Merge remote-tracking branch 'origin/1.10' into sdl_platform_1.10

# Conflicts:
#	Source/Editor/GUI/ContextMenu/ContextMenuBase.cs
#	Source/Engine/Platform/Linux/LinuxPlatform.cpp

.github/ISSUE_TEMPLATE/1-bug.yaml

@@ -1,42 +0,0 @@
-name: Bug Report
-description: File a bug report.
-title: "[Bug]: "
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for taking the time to fill out this bug report! Please attach any minimal reproduction projects!
-  - type: textarea
-    id: description-area
-    attributes:
-      label: Description
-      description: Please provide a description of the bug and what you expected to happen.
-    validations:
-      required: true
-  - type: textarea
-    id: steps-area
-    attributes:
-      label: Steps to reproduce
-      description: Please provide reproduction steps if possible.
-    validations:
-      required: true
-  - type: dropdown
-    id: version
-    attributes:
-      label: Version
-      description: What version of Flax are you running?
-      options:
-        - '1.8'
-        - '1.9'
-        - '1.10'
-        - '1.11'
-        - master branch
-      default: 3
-    validations:
-      required: true
-  - type: textarea
-    id: logs
-    attributes:
-      label: Relevant logs
-      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
-      render: shell

.github/ISSUE_TEMPLATE/2-feature-request.yaml

@@ -1,22 +0,0 @@
-name: Feature Request
-description: File a feature request.
-title: "[Request]: "
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for taking the time to fill out a feature request!
-  - type: textarea
-    id: description-area
-    attributes:
-      label: Description
-      description: Please provide a description of the feature!
-    validations:
-      required: true
-  - type: textarea
-    id: benefits-area
-    attributes:
-      label: Benefits
-      description: Please provide what benefits this feature would provide to the engine!
-    validations:
-      required: true

.github/workflows/build_ios.yml

@@ -19,7 +19,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 9.0.x
+        dotnet-version: 8.0.x
     - name: Setup .NET Workload
       run: |
         dotnet workload install ios
@@ -33,4 +33,4 @@ jobs:
         git lfs pull
     - name: Build
       run: |
-        ./Development/Scripts/Mac/CallBuildTool.sh -build -log -dotnet=9 -arch=ARM64 -platform=iOS -configuration=Release -buildtargets=FlaxGame
+        ./Development/Scripts/Mac/CallBuildTool.sh -build -log -dotnet=8 -arch=ARM64 -platform=iOS -configuration=Release -buildtargets=FlaxGame

.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 libwayland-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

@@ -34,7 +34,7 @@ jobs:
         dotnet workload --info
     - name: Build
       run: |
-        .\PackageEditor.bat -arch=x64 -platform=Windows -deployOutput=Output -dotnet=8
+        .\PackageEditor.bat -arch=x64 -platform=Windows -deployOutput=Output
     - name: Upload
       uses: actions/upload-artifact@v4
       with:
@@ -67,7 +67,7 @@ jobs:
         dotnet workload --info
     - name: Build
       run: |
-        .\PackagePlatforms.bat -arch=x64 -platform=Windows -deployOutput=Output -dotnet=8
+        .\PackagePlatforms.bat -arch=x64 -platform=Windows -deployOutput=Output
     - name: Upload
       uses: actions/upload-artifact@v4
       with:
@@ -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
     - name: Setup Vulkan
       uses: ./.github/actions/vulkan
     - name: Setup .NET
@@ -101,7 +100,7 @@ jobs:
         dotnet workload --info
     - name: Build
       run: |
-        ./PackageEditor.sh -arch=x64 -platform=Linux -deployOutput=Output -dotnet=8
+        ./PackageEditor.sh -arch=x64 -platform=Linux -deployOutput=Output
     - name: Upload
       uses: actions/upload-artifact@v4
       with:
@@ -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
     - name: Setup Vulkan
       uses: ./.github/actions/vulkan
     - name: Setup .NET
@@ -133,7 +131,7 @@ jobs:
         dotnet workload --info
     - name: Build
       run: |
-        ./PackagePlatforms.sh -arch=x64 -platform=Linux -deployOutput=Output -dotnet=8
+        ./PackagePlatforms.sh -arch=x64 -platform=Linux -deployOutput=Output
     - name: Upload
       uses: actions/upload-artifact@v4
       with:
@@ -163,7 +161,7 @@ jobs:
         dotnet workload --info
     - name: Build
       run: |
-        ./PackageEditor.command -arch=ARM64 -platform=Mac -deployOutput=Output -dotnet=8
+        ./PackageEditor.command -arch=ARM64 -platform=Mac -deployOutput=Output
     - name: Upload
       uses: actions/upload-artifact@v4
       with:
@@ -191,7 +189,7 @@ jobs:
         dotnet workload --info
     - name: Build
       run: |
-        ./PackagePlatforms.command -arch=ARM64 -platform=Mac -deployOutput=Output -dotnet=8
+        ./PackagePlatforms.command -arch=ARM64 -platform=Mac -deployOutput=Output
     - name: Upload
       uses: actions/upload-artifact@v4
       with:

.github/workflows/tests.yml

@@ -28,8 +28,7 @@ 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 libwayland-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: Build
       run: |
         ./GenerateProjectFiles.sh -vs2022 -log -verbose -printSDKs -dotnet=8

Content/Editor/MaterialTemplates/Decal.shader

@@ -6,7 +6,6 @@
 @3
 
 #include "./Flax/Common.hlsl"
-#include "./Flax/Stencil.hlsl"
 #include "./Flax/MaterialCommon.hlsl"
 #include "./Flax/GBufferCommon.hlsl"
 @7
@@ -14,14 +13,11 @@
 META_CB_BEGIN(0, Data)
 float4x4 WorldMatrix;
 float4x4 InvWorld;
-float4x4 SvPositionToWorld;
+float4x4 SVPositionToWorld;
-float3 Padding0;
-uint RenderLayersMask;
 @1META_CB_END
 
 // Use depth buffer for per-pixel decal layering
 Texture2D DepthBuffer : register(t0);
-Texture2D<uint2> StencilBuffer : register(t1);
 
 // Material shader resources
 @2
@@ -31,63 +27,12 @@ struct MaterialInput
 	float3 WorldPosition;
 	float TwoSidedSign;
 	float2 TexCoord;
-	float4 TexCoord_DDX_DDY;
 	float3x3 TBN;
 	float4 SvPosition;
 	float3 PreSkinnedPosition;
 	float3 PreSkinnedNormal;
 };
 
-// Calculates decal texcoords for a given pixel position (sampels depth buffer and projects value to decal space).
-float2 SvPositionToDecalUV(float4 svPosition)
-{
-	float2 screenUV = svPosition.xy * ScreenSize.zw;
-	svPosition.z = SAMPLE_RT(DepthBuffer, screenUV).r;
-	float4 positionHS = mul(float4(svPosition.xyz, 1), SvPositionToWorld);
-	float3 positionWS = positionHS.xyz / positionHS.w;
-	float3 positionOS = mul(float4(positionWS, 1), InvWorld).xyz;
-	return positionOS.xz + 0.5f;
-}
-
-// Manually compute ddx/ddy for decal texture cooordinates to avoid the 2x2 pixels artifacts on the edges of geometry under decal
-// [Reference: https://www.humus.name/index.php?page=3D&ID=84]
-float4 CalculateTextureDerivatives(float4 svPosition, float2 texCoord)
-{
-	float4 svDiffX = float4(1, 0, 0, 0);
-	float2 uvDiffX0 = texCoord - SvPositionToDecalUV(svPosition - svDiffX);
-	float2 uvDiffX1 = SvPositionToDecalUV(svPosition + svDiffX) - texCoord;
-	float2 dx = dot(uvDiffX0, uvDiffX0) < dot(uvDiffX1, uvDiffX1) ? uvDiffX0 : uvDiffX1;
-
-	float4 svDiffY = float4(0, 1, 0, 0);
-	float2 uvDiffY0 = texCoord - SvPositionToDecalUV(svPosition - svDiffY);
-	float2 uvDiffY1 = SvPositionToDecalUV(svPosition + svDiffY) - texCoord;
-	float2 dy = dot(uvDiffY0, uvDiffY0) < dot(uvDiffY1, uvDiffY1) ? uvDiffY0 : uvDiffY1;
-
-	return float4(dx, dy);
-}
-
-// Computes the mipmap level for a specific texture dimensions to be sampled at decal texture cooordinates.
-// [Reference: https://hugi.scene.org/online/coding/hugi%2014%20-%20comipmap.htm]
-float CalculateTextureMipmap(MaterialInput input, float2 textureSize)
-{
-	float2 dx = input.TexCoord_DDX_DDY.xy * textureSize;
-	float2 dy = input.TexCoord_DDX_DDY.zw * textureSize;
-	float d = max(dot(dx, dx), dot(dy, dy));
-	return (0.5 * 0.5) * log2(d); // Hardcoded half-mip rate reduction to avoid artifacts when decal is moved over dither texture
-}
-float CalculateTextureMipmap(MaterialInput input, Texture2D t)
-{
-	float2 textureSize;
-	t.GetDimensions(textureSize.x, textureSize.y);
-	return CalculateTextureMipmap(input, textureSize);
-}
-float CalculateTextureMipmap(MaterialInput input, TextureCube t)
-{
-	float2 textureSize;
-	t.GetDimensions(textureSize.x, textureSize.y);
-	return CalculateTextureMipmap(input, textureSize);
-}
-
 // Transforms a vector from tangent space to world space
 float3 TransformTangentVectorToWorld(MaterialInput input, float3 tangentVector)
 {
@@ -171,6 +116,7 @@ Material GetMaterialPS(MaterialInput input)
 }
 
 // Input macro specified by the material: DECAL_BLEND_MODE
+
 #define DECAL_BLEND_MODE_TRANSLUCENT 0
 #define DECAL_BLEND_MODE_STAIN       1
 #define DECAL_BLEND_MODE_NORMAL      2
@@ -204,18 +150,10 @@ void PS_Decal(
 #endif
 	)
 {
-	// Stencil masking
-	uint stencilObjectLayer = STENCIL_BUFFER_OBJECT_LAYER(STENCIL_BUFFER_LOAD(StencilBuffer, SvPosition.xy));
-	if ((RenderLayersMask & (1 << stencilObjectLayer)) == 0)
-	{
-		clip(-1);
-		return;
-	}
-
 	float2 screenUV = SvPosition.xy * ScreenSize.zw;
 	SvPosition.z = SAMPLE_RT(DepthBuffer, screenUV).r;
 
-	float4 positionHS = mul(float4(SvPosition.xyz, 1), SvPositionToWorld);
+	float4 positionHS = mul(float4(SvPosition.xyz, 1), SVPositionToWorld);
 	float3 positionWS = positionHS.xyz / positionHS.w;
 	float3 positionOS = mul(float4(positionWS, 1), InvWorld).xyz;
 
@@ -228,9 +166,8 @@ void PS_Decal(
 	materialInput.TexCoord = decalUVs;
 	materialInput.TwoSidedSign = 1;
 	materialInput.SvPosition = SvPosition;
-	materialInput.TexCoord_DDX_DDY = CalculateTextureDerivatives(materialInput.SvPosition, materialInput.TexCoord);
 	
-	// Calculate tangent-space
+	// Build tangent to world transformation matrix
 	float3 ddxWp = ddx(positionWS);
 	float3 ddyWp = ddy(positionWS);
 	materialInput.TBN[0] = normalize(ddyWp);

Content/Editor/MaterialTemplates/Deformable.shader

@@ -337,7 +337,6 @@ VertexOutput VS_SplineModel(ModelInput input)
 	// Apply world position offset per-vertex
 #if USE_POSITION_OFFSET
 	output.Geometry.WorldPosition += material.PositionOffset;
-	output.Geometry.PrevWorldPosition += material.PositionOffset;
 	output.Position = mul(float4(output.Geometry.WorldPosition, 1), ViewProjectionMatrix);
 #endif
 

Content/Editor/MaterialTemplates/Features/DeferredShading.hlsl

@@ -1,4 +1,4 @@
-// Copyright (c) Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 @0// Deferred Shading: Defines
 @1// Deferred Shading: Includes

Content/Editor/MaterialTemplates/Features/Distortion.hlsl

@@ -1,4 +1,4 @@
-// Copyright (c) Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 @0// Distortion: Defines
 @1// Distortion: Includes

Content/Editor/MaterialTemplates/Features/ForwardShading.hlsl

@@ -1,11 +1,11 @@
-// Copyright (c) Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 @0// Forward Shading: Defines
 #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];
@@ -29,17 +27,7 @@ TextureCube EnvProbe : register(t__SRV__);
 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; }
-ExponentialHeightFogData GetExponentialHeightFog() { return ExponentialHeightFog; }
-VolumetricFogData GetVolumetricFog() { return VolumetricFog; }
-uint GetLocalLightsCount() { return LocalLightsCount; }
-LightData GetLocalLight(uint i) { return LocalLights[i]; }
 @5// Forward Shading: Shaders
 
 // Pixel Shader function for Forward Pass
@@ -88,8 +76,9 @@ void PS_Forward(
 	gBuffer.ShadingModel = MATERIAL_SHADING_MODEL;
 
 	// Calculate lighting from a single directional light
+	float4 shadowMask = 1.0f;
 	ShadowSample shadow = SampleDirectionalLightShadow(DirectionalLight, ShadowsBuffer, ShadowMap, gBuffer);
-	float4 shadowMask = GetShadowMask(shadow);
+	shadowMask = GetShadowMask(shadow);
 	float4 light = GetLighting(ViewPos, DirectionalLight, gBuffer, shadowMask, false, false);
 
 	// Calculate lighting from sky light
@@ -112,8 +101,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 +109,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 +117,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,37 +129,23 @@ 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
 
-#if USE_FOG && MATERIAL_SHADING_MODEL != SHADING_MODEL_UNLIT
+#if USE_FOG
 	// Calculate exponential height fog
-#if DIRECTX && FEATURE_LEVEL < FEATURE_LEVEL_SM6
+	float4 fog = GetExponentialHeightFog(ExponentialHeightFog, materialInput.WorldPosition, ViewPos, 0);
-	// TODO: fix D3D11/D3D10 bug with incorrect distance
-	float fogSceneDistance = distance(materialInput.WorldPosition, ViewPos);
-#else
-	float fogSceneDistance = gBuffer.ViewPos.z;
-#endif
-	float fogSkipDistance = max(ExponentialHeightFog.VolumetricFogMaxDistance - 100, 0);
-	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);
-		fog = CombineVolumetricFog(fog, volumetricFog);
-	}
 
 	// Apply fog to the output color
 #if MATERIAL_BLEND == MATERIAL_BLEND_OPAQUE

Content/Editor/MaterialTemplates/Features/GlobalIllumination.hlsl

@@ -1,4 +1,4 @@
-// Copyright (c) Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 @0// Global Illumination: Defines
 #define USE_GI 1

Content/Editor/MaterialTemplates/Features/Lightmap.hlsl

@@ -1,4 +1,4 @@
-// Copyright (c) Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 @0// Lightmap: Defines
 #define CAN_USE_LIGHTMAP 1

Content/Editor/MaterialTemplates/Features/MotionVectors.hlsl

@@ -1,4 +1,4 @@
-// Copyright (c) Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 @0// Motion Vectors: Defines
 @1// Motion Vectors: Includes

Content/Editor/MaterialTemplates/Features/SDFReflections.hlsl

@@ -1,4 +1,4 @@
-// Copyright (c) Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 @0// SDF Reflections: Defines
 #define USE_GLOBAL_SURFACE_ATLAS 1

Content/Editor/MaterialTemplates/Features/Tessellation.hlsl

@@ -1,4 +1,4 @@
-// Copyright (c) Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 @0// Tessellation: Defines
 #define TessalationProjectOntoPlane(planeNormal, planePosition, pointToProject) pointToProject - dot(pointToProject - planePosition, planeNormal) * planeNormal

Content/Editor/MaterialTemplates/GUI.shader

@@ -20,8 +20,6 @@ float TimeParam;
 float4 ViewInfo;
 float4 ScreenSize;
 float4 ViewSize;
-float3 ViewPadding0;
-float ScaledTimeParam;
 @1META_CB_END
 
 // Shader resources
@@ -38,7 +36,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 +53,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 +65,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 +82,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 +101,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
@@ -234,7 +227,6 @@ VertexOutput VS_GUI(Render2DVertex input)
 #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

@@ -645,7 +645,7 @@ VertexOutput VS_Ribbon(RibbonInput input, uint vertexIndex : SV_VertexID)
 	materialInput.TBN = output.TBN;
 	materialInput.TwoSidedSign = 1;
 	materialInput.SvPosition = output.Position;
-	materialInput.PreSkinnedPosition = position;
+	materialInput.PreSkinnedPosition = Position;
 	materialInput.PreSkinnedNormal = tangentToLocal[2].xyz;
 	materialInput.InstanceOrigin = output.InstanceOrigin;
 	materialInput.InstanceParams = output.InstanceParams;	

Content/Editor/MaterialTemplates/PostProcess.shader

@@ -19,8 +19,6 @@ float4 ViewInfo;
 float4 ScreenSize;
 float4 TemporalAAJitter;
 float4x4 InverseViewProjectionMatrix;
-float3 ViewPadding0;
-float ScaledTimeParam;
 @1META_CB_END
 
 // Shader resources

Content/Editor/MaterialTemplates/Surface.shader

@@ -377,7 +377,6 @@ VertexOutput VS(ModelInput input)
 	// Apply world position offset per-vertex
 #if USE_POSITION_OFFSET
 	output.Geometry.WorldPosition += material.PositionOffset;
-	output.Geometry.PrevWorldPosition += material.PositionOffset;
 	output.Position = mul(float4(output.Geometry.WorldPosition, 1), ViewProjectionMatrix);
 #endif
 
@@ -548,7 +547,6 @@ VertexOutput VS_Skinned(ModelInput_Skinned input)
 	// Apply world position offset per-vertex
 #if USE_POSITION_OFFSET
 	output.Geometry.WorldPosition += material.PositionOffset;
-	output.Geometry.PrevWorldPosition += material.PositionOffset;
 	output.Position = mul(float4(output.Geometry.WorldPosition, 1), ViewProjectionMatrix);
 #endif
 

Content/Editor/MaterialTemplates/Terrain.shader

@@ -15,7 +15,6 @@
 #include "./Flax/Common.hlsl"
 #include "./Flax/MaterialCommon.hlsl"
 #include "./Flax/GBufferCommon.hlsl"
-#include "./Flax/TerrainCommon.hlsl"
 @7
 // Primary constant buffer (with additional material parameters)
 META_CB_BEGIN(0, Data)
@@ -335,7 +334,7 @@ VertexOutput VS(TerrainVertexInput input)
 	float lodValue = CurrentLOD;
 	float morphAlpha = lodCalculated - CurrentLOD;
 
-	// Sample heightmap and splatmaps
+	// Sample heightmap
 	float2 heightmapUVs = input.TexCoord * HeightmapUVScaleBias.xy + HeightmapUVScaleBias.zw;
 #if USE_SMOOTH_LOD_TRANSITION
 	float4 heightmapValueThisLOD = Heightmap.SampleLevel(SamplerPointClamp, heightmapUVs, lodValue);
@@ -343,6 +342,7 @@ VertexOutput VS(TerrainVertexInput input)
 	float2 heightmapUVsNextLOD = nextLODPos * HeightmapUVScaleBias.xy + HeightmapUVScaleBias.zw;
 	float4 heightmapValueNextLOD = Heightmap.SampleLevel(SamplerPointClamp, heightmapUVsNextLOD, lodValue + 1);
 	float4 heightmapValue = lerp(heightmapValueThisLOD, heightmapValueNextLOD, morphAlpha);
+	bool isHole = max(heightmapValueThisLOD.b + heightmapValueThisLOD.a, heightmapValueNextLOD.b + heightmapValueNextLOD.a) >= 1.9f;
 #if USE_TERRAIN_LAYERS
 	float4 splatmapValueThisLOD = Splatmap0.SampleLevel(SamplerPointClamp, heightmapUVs, lodValue);
 	float4 splatmapValueNextLOD = Splatmap0.SampleLevel(SamplerPointClamp, heightmapUVsNextLOD, lodValue + 1);
@@ -355,6 +355,7 @@ VertexOutput VS(TerrainVertexInput input)
 #endif
 #else
 	float4 heightmapValue = Heightmap.SampleLevel(SamplerPointClamp, heightmapUVs, lodValue);
+	bool isHole = (heightmapValue.b + heightmapValue.a) >= 1.9f;
 #if USE_TERRAIN_LAYERS
 	float4 splatmap0Value = Splatmap0.SampleLevel(SamplerPointClamp, heightmapUVs, lodValue);
 #if TERRAIN_LAYERS_DATA_SIZE > 1
@@ -362,11 +363,12 @@ VertexOutput VS(TerrainVertexInput input)
 #endif
 #endif
 #endif
-	float height = DecodeHeightmapHeight(heightmapValue);
+	float height = (float)((int)(heightmapValue.x * 255.0) + ((int)(heightmapValue.y * 255) << 8)) / 65535.0;
 
 	// Extract normal and the holes mask
-	bool isHole;
+	float2 normalTemp = float2(heightmapValue.b, heightmapValue.a) * 2.0f - 1.0f;
-	float3 normal = DecodeHeightmapNormal(heightmapValue, isHole);
+	float3 normal = float3(normalTemp.x, sqrt(1.0 - saturate(dot(normalTemp, normalTemp))), normalTemp.y);
+	normal = normalize(normal);
 	output.Geometry.HolesMask = isHole ? 0 : 1;
 	if (isHole)
 	{

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));
 

Development/Scripts/Linux/CallBuildTool.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) Wojciech Figat. All rights reserved.
+# Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 set -e
 

Development/Scripts/Mac/CallBuildTool.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) Wojciech Figat. All rights reserved
+# Copyright (c) 2012-2024 Wojciech Figat. All rights reserved
 
 set -e
 

Development/Scripts/Mac/XCodeBuild.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (c) Wojciech Figat. All rights reserved
+# Copyright (c) 2012-2024 Wojciech Figat. All rights reserved
 
 # Fix mono bin to be in a path
 #export PATH=/Library/Frameworks/Mono.framework/Versions/Current/Commands:$PATH

Development/Scripts/Windows/CallBuildTool.bat

@@ -1,6 +1,6 @@
 @echo off
 
-rem Copyright (c) Wojciech Figat. All rights reserved.
+rem Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 if not exist "Development\Scripts\Windows\GetMSBuildPath.bat" goto Error_InvalidLocation
 

Development/Scripts/Windows/GetMSBuildPath.bat

@@ -1,6 +1,6 @@
 @echo off
 
-rem Copyright (c) Wojciech Figat. All rights reserved.
+rem Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 set MSBUILD_PATH=
 

Flax.flaxproj

@@ -2,12 +2,12 @@
   "Name": "Flax",
   "Version": {
     "Major": 1,
-    "Minor": 12,
+    "Minor": 10,
     "Revision": 0,
-    "Build": 6905
+    "Build": 6702
   },
   "Company": "Flax",
-  "Copyright": "Copyright (c) 2012-2026 Wojciech Figat. All rights reserved.",
+  "Copyright": "Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.",
   "GameTarget": "FlaxGame",
   "EditorTarget": "FlaxEditor",
   "Configuration": {