[Editor] Fixed player backends using the wrong dotnet version;

[Android] Fixed builds crashing due to failing to load shaders;
[Core] Fix TypeCacheGenerator clearing type caches when it shouldn't;
[Rendering] Cleanup;

Author: LittleCodingFox

Engine/Core/Rendering/Animation/SkinnedMeshRenderSystem.cs

@@ -100,7 +100,7 @@ public void Process((Entity, Transform, IComponent)[] entities, Camera activeCam
 
             var useAnimator = animator != null && animator.evaluator != null;
 
-            Matrix4x4[] boneMatrices = null;
+            Matrix4x4[] boneMatrices;
 
             if (useAnimator)
             {
@@ -226,6 +226,7 @@ public void Submit()
         Material lastMaterial = null;
         int lastMeshAsset = 0;
         SkinnedMeshAnimator lastAnimator = null;
+        MaterialLighting lastLighting = MaterialLighting.Unlit;
 
         bgfx.discard((byte)bgfx.DiscardFlags.All);
 
@@ -234,61 +235,25 @@ public void Submit()
             var renderer = pair.renderer;
             var mesh = renderer.mesh;
             var meshAsset = mesh.meshAsset;
-            var meshAssetMesh = meshAsset.meshes[mesh.meshAssetIndex];
             var animator = renderer.animator.Content;
 
             for (var j = 0; j < renderer.mesh.submeshes.Count; j++)
             {
                 var assetGuid = meshAsset.Guid.GetHashCode();
 
-                var useAnimator = animator != null && animator.evaluator != null;
-
-                Matrix4x4[] boneMatrices = null;
-
-                if (useAnimator)
-                {
-                    boneMatrices = animator.cachedBoneMatrices;
-                }
-                else
-                {
-                    cachedBoneMatrices.TryGetValue(assetGuid, out boneMatrices);
-                }
-
-                if(boneMatrices == null)
-                {
-                    continue;
-                }
-
-                var bones = meshAssetMesh.bones[j];
-
-                /*
-                if (bones.Length > MaxBones)
-                {
-                    Log.Warning($"Skipping skinned mesh render for {meshAssetMesh.name}: " +
-                        $"Bone count of {bones.Length} exceeds limit of {MaxBones}, try setting split large meshes in the import settings!");
-
-                    continue;
-                }
-                */
-
                 var material = renderer.materials[j];
 
-#if STAPLE_USE_EXPERIMENTAL_OPTIMIZATIONS
-                var needsChange = assetGuid != lastMeshAsset ||
-                    material.Guid != (lastMaterial?.Guid ?? "") ||
-                    lastAnimator != animator;
-#else
                 var needsChange = assetGuid != lastMeshAsset ||
                     material.Guid != (lastMaterial?.Guid ?? "") ||
                     lastAnimator != animator ||
-                    renderer.lighting != MaterialLighting.Unlit;
-#endif
+                    lastLighting != renderer.lighting;
 
                 if (needsChange)
                 {
                     lastMeshAsset = assetGuid;
                     lastMaterial = material;
                     lastAnimator = animator;
+                    lastLighting = renderer.lighting;
 
                     bgfx.discard((byte)bgfx.DiscardFlags.All);
 
@@ -329,10 +294,7 @@ public void Submit()
                     bgfx.DiscardFlags.IndexBuffer |
                     bgfx.DiscardFlags.Transform;
 
-                if(renderer.stagingBoneMatrixBuffer != null)
-                {
-                    renderer.stagingBoneMatrixBuffer.SetBufferActive(15, Access.Read);
-                }
+                renderer.stagingBoneMatrixBuffer?.SetBufferActive(15, Access.Read);
 
                 bgfx.submit(pair.viewID, program, 0, (byte)flags);
             }

Engine/Core/Rendering/Mesh/MeshRenderSystem.cs

@@ -205,25 +205,23 @@ public void Submit()
             bgfx.StateFlags.DepthTestLequal;
 
         Material lastMaterial = null;
+        MaterialLighting lastLighting = MaterialLighting.Unlit;
 
         foreach(var pair in renderers.Contents)
         {
             void DrawMesh(int index)
             {
                 var material = pair.renderer.materials[index];
 
-#if STAPLE_USE_EXPERIMENTAL_OPTIMIZATIONS
-                var needsChange = lastMaterial?.Guid.GetHashCode() != material?.Guid?.GetHashCode();
-#else
                 var needsChange = lastMaterial?.Guid.GetHashCode() != material?.Guid?.GetHashCode() ||
-                    pair.renderer.lighting != MaterialLighting.Unlit;
-#endif
+                    lastLighting != pair.renderer.lighting;
 
                 if (needsChange)
                 {
                     bgfx.discard((byte)bgfx.DiscardFlags.All);
 
                     lastMaterial = material;
+                    lastLighting = pair.renderer.lighting;
 
                     material.DisableShaderKeyword(Shader.SkinningKeyword);
 

Engine/Core/StapleCore.csproj

@@ -7,7 +7,6 @@
 		<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
 
 		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('macOS'))">$(TargetFrameworks);net9.0-ios</TargetFrameworks>
-		<DefineConstants>$(DefineConstants);STAPLE_USE_EXPERIMENTAL_OPTIMIZATIONS</DefineConstants>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Windows'))">

Engine/Editor/Backends/AndroidBuildProcessor.cs

@@ -114,7 +114,7 @@ public class PlayerActivity : StapleActivity
 {
     protected override void OnCreate(Bundle? savedInstanceState)
     {
-        TypeCacheRegistration.RegisterAll();
+        StapleCodeGeneration.TypeCacheRegistration.RegisterAll();
 
         base.OnCreate(savedInstanceState);
     }

Engine/TypeRegistration/TypeCacheRegistrationGenerator.cs

@@ -61,7 +61,6 @@ public static class TypeCacheRegistration
     {{
         public static void RegisterAll()
         {{
-            Staple.Internal.TypeCache.Clear();
 ";
 
             var types = new HashSet<string>();

Staging/Player Backends/Android/PlayerBackend.json

@@ -4,7 +4,7 @@
 	"redistOutput": "lib/arm64-v8a",
 	"dataDir": "Assets",
 	"platformRuntime": "android-arm64",
-	"framework": "net8.0-android",
+	"framework": "net9.0-android",
 	"publish": false,
 	"dataDirIsOutput": false,
 	"renderers": [

Staging/Player Backends/Linux/PlayerBackend.json

@@ -4,7 +4,7 @@
 	"redistOutput": ".",
 	"dataDir": "Data",
 	"platformRuntime": "linux-x64",
-	"framework": "net8.0",
+	"framework": "net9.0",
 	"publish": true,
 	"dataDirIsOutput": true,
 	"renderers": [

Staging/Player Backends/MacOSX/PlayerBackend.json

@@ -4,7 +4,7 @@
 	"redistOutput": ".",
 	"dataDir": "Data",
 	"platformRuntime": "osx-arm64",
-	"framework": "net8.0",
+	"framework": "net9.0",
 	"publish": true,
 	"dataDirIsOutput": true,
 	"renderers": [

Staging/Player Backends/Windows/PlayerBackend.json

@@ -4,7 +4,7 @@
 	"redistOutput": ".",
 	"dataDir": "Data",
 	"platformRuntime": "win-x64",
-	"framework": "net8.0",
+	"framework": "net9.0",
 	"publish": true,
 	"dataDirIsOutput": true,
 	"appIconExtension": "ico",

Staging/Player Backends/iOS/PlayerBackend.json

@@ -4,7 +4,7 @@
 	"redistOutput": ".",
 	"dataDir": ".",
 	"platformRuntime": "ios-arm64",
-	"framework": "net8.0-ios",
+	"framework": "net9.0-ios",
 	"publish": false,
 	"dataDirIsOutput": false,
 	"renderers": [