some linux work from summer

.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 -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
+        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
     - 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 -y --fix-missing libx11-dev libxcursor-dev libxinerama-dev build-essential gettext libtool libtool-bin libpulse-dev libasound2-dev libjack-dev portaudio19-dev
+        sudo apt-get install 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
@@ -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 -y --fix-missing libx11-dev libxcursor-dev libxinerama-dev build-essential gettext libtool libtool-bin libpulse-dev libasound2-dev libjack-dev portaudio19-dev
+        sudo apt-get install 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

.github/workflows/tests.yml

@@ -28,8 +28,7 @@ jobs:
         git lfs pull
     - name: Install dependencies
       run: |
-        sudo apt-get update
-        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
+        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
     - name: Build
       run: |
         ./GenerateProjectFiles.sh -vs2022 -log -verbose -printSDKs -dotnet=8

.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

@@ -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;
-float3 Padding0;
-uint RenderLayersMask;
+float4x4 SVPositionToWorld;
 @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/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];
@@ -29,15 +27,12 @@ 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; }
+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 +107,7 @@ void PS_Forward(
 
 	// Calculate reflections
 #if USE_REFLECTIONS
-	float4 reflections = SampleReflectionProbe(ViewPos, EnvProbe, EnvironmentProbe, gBuffer.WorldPos, gBuffer.Normal, gBuffer.Roughness);
-	reflections.rgb *= reflections.a;
+	float3 reflections = SampleReflectionProbe(ViewPos, EnvProbe, EnvironmentProbe, gBuffer.WorldPos, gBuffer.Normal, gBuffer.Roughness).rgb;
 
 #if MATERIAL_REFLECTIONS == MATERIAL_REFLECTIONS_SSR
 	// Screen Space Reflections
@@ -121,7 +115,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 +123,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 +135,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
-	output.rgb += light.rgb;
+	// Add lighting (apply ambient occlusion)
+	output.rgb += light.rgb * gBuffer.AO;
 
 #endif
 
 #if USE_FOG && MATERIAL_SHADING_MODEL != SHADING_MODEL_UNLIT
 	// Calculate exponential height fog
-#if DIRECTX && FEATURE_LEVEL < FEATURE_LEVEL_SM6
-	// 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);
-	}
+	float4 fog = GetExponentialHeightFog(ExponentialHeightFog, materialInput.WorldPosition, ViewPos, 0, gBuffer.ViewPos.z);
 
 	// Apply fog to the output color
 #if MATERIAL_BLEND == MATERIAL_BLEND_OPAQUE

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/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;
-	float3 emission = material.Emissive * material.Opacity;
+	float extinction = material.Opacity * material.Mask * 0.001f;
+	float3 emission = material.Emissive;
 	float3 scattering = albedo * extinction;
 	float absorption = max(0.0f, extinction - Luminance(scattering));
 

Flax.flaxproj

@@ -2,12 +2,12 @@
   "Name": "Flax",
   "Version": {
     "Major": 1,
-    "Minor": 12,
+    "Minor": 11,
     "Revision": 0,
-    "Build": 6905
+    "Build": 6800
   },
   "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": {

Flax.sln.DotSettings

@@ -73,24 +73,6 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/CppNaming/UserRules/=TYPEDEF/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aa_bb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CppNaming/UserRules/=UNION/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aa_bb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CppNaming/UserRules/=UNION_005FMEMBER/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aa_bb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CppNamingOptions/Abbreviations/=CCD/@EntryIndexedValue">CCD</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CppNamingOptions/Abbreviations/=GPU/@EntryIndexedValue">GPU</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CppNamingOptions/Abbreviations/=ID/@EntryIndexedValue">ID</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CppNamingOptions/Rules/=175CE9C669E52F4D92FD2C07848740BD/@EntryIndexedValue">&lt;NamingElement Priority="11" Title="Class and struct public fields"&gt;&lt;Descriptor Static="Indeterminate" Constexpr="Indeterminate" Const="Indeterminate" Volatile="Indeterminate" Accessibility="PUBLIC"&gt;&lt;type Name="class field" /&gt;&lt;type Name="struct field" /&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" WarnAboutPrefixesAndSuffixes="False" Prefix="" Suffix="" Style="AaBb" /&gt;&lt;/NamingElement&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CppNamingOptions/Rules/=32EB6D69783B3E4481A733193E338089/@EntryIndexedValue">&lt;NamingElement Priority="9" Title="Class and struct methods"&gt;&lt;Descriptor Static="Indeterminate" Constexpr="Indeterminate" Const="Indeterminate" Volatile="Indeterminate" Accessibility="NOT_APPLICABLE"&gt;&lt;type Name="member function" /&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" WarnAboutPrefixesAndSuffixes="False" Prefix="" Suffix="" Style="AaBb" /&gt;&lt;/NamingElement&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CppNamingOptions/Rules/=3C4E0D59F298854F9608A9B454E8FF5E/@EntryIndexedValue">&lt;NamingElement Priority="17" Title="Typedefs"&gt;&lt;Descriptor Static="Indeterminate" Constexpr="Indeterminate" Const="Indeterminate" Volatile="Indeterminate" Accessibility="NOT_APPLICABLE"&gt;&lt;type Name="type alias" /&gt;&lt;type Name="typedef" /&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" WarnAboutPrefixesAndSuffixes="False" Prefix="" Suffix="" Style="AaBb" /&gt;&lt;/NamingElement&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CppNamingOptions/Rules/=499C9026DADA2B448BCD0B2C54746A59/@EntryIndexedValue">&lt;NamingElement Priority="14" Title="Other constants"&gt;&lt;Descriptor Static="True" Constexpr="Indeterminate" Const="True" Volatile="Indeterminate" Accessibility="NOT_APPLICABLE"&gt;&lt;type Name="class field" /&gt;&lt;type Name="local variable" /&gt;&lt;type Name="struct field" /&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" WarnAboutPrefixesAndSuffixes="False" Prefix="" Suffix="" Style="AaBb" /&gt;&lt;/NamingElement&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CppNamingOptions/Rules/=50D2535711CE1A43A3B06EF841C36CFD/@EntryIndexedValue">&lt;NamingElement Priority="13" Title="Enum members"&gt;&lt;Descriptor Static="Indeterminate" Constexpr="Indeterminate" Const="Indeterminate" Volatile="Indeterminate" Accessibility="NOT_APPLICABLE"&gt;&lt;type Name="scoped enumerator" /&gt;&lt;type Name="unscoped enumerator" /&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" WarnAboutPrefixesAndSuffixes="False" Prefix="" Suffix="" Style="AaBb" /&gt;&lt;/NamingElement&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CppNamingOptions/Rules/=6AD3BADA1260CC4D840AB26323C51827/@EntryIndexedValue">&lt;NamingElement Priority="15" Title="Global constants"&gt;&lt;Descriptor Static="Indeterminate" Constexpr="Indeterminate" Const="True" Volatile="Indeterminate" Accessibility="NOT_APPLICABLE"&gt;&lt;type Name="global variable" /&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" WarnAboutPrefixesAndSuffixes="False" Prefix="" Suffix="" Style="AaBb" /&gt;&lt;/NamingElement&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CppNamingOptions/Rules/=904CDCA174AACE4AA52660A247CDF9A0/@EntryIndexedValue">&lt;NamingElement Priority="7" Title="Global variables"&gt;&lt;Descriptor Static="Indeterminate" Constexpr="Indeterminate" Const="Indeterminate" Volatile="Indeterminate" Accessibility="NOT_APPLICABLE"&gt;&lt;type Name="global variable" /&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" WarnAboutPrefixesAndSuffixes="False" Prefix="" Suffix="" Style="AaBb" /&gt;&lt;/NamingElement&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CppNamingOptions/Rules/=95BCDE767C97B64DB3DAE800DBBBC758/@EntryIndexedValue">&lt;NamingElement Priority="5" Title="Parameters"&gt;&lt;Descriptor Static="Indeterminate" Constexpr="Indeterminate" Const="Indeterminate" Volatile="Indeterminate" Accessibility="NOT_APPLICABLE"&gt;&lt;type Name="function parameter" /&gt;&lt;type Name="lambda parameter" /&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" WarnAboutPrefixesAndSuffixes="False" Prefix="" Suffix="" Style="aaBb" /&gt;&lt;/NamingElement&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CppNamingOptions/Rules/=C03AE454FC2CBA43819AC75E4D6C9C8C/@EntryIndexedValue">&lt;NamingElement Priority="1" Title="Classes and structs"&gt;&lt;Descriptor Static="Indeterminate" Constexpr="Indeterminate" Const="Indeterminate" Volatile="Indeterminate" Accessibility="NOT_APPLICABLE"&gt;&lt;type Name="__interface" /&gt;&lt;type Name="class" /&gt;&lt;type Name="struct" /&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" WarnAboutPrefixesAndSuffixes="False" Prefix="" Suffix="" Style="AaBb" /&gt;&lt;/NamingElement&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CppNamingOptions/Rules/=D49E31C610641E4CAD0407DB79ACC851/@EntryIndexedValue">&lt;NamingElement Priority="8" Title="Global functions"&gt;&lt;Descriptor Static="Indeterminate" Constexpr="Indeterminate" Const="Indeterminate" Volatile="Indeterminate" Accessibility="NOT_APPLICABLE"&gt;&lt;type Name="global function" /&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" WarnAboutPrefixesAndSuffixes="False" Prefix="" Suffix="" Style="AaBb" /&gt;&lt;/NamingElement&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CppNamingOptions/Rules/=D73FBB3529BC5449B6C85BB37B26A8D4/@EntryIndexedValue">&lt;NamingElement Priority="16" Title="Namespaces"&gt;&lt;Descriptor Static="Indeterminate" Constexpr="Indeterminate" Const="Indeterminate" Volatile="Indeterminate" Accessibility="NOT_APPLICABLE"&gt;&lt;type Name="namespace" /&gt;&lt;type Name="namespace alias" /&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" WarnAboutPrefixesAndSuffixes="False" Prefix="" Suffix="" Style="AaBb" /&gt;&lt;/NamingElement&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CppNamingOptions/Rules/=DA41807CE47AEB4CBE1724C44D0B786E/@EntryIndexedValue">&lt;NamingElement Priority="6" Title="Local variables"&gt;&lt;Descriptor Static="Indeterminate" Constexpr="Indeterminate" Const="Indeterminate" Volatile="Indeterminate" Accessibility="NOT_APPLICABLE"&gt;&lt;type Name="local variable" /&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" WarnAboutPrefixesAndSuffixes="False" Prefix="" Suffix="" Style="aaBb" /&gt;&lt;/NamingElement&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CppNamingOptions/Rules/=DDF30C9A1DA74B4DBBC56D25FDF886AA/@EntryIndexedValue">&lt;NamingElement Priority="10" Title="Class and struct fields"&gt;&lt;Descriptor Static="Indeterminate" Constexpr="Indeterminate" Const="Indeterminate" Volatile="Indeterminate" Accessibility="NOT_APPLICABLE"&gt;&lt;type Name="class field" /&gt;&lt;type Name="struct field" /&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" WarnAboutPrefixesAndSuffixes="False" Prefix="_" Suffix="" Style="aaBb" /&gt;&lt;/NamingElement&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CppNamingOptions/Rules/=EF70A6BF54ACE446971DDB32344C25A3/@EntryIndexedValue">&lt;NamingElement Priority="12" Title="Union members"&gt;&lt;Descriptor Static="Indeterminate" Constexpr="Indeterminate" Const="Indeterminate" Volatile="Indeterminate" Accessibility="NOT_APPLICABLE"&gt;&lt;type Name="union member" /&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" WarnAboutPrefixesAndSuffixes="False" Prefix="" Suffix="" Style="AaBb" /&gt;&lt;/NamingElement&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CppNamingOptions/Rules/=F37818C54C323A4A80B1A478629985AE/@EntryIndexedValue">&lt;NamingElement Priority="2" Title="Enums"&gt;&lt;Descriptor Static="Indeterminate" Constexpr="Indeterminate" Const="Indeterminate" Volatile="Indeterminate" Accessibility="NOT_APPLICABLE"&gt;&lt;type Name="enum" /&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" WarnAboutPrefixesAndSuffixes="False" Prefix="" Suffix="" Style="AaBb" /&gt;&lt;/NamingElement&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AI/@EntryIndexedValue">AI</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ARGB/@EntryIndexedValue">ARGB</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=LO/@EntryIndexedValue">LO</s:String>
@@ -188,7 +170,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>
@@ -231,7 +213,6 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=YZ/@EntryIndexedValue">YZ</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PublicFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb"&gt;&lt;ExtraRule Prefix="_" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
 	<s:String x:Key="/Default/Environment/Hierarchy/PsiConfigurationSettingsKey/CustomLocation/@EntryValue">C:\Users\Wojtek\AppData\Local\JetBrains\Transient\ReSharperPlatformVs15\v08_f9eacea9\SolutionCaches</s:String>
-	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EFeature_002EServices_002ECpp_002ECodeStyle_002ENaming_002ECppNamingOptionsMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EFeature_002EServices_002ECpp_002ECodeStyle_002ESettingsUpgrade_002EFunctionReturnStyleSettingsUpgrader/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EFeature_002EServices_002ECpp_002ECodeStyle_002ESettingsUpgrade_002ENamespaceIndentationSettingsUpgrader/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpAttributeForSingleLineMethodUpgrade/@EntryIndexedValue">True</s:Boolean>

GenerateProjectFiles.sh

@@ -14,4 +14,4 @@ bash ./Development/Scripts/Linux/CallBuildTool.sh --genproject "$@"
 # Build bindings for all editor configurations
 echo Building C# bindings...
 # TODO: Detect the correct architecture here
-Binaries/Tools/Flax.Build -build -BuildBindingsOnly -arch=x64 -platform=Linux --buildTargets=FlaxEditor
+#Binaries/Tools/Flax.Build -build -BuildBindingsOnly -arch=x64 -platform=Linux --buildTargets=FlaxEditor

ISSUE_TEMPLATE.md

@@ -0,0 +1,19 @@
+<!-- Please search existing issues for potential duplicates before filing yours:
+https://github.com/flaxengine/FlaxEngine/issues?q=is%3Aissue
+-->
+
+**Issue description:**
+<!-- What happened, and what was expected. -->
+<!-- Log file, can be found in the project directory's `Logs` folder (optional) -->
+
+**Steps to reproduce:**
+<!-- Enter minimal reproduction steps if available. -->
+
+
+**Minimal reproduction project:**
+<!-- Recommended as it greatly speeds up debugging. Drag and drop a zip archive to upload it. -->
+
+
+**Flax version:**
+<!-- Specify version number. -->
+

README.md

@@ -49,7 +49,7 @@ Follow the instructions below to compile and run the engine from source.
   * Fedora: `sudo dnf install dotnet-sdk-8.0`
   * Arch: `sudo pacman -S dotnet-sdk-8.0 dotnet-runtime-8.0 dotnet-targeting-pack-8.0 dotnet-host`
 * Install Vulkan SDK ([https://vulkan.lunarg.com/](https://vulkan.lunarg.com/))
-  * Ubuntu: `sudo apt install vulkan-sdk` (deprecated, follow official docs)
+  * Ubuntu: `sudo apt install vulkan-sdk`
   * Fedora: `sudo dnf install vulkan-headers vulkan-tools vulkan-validation-layers`
   * Arch: `sudo pacman -S vulkan-headers vulkan-tools vulkan-validation-layers`
 * Install Git with LFS
@@ -57,10 +57,10 @@ Follow the instructions below to compile and run the engine from source.
   * Arch: `sudo pacman -S git git-lfs`
   * `git-lfs install`
 * Install the required packages:
-  * Ubuntu: `sudo apt-get install libx11-dev libxcursor-dev libxinerama-dev zlib1g-dev`
-  * Fedora: `sudo dnf install libX11-devel libXcursor-devel  libXinerama-devel ghc-zlib-devel`
-  * Arch: `sudo pacman -S base-devel libx11 libxcursor libxinerama zlib`
-* Install Clang compiler (version 14 or later):
+  * Ubuntu: `sudo apt-get install libx11-dev libxcursor-dev libxinerama-dev zlib1g-dev zenity wayland-protocols libportal-dev`
+  * Fedora: `sudo dnf install libX11-devel libXcursor-devel  libXinerama-devel ghc-zlib-devel zenity wayland-protocols-devel libportal`
+  * Arch: `sudo pacman -S base-devel libx11 libxcursor libxinerama zlib zenity wayland-protocols libportal`
+* Install Clang compiler (version 6 or later):
   * Ubuntu: `sudo apt-get install clang lldb lld`
   * Fedora: `sudo dnf install clang llvm lldb lld`
   * Arch: `sudo pacman -S clang lldb lld`

Source/Editor/Content/Create/PrefabCreateEntry.cs

@@ -117,8 +117,7 @@ namespace FlaxEditor.Content.Create
 
             private static bool IsValid(Type type)
             {
-                var controlTypes = Editor.Instance.CodeEditing.Controls.Get();
-                return (type.IsPublic || type.IsNestedPublic) && !type.IsAbstract && !type.IsGenericType && controlTypes.Contains(new ScriptType(type));
+                return (type.IsPublic || type.IsNestedPublic) && !type.IsAbstract && !type.IsGenericType;
             }
         }
 

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/VisualScriptItem.cs

@@ -281,13 +281,6 @@ namespace FlaxEditor.Content
 
         private void CacheData()
         {
-            if (!_asset)
-            {
-                _parameters = Utils.GetEmptyArray<ScriptMemberInfo>();
-                _methods = Utils.GetEmptyArray<ScriptMemberInfo>();
-                _attributes = Utils.GetEmptyArray<Attribute>();
-                return;
-            }
             if (_parameters != null)
                 return;
             if (_asset.WaitForLoaded())
@@ -351,13 +344,13 @@ namespace FlaxEditor.Content
         }
 
         /// <inheritdoc />
-        public string Name => _asset ? Path.GetFileNameWithoutExtension(_asset.Path) : null;
+        public string Name => Path.GetFileNameWithoutExtension(_asset.Path);
 
         /// <inheritdoc />
         public string Namespace => string.Empty;
 
         /// <inheritdoc />
-        public string TypeName => _asset ? JsonSerializer.GetStringID(_asset.ID) : null;
+        public string TypeName => JsonSerializer.GetStringID(_asset.ID);
 
         /// <inheritdoc />
         public bool IsPublic => true;

Source/Editor/Content/Proxy/AssetProxy.cs

@@ -130,11 +130,6 @@ namespace FlaxEditor.Content
             eyeAdaptation.Mode = EyeAdaptationMode.None;
             eyeAdaptation.OverrideFlags |= EyeAdaptationSettingsOverride.Mode;
             preview.PostFxVolume.EyeAdaptation = eyeAdaptation;
-
-            var antiAliasing = preview.PostFxVolume.AntiAliasing;
-            antiAliasing.Mode = AntialiasingMode.FastApproximateAntialiasing;
-            antiAliasing.OverrideFlags |= AntiAliasingSettingsOverride.Mode;
-            preview.PostFxVolume.AntiAliasing = antiAliasing;
         }
     }
 }

Source/Editor/Cooker/CookingData.h

@@ -20,6 +20,13 @@ class PlatformTools;
 #define GAME_BUILD_DOTNET_RUNTIME_MAX_VER 9
 #endif
 
+#if OFFICIAL_BUILD
+// Use the fixed .NET SDK version in packaged builds for compatibility (FlaxGame is precompiled with it)
+#define GAME_BUILD_DOTNET_VER TEXT("-dotnet=" MACRO_TO_STR(GAME_BUILD_DOTNET_RUNTIME_MIN_VER))
+#else
+#define GAME_BUILD_DOTNET_VER TEXT("")
+#endif
+
 /// <summary>
 /// Game building options. Used as flags.
 /// </summary>
@@ -141,11 +148,6 @@ API_ENUM() enum class BuildPlatform
     /// </summary>
     API_ENUM(Attributes="EditorDisplay(null, \"Windows ARM64\")")
     WindowsARM64 = 15,
-
-    /// <summary>
-    /// Web
-    /// </summary>
-    Web = 16,
 };
 
 /// <summary>
@@ -193,11 +195,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);
@@ -377,8 +374,6 @@ public:
     /// </summary>
     void GetBuildPlatformName(const Char*& platform, const Char*& architecture) const;
 
-    String GetDotnetCommandArg() const;
-
 public:
 
     /// <summary>

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,23 +307,11 @@ 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.");
     }
 }
 
-String CookingData::GetDotnetCommandArg() const
-{
-    int32 version = Tools->GetDotnetVersion();
-    if (version == 0)
-        return String::Empty;
-    return String::Format(TEXT("-dotnet={}"), version);
-}
-
 void CookingData::StepProgress(const String& info, const float stepProgress) const
 {
     const float singleStepProgress = 1.0f / (StepsCount + 1);
@@ -473,11 +453,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 +596,6 @@ void GameCooker::GetCurrentPlatform(PlatformType& platform, BuildPlatform& build
     case PlatformType::iOS:
         buildPlatform = BuildPlatform::iOSARM64;
         break;
-    case PlatformType::Web:
-        buildPlatform = BuildPlatform::Web;
-        break;
     default: ;
     }
 }
@@ -703,7 +675,8 @@ bool GameCookerImpl::Build()
 
     MCore::Thread::Attach();
 
-    // Build start
+    // Build Started
+    if (!EnumHasAnyFlags(data.Options, BuildOptions::NoCook))
     {
         CallEvent(GameCooker::EventType::BuildStarted);
         data.Tools->OnBuildStarted(data);
@@ -776,8 +749,8 @@ bool GameCookerImpl::Build()
     }
     IsRunning = false;
     CancelFlag = 0;
+    if (!EnumHasAnyFlags(data.Options, BuildOptions::NoCook))
     {
-        // Build end
         for (int32 stepIndex = 0; stepIndex < Steps.Count(); stepIndex++)
             Steps[stepIndex]->OnBuildEnded(data, failed);
         data.Tools->OnBuildEnded(data, failed);

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/GDK/GDKPlatformTools.cpp

@@ -15,32 +15,26 @@
 #include "Editor/ProjectInfo.h"
 #include "Editor/Utilities/EditorUtilities.h"
 
-String GetGDK()
+GDKPlatformTools::GDKPlatformTools()
 {
-    String gdk;
-    Platform::GetEnvironmentVariable(TEXT("GameDKLatest"), gdk);
-    if (gdk.IsEmpty() || !FileSystem::DirectoryExists(gdk))
+    // Find GDK
+    Platform::GetEnvironmentVariable(TEXT("GameDKLatest"), _gdkPath);
+    if (_gdkPath.IsEmpty() || !FileSystem::DirectoryExists(_gdkPath))
     {
-        gdk.Clear();
-        Platform::GetEnvironmentVariable(TEXT("GRDKLatest"), gdk);
-        if (gdk.IsEmpty() || !FileSystem::DirectoryExists(gdk))
+        _gdkPath.Clear();
+        Platform::GetEnvironmentVariable(TEXT("GRDKLatest"), _gdkPath);
+        if (_gdkPath.IsEmpty() || !FileSystem::DirectoryExists(_gdkPath))
         {
-            gdk.Clear();
+            _gdkPath.Clear();
         }
         else
         {
-            if (gdk.EndsWith(TEXT("GRDK\\")))
-                gdk.Remove(gdk.Length() - 6);
-            else if (gdk.EndsWith(TEXT("GRDK")))
-                gdk.Remove(gdk.Length() - 5);
+            if (_gdkPath.EndsWith(TEXT("GRDK\\")))
+                _gdkPath.Remove(_gdkPath.Length() - 6);
+            else if (_gdkPath.EndsWith(TEXT("GRDK")))
+                _gdkPath.Remove(_gdkPath.Length() - 5);
         }
     }
-    return gdk;
-}
-
-GDKPlatformTools::GDKPlatformTools()
-{
-    _gdkPath = GetGDK();
 }
 
 DotNetAOTModes GDKPlatformTools::UseAOT() const
@@ -127,7 +121,7 @@ bool GDKPlatformTools::OnPostProcess(CookingData& data, GDKPlatformSettings* pla
         validName.Add('\0');
 
         sb.Append(TEXT("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"));
-        sb.Append(TEXT("<Game configVersion=\"1\">\n"));
+        sb.Append(TEXT("<Game configVersion=\"0\">\n"));
         sb.AppendFormat(TEXT("  <Identity Name=\"{0}\" Publisher=\"{1}\" Version=\"{2}\"/>\n"),
                         validName.Get(),
                         platformSettings->PublisherName.HasChars() ? platformSettings->PublisherName : TEXT("CN=") + gameSettings->CompanyName,
@@ -201,9 +195,4 @@ bool GDKPlatformTools::OnPostProcess(CookingData& data, GDKPlatformSettings* pla
     return false;
 }
 
-int32 GDKPlatformTools::GetDotnetVersion() const
-{
-    return GAME_BUILD_DOTNET_RUNTIME_MIN_VER;
-}
-
 #endif

Source/Editor/Cooker/Platform/GDK/GDKPlatformTools.h

@@ -26,7 +26,6 @@ public:
 public:
 
     // [PlatformTools]
-    int32 GetDotnetVersion() const override;
     DotNetAOTModes UseAOT() const override;
     bool OnDeployBinaries(CookingData& data) override;
 };

Source/Editor/Cooker/Platform/Mac/MacPlatformTools.cpp

@@ -231,8 +231,6 @@ bool MacPlatformTools::OnPostProcess(CookingData& data)
     LOG(Info, "Building app package...");
     {
         const String dmgPath = data.OriginalOutputPath / appName + TEXT(".dmg");
-        if (FileSystem::FileExists(dmgPath))
-            FileSystem::DeleteFile(dmgPath);
         CreateProcessSettings procSettings;
         procSettings.HiddenWindow = true;
         procSettings.WorkingDirectory = data.OriginalOutputPath;

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

@@ -1,157 +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/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 "Editor/Cooker/GameCooker.h"
-
-IMPLEMENT_SETTINGS_GETTER(WebPlatformSettings, WebPlatform);
-
-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::NoDotnet;
-}
-
-PixelFormat WebPlatformTools::GetTextureFormat(CookingData& data, TextureBase* texture, PixelFormat format)
-{
-    // TODO: texture compression for Web (eg. ASTC for mobile and BC for others?)
-    return PixelFormatExtensions::FindUncompressedFormat(format);
-}
-
-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 build the 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 (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;
-    }
-
-    // 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;
-        }
-    }
-
-    // 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");
-        if (!gameJsText.Contains(filesIncludeBegin))
-        {
-            // Insert generated files.js into the main game file after the minimum_runtime_check.js include
-            String fileJsText;
-            String fileJs = data.OriginalOutputPath / TEXT("files.js");
-            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);
-            CHECK_RETURN(location != -1, true);
-            location += insertPrefixLocation.Length() + 1;
-            fileJsText = filesIncludeBegin + TEXT("\n") + fileJsText + TEXT("\n") + filesIncludeEnd + TEXT("\n");
-            gameJsText.Insert(location, fileJsText);
-            File::WriteAllText(gameJs, gameJsText, Encoding::UTF8);
-        }
-    }
-
-    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,27 +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;
-    bool IsNativeCodeFile(CookingData& data, const String& file) override;
-    void OnBuildStarted(CookingData& data) override;
-    bool OnPostProcess(CookingData& data) override;
-};
-
-#endif

Source/Editor/Cooker/Platform/Windows/WindowsPlatformTools.cpp

@@ -528,9 +528,6 @@ bool WindowsPlatformTools::OnDeployBinaries(CookingData& data)
 
 void WindowsPlatformTools::OnBuildStarted(CookingData& data)
 {
-    if (EnumHasAllFlags(data.Options, BuildOptions::NoCook))
-        return;
-
     // Remove old executable
     Array<String> files;
     FileSystem::DirectoryGetFiles(files, data.NativeCodeOutputPath, TEXT("*.exe"), DirectorySearchOption::TopDirectoryOnly);

Source/Editor/Cooker/PlatformTools.h

@@ -70,20 +70,6 @@ public:
     /// </summary>
     virtual ArchitectureType GetArchitecture() const = 0;
 
-    /// <summary>
-    /// Gets the .Net version to use for the cooked game.
-    /// </summary>
-    virtual int32 GetDotnetVersion() const
-    {
-#if OFFICIAL_BUILD
-        // Use the fixed .NET SDK version in packaged builds for compatibility (FlaxGame is precompiled with it)
-        return GAME_BUILD_DOTNET_RUNTIME_MIN_VER;
-#else
-        // Use the highest version found on a system (Flax.Build will decide)
-        return 0;
-#endif
-    }
-
     /// <summary>
     /// Gets the value indicating whenever platform requires AOT (needs C# assemblies to be precompiled).
     /// </summary>

Source/Editor/Cooker/Steps/CompileScriptsStep.cpp

@@ -10,10 +10,9 @@
 #include "Engine/Serialization/JsonTools.h"
 #include "Engine/Serialization/JsonWriters.h"
 #include "Editor/Cooker/PlatformTools.h"
-#include "Engine/Engine/Globals.h"
 #include "Editor/Editor.h"
 #include "Editor/ProjectInfo.h"
-#include "Editor/Utilities/EditorUtilities.h"
+#include "Engine/Engine/Globals.h"
 #if PLATFORM_MAC
 #include <sys/stat.h>
 #endif
@@ -128,7 +127,7 @@ bool CompileScriptsStep::DeployBinaries(CookingData& data, const String& path, c
         const String dst = dstPath / StringUtils::GetFileName(file);
         if (dst == file)
             continue;
-        if (EditorUtilities::CopyFileIfNewer(dst, file))
+        if (FileSystem::CopyFile(dst, file))
         {
             data.Error(String::Format(TEXT("Failed to copy file from {0} to {1}."), file, dst));
             return true;
@@ -190,7 +189,7 @@ bool CompileScriptsStep::Perform(CookingData& data)
     const String logFile = data.CacheDirectory / TEXT("CompileLog.txt");
     auto args = String::Format(
         TEXT("-log -logfile=\"{4}\" -build -mutex -buildtargets={0} -platform={1} -arch={2} -configuration={3} -aotMode={5} {6}"),
-        target, platform, architecture, configuration, logFile, ToString(data.Tools->UseAOT()), data.GetDotnetCommandArg());
+        target, platform, architecture, configuration, logFile, ToString(data.Tools->UseAOT()), GAME_BUILD_DOTNET_VER);
 #if PLATFORM_WINDOWS
     if (data.Platform == BuildPlatform::LinuxX64)
 #elif PLATFORM_LINUX

Source/Editor/Cooker/Steps/CookAssetsStep.cpp

@@ -526,7 +526,6 @@ bool ProcessShaderBase(CookAssetsStep::AssetCookData& data, ShaderAssetBase* ass
 #if PLATFORM_TOOLS_XBOX_SCARLETT
     case BuildPlatform::XboxScarlett:
     {
-        options.Platform = PlatformType::XboxScarlett;
         const char* platformDefineName = "PLATFORM_XBOX_SCARLETT";
         COMPILE_PROFILE(DirectX_SM6, SHADER_FILE_CHUNK_INTERNAL_D3D_SM6_CACHE);
         break;
@@ -572,14 +571,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";
-        // TODO: compile shaders for WebGPU
-        break;
-    }
 #endif
     default:
     {
@@ -1376,10 +1367,7 @@ bool CookAssetsStep::Perform(CookingData& data)
             {
                 typeName = e.TypeName;
             }
-            if (e.Count == 1)
-                LOG(Info, "{0}:    1 asset  of total size {1}", typeName, Utilities::BytesToText(e.ContentSize));
-            else
-                LOG(Info, "{0}: {1:>4} assets of total size {2}", typeName, e.Count, Utilities::BytesToText(e.ContentSize));
+            LOG(Info, "{0}: {1:>4} assets of total size {2}", typeName, e.Count, Utilities::BytesToText(e.ContentSize));
         }
         LOG(Info, "");
     }

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)
-    {
-        // No .NET
-        FileSystem::DeleteDirectory(dstDotnet);
-    }
-    else if (buildSettings.SkipDotnetPackaging && data.Tools->UseSystemDotnet())
+    if (buildSettings.SkipDotnetPackaging && data.Tools->UseSystemDotnet())
     {
         // Use system-installed .NET Runtime
         FileSystem::DeleteDirectory(dstDotnet);
-        LOG(Info, "Not using .NET Runtime");
     }
     else
     {
@@ -94,7 +88,7 @@ bool DeployDataStep::Perform(CookingData& data)
             {
                 // Ask Flax.Build to provide .NET SDK location for the current platform
                 String sdks;
-                bool failed = ScriptsBuilder::RunBuildTool(String::Format(TEXT("-log -logMessagesOnly -logFileWithConsole -logfile=SDKs.txt -printSDKs {}"), data.GetDotnetCommandArg()), data.CacheDirectory);
+                bool failed = ScriptsBuilder::RunBuildTool(String::Format(TEXT("-log -logMessagesOnly -logFileWithConsole -logfile=SDKs.txt -printSDKs {}"), GAME_BUILD_DOTNET_VER), data.CacheDirectory);
                 failed |= File::ReadAllText(data.CacheDirectory / TEXT("SDKs.txt"), sdks);
                 int32 idx = sdks.Find(TEXT("DotNetSdk, "), StringSearchCase::CaseSensitive);
                 if (idx != -1)
@@ -206,7 +200,7 @@ bool DeployDataStep::Perform(CookingData& data)
                 String sdks;
                 const Char *platformName, *archName;
                 data.GetBuildPlatformName(platformName, archName);
-                String args = String::Format(TEXT("-log -logMessagesOnly -logFileWithConsole -logfile=SDKs.txt -printDotNetRuntime -platform={} -arch={} {}"), platformName, archName, data.GetDotnetCommandArg());
+                String args = String::Format(TEXT("-log -logMessagesOnly -logFileWithConsole -logfile=SDKs.txt -printDotNetRuntime -platform={} -arch={} {}"), platformName, archName, GAME_BUILD_DOTNET_VER);
                 bool failed = ScriptsBuilder::RunBuildTool(args, data.CacheDirectory);
                 failed |= File::ReadAllText(data.CacheDirectory / TEXT("SDKs.txt"), sdks);
                 Array<String> parts;
@@ -250,13 +244,10 @@ bool DeployDataStep::Perform(CookingData& data)
                     }
                     if (version.IsEmpty())
                     {
-                        int32 minVer = GAME_BUILD_DOTNET_RUNTIME_MIN_VER, maxVer = GAME_BUILD_DOTNET_RUNTIME_MAX_VER;
                         if (srcDotnetFromEngine)
                         {
                             // Detect version from runtime files inside Engine Platform folder
-                            if (data.Tools->GetDotnetVersion() != 0)
-                                minVer = maxVer = data.Tools->GetDotnetVersion();
-                            for (int32 i = maxVer; i >= minVer; i--)
+                            for (int32 i = GAME_BUILD_DOTNET_RUNTIME_MAX_VER; i >= GAME_BUILD_DOTNET_RUNTIME_MIN_VER; i--)
                             {
                                 // Check runtime files inside Engine Platform folder
                                 String testPath1 = srcDotnet / String::Format(TEXT("lib/net{}.0"), i);
@@ -271,7 +262,7 @@ bool DeployDataStep::Perform(CookingData& data)
                         }
                         if (version.IsEmpty())
                         {
-                            data.Error(String::Format(TEXT("Failed to find supported .NET {} version (min {}) for {} platform."), maxVer, minVer, platformName));
+                            data.Error(String::Format(TEXT("Failed to find supported .NET {} version for the current host platform."), GAME_BUILD_DOTNET_RUNTIME_MIN_VER));
                             return true;
                         }
                     }
@@ -373,7 +364,7 @@ bool DeployDataStep::Perform(CookingData& data)
             const String logFile = data.CacheDirectory / TEXT("StripDotnetLibs.txt");
             String args = String::Format(
                 TEXT("-log -logfile=\"{}\" -runDotNetClassLibStripping -mutex -binaries=\"{}\" {}"),
-                logFile, data.DataOutputPath, data.GetDotnetCommandArg());
+                logFile, data.DataOutputPath, GAME_BUILD_DOTNET_VER);
             for (const String& define : data.CustomDefines)
             {
                 args += TEXT(" -D");

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 || 
-        aotMode == DotNetAOTModes::NoDotnet || 
-        EnumHasAllFlags(data.Options, BuildOptions::NoCook))
+    if (aotMode == DotNetAOTModes::None)
         return;
     const auto& buildSettings = *BuildSettings::Get();
 
@@ -51,8 +49,7 @@ void PrecompileAssembliesStep::OnBuildStarted(CookingData& data)
 bool PrecompileAssembliesStep::Perform(CookingData& data)
 {
     const DotNetAOTModes aotMode = data.Tools->UseAOT();
-    if (aotMode == DotNetAOTModes::None ||
-        aotMode == DotNetAOTModes::NoDotnet)
+    if (aotMode == DotNetAOTModes::None)
         return false;
     const auto& buildSettings = *BuildSettings::Get();
     if (buildSettings.SkipDotnetPackaging && data.Tools->UseSystemDotnet())
@@ -62,7 +59,6 @@ bool PrecompileAssembliesStep::Perform(CookingData& data)
     data.StepProgress(infoMsg, 0);
 
     // Override Newtonsoft.Json with AOT-version (one that doesn't use System.Reflection.Emit)
-    // TODO: remove it since EngineModule does properly reference AOT lib now
     EditorUtilities::CopyFileIfNewer(data.ManagedCodeOutputPath / TEXT("Newtonsoft.Json.dll"), Globals::StartupFolder / TEXT("Source/Platforms/DotNet/AOT/Newtonsoft.Json.dll"));
     FileSystem::DeleteFile(data.ManagedCodeOutputPath / TEXT("Newtonsoft.Json.xml"));
     FileSystem::DeleteFile(data.ManagedCodeOutputPath / TEXT("Newtonsoft.Json.pdb"));
@@ -73,7 +69,7 @@ bool PrecompileAssembliesStep::Perform(CookingData& data)
     const String logFile = data.CacheDirectory / TEXT("AOTLog.txt");
     String args = String::Format(
         TEXT("-log -logfile=\"{}\" -runDotNetAOT -mutex -platform={} -arch={} -configuration={} -aotMode={} -binaries=\"{}\" -intermediate=\"{}\" {}"),
-        logFile, platform, architecture, configuration, ToString(aotMode), data.DataOutputPath, data.ManagedCodeOutputPath, data.GetDotnetCommandArg());
+        logFile, platform, architecture, configuration, ToString(aotMode), data.DataOutputPath, data.ManagedCodeOutputPath, GAME_BUILD_DOTNET_VER);
     if (!buildSettings.SkipUnusedDotnetLibsPackaging)
         args += TEXT(" -skipUnusedDotnetLibs=false"); // Run AOT on whole class library (not just used libs)
     for (const String& define : data.CustomDefines)

Source/Editor/CustomEditorWindow.cs

@@ -18,8 +18,8 @@ namespace FlaxEditor
             private readonly CustomEditorPresenter _presenter;
             private CustomEditorWindow _customEditor;
 
-            public Win(CustomEditorWindow customEditor, bool hideOnClose, ScrollBars scrollBars)
-            : base(Editor.Instance, hideOnClose, scrollBars)
+            public Win(CustomEditorWindow customEditor)
+            : base(Editor.Instance, false, ScrollBars.Vertical)
             {
                 Title = customEditor.GetType().Name;
                 _customEditor = customEditor;
@@ -64,9 +64,9 @@ namespace FlaxEditor
         /// <summary>
         /// Initializes a new instance of the <see cref="CustomEditorWindow"/> class.
         /// </summary>
-        protected CustomEditorWindow(bool hideOnClose = false, ScrollBars scrollBars = ScrollBars.Vertical)
+        protected CustomEditorWindow()
         {
-            _win = new Win(this, hideOnClose, scrollBars);
+            _win = new Win(this);
             ScriptsBuilder.ScriptsReloadBegin += OnScriptsReloadBegin;
         }
 

Source/Editor/CustomEditors/CustomEditor.cs

@@ -749,15 +749,6 @@ namespace FlaxEditor.CustomEditors
             }
         }
 
-        private Actor FindActor(CustomEditor editor)
-        {
-            if (editor.Values[0] is Actor actor)
-                return actor;
-            if (editor.ParentEditor != null)
-                return FindActor(editor.ParentEditor);
-            return null;
-        }
-
         private Actor FindPrefabRoot(CustomEditor editor)
         {
             if (editor.Values[0] is Actor actor)
@@ -776,35 +767,32 @@ namespace FlaxEditor.CustomEditors
             return FindPrefabRoot(actor.Parent);
         }
 
-        private SceneObject FindObjectWithPrefabObjectId(Actor actor, ref Guid prefabObjectId, Actor endPoint)
+        private SceneObject FindObjectWithPrefabObjectId(Actor actor, ref Guid prefabObjectId)
         {
-            var visited = new HashSet<Actor>();
-            return FindObjectWithPrefabObjectId(actor, ref prefabObjectId, endPoint, visited);
-        }
-
-        private SceneObject FindObjectWithPrefabObjectId(Actor actor, ref Guid prefabObjectId, Actor endPoint, HashSet<Actor> visited)
-        {
-            if (visited.Contains(actor) || actor is Scene || actor == endPoint)
-                return null;
             if (actor.PrefabObjectID == prefabObjectId)
                 return actor;
 
             for (int i = 0; i < actor.ScriptsCount; i++)
             {
-                var script = actor.GetScript(i);
-                if (script != null && script.PrefabObjectID == prefabObjectId)
-                    return script;
+                if (actor.GetScript(i).PrefabObjectID == prefabObjectId)
+                {
+                    var a = actor.GetScript(i);
+                    if (a != null)
+                        return a;
+                }
             }
 
             for (int i = 0; i < actor.ChildrenCount; i++)
             {
-                var child = actor.GetChild(i);
-                if (child != null && child.PrefabObjectID == prefabObjectId)
-                    return child;
+                if (actor.GetChild(i).PrefabObjectID == prefabObjectId)
+                {
+                    var a = actor.GetChild(i);
+                    if (a != null)
+                        return a;
+                }
             }
 
-            // Go up in the hierarchy
-            return FindObjectWithPrefabObjectId(actor.Parent, ref prefabObjectId, endPoint, visited);
+            return null;
         }
 
         /// <summary>
@@ -838,7 +826,7 @@ namespace FlaxEditor.CustomEditors
                 }
 
                 var prefabObjectId = referenceSceneObject.PrefabObjectID;
-                var prefabInstanceRef = FindObjectWithPrefabObjectId(FindActor(this), ref prefabObjectId, prefabInstanceRoot);
+                var prefabInstanceRef = FindObjectWithPrefabObjectId(prefabInstanceRoot, ref prefabObjectId);
                 if (prefabInstanceRef == null)
                 {
                     Editor.LogWarning("Missing prefab instance reference in the prefab instance. Cannot revert to it.");

Source/Editor/CustomEditors/CustomEditorPresenter.cs

@@ -63,11 +63,6 @@ namespace FlaxEditor.CustomEditors
         /// Indication of if the properties window is locked on specific objects.
         /// </summary>
         public bool LockSelection { get; set; }
-
-        /// <summary>
-        /// Gets the scene editing context.
-        /// </summary>
-        public ISceneEditingContext SceneContext { get; }
     }
 
     /// <summary>

Source/Editor/CustomEditors/CustomEditorsUtil.cs

@@ -87,11 +87,8 @@ namespace FlaxEditor.CustomEditors
             var targetTypeType = TypeUtils.GetType(targetType);
             if (canUseRefPicker)
             {
-                // TODO: add generic way of CustomEditor for ref pickers (use it on AssetRefEditor/GPUTextureEditor/...)
                 if (typeof(Asset).IsAssignableFrom(targetTypeType))
                     return new AssetRefEditor();
-                if (typeof(GPUTexture).IsAssignableFrom(targetTypeType))
-                    return new GPUTextureEditor();
                 if (typeof(FlaxEngine.Object).IsAssignableFrom(targetTypeType))
                     return new FlaxObjectRefEditor();
             }

Source/Editor/CustomEditors/Dedicated/ActorEditor.cs

@@ -1,5 +1,8 @@
 // Copyright (c) Wojciech Figat. All rights reserved.
 
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using FlaxEditor.Actions;
 using FlaxEditor.CustomEditors.Editors;
 using FlaxEditor.CustomEditors.Elements;
@@ -7,14 +10,12 @@ using FlaxEditor.GUI;
 using FlaxEditor.GUI.ContextMenu;
 using FlaxEditor.GUI.Tree;
 using FlaxEditor.Scripting;
+using FlaxEditor.Windows;
 using FlaxEditor.Windows.Assets;
 using FlaxEngine;
 using FlaxEngine.GUI;
 using FlaxEngine.Json;
 using FlaxEngine.Utilities;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 
 namespace FlaxEditor.CustomEditors.Dedicated
 {
@@ -239,12 +240,6 @@ namespace FlaxEditor.CustomEditors.Dedicated
                 node.TextColor = Color.OrangeRed;
                 node.Text = Utilities.Utils.GetPropertyNameUI(removed.PrefabObject.GetType().Name);
             }
-            // Removed Actor
-            else if (editor is RemovedActorDummy removedActor)
-            {
-                node.TextColor = Color.OrangeRed;
-                node.Text = $"{removedActor.PrefabObject.Name} ({Utilities.Utils.GetPropertyNameUI(removedActor.PrefabObject.GetType().Name)})";
-            }
             // Actor or Script
             else if (editor.Values[0] is SceneObject sceneObject)
             {
@@ -300,40 +295,16 @@ namespace FlaxEditor.CustomEditors.Dedicated
                 // Not used
             }
         }
-        
-        private class RemovedActorDummy : CustomEditor
-        {
-            /// <summary>
-            /// The removed prefab object (from the prefab default instance).
-            /// </summary>
-            public Actor PrefabObject;
-
-            /// <summary>
-            /// The prefab instance's parent.
-            /// </summary>
-            public Actor ParentActor;
-
-            /// <summary>
-            /// The order of the removed actor in the parent.
-            /// </summary>
-            public int OrderInParent;
-
-            /// <inheritdoc />
-            public override void Initialize(LayoutElementsContainer layout)
-            {
-                // Not used
-            }
-        }
 
         private TreeNode ProcessDiff(CustomEditor editor, bool skipIfNotModified = true)
         {
-            // Special case for new Script or child actor added to actor
-            if ((editor.Values[0] is Script script && !script.HasPrefabLink) || (editor.Values[0] is Actor a && !a.HasPrefabLink))
+            // Special case for new Script added to actor
+            if (editor.Values[0] is Script script && !script.HasPrefabLink)
                 return CreateDiffNode(editor);
 
             // Skip if no change detected
             var isRefEdited = editor.Values.IsReferenceValueModified;
-            if (!isRefEdited && skipIfNotModified && editor is not ScriptsEditor)
+            if (!isRefEdited && skipIfNotModified)
                 return null;
 
             TreeNode result = null;
@@ -388,44 +359,6 @@ namespace FlaxEditor.CustomEditors.Dedicated
                 }
             }
 
-            // Compare child actors for removed actors.
-            if (editor is ActorEditor && editor.Values.HasReferenceValue && editor.Values.ReferenceValue is Actor prefabObjectActor)
-            {
-                var thisActor = editor.Values[0] as Actor;
-                for (int i = 0; i < prefabObjectActor.ChildrenCount; i++)
-                {
-                    var prefabActorChild = prefabObjectActor.Children[i];
-                    if (thisActor == null)
-                        continue;
-                    bool isRemoved = true;
-                    for (int j = 0; j < thisActor.ChildrenCount; j++)
-                    {
-                        var actorChild = thisActor.Children[j];
-                        if (actorChild.PrefabObjectID == prefabActorChild.PrefabObjectID)
-                        {
-                            isRemoved = false;
-                            break;
-                        }
-                    }
-                    if (isRemoved)
-                    {
-                        var dummy = new RemovedActorDummy
-                        {
-                            PrefabObject = prefabActorChild,
-                            ParentActor = thisActor,
-                            OrderInParent = prefabActorChild.OrderInParent,
-                        };
-                        var child = CreateDiffNode(dummy);
-                        if (result == null)
-                            result = CreateDiffNode(editor);
-                        result.AddChild(child);
-                    }
-                }
-            }
-
-            if (editor is ScriptsEditor && result != null && result.ChildrenCount == 0)
-                return null;
-
             return result;
         }
 
@@ -505,15 +438,6 @@ namespace FlaxEditor.CustomEditors.Dedicated
             Presenter.BuildLayoutOnUpdate();
         }
 
-        private static void GetAllPrefabObjects(List<object> objects, Actor actor)
-        {
-            objects.Add(actor);
-            objects.AddRange(actor.Scripts);
-            var children = actor.Children;
-            foreach (var child in children)
-                GetAllPrefabObjects(objects, child);
-        }
-
         private void OnDiffRevert(CustomEditor editor)
         {
             // Special case for removed Script from actor
@@ -535,22 +459,6 @@ namespace FlaxEditor.CustomEditors.Dedicated
                 return;
             }
 
-            // Special case for reverting removed Actors
-            if (editor is RemovedActorDummy removedActor)
-            {
-                Editor.Log("Reverting removed actor changes to prefab (adding it)");
-
-                var parentActor = removedActor.ParentActor;
-                var restored = parentActor.AddChild(removedActor.PrefabObject.GetType());
-                var prefabId = parentActor.PrefabID;
-                var prefabObjectId = removedActor.PrefabObject.PrefabObjectID;
-                string data = JsonSerializer.Serialize(removedActor.PrefabObject);
-                JsonSerializer.Deserialize(restored, data);
-                Presenter.Owner.SceneContext.Spawn(restored, parentActor, removedActor.OrderInParent);
-                Actor.Internal_LinkPrefab(FlaxEngine.Object.GetUnmanagedPtr(restored), ref prefabId, ref prefabObjectId);
-                return;
-            }
-
             // Special case for new Script added to actor
             if (editor.Values[0] is Script script && !script.HasPrefabLink)
             {
@@ -562,37 +470,8 @@ namespace FlaxEditor.CustomEditors.Dedicated
 
                 return;
             }
-            
-            // Special case for new Actor added to actor
-            if (editor.Values[0] is Actor a && !a.HasPrefabLink)
-            {
-                Editor.Log("Reverting added actor changes to prefab (removing it)");
 
-                // TODO: Keep previous selection.
-                var context = Presenter.Owner.SceneContext;
-                context.Select(SceneGraph.SceneGraphFactory.FindNode(a.ID));
-                context.DeleteSelection();
-
-                return;
-            }
-
-            if (Presenter.Undo != null && Presenter.Undo.Enabled)
-            {
-                var thisActor = (Actor)Values[0];
-                var rootActor = thisActor.IsPrefabRoot ? thisActor : thisActor.GetPrefabRoot();
-                var prefabObjects = new List<object>();
-                GetAllPrefabObjects(prefabObjects, rootActor);
-                using (new UndoMultiBlock(Presenter.Undo, prefabObjects, "Revert to Prefab"))
-                {
-                    editor.RevertToReferenceValue();
-                    editor.RefreshInternal();
-                }
-            }
-            else
-            {
-                editor.RevertToReferenceValue();
-                editor.RefreshInternal();
-            }
+            editor.RevertToReferenceValue();
         }
     }
 }

Source/Editor/CustomEditors/Dedicated/AudioSourceEditor.cs

@@ -13,8 +13,6 @@ namespace FlaxEditor.CustomEditors.Dedicated
     public class AudioSourceEditor : ActorEditor
     {
         private Label _infoLabel;
-        private Slider _slider;
-        private AudioSource.States _slideStartState;
 
         /// <inheritdoc />
         public override void Initialize(LayoutElementsContainer layout)
@@ -30,13 +28,6 @@ namespace FlaxEditor.CustomEditors.Dedicated
                 _infoLabel = playbackGroup.Label(string.Empty).Label;
                 _infoLabel.AutoHeight = true;
 
-                // Play back slider
-                var sliderElement = playbackGroup.CustomContainer<Slider>();
-                _slider = sliderElement.CustomControl;
-                _slider.ThumbSize = new Float2(_slider.ThumbSize.X * 0.5f, _slider.ThumbSize.Y);
-                _slider.SlidingStart += OnSlidingStart;
-                _slider.SlidingEnd += OnSlidingEnd;
-
                 var grid = playbackGroup.UniformGrid();
                 var gridControl = grid.CustomControl;
                 gridControl.ClipChildren = false;
@@ -49,38 +40,6 @@ namespace FlaxEditor.CustomEditors.Dedicated
             }
         }
 
-        private void OnSlidingEnd()
-        {
-            foreach (var value in Values)
-            {
-                if (value is AudioSource audioSource && audioSource.Clip)
-                {
-                    switch (_slideStartState)
-                    {
-                    case AudioSource.States.Playing:
-                        audioSource.Play();
-                        break;
-                    case AudioSource.States.Paused:
-                    case AudioSource.States.Stopped:
-                        audioSource.Pause();
-                        break;
-                    default: break;
-                    }
-                }
-            }
-        }
-
-        private void OnSlidingStart()
-        {
-            foreach (var value in Values)
-            {
-                if (value is AudioSource audioSource && audioSource.Clip)
-                {
-                    _slideStartState = audioSource.State;
-                }
-            }
-        }
-
         /// <inheritdoc />
         public override void Refresh()
         {
@@ -92,29 +51,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
                 foreach (var value in Values)
                 {
                     if (value is AudioSource audioSource && audioSource.Clip)
-                    {
                         text += $"Time: {audioSource.Time:##0.0}s / {audioSource.Clip.Length:##0.0}s\n";
-                        _slider.Maximum = audioSource.Clip.Length;
-                        _slider.Minimum = 0;
-                        if (_slider.IsSliding)
-                        {
-                            if (audioSource.State != AudioSource.States.Playing)
-                            {
-                                // Play to move slider correctly
-                                audioSource.Play();
-                                audioSource.Time = _slider.Value;
-                            }
-                            else
-                            {
-                                audioSource.Time = _slider.Value;
-                            }
-                        }
-                        else
-                        {
-                            _slider.Value = audioSource.Time;
-                        }
-                        
-                    }
                 }
                 _infoLabel.Text = text;
             }

Source/Editor/CustomEditors/Dedicated/EnvironmentProbeEditor.cs

@@ -1,7 +1,6 @@
 // Copyright (c) Wojciech Figat. All rights reserved.
 
 using FlaxEngine;
-using FlaxEngine.GUI;
 
 namespace FlaxEditor.CustomEditors.Dedicated
 {
@@ -12,7 +11,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
     [CustomEditor(typeof(EnvironmentProbe)), DefaultEditor]
     public class EnvironmentProbeEditor : ActorEditor
     {
-        private Button _bake;
+        private FlaxEngine.GUI.Button _bake;
 
         /// <inheritdoc />
         public override void Initialize(LayoutElementsContainer layout)
@@ -21,12 +20,9 @@ namespace FlaxEditor.CustomEditors.Dedicated
 
             if (Values.HasDifferentTypes == false)
             {
-                var group = layout.Group("Probe");
-                group.Panel.ItemsMargin = new Margin(Utilities.Constants.UIMargin * 2);
-                _bake = group.Button("Bake").Button;
+                layout.Space(10);
+                _bake = layout.Button("Bake").Button;
                 _bake.Clicked += BakeButtonClicked;
-                var view = group.Button("View", "Opens the probe texture viewer");
-                view.Button.Clicked += OnViewButtonClicked;
             }
         }
 
@@ -52,14 +48,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/GPUTextureEditor.cs

@@ -1,68 +0,0 @@
-// Copyright (c) Wojciech Figat. All rights reserved.
-
-using FlaxEditor.GUI.ContextMenu;
-using FlaxEngine;
-using FlaxEngine.GUI;
-
-namespace FlaxEditor.CustomEditors.Dedicated
-{
-    /// <summary>
-    /// Basic editor/viewer for <see cref="GPUTexture"/>.
-    /// </summary>
-    [CustomEditor(typeof(GPUTexture)), DefaultEditor]
-    public class GPUTextureEditor : CustomEditor
-    {
-        private Image _image;
-
-        /// <inheritdoc />
-        public override DisplayStyle Style => DisplayStyle.Inline;
-
-        /// <inheritdoc />
-        public override void Initialize(LayoutElementsContainer layout)
-        {
-            _image = new Image
-            {
-                Brush = new GPUTextureBrush(),
-                Size = new Float2(200, 100),
-                Parent = layout.ContainerControl,
-            };
-            _image.Clicked += OnImageClicked;
-        }
-
-        private void OnImageClicked(Image image, MouseButton button)
-        {
-            var texture = Values[0] as GPUTexture;
-            if (!texture || button != MouseButton.Right)
-                return;
-            var menu = new ContextMenu();
-            menu.AddButton("Save...", () => Screenshot.Capture(Values[0] as GPUTexture));
-            menu.AddButton("Enlarge", () => _image.Size *= 2);
-            menu.AddButton("Shrink", () => _image.Size /= 2).Enabled = _image.Height > 32;
-            var location = image.PointFromScreen(Input.MouseScreenPosition);
-            menu.Show(image, location);
-        }
-
-        /// <inheritdoc />
-        public override void Refresh()
-        {
-            base.Refresh();
-
-            var texture = Values[0] as GPUTexture;
-            ((GPUTextureBrush)_image.Brush).Texture = texture;
-            if (texture)
-            {
-                var desc = texture.Description;
-#if BUILD_RELEASE
-                var name = string.Empty;
-#else
-                var name = texture.Name;
-#endif
-                _image.TooltipText = $"{name}\nType: {texture.ResourceType}\nSize: {desc.Width}x{desc.Height}\nFormat: {desc.Format}\nMemory: {Utilities.Utils.FormatBytesCount(texture.MemoryUsage)}";
-            }
-            else
-            {
-                _image.TooltipText = "None";
-            }
-        }
-    }
-}

Source/Editor/CustomEditors/Dedicated/LocalizationSettingsEditor.cs

@@ -195,7 +195,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
                     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).Concat(Directory.GetFiles(Globals.ProjectSourceFolder, "*.hpp", SearchOption.AllDirectories)).ToArray();;
                     filesCount += files.Length;
                     foreach (var file in files)
                         FindNewKeysCpp(file, newKeys, allKeys);