[Rendering] Revert change;

[Editor] Update Program.cs for PC backends;

Author: LittleCodingFox

Engine/Core/Rendering/Animation/SkinnedMeshRenderSystem.cs

@@ -280,27 +280,39 @@ public void Submit()
                 var material = renderer.materials[j];
 
                 var needsChange = assetGuid != lastMeshAsset ||
-                    material.Guid != (lastMaterial?.Guid ?? "");
-
-                var lightSystem = RenderSystem.Instance.Get<LightSystem>();
+                    material.Guid != (lastMaterial?.Guid ?? "") ||
+                    lastAnimator != animator;
 
                 if (needsChange)
                 {
                     lastMeshAsset = assetGuid;
                     lastMaterial = material;
+                    lastAnimator = animator;
 
                     bgfx.discard((byte)bgfx.DiscardFlags.All);
 
                     material.EnableShaderKeyword(Shader.SkinningKeyword);
 
+                    var lightSystem = RenderSystem.Instance.Get<LightSystem>();
+
                     lightSystem?.ApplyMaterialLighting(material, pair.renderer.lighting);
 
                     if(material.ShaderProgram.Valid == false)
                     {
                         continue;
                     }
 
-                    material.ApplyProperties(Material.ApplyMode.TexturesOnly);
+                    bgfx.set_state((ulong)(state |
+                        renderer.mesh.PrimitiveFlag() |
+                        material.shader.BlendingFlag |
+                        material.CullingFlag), 0);
+
+                    material.ApplyProperties(Material.ApplyMode.All);
+
+                    material.shader.SetMatrix4x4(material.GetShaderHandle("u_boneMatrices"), boneMatrices);
+
+                    lightSystem?.ApplyLightProperties(pair.position, pair.transform, material,
+                        RenderSystem.CurrentCamera.Item2.Position, pair.renderer.lighting);
                 }
 
                 unsafe
@@ -312,24 +324,11 @@ public void Submit()
 
                 renderer.mesh.SetActive(j);
 
-                material.ApplyProperties(Material.ApplyMode.IgnoreTextures);
-
-                material.shader.SetMatrix4x4(material.GetShaderHandle("u_boneMatrices"), boneMatrices);
-
                 var program = material.ShaderProgram;
 
-                bgfx.set_state((ulong)(state |
-                    renderer.mesh.PrimitiveFlag() |
-                    material.shader.BlendingFlag |
-                    material.CullingFlag), 0);
-
-                lightSystem?.ApplyLightProperties(pair.position, pair.transform, material,
-                    RenderSystem.CurrentCamera.Item2.Position, pair.renderer.lighting);
-
                 var flags = bgfx.DiscardFlags.VertexStreams |
                     bgfx.DiscardFlags.IndexBuffer |
-                    bgfx.DiscardFlags.Transform |
-                    bgfx.DiscardFlags.State;
+                    bgfx.DiscardFlags.Transform;
 
                 bgfx.submit(pair.viewID, program, 0, (byte)flags);
             }

Engine/Core/Rendering/Mesh/MeshRenderSystem.cs

@@ -226,8 +226,6 @@ void DrawMesh(int index)
 
                 var needsChange = lastMaterial?.Guid.GetHashCode() != material?.Guid?.GetHashCode();
 
-                var lightSystem = RenderSystem.Instance.Get<LightSystem>();
-
                 if (needsChange)
                 {
                     bgfx.discard((byte)bgfx.DiscardFlags.All);
@@ -236,14 +234,24 @@ void DrawMesh(int index)
 
                     material.DisableShaderKeyword(Shader.SkinningKeyword);
 
+                    var lightSystem = RenderSystem.Instance.Get<LightSystem>();
+
                     lightSystem?.ApplyMaterialLighting(material, pair.renderer.lighting);
 
                     if(material.ShaderProgram.Valid == false)
                     {
                         return;
                     }
 
-                    material.ApplyProperties(Material.ApplyMode.TexturesOnly);
+                    bgfx.set_state((ulong)(state |
+                        pair.renderer.mesh.PrimitiveFlag() |
+                        material.shader.BlendingFlag |
+                        material.CullingFlag), 0);
+
+                    material.ApplyProperties(Material.ApplyMode.All);
+
+                    lightSystem?.ApplyLightProperties(pair.position, pair.transform, material,
+                        RenderSystem.CurrentCamera.Item2.Position, pair.renderer.lighting);
                 }
 
                 unsafe
@@ -255,22 +263,11 @@ void DrawMesh(int index)
 
                 pair.renderer.mesh.SetActive(index);
 
-                bgfx.set_state((ulong)(state |
-                    pair.renderer.mesh.PrimitiveFlag() |
-                    material.shader.BlendingFlag |
-                    material.CullingFlag), 0);
-
-                material.ApplyProperties(Material.ApplyMode.IgnoreTextures);
-
-                lightSystem?.ApplyLightProperties(pair.position, pair.transform, material,
-                    RenderSystem.CurrentCamera.Item2.Position, pair.renderer.lighting);
-
                 var program = material.ShaderProgram;
 
                 var flags = bgfx.DiscardFlags.VertexStreams |
                     bgfx.DiscardFlags.IndexBuffer |
-                    bgfx.DiscardFlags.Transform |
-                    bgfx.DiscardFlags.State;
+                    bgfx.DiscardFlags.Transform;
 
                 bgfx.submit(pair.viewID, program, 0, (byte)flags);
             }

Staging/Player Backends/Linux/Resources/Program.cs

@@ -9,7 +9,7 @@ public static void Main(string[] args)
         {
             Console.WriteLine($"Staple: Registering type cache");
 
-            TypeCacheRegistration.RegisterAll();
+            StapleCodeGeneration.TypeCacheRegistration.RegisterAll();
 
             Console.WriteLine($"Staple: Registered {TypeCache.AllTypes().Length} types");
 

Staging/Player Backends/MacOSX/Resources/Program.cs

@@ -9,7 +9,7 @@ public static void Main(string[] args)
         {
             Console.WriteLine($"Staple: Registering type cache");
 
-            TypeCacheRegistration.RegisterAll();
+            StapleCodeGeneration.TypeCacheRegistration.RegisterAll();
 
             Console.WriteLine($"Staple: Registered {TypeCache.AllTypes().Length} types");
 

Staging/Player Backends/Windows/Resources/Program.cs

@@ -9,7 +9,7 @@ public static void Main(string[] args)
         {
             Console.WriteLine($"Staple: Registering type cache");
 
-            TypeCacheRegistration.RegisterAll();
+            StapleCodeGeneration.TypeCacheRegistration.RegisterAll();
 
             Console.WriteLine($"Staple: Registered {TypeCache.AllTypes().Length} types");