Fix packaging for macOS

#2376

.github/workflows/build_android.yml

@@ -19,7 +19,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
     - name: Setup .NET Workload
       run: |
         dotnet workload install android
@@ -33,4 +33,4 @@ jobs:
         git lfs pull
     - name: Build
       run: |
-        .\Development\Scripts\Windows\CallBuildTool.bat -build -log -printSDKs -dotnet=7 -arch=ARM64 -platform=Android -configuration=Release -buildtargets=FlaxGame
+        .\Development\Scripts\Windows\CallBuildTool.bat -build -log -printSDKs -dotnet=8 -arch=ARM64 -platform=Android -configuration=Release -buildtargets=FlaxGame

.github/workflows/build_ios.yml

@@ -19,7 +19,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 7.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=7 -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

@@ -25,7 +25,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
     - name: Print .NET info
       run: |
         dotnet --info
@@ -36,7 +36,7 @@ jobs:
         git lfs pull
     - name: Build
       run: |
-        ./Development/Scripts/Linux/CallBuildTool.sh -build -log -printSDKs -dotnet=7 -arch=x64 -platform=Linux -configuration=Development -buildtargets=FlaxEditor
+        ./Development/Scripts/Linux/CallBuildTool.sh -build -log -printSDKs -dotnet=8 -arch=x64 -platform=Linux -configuration=Development -buildtargets=FlaxEditor
 
   # Game
   game-linux:
@@ -53,7 +53,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
     - name: Print .NET info
       run: |
         dotnet --info
@@ -64,4 +64,4 @@ jobs:
         git lfs pull
     - name: Build
       run: |
-        ./Development/Scripts/Linux/CallBuildTool.sh -build -log -printSDKs -dotnet=7 -arch=x64 -platform=Linux -configuration=Release -buildtargets=FlaxGame
+        ./Development/Scripts/Linux/CallBuildTool.sh -build -log -printSDKs -dotnet=8 -arch=x64 -platform=Linux -configuration=Release -buildtargets=FlaxGame

.github/workflows/build_mac.yml

@@ -19,7 +19,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
     - name: Print .NET info
       run: |
         dotnet --info
@@ -30,7 +30,7 @@ jobs:
         git lfs pull
     - name: Build
       run: |
-        ./Development/Scripts/Mac/CallBuildTool.sh -build -log -printSDKs -dotnet=7 -arch=x64 -platform=Mac -configuration=Development -buildtargets=FlaxEditor
+        ./Development/Scripts/Mac/CallBuildTool.sh -build -log -printSDKs -dotnet=8 -arch=x64 -platform=Mac -configuration=Development -buildtargets=FlaxEditor
 
   # Game
   game-mac:
@@ -44,7 +44,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
     - name: Print .NET info
       run: |
         dotnet --info
@@ -55,4 +55,4 @@ jobs:
         git lfs pull
     - name: Build
       run: |
-        ./Development/Scripts/Mac/CallBuildTool.sh -build -log -printSDKs -dotnet=7 -arch=x64 -platform=Mac -configuration=Release -buildtargets=FlaxGame
+        ./Development/Scripts/Mac/CallBuildTool.sh -build -log -printSDKs -dotnet=8 -arch=x64 -platform=Mac -configuration=Release -buildtargets=FlaxGame

.github/workflows/build_windows.yml

@@ -19,7 +19,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
     - name: Print .NET info
       run: |
         dotnet --info
@@ -30,7 +30,7 @@ jobs:
         git lfs pull
     - name: Build
       run: |
-        .\Development\Scripts\Windows\CallBuildTool.bat -build -log -printSDKs -dotnet=7 -arch=x64 -platform=Windows -configuration=Development -buildtargets=FlaxEditor
+        .\Development\Scripts\Windows\CallBuildTool.bat -build -log -printSDKs -dotnet=8 -arch=x64 -platform=Windows -configuration=Development -buildtargets=FlaxEditor
 
   # Game
   game-windows:
@@ -44,7 +44,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
     - name: Print .NET info
       run: |
         dotnet --info
@@ -55,4 +55,4 @@ jobs:
         git lfs pull
     - name: Build
       run: |
-        .\Development\Scripts\Windows\CallBuildTool.bat -build -log -printSDKs -dotnet=7 -arch=x64 -platform=Windows -configuration=Release -buildtargets=FlaxGame
+        .\Development\Scripts\Windows\CallBuildTool.bat -build -log -printSDKs -dotnet=8 -arch=x64 -platform=Windows -configuration=Release -buildtargets=FlaxGame

.github/workflows/cd.yml

@@ -26,7 +26,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
     - name: Print .NET info
       run: |
         dotnet --info
@@ -59,7 +59,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
     - name: Print .NET info
       run: |
         dotnet --info
@@ -95,7 +95,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
     - name: Print .NET info
       run: |
         dotnet --info
@@ -129,7 +129,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
     - name: Print .NET info
       run: |
         dotnet --info
@@ -159,7 +159,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
     - name: Print .NET info
       run: |
         dotnet --info
@@ -187,7 +187,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
     - name: Print .NET info
       run: |
         dotnet --info

.github/workflows/tests.yml

@@ -17,7 +17,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
     - name: Print .NET info
       run: |
         dotnet --info
@@ -34,21 +34,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: Build
       run: |
-        ./GenerateProjectFiles.sh -vs2022 -log -verbose -printSDKs -dotnet=7
-        ./Development/Scripts/Linux/CallBuildTool.sh -build -log -dotnet=7 -arch=x64 -platform=Linux -configuration=Development -buildtargets=FlaxTestsTarget
+        ./GenerateProjectFiles.sh -vs2022 -log -verbose -printSDKs -dotnet=8
+        ./Development/Scripts/Linux/CallBuildTool.sh -build -log -dotnet=8 -arch=x64 -platform=Linux -configuration=Development -buildtargets=FlaxTestsTarget
         dotnet msbuild Source/Tools/Flax.Build.Tests/Flax.Build.Tests.csproj /m /t:Restore,Build /p:Configuration=Debug /p:Platform=AnyCPU /nologo
         dotnet msbuild Source/Tools/Flax.Build.Tests/Flax.Build.Tests.csproj /m /t:Restore,Build /p:Configuration=Debug /p:Platform=AnyCPU /nologo
     - name: Test
       run: |
         ${GITHUB_WORKSPACE}/Binaries/Editor/Linux/Development/FlaxTests
-        dotnet test -f net7.0 Binaries/Tests/Flax.Build.Tests.dll
+        dotnet test -f net8.0 Binaries/Tests/Flax.Build.Tests.dll
         cp Binaries/Editor/Linux/Development/FlaxEngine.CSharp.dll Binaries/Tests
         cp Binaries/Editor/Linux/Development/FlaxEngine.CSharp.runtimeconfig.json Binaries/Tests
         cp Binaries/Editor/Linux/Development/Newtonsoft.Json.dll Binaries/Tests
-        dotnet test -f net7.0 Binaries/Tests/FlaxEngine.CSharp.dll
+        dotnet test -f net8.0 Binaries/Tests/FlaxEngine.CSharp.dll
     - name: Test UseLargeWorlds
       run: |
-        ./Development/Scripts/Linux/CallBuildTool.sh -build -log -dotnet=7 -arch=x64 -platform=Linux -configuration=Development -buildtargets=FlaxTestsTarget -UseLargeWorlds=true
+        ./Development/Scripts/Linux/CallBuildTool.sh -build -log -dotnet=8 -arch=x64 -platform=Linux -configuration=Development -buildtargets=FlaxTestsTarget -UseLargeWorlds=true
         ${GITHUB_WORKSPACE}/Binaries/Editor/Linux/Development/FlaxTests
 
   # Tests on Windows
@@ -61,7 +61,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
     - name: Print .NET info
       run: |
         dotnet --info
@@ -72,14 +72,14 @@ jobs:
         git lfs pull
     - name: Build
       run: |
-        .\GenerateProjectFiles.bat -vs2022 -log -verbose -printSDKs -dotnet=7
-        .\Development\Scripts\Windows\CallBuildTool.bat -build -log -dotnet=7 -arch=x64 -platform=Windows -configuration=Development -buildtargets=FlaxTestsTarget
+        .\GenerateProjectFiles.bat -vs2022 -log -verbose -printSDKs -dotnet=8
+        .\Development\Scripts\Windows\CallBuildTool.bat -build -log -dotnet=8 -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
+        dotnet test -f net8.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
+        dotnet test -f net8.0 Binaries\Tests\FlaxEngine.CSharp.dll

.gitignore

@@ -11,7 +11,6 @@ Source/*.Gen.*
 Source/*.csproj
 /Package_*/
 !Source/Engine/Debug
-/Source/Platforms/Editor/Linux/Mono/etc/mono/registry
 PackageEditor_Cert.command
 PackageEditor_Cert.bat
 PackagePlatforms_Cert.bat

Content/Editor/MaterialTemplates/Features/DeferredShading.hlsl

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

Content/Editor/MaterialTemplates/Features/Distortion.hlsl

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

Content/Editor/MaterialTemplates/Features/ForwardShading.hlsl

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 @0// Forward Shading: Defines
 #define MAX_LOCAL_LIGHTS 4
@@ -133,6 +133,8 @@ void PS_Forward(
 	// Add lighting (apply ambient occlusion)
 	output.rgb += light.rgb * gBuffer.AO;
 
+#endif
+
 #if USE_FOG
 	// Calculate exponential height fog
 	float4 fog = GetExponentialHeightFog(ExponentialHeightFog, materialInput.WorldPosition, ViewPos, 0);
@@ -148,7 +150,5 @@ void PS_Forward(
 	output = float4(lerp(float3(1, 1, 1), output.rgb, fog.aaa * fog.aaa), output.a);
 #endif
 
-#endif
-	
 #endif
 }

Content/Editor/MaterialTemplates/Features/GlobalIllumination.hlsl

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

Content/Editor/MaterialTemplates/Features/Lightmap.hlsl

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

Content/Editor/MaterialTemplates/Features/MotionVectors.hlsl

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

Content/Editor/MaterialTemplates/Features/Tessellation.hlsl

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

Development/Scripts/Linux/CallBuildTool.sh

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

Development/Scripts/Mac/CallBuildTool.sh

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

Development/Scripts/Mac/XCodeBuild.sh

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

Development/Scripts/Windows/CallBuildTool.bat

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

Development/Scripts/Windows/GetMSBuildPath.bat

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

Flax.flaxproj

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

Flax.sln.DotSettings

@@ -73,8 +73,12 @@
 	<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/CSharpNaming/Abbreviations/=AI/@EntryIndexedValue">AI</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=LO/@EntryIndexedValue">LO</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=RPC/@EntryIndexedValue">RPC</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SDK/@EntryIndexedValue">SDK</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=VS/@EntryIndexedValue">VS</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticReadonly/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="_" Suffix="" Style="aaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FCONSTANT/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FFUNCTION/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FVARIABLE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>

GenerateProjectFiles.bat

@@ -1,5 +1,5 @@
 @echo off
-:: Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+:: Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 setlocal
 pushd

GenerateProjectFiles.command

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

GenerateProjectFiles.sh

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

PackageAll.bat

@@ -1,13 +1,13 @@
 @echo off
 
-rem Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+rem Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 setlocal
 pushd
 echo Performing the full package...
 
 rem Run the build tool.
-call "Development\Scripts\Windows\CallBuildTool.bat" -deploy -deployEditor -deployPlatforms -dotnet=7 -verbose -log -logFile="Cache\Intermediate\PackageLog.txt" %*
+call "Development\Scripts\Windows\CallBuildTool.bat" -deploy -deployEditor -deployPlatforms -dotnet=8 -verbose -log -logFile="Cache\Intermediate\PackageLog.txt" %*
 if errorlevel 1 goto BuildToolFailed
 
 popd

PackageEditor.bat

@@ -1,13 +1,13 @@
 @echo off
 
-rem Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+rem Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 setlocal
 pushd
 echo Building and packaging Flax Editor...
 
 rem Run the build tool.
-call "Development\Scripts\Windows\CallBuildTool.bat" -deploy -deployEditor -dotnet=7 -verbose -log -logFile="Cache\Intermediate\PackageLog.txt" %*
+call "Development\Scripts\Windows\CallBuildTool.bat" -deploy -deployEditor -dotnet=8 -verbose -log -logFile="Cache\Intermediate\PackageLog.txt" %*
 if errorlevel 1 goto BuildToolFailed
 
 popd

PackageEditor.command

@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+# Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 set -e
 
@@ -9,4 +9,4 @@ echo Building and packaging Flax Editor...
 cd "`dirname "$0"`"
 
 # Run Flax.Build (also pass the arguments)
-bash ./Development/Scripts/Mac/CallBuildTool.sh --deploy --deployEditor --dotnet=7 --verbose --log --logFile="Cache/Intermediate/PackageLog.txt" "$@"
+bash ./Development/Scripts/Mac/CallBuildTool.sh --deploy --deployEditor --dotnet=8 --verbose --log --logFile="Cache/Intermediate/PackageLog.txt" "$@"

PackageEditor.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+# Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 set -e
 
@@ -9,4 +9,4 @@ echo Building and packaging Flax Editor...
 cd "`dirname "$0"`"
 
 # Run Flax.Build (also pass the arguments)
-bash ./Development/Scripts/Linux/CallBuildTool.sh --deploy --deployEditor --dotnet=7 --verbose --log --logFile="Cache/Intermediate/PackageLog.txt" "$@"
+bash ./Development/Scripts/Linux/CallBuildTool.sh --deploy --deployEditor --dotnet=8 --verbose --log --logFile="Cache/Intermediate/PackageLog.txt" "$@"

PackagePlatforms.bat

@@ -1,13 +1,13 @@
 @echo off
 
-rem Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+rem Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 setlocal
 pushd
 echo Building and packaging platforms data...
 
 rem Run the build tool.
-call "Development\Scripts\Windows\CallBuildTool.bat" -deploy -deployPlatforms -dotnet=7 -verbose -log -logFile="Cache\Intermediate\PackageLog.txt" %*
+call "Development\Scripts\Windows\CallBuildTool.bat" -deploy -deployPlatforms -dotnet=8 -verbose -log -logFile="Cache\Intermediate\PackageLog.txt" %*
 if errorlevel 1 goto BuildToolFailed
 
 popd

PackagePlatforms.command

@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+# Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 set -e
 
@@ -9,4 +9,4 @@ echo Building and packaging platforms data...
 cd "`dirname "$0"`"
 
 # Run Flax.Build (also pass the arguments)
-bash ./Development/Scripts/Mac/CallBuildTool.sh --deploy --deployPlatforms --dotnet=7 --verbose --log --logFile="Cache/Intermediate/PackageLog.txt" "$@"
+bash ./Development/Scripts/Mac/CallBuildTool.sh --deploy --deployPlatforms --dotnet=8 --verbose --log --logFile="Cache/Intermediate/PackageLog.txt" "$@"

PackagePlatforms.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+# Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 set -e
 
@@ -9,4 +9,4 @@ echo Building and packaging platforms data...
 cd "`dirname "$0"`"
 
 # Run Flax.Build (also pass the arguments)
-bash ./Development/Scripts/Linux/CallBuildTool.sh --deploy --deployPlatforms --dotnet=7 --verbose --log --logFile="Cache/Intermediate/PackageLog.txt" "$@"
+bash ./Development/Scripts/Linux/CallBuildTool.sh --deploy --deployPlatforms --dotnet=8 --verbose --log --logFile="Cache/Intermediate/PackageLog.txt" "$@"

README.md

@@ -31,7 +31,7 @@ Follow the instructions below to compile and run the engine from source.
 * Install Visual Studio 2022 or newer
 * Install Windows 8.1 SDK or newer (via Visual Studio Installer)
 * Install Microsoft Visual C++ 2015 v140 toolset or newer (via Visual Studio Installer)
-* Install .NET 7 SDK for **Windows x64** (via Visual Studio Installer or [from web](https://dotnet.microsoft.com/en-us/download/dotnet/7.0))
+* Install .NET 8 SDK for **Windows x64** (via Visual Studio Installer or [from web](https://dotnet.microsoft.com/en-us/download/dotnet/8.0))
 * Install Git with LFS
 * Clone repo (with LFS)
 * Run **GenerateProjectFiles.bat**
@@ -44,8 +44,8 @@ Follow the instructions below to compile and run the engine from source.
 ## Linux
 
 * Install Visual Studio Code
-* Install .NET 7 SDK ([https://dotnet.microsoft.com/en-us/download/dotnet/7.0](https://dotnet.microsoft.com/en-us/download/dotnet/7.0))
-  * Ubuntu: `sudo apt install dotnet-sdk-7.0`
+* Install .NET 8 SDK ([https://dotnet.microsoft.com/en-us/download/dotnet/8.0](https://dotnet.microsoft.com/en-us/download/dotnet/8.0))
+  * Ubuntu: `sudo apt install dotnet-sdk-8.0`
 * Install Vulkan SDK ([https://vulkan.lunarg.com/](https://vulkan.lunarg.com/))
   * Ubuntu: `sudo apt install vulkan-sdk`
   * Arch: `sudo pacman -S spirv-tools vulkan-headers vulkan-tools vulkan-validation-layers`
@@ -67,7 +67,7 @@ Follow the instructions below to compile and run the engine from source.
 ## Mac
 
 * Install XCode
-* Install .NET 7 SDK ([https://dotnet.microsoft.com/en-us/download/dotnet/7.0](https://dotnet.microsoft.com/en-us/download/dotnet/7.0))
+* Install .NET 8 SDK ([https://dotnet.microsoft.com/en-us/download/dotnet/8.0](https://dotnet.microsoft.com/en-us/download/dotnet/8.0))
 * Install Vulkan SDK ([https://vulkan.lunarg.com/](https://vulkan.lunarg.com/))
 * Clone repo (with LFS)
 * Run `GenerateProjectFiles.command`
@@ -80,9 +80,9 @@ Follow the instructions below to compile and run the engine from source.
 
 Restart PC - ensure DotNet is added to PATH for command line tools execution.
 
-* `Microsoft.NET.TargetFrameworkInference.targets(141,5): error NETSDK1045: The current .NET SDK does not support targeting .NET 7.0.  Either target .NET 5.0 or lower, or use a version of the .NET SDK that supports .NET 7.0`
+* `Microsoft.NET.TargetFrameworkInference.targets(141,5): error NETSDK1045: The current .NET SDK does not support targeting .NET 8.0.  Either target .NET 5.0 or lower, or use a version of the .NET SDK that supports .NET 8.0`
 
-Use Visual Studio 2022, older versions are not supported by .NET SDK 7.
+Use Visual Studio 2022, older versions are not supported by .NET SDK 8.
 
 * `Building for Windows without Vulkan rendering backend (Vulkan SDK is missing)`
 

RegisterEngineLocation.bat

@@ -1,6 +1,6 @@
 @echo off
 
-rem Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+rem Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 setlocal
 pushd %~dp0

Source/Editor/Analytics/EditorAnalytics.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 #include "EditorAnalytics.h"
 #include "Editor/Editor.h"

Source/Editor/Analytics/EditorAnalytics.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 #pragma once
 

Source/Editor/Content/AssetItemConverter.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 using System;
 using Newtonsoft.Json;

Source/Editor/Content/Create/CreateFileEntry.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 namespace FlaxEditor.Content.Create
 {

Source/Editor/Content/Create/CreateFilesDialog.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 using System;
 using System.Collections.Generic;

Source/Editor/Content/Create/ParticleEmitterCreateEntry.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 using System;
 using System.IO;
@@ -81,7 +81,7 @@ namespace FlaxEditor.Content.Create
             switch (_options.Template)
             {
             case Templates.Empty:
-                return Editor.CreateAsset(Editor.NewAssetType.ParticleEmitter, ResultUrl);
+                return Editor.CreateAsset("ParticleEmitter", ResultUrl);
             case Templates.ConstantBurst:
                 templateName = "Constant Burst";
                 break;

Source/Editor/Content/Create/SettingsCreateEntry.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 using System;
 using System.Collections.Generic;

Source/Editor/Content/Create/VisualScriptCreateEntry.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 using System;
 using FlaxEngine;

Source/Editor/Content/GUI/ContentNavigation.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 using FlaxEditor.GUI;
 using FlaxEditor.GUI.ContextMenu;
@@ -161,7 +161,7 @@ namespace FlaxEditor.Content.GUI
         {
             var style = Style.Current;
             var rect = new Rectangle(Float2.Zero, Size);
-            var color = IsDragOver ? style.BackgroundSelected * 0.6f : (_mouseDown ? style.BackgroundSelected : (IsMouseOver ? style.BackgroundHighlighted : Color.Transparent));
+            var color = IsDragOver ? Color.Transparent : (_mouseDown ? style.BackgroundSelected : (IsMouseOver ? style.BackgroundHighlighted : Color.Transparent));
             Render2D.FillRectangle(rect, color);
             Render2D.DrawSprite(Editor.Instance.Icons.ArrowRight12, new Rectangle(rect.Location.X, rect.Y + rect.Size.Y * 0.25f, rect.Size.X, rect.Size.X), EnabledInHierarchy ? style.Foreground : style.ForegroundDisabled);
         }

Source/Editor/Content/GUI/ContentView.DragDrop.cs

@@ -1,123 +0,0 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
-
-using FlaxEditor.GUI.Drag;
-using FlaxEditor.SceneGraph;
-using FlaxEngine;
-using FlaxEngine.GUI;
-
-namespace FlaxEditor.Content.GUI
-{
-    public partial class ContentView
-    {
-        private bool _validDragOver;
-        private DragActors _dragActors;
-
-        /// <inheritdoc />
-        public override DragDropEffect OnDragEnter(ref Float2 location, DragData data)
-        {
-            var result = base.OnDragEnter(ref location, data);
-            if (result != DragDropEffect.None)
-                return result;
-
-            // Check if drop file(s)
-            if (data is DragDataFiles)
-            {
-                _validDragOver = true;
-                return DragDropEffect.Copy;
-            }
-
-            // Check if drop actor(s)
-            if (_dragActors == null)
-                _dragActors = new DragActors(ValidateDragActors);
-            if (_dragActors.OnDragEnter(data))
-            {
-                _validDragOver = true;
-                return DragDropEffect.Move;
-            }
-
-            return DragDropEffect.None;
-        }
-
-        private bool ValidateDragActors(ActorNode actor)
-        {
-            return actor.CanCreatePrefab && Editor.Instance.Windows.ContentWin.CurrentViewFolder.CanHaveAssets;
-        }
-
-        private void ImportActors(DragActors actors, ContentFolder location)
-        {
-            foreach (var actorNode in actors.Objects)
-            {
-                var actor = actorNode.Actor;
-                if (actors.Objects.Contains(actorNode.ParentNode as ActorNode))
-                    continue;
-
-                Editor.Instance.Prefabs.CreatePrefab(actor, false);
-            }
-        }
-
-        /// <inheritdoc />
-        public override DragDropEffect OnDragMove(ref Float2 location, DragData data)
-        {
-            _validDragOver = false;
-            var result = base.OnDragMove(ref location, data);
-            if (result != DragDropEffect.None)
-                return result;
-
-            if (data is DragDataFiles)
-            {
-                _validDragOver = true;
-                result = DragDropEffect.Copy;
-            }
-            else if (_dragActors != null && _dragActors.HasValidDrag)
-            {
-                _validDragOver = true;
-                result = DragDropEffect.Move;
-            }
-
-            return result;
-        }
-
-        /// <inheritdoc />
-        public override DragDropEffect OnDragDrop(ref Float2 location, DragData data)
-        {
-            var result = base.OnDragDrop(ref location, data);
-            if (result != DragDropEffect.None)
-                return result;
-
-            // Check if drop file(s)
-            if (data is DragDataFiles files)
-            {
-                // Import files
-                var currentFolder = Editor.Instance.Windows.ContentWin.CurrentViewFolder;
-                if (currentFolder != null)
-                    Editor.Instance.ContentImporting.Import(files.Files, currentFolder);
-                result = DragDropEffect.Copy;
-            }
-            // Check if drop actor(s)
-            else if (_dragActors != null && _dragActors.HasValidDrag)
-            {
-                // Import actors
-                var currentFolder = Editor.Instance.Windows.ContentWin.CurrentViewFolder;
-                if (currentFolder != null)
-                    ImportActors(_dragActors, currentFolder);
-
-                _dragActors.OnDragDrop();
-                result = DragDropEffect.Move;
-            }
-
-            // Clear cache
-            _validDragOver = false;
-
-            return result;
-        }
-
-        /// <inheritdoc />
-        public override void OnDragLeave()
-        {
-            _validDragOver = false;
-            _dragActors?.OnDragLeave();
-
-            base.OnDragLeave();
-        }
-    }
-}

Source/Editor/Content/GUI/ContentView.cs

@@ -1,9 +1,11 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using FlaxEditor.GUI.Drag;
 using FlaxEditor.Options;
+using FlaxEditor.SceneGraph;
 using FlaxEditor.Windows;
 using FlaxEngine;
 using FlaxEngine.GUI;
@@ -52,10 +54,16 @@ namespace FlaxEditor.Content.GUI
     public partial class ContentView : ContainerControl, IContentItemOwner
     {
         private readonly List<ContentItem> _items = new List<ContentItem>(256);
-        private readonly List<ContentItem> _selection = new List<ContentItem>(16);
+        private readonly List<ContentItem> _selection = new List<ContentItem>();
 
         private float _viewScale = 1.0f;
         private ContentViewType _viewType = ContentViewType.Tiles;
+        private bool _isRubberBandSpanning;
+        private Float2 _mousePressLocation;
+        private Rectangle _rubberBandRectangle;
+
+        private bool _validDragOver;
+        private DragActors _dragActors;
 
         #region External Events
 
@@ -190,6 +198,7 @@ namespace FlaxEditor.Content.GUI
                         OnDelete?.Invoke(_selection);
                 }),
                 new InputActionsContainer.Binding(options => options.SelectAll, SelectAll),
+                new InputActionsContainer.Binding(options => options.DeselectAll, DeselectAll),
                 new InputActionsContainer.Binding(options => options.Rename, () =>
                 {
                     if (HasSelection && _selection[0].CanRename)
@@ -394,10 +403,7 @@ namespace FlaxEditor.Content.GUI
             PerformLayout();
         }
 
-        /// <summary>
-        /// Selects all the items.
-        /// </summary>
-        public void SelectAll()
+        private void BulkSelectUpdate(bool select = true)
         {
             // Lock layout
             var wasLayoutLocked = IsLayoutLocked;
@@ -405,13 +411,30 @@ namespace FlaxEditor.Content.GUI
 
             // Select items
             _selection.Clear();
-            _selection.AddRange(_items);
+            if (select)
+                _selection.AddRange(_items);
 
             // Unload and perform UI layout
             IsLayoutLocked = wasLayoutLocked;
             PerformLayout();
         }
 
+        /// <summary>
+        /// Selects all the items.
+        /// </summary>
+        public void SelectAll()
+        {
+            BulkSelectUpdate(true);
+        }
+
+        /// <summary>
+        /// Deselects all the items.
+        /// </summary>
+        public void DeselectAll()
+        {
+            BulkSelectUpdate(false);
+        }
+
         /// <summary>
         /// Deselects the specified item.
         /// </summary>
@@ -592,7 +615,9 @@ namespace FlaxEditor.Content.GUI
             // Check if drag is over
             if (IsDragOver && _validDragOver)
             {
-                Render2D.FillRectangle(new Rectangle(Float2.Zero, Size), style.BackgroundSelected * 0.4f);
+                var bounds = new Rectangle(Float2.One, Size - Float2.One * 2);
+                Render2D.FillRectangle(bounds, style.Selection);
+                Render2D.DrawRectangle(bounds, style.SelectionBorder);
             }
 
             // Check if it's an empty thing
@@ -600,6 +625,13 @@ namespace FlaxEditor.Content.GUI
             {
                 Render2D.DrawText(style.FontSmall, IsSearching ? "No results" : "Empty", new Rectangle(Float2.Zero, Size), style.ForegroundDisabled, TextAlignment.Center, TextAlignment.Center);
             }
+
+            // Selection
+            if (_isRubberBandSpanning)
+            {
+                Render2D.FillRectangle(_rubberBandRectangle, style.Selection);
+                Render2D.DrawRectangle(_rubberBandRectangle, style.SelectionBorder);
+            }
         }
 
         /// <inheritdoc />
@@ -607,9 +639,56 @@ namespace FlaxEditor.Content.GUI
         {
             if (base.OnMouseDown(location, button))
                 return true;
+
+            if (button == MouseButton.Left)
+            {
+                _mousePressLocation = location;
+                _rubberBandRectangle = new Rectangle(_mousePressLocation, 0, 0);
+                _isRubberBandSpanning = true;
+                StartMouseCapture();
+                return true;
+            }
+
             return AutoFocus && Focus(this);
         }
 
+        /// <inheritdoc />
+        public override void OnMouseMove(Float2 location)
+        {
+            if (_isRubberBandSpanning)
+            {
+                _rubberBandRectangle.Width = location.X - _mousePressLocation.X;
+                _rubberBandRectangle.Height = location.Y - _mousePressLocation.Y;
+            }
+
+            base.OnMouseMove(location);
+        }
+
+        /// <inheritdoc />
+        public override bool OnMouseUp(Float2 location, MouseButton button)
+        {
+            if (_isRubberBandSpanning)
+            {
+                _isRubberBandSpanning = false;
+                EndMouseCapture();
+                if (_rubberBandRectangle.Width < 0 || _rubberBandRectangle.Height < 0)
+                {
+                    // make sure we have a well-formed rectangle i.e. size is positive and X/Y is upper left corner
+                    var size = _rubberBandRectangle.Size;
+                    _rubberBandRectangle.X = Mathf.Min(_rubberBandRectangle.X, _rubberBandRectangle.X + _rubberBandRectangle.Width);
+                    _rubberBandRectangle.Y = Mathf.Min(_rubberBandRectangle.Y, _rubberBandRectangle.Y + _rubberBandRectangle.Height);
+                    size.X = Mathf.Abs(size.X);
+                    size.Y = Mathf.Abs(size.Y);
+                    _rubberBandRectangle.Size = size;
+                }
+                var itemsInRectangle = _items.Where(t => _rubberBandRectangle.Intersects(t.Bounds)).ToList();
+                Select(itemsInRectangle, Input.GetKey(KeyboardKeys.Shift) || Input.GetKey(KeyboardKeys.Control));
+                return true;
+            }
+
+            return base.OnMouseUp(location, button);
+        }
+
         /// <inheritdoc />
         public override bool OnMouseWheel(Float2 location, float delta)
         {
@@ -714,6 +793,114 @@ namespace FlaxEditor.Content.GUI
             return false;
         }
 
+        /// <inheritdoc />
+        public override DragDropEffect OnDragEnter(ref Float2 location, DragData data)
+        {
+            var result = base.OnDragEnter(ref location, data);
+            if (result != DragDropEffect.None)
+                return result;
+
+            // Check if drop file(s)
+            if (data is DragDataFiles)
+            {
+                _validDragOver = true;
+                return DragDropEffect.Copy;
+            }
+
+            // Check if drop actor(s)
+            if (_dragActors == null)
+                _dragActors = new DragActors(ValidateDragActors);
+            if (_dragActors.OnDragEnter(data))
+            {
+                _validDragOver = true;
+                return DragDropEffect.Move;
+            }
+
+            return DragDropEffect.None;
+        }
+
+        private bool ValidateDragActors(ActorNode actor)
+        {
+            return actor.CanCreatePrefab && Editor.Instance.Windows.ContentWin.CurrentViewFolder.CanHaveAssets;
+        }
+
+        private void ImportActors(DragActors actors, ContentFolder location)
+        {
+            foreach (var actorNode in actors.Objects)
+            {
+                var actor = actorNode.Actor;
+                if (actors.Objects.Contains(actorNode.ParentNode as ActorNode))
+                    continue;
+
+                Editor.Instance.Prefabs.CreatePrefab(actor, false);
+            }
+        }
+
+        /// <inheritdoc />
+        public override DragDropEffect OnDragMove(ref Float2 location, DragData data)
+        {
+            _validDragOver = false;
+            var result = base.OnDragMove(ref location, data);
+            if (result != DragDropEffect.None)
+                return result;
+
+            if (data is DragDataFiles)
+            {
+                _validDragOver = true;
+                result = DragDropEffect.Copy;
+            }
+            else if (_dragActors != null && _dragActors.HasValidDrag)
+            {
+                _validDragOver = true;
+                result = DragDropEffect.Move;
+            }
+
+            return result;
+        }
+
+        /// <inheritdoc />
+        public override DragDropEffect OnDragDrop(ref Float2 location, DragData data)
+        {
+            var result = base.OnDragDrop(ref location, data);
+            if (result != DragDropEffect.None)
+                return result;
+
+            // Check if drop file(s)
+            if (data is DragDataFiles files)
+            {
+                // Import files
+                var currentFolder = Editor.Instance.Windows.ContentWin.CurrentViewFolder;
+                if (currentFolder != null)
+                    Editor.Instance.ContentImporting.Import(files.Files, currentFolder);
+                result = DragDropEffect.Copy;
+            }
+            // Check if drop actor(s)
+            else if (_dragActors != null && _dragActors.HasValidDrag)
+            {
+                // Import actors
+                var currentFolder = Editor.Instance.Windows.ContentWin.CurrentViewFolder;
+                if (currentFolder != null)
+                    ImportActors(_dragActors, currentFolder);
+
+                _dragActors.OnDragDrop();
+                result = DragDropEffect.Move;
+            }
+
+            // Clear cache
+            _validDragOver = false;
+
+            return result;
+        }
+
+        /// <inheritdoc />
+        public override void OnDragLeave()
+        {
+            _validDragOver = false;
+            _dragActors?.OnDragLeave();
+
+            base.OnDragLeave();
+        }
+
         /// <inheritdoc />
         protected override void PerformLayoutBeforeChildren()
         {
@@ -779,6 +966,9 @@ namespace FlaxEditor.Content.GUI
         /// <inheritdoc />
         public override void OnDestroy()
         {
+            if (IsDisposing)
+                return;
+
             // Ensure to unlink all items
             ClearItems();
 

Source/Editor/Content/IFileEntryAction.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 using FlaxEngine;
 

Source/Editor/Content/Import/AssetImportEntry.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 namespace FlaxEditor.Content.Import
 {

Source/Editor/Content/Import/AudioImportSettings.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 using System.Collections.Generic;
 using FlaxEditor.CustomEditors.Editors;

Source/Editor/Content/Import/FolderImportEntry.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 using System.IO;
 

Source/Editor/Content/Import/ImportFileEntry.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 using System.Collections.Generic;
 using System.IO;

Source/Editor/Content/Import/ImportFilesDialog.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 using System;
 using System.Collections.Generic;

Source/Editor/Content/Import/ModelImportEntry.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 using System.Collections.Generic;
 using FlaxEditor.CustomEditors.Editors;
@@ -16,6 +16,7 @@ namespace FlaxEngine.Tools
             private bool ShowModel => Type == ModelType.Model || Type == ModelType.Prefab;
             private bool ShowSkinnedModel => Type == ModelType.SkinnedModel || Type == ModelType.Prefab;
             private bool ShowAnimation => Type == ModelType.Animation || Type == ModelType.Prefab;
+            private bool ShowRootMotion => ShowAnimation && RootMotion != RootMotionMode.None;
             private bool ShowSmoothingNormalsAngle => ShowGeometry && CalculateNormals;
             private bool ShowSmoothingTangentsAngle => ShowGeometry && CalculateTangents;
             private bool ShowFramesRange => ShowAnimation && Duration == AnimationDuration.Custom;

Source/Editor/Content/Import/Request.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 using FlaxEngine;
 

Source/Editor/Content/Import/TextureImportEntry.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 using System.Collections.Generic;
 using System.ComponentModel;

Source/Editor/Content/Items/AssetItem.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 using System;
 using FlaxEngine;

Source/Editor/Content/Items/BinaryAssetItem.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 using System;
 using System.Text;

Source/Editor/Content/Items/CSharpScriptItem.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 using FlaxEngine;
 

Source/Editor/Content/Items/ContentFolder.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 using System;
 using System.Collections.Generic;
@@ -241,7 +241,12 @@ namespace FlaxEditor.Content
 
             // Check if drag is over
             if (IsDragOver && _validDragOver)
-                Render2D.FillRectangle(new Rectangle(Float2.Zero, Size), Style.Current.BackgroundSelected * 0.6f);
+            {
+                var style = Style.Current;
+                var bounds = new Rectangle(Float2.Zero, Size);
+                Render2D.FillRectangle(bounds, style.Selection);
+                Render2D.DrawRectangle(bounds, style.SelectionBorder);
+            }
         }
 
         private bool ValidateDragItem(ContentItem item)

Source/Editor/Content/Items/ContentItem.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 using System;
 using System.Collections.Generic;

Source/Editor/Content/Items/CppScriptItem.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 using FlaxEngine;
 

Source/Editor/Content/Items/FileItem.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 using FlaxEngine;
 

Source/Editor/Content/Items/JsonAssetItem.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 using System;
 using FlaxEngine;

Source/Editor/Content/Items/NewItem.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 using System.Text;
 using FlaxEngine;

Source/Editor/Content/Items/PrefabItem.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 using System;
 using FlaxEngine;