From 1fbdabdcd0bcd5d8b6f4530e5470d051432a4299 Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Sun, 19 Jun 2022 13:07:19 +0200 Subject: [PATCH] Fixes --- Content/Shaders/GI/DDGI.flax | 4 ++-- Content/Shaders/VolumetricFog.flax | 4 ++-- Source/Editor/Windows/Assets/MaterialWindow.cs | 3 +++ Source/Editor/Windows/Assets/ParticleEmitterWindow.cs | 3 +++ Source/Engine/Core/Math/OrientedBoundingBox.h | 2 +- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Content/Shaders/GI/DDGI.flax b/Content/Shaders/GI/DDGI.flax index 06036722b..172af5014 100644 --- a/Content/Shaders/GI/DDGI.flax +++ b/Content/Shaders/GI/DDGI.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:48d4226baa1cf8751208681ad1c7d9855d5bbc5fc252acd381c24d293f8a789c -size 19190 +oid sha256:639f5bc194e1108f6c43523bce2483d25381a0ee9e26b53f213a1edefd4adcae +size 19178 diff --git a/Content/Shaders/VolumetricFog.flax b/Content/Shaders/VolumetricFog.flax index e82ee9eaa..5dbdb545b 100644 --- a/Content/Shaders/VolumetricFog.flax +++ b/Content/Shaders/VolumetricFog.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:721f4fa6688bfc97592d1e8747feff21fd313e02fd8e5ee41cfa752fba42fa4d -size 14394 +oid sha256:e4908ae3d09694599b3eb3e3fcab07e1b948e68a3dcfbe663a2c3579f566328c +size 13823 diff --git a/Source/Editor/Windows/Assets/MaterialWindow.cs b/Source/Editor/Windows/Assets/MaterialWindow.cs index 644b19688..aea385967 100644 --- a/Source/Editor/Windows/Assets/MaterialWindow.cs +++ b/Source/Editor/Windows/Assets/MaterialWindow.cs @@ -34,6 +34,9 @@ namespace FlaxEditor.Windows.Assets new ScriptType(typeof(ChannelMask)), new ScriptType(typeof(bool)), new ScriptType(typeof(int)), + new ScriptType(typeof(Float2)), + new ScriptType(typeof(Float3)), + new ScriptType(typeof(Float4)), new ScriptType(typeof(Vector2)), new ScriptType(typeof(Vector3)), new ScriptType(typeof(Vector4)), diff --git a/Source/Editor/Windows/Assets/ParticleEmitterWindow.cs b/Source/Editor/Windows/Assets/ParticleEmitterWindow.cs index 45e2f305d..33c02da0a 100644 --- a/Source/Editor/Windows/Assets/ParticleEmitterWindow.cs +++ b/Source/Editor/Windows/Assets/ParticleEmitterWindow.cs @@ -33,6 +33,9 @@ namespace FlaxEditor.Windows.Assets new ScriptType(typeof(ChannelMask)), new ScriptType(typeof(bool)), new ScriptType(typeof(int)), + new ScriptType(typeof(Float2)), + new ScriptType(typeof(Float3)), + new ScriptType(typeof(Float4)), new ScriptType(typeof(Vector2)), new ScriptType(typeof(Vector3)), new ScriptType(typeof(Vector4)), diff --git a/Source/Engine/Core/Math/OrientedBoundingBox.h b/Source/Engine/Core/Math/OrientedBoundingBox.h index dbdba67a4..4a72419ef 100644 --- a/Source/Engine/Core/Math/OrientedBoundingBox.h +++ b/Source/Engine/Core/Math/OrientedBoundingBox.h @@ -12,7 +12,7 @@ enum class ContainmentType; /// API_STRUCT() struct FLAXENGINE_API OrientedBoundingBox { - DECLARE_SCRIPTING_TYPE_MINIMAL(Rectangle); + DECLARE_SCRIPTING_TYPE_MINIMAL(OrientedBoundingBox); /// /// Half lengths of the box along each axis.