[Platform] Fix AppSettings cloning missing some fields;

[Physics] Add missing Physics profiling tracking;
[Rendering] Fix missing vertex/fragment textures causing exceptions;
[UI] Add UIPerformanceDisplayer;

Author: LittleCodingFox

Engine/Staple.Core/AppSettings/AppSettings.cs

@@ -185,7 +185,7 @@ public class AppSettings
     /// x64 Instruction Level
     /// </summary>
     [Key(28)]
-    public X64InstructionLevel x64InstructionLevel = X64InstructionLevel.x86_64v3;
+    public X64InstructionLevel x64InstructionLevel = X64InstructionLevel.x86_64v2;
 
     [IgnoreMember]
     public static AppSettings Default
@@ -285,6 +285,8 @@ internal AppSettings Clone()
             enableLighting = enableLighting,
             allowUnsafeCode = allowUnsafeCode,
             usePhysicsInterpolation = usePhysicsInterpolation,
+            overrideNativeInstructionSetX64 = overrideNativeInstructionSetX64,
+            x64InstructionLevel = x64InstructionLevel,
         };
     }
 }

Engine/Staple.Core/Performance/PerformanceProfilerSystem.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Threading;
 
 namespace Staple.Internal;
 
@@ -13,7 +14,7 @@ internal static class PerformanceProfilerSystem
 
     private static readonly Dictionary<PerformanceProfilerType, int> averageFrameCounters = [];
 
-    private static readonly object lockObject = new();
+    private static readonly Lock lockObject = new();
 
     private static DateTime lastAverageTime = DateTime.UtcNow;
 

Engine/Staple.Core/Physics/3D/Physics3D.cs

@@ -132,6 +132,8 @@ internal IBody3D CreateBody(Entity entity, World world)
             return default;
         }
 
+        using var profiler = new PerformanceProfiler(PerformanceProfilerType.Physics);
+
         return Impl.CreateBody(entity, world);
     }
 
@@ -166,6 +168,8 @@ internal bool CreateBox(Entity entity, Vector3 extents, Vector3 position, Quater
             return false;
         }
 
+        using var profiler = new PerformanceProfiler(PerformanceProfilerType.Physics);
+
         return Impl.CreateBox(entity, extents, position, rotation, motionType, layer, isTrigger, gravityFactor,
             friction, restitution, freezeX, freezeY, freezeZ, is2DPlane, mass, out body);
     }
@@ -201,6 +205,8 @@ internal bool CreateSphere(Entity entity, float radius, Vector3 position, Quater
             return false;
         }
 
+        using var profiler = new PerformanceProfiler(PerformanceProfilerType.Physics);
+
         return Impl.CreateSphere(entity, radius, position, rotation, motionType, layer, isTrigger, gravityFactor,
             friction, restitution, freezeX, freezeY, freezeZ, is2DPlane, mass, out body);
     }
@@ -237,6 +243,8 @@ internal bool CreateCapsule(Entity entity, float height, float radius, Vector3 p
             return false;
         }
 
+        using var profiler = new PerformanceProfiler(PerformanceProfilerType.Physics);
+
         return Impl.CreateCapsule(entity, height, radius, position, rotation, motionType, layer, isTrigger, gravityFactor,
             friction, restitution, freezeX, freezeY, freezeZ, is2DPlane, mass, out body);
     }
@@ -273,6 +281,8 @@ internal bool CreateCylinder(Entity entity, float height, float radius, Vector3
             return false;
         }
 
+        using var profiler = new PerformanceProfiler(PerformanceProfilerType.Physics);
+
         return Impl.CreateCylinder(entity, height, radius, position, rotation, motionType, layer, isTrigger, gravityFactor,
             friction, restitution, freezeX, freezeY, freezeZ, is2DPlane, mass, out body);
     }
@@ -308,6 +318,8 @@ internal bool CreateMesh(Entity entity, Mesh mesh, Vector3 position, Quaternion
             return false;
         }
 
+        using var profiler = new PerformanceProfiler(PerformanceProfilerType.Physics);
+
         return Impl.CreateMesh(entity, mesh, position, rotation, motionType, layer, isTrigger, gravityFactor,
             friction, restitution, freezeX, freezeY, freezeZ, is2DPlane, mass, out body);
     }
@@ -337,6 +349,8 @@ internal bool CreateHeightMap(Entity entity, float[] heights, Vector3 offset, Ve
             return false;
         }
 
+        using var profiler = new PerformanceProfiler(PerformanceProfilerType.Physics);
+
         return Impl.CreateHeightMap(entity, heights, offset, scale, position, rotation, layer, friction, restitution, mass, out body);
     }
 
@@ -351,6 +365,8 @@ internal void DestroyBody(IBody3D body)
             return;
         }
 
+        using var profiler = new PerformanceProfiler(PerformanceProfilerType.Physics);
+
         Impl.DestroyBody(body);
     }
 
@@ -364,6 +380,8 @@ internal void DestroyAllBodies()
             return;
         }
 
+        using var profiler = new PerformanceProfiler(PerformanceProfilerType.Physics);
+
         Impl.DestroyAllBodies();
     }
 
@@ -379,6 +397,8 @@ internal void AddBody(IBody3D body, bool activated)
             return;
         }
 
+        using var profiler = new PerformanceProfiler(PerformanceProfilerType.Physics);
+
         Impl.AddBody(body, activated);
     }
 
@@ -393,6 +413,8 @@ internal void RemoveBody(IBody3D body)
             return;
         }
 
+        using var profiler = new PerformanceProfiler(PerformanceProfilerType.Physics);
+
         Impl.RemoveBody(body);
     }
 
@@ -416,6 +438,8 @@ public bool RayCast(Ray ray, out IBody3D body, out float fraction, LayerMask lay
             return false;
         }
 
+        using var profiler = new PerformanceProfiler(PerformanceProfilerType.Physics);
+
         return Impl.RayCast(ray, out body, out fraction, layerMask, triggerQuery, maxDistance);
     }
 
@@ -431,6 +455,8 @@ public float GravityFactor(IBody3D body)
             return default;
         }
 
+        using var profiler = new PerformanceProfiler(PerformanceProfilerType.Physics);
+
         return Impl.GravityFactor(body);
     }
 
@@ -446,6 +472,8 @@ public void SetGravityFactor(IBody3D body, float factor)
             return;
         }
 
+        using var profiler = new PerformanceProfiler(PerformanceProfilerType.Physics);
+
         Impl.SetGravityFactor(body, factor);
     }
 
@@ -461,6 +489,8 @@ public void SetBodyPosition(IBody3D body, Vector3 newPosition)
             return;
         }
 
+        using var profiler = new PerformanceProfiler(PerformanceProfilerType.Physics);
+
         Impl.SetBodyPosition(body, newPosition);
     }
 
@@ -476,6 +506,8 @@ public void SetBodyRotation(IBody3D body, Quaternion newRotation)
             return;
         }
 
+        using var profiler = new PerformanceProfiler(PerformanceProfilerType.Physics);
+
         Impl.SetBodyRotation(body, newRotation);
     }
 
@@ -491,6 +523,8 @@ public void SetBodyTrigger(IBody3D body, bool value)
             return;
         }
 
+        using var profiler = new PerformanceProfiler(PerformanceProfilerType.Physics);
+
         Impl.SetBodyTrigger(body, value);
     }
 
@@ -506,6 +540,8 @@ public IBody3D GetBody(Entity entity)
             return default;
         }
 
+        using var profiler = new PerformanceProfiler(PerformanceProfilerType.Physics);
+
         return Impl.GetBody(entity);
     }
 
@@ -521,6 +557,8 @@ public void AddForce(IBody3D body, Vector3 force)
             return;
         }
 
+        using var profiler = new PerformanceProfiler(PerformanceProfilerType.Physics);
+
         Impl.AddForce(body, force);
     }
 
@@ -536,6 +574,8 @@ public void AddImpulse(IBody3D body, Vector3 impulse)
             return;
         }
 
+        using var profiler = new PerformanceProfiler(PerformanceProfilerType.Physics);
+
         Impl.AddImpulse(body, impulse);
     }
 
@@ -551,6 +591,8 @@ public void AddAngularImpulse(IBody3D body, Vector3 impulse)
             return;
         }
 
+        using var profiler = new PerformanceProfiler(PerformanceProfilerType.Physics);
+
         Impl.AddAngularImpulse(body, impulse);
     }
 
@@ -565,7 +607,9 @@ public void RecreateBody(Entity entity)
             return;
         }
 
-        if(entity.TryGetComponent<RigidBody3D>(out var rigidBody))
+        using var profiler = new PerformanceProfiler(PerformanceProfilerType.Physics);
+
+        if (entity.TryGetComponent<RigidBody3D>(out var rigidBody))
         {
             if (rigidBody.body != null)
             {
@@ -609,6 +653,8 @@ public void Startup()
                 return;
             }
 
+            using var profiler = new PerformanceProfiler(PerformanceProfilerType.Physics);
+
             var rigidBody = (RigidBody3D)component;
 
             rigidBody.body = CreateBody(entity, world);
@@ -621,6 +667,8 @@ public void Startup()
                 return;
             }
 
+            using var profiler = new PerformanceProfiler(PerformanceProfilerType.Physics);
+
             var character = (Character3D)component;
 
             character.body = CreateBody(entity, world);
@@ -633,6 +681,8 @@ public void Startup()
                 return;
             }
 
+            using var profiler = new PerformanceProfiler(PerformanceProfilerType.Physics);
+
             var rigidBody = (RigidBody3D)component;
 
             DestroyBody(rigidBody.body);
@@ -647,6 +697,8 @@ public void Startup()
                 return;
             }
 
+            using var profiler = new PerformanceProfiler(PerformanceProfilerType.Physics);
+
             var character = (Character3D)component;
 
             DestroyBody(character.body);
@@ -683,7 +735,9 @@ public void Update()
             return;
         }
 
-        if(needsSubsystemCheck)
+        using var profiler = new PerformanceProfiler(PerformanceProfilerType.Physics);
+
+        if (needsSubsystemCheck)
         {
             needsSubsystemCheck = false;
 
@@ -698,6 +752,8 @@ public void Update()
 
     public void BodyActivated(IBody3D body)
     {
+        using var profiler = new PerformanceProfiler(PerformanceProfilerType.Physics);
+
         lock (lockObject)
         {
             foreach (var system in physicsReceivers)
@@ -709,6 +765,8 @@ public void BodyActivated(IBody3D body)
 
     public void BodyDeactivated(IBody3D body)
     {
+        using var profiler = new PerformanceProfiler(PerformanceProfilerType.Physics);
+
         lock (lockObject)
         {
             foreach (var system in physicsReceivers)
@@ -720,6 +778,8 @@ public void BodyDeactivated(IBody3D body)
 
     public void ContactAdded(IBody3D A, IBody3D B)
     {
+        using var profiler = new PerformanceProfiler(PerformanceProfilerType.Physics);
+
         lock (lockObject)
         {
             foreach (var system in physicsReceivers)
@@ -731,6 +791,8 @@ public void ContactAdded(IBody3D A, IBody3D B)
 
     public void ContactPersisted(IBody3D A, IBody3D B)
     {
+        using var profiler = new PerformanceProfiler(PerformanceProfilerType.Physics);
+
         lock (lockObject)
         {
             foreach (var system in physicsReceivers)
@@ -742,6 +804,8 @@ public void ContactPersisted(IBody3D A, IBody3D B)
 
     public void ContactRemoved(IBody3D A, IBody3D B)
     {
+        using var profiler = new PerformanceProfiler(PerformanceProfilerType.Physics);
+
         lock (lockObject)
         {
             foreach (var system in physicsReceivers)
@@ -753,6 +817,8 @@ public void ContactRemoved(IBody3D A, IBody3D B)
 
     public bool ContactValidate(IBody3D A, IBody3D B)
     {
+        using var profiler = new PerformanceProfiler(PerformanceProfilerType.Physics);
+
         lock (lockObject)
         {
             foreach (var system in physicsReceivers)

Engine/Staple.Core/Rendering/RenderSystem/Backend/Impls/SDLGPU/SDLGPURendererBackend+Textures.cs

@@ -1002,6 +1002,13 @@ internal bool TryGetTextureSamplers(Texture[] vertexTextures, Texture[] fragment
 
         if (vertexSamplers != null)
         {
+            if(vertexTextures == null)
+            {
+                vertexSamplers = fragmentSamplers = default;
+
+                return false;
+            }
+
             for (var i = 0; i < vertexSamplers.Length; i++)
             {
                 if (vertexTextures[i]?.impl is not SDLGPUTexture texture ||
@@ -1020,6 +1027,13 @@ internal bool TryGetTextureSamplers(Texture[] vertexTextures, Texture[] fragment
 
         if (fragmentSamplers != null)
         {
+            if (fragmentTextures == null)
+            {
+                vertexSamplers = fragmentSamplers = default;
+
+                return false;
+            }
+
             for (var i = 0; i < fragmentSamplers.Length; i++)
             {
                 if (fragmentTextures[i]?.impl is not SDLGPUTexture texture ||

Engine/Staple.Core/Rendering/Windowing/RenderWindow.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading;
 
 namespace Staple.Internal;

Engine/Staple.Core/Staple.Core.csproj

@@ -286,6 +286,7 @@
 		<Compile Include="UI\UIPanel+API.cs" />
 		<Compile Include="UI\UIPanel+Internal.cs" />
 		<Compile Include="UI\UIPanel.cs" />
+		<Compile Include="UI\UIPerformanceDisplayer.cs" />
 		<Compile Include="UI\UIRenderStats.cs" />
 		<Compile Include="UI\UIScrollableFrame.cs" />
 		<Compile Include="UI\UIScrollBar.cs" />