[Rendering] Bugfixes to skinned mesh renderers;

Author: LittleCodingFox

Engine/Core/Rendering/Animation/SkinnedMeshRenderSystem.cs

@@ -20,6 +20,11 @@ private struct RenderInfo
         /// </summary>
         public SkinnedMeshRenderer renderer;
 
+        /// <summary>
+        /// The render cache
+        /// </summary>
+        public RenderCache cache;
+
         /// <summary>
         /// The current position of the object
         /// </summary>
@@ -36,9 +41,16 @@ private struct RenderInfo
         public ushort viewID;
     }
 
+    private class RenderCache
+    {
+        public Matrix4x4[] boneMatrices;
+
+        public VertexBuffer boneBuffer;
+    }
+
     private readonly ExpandableContainer<RenderInfo> renderers = new();
 
-    private readonly Dictionary<int, Matrix4x4[]> cachedBoneMatrices = [];
+    private readonly Dictionary<int, RenderCache> renderCache = [];
 
     public void Startup()
     {
@@ -94,23 +106,39 @@ public void Process((Entity, Transform, IComponent)[] entities, Camera activeCam
 
             renderer.animator ??= new(entity, EntityQueryMode.Parent, false);
 
+            var animator = renderer.animator.Content;
+            var mesh = renderer.mesh;
+            var meshAsset = mesh.meshAsset;
+
+            Matrix4x4[] boneMatrices;
+
+            if (renderCache.TryGetValue(meshAsset.Guid.GetHashCode(), out var cache) == false)
+            {
+                boneMatrices = new Matrix4x4[meshAsset.BoneCount];
+
+                cache = new()
+                {
+                    boneMatrices = boneMatrices,
+                };
+
+                renderCache.Add(meshAsset.Guid.GetHashCode(), cache);
+            }
+            else
+            {
+                boneMatrices = cache.boneMatrices;
+            }
+
             renderers.Add(new()
             {
                 renderer = renderer,
+                cache = cache,
                 position = transform.Position,
                 transform = transform.Matrix,
                 viewID = viewId
             });
 
-            var animator = renderer.animator.Content;
-            var mesh = renderer.mesh;
-            var meshAsset = mesh.meshAsset;
-            var meshAssetMesh = meshAsset.meshes[mesh.meshAssetIndex];
-
             var useAnimator = animator != null && animator.evaluator != null;
 
-            Matrix4x4[] boneMatrices;
-
             if (useAnimator)
             {
                 if((animator?.cachedBoneMatrices?.Length ?? 0) == 0)
@@ -120,25 +148,21 @@ public void Process((Entity, Transform, IComponent)[] entities, Camera activeCam
 
                 boneMatrices = animator.cachedBoneMatrices;
             }
-            else if (cachedBoneMatrices.TryGetValue(meshAsset.Guid.GetHashCode(), out boneMatrices) == false)
+            else
             {
-                boneMatrices = new Matrix4x4[meshAsset.BoneCount];
-
-                cachedBoneMatrices.Add(meshAsset.Guid.GetHashCode(), boneMatrices);
-
                 UpdateBoneMatrices(meshAsset, boneMatrices, meshAsset.nodes);
             }
 
-            if (useAnimator == false && (renderer.boneMatrixBuffer?.Disposed ?? true))
+            if (useAnimator == false && (cache.boneBuffer?.Disposed ?? true))
             {
-                renderer.boneMatrixBuffer = VertexBuffer.CreateDynamic(new VertexLayoutBuilder()
+                cache.boneBuffer = VertexBuffer.CreateDynamic(new VertexLayoutBuilder()
                     .Add(VertexAttribute.TexCoord0, 4, VertexAttributeType.Float)
                     .Add(VertexAttribute.TexCoord1, 4, VertexAttributeType.Float)
                     .Add(VertexAttribute.TexCoord2, 4, VertexAttributeType.Float)
                     .Add(VertexAttribute.TexCoord3, 4, VertexAttributeType.Float)
                     .Build(), RenderBufferFlags.ComputeRead, true, (uint)boneMatrices.Length);
 
-                renderer.boneMatrixBuffer.Update(boneMatrices.AsSpan(), 0, true);
+                cache.boneBuffer.Update(boneMatrices.AsSpan(), 0, true);
             }
         }
     }
@@ -165,6 +189,7 @@ public void Submit()
         foreach(var pair in renderers.Contents)
         {
             var renderer = pair.renderer;
+            var cache = pair.cache;
             var mesh = renderer.mesh;
             var meshAsset = mesh.meshAsset;
             var animator = renderer.animator.Content;
@@ -228,14 +253,9 @@ public void Submit()
                     bgfx.DiscardFlags.IndexBuffer |
                     bgfx.DiscardFlags.Transform;
 
-                if (useAnimator)
-                {
-                    animator.boneMatrixBuffer?.SetBufferActive(15, Access.Read);
-                }
-                else
-                {
-                    renderer.boneMatrixBuffer?.SetBufferActive(15, Access.Read);
-                }
+                var buffer = useAnimator ? animator.boneMatrixBuffer : cache.boneBuffer;
+
+                buffer?.SetBufferActive(15, Access.Read);
 
                 bgfx.submit(pair.viewID, program, 0, (byte)flags);
             }

Engine/Core/Rendering/Animation/SkinnedMeshRenderer.cs

@@ -1,12 +1,11 @@
 using System.Collections.Generic;
-using System.Numerics;
 
 namespace Staple;
 
 /// <summary>
 /// Skinned Mesh Renderer component
 /// </summary>
-public sealed class SkinnedMeshRenderer : Renderable, IComponentDisposable
+public sealed class SkinnedMeshRenderer : Renderable
 {
     /// <summary>
     /// The mesh used for this
@@ -27,16 +26,4 @@ public sealed class SkinnedMeshRenderer : Renderable, IComponentDisposable
     /// Cached animator for this renderer
     /// </summary>
     internal EntityQuery<SkinnedMeshAnimator> animator;
-
-    /// <summary>
-    /// The bone matrix compute buffer for skinning
-    /// </summary>
-    internal VertexBuffer boneMatrixBuffer;
-
-    public void DisposeComponent()
-    {
-        boneMatrixBuffer?.Destroy();
-
-        boneMatrixBuffer = null;
-    }
 }

Engine/Core/Rendering/Mesh/MeshAsset.cs

@@ -479,9 +479,9 @@ public void ApplyTo(Transform transform)
 
             Matrix4x4.Decompose(GlobalTransform, out var scale, out var rotation, out var position);
 
-            transform.Position = position;
-            transform.Rotation = rotation;
-            transform.Scale = scale;
+            transform.LocalPosition = position;
+            transform.LocalRotation = rotation;
+            transform.LocalScale = scale;
         }
 
         /// <summary>

Engine/Editor/EditorUtils.cs

@@ -338,6 +338,8 @@ internal static Entity InstanceMesh(string name, MeshAsset asset, Entity parentE
 
                 nodeTransform.SetParent(baseTransform);
 
+                node.ApplyTo(nodeTransform);
+
                 foreach (var index in node.meshIndices)
                 {
                     if (index < 0 || index >= asset.meshes.Count)