Commit Graph

161 Commits

Author SHA1 Message Date
mafiesto4 aaaf7c5c37 Various fixes to scripting 2023-03-06 16:17:52 +01:00
mafiesto4 60f21d1a92 Update old copyright headers 2023-03-03 17:14:35 +01:00
mafiesto4 a17981bc87 Merge branch 'system_array_marshalling' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-system_array_marshalling 2023-02-28 10:26:56 +01:00
mafiesto4 f88dd50098 Merge commit '272ffe2ea22eecb8f7cd6662efc1cadbe5593feb' into dotnet7 2023-02-27 23:17:04 +01:00
mafiesto4 499df770cc Match C++ managed memory alloc with C# for scripting 2023-02-27 22:56:15 +01:00
GoaLitiuM 87e9046e41 Fix native to managed marshalling of System.Array 2023-02-19 20:33:12 +02:00
GoaLitiuM 1c74e89f0d Revert "Add System.Array interop from native return to managed world"
This reverts commit 272ffe2ea2.
2023-02-19 20:32:50 +02:00
mafiesto4 272ffe2ea2 Add System.Array interop from native return to managed world 2023-02-19 16:58:37 +01:00
mafiesto4 45a0b25ee4 Fix after merge 2023-02-13 10:52:11 +01:00
mafiesto4 ac59cc4633 Merge remote-tracking branch 'origin/master' into dotnet7 2023-02-13 10:05:51 +01:00
mafiesto4 2a6fb3ba81 Merge branch 'threadsafe_managedarraypool' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-threadsafe_managedarraypool 2023-02-13 10:04:03 +01:00
mafiesto4 82823d6945 Various improvements and fixes 2023-02-09 20:05:46 +01:00
mafiesto4 ea9dd48da9 Expose ManagedArray to be used in game code bindings 2023-02-06 10:44:10 +01:00
mafiesto4 547f4d1180 Fix missing getter/setter methods attributes 2023-02-06 10:43:08 +01:00
GoaLitiuM 02c6354003 Store pooled ManagedArray in thread-local storage 2023-01-29 18:09:37 +02:00
mafiesto4 798b950046 Merge branch 'dotnet7' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-dotnet7 2023-01-24 09:30:38 +01:00
mafiesto4 f1f5dacb6f Add unit test to verify LibraryImport attributes usage for proper bindings 2023-01-24 09:25:39 +01:00
mafiesto4 f3366178ea Refactor manually written managed bindings to use C-style exported P/Invoke 2023-01-23 18:14:38 +01:00
GoaLitiuM a917567e92 Fix passing weak managed string handles in marshallers 2023-01-22 17:29:30 +02:00
mafiesto4 7b20bc38a4 Merge branch '1.5' into dotnet7
# Conflicts:
#	Content/Shaders/GI/DDGI.flax
#	Content/Shaders/GI/GlobalSurfaceAtlas.flax
#	Content/Shaders/TAA.flax
#	Content/Shaders/VolumetricFog.flax
#	Source/Tools/Flax.Build/Projects/VisualStudio/VCProjectGenerator.cs
2023-01-17 11:52:52 +01:00
mafiesto4 831fc80971 Fix game build 2023-01-16 11:14:13 +01:00
mafiesto4 a2af46845d Merge branch 'master' into 1.5
# Conflicts:
#	Source/Engine/Renderer/AmbientOcclusionPass.cpp
2023-01-15 18:27:49 +01:00
mafiesto4 b89f2e39c9 Expose RandomUtil to Visual Scripting and cleanup codestyle
#843
2023-01-15 13:47:06 +01:00
mafiesto4 3622b77034 Merge branch 'master' of https://github.com/Withaust/FlaxEngine into Withaust-master 2023-01-15 13:38:10 +01:00
GoaLitiuM 1a1fadcc2f Fix incorrect marshalling of TextureImportEntry fields 2023-01-14 17:50:25 +02:00
mafiesto4 59ba9102a6 Merge branch 'dotnet7' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-dotnet7 2023-01-12 15:15:40 +01:00
mafiesto4 daa92db25c Add support for using managed method thunks on dotnet7 in all cases 2023-01-12 15:14:43 +01:00
mafiesto4 45a557f9c0 Minor tweaks 2023-01-10 16:50:52 +01:00
mafiesto4 7698e79143 Fix dotnet7 method runtime invoke to match return value boxing 2023-01-10 16:47:02 +01:00
mafiesto4 1c584e937a Fix mono_class_get_interfaces on dotnet7 to match mono behavior 2023-01-10 16:39:48 +01:00
mafiesto4 6ef5c76e1a Fix regression from recent scripting fixes/features on 1.5 2023-01-10 16:13:53 +01:00
mafiesto4 eebc4951de Merge branch '1.5' into dotnet7
# Conflicts:
#	Source/Platforms/DotNet/NUnit/agents/net40/nunit-agent.exe
#	Source/Platforms/DotNet/NUnit/agents/net40/nunit.engine.api.dll
#	Source/Platforms/DotNet/NUnit/agents/net40/nunit.engine.core.dll
#	Source/Platforms/DotNet/NUnit/agents/net7.0/nunit.agent.addins
#	Source/Platforms/DotNet/NUnit/nunit.engine.api.dll
#	Source/Platforms/DotNet/NUnit/nunit.engine.core.dll
#	Source/Platforms/DotNet/NUnit/nunit.engine.dll
#	Source/Platforms/DotNet/NUnit/nunit3-console.exe
#	Source/Platforms/DotNet/NUnit/nunit3-console.exe.config
#	Source/Platforms/DotNet/NUnit/testcentric.engine.metadata.dll
#	Source/Tools/Flax.Build/Deps/Downloader.cs
#	Source/Tools/Flax.Stats/CodeFrame.cs
#	Source/Tools/Flax.Stats/CodeFrameNode.cs
#	Source/Tools/Flax.Stats/Flax.Stats.Build.cs
#	Source/Tools/Flax.Stats/Languages.cs
#	Source/Tools/Flax.Stats/Program.cs
#	Source/Tools/Flax.Stats/TaskType.cs
#	Source/Tools/Flax.Stats/Tools.cs
#	Source/Tools/FlaxEngine.Tests/TestEditorUtils.cs
2023-01-10 15:49:44 +01:00
mafiesto4 a7e428a21c Merge branch 'master' into 1.5
# Conflicts:
#	Content/Shaders/GI/DDGI.flax
#	Content/Shaders/GI/GlobalSurfaceAtlas.flax
#	Content/Shaders/TAA.flax
#	Content/Shaders/VolumetricFog.flax
#	Source/Editor/CustomEditors/Editors/ActorTagEditor.cs
#	Source/Engine/Core/Config/GraphicsSettings.cpp
#	Source/Engine/Engine/PostProcessEffect.cs
#	Source/Engine/Graphics/GPUResourcesCollection.cpp
#	Source/Engine/Graphics/GPUResourcesCollection.h
#	Source/Engine/Graphics/PostProcessBase.h
#	Source/FlaxEngine.Gen.cs
2023-01-10 15:37:55 +01:00
mafiesto4 9626e9bbb6 Update copyright year 2023-01-10 15:29:37 +01:00
GoaLitiuM 9f76e9e230 Hide types in unloaded scripting assemblies 2023-01-09 15:20:24 +02:00
mafiesto4 34cc546f00 Minor tweaks 2023-01-05 11:32:25 +01:00
mafiesto4 b21aeedae2 Fix build 2023-01-05 09:38:46 +01:00
mafiesto4 0b8d4850f0 Use manual pdb file loading for debug symbols in C# 2023-01-04 09:56:58 +01:00
mafiesto4 ceacdc8d08 Fixes for dotnet7 bindings to pass unit tests 2023-01-03 14:34:16 +01:00
mafiesto4 dea307179f Merge branch 'dotnet7' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-dotnet7
# Conflicts:
#	Source/Engine/Engine/NativeInterop.cs
2023-01-02 11:04:36 +01:00
mafiesto4 e48b642101 Minor code cleanup 2023-01-02 10:36:57 +01:00
mafiesto4 00d960d61e Refactor abstract classes handling for scripting types creation (eg. Script or GPUResource) under dotnet7 2023-01-02 10:35:39 +01:00
GoaLitiuM 5b4e209816 Fix creating delegates to scripting methods after script reload 2023-01-01 22:06:00 +02:00
GoaLitiuM 21c67b4777 Fix weak ManagedHandles collection 2022-12-31 15:34:16 +02:00
GoaLitiuM 2f507091b2 Fix ManagedHandle marshalling 2022-12-31 15:30:58 +02:00
GoaLitiuM 8b80f73641 Implement ManagedHandle replacement for GCHandles
Allows for more controlled management of weak handles, increasing their lifetime for slightly longer than with GCHandles.
2022-12-30 22:14:48 +02:00
mafiesto4 6a8483a898 Fix converting managed array back to native if passed via structure argument 2022-12-30 16:05:33 +01:00
mafiesto4 71e2cbe856 Minor tweaks to dotnet interop 2022-12-30 15:36:35 +01:00
GoaLitiuM 77478f9515 Fix managed and native array field marshalling 2022-12-30 01:34:52 +02:00
GoaLitiuM f12475ea99 Prefer NativeMemory.AlignedAlloc over Marshal.Alloc* 2022-12-27 19:08:56 +02:00