Fix managed wrapper function parameter handling for BytesContainer

.github/data/bt.sh

@@ -1,17 +0,0 @@
-#!/bin/sh
-# https://gist.github.com/ongardie/aa15f1f0d0e6b59890a9
-gdb -q --batch \
-               -ex 'handle SIGHUP nostop pass' \
-               -ex 'handle SIGQUIT nostop pass' \
-               -ex 'handle SIGPIPE nostop pass' \
-               -ex 'handle SIGALRM nostop pass' \
-               -ex 'handle SIGTERM nostop pass' \
-               -ex 'handle SIGUSR1 nostop pass' \
-               -ex 'handle SIGUSR2 nostop pass' \
-               -ex 'handle SIGCHLD nostop pass' \
-               -ex 'set print thread-events off' \
-               -return-child-result \
-               -ex 'run' \
-               -ex 'thread apply all bt' \
-               --tty=/dev/stdout \
-               --args $*

.github/workflows/build_linux.yml

@@ -16,8 +16,7 @@ jobs:
       uses: actions/checkout@v3
     - name: Install dependencies
       run: |
-        sudo apt-get update
+        sudo apt-get install libx11-dev libxcursor-dev libxinerama-dev build-essential gettext libtool libtool-bin libpulse-dev libasound2-dev libjack-dev portaudio19-dev
-        sudo apt-get install -y --fix-missing libx11-dev libxcursor-dev libxinerama-dev build-essential gettext libtool libtool-bin libpulse-dev libasound2-dev libjack-dev portaudio19-dev libwayland-dev
     - name: Setup Vulkan
       uses: ./.github/actions/vulkan
     - name: Setup .NET
@@ -45,8 +44,7 @@ jobs:
       uses: actions/checkout@v3
     - name: Install dependencies
       run: |
-        sudo apt-get update
+        sudo apt-get install libx11-dev libxcursor-dev libxinerama-dev
-        sudo apt-get install -y --fix-missing libx11-dev libxcursor-dev libxinerama-dev build-essential gettext libtool libtool-bin libpulse-dev libasound2-dev libjack-dev portaudio19-dev libwayland-dev
     - name: Setup Vulkan
       uses: ./.github/actions/vulkan
     - name: Setup .NET

.github/workflows/cd.yml

@@ -87,8 +87,7 @@ jobs:
         git ${{ env.GIT_LFS_PULL_OPTIONS }} lfs pull
     - name: Install dependencies
       run: |
-        sudo apt-get update
+        sudo apt-get install libx11-dev libxcursor-dev libxinerama-dev build-essential gettext libtool libtool-bin libpulse-dev libasound2-dev libjack-dev portaudio19-dev
-        sudo apt-get install -y --fix-missing libx11-dev libxcursor-dev libxinerama-dev build-essential gettext libtool libtool-bin libpulse-dev libasound2-dev libjack-dev portaudio19-dev libwayland-dev
     - name: Setup Vulkan
       uses: ./.github/actions/vulkan
     - name: Setup .NET
@@ -119,8 +118,7 @@ jobs:
         git ${{ env.GIT_LFS_PULL_OPTIONS }} lfs pull
     - name: Install dependencies
       run: |
-        sudo apt-get update
+        sudo apt-get install libx11-dev libxcursor-dev libxinerama-dev build-essential gettext libtool libtool-bin libpulse-dev libasound2-dev libjack-dev portaudio19-dev
-        sudo apt-get install -y --fix-missing libx11-dev libxcursor-dev libxinerama-dev build-essential gettext libtool libtool-bin libpulse-dev libasound2-dev libjack-dev portaudio19-dev libwayland-dev
     - name: Setup Vulkan
       uses: ./.github/actions/vulkan
     - name: Setup .NET

.github/workflows/tests.yml

@@ -28,23 +28,25 @@ jobs:
         git lfs pull
     - name: Install dependencies
       run: |
-        sudo apt-get update
+        sudo apt-get install libx11-dev libxcursor-dev libxinerama-dev build-essential gettext libtool libtool-bin libpulse-dev libasound2-dev libjack-dev portaudio19-dev
-        sudo apt-get install -y --fix-missing libx11-dev libxcursor-dev libxinerama-dev build-essential gettext libtool libtool-bin libpulse-dev libasound2-dev libjack-dev portaudio19-dev libwayland-dev gdb
-        chmod +x .github/data/bt.sh
     - name: Build
       run: |
         ./GenerateProjectFiles.sh -vs2022 -log -verbose -printSDKs -dotnet=8
-        ./Development/Scripts/Linux/CallBuildTool.sh -build -log -dotnet=8 -arch=x64 -platform=Linux -configuration=Development -buildtargets=FlaxTestsTarget -UseLargeWorlds=true
+        ./Development/Scripts/Linux/CallBuildTool.sh -build -log -dotnet=8 -arch=x64 -platform=Linux -configuration=Development -buildtargets=FlaxTestsTarget
         dotnet msbuild Source/Tools/Flax.Build.Tests/Flax.Build.Tests.csproj /m /t:Restore,Build /p:Configuration=Debug /p:Platform=AnyCPU /nologo
         dotnet msbuild Source/Tools/Flax.Build.Tests/Flax.Build.Tests.csproj /m /t:Restore,Build /p:Configuration=Debug /p:Platform=AnyCPU /nologo
     - name: Test
       run: |
-        ${GITHUB_WORKSPACE}/.github/data/bt.sh ./Binaries/Editor/Linux/Development/FlaxTests -headless
+        ${GITHUB_WORKSPACE}/Binaries/Editor/Linux/Development/FlaxTests
         dotnet test -f net8.0 Binaries/Tests/Flax.Build.Tests.dll
         cp Binaries/Editor/Linux/Development/FlaxEngine.CSharp.dll Binaries/Tests
         cp Binaries/Editor/Linux/Development/FlaxEngine.CSharp.runtimeconfig.json Binaries/Tests
         cp Binaries/Editor/Linux/Development/Newtonsoft.Json.dll Binaries/Tests
         dotnet test -f net8.0 Binaries/Tests/FlaxEngine.CSharp.dll
+    - name: Test UseLargeWorlds
+      run: |
+        ./Development/Scripts/Linux/CallBuildTool.sh -build -log -dotnet=8 -arch=x64 -platform=Linux -configuration=Development -buildtargets=FlaxTestsTarget -UseLargeWorlds=true
+        ${GITHUB_WORKSPACE}/Binaries/Editor/Linux/Development/FlaxTests
 
   # Tests on Windows
   tests-windows:
@@ -74,7 +76,7 @@ jobs:
       shell: pwsh
       run: |
         $ErrorActionPreference = "Stop"
-        .\Binaries\Editor\Win64\Development\FlaxTests.exe -headless
+        .\Binaries\Editor\Win64\Development\FlaxTests.exe
         if(!$?) { Write-Host "Tests failed with exit code $LastExitCode" -ForegroundColor Red; Exit $LastExitCode }
         dotnet test -f net8.0 Binaries\Tests\Flax.Build.Tests.dll
         xcopy /y Binaries\Editor\Win64\Development\FlaxEngine.CSharp.dll Binaries\Tests

.lfsconfig

@@ -1,4 +1,4 @@
 # Redirect to our own Git LFS server
 [lfs]
-#url="https://gitlab.flaxengine.com/flax/flaxengine.git/info/lfs"
+url="https://gitlab.flaxengine.com/flax/flaxengine.git/info/lfs"
 locksverify = false

Content/Editor/MaterialTemplates/Decal.shader

@@ -42,10 +42,10 @@ struct MaterialInput
 float2 SvPositionToDecalUV(float4 svPosition)
 {
 	float2 screenUV = svPosition.xy * ScreenSize.zw;
-	svPosition.z = SAMPLE_RT_DEPTH(DepthBuffer, screenUV);
+	svPosition.z = SAMPLE_RT(DepthBuffer, screenUV).r;
-	float4 positionHS = PROJECT_POINT(float4(svPosition.xyz, 1), SvPositionToWorld);
+	float4 positionHS = mul(float4(svPosition.xyz, 1), SvPositionToWorld);
 	float3 positionWS = positionHS.xyz / positionHS.w;
-	float3 positionOS = PROJECT_POINT(float4(positionWS, 1), InvWorld).xyz;
+	float3 positionOS = mul(float4(positionWS, 1), InvWorld).xyz;
 	return positionOS.xz + 0.5f;
 }
 
@@ -182,10 +182,10 @@ META_VS_IN_ELEMENT(POSITION, 0, R32G32B32_FLOAT, 0, 0, PER_VERTEX, 0, true)
 void VS_Decal(in float3 Position : POSITION0, out float4 SvPosition : SV_Position)
 {
 	// Compute world space vertex position
-	float3 worldPosition = PROJECT_POINT(float4(Position.xyz, 1), WorldMatrix).xyz;
+	float3 worldPosition = mul(float4(Position.xyz, 1), WorldMatrix).xyz;
 
 	// Compute clip space position
-	SvPosition = PROJECT_POINT(float4(worldPosition.xyz, 1), ViewProjectionMatrix);
+	SvPosition = mul(float4(worldPosition.xyz, 1), ViewProjectionMatrix);
 }
 
 // Pixel Shader function for decals rendering
@@ -213,11 +213,11 @@ void PS_Decal(
 	}
 
 	float2 screenUV = SvPosition.xy * ScreenSize.zw;
-	SvPosition.z = SAMPLE_RT_DEPTH(DepthBuffer, screenUV);
+	SvPosition.z = SAMPLE_RT(DepthBuffer, screenUV).r;
 
-	float4 positionHS = PROJECT_POINT(float4(SvPosition.xyz, 1), SvPositionToWorld);
+	float4 positionHS = mul(float4(SvPosition.xyz, 1), SvPositionToWorld);
 	float3 positionWS = positionHS.xyz / positionHS.w;
-	float3 positionOS = PROJECT_POINT(float4(positionWS, 1), InvWorld).xyz;
+	float3 positionOS = mul(float4(positionWS, 1), InvWorld).xyz;
 
 	clip(0.5 - abs(positionOS.xyz));
 	float2 decalUVs = positionOS.xz + 0.5f;

Content/Editor/MaterialTemplates/Deformable.shader

@@ -308,7 +308,7 @@ VertexOutput VS_SplineModel(ModelInput input)
 	world = mul(world, WorldMatrix);
 
 	// Compute clip space position
-	output.Position = PROJECT_POINT(float4(output.Geometry.WorldPosition, 1), ViewProjectionMatrix);
+	output.Position = mul(float4(output.Geometry.WorldPosition, 1), ViewProjectionMatrix);
 
 	// Pass vertex attributes
 	output.Geometry.TexCoord = input.TexCoord0;
@@ -338,7 +338,7 @@ VertexOutput VS_SplineModel(ModelInput input)
 #if USE_POSITION_OFFSET
 	output.Geometry.WorldPosition += material.PositionOffset;
 	output.Geometry.PrevWorldPosition += material.PositionOffset;
-	output.Position = PROJECT_POINT(float4(output.Geometry.WorldPosition, 1), ViewProjectionMatrix);
+	output.Position = mul(float4(output.Geometry.WorldPosition, 1), ViewProjectionMatrix);
 #endif
 
 	// Get tessalation multiplier (per vertex)

Content/Editor/MaterialTemplates/Features/ForwardShading.hlsl

@@ -4,8 +4,8 @@
 #define MAX_LOCAL_LIGHTS 4
 @1// Forward Shading: Includes
 #include "./Flax/LightingCommon.hlsl"
-#include "./Flax/ReflectionsCommon.hlsl"
 #if USE_REFLECTIONS
+#include "./Flax/ReflectionsCommon.hlsl"
 #define MATERIAL_REFLECTIONS_SSR 1
 #if MATERIAL_REFLECTIONS == MATERIAL_REFLECTIONS_SSR
 #include "./Flax/SSR.hlsl"
@@ -14,13 +14,11 @@
 #include "./Flax/Lighting.hlsl"
 #include "./Flax/ShadowsSampling.hlsl"
 #include "./Flax/ExponentialHeightFog.hlsl"
-#include "./Flax/VolumetricFog.hlsl"
 @2// Forward Shading: Constants
 LightData DirectionalLight;
 LightData SkyLight;
-EnvProbeData EnvironmentProbe;
+ProbeData EnvironmentProbe;
 ExponentialHeightFogData ExponentialHeightFog;
-VolumetricFogData VolumetricFog;
 float3 Dummy2;
 uint LocalLightsCount;
 LightData LocalLights[MAX_LOCAL_LIGHTS];
@@ -30,14 +28,12 @@ TextureCube SkyLightTexture : register(t__SRV__);
 Buffer<float4> ShadowsBuffer : register(t__SRV__);
 Texture2D<float> ShadowMap : register(t__SRV__);
 Texture3D VolumetricFogTexture : register(t__SRV__);
-Texture2D PreIntegratedGF : register(t__SRV__);
 @4// Forward Shading: Utilities
 // Public accessors for lighting data, use them as data binding might change but those methods will remain.
 LightData GetDirectionalLight() { return DirectionalLight; }
 LightData GetSkyLight() { return SkyLight; }
-EnvProbeData GetEnvironmentProbe() { return EnvironmentProbe; }
+ProbeData GetEnvironmentProbe() { return EnvironmentProbe; }
 ExponentialHeightFogData GetExponentialHeightFog() { return ExponentialHeightFog; }
-VolumetricFogData GetVolumetricFog() { return VolumetricFog; }
 uint GetLocalLightsCount() { return LocalLightsCount; }
 LightData GetLocalLight(uint i) { return LocalLights[i]; }
 @5// Forward Shading: Shaders
@@ -112,8 +108,7 @@ void PS_Forward(
 
 	// Calculate reflections
 #if USE_REFLECTIONS
-	float4 reflections = SampleReflectionProbe(ViewPos, EnvProbe, EnvironmentProbe, gBuffer.WorldPos, gBuffer.Normal, gBuffer.Roughness);
+	float3 reflections = SampleReflectionProbe(ViewPos, EnvProbe, EnvironmentProbe, gBuffer.WorldPos, gBuffer.Normal, gBuffer.Roughness).rgb;
-	reflections.rgb *= reflections.a;
 
 #if MATERIAL_REFLECTIONS == MATERIAL_REFLECTIONS_SSR
 	// Screen Space Reflections
@@ -121,7 +116,7 @@ void PS_Forward(
 	Texture2D sceneColorTexture = MATERIAL_REFLECTIONS_SSR_COLOR;
 	float2 screenUV = materialInput.SvPosition.xy * ScreenSize.zw;
 	float stepSize = ScreenSize.z; // 1 / screenWidth
-	float maxSamples = 50;
+	float maxSamples = 48;
 	float worldAntiSelfOcclusionBias = 0.1f;
 	float brdfBias = 0.82f;
 	float drawDistance = 5000.0f;
@@ -129,7 +124,7 @@ void PS_Forward(
 	if (hit.z > 0)
 	{
 		float3 screenColor = sceneColorTexture.SampleLevel(SamplerPointClamp, hit.xy, 0).rgb;
-		reflections.rgb = lerp(reflections.rgb, screenColor, hit.z);
+		reflections = lerp(reflections, screenColor, hit.z);
 	}
 
 	// Fallback to software tracing if possible
@@ -141,17 +136,17 @@ void PS_Forward(
 		if (TraceSDFSoftwareReflections(gBuffer, reflectWS, surfaceAtlas))
 		{
 			float3 screenColor = sceneColorTexture.SampleLevel(SamplerPointClamp, hit.xy, 0).rgb;
-        	reflections.rgb = lerp(surfaceAtlas, float4(screenColor, 1), hit.z);
+        	reflections = lerp(surfaceAtlas, float4(screenColor, 1), hit.z);
 		}
 	}
 #endif
 #endif
 
-	light.rgb += reflections.rgb * GetReflectionSpecularLighting(PreIntegratedGF, ViewPos, gBuffer);
+	light.rgb += reflections * GetReflectionSpecularLighting(ViewPos, gBuffer) * light.a;	
 #endif
 
-	// Add lighting
+	// Add lighting (apply ambient occlusion)
-	output.rgb += light.rgb;
+	output.rgb += light.rgb * gBuffer.AO;
 
 #endif
 
@@ -163,13 +158,17 @@ void PS_Forward(
 #else
 	float fogSceneDistance = gBuffer.ViewPos.z;
 #endif
-	float fogSkipDistance = max(ExponentialHeightFog.VolumetricFogMaxDistance - 100, 0);
+	float4 fog = GetExponentialHeightFog(ExponentialHeightFog, materialInput.WorldPosition, ViewPos, 0, fogSceneDistance);
-	float4 fog = GetExponentialHeightFog(ExponentialHeightFog, materialInput.WorldPosition, ViewPos, fogSkipDistance, fogSceneDistance);
+
 	if (ExponentialHeightFog.VolumetricFogMaxDistance > 0)
 	{
 		// Sample volumetric fog and mix it in
 		float2 screenUV = materialInput.SvPosition.xy * ScreenSize.zw;
-		float4 volumetricFog = SampleVolumetricFog(VolumetricFogTexture, VolumetricFog, materialInput.WorldPosition - ViewPos, screenUV, TemporalAAJitter);
+		float3 viewVector = materialInput.WorldPosition - ViewPos;
+		float sceneDepth = length(viewVector);
+		float depthSlice = sceneDepth / ExponentialHeightFog.VolumetricFogMaxDistance;
+		float3 volumeUV = float3(screenUV, depthSlice);
+		float4 volumetricFog = VolumetricFogTexture.SampleLevel(SamplerLinearClamp, volumeUV, 0);
 		fog = CombineVolumetricFog(fog, volumetricFog);
 	}
 

Content/Editor/MaterialTemplates/GPUParticles.shader

@@ -67,7 +67,7 @@ float Rand(inout uint seed)
 float3 ReprojectPosition(float2 uv, float rawDepth)
 {
 	uv = uv * float2(2.0, -2.0) + float2(-1.0, 1.0);
-	float4 pos = PROJECT_POINT(float4(uv.x, uv.y, rawDepth, 1.0f), InvViewProjectionMatrix);
+	float4 pos = mul(float4(uv.x, uv.y, rawDepth, 1.0f), InvViewProjectionMatrix);
 	return pos.xyz / pos.w;
 }
 
@@ -158,7 +158,7 @@ void SpawnParticle(Context context)
 @4}
 
 // Main entry point for the particles simulation and spawning
-META_CS(true, AUTO)
+META_CS(true, FEATURE_LEVEL_SM5)
 [numthreads(THREAD_GROUP_SIZE, 1, 1)]
 void CS_Main(uint3 dispatchThreadId : SV_DispatchThreadID)
 {

Content/Editor/MaterialTemplates/GUI.shader

@@ -38,7 +38,6 @@ struct VertexOutput
 #endif
 	float4 ClipExtents       : TEXCOORD3;
 	float2 ClipOrigin        : TEXCOORD4;
-    float2 CustomData        : TEXCOORD5; // x-per-geometry type, y-features mask
 #if USE_CUSTOM_VERTEX_INTERPOLATORS
 	float4 CustomVSToPS[CUSTOM_VERTEX_INTERPOLATORS_COUNT] : TEXCOORD9;
 #endif
@@ -56,7 +55,6 @@ struct PixelInput
 #endif
 	float4 ClipExtents       : TEXCOORD3;
 	float2 ClipOrigin        : TEXCOORD4;
-    float2 CustomData        : TEXCOORD5; // x-per-geometry type, y-features mask
 #if USE_CUSTOM_VERTEX_INTERPOLATORS
 	float4 CustomVSToPS[CUSTOM_VERTEX_INTERPOLATORS_COUNT] : TEXCOORD9;
 #endif
@@ -69,7 +67,6 @@ struct MaterialInput
 	float3 WorldPosition;
 	float TwoSidedSign;
 	float2 TexCoord;
-    float2 CustomData; // x-per-geometry type, y-features mask
 #if USE_VERTEX_COLOR
 	half4 VertexColor;
 #endif
@@ -87,7 +84,6 @@ MaterialInput GetMaterialInput(Render2DVertex input, VertexOutput output)
 	MaterialInput result;
 	result.WorldPosition = output.WorldPosition;
 	result.TexCoord = output.TexCoord;
-	result.CustomData = input.CustomDataAndClipOrigin.xy;
 #if USE_VERTEX_COLOR
 	result.VertexColor = output.VertexColor;
 #endif
@@ -107,7 +103,6 @@ MaterialInput GetMaterialInput(PixelInput input)
 	MaterialInput result;
 	result.WorldPosition = input.WorldPosition;
 	result.TexCoord = input.TexCoord;
-	result.CustomData = input.CustomData;
 #if USE_VERTEX_COLOR
 	result.VertexColor = input.VertexColor;
 #endif
@@ -227,14 +222,13 @@ VertexOutput VS_GUI(Render2DVertex input)
 	if ((int)input.CustomDataAndClipOrigin.y & 1)
 		input.Position = (int2)input.Position;
 
-	output.Position = PROJECT_POINT(float4(input.Position, 0, 1), ViewProjectionMatrix);
+	output.Position = mul(float4(input.Position, 0, 1), ViewProjectionMatrix);
 	output.WorldPosition = mul(float4(input.Position, 0, 1), WorldMatrix).xyz;
 	output.TexCoord = input.TexCoord;
 	output.WindowPos = input.Position;
 #if USE_VERTEX_COLOR
 	output.VertexColor = input.Color;
 #endif
-	output.CustomData = input.CustomDataAndClipOrigin.xy;
 	output.ClipOrigin = input.CustomDataAndClipOrigin.zw;
 	output.ClipExtents = input.ClipExtents;
 

Content/Editor/MaterialTemplates/Particle.shader

@@ -393,7 +393,7 @@ VertexOutput VS_Sprite(SpriteInput input, uint particleIndex : SV_InstanceID)
 	output.WorldPosition = position + spriteVertexPosition;
 
 	// Compute clip space position
-	output.Position = PROJECT_POINT(float4(output.WorldPosition.xyz, 1), ViewProjectionMatrix);
+	output.Position = mul(float4(output.WorldPosition.xyz, 1), ViewProjectionMatrix);
 
 	// Pass vertex attributes
 	output.TexCoord = input.TexCoord;
@@ -431,7 +431,7 @@ VertexOutput VS_Sprite(SpriteInput input, uint particleIndex : SV_InstanceID)
 	// Apply world position offset per-vertex
 #if USE_POSITION_OFFSET
 	output.WorldPosition += material.PositionOffset;
-	output.Position = PROJECT_POINT(float4(output.WorldPosition.xyz, 1), ViewProjectionMatrix);
+	output.Position = mul(float4(output.WorldPosition.xyz, 1), ViewProjectionMatrix);
 #endif
 
 	// Copy interpolants for other shader stages
@@ -511,7 +511,7 @@ VertexOutput VS_Model(ModelInput input, uint particleIndex : SV_InstanceID)
 	output.WorldPosition = mul(float4(input.Position, 1), world).xyz;
 
 	// Compute clip space position
-	output.Position = PROJECT_POINT(float4(output.WorldPosition, 1), ViewProjectionMatrix);
+	output.Position = mul(float4(output.WorldPosition, 1), ViewProjectionMatrix);
 
 	// Pass vertex attributes
 	output.TexCoord = input.TexCoord0;
@@ -549,7 +549,7 @@ VertexOutput VS_Model(ModelInput input, uint particleIndex : SV_InstanceID)
 	// Apply world position offset per-vertex
 #if USE_POSITION_OFFSET
 	output.WorldPosition += material.PositionOffset;
-	output.Position = PROJECT_POINT(float4(output.WorldPosition.xyz, 1), ViewProjectionMatrix);
+	output.Position = mul(float4(output.WorldPosition.xyz, 1), ViewProjectionMatrix);
 #endif
 
 	// Copy interpolants for other shader stages
@@ -617,7 +617,7 @@ VertexOutput VS_Ribbon(RibbonInput input, uint vertexIndex : SV_VertexID)
 	output.WorldPosition = position + tangentRight * vertexSign * (ribbonWidth.xxx * 0.5f);
 
 	// Compute clip space position
-	output.Position = PROJECT_POINT(float4(output.WorldPosition.xyz, 1), ViewProjectionMatrix);
+	output.Position = mul(float4(output.WorldPosition.xyz, 1), ViewProjectionMatrix);
 
 	// Pass vertex attributes
 	output.ParticleIndex = particleIndex;
@@ -655,7 +655,7 @@ VertexOutput VS_Ribbon(RibbonInput input, uint vertexIndex : SV_VertexID)
 	// Apply world position offset per-vertex
 #if USE_POSITION_OFFSET
 	output.WorldPosition += material.PositionOffset;
-	output.Position = PROJECT_POINT(float4(output.WorldPosition.xyz, 1), ViewProjectionMatrix);
+	output.Position = mul(float4(output.WorldPosition.xyz, 1), ViewProjectionMatrix);
 #endif
 
 	// Copy interpolants for other shader stages

Content/Editor/MaterialTemplates/Surface.shader

@@ -342,7 +342,7 @@ VertexOutput VS(ModelInput input)
 	output.Geometry.PrevWorldPosition = mul(float4(input.Position.xyz, 1), object.PrevWorldMatrix).xyz;
 
 	// Compute clip space position
-	output.Position = PROJECT_POINT(float4(output.Geometry.WorldPosition, 1), ViewProjectionMatrix);
+	output.Position = mul(float4(output.Geometry.WorldPosition, 1), ViewProjectionMatrix);
 
 	// Pass vertex attributes
 	output.Geometry.TexCoords01 = float4(input.TexCoord0, input.TexCoord1);
@@ -378,7 +378,7 @@ VertexOutput VS(ModelInput input)
 #if USE_POSITION_OFFSET
 	output.Geometry.WorldPosition += material.PositionOffset;
 	output.Geometry.PrevWorldPosition += material.PositionOffset;
-	output.Position = PROJECT_POINT(float4(output.Geometry.WorldPosition, 1), ViewProjectionMatrix);
+	output.Position = mul(float4(output.Geometry.WorldPosition, 1), ViewProjectionMatrix);
 #endif
 
 	// Get tessalation multiplier (per vertex)
@@ -412,7 +412,7 @@ float4 VS_Depth(ModelInput_PosOnly input) : SV_Position
 
 	// Transform vertex position into the screen
 	float3 worldPosition = mul(float4(input.Position.xyz, 1), object.WorldMatrix).xyz;
-	float4 position = PROJECT_POINT(float4(worldPosition, 1), ViewProjectionMatrix);
+	float4 position = mul(float4(worldPosition, 1), ViewProjectionMatrix);
 	return position;
 }
 
@@ -518,7 +518,7 @@ VertexOutput VS_Skinned(ModelInput_Skinned input)
 #endif
 
 	// Compute clip space position
-	output.Position = PROJECT_POINT(float4(output.Geometry.WorldPosition, 1), ViewProjectionMatrix);
+	output.Position = mul(float4(output.Geometry.WorldPosition, 1), ViewProjectionMatrix);
 
 	// Pass vertex attributes
 	output.Geometry.TexCoords01 = float4(input.TexCoord0, input.TexCoord1);
@@ -549,7 +549,7 @@ VertexOutput VS_Skinned(ModelInput_Skinned input)
 #if USE_POSITION_OFFSET
 	output.Geometry.WorldPosition += material.PositionOffset;
 	output.Geometry.PrevWorldPosition += material.PositionOffset;
-	output.Position = PROJECT_POINT(float4(output.Geometry.WorldPosition, 1), ViewProjectionMatrix);
+	output.Position = mul(float4(output.Geometry.WorldPosition, 1), ViewProjectionMatrix);
 #endif
 
 	// Get tessalation multiplier (per vertex)

Content/Editor/MaterialTemplates/Terrain.shader

@@ -388,7 +388,7 @@ VertexOutput VS(TerrainVertexInput input)
 	output.Geometry.WorldPosition = mul(float4(position, 1), worldMatrix).xyz;
 
 	// Compute clip space position
-	output.Position = PROJECT_POINT(float4(output.Geometry.WorldPosition, 1), ViewProjectionMatrix);
+	output.Position = mul(float4(output.Geometry.WorldPosition, 1), ViewProjectionMatrix);
 
 	// Pass vertex attributes
 #if USE_SMOOTH_LOD_TRANSITION
@@ -436,7 +436,7 @@ VertexOutput VS(TerrainVertexInput input)
 	// Apply world position offset per-vertex
 #if USE_POSITION_OFFSET
 	output.Geometry.WorldPosition += material.PositionOffset;
-	output.Position = PROJECT_POINT(float4(output.Geometry.WorldPosition, 1), ViewProjectionMatrix);
+	output.Position = mul(float4(output.Geometry.WorldPosition, 1), ViewProjectionMatrix);
 #endif
 
 	// Get tessalation multiplier (per vertex)

Content/Editor/MaterialTemplates/VolumeParticle.shader

@@ -8,7 +8,6 @@
 #include "./Flax/Common.hlsl"
 #include "./Flax/MaterialCommon.hlsl"
 #include "./Flax/GBufferCommon.hlsl"
-#include "./Flax/VolumetricFog.hlsl"
 @7
 
 // Primary constant buffer (with additional material parameters)
@@ -22,7 +21,6 @@ float Dummy0;
 float VolumetricFogMaxDistance;
 int ParticleStride;
 int ParticleIndex;
-float4 GridSliceParameters;
 @1META_CB_END
 
 // Particles attributes buffer
@@ -204,19 +202,19 @@ Material GetMaterialPS(MaterialInput input)
 META_PS(true, FEATURE_LEVEL_SM5)
 void PS_VolumetricFog(Quad_GS2PS input, out float4 VBufferA : SV_Target0, out float4 VBufferB : SV_Target1)
 {
-	// Reproject grid position back to the screen and world space
 	uint3 gridCoordinate = uint3(input.Vertex.Position.xy, input.LayerIndex);
 	float3 cellOffset = 0.5f;
 	float2 volumeUV = (gridCoordinate.xy + cellOffset.xy) / GridSize.xy;
-	float sceneDepth = GetDepthFromSlice(GridSliceParameters, gridCoordinate.z + cellOffset.z) / ViewFar;
+	float zSlice = gridCoordinate.z + cellOffset.z;
+	float sceneDepth = (zSlice / GridSize.z) * VolumetricFogMaxDistance / ViewFar;
 	float deviceDepth = (ViewInfo.w / sceneDepth) + ViewInfo.z;
 	float4 clipPos = float4(volumeUV * float2(2.0, -2.0) + float2(-1.0, 1.0), deviceDepth, 1.0);
 	float4 wsPos = mul(clipPos, InverseViewProjectionMatrix);
-	wsPos.xyz /= wsPos.w;
+	float3 positionWS = wsPos.xyz / wsPos.w;
 
 	// Get material parameters
 	MaterialInput materialInput = (MaterialInput)0;
-	materialInput.WorldPosition = wsPos.xyz;
+	materialInput.WorldPosition = positionWS;
 	materialInput.TexCoord = input.Vertex.TexCoord;
 	materialInput.ParticleIndex = ParticleIndex;
 	materialInput.TBN = float3x3(float3(1, 0, 0), float3(0, 1, 0), float3(0, 0, 1));
@@ -227,10 +225,9 @@ void PS_VolumetricFog(Quad_GS2PS input, out float4 VBufferA : SV_Target0, out fl
 	Material material = GetMaterialPS(materialInput);
 
 	// Compute fog properties
-	material.Opacity *= material.Mask;
 	float3 albedo = material.Color;
-	float extinction = material.Opacity * 0.001f;
+	float extinction = material.Opacity * material.Mask * 0.001f;
-	float3 emission = material.Emissive * material.Opacity;
+	float3 emission = material.Emissive;
 	float3 scattering = albedo * extinction;
 	float absorption = max(0.0f, extinction - Luminance(scattering));
 

Content/Shaders/GI/GlobalSurfaceAtlas.flax

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:615dff65b01507be6c4de722e126324aba20fc197f8e12dafaa94a05e46cba6e
+oid sha256:0f34bf867df5f4296ca66ac691c2bca4efa168fb9e21ca4e613e8086669575cf
-size 13222
+size 13296

Content/Shaders/VolumetricFog.flax

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:706adde844360c2b0e65ecabaf1d2e2cc4eb4ac7ca9d483d0dd04ec8163b3d97
+oid sha256:872ac3560279bfd0aeb989ebac1b49750dd142b985bc40058888dfd2b63fe9b2
-size 13081
+size 13214

Flax.flaxproj

@@ -2,18 +2,17 @@
   "Name": "Flax",
   "Version": {
     "Major": 1,
-    "Minor": 12,
+    "Minor": 11,
     "Revision": 0,
-    "Build": 6908
+    "Build": 6805
   },
   "Company": "Flax",
-  "Copyright": "Copyright (c) 2012-2026 Wojciech Figat. All rights reserved.",
+  "Copyright": "Copyright (c) 2012-2025 Wojciech Figat. All rights reserved.",
   "GameTarget": "FlaxGame",
   "EditorTarget": "FlaxEditor",
   "Configuration": {
     "UseCSharp": true,
     "UseLargeWorlds": false,
-    "UseDotNet": true,
+    "UseDotNet": true
-    "UseSDL": true
   }
 }

Flax.sln.DotSettings

@@ -188,7 +188,7 @@
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE/@EntryValue">False</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_SIMPLE_ACCESSOR_ATTRIBUTE_ON_SAME_LINE/@EntryValue">False</s:Boolean>
-	
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_SIMPLE_CASE_STATEMENT_ON_SAME_LINE/@EntryValue">ALWAYS</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_SIMPLE_EMBEDDED_STATEMENT_ON_SAME_LINE/@EntryValue">NEVER</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SIMPLE_CASE_STATEMENT_STYLE/@EntryValue">ON_SINGLE_LINE</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_AFTER_TYPECAST_PARENTHESES/@EntryValue">False</s:Boolean>

Source/Editor/Content/Import/TextureImportEntry.cs

@@ -187,11 +187,6 @@ namespace FlaxEditor.Content.Import
                 // Glossiness, metalness, ambient occlusion, displacement, height, cavity or specular
                 _settings.Settings.Type = TextureFormatType.GrayScale;
             }
-            else if (_settings.Settings.Type == TextureFormatType.ColorRGB)
-            {
-                // Blind guess that common color texture is sRGB
-                _settings.Settings.sRGB = true;
-            }
 
             // Try to restore target asset texture import options (useful for fast reimport)
             Editor.TryRestoreImportOptions(ref _settings.Settings, ResultUrl);

Source/Editor/Content/Items/ContentFolder.cs

@@ -282,7 +282,7 @@ namespace FlaxEditor.Content
 
             if (data is DragDataFiles)
                 return DragDropEffect.Copy;
-            return _dragOverItems?.Effect ?? DragDropEffect.None;
+            return _dragOverItems.Effect;
         }
 
         /// <inheritdoc />

Source/Editor/Content/Items/CppScriptItem.cs

@@ -20,7 +20,7 @@ namespace FlaxEditor.Content
         }
 
         /// <inheritdoc />
-        public override string TypeDescription => Path.EndsWith(".h") || Path.EndsWith(".hpp") ? "C++ Header File" : "C++ Source Code";
+        public override string TypeDescription => Path.EndsWith(".h") ? "C++ Header File" : "C++ Source Code";
 
         /// <inheritdoc />
         public override SpriteHandle DefaultThumbnail => Editor.Instance.Icons.CPPScript128;

Source/Editor/Content/Thumbnails/ThumbnailsModule.cs

@@ -45,8 +45,6 @@ namespace FlaxEditor.Content.Thumbnails
         {
             if (item == null)
                 throw new ArgumentNullException();
-            if (_task == null)
-                return;
 
             // Check if use default icon
             var defaultThumbnail = item.DefaultThumbnail;
@@ -225,12 +223,11 @@ namespace FlaxEditor.Content.Thumbnails
         /// <inheritdoc />
         public override void OnInit()
         {
-            if (Editor.IsHeadlessMode || (GPUDevice.Instance != null && GPUDevice.Instance.RendererType == RendererType.Null))
-                return;
-
             // Create cache folder
             if (!Directory.Exists(_cacheFolder))
+            {
                 Directory.CreateDirectory(_cacheFolder);
+            }
 
             // Find atlases in a Editor cache directory
             var files = Directory.GetFiles(_cacheFolder, "cache_*.flax", SearchOption.TopDirectoryOnly);
@@ -485,7 +482,7 @@ namespace FlaxEditor.Content.Thumbnails
         public override void OnUpdate()
         {
             // Wait some frames before start generating previews (late init feature)
-            if (Time.TimeSinceStartup < 1.0f || HasAllAtlasesLoaded() == false || _task == null)
+            if (Time.TimeSinceStartup < 1.0f || HasAllAtlasesLoaded() == false)
                 return;
 
             lock (_requests)

Source/Editor/Cooker/CookingData.h

@@ -141,11 +141,6 @@ API_ENUM() enum class BuildPlatform
     /// </summary>
     API_ENUM(Attributes="EditorDisplay(null, \"Windows ARM64\")")
     WindowsARM64 = 15,
-
-    /// <summary>
-    /// Web
-    /// </summary>
-    Web = 16,
 };
 
 /// <summary>
@@ -193,11 +188,6 @@ enum class DotNetAOTModes
     /// Use Mono AOT to cross-compile all used C# assemblies into native platform static libraries which can be linked into a single shared library.
     /// </summary>
     MonoAOTStatic,
-
-    /// <summary>
-    /// Target platform doesn't support .NET or it has been disabled.
-    /// </summary>
-    NoDotnet,
 };
 
 extern FLAXENGINE_API const Char* ToString(const BuildPlatform platform);

Source/Editor/Cooker/GameCooker.cpp

@@ -69,10 +69,6 @@
 #include "Platform/iOS/iOSPlatformTools.h"
 #include "Engine/Platform/iOS/iOSPlatformSettings.h"
 #endif
-#if PLATFORM_TOOLS_WEB
-#include "Platform/Web/WebPlatformTools.h"
-#include "Engine/Platform/Web/WebPlatformSettings.h"
-#endif
 
 namespace GameCookerImpl
 {
@@ -155,8 +151,6 @@ const Char* ToString(const BuildPlatform platform)
         return TEXT("iOS ARM64");
     case BuildPlatform::WindowsARM64:
         return TEXT("Windows ARM64");
-    case BuildPlatform::Web:
-        return TEXT("Web");
     default:
         return TEXT("");
     }
@@ -189,8 +183,6 @@ const Char* ToString(const DotNetAOTModes mode)
         return TEXT("MonoAOTDynamic");
     case DotNetAOTModes::MonoAOTStatic:
         return TEXT("MonoAOTStatic");
-    case DotNetAOTModes::NoDotnet:
-        return TEXT("NoDotnet");
     default:
         return TEXT("");
     }
@@ -315,10 +307,6 @@ void CookingData::GetBuildPlatformName(const Char*& platform, const Char*& archi
         platform = TEXT("Windows");
         architecture = TEXT("ARM64");
         break;
-    case BuildPlatform::Web:
-        platform = TEXT("Web");
-        architecture = TEXT("x86");
-        break;
     default:
         LOG(Fatal, "Unknown or unsupported build platform.");
     }
@@ -473,11 +461,6 @@ PlatformTools* GameCooker::GetTools(BuildPlatform platform)
         case BuildPlatform::iOSARM64:
             result = New<iOSPlatformTools>();
             break;
-#endif
-#if PLATFORM_TOOLS_WEB
-        case BuildPlatform::Web:
-            result = New<WebPlatformTools>();
-            break;
 #endif
         }
         Tools.Add(platform, result);
@@ -621,9 +604,6 @@ void GameCooker::GetCurrentPlatform(PlatformType& platform, BuildPlatform& build
     case PlatformType::iOS:
         buildPlatform = BuildPlatform::iOSARM64;
         break;
-    case PlatformType::Web:
-        buildPlatform = BuildPlatform::Web;
-        break;
     default: ;
     }
 }

Source/Editor/Cooker/GameCooker.cs

@@ -106,7 +106,6 @@ namespace FlaxEditor
             case BuildPlatform.MacOSARM64:
             case BuildPlatform.MacOSx64: return PlatformType.Mac;
             case BuildPlatform.iOSARM64: return PlatformType.iOS;
-            case BuildPlatform.Web: return PlatformType.Web;
             default: throw new ArgumentOutOfRangeException(nameof(buildPlatform), buildPlatform, null);
             }
         }

Source/Editor/Cooker/Platform/Android/AndroidPlatformTools.cpp

@@ -138,7 +138,6 @@ Array<byte> AndroidPlatformTools::SaveCache(CookingData& data, IBuildCache* cach
     result.Add((const byte*)&platformCache, sizeof(platformCache));
     return result;
 }
-
 void AndroidPlatformTools::OnBuildStarted(CookingData& data)
 {
     // Adjust the cooking output folder to be located inside the Gradle assets directory
@@ -412,6 +411,7 @@ bool AndroidPlatformTools::OnPostProcess(CookingData& data)
         return true;
     }
     LOG(Info, "Output Android APK application package: {0} (size: {1} MB)", outputApk, FileSystem::GetFileSize(outputApk) / 1024 / 1024);
+    
 
     return false;
 }

Source/Editor/Cooker/Platform/Web/WebPlatformTools.cpp

@@ -1,271 +0,0 @@
-// Copyright (c) Wojciech Figat. All rights reserved.
-
-#if PLATFORM_TOOLS_WEB
-
-#include "WebPlatformTools.h"
-#include "Engine/Platform/File.h"
-#include "Engine/Platform/FileSystem.h"
-#include "Engine/Platform/CreateProcessSettings.h"
-#include "Engine/Platform/Web/WebPlatformSettings.h"
-#include "Engine/Core/Types/Span.h"
-#include "Engine/Core/Math/Vector2.h"
-#include "Engine/Core/Config/GameSettings.h"
-#include "Engine/Core/Config/BuildSettings.h"
-#include "Engine/Content/Content.h"
-#include "Engine/Content/JsonAsset.h"
-#include "Engine/Graphics/PixelFormatExtensions.h"
-#include "Engine/Graphics/Textures/TextureBase.h"
-#include "Editor/Cooker/GameCooker.h"
-
-IMPLEMENT_SETTINGS_GETTER(WebPlatformSettings, WebPlatform);
-
-namespace
-{
-    struct WebPlatformCache
-    {
-        WebPlatformSettings::TextureCompression TexturesCompression;
-    };
-}
-
-const Char* WebPlatformTools::GetDisplayName() const
-{
-    return TEXT("Web");
-}
-
-const Char* WebPlatformTools::GetName() const
-{
-    return TEXT("Web");
-}
-
-PlatformType WebPlatformTools::GetPlatform() const
-{
-    return PlatformType::Web;
-}
-
-ArchitectureType WebPlatformTools::GetArchitecture() const
-{
-    return ArchitectureType::x86;
-}
-
-DotNetAOTModes WebPlatformTools::UseAOT() const
-{
-    return DotNetAOTModes::MonoAOTDynamic;//MonoAOTStatic;// DotNetAOTModes::None;//DotNetAOTModes::MonoAOTStatic;//DotNetAOTModes::NoDotnet;
-}
-
-PixelFormat WebPlatformTools::GetTextureFormat(CookingData& data, TextureBase* texture, PixelFormat format)
-{
-    const auto platformSettings = WebPlatformSettings::Get();
-    const auto uncompressed = PixelFormatExtensions::FindUncompressedFormat(format);
-    switch (platformSettings->TexturesCompression)
-    {
-    case WebPlatformSettings::TextureCompression::Uncompressed:
-        return uncompressed;
-    case WebPlatformSettings::TextureCompression::BC:
-        return format;
-    case WebPlatformSettings::TextureCompression::ASTC:
-        switch (format)
-        {
-        case PixelFormat::BC4_SNorm:
-            return PixelFormat::R8_SNorm;
-        case PixelFormat::BC5_SNorm:
-            return PixelFormat::R16G16_SNorm;
-        case PixelFormat::BC6H_Typeless:
-        case PixelFormat::BC6H_Uf16:
-        case PixelFormat::BC6H_Sf16:
-        case PixelFormat::BC7_Typeless:
-        case PixelFormat::BC7_UNorm:
-        case PixelFormat::BC7_UNorm_sRGB:
-            return PixelFormat::R16G16B16A16_Float; // TODO: ASTC HDR
-        default:
-            return PixelFormatExtensions::IsSRGB(format) ? PixelFormat::ASTC_6x6_UNorm_sRGB : PixelFormat::ASTC_6x6_UNorm;
-        }
-    case WebPlatformSettings::TextureCompression::Basis:
-        switch (format)
-        {
-        case PixelFormat::BC7_Typeless:
-        case PixelFormat::BC7_UNorm:
-        case PixelFormat::BC7_UNorm_sRGB:
-            return PixelFormat::R16G16B16A16_Float; // Basic Universal doesn't support alpha in BC7 (and it can be loaded only from LDR formats)
-        default:
-            if (uncompressed != format && texture->Size().MinValue() >= 16)
-                return PixelFormat::Basis;
-            return uncompressed;
-        }
-    default:
-        return format;
-    }
-}
-
-void WebPlatformTools::LoadCache(CookingData& data, IBuildCache* cache, const Span<byte>& bytes)
-{
-    const auto platformSettings = WebPlatformSettings::Get();
-    bool invalidTextures = true;
-    if (bytes.Length() == sizeof(WebPlatformCache))
-    {
-        auto* platformCache = (WebPlatformCache*)bytes.Get();
-        invalidTextures = platformCache->TexturesCompression != platformSettings->TexturesCompression;
-    }
-    if (invalidTextures)
-    {
-        LOG(Info, "{0} option has been modified.", TEXT("TexturesQuality"));
-        cache->InvalidateCacheTextures();
-    }
-}
-
-Array<byte> WebPlatformTools::SaveCache(CookingData& data, IBuildCache* cache)
-{
-    const auto platformSettings = WebPlatformSettings::Get();
-    WebPlatformCache platformCache;
-    platformCache.TexturesCompression = platformSettings->TexturesCompression;
-    Array<byte> result;
-    result.Add((const byte*)&platformCache, sizeof(platformCache));
-    return result;
-}
-
-bool WebPlatformTools::IsNativeCodeFile(CookingData& data, const String& file)
-{
-    String extension = FileSystem::GetExtension(file);
-    return extension.IsEmpty() || extension == TEXT("html") || extension == TEXT("js") || extension == TEXT("wasm");
-}
-
-void WebPlatformTools::OnBuildStarted(CookingData& data)
-{
-    // Adjust the cooking output folder for the data files so file_packager tool can compress and output final data inside the cooker output folder
-    data.DataOutputPath = data.CacheDirectory / TEXT("Files");
-}
-
-bool WebPlatformTools::OnPostProcess(CookingData& data)
-{
-    const auto gameSettings = GameSettings::Get();
-    const auto platformSettings = WebPlatformSettings::Get();
-    const auto platformDataPath = data.GetPlatformBinariesRoot();
-
-    // Get name of the output binary (JavaScript and WebAssembly files match)
-    String gameJs;
-    {
-        Array<String> files;
-        FileSystem::DirectoryGetFiles(files, data.OriginalOutputPath, TEXT("*"), DirectorySearchOption::TopDirectoryOnly);
-        for (const String& file : files)
-        {
-            if (file.EndsWith(TEXT(".js")))
-            {
-                String outputWasm = String(StringUtils::GetPathWithoutExtension(file)) + TEXT(".wasm");
-                if (files.Contains(outputWasm))
-                {
-                    gameJs = file;
-                    break;
-                }
-            }
-        }
-    }
-    if (gameJs.IsEmpty())
-    {
-        data.Error(TEXT("Failed to find the main JavaScript for the output game"));
-        return true;
-    }
-
-    // Move .wasm assemblies into the data files in order for dlopen to work (blocking)
-    {
-        Array<String> files, files2;
-        FileSystem::DirectoryGetFiles(files, data.OriginalOutputPath, TEXT("*.wasm"), DirectorySearchOption::AllDirectories);
-        FileSystem::DirectoryGetFiles(files, data.OriginalOutputPath, TEXT("*.so"), DirectorySearchOption::AllDirectories);
-        StringView gameWasm = StringUtils::GetFileNameWithoutExtension(gameJs);
-        for (const String& file : files)
-        {
-            if (StringUtils::GetFileNameWithoutExtension(file) == gameWasm)
-                continue; // Skip the main game module
-            FileSystem::MoveFile(data.DataOutputPath / StringUtils::GetFileName(file), file, true);
-        }
-        for (const String& file : files2)
-        {
-            if (StringUtils::GetFileNameWithoutExtension(file) == gameWasm)
-                continue; // Skip the main game module
-            FileSystem::MoveFile(data.DataOutputPath / StringUtils::GetFileName(file), file, true);
-        }
-    }
-
-    // Pack data files into a single file using Emscripten's file_packager tool
-    {
-        CreateProcessSettings procSettings;
-        String emscriptenSdk = TEXT("EMSDK");
-        Platform::GetEnvironmentVariable(emscriptenSdk, emscriptenSdk);
-        procSettings.FileName = emscriptenSdk / TEXT("upstream/emscripten/tools/file_packager");
-#if PLATFORM_WIN32
-        procSettings.FileName += TEXT(".bat");
-#endif
-        procSettings.Arguments = String::Format(TEXT("files.data --preload \"{}@/\" --lz4 --js-output=files.js"), data.DataOutputPath);
-        procSettings.WorkingDirectory = data.OriginalOutputPath;
-        const int32 result = Platform::CreateProcess(procSettings);
-        if (result != 0)
-        {
-            if (!FileSystem::FileExists(procSettings.FileName))
-                data.Error(TEXT("Missing file_packager.bat. Ensure Emscripten SDK installation is valid and 'EMSDK' environment variable points to it."));
-            data.Error(String::Format(TEXT("Failed to package project files (result code: {0}). See log for more info."), result));
-            return true;
-        }
-    }
-
-    // Copy icon file
-    {
-        String dstIcon = data.OriginalOutputPath / TEXT("favicon.ico");
-        if (!FileSystem::FileExists(dstIcon))
-            FileSystem::CopyFile(dstIcon, platformDataPath / TEXT("favicon.ico"));
-    }
-
-    // TODO: customizable HTML templates
-
-    // Insert packaged file system with game data
-    {
-        String gameJsText;
-        if (File::ReadAllText(gameJs, gameJsText))
-        {
-            data.Error(String::Format(TEXT("Failed to load file '{}'"), gameJs));
-            return true;
-        }
-        const String filesIncludeBegin = TEXT("// include: files.js");
-        const String filesIncludeEnd = TEXT("// end include: files.js");
-        String fileJs = data.OriginalOutputPath / TEXT("files.js");
-        if (!gameJsText.Contains(filesIncludeBegin))
-        {
-            // Insert generated files.js into the main game file after the minimum_runtime_check.js include
-            String fileJsText;
-            if (File::ReadAllText(fileJs, fileJsText))
-            {
-                data.Error(String::Format(TEXT("Failed to load file '{}'"), fileJs));
-                return true;
-            }
-            const String insertPrefixLocation = TEXT("// end include: minimum_runtime_check.js");
-            int32 location = gameJsText.Find(insertPrefixLocation);
-            if (location != -1)
-            {
-                location += insertPrefixLocation.Length() + 1;
-                fileJsText = filesIncludeBegin + TEXT("\n") + fileJsText + TEXT("\n") + filesIncludeEnd + TEXT("\n");
-                gameJsText.Insert(location, fileJsText);
-            }
-            else
-            {
-                // Comments are missing in Release when JS/HTML are minified
-                fileJsText.Insert(0, filesIncludeBegin);
-                fileJsText.Insert(0, TEXT("\n"));
-                gameJsText.Insert(0, fileJsText);
-            }
-            File::WriteAllText(gameJs, gameJsText, Encoding::UTF8);
-        }
-
-        // Remove the generated files.js as it's now included in the main game JS file
-        FileSystem::DeleteFile(fileJs);
-    }
-
-    const auto buildSettings = BuildSettings::Get();
-    if (buildSettings->SkipPackaging)
-        return false;
-    GameCooker::PackageFiles();
-
-    // TODO: minify/compress output JS files (in Release builds)
-
-    LOG(Info, "Output website size: {0} MB", FileSystem::GetDirectorySize(data.OriginalOutputPath) / 1024 / 1024);
-
-    return false;
-}
-
-#endif

Source/Editor/Cooker/Platform/Web/WebPlatformTools.h

@@ -1,29 +0,0 @@
-// Copyright (c) Wojciech Figat. All rights reserved.
-
-#pragma once
-
-#if PLATFORM_TOOLS_WEB
-
-#include "../../PlatformTools.h"
-
-/// <summary>
-/// The Web platform support tools.
-/// </summary>
-class WebPlatformTools : public PlatformTools
-{
-public:
-    // [PlatformTools]
-    const Char* GetDisplayName() const override;
-    const Char* GetName() const override;
-    PlatformType GetPlatform() const override;
-    ArchitectureType GetArchitecture() const override;
-    DotNetAOTModes UseAOT() const override;
-    PixelFormat GetTextureFormat(CookingData& data, TextureBase* texture, PixelFormat format) override;
-    void LoadCache(CookingData& data, IBuildCache* cache, const Span<byte>& bytes) override;
-    Array<byte> SaveCache(CookingData& data, IBuildCache* cache) override;
-    bool IsNativeCodeFile(CookingData& data, const String& file) override;
-    void OnBuildStarted(CookingData& data) override;
-    bool OnPostProcess(CookingData& data) override;
-};
-
-#endif

Source/Editor/Cooker/Steps/CookAssetsStep.cpp

@@ -572,14 +572,6 @@ bool ProcessShaderBase(CookAssetsStep::AssetCookData& data, ShaderAssetBase* ass
         COMPILE_PROFILE(Vulkan_SM5, SHADER_FILE_CHUNK_INTERNAL_VULKAN_SM5_CACHE);
         break;
     }
-#endif
-#if PLATFORM_TOOLS_WEB
-    case BuildPlatform::Web:
-    {
-        const char* platformDefineName = "PLATFORM_WEB";
-        COMPILE_PROFILE(WebGPU, SHADER_FILE_CHUNK_INTERNAL_GENERIC_CACHE);
-        break;
-    }
 #endif
     default:
     {
@@ -742,8 +734,37 @@ bool ProcessTextureBase(CookAssetsStep::AssetCookData& data)
     {
         auto chunk = New<FlaxChunk>();
         data.InitData.Header.Chunks[mipIndex] = chunk;
-        if (TextureTool::WriteTextureData(chunk->Data, *textureData, mipIndex))
+
-            return true;
+        // Calculate the texture data storage layout
+        uint32 rowPitch, slicePitch;
+        const int32 mipWidth = Math::Max(1, textureData->Width >> mipIndex);
+        const int32 mipHeight = Math::Max(1, textureData->Height >> mipIndex);
+        RenderTools::ComputePitch(textureData->Format, mipWidth, mipHeight, rowPitch, slicePitch);
+        chunk->Data.Allocate(slicePitch * textureData->GetArraySize());
+
+        // Copy array slices into mip data (sequential)
+        for (int32 arrayIndex = 0; arrayIndex < textureData->Items.Count(); arrayIndex++)
+        {
+            auto& mipData = textureData->Items[arrayIndex].Mips[mipIndex];
+            byte* src = mipData.Data.Get();
+            byte* dst = chunk->Data.Get() + (slicePitch * arrayIndex);
+
+            // Faster path if source and destination data layout matches
+            if (rowPitch == mipData.RowPitch && slicePitch == mipData.DepthPitch)
+            {
+                Platform::MemoryCopy(dst, src, slicePitch);
+            }
+            else
+            {
+                const auto copyRowSize = Math::Min(mipData.RowPitch, rowPitch);
+                for (uint32 line = 0; line < mipData.Lines; line++)
+                {
+                    Platform::MemoryCopy(dst, src, copyRowSize);
+                    src += mipData.RowPitch;
+                    dst += rowPitch;
+                }
+            }
+        }
     }
 
     // Clone any custom asset chunks (eg. sprite atlas data, mips are in 0-13 chunks)

Source/Editor/Cooker/Steps/DeployDataStep.cpp

@@ -39,23 +39,17 @@ bool DeployDataStep::Perform(CookingData& data)
     }
     String dstDotnet = data.DataOutputPath / TEXT("Dotnet");
     const DotNetAOTModes aotMode = data.Tools->UseAOT();
-    const bool usAOT = aotMode != DotNetAOTModes::None && aotMode != DotNetAOTModes::NoDotnet;
+    const bool usAOT = aotMode != DotNetAOTModes::None;
     if (usAOT)
     {
         // Deploy Dotnet files into intermediate cooking directory for AOT
         FileSystem::DeleteDirectory(dstDotnet);
         dstDotnet = data.ManagedCodeOutputPath;
     }
-    if (aotMode == DotNetAOTModes::NoDotnet)
+    if (buildSettings.SkipDotnetPackaging && data.Tools->UseSystemDotnet())
-    {
-        // No .NET
-        FileSystem::DeleteDirectory(dstDotnet);
-    }
-    else if (buildSettings.SkipDotnetPackaging && data.Tools->UseSystemDotnet())
     {
         // Use system-installed .NET Runtime
         FileSystem::DeleteDirectory(dstDotnet);
-        LOG(Info, "Not using .NET Runtime");
     }
     else
     {

Source/Editor/Cooker/Steps/PrecompileAssembliesStep.cpp

@@ -12,9 +12,7 @@
 void PrecompileAssembliesStep::OnBuildStarted(CookingData& data)
 {
     const DotNetAOTModes aotMode = data.Tools->UseAOT();
-    if (aotMode == DotNetAOTModes::None || 
+    if (aotMode == DotNetAOTModes::None || EnumHasAllFlags(data.Options, BuildOptions::NoCook))
-        aotMode == DotNetAOTModes::NoDotnet || 
-        EnumHasAllFlags(data.Options, BuildOptions::NoCook))
         return;
     const auto& buildSettings = *BuildSettings::Get();
 
@@ -37,8 +35,8 @@ void PrecompileAssembliesStep::OnBuildStarted(CookingData& data)
         if (cachedData != aotModeCacheValue)
         {
             LOG(Info, "AOT cache invalidation");
-            //FileSystem::DeleteDirectory(data.ManagedCodeOutputPath); // Remove AOT cache
+            FileSystem::DeleteDirectory(data.ManagedCodeOutputPath); // Remove AOT cache
-            //FileSystem::DeleteDirectory(data.DataOutputPath / TEXT("Dotnet")); // Remove deployed Dotnet libs (be sure to remove any leftovers from previous build)
+            FileSystem::DeleteDirectory(data.DataOutputPath / TEXT("Dotnet")); // Remove deployed Dotnet libs (be sure to remove any leftovers from previous build)
         }
     }
     if (!FileSystem::DirectoryExists(data.ManagedCodeOutputPath))
@@ -51,8 +49,7 @@ void PrecompileAssembliesStep::OnBuildStarted(CookingData& data)
 bool PrecompileAssembliesStep::Perform(CookingData& data)
 {
     const DotNetAOTModes aotMode = data.Tools->UseAOT();
-    if (aotMode == DotNetAOTModes::None ||
+    if (aotMode == DotNetAOTModes::None)
-        aotMode == DotNetAOTModes::NoDotnet)
         return false;
     const auto& buildSettings = *BuildSettings::Get();
     if (buildSettings.SkipDotnetPackaging && data.Tools->UseSystemDotnet())

Source/Editor/CustomEditors/Dedicated/EnvironmentProbeEditor.cs

@@ -21,12 +21,10 @@ namespace FlaxEditor.CustomEditors.Dedicated
 
             if (Values.HasDifferentTypes == false)
             {
-                var group = layout.Group("Probe");
+                var group = layout.Group("Bake");
                 group.Panel.ItemsMargin = new Margin(Utilities.Constants.UIMargin * 2);
                 _bake = group.Button("Bake").Button;
                 _bake.Clicked += BakeButtonClicked;
-                var view = group.Button("View", "Opens the probe texture viewer");
-                view.Button.Clicked += OnViewButtonClicked;
             }
         }
 
@@ -52,14 +50,5 @@ namespace FlaxEditor.CustomEditors.Dedicated
                 }
             }
         }
-
-        private void OnViewButtonClicked()
-        {
-            foreach (var value in Values)
-            {
-                if (value is EnvironmentProbe probe && probe.ProbeAsset)
-                    Editor.Instance.ContentEditing.Open(probe.ProbeAsset);
-            }
-        }
     }
 }

Source/Editor/CustomEditors/Dedicated/LocalizationSettingsEditor.cs

@@ -190,12 +190,12 @@ namespace FlaxEditor.CustomEditors.Dedicated
                     foreach (var file in files)
                         FindNewKeysCSharp(file, newKeys, allKeys);
 
-                    // C/C++
+                    // C++
-                    files = Directory.GetFiles(Globals.ProjectSourceFolder, "*.cpp", SearchOption.AllDirectories).Concat(Directory.GetFiles(Globals.ProjectSourceFolder, "*.c", SearchOption.AllDirectories)).ToArray();
+                    files = Directory.GetFiles(Globals.ProjectSourceFolder, "*.cpp", SearchOption.AllDirectories);
                     filesCount += files.Length;
                     foreach (var file in files)
                         FindNewKeysCpp(file, newKeys, allKeys);
-                    files = Directory.GetFiles(Globals.ProjectSourceFolder, "*.h", SearchOption.AllDirectories).Concat(Directory.GetFiles(Globals.ProjectSourceFolder, "*.hpp", SearchOption.AllDirectories)).ToArray();
+                    files = Directory.GetFiles(Globals.ProjectSourceFolder, "*.h", SearchOption.AllDirectories);
                     filesCount += files.Length;
                     foreach (var file in files)
                         FindNewKeysCpp(file, newKeys, allKeys);

Source/Editor/CustomEditors/Dedicated/NavMeshBoundsVolumeEditor.cs

@@ -1,38 +0,0 @@
-// Copyright (c) Wojciech Figat. All rights reserved.
-
-using FlaxEngine;
-
-namespace FlaxEditor.CustomEditors.Dedicated
-{
-    /// <summary>
-    /// Custom editor for <see cref="NavMeshBoundsVolume"/>.
-    /// </summary>
-    /// <seealso cref="ActorEditor" />
-    [CustomEditor(typeof(NavMeshBoundsVolume)), DefaultEditor]
-    internal class NavMeshBoundsVolumeEditor : ActorEditor
-    {
-        /// <inheritdoc />
-        public override void Initialize(LayoutElementsContainer layout)
-        {
-            base.Initialize(layout);
-
-            if (Values.HasDifferentTypes == false)
-            {
-                var button = layout.Button("Build");
-                button.Button.Clicked += OnBuildClicked;
-            }
-        }
-
-        private void OnBuildClicked()
-        {
-            foreach (var value in Values)
-            {
-                if (value is NavMeshBoundsVolume volume)
-                {
-                    Navigation.BuildNavMesh(volume.Box, volume.Scene);
-                    Editor.Instance.Scene.MarkSceneEdited(volume.Scene);
-                }
-            }
-        }
-    }
-}

Source/Editor/CustomEditors/Dedicated/RigidBodyEditor.cs

@@ -1,6 +1,7 @@
 // Copyright (c) Wojciech Figat. All rights reserved.
 
 using System.Collections.Generic;
+using System.Reflection.Emit;
 using FlaxEditor.CustomEditors.GUI;
 using FlaxEngine;
 using FlaxEngine.GUI;

Source/Editor/CustomEditors/Dedicated/ScriptsEditor.cs

@@ -103,12 +103,11 @@ namespace FlaxEditor.CustomEditors.Dedicated
                     var actors = ScriptsEditor.ParentEditor.Values;
                     foreach (var a in actors)
                     {
-                        if (a.GetType() == requireActor.RequiredType)
+                        if (a.GetType() != requireActor.RequiredType)
-                            continue;
+                        {
-                        if (requireActor.IncludeInheritedTypes && a.GetType().IsSubclassOf(requireActor.RequiredType))
+                            item.Enabled = false;
-                            continue;
+                            break;
-                        item.Enabled = false;
+                        }
-                        break;
                     }
                 }
                 cm.AddItem(item);
@@ -740,8 +739,6 @@ namespace FlaxEditor.CustomEditors.Dedicated
         /// <inheritdoc />
         public override void Initialize(LayoutElementsContainer layout)
         {
-            var style = FlaxEngine.GUI.Style.Current;
-
             // Area for drag&drop scripts
             var dragArea = layout.CustomContainer<DragAreaControl>();
             dragArea.CustomControl.ScriptsEditor = this;
@@ -803,10 +800,17 @@ namespace FlaxEditor.CustomEditors.Dedicated
                 bool hasAllRequirements = true;
                 if (scriptType.HasAttribute(typeof(RequireScriptAttribute), false))
                 {
-                    var attribute = (RequireScriptAttribute)scriptType.GetAttributes(false).FirstOrDefault(x => x is RequireScriptAttribute);
+                    RequireScriptAttribute scriptAttribute = null;
-                    if (attribute != null)
+                    foreach (var e in scriptType.GetAttributes(false))
                     {
-                        foreach (var type in attribute.RequiredTypes)
+                        if (e is not RequireScriptAttribute requireScriptAttribute)
+                            continue;
+                        scriptAttribute = requireScriptAttribute;
+                    }
+
+                    if (scriptAttribute != null)
+                    {
+                        foreach (var type in scriptAttribute.RequiredTypes)
                         {
                             if (!type.IsSubclassOf(typeof(Script)))
                                 continue;
@@ -821,11 +825,19 @@ namespace FlaxEditor.CustomEditors.Dedicated
                 }
                 if (scriptType.HasAttribute(typeof(RequireActorAttribute), false))
                 {
-                    var attribute = (RequireActorAttribute)scriptType.GetAttributes(false).FirstOrDefault(x => x is RequireActorAttribute);
+                    RequireActorAttribute attribute = null;
+                    foreach (var e in scriptType.GetAttributes(false))
+                    {
+                        if (e is not RequireActorAttribute requireActorAttribute)
+                            continue;
+                        attribute = requireActorAttribute;
+                        break;
+                    }
+
                     if (attribute != null)
                     {
                         var actor = script.Actor;
-                        if (actor.GetType() != attribute.RequiredType && (attribute.IncludeInheritedTypes && !actor.GetType().IsSubclassOf(attribute.RequiredType)))
+                        if (actor.GetType() != attribute.RequiredType && !actor.GetType().IsSubclassOf(attribute.RequiredType))
                         {
                             Editor.LogWarning($"`{Utilities.Utils.GetPropertyNameUI(scriptType.Name)}` on `{script.Actor}` is missing a required Actor of type `{attribute.RequiredType}`.");
                             hasAllRequirements = false;
@@ -838,7 +850,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
                 var title = Utilities.Utils.GetPropertyNameUI(scriptType.Name);
                 var group = layout.Group(title, editor);
                 if (!hasAllRequirements)
-                    group.Panel.HeaderTextColor = style.Statusbar.Failed;
+                    group.Panel.HeaderTextColor = FlaxEngine.GUI.Style.Current.Statusbar.Failed;
                 if ((Presenter.Features & FeatureFlags.CacheExpandedGroups) != 0)
                 {
                     if (Editor.Instance.ProjectCache.IsGroupToggled(title))
@@ -851,10 +863,9 @@ namespace FlaxEditor.CustomEditors.Dedicated
                     group.Panel.Open();
 
                 // Customize
-                float totalHeaderButtonsOffset = 0f;
                 group.Panel.TooltipText = Editor.Instance.CodeDocs.GetTooltip(scriptType);
                 if (script.HasPrefabLink)
-                    group.Panel.HeaderTextColor = style.ProgressNormal;
+                    group.Panel.HeaderTextColor = FlaxEngine.GUI.Style.Current.ProgressNormal;
 
                 // Add toggle button to the group
                 var headerHeight = group.Panel.HeaderHeight;
@@ -878,7 +889,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
                     TooltipText = "Script reference.",
                     AutoFocus = true,
                     IsScrollable = false,
-                    Color = style.ForegroundGrey,
+                    Color = FlaxEngine.GUI.Style.Current.ForegroundGrey,
                     Parent = group.Panel,
                     Bounds = new Rectangle(scriptToggle.Right, 0.5f, headerHeight, headerHeight),
                     Margin = new Margin(1),
@@ -897,35 +908,9 @@ namespace FlaxEditor.CustomEditors.Dedicated
                 var settingsButton = group.AddSettingsButton();
                 settingsButton.Tag = script;
                 settingsButton.Clicked += OnSettingsButtonClicked;
-                totalHeaderButtonsOffset += settingsButton.Width + FlaxEditor.Utilities.Constants.UIMargin;
 
-                // Add script obsolete icon to the group
+                group.Panel.HeaderTextMargin = new Margin(scriptDrag.Right - 12, 15, 2, 2);
-                if (scriptType.HasAttribute(typeof(ObsoleteAttribute), false))
-                {
-                    var attribute = (ObsoleteAttribute)scriptType.GetAttributes(false).First(x => x is ObsoleteAttribute);
-                    var tooltip = "Script marked as obsolete." +
-                        (string.IsNullOrEmpty(attribute.Message) ? "" : $"\n{attribute.Message}") +
-                        (string.IsNullOrEmpty(attribute.DiagnosticId) ? "" : $"\n{attribute.DiagnosticId}");
-                    var obsoleteButton = group.AddHeaderButton(tooltip, totalHeaderButtonsOffset, Editor.Instance.Icons.Info32);
-                    obsoleteButton.Color = Color.Orange;
-                    obsoleteButton.MouseOverColor = Color.DarkOrange;
-                    totalHeaderButtonsOffset += obsoleteButton.Width;
-                }
-
-                // Show visual indicator if script only exists in prefab instance and is not part of the prefab
-                bool isPrefabActor = scripts.Any(s => s.Actor.HasPrefabLink);
-                if (isPrefabActor && script.PrefabID == Guid.Empty)
-                {
-                    var prefabInstanceButton = group.AddHeaderButton("Script only exists in this prefab instance.", totalHeaderButtonsOffset, Editor.Instance.Icons.Add32);
-                    prefabInstanceButton.Color = style.ProgressNormal;
-                    prefabInstanceButton.MouseOverColor = style.ProgressNormal * 0.9f;
-                    totalHeaderButtonsOffset += prefabInstanceButton.Width;
-                }
-
-                // Adjust margin to not overlap with other ui elements in the header
-                group.Panel.HeaderTextMargin = group.Panel.HeaderTextMargin with { Left = scriptDrag.Right - 12, Right = settingsButton.Width + Utilities.Constants.UIMargin };
                 group.Object(values, editor);
-
                 // Remove drop down arrows and containment lines if no objects in the group
                 if (group.Children.Count == 0)
                 {

Source/Editor/CustomEditors/Dedicated/SplineEditor.cs

@@ -18,7 +18,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
     public class SplineEditor : ActorEditor
     {
         /// <summary>
-        /// Stores undo spline data.
+        /// Storage undo spline data
         /// </summary>
         private struct UndoData
         {
@@ -83,7 +83,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
         }
 
         /// <summary>
-        /// Edit curve options manipulate the curve as free mode.
+        /// Edit curve options manipulate the curve as free mode
         /// </summary>
         private sealed class FreeTangentMode : EditTangentOptionBase
         {
@@ -98,7 +98,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
         }
 
         /// <summary>
-        /// Edit curve options to set tangents to linear.
+        /// Edit curve options to set tangents to linear
         /// </summary>
         private sealed class LinearTangentMode : EditTangentOptionBase
         {
@@ -107,13 +107,13 @@ namespace FlaxEditor.CustomEditors.Dedicated
             {
                 SetKeyframeLinear(spline, index);
 
-                // Change the selection to tangent parent (a spline point / keyframe)
+                // change the selection to tangent parent (a spline point / keyframe)
                 Editor.SetSelectSplinePointNode(spline, index);
             }
         }
 
         /// <summary>
-        /// Edit curve options to align tangents of selected spline.
+        /// Edit curve options to align tangents of selected spline
         /// </summary>
         private sealed class AlignedTangentMode : EditTangentOptionBase
         {
@@ -168,7 +168,8 @@ namespace FlaxEditor.CustomEditors.Dedicated
         }
 
         /// <summary>
-        /// Edit curve options manipulate the curve setting selected point tangent in as smoothed but tangent out as linear.
+        /// Edit curve options manipulate the curve setting selected point 
+        /// tangent in as smoothed but tangent out as linear
         /// </summary>
         private sealed class SmoothInTangentMode : EditTangentOptionBase
         {
@@ -181,7 +182,8 @@ namespace FlaxEditor.CustomEditors.Dedicated
         }
 
         /// <summary>
-        /// Edit curve options manipulate the curve setting selected point tangent in as linear but tangent out as smoothed.
+        /// Edit curve options manipulate the curve setting selected point 
+        /// tangent in as linear but tangent out as smoothed
         /// </summary>
         private sealed class SmoothOutTangentMode : EditTangentOptionBase
         {
@@ -217,8 +219,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
                     var enabled = EnabledInHierarchy && tab.EnabledInHierarchy;
                     var style = FlaxEngine.GUI.Style.Current;
                     var size = Size;
-                    var textHeight = 30.0f;
+                    var textHeight = 16.0f;
-                    // Make icons smaller when tabs get thinner
                     var iconSize = size.Y - textHeight;
                     var iconRect = new Rectangle((Width - iconSize) / 2, 0, iconSize, iconSize);
                     if (tab._mirrorIcon)
@@ -229,11 +230,8 @@ namespace FlaxEditor.CustomEditors.Dedicated
                     var color = style.Foreground;
                     if (!enabled)
                         color *= 0.6f;
-                    var textRect = new Rectangle(0, size.Y - textHeight, size.X, textHeight);
-                    Render2D.PushClip(new Rectangle(Float2.Zero, Size));
                     Render2D.DrawSprite(tab._customIcon, iconRect, color);
-                    Render2D.DrawText(style.FontMedium, tab._customText, textRect, color, TextAlignment.Center, TextAlignment.Center, TextWrapping.WrapWords, 0.65f);
+                    Render2D.DrawText(style.FontMedium, tab._customText, new Rectangle(0, iconSize, size.X, textHeight), color, TextAlignment.Center, TextAlignment.Center);
-                    Render2D.PopClip();
                 }
             }
 
@@ -293,21 +291,18 @@ namespace FlaxEditor.CustomEditors.Dedicated
                 return;
             _selectedSpline = spline;
 
-            //var tabSize = 46;
+            layout.Space(10);
-            var tabSize = 60;
+            var tabSize = 46;
             var icons = Editor.Instance.Icons;
 
-            var group = layout.Group("Selected Point");
+            layout.Header("Selected spline point");
             _selectedPointsTabs = new Tabs
             {
                 Height = tabSize,
                 TabsSize = new Float2(tabSize),
                 AutoTabsSize = true,
-                Parent = group.ContainerControl,
+                Parent = layout.ContainerControl,
             };
-            // Move the group above the group containing spline points
-            group.Control.IndexInParent = 3;
-
             _linearTangentTab = _selectedPointsTabs.AddTab(new IconTab(OnSetSelectedLinear, "Linear", icons.SplineLinear64));
             _freeTangentTab = _selectedPointsTabs.AddTab(new IconTab(OnSetSelectedFree, "Free", icons.SplineFree64));
             _alignedTangentTab = _selectedPointsTabs.AddTab(new IconTab(OnSetSelectedAligned, "Aligned", icons.SplineAligned64));
@@ -315,13 +310,13 @@ namespace FlaxEditor.CustomEditors.Dedicated
             _smoothOutTangentTab = _selectedPointsTabs.AddTab(new IconTab(OnSetSelectedSmoothOut, "Smooth Out", icons.SplineSmoothIn64, true));
             _selectedPointsTabs.SelectedTabIndex = -1;
 
-            group = layout.Group("All Points");
+            layout.Header("All spline points");
             _allPointsTabs = new Tabs
             {
                 Height = tabSize,
                 TabsSize = new Float2(tabSize),
                 AutoTabsSize = true,
-                Parent = group.ContainerControl,
+                Parent = layout.ContainerControl,
             };
             _setLinearAllTangentsTab = _allPointsTabs.AddTab(new IconTab(OnSetTangentsLinear, "Set Linear Tangents", icons.SplineLinear64));
             _setSmoothAllTangentsTab = _allPointsTabs.AddTab(new IconTab(OnSetTangentsSmooth, "Set Smooth Tangents", icons.SplineAligned64));

Source/Editor/CustomEditors/Dedicated/UIControlEditor.cs

@@ -690,7 +690,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
             return grid;
         }
 
-        private CustomElementsContainer<UniformGridPanel> UniformPanelCapsuleForObjectWithText(LayoutElementsContainer el, string text, ValueContainer values, Color highlightColor, out FloatValueBox valueBox)
+        private CustomElementsContainer<UniformGridPanel> UniformPanelCapsuleForObjectWithText(LayoutElementsContainer el, string text, ValueContainer values, Color borderColor, out FloatValueBox valueBox)
         {
             valueBox = null;
             var grid = UniformGridTwoByOne(el);
@@ -701,8 +701,8 @@ namespace FlaxEditor.CustomEditors.Dedicated
             {
                 valueBox = floatEditorElement.ValueBox;
                 var back = FlaxEngine.GUI.Style.Current.TextBoxBackground;
-                valueBox.HighlightColor = highlightColor;
+                valueBox.BorderColor = Color.Lerp(borderColor, back, ActorTransformEditor.AxisGreyOutFactor);
-                valueBox.BorderSelectedColor = highlightColor;
+                valueBox.BorderSelectedColor = borderColor;
             }
             return grid;
         }

Source/Editor/CustomEditors/Editors/ActorTransformEditor.cs

@@ -14,17 +14,22 @@ namespace FlaxEditor.CustomEditors.Editors
         /// <summary>
         /// The X axis color.
         /// </summary>
-        public static Color AxisColorX = new Color(0.8f, 0.0f, 0.027f, 1.0f);
+        public static Color AxisColorX = new Color(1.0f, 0.0f, 0.02745f, 1.0f);
 
         /// <summary>
         /// The Y axis color.
         /// </summary>
-        public static Color AxisColorY = new Color(0.239215f, 0.65f, 0.047058f, 1.0f);
+        public static Color AxisColorY = new Color(0.239215f, 1.0f, 0.047058f, 1.0f);
 
         /// <summary>
         /// The Z axis color.
         /// </summary>
-        public static Color AxisColorZ = new Color(0.0f, 0.42352f, 0.8f, 1.0f);
+        public static Color AxisColorZ = new Color(0.0f, 0.0235294f, 1.0f, 1.0f);
+
+        /// <summary>
+        /// The axes colors grey out scale when input field is not focused.
+        /// </summary>
+        public static float AxisGreyOutFactor = 0.6f;
 
         /// <summary>
         /// Custom editor for actor position property.
@@ -38,20 +43,18 @@ namespace FlaxEditor.CustomEditors.Editors
                 base.Initialize(layout);
 
                 if (XElement.ValueBox.Parent is UniformGridPanel ug)
-                {
-                    ug.SlotPadding = new Margin(3.0f, 0.0f, 0.0f, 0.0f);
                     CheckLayout(ug);
-                }
 
                 // Override colors
+                var back = FlaxEngine.GUI.Style.Current.TextBoxBackground;
+                XElement.ValueBox.BorderColor = Color.Lerp(AxisColorX, back, AxisGreyOutFactor);
                 XElement.ValueBox.BorderSelectedColor = AxisColorX;
-                YElement.ValueBox.BorderSelectedColor = AxisColorY;
-                ZElement.ValueBox.BorderSelectedColor = AxisColorZ;
-                XElement.ValueBox.HighlightColor = AxisColorX;
                 XElement.ValueBox.Category = Utils.ValueCategory.Distance;
-                YElement.ValueBox.HighlightColor = AxisColorY;
+                YElement.ValueBox.BorderColor = Color.Lerp(AxisColorY, back, AxisGreyOutFactor);
+                YElement.ValueBox.BorderSelectedColor = AxisColorY;
                 YElement.ValueBox.Category = Utils.ValueCategory.Distance;
-                ZElement.ValueBox.HighlightColor = AxisColorZ;
+                ZElement.ValueBox.BorderColor = Color.Lerp(AxisColorZ, back, AxisGreyOutFactor);
+                ZElement.ValueBox.BorderSelectedColor = AxisColorZ;
                 ZElement.ValueBox.Category = Utils.ValueCategory.Distance;
             }
         }
@@ -68,20 +71,18 @@ namespace FlaxEditor.CustomEditors.Editors
                 base.Initialize(layout);
                 
                 if (XElement.ValueBox.Parent is UniformGridPanel ug)
-                {
-                    ug.SlotPadding = new Margin(3.0f, 0.0f, 0.0f, 0.0f);
                     CheckLayout(ug);
-                }
 
                 // Override colors
+                var back = FlaxEngine.GUI.Style.Current.TextBoxBackground;
+                XElement.ValueBox.BorderColor = Color.Lerp(AxisColorX, back, AxisGreyOutFactor);
                 XElement.ValueBox.BorderSelectedColor = AxisColorX;
-                YElement.ValueBox.BorderSelectedColor = AxisColorY;
-                ZElement.ValueBox.BorderSelectedColor = AxisColorZ;
-                XElement.ValueBox.HighlightColor = AxisColorX;
                 XElement.ValueBox.Category = Utils.ValueCategory.Angle;
-                YElement.ValueBox.HighlightColor = AxisColorY;
+                YElement.ValueBox.BorderColor = Color.Lerp(AxisColorY, back, AxisGreyOutFactor);
+                YElement.ValueBox.BorderSelectedColor = AxisColorY;
                 YElement.ValueBox.Category = Utils.ValueCategory.Angle;
-                ZElement.ValueBox.HighlightColor = AxisColorZ;
+                ZElement.ValueBox.BorderColor = Color.Lerp(AxisColorZ, back, AxisGreyOutFactor);
+                ZElement.ValueBox.BorderSelectedColor = AxisColorZ;
                 ZElement.ValueBox.Category = Utils.ValueCategory.Angle;
             }
         }
@@ -128,19 +129,17 @@ namespace FlaxEditor.CustomEditors.Editors
                 }
 
                 if (XElement.ValueBox.Parent is UniformGridPanel ug)
-                {
-                    ug.SlotPadding = new Margin(3.0f, 0.0f, 0.0f, 0.0f);
                     CheckLayout(ug);
-                }
 
                 // Override colors
                 var back = FlaxEngine.GUI.Style.Current.TextBoxBackground;
+                var grayOutFactor = 0.6f;
+                XElement.ValueBox.BorderColor = Color.Lerp(AxisColorX, back, grayOutFactor);
                 XElement.ValueBox.BorderSelectedColor = AxisColorX;
+                YElement.ValueBox.BorderColor = Color.Lerp(AxisColorY, back, grayOutFactor);
                 YElement.ValueBox.BorderSelectedColor = AxisColorY;
+                ZElement.ValueBox.BorderColor = Color.Lerp(AxisColorZ, back, grayOutFactor);
                 ZElement.ValueBox.BorderSelectedColor = AxisColorZ;
-                XElement.ValueBox.HighlightColor = AxisColorX;
-                YElement.ValueBox.HighlightColor = AxisColorY;
-                ZElement.ValueBox.HighlightColor = AxisColorZ;
             }
 
             /// <summary>

Source/Editor/CustomEditors/Editors/CollectionEditor.cs

@@ -450,7 +450,6 @@ namespace FlaxEditor.CustomEditors.Editors
         protected bool NotNullItems;
 
         private IntValueBox _sizeBox;
-        private Label _label;
         private Color _background;
         private int _elementsCount, _minCount, _maxCount;
         private bool _readOnly;
@@ -567,7 +566,7 @@ namespace FlaxEditor.CustomEditors.Editors
                     Parent = dropPanel,
                 };
 
-                _label = new Label
+                var label = new Label
                 {
                     Text = "Size",
                     AnchorPreset = AnchorPresets.TopRight,
@@ -593,12 +592,11 @@ namespace FlaxEditor.CustomEditors.Editors
                 panel.Panel.Offsets = new Margin(7, 7, 0, 0);
                 panel.Panel.BackgroundColor = _background;
                 var elementType = ElementType;
-                var bindingAttr = System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public;
                 bool single = elementType.IsPrimitive ||
                               elementType.Equals(new ScriptType(typeof(string))) ||
                               elementType.IsEnum ||
-                              (elementType.GetFields(bindingAttr).Length == 1 && elementType.GetProperties(bindingAttr).Length == 0) ||
+                              (elementType.GetFields().Length == 1 && elementType.GetProperties().Length == 0) ||
-                              (elementType.GetProperties(bindingAttr).Length == 1 && elementType.GetFields(bindingAttr).Length == 0) ||
+                              (elementType.GetProperties().Length == 1 && elementType.GetFields().Length == 0) ||
                               elementType.Equals(new ScriptType(typeof(JsonAsset))) ||
                               elementType.Equals(new ScriptType(typeof(SettingsBase)));
                 if (_cachedDropPanels == null)
@@ -674,10 +672,8 @@ namespace FlaxEditor.CustomEditors.Editors
                     Resize(Count + 1);
                 };
             }
-
-            Layout.ContainerControl.SizeChanged += OnLayoutSizeChanged;
         }
-        
+
         private void OnSetupContextMenu(ContextMenu menu, DropPanel panel)
         {
             if (menu.Items.Any(x => x is ContextMenuButton b && b.Text.Equals("Open All", StringComparison.Ordinal)))
@@ -700,24 +696,10 @@ namespace FlaxEditor.CustomEditors.Editors
             });
         }
 
-        private void OnLayoutSizeChanged(Control control)
-        {
-            if (Layout.ContainerControl is DropPanel dropPanel)
-            {
-                // Hide "Size" text when array editor title overlaps
-                var headerTextSize = dropPanel.HeaderTextFont.GetFont().MeasureText(dropPanel.HeaderText);
-                if (headerTextSize.X + DropPanel.DropDownIconSize >= _label.Left)
-                    _label.TextColor = _label.TextColorHighlighted = Color.Transparent;
-                else
-                    _label.TextColor = _label.TextColorHighlighted = FlaxEngine.GUI.Style.Current.Foreground;
-            }
-        }
-
         /// <inheritdoc />
         protected override void Deinitialize()
         {
             _sizeBox = null;
-            Layout.ContainerControl.SizeChanged -= OnLayoutSizeChanged;
 
             base.Deinitialize();
         }

Source/Editor/CustomEditors/Editors/InputEditor.cs

@@ -47,8 +47,6 @@ namespace FlaxEditor.CustomEditors.Editors
                 return inputEvent;
             if (Values[0] is string str)
                 return str;
-            if (Values.Type.Type == typeof(InputEvent))
-                return new InputEvent();
             if (Values.Type.Type == typeof(string))
                 return string.Empty;
             return null;