Fix dotnet installation selection on Linux to favor lib over share

#1225

.gitattributes

@@ -1,5 +1,5 @@
 # Set the default behavior, in case people don't have core.autocrlf set.
-* text=auto
+* text=auto eol=lf
 
 # Explicitly declare text files you want to always be normalized and converted to native line endings on checkout.
 *.c text diff=cpp

.github/workflows/build_android.yml

@@ -1,21 +1,36 @@
 name: Build Android
 on: [push, pull_request]
 
+env:
+  DOTNET_NOLOGO: true
+  DOTNET_CLI_TELEMETRY_OPTOUT: false
+
 jobs:
 
   # Game
   game-windows:
     name: Game (Android, Release ARM64)
-    runs-on: "windows-2019"
+    runs-on: "windows-2022"
     steps:
     - name: Checkout repo
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: Setup Vulkan
       uses: ./.github/actions/vulkan
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: 7.0.x
+    - name: Setup .NET Workload
+      run: |
+        dotnet workload install android
+    - name: Print .NET info
+      run: |
+        dotnet --info
+        dotnet workload --info
     - 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
+        .\Development\Scripts\Windows\CallBuildTool.bat -build -log -printSDKs -arch=ARM64 -platform=Android -configuration=Release -buildtargets=FlaxGame

.github/workflows/build_ios.yml

@@ -0,0 +1,36 @@
+name: Build iOS
+on: [push, pull_request]
+
+env:
+  DOTNET_NOLOGO: true
+  DOTNET_CLI_TELEMETRY_OPTOUT: false
+
+jobs:
+
+  # Game
+  game-windows:
+    name: Game (iOS, Release ARM64)
+    runs-on: "macos-latest"
+    steps:
+    - name: Checkout repo
+      uses: actions/checkout@v3
+    - name: Setup Vulkan
+      uses: ./.github/actions/vulkan
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: 7.0.x
+    - name: Setup .NET Workload
+      run: |
+        dotnet workload install ios
+    - name: Print .NET info
+      run: |
+        dotnet --info
+        dotnet workload --info
+    - name: Checkout LFS
+      run: |
+        git lfs version
+        git lfs pull
+    - name: Build
+      run: |
+        ./Development/Scripts/Mac/CallBuildTool.sh -build -log -arch=ARM64 -platform=iOS -configuration=Release -buildtargets=FlaxGame

.github/workflows/build_linux.yml

@@ -1,6 +1,10 @@
 name: Build Linux
 on: [push, pull_request]
 
+env:
+  DOTNET_NOLOGO: true
+  DOTNET_CLI_TELEMETRY_OPTOUT: false
+
 jobs:
 
   # Editor
@@ -9,7 +13,7 @@ jobs:
     runs-on: "ubuntu-20.04"
     steps:
     - name: Checkout repo
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: Install dependencies
       run: |
         sudo rm -f /etc/apt/sources.list.d/*
@@ -18,13 +22,21 @@ jobs:
         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
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: 7.0.x
+    - name: Print .NET info
+      run: |
+        dotnet --info
+        dotnet workload --info
     - name: Checkout LFS
       run: |
         git lfs version
         git lfs pull
     - name: Build
       run: |
-        ./Development/Scripts/Linux/CallBuildTool.sh -build -log -arch=x64 -platform=Linux -configuration=Development -buildtargets=FlaxEditor
+        ./Development/Scripts/Linux/CallBuildTool.sh -build -log -printSDKs -arch=x64 -platform=Linux -configuration=Development -buildtargets=FlaxEditor
 
   # Game
   game-linux:
@@ -32,16 +44,24 @@ jobs:
     runs-on: "ubuntu-20.04"
     steps:
     - name: Checkout repo
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: Install dependencies
       run: |
         sudo apt-get install libx11-dev libxcursor-dev libxinerama-dev
     - name: Setup Vulkan
       uses: ./.github/actions/vulkan
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: 7.0.x
+    - name: Print .NET info
+      run: |
+        dotnet --info
+        dotnet workload --info
     - name: Checkout LFS
       run: |
         git lfs version
         git lfs pull
     - name: Build
       run: |
-        ./Development/Scripts/Linux/CallBuildTool.sh -build -log -arch=x64 -platform=Linux -configuration=Release -buildtargets=FlaxGame
+        ./Development/Scripts/Linux/CallBuildTool.sh -build -log -printSDKs -arch=x64 -platform=Linux -configuration=Release -buildtargets=FlaxGame

.github/workflows/build_mac.yml

@@ -1,6 +1,10 @@
 name: Build macOS
 on: [push, pull_request]
 
+env:
+  DOTNET_NOLOGO: true
+  DOTNET_CLI_TELEMETRY_OPTOUT: false
+
 jobs:
 
   # Editor
@@ -9,16 +13,24 @@ jobs:
     runs-on: "macos-latest"
     steps:
     - name: Checkout repo
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: Setup Vulkan
       uses: ./.github/actions/vulkan
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: 7.0.x
+    - name: Print .NET info
+      run: |
+        dotnet --info
+        dotnet workload --info
     - name: Checkout LFS
       run: |
         git lfs version
         git lfs pull
     - name: Build
       run: |
-        ./Development/Scripts/Mac/CallBuildTool.sh -build -log -arch=x64 -platform=Mac -configuration=Development -buildtargets=FlaxEditor
+        ./Development/Scripts/Mac/CallBuildTool.sh -build -log -printSDKs -arch=x64 -platform=Mac -configuration=Development -buildtargets=FlaxEditor
 
   # Game
   game-mac:
@@ -26,13 +38,21 @@ jobs:
     runs-on: "macos-latest"
     steps:
     - name: Checkout repo
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: Setup Vulkan
       uses: ./.github/actions/vulkan
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: 7.0.x
+    - name: Print .NET info
+      run: |
+        dotnet --info
+        dotnet workload --info
     - name: Checkout LFS
       run: |
         git lfs version
         git lfs pull
     - name: Build
       run: |
-        ./Development/Scripts/Mac/CallBuildTool.sh -build -log -arch=x64 -platform=Mac -configuration=Release -buildtargets=FlaxGame
+        ./Development/Scripts/Mac/CallBuildTool.sh -build -log -printSDKs -arch=x64 -platform=Mac -configuration=Release -buildtargets=FlaxGame

.github/workflows/build_windows.yml

@@ -1,38 +1,58 @@
 name: Build Windows
 on: [push, pull_request]
 
+env:
+  DOTNET_NOLOGO: true
+  DOTNET_CLI_TELEMETRY_OPTOUT: false
+
 jobs:
 
   # Editor
   editor-windows:
     name: Editor (Windows, Development x64)
-    runs-on: "windows-2019"
+    runs-on: "windows-2022"
     steps:
     - name: Checkout repo
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: Setup Vulkan
       uses: ./.github/actions/vulkan
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: 7.0.x
+    - name: Print .NET info
+      run: |
+        dotnet --info
+        dotnet workload --info
     - name: Checkout LFS
       run: |
         git lfs version
         git lfs pull
     - name: Build
       run: |
-        .\Development\Scripts\Windows\CallBuildTool.bat -build -log -arch=x64 -platform=Windows -configuration=Development -buildtargets=FlaxEditor
+        .\Development\Scripts\Windows\CallBuildTool.bat -build -log -printSDKs -arch=x64 -platform=Windows -configuration=Development -buildtargets=FlaxEditor
 
   # Game
   game-windows:
     name: Game (Windows, Release x64)
-    runs-on: "windows-2019"
+    runs-on: "windows-2022"
     steps:
     - name: Checkout repo
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: Setup Vulkan
       uses: ./.github/actions/vulkan
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: 7.0.x
+    - name: Print .NET info
+      run: |
+        dotnet --info
+        dotnet workload --info
     - name: Checkout LFS
       run: |
         git lfs version
         git lfs pull
     - name: Build
       run: |
-        .\Development\Scripts\Windows\CallBuildTool.bat -build -log -arch=x64 -platform=Windows -configuration=Release -buildtargets=FlaxGame
+        .\Development\Scripts\Windows\CallBuildTool.bat -build -log -printSDKs -arch=x64 -platform=Windows -configuration=Release -buildtargets=FlaxGame

.github/workflows/cd.yml

@@ -4,51 +4,71 @@ on:
     - cron: '15 4 * * *'
   workflow_dispatch:
 
+env:
+  DOTNET_NOLOGO: true
+  DOTNET_CLI_TELEMETRY_OPTOUT: false
+
 jobs:
 
   # Windows
   package-windows-editor:
     name: Editor (Windows)
-    runs-on: "windows-2019"
+    runs-on: "windows-2022"
     steps:
     - name: Checkout repo
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: Checkout LFS
       run: |
         git lfs version
         git lfs pull
     - name: Setup Vulkan
       uses: ./.github/actions/vulkan
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: 7.0.x
+    - name: Print .NET info
+      run: |
+        dotnet --info
+        dotnet workload --info
     - name: Build
       run: |
         .\PackageEditor.bat -arch=x64 -platform=Windows -deployOutput=Output
     - name: Upload
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: Windows-Editor
         path: Output/Editor.zip
     - name: Upload
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: Windows-EditorDebugSymbols
         path: Output/EditorDebugSymbols.zip
   package-windows-game:
     name: Game (Windows)
-    runs-on: "windows-2019"
+    runs-on: "windows-2022"
     steps:
     - name: Checkout repo
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: Checkout LFS
       run: |
         git lfs version
         git lfs pull
     - name: Setup Vulkan
       uses: ./.github/actions/vulkan
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: 7.0.x
+    - name: Print .NET info
+      run: |
+        dotnet --info
+        dotnet workload --info
     - name: Build
       run: |
         .\PackagePlatforms.bat -arch=x64 -platform=Windows -deployOutput=Output
     - name: Upload
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: Windows-Game
         path: Output/Windows.zip
@@ -59,7 +79,7 @@ jobs:
     runs-on: "ubuntu-20.04"
     steps:
     - name: Checkout repo
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: Checkout LFS
       run: |
         git lfs version
@@ -72,11 +92,19 @@ jobs:
         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
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: 7.0.x
+    - name: Print .NET info
+      run: |
+        dotnet --info
+        dotnet workload --info
     - name: Build
       run: |
         ./PackageEditor.sh -arch=x64 -platform=Linux -deployOutput=Output
     - name: Upload
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: Linux-Editor
         path: Output/FlaxEditorLinux.zip
@@ -85,7 +113,7 @@ jobs:
     runs-on: "ubuntu-20.04"
     steps:
     - name: Checkout repo
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: Checkout LFS
       run: |
         git lfs version
@@ -98,11 +126,19 @@ jobs:
         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
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: 7.0.x
+    - name: Print .NET info
+      run: |
+        dotnet --info
+        dotnet workload --info
     - name: Build
       run: |
         ./PackagePlatforms.sh -arch=x64 -platform=Linux -deployOutput=Output
     - name: Upload
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: Linux-Game
         path: Output/Linux.zip
@@ -113,18 +149,26 @@ jobs:
     runs-on: "macos-latest"
     steps:
     - name: Checkout repo
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: Checkout LFS
       run: |
         git lfs version
         git lfs pull
     - name: Setup Vulkan
       uses: ./.github/actions/vulkan
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: 7.0.x
+    - name: Print .NET info
+      run: |
+        dotnet --info
+        dotnet workload --info
     - name: Build
       run: |
         ./PackageEditor.command -arch=x64 -platform=Mac -deployOutput=Output
     - name: Upload
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: Mac-Editor
         path: Output/FlaxEditorMac.zip
@@ -133,18 +177,26 @@ jobs:
     runs-on: "macos-latest"
     steps:
     - name: Checkout repo
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: Checkout LFS
       run: |
         git lfs version
         git lfs pull
     - name: Setup Vulkan
       uses: ./.github/actions/vulkan
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: 7.0.x
+    - name: Print .NET info
+      run: |
+        dotnet --info
+        dotnet workload --info
     - name: Build
       run: |
         ./PackagePlatforms.command -arch=x64 -platform=Mac -deployOutput=Output
     - name: Upload
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: Mac-Game
         path: Output/Mac.zip

.github/workflows/tests.yml

@@ -1,15 +1,27 @@
 name: Tests
 on: [push, pull_request]
 
+env:
+  DOTNET_NOLOGO: true
+  DOTNET_CLI_TELEMETRY_OPTOUT: false
+
 jobs:
 
-  # Tests
+  # Tests on Linux
   tests-linux:
     name: Tests (Linux)
     runs-on: "ubuntu-20.04"
     steps:
     - name: Checkout repo
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: 7.0.x
+    - name: Print .NET info
+      run: |
+        dotnet --info
+        dotnet workload --info
     - name: Checkout LFS
       run: |
         git lfs version
@@ -22,17 +34,52 @@ jobs:
         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: Build
       run: |
-        ./GenerateProjectFiles.sh -vs2019
+        ./GenerateProjectFiles.sh -vs2022 -log -verbose -printSDKs
         ./Development/Scripts/Linux/CallBuildTool.sh -build -log -arch=x64 -platform=Linux -configuration=Development -buildtargets=FlaxTestsTarget
-        ./Development/Scripts/Linux/CallBuildTool.sh -build -log -arch=x64 -platform=Linux -configuration=Debug -buildtargets=FlaxEditor -BuildBindingsOnly
+        dotnet msbuild Source/Tools/Flax.Build.Tests/Flax.Build.Tests.csproj /m /t:Restore,Build /p:Configuration=Debug /p:Platform=AnyCPU /nologo
-        ./Development/Scripts/Linux/CallBuildTool.sh -build -log -arch=x64 -platform=Linux -configuration=Debug -buildtargets="FlaxEngine.Tests"
+        dotnet msbuild Source/Tools/Flax.Build.Tests/Flax.Build.Tests.csproj /m /t:Restore,Build /p:Configuration=Debug /p:Platform=AnyCPU /nologo
-        ./Development/Scripts/Linux/CallBuildTool.sh -build -log -arch=x64 -platform=Linux -configuration=Debug -buildtargets="Flax.Build.Tests"
     - name: Test
       run: |
-        Binaries/Editor/Linux/Development/FlaxTests
+        ${GITHUB_WORKSPACE}/Binaries/Editor/Linux/Development/FlaxTests
-        mono Source/Platforms/DotNet/NUnit/nunit3-console.exe Binaries/Tools/FlaxEngine.Tests.dll --framework=mono-4.0
+        dotnet test -f net7.0 Binaries/Tests/Flax.Build.Tests.dll
-        mono Source/Platforms/DotNet/NUnit/nunit3-console.exe Binaries/Tools/Flax.Build.Tests.dll --framework=mono-4.0
+        cp Binaries/Editor/Linux/Development/FlaxEngine.CSharp.dll Binaries/Tests
+        cp Binaries/Editor/Linux/Development/FlaxEngine.CSharp.runtimeconfig.json Binaries/Tests
+        cp Binaries/Editor/Linux/Development/Newtonsoft.Json.dll Binaries/Tests
+        dotnet test -f net7.0 Binaries/Tests/FlaxEngine.CSharp.dll
     - 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
+        ${GITHUB_WORKSPACE}/Binaries/Editor/Linux/Development/FlaxTests
+
+  # Tests on Windows
+  tests-windows:
+    name: Tests (Windows)
+    runs-on: "windows-2022"
+    steps:
+    - name: Checkout repo
+      uses: actions/checkout@v3
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: 7.0.x
+    - name: Print .NET info
+      run: |
+        dotnet --info
+        dotnet workload --info
+    - name: Checkout LFS
+      run: |
+        git lfs version
+        git lfs pull
+    - name: Build
+      run: |
+        .\GenerateProjectFiles.bat -vs2022 -log -verbose -printSDKs
+        .\Development\Scripts\Windows\CallBuildTool.bat -build -log -arch=x64 -platform=Windows -configuration=Development -buildtargets=FlaxTestsTarget
+        dotnet msbuild Source\Tools\Flax.Build.Tests\Flax.Build.Tests.csproj /m /t:Restore,Build /p:Configuration=Debug /p:Platform=AnyCPU /nologo
+    - name: Test
+      run: |
+        .\Binaries\Editor\Win64\Development\FlaxTests.exe
+        dotnet test -f net7.0 Binaries\Tests\Flax.Build.Tests.dll
+        xcopy /y Binaries\Editor\Win64\Development\FlaxEngine.CSharp.dll Binaries\Tests
+        xcopy /y Binaries\Editor\Win64\Development\FlaxEngine.CSharp.runtimeconfig.json Binaries\Tests
+        xcopy /y Binaries\Editor\Win64\Development\Newtonsoft.Json.dll Binaries\Tests
+        dotnet test -f net7.0 Binaries\Tests\FlaxEngine.CSharp.dll

.gitignore

@@ -5,7 +5,9 @@
 obj/
 Cache/
 Binaries/
+Output/
 Logs/
+Source/*.Gen.*
 Source/*.csproj
 /Package_*/
 !Source/Engine/Debug
@@ -23,6 +25,7 @@ PackagePlatforms_Cert.bat
 *.opendb
 *.DS_Store
 *.xcodeproj
+launchSettings.json
 
 # NUNIT
 *.VisualState.xml
@@ -152,4 +155,4 @@ obj/
 .vscode/
 .idea/
 *.code-workspace
-
+omnisharp.json

Content/Editor/MaterialTemplates/Decal.shader

@@ -2,6 +2,7 @@
 // Version: @0
 
 #define MATERIAL 1
+#define USE_PER_VIEW_CONSTANTS 1
 @3
 
 #include "./Flax/Common.hlsl"
@@ -10,17 +11,9 @@
 @7
 // Primary constant buffer (with additional material parameters)
 META_CB_BEGIN(0, Data)
-float4x4 ViewProjectionMatrix;
 float4x4 WorldMatrix;
-float4x4 ViewMatrix;
 float4x4 InvWorld;
 float4x4 SVPositionToWorld;
-float3 ViewPos;
-float ViewFar;
-float3 ViewDir;
-float TimeParam;
-float4 ViewInfo;
-float4 ScreenSize;
 @1META_CB_END
 
 // Use depth buffer for per-pixel decal layering

Content/Editor/MaterialTemplates/Deformable.shader

@@ -2,6 +2,7 @@
 // Version: @0
 
 #define MATERIAL 1
+#define USE_PER_VIEW_CONSTANTS 1
 @3
 #include "./Flax/Common.hlsl"
 #include "./Flax/MaterialCommon.hlsl"
@@ -9,23 +10,14 @@
 @7
 // Primary constant buffer (with additional material parameters)
 META_CB_BEGIN(0, Data)
-float4x4 ViewProjectionMatrix;
 float4x4 WorldMatrix;
 float4x4 LocalMatrix;
-float4x4 ViewMatrix;
-float3 ViewPos;
-float ViewFar;
-float3 ViewDir;
-float TimeParam;
-float4 ViewInfo;
-float4 ScreenSize;
 float3 Dummy0;
 float WorldDeterminantSign;
 float MeshMinZ;
 float Segment;
 float ChunksPerSegment;
 float PerInstanceRandom;
-float4 TemporalAAJitter;
 float3 GeometrySize;
 float MeshMaxZ;
 @1META_CB_END

Content/Editor/MaterialTemplates/Features/DeferredShading.hlsl

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 @0// Deferred Shading: Defines
 @1// Deferred Shading: Includes
@@ -40,7 +40,7 @@ void PS_GBuffer(
 #if MATERIAL_MASKED
 	clip(material.Mask - MATERIAL_MASK_THRESHOLD);
 #endif
-	
+
 #if USE_LIGHTMAP
 	float3 diffuseColor = GetDiffuseColor(material.Color, material.Metalness);
 	float3 specularColor = GetSpecularColor(material.Color, material.Specular, material.Metalness);

Content/Editor/MaterialTemplates/Features/Distortion.hlsl

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

Content/Editor/MaterialTemplates/Features/ForwardShading.hlsl

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 @0// Forward Shading: Defines
 #define MAX_LOCAL_LIGHTS 4
@@ -33,9 +33,12 @@ DECLARE_LIGHTSHADOWDATA_ACCESS(DirectionalLightShadow);
 
 // Pixel Shader function for Forward Pass
 META_PS(USE_FORWARD, FEATURE_LEVEL_ES2)
-float4 PS_Forward(PixelInput input) : SV_Target0
+void PS_Forward(
+		in PixelInput input
+		,out float4 output : SV_Target0
+	)
 {
-	float4 output = 0;
+	output = 0;
 
 #if USE_DITHERED_LOD_TRANSITION
 	// LOD masking
@@ -148,6 +151,4 @@ float4 PS_Forward(PixelInput input) : SV_Target0
 #endif
 	
 #endif
-
-	return output;
 }

Content/Editor/MaterialTemplates/Features/GlobalIllumination.hlsl

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

Content/Editor/MaterialTemplates/Features/Lightmap.hlsl

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

Content/Editor/MaterialTemplates/Features/MotionVectors.hlsl

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

Content/Editor/MaterialTemplates/Features/Tessellation.hlsl

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

Content/Editor/MaterialTemplates/Particle.shader

@@ -2,9 +2,8 @@
 // Version: @0
 
 #define MATERIAL 1
+#define USE_PER_VIEW_CONSTANTS 1
 @3
-// Ribbons don't use sorted indices so overlap the segment distances buffer on the slot
-#define HAS_SORTED_INDICES (!defined(_VS_Ribbon))
 
 #include "./Flax/Common.hlsl"
 #include "./Flax/MaterialCommon.hlsl"
@@ -17,17 +16,17 @@ struct SpriteInput
 	float2 TexCoord : TEXCOORD;
 };
 
+struct RibbonInput
+{
+	uint Order : TEXCOORD0;
+	uint ParticleIndex : TEXCOORD1;
+	uint PrevParticleIndex : TEXCOORD2;
+	float Distance : TEXCOORD3;
+};
+
 // Primary constant buffer (with additional material parameters)
 META_CB_BEGIN(0, Data)
-float4x4 ViewProjectionMatrix;
 float4x4 WorldMatrix;
-float4x4 ViewMatrix;
-float3 ViewPos;
-float ViewFar;
-float3 ViewDir;
-float TimeParam;
-float4 ViewInfo;
-float4 ScreenSize;
 uint SortedIndicesOffset;
 float PerInstanceRandom;
 int ParticleStride;
@@ -52,13 +51,8 @@ float4x4 WorldMatrixInverseTransposed;
 // Particles attributes buffer
 ByteAddressBuffer ParticlesData : register(t0);
 
-#if HAS_SORTED_INDICES
 // Sorted particles indices
 Buffer<uint> SortedIndices : register(t1);
-#else
-// Ribbon particles segments distances buffer
-Buffer<float> SegmentDistances : register(t1);
-#endif
 
 // Shader resources
 @2
@@ -327,13 +321,11 @@ VertexOutput VS_Sprite(SpriteInput input, uint particleIndex : SV_InstanceID)
 {
 	VertexOutput output;
 
-#if HAS_SORTED_INDICES
 	// Sorted particles mapping
 	if (SortedIndicesOffset != 0xFFFFFFFF)
 	{
 		particleIndex = SortedIndices[SortedIndicesOffset + particleIndex];
 	}
-#endif
 
 	// Read particle data	
 	float3 particlePosition = GetParticleVec3(particleIndex, PositionOffset);
@@ -464,13 +456,11 @@ VertexOutput VS_Model(ModelInput input, uint particleIndex : SV_InstanceID)
 {
 	VertexOutput output;
 
-#if HAS_SORTED_INDICES
 	// Sorted particles mapping
 	if (SortedIndicesOffset != 0xFFFFFFFF)
 	{
 		particleIndex = SortedIndices[SortedIndicesOffset + particleIndex];
 	}
-#endif
 
 	// Read particle data
 	float3 particlePosition = GetParticleVec3(particleIndex, PositionOffset);
@@ -573,12 +563,16 @@ VertexOutput VS_Model(ModelInput input, uint particleIndex : SV_InstanceID)
 
 // Vertex Shader function for Ribbon Rendering
 META_VS(true, FEATURE_LEVEL_ES2)
-VertexOutput VS_Ribbon(uint vertexIndex : SV_VertexID)
+META_VS_IN_ELEMENT(TEXCOORD, 0, R32_UINT,  0, 0,     PER_VERTEX, 0, true)
+META_VS_IN_ELEMENT(TEXCOORD, 1, R32_UINT,  0, ALIGN, PER_VERTEX, 0, true)
+META_VS_IN_ELEMENT(TEXCOORD, 2, R32_UINT,  0, ALIGN, PER_VERTEX, 0, true)
+META_VS_IN_ELEMENT(TEXCOORD, 3, R32_FLOAT, 0, ALIGN, PER_VERTEX, 0, true)
+VertexOutput VS_Ribbon(RibbonInput input, uint vertexIndex : SV_VertexID)
 {
 	VertexOutput output;
 
 	// Get particle data
-	uint particleIndex = vertexIndex / 2;
+	uint particleIndex = input.ParticleIndex;
 	int vertexSign = (((int)vertexIndex & 0x1) * 2) - 1;
 	float3 position = GetParticlePosition(particleIndex);
 	float ribbonWidth = RibbonWidthOffset != -1 ? GetParticleFloat(particleIndex, RibbonWidthOffset) : 20.0f;
@@ -586,15 +580,13 @@ VertexOutput VS_Ribbon(uint vertexIndex : SV_VertexID)
 
 	// Calculate ribbon direction
 	float3 direction;
-	if (particleIndex == 0)
+	if (input.Order == 0)
 	{
-		float3 nextParticlePos = GetParticlePosition(particleIndex + 1);
+		direction = GetParticlePosition(input.PrevParticleIndex) - position;
-		direction = nextParticlePos - position;
 	}
 	else
 	{
-		float3 previousParticlePos = GetParticlePosition(particleIndex - 1);
+		direction = position - GetParticlePosition(input.PrevParticleIndex);
-		direction = position - previousParticlePos;
 	}
 
 	// Calculate particle orientation (tangent vectors)
@@ -611,19 +603,16 @@ VertexOutput VS_Ribbon(uint vertexIndex : SV_VertexID)
 	}
 
 	// Calculate texture coordinates
-	float texCoordU;
-#ifdef _VS_Ribbon
 	if (RibbonUVTilingDistance != 0.0f)
 	{
-		texCoordU = SegmentDistances[particleIndex] / RibbonUVTilingDistance;
+		output.TexCoord.x = input.Distance / RibbonUVTilingDistance;
 	}
 	else
-#endif
 	{
-		texCoordU = (float)particleIndex / RibbonSegmentCount;
+		output.TexCoord.x = (float)input.Order / (float)RibbonSegmentCount;
 	}
-	float texCoordV = (vertexIndex + 1) & 0x1;
+	output.TexCoord.y = (vertexIndex + 1) & 0x1;
-	output.TexCoord = float2(texCoordU, texCoordV) * RibbonUVScale + RibbonUVOffset;
+	output.TexCoord = output.TexCoord * RibbonUVScale + RibbonUVOffset;
 
 	// Compute world space vertex position
 	output.WorldPosition = position + tangentRight * vertexSign * (ribbonWidth.xxx * 0.5f);

Content/Editor/MaterialTemplates/PostProcess.shader

@@ -18,6 +18,7 @@ float TimeParam;
 float4 ViewInfo;
 float4 ScreenSize;
 float4 TemporalAAJitter;
+float4x4 InverseViewProjectionMatrix;
 @1META_CB_END
 
 // Shader resources
@@ -62,6 +63,14 @@ MaterialInput GetMaterialInput(PixelInput input)
 	return result;
 }
 
+// Gets world space position at given pixel coordinate with given device depth
+float3 GetWorldPos(float2 uv, float deviceDepth)
+{
+	float4 clipPos = float4(uv * float2(2.0, -2.0) + float2(-1.0, 1.0), deviceDepth, 1.0);
+	float4 wsPos = mul(clipPos, InverseViewProjectionMatrix);
+	return wsPos.xyz / wsPos.w;
+}
+
 // Transforms a vector from tangent space to world space
 float3 TransformTangentVectorToWorld(MaterialInput input, float3 tangentVector)
 {

Content/Editor/MaterialTemplates/Surface.shader

@@ -2,6 +2,7 @@
 // Version: @0
 
 #define MATERIAL 1
+#define USE_PER_VIEW_CONSTANTS 1
 @3
 #include "./Flax/Common.hlsl"
 #include "./Flax/MaterialCommon.hlsl"
@@ -9,27 +10,13 @@
 @7
 // Primary constant buffer (with additional material parameters)
 META_CB_BEGIN(0, Data)
-float4x4 ViewProjectionMatrix;
 float4x4 WorldMatrix;
-float4x4 ViewMatrix;
-float4x4 PrevViewProjectionMatrix;
 float4x4 PrevWorldMatrix;
-float4x4 MainViewProjectionMatrix;
-float4 MainScreenSize;
-float3 ViewPos;
-float ViewFar;
-float3 ViewDir;
-float TimeParam;
-float4 ViewInfo;
-float4 ScreenSize;
-float3 WorldInvScale;
-float WorldDeterminantSign;
 float2 Dummy0;
 float LODDitherFactor;
 float PerInstanceRandom;
-float4 TemporalAAJitter;
 float3 GeometrySize;
-float Dummy1;
+float WorldDeterminantSign;
 @1META_CB_END
 
 // Shader resources
@@ -48,6 +35,9 @@ struct GeometryData
 	nointerpolation float3 InstanceOrigin : TEXCOORD5;
 	nointerpolation float2 InstanceParams : TEXCOORD6; // x-PerInstanceRandom, y-LODDitherFactor
 	float3 PrevWorldPosition : TEXCOORD7;
+	nointerpolation float3 InstanceTransform1 : TEXCOORD8;
+	nointerpolation float3 InstanceTransform2 : TEXCOORD9;
+	nointerpolation float3 InstanceTransform3 : TEXCOORD10;
 };
 
 // Interpolants passed from the vertex shader
@@ -56,7 +46,7 @@ struct VertexOutput
 	float4 Position : SV_Position;
 	GeometryData Geometry;
 #if USE_CUSTOM_VERTEX_INTERPOLATORS
-	float4 CustomVSToPS[CUSTOM_VERTEX_INTERPOLATORS_COUNT] : TEXCOORD9;
+	float4 CustomVSToPS[CUSTOM_VERTEX_INTERPOLATORS_COUNT] : TEXCOORD11;
 #endif
 #if USE_TESSELLATION
     float TessellationMultiplier : TESS;
@@ -69,7 +59,7 @@ struct PixelInput
 	float4 Position : SV_Position;
 	GeometryData Geometry;
 #if USE_CUSTOM_VERTEX_INTERPOLATORS
-	float4 CustomVSToPS[CUSTOM_VERTEX_INTERPOLATORS_COUNT] : TEXCOORD9;
+	float4 CustomVSToPS[CUSTOM_VERTEX_INTERPOLATORS_COUNT] : TEXCOORD11;
 #endif
 	bool IsFrontFace : SV_IsFrontFace;
 };
@@ -92,11 +82,9 @@ struct MaterialInput
 	float3 PreSkinnedNormal;
 	float3 InstanceOrigin;
 	float2 InstanceParams;
-#if USE_INSTANCING
 	float3 InstanceTransform1;
 	float3 InstanceTransform2;
 	float3 InstanceTransform3;
-#endif
 #if USE_CUSTOM_VERTEX_INTERPOLATORS
 	float4 CustomVSToPS[CUSTOM_VERTEX_INTERPOLATORS_COUNT];
 #endif
@@ -117,6 +105,9 @@ MaterialInput GetGeometryMaterialInput(GeometryData geometry)
 	output.TBN = CalcTangentBasis(geometry.WorldNormal, geometry.WorldTangent);
 	output.InstanceOrigin = geometry.InstanceOrigin;
 	output.InstanceParams = geometry.InstanceParams;
+	output.InstanceTransform1 = geometry.InstanceTransform1;
+	output.InstanceTransform2 = geometry.InstanceTransform2;
+	output.InstanceTransform3 = geometry.InstanceTransform3;
 	return output;
 }
 
@@ -154,6 +145,9 @@ GeometryData InterpolateGeometry(GeometryData p0, float w0, GeometryData p1, flo
 	output.WorldTangent.xyz = normalize(output.WorldTangent.xyz);
 	output.InstanceOrigin = p0.InstanceOrigin;
 	output.InstanceParams = p0.InstanceParams;
+	output.InstanceTransform1 = p0.InstanceTransform1;
+	output.InstanceTransform2 = p0.InstanceTransform2;
+	output.InstanceTransform3 = p0.InstanceTransform3;
 	return output;
 }
 
@@ -170,17 +164,19 @@ MaterialInput GetMaterialInput(PixelInput input)
 	return output;
 }
 
-// Gets the local to world transform matrix (supports instancing)
+// Gets the local to world transform matrix
-#if USE_INSTANCING
 #define GetInstanceTransform(input) float4x4(float4(input.InstanceTransform1.xyz, 0.0f), float4(input.InstanceTransform2.xyz, 0.0f), float4(input.InstanceTransform3.xyz, 0.0f), float4(input.InstanceOrigin.xyz, 1.0f))
+
+// Extarcts the world matrix and instancce transform vector
+#if USE_INSTANCING
+#define CalculateInstanceTransform(input) float4x4 world = GetInstanceTransform(input); output.Geometry.InstanceTransform1 = input.InstanceTransform1.xyz; output.Geometry.InstanceTransform2 = input.InstanceTransform2.xyz; output.Geometry.InstanceTransform3 = input.InstanceTransform3.xyz;
 #else
-#define GetInstanceTransform(input) WorldMatrix;
+#define CalculateInstanceTransform(input) float4x4 world = WorldMatrix; output.Geometry.InstanceTransform1 = world[0].xyz; output.Geometry.InstanceTransform2 = world[1].xyz; output.Geometry.InstanceTransform3 = world[2].xyz;
 #endif
 
 // Removes the scale vector from the local to world transformation matrix (supports instancing)
 float3x3 RemoveScaleFromLocalToWorld(float3x3 localToWorld)
 {
-#if USE_INSTANCING
 	// Extract per axis scales from localToWorld transform
 	float scaleX = length(localToWorld[0]);
 	float scaleY = length(localToWorld[1]);
@@ -189,9 +185,6 @@ float3x3 RemoveScaleFromLocalToWorld(float3x3 localToWorld)
 		scaleX > 0.00001f ? 1.0f / scaleX : 0.0f,
 		scaleY > 0.00001f ? 1.0f / scaleY : 0.0f,
 		scaleZ > 0.00001f ? 1.0f / scaleZ : 0.0f);
-#else
-	float3 invScale = WorldInvScale;
-#endif
 	localToWorld[0] *= invScale.x;
 	localToWorld[1] *= invScale.y;
 	localToWorld[2] *= invScale.z;
@@ -333,7 +326,7 @@ VertexOutput VS(ModelInput input)
 	VertexOutput output;
 
 	// Compute world space vertex position
-	float4x4 world = GetInstanceTransform(input);
+	CalculateInstanceTransform(input);
 	output.Geometry.WorldPosition = mul(float4(input.Position.xyz, 1), world).xyz;
 	output.Geometry.PrevWorldPosition = mul(float4(input.Position.xyz, 1), PrevWorldMatrix).xyz;
 
@@ -372,11 +365,6 @@ VertexOutput VS(ModelInput input)
 	materialInput.SvPosition = output.Position;
 	materialInput.PreSkinnedPosition = input.Position.xyz;
 	materialInput.PreSkinnedNormal = tangentToLocal[2].xyz;
-#if USE_INSTANCING
-	materialInput.InstanceTransform1 = input.InstanceTransform1.xyz;
-	materialInput.InstanceTransform2 = input.InstanceTransform2.xyz;
-	materialInput.InstanceTransform3 = input.InstanceTransform3.xyz;
-#endif
 	Material material = GetMaterialVS(materialInput);
 #endif
 
@@ -411,7 +399,11 @@ META_VS_IN_ELEMENT(ATTRIBUTE,3, R32G32B32_FLOAT,   3, ALIGN, PER_INSTANCE, 1, US
 META_VS_IN_ELEMENT(ATTRIBUTE,4, R16G16B16A16_FLOAT,3, ALIGN, PER_INSTANCE, 1, USE_INSTANCING)
 float4 VS_Depth(ModelInput_PosOnly input) : SV_Position
 {
+#if USE_INSTANCING
 	float4x4 world = GetInstanceTransform(input);
+#else
+	float4x4 world = WorldMatrix;
+#endif
 	float3 worldPosition = mul(float4(input.Position.xyz, 1), world).xyz;
 	float4 position = mul(float4(worldPosition, 1), ViewProjectionMatrix);
 	return position;
@@ -515,7 +507,7 @@ VertexOutput VS_Skinned(ModelInput_Skinned input)
 	float3x3 tangentToLocal = SkinTangents(input, data);
 	
 	// Compute world space vertex position
-	float4x4 world = GetInstanceTransform(input);
+	CalculateInstanceTransform(input);
 	output.Geometry.WorldPosition = mul(float4(position, 1), world).xyz;
 #if PER_BONE_MOTION_BLUR
 	float3 prevPosition = SkinPrevPosition(input);
@@ -602,7 +594,7 @@ void PS_Depth(PixelInput input)
 	ClipLODTransition(input);
 #endif
 
-#if MATERIAL_MASKED || MATERIAL_BLEND != MATERIAL_BLEND_OPAQUE 
+#if MATERIAL_MASKED || MATERIAL_BLEND != MATERIAL_BLEND_OPAQUE
 	// Get material parameters
 	MaterialInput materialInput = GetMaterialInput(input);
 	Material material = GetMaterialPS(materialInput);

Content/Editor/MaterialTemplates/Terrain.shader

@@ -2,6 +2,7 @@
 // Version: @0
 
 #define MATERIAL 1
+#define USE_PER_VIEW_CONSTANTS 1
 @3
 // Enables/disables smooth terrain chunks LOD transitions (with morphing higher LOD near edges to the lower LOD in the neighbour)
 #define USE_SMOOTH_LOD_TRANSITION 1
@@ -16,15 +17,7 @@
 @7
 // Primary constant buffer (with additional material parameters)
 META_CB_BEGIN(0, Data)
-float4x4 ViewProjectionMatrix;
 float4x4 WorldMatrix;
-float4x4 ViewMatrix;
-float3 ViewPos;
-float ViewFar;
-float3 ViewDir;
-float TimeParam;
-float4 ViewInfo;
-float4 ScreenSize;
 float3 WorldInvScale;
 float WorldDeterminantSign;
 float PerInstanceRandom;
@@ -276,24 +269,16 @@ float CalcLOD(float2 xy, float4 morph)
 	if ((xy.x + xy.y) > 1)
 	{
 		if (xy.x < xy.y)
-		{
 			lod = lodCalculated.w;
-		}
 		else
-		{
 			lod = lodCalculated.z;
-		}
 	}
 	else
 	{
 		if (xy.x < xy.y)
-		{
 			lod = lodCalculated.y;
-		}
 		else
-		{
 			lod = lodCalculated.x;
-		}
 	}
 
 	return lod;

Content/Editor/MaterialTemplates/VolumeParticle.shader

@@ -2,6 +2,7 @@
 // Version: @0
 
 #define MATERIAL 1
+#define USE_PER_VIEW_CONSTANTS 1
 @3
 
 #include "./Flax/Common.hlsl"
@@ -11,17 +12,9 @@
 
 // Primary constant buffer (with additional material parameters)
 META_CB_BEGIN(0, Data)
-float4x4 ViewProjectionMatrix;
 float4x4 InverseViewProjectionMatrix;
-float4x4 ViewMatrix;
 float4x4 WorldMatrix;
 float4x4 WorldMatrixInverseTransposed;
-float3 ViewPos;
-float ViewFar;
-float3 ViewDir;
-float TimeParam;
-float4 ViewInfo;
-float4 ScreenSize;
 float3 GridSize;
 float PerInstanceRandom;
 float Dummy0;

Content/Editor/Scripting/CppAssetTemplate.h

@@ -1,5 +1,4 @@
-%copyright%
+%copyright%#pragma once
-#pragma once
 
 #include "Engine/Core/ISerializable.h"
 #include "Engine/Core/Types/BaseTypes.h"

Content/Editor/Scripting/CppStaticClassTemplate.cpp

@@ -1,5 +1,4 @@
-%copyright%
+%copyright%#include "%filename%.h"
-#include "%filename%.h"
 #include "Engine/Core/Log.h"
 
 void %class%::RunNativeAction(Vector4 data)

Content/Editor/Scripting/CppStaticClassTemplate.h

@@ -1,5 +1,4 @@
-%copyright%
+%copyright%#pragma once
-#pragma once
 
 #include "Engine/Scripting/Script.h"
 #include "Engine/Core/Math/Vector4.h"

Content/Editor/Scripting/ScriptTemplate.cpp

@@ -1,5 +1,4 @@
-%copyright%
+%copyright%#include "%filename%.h"
-#include "%filename%.h"
 
 %class%::%class%(const SpawnParams& params)
     : Script(params)

Content/Editor/Scripting/ScriptTemplate.h

@@ -1,5 +1,4 @@
-%copyright%
+%copyright%#pragma once
-#pragma once
 
 #include "Engine/Scripting/Script.h"