Fixes for Vulkan

Fix crash on Linux with empty log message
Fix UWP build
2022-09-06 22:54:00 +02:00 · 2022-09-06 21:53:14 +02:00 · 2022-09-06 19:35:11 +02:00 · 2022-09-04 21:53:57 +02:00 · 2022-09-04 21:53:49 +02:00 · 2022-09-04 21:51:38 +02:00
1494 changed files with 56008 additions and 30849 deletions
@@ -0,0 +1,21 @@
+name: Build Android
+on: [push, pull_request]
+
+jobs:
+
+  # Game
+  game-windows:
+    name: Game (Android, Release ARM64)
+    runs-on: "windows-2019"
+    steps:
+    - name: Checkout repo
+      uses: actions/checkout@v2
+    - name: Setup Vulkan
+      uses: ./.github/actions/vulkan
+    - name: Checkout LFS
+      run: |
+        git lfs version
+        git lfs pull
+    - name: Build
+      run: |
+        .\Development\Scripts\Windows\CallBuildTool.bat -build -log -arch=ARM64 -platform=Android -configuration=Release -buildtargets=FlaxGame
@@ -29,6 +29,10 @@ jobs:
        ./Development/Scripts/Linux/CallBuildTool.sh -build -log -arch=x64 -platform=Linux -configuration=Debug -buildtargets="Flax.Build.Tests"
    - name: Test
      run: |
-        Binaries/Tests/Linux/x64/Development/FlaxTests
+        Binaries/Editor/Linux/Development/FlaxTests
        mono Source/Platforms/DotNet/NUnit/nunit3-console.exe Binaries/Tools/FlaxEngine.Tests.dll --framework=mono-4.0
        mono Source/Platforms/DotNet/NUnit/nunit3-console.exe Binaries/Tools/Flax.Build.Tests.dll --framework=mono-4.0
+    - name: Test UseLargeWorlds
+      run: |
+        ./Development/Scripts/Linux/CallBuildTool.sh -build -log -arch=x64 -platform=Linux -configuration=Development -buildtargets=FlaxTestsTarget -UseLargeWorlds=true
+        Binaries/Editor/Linux/Development/FlaxTests
@@ -10,6 +10,8 @@ Source/*.csproj
 /Package_*/
 !Source/Engine/Debug
 /Source/Platforms/Editor/Linux/Mono/etc/mono/registry
+PackageEditor_Cert.bat
+PackagePlatforms_Cert.bat

 # User-specific files
 *.suo
@@ -148,5 +150,6 @@ bin/
 obj/
 *.vcxproj.filters
 .vscode/
+.idea/
 *.code-workspace

@@ -25,7 +25,7 @@ void PS_GBuffer(
 #endif
 	)
 {
-	Light = 0;
+	Light = float4(0, 0, 0, 1);
 	
 #if USE_DITHERED_LOD_TRANSITION
 	// LOD masking
@@ -6,6 +6,10 @@
 #include "./Flax/LightingCommon.hlsl"
 #if USE_REFLECTIONS
 #include "./Flax/ReflectionsCommon.hlsl"
+#define MATERIAL_REFLECTIONS_SSR 1
+#if MATERIAL_REFLECTIONS == MATERIAL_REFLECTIONS_SSR
+#include "./Flax/SSR.hlsl"
+#endif
 #endif
 #include "./Flax/Lighting.hlsl"
 #include "./Flax/ShadowsSampling.hlsl"
@@ -93,9 +97,34 @@ float4 PS_Forward(PixelInput input) : SV_Target0
 		light += GetLighting(ViewPos, localLight, gBuffer, shadowMask, true, isSpotLight);
 	}

-#if USE_REFLECTIONS
+	// Calculate lighting from Global Illumination
+#if USE_GI
+	light += GetGlobalIlluminationLighting(gBuffer);
+#endif
+
 	// Calculate reflections
-	light.rgb += GetEnvProbeLighting(ViewPos, EnvProbe, EnvironmentProbe, gBuffer) * light.a;	
+#if USE_REFLECTIONS
+	float3 reflections = SampleReflectionProbe(ViewPos, EnvProbe, EnvironmentProbe, gBuffer.WorldPos, gBuffer.Normal, gBuffer.Roughness).rgb;
+
+#if MATERIAL_REFLECTIONS == MATERIAL_REFLECTIONS_SSR
+	// Screen Space Reflections
+	Texture2D sceneDepthTexture = MATERIAL_REFLECTIONS_SSR_DEPTH; // Material Generator inserts depth and color buffers and plugs it via internal define
+	Texture2D sceneColorTexture = MATERIAL_REFLECTIONS_SSR_COLOR;
+	float2 screenUV = materialInput.SvPosition.xy * ScreenSize.zw;
+	float stepSize = ScreenSize.z; // 1 / screenWidth
+	float maxSamples = 48;
+	float worldAntiSelfOcclusionBias = 0.1f;
+	float brdfBias = 0.82f;
+	float drawDistance = 5000.0f;
+	float3 hit = TraceScreenSpaceReflection(screenUV, gBuffer, sceneDepthTexture, ViewPos, ViewMatrix, ViewProjectionMatrix, stepSize, maxSamples, false, 0.0f, worldAntiSelfOcclusionBias, brdfBias, drawDistance);
+	if (hit.z > 0)
+	{
+		float3 screenColor = sceneColorTexture.SampleLevel(SamplerPointClamp, hit.xy, 0).rgb;
+		reflections = lerp(reflections, screenColor, hit.z);
+	}
+#endif
+
+	light.rgb += reflections * GetReflectionSpecularLighting(ViewPos, gBuffer) * light.a;	
 #endif

 	// Add lighting (apply ambient occlusion)
@@ -0,0 +1,23 @@
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
+
+@0// Global Illumination: Defines
+#define USE_GI 1
+@1// Global Illumination: Includes
+#include "./Flax/GI/DDGI.hlsl"
+#include "./Flax/LightingCommon.hlsl"
+@2// Global Illumination: Constants
+DDGIData DDGI;
+@3// Global Illumination: Resources
+Texture2D<snorm float4> ProbesState : register(t__SRV__);
+Texture2D<float4> ProbesDistance : register(t__SRV__);
+Texture2D<float4> ProbesIrradiance : register(t__SRV__);
+@4// Global Illumination: Utilities
+float4 GetGlobalIlluminationLighting(GBufferSample gBuffer)
+{
+	float3 irradiance = SampleDDGIIrradiance(DDGI, ProbesState, ProbesDistance, ProbesIrradiance, gBuffer.WorldPos, gBuffer.Normal);
+	float3 diffuseColor = GetDiffuseColor(gBuffer);
+	float3 diffuse = Diffuse_Lambert(diffuseColor);
+	return float4(diffuse * irradiance, saturate(length(irradiance)));
+}
+
+@5// Global Illumination: Shaders
@@ -5,6 +5,7 @@
 #include "./Flax/Common.hlsl"
 #include "./Flax/GBufferCommon.hlsl"
 #include "./Flax/Matrix.hlsl"
+#include "./Flax/Noise.hlsl"
@7
 // Primary constant buffer
 META_CB_BEGIN(0, Data)
@@ -62,68 +63,6 @@ float Rand(inout uint seed)
 	return asfloat((seed >> 9) | 0x3f800000) - 1.0f;
 }

-float4 Mod289(float4 x)
-{
-	return x - floor(x * (1.0 / 289.0)) * 289.0;
-}
-
-float4 Perm(float4 x)
-{
-	return Mod289(((x * 34.0) + 1.0) * x);
-}
-
-float Noise(float3 p)
-{
-    float3 a = floor(p);
-    float3 d = p - a;
-    d = d * d * (3.0 - 2.0 * d);
-	
-    float4 b = a.xxyy + float4(0.0, 1.0, 0.0, 1.0);
-    float4 k1 = Perm(b.xyxy);
-    float4 k2 = Perm(k1.xyxy + b.zzww);
-	
-    float4 c = k2 + a.zzzz;
-    float4 k3 = Perm(c);
-    float4 k4 = Perm(c + 1.0);
-	
-    float4 o1 = frac(k3 * (1.0 / 41.0));
-    float4 o2 = frac(k4 * (1.0 / 41.0));
-	
-    float4 o3 = o2 * d.z + o1 * (1.0 - d.z);
-    float2 o4 = o3.yw * d.x + o3.xz * (1.0 - d.x);
-	
-    return o4.y * d.y + o4.x * (1.0 - d.y);
-}
-
-float3 Noise3D(float3 p)
-{
-    float o = Noise(p);
-    float a = Noise(p + float3(0.0001f, 0.0f, 0.0f));
-    float b = Noise(p + float3(0.0f, 0.0001f, 0.0f));
-    float c = Noise(p + float3(0.0f, 0.0f, 0.0001f));
-
-    float3 grad = float3(o - a, o - b, o - c);
-    float3 other = abs(grad.zxy);
-    return normalize(cross(grad,other));
-}
-
-float3 Noise3D(float3 position, int octaves, float roughness)
-{
-	float weight = 0.0f;
-	float3 noise = float3(0.0, 0.0, 0.0);
-	float scale = 1.0f;
-	for (int i = 0; i < octaves; i++)
-	{
-		float curWeight = pow((1.0-((float)i / octaves)), lerp(2.0, 0.2, roughness));
-		
-		noise += Noise3D(position * scale) * curWeight;
-		weight += curWeight;
-		
-		scale *= 1.72531;
-	}
-	return noise / weight;
-}
-
 // Reprojects the world space position from the given UV and raw device depth
 float3 ReprojectPosition(float2 uv, float rawDepth)
 {
@@ -19,6 +19,7 @@ float3 ViewDir;
 float TimeParam;
 float4 ViewInfo;
 float4 ScreenSize;
+float4 ViewSize;
@1META_CB_END

 // Shader resources
@@ -76,8 +76,8 @@ struct VertexOutput
 #if USE_CUSTOM_VERTEX_INTERPOLATORS
 	float4 CustomVSToPS[CUSTOM_VERTEX_INTERPOLATORS_COUNT] : TEXCOORD9;
 #endif
-	float3 InstanceOrigin    : TEXCOORD6;
-	float InstanceParams     : TEXCOORD7; // x-PerInstanceRandom
+	nointerpolation float3 InstanceOrigin : TEXCOORD6;
+	nointerpolation float InstanceParams : TEXCOORD7; // x-PerInstanceRandom
 };

 // Interpolants passed to the pixel shader
@@ -94,8 +94,8 @@ struct PixelInput
 #if USE_CUSTOM_VERTEX_INTERPOLATORS
 	float4 CustomVSToPS[CUSTOM_VERTEX_INTERPOLATORS_COUNT] : TEXCOORD9;
 #endif
-	float3 InstanceOrigin    : TEXCOORD6;
-	float InstanceParams     : TEXCOORD7; // x-PerInstanceRandom
+	nointerpolation float3 InstanceOrigin : TEXCOORD6;
+	nointerpolation float InstanceParams : TEXCOORD7; // x-PerInstanceRandom
 	bool IsFrontFace         : SV_IsFrontFace;
 };

@@ -14,6 +14,8 @@ float4x4 WorldMatrix;
 float4x4 ViewMatrix;
 float4x4 PrevViewProjectionMatrix;
 float4x4 PrevWorldMatrix;
+float4x4 MainViewProjectionMatrix;
+float4 MainScreenSize;
 float3 ViewPos;
 float ViewFar;
 float3 ViewDir;
@@ -43,8 +45,8 @@ struct GeometryData
 #endif
 	float3 WorldNormal : TEXCOORD3;
 	float4 WorldTangent : TEXCOORD4;
-	float3 InstanceOrigin : TEXCOORD5;
-	float2 InstanceParams : TEXCOORD6; // x-PerInstanceRandom, y-LODDitherFactor
+	nointerpolation float3 InstanceOrigin : TEXCOORD5;
+	nointerpolation float2 InstanceParams : TEXCOORD6; // x-PerInstanceRandom, y-LODDitherFactor
 	float3 PrevWorldPosition : TEXCOORD7;
 };

@@ -2,6 +2,8 @@

 Custom fork: [https://github.com/FlaxEngine/mono](https://github.com/FlaxEngine/mono) with custom features for C# assemblies hot-reloading at runtime without domain unload (more: [https://flaxengine.com/blog/flax-facts-16-scripts-hot-reload/](https://flaxengine.com/blog/flax-facts-16-scripts-hot-reload/)).

+Startup docs about building mono: [https://www.mono-project.com/docs/compiling-mono/](https://www.mono-project.com/docs/compiling-mono/)
+
 ### Notes

 Some useful notes and tips for devs:
@@ -2,11 +2,15 @@
  "Name": "Flax",
  "Version": {
    "Major": 1,
-    "Minor": 3,
-    "Build": 6228
+    "Minor": 4,
+    "Build": 6334
  },
  "Company": "Flax",
  "Copyright": "Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.",
  "GameTarget": "FlaxGame",
-  "EditorTarget": "FlaxEditor"
+  "EditorTarget": "FlaxEditor",
+  "Configuration": {
+    "UseCSharp": true,
+    "UseLargeWorlds": false
+  }
 }
@@ -237,6 +237,7 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Ackermann/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=analytics/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Antialiasing/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=ascender/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=backbuffer/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=backbuffers/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=backends/@EntryIndexedValue">True</s:Boolean>
@@ -254,6 +255,7 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=comperand/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=coord/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=cubemap/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=defragmentation/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Delaunay/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Defocus/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Deinitialize/@EntryIndexedValue">True</s:Boolean>
@@ -340,6 +342,7 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=subresource/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=subresources/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=taskbar/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Teleport/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=texcoord/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=texcoords/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=texel/@EntryIndexedValue">True</s:Boolean>
@@ -360,6 +363,7 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Upgrader/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=upgraders/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Visject/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=voxel/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=voxels/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=vsync/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=vtable/@EntryIndexedValue">True</s:Boolean>
@@ -18,9 +18,9 @@ This repository contains full source code of the Flax Engine (excluding NDA-prot

 # Screenshots

+![pbr-rendering](Development/Images/flax-pic-2.jpg "PBR Rendering and Global Illumination")
 ![rendering](Development/Images/flax-pic-1.jpg "Rendering")
 ![performance](Development/Images/flax-pic-3.jpg "High Performance")
-![pbr-rendering](Development/Images/flax-pic-2.jpg "PBR Rendering")

 # Getting started

@@ -18,6 +18,11 @@ indent_size = 4
 indent_style = space
 indent_size = 4

+# Shader files
+[*.{hlsl,shader,glsl}]
+indent_style = space
+indent_size = 4
+
 # XAML files
 [*.xaml]
 indent_style = space
@@ -73,7 +73,7 @@ void EditorAnalytics::StartSession()
    }
    if (ScreenResolution.IsEmpty())
    {
-        const Vector2 desktopSize = Platform::GetDesktopSize();
+        const auto desktopSize = Platform::GetDesktopSize();
        ScreenResolution = StringAnsi(StringUtils::ToString((int32)desktopSize.X)) + "x" + StringAnsi(StringUtils::ToString((int32)desktopSize.Y));
    }
    if (UserLanguage.IsEmpty())
@@ -84,7 +84,7 @@ namespace FlaxEditor.Content.Create
            _settingsEditor = new CustomEditorPresenter(null);
            _settingsEditor.Panel.Parent = panel;

-            _dialogSize = new Vector2(TotalWidth, panel.Bottom);
+            _dialogSize = new Float2(TotalWidth, panel.Bottom);

            _settingsEditor.Select(_entry.Settings);
        }
@@ -102,7 +102,7 @@ namespace FlaxEditor.Content.Create
        {
            base.SetupWindowSettings(ref settings);

-            settings.MinimumSize = new Vector2(300, 400);
+            settings.MinimumSize = new Float2(300, 400);
            settings.HasSizingFrame = true;
        }
    }
@@ -66,7 +66,7 @@ namespace FlaxEditor.Content.GUI
        }

        /// <inheritdoc />
-        public override DragDropEffect OnDragEnter(ref Vector2 location, DragData data)
+        public override DragDropEffect OnDragEnter(ref Float2 location, DragData data)
        {
            base.OnDragEnter(ref location, data);

@@ -80,7 +80,7 @@ namespace FlaxEditor.Content.GUI
        }

        /// <inheritdoc />
-        public override DragDropEffect OnDragMove(ref Vector2 location, DragData data)
+        public override DragDropEffect OnDragMove(ref Float2 location, DragData data)
        {
            base.OnDragMove(ref location, data);

@@ -97,7 +97,7 @@ namespace FlaxEditor.Content.GUI
        }

        /// <inheritdoc />
-        public override DragDropEffect OnDragDrop(ref Vector2 location, DragData data)
+        public override DragDropEffect OnDragDrop(ref Float2 location, DragData data)
        {
            var result = DragDropEffect.None;
            base.OnDragDrop(ref location, data);
@@ -13,7 +13,7 @@ namespace FlaxEditor.Content.GUI
        private DragActors _dragActors;

        /// <inheritdoc />
-        public override DragDropEffect OnDragEnter(ref Vector2 location, DragData data)
+        public override DragDropEffect OnDragEnter(ref Float2 location, DragData data)
        {
            var result = base.OnDragEnter(ref location, data);
            if (result != DragDropEffect.None)
@@ -50,7 +50,7 @@ namespace FlaxEditor.Content.GUI
        }

        /// <inheritdoc />
-        public override DragDropEffect OnDragMove(ref Vector2 location, DragData data)
+        public override DragDropEffect OnDragMove(ref Float2 location, DragData data)
        {
            _validDragOver = false;
            var result = base.OnDragMove(ref location, data);
@@ -72,7 +72,7 @@ namespace FlaxEditor.Content.GUI
        }

        /// <inheritdoc />
-        public override DragDropEffect OnDragDrop(ref Vector2 location, DragData data)
+        public override DragDropEffect OnDragDrop(ref Float2 location, DragData data)
        {
            var result = base.OnDragDrop(ref location, data);
            if (result != DragDropEffect.None)
--- a/Show More
+++ b/Show More