[Core] WIP refactor;

Author: LittleCodingFox

Engine/Staple.Core/Assets/NoiseGeneratorSettings.cs

@@ -23,9 +23,7 @@ public class NoiseGeneratorSettings : IStapleAsset, IGuidAsset
     public NoiseGenerator.DomainWarpType domainWarpType = NoiseGenerator.DomainWarpType.OpenSimplex2;
     public float domainWarpAmp = 1;
 
-    private readonly GuidHasher guidHasher = new();
-
-    public GuidHasher Guid => guidHasher;
+    public GuidHasher Guid { get; } = new();
 
     public static object Create(string guid)
     {

Engine/Staple.Core/Assets/TextAsset.cs

@@ -8,9 +8,7 @@ public class TextAsset : IGuidAsset
 
     public byte[] bytes;
 
-    private readonly GuidHasher guidHasher = new();
-
-    public GuidHasher Guid => guidHasher;
+    public GuidHasher Guid { get; } = new();
 
     public static object Create(string guid)
     {

Engine/Staple.Core/Audio/AudioClip.cs

@@ -55,9 +55,7 @@ public sealed class AudioClip : IGuidAsset
     /// </summary>
     internal byte[] fileData;
 
-    private readonly GuidHasher guidHasher = new();
-
-    public GuidHasher Guid => guidHasher;
+    public GuidHasher Guid { get; } = new();
 
     /// <summary>
     /// Gets an internal audio stream for the audio.

Engine/Staple.Core/Entities/EntityQuery.cs

@@ -39,45 +39,40 @@ public enum EntityQueryMode
 public sealed class EntityQuery<T> : ISceneQuery
     where T : IComponent
 {
-    private T[] contents = [];
-    private T content;
-    private (Entity, T)[] contentEntities = [];
-    private (Entity, T) contentEntity;
-
     private readonly EntityQueryMode queryMode;
     private readonly Entity target;
     private readonly bool getEntities;
 
-    public int Length => contents.Length;
+    public int Length => Contents.Length;
 
     /// <summary>
     /// Contained content. Only valid if we have a single element.
     /// </summary>
-    public T Content => content;
+    public T Content { get; private set; }
 
     /// <summary>
     /// Contained content. Only valid if we have a single element.
     /// </summary>
-    public T[] Contents => contents;
+    public T[] Contents { get; private set; } = [];
 
     /// <summary>
     /// The content with its entity, if available.
     /// </summary>
-    public (Entity, T) ContentEntity => contentEntity;
+    public (Entity, T) ContentEntity { get; private set; }
 
     /// <summary>
     /// The content with its entity, if available.
     /// </summary>
-    public (Entity, T)[] ContentEntities => contentEntities;
+    public (Entity, T)[] ContentEntities { get; private set; } = [];
 
-    public T this[int index] => contents[index];
+    public T this[int index] => Contents[index];
 
     /// <summary>
     /// Gets an entity and component at a specific index
     /// </summary>
     /// <param name="index">The index to get at</param>
     /// <returns>The entity and component as a tuple, if valid</returns>
-    public (Entity, T) ContentEntityAt(int index) => index >= 0 && index < contentEntities.Length ? contentEntities[index] : default;
+    public (Entity, T) ContentEntityAt(int index) => index >= 0 && index < ContentEntities.Length ? ContentEntities[index] : default;
 
     /// <summary>
     /// Creates an entity query for a specific entity.
@@ -101,20 +96,20 @@ public void Unregister()
     {
         World.RemoveSceneQuery(this);
 
-        content = default;
-        contentEntity = default;
+        Content = default;
+        ContentEntity = default;
 
-        contents = [];
-        contentEntities = [];
+        Contents = [];
+        ContentEntities = [];
     }
 
     public void WorldChanged()
     {
-        content = default;
-        contentEntity = default;
+        Content = default;
+        ContentEntity = default;
 
-        contents = [];
-        contentEntities = [];
+        Contents = [];
+        ContentEntities = [];
 
         if (!target.IsValid)
         {
@@ -143,7 +138,7 @@ public void WorldChanged()
             count++;
         }
 
-        contents = new T[count];
+        Contents = new T[count];
 
         for(int i = 0, counter = 0; i < items.Length; i++)
         {
@@ -152,27 +147,29 @@ public void WorldChanged()
                 continue;
             }
 
-            contents[counter++] = (T)items[i];
+            Contents[counter++] = items[i];
         }
 
-        if(count == 1 && contents[0] != null)
+        if(count == 1 && Contents[0] != null)
         {
-            content = contents[0];
+            Content = Contents[0];
         }
 
-        if(getEntities)
+        if (!getEntities)
         {
-            contentEntities = new (Entity, T)[count];
+            return;
+        }
+        
+        ContentEntities = new (Entity, T)[count];
 
-            for(var i = 0; i < items.Length; i++)
-            {
-                contentEntities[i] = (World.Current.GetComponentEntity(contents[i]), contents[i]);
-            }
+        for(var i = 0; i < items.Length; i++)
+        {
+            ContentEntities[i] = (World.Current.GetComponentEntity(Contents[i]), Contents[i]);
+        }
 
-            if(count == 1 && contents[0] != null)
-            {
-                contentEntity = contentEntities[0];
-            }
+        if(count == 1 && Contents[0] != null)
+        {
+            ContentEntity = ContentEntities[0];
         }
     }
 }
@@ -187,45 +184,40 @@ public sealed class EntityQuery<T, T2> : ISceneQuery
     where T : IComponent
     where T2 : IComponent
 {
-    private (T, T2)[] contents = [];
-    private (T, T2) content;
-    private (Entity, T, T2)[] contentEntities = [];
-    private (Entity, T, T2) contentEntity;
-
     private readonly EntityQueryMode queryMode;
     private readonly Entity target;
     private readonly bool getEntities;
 
-    public int Length => contents.Length;
+    public int Length => Contents.Length;
 
     /// <summary>
     /// Contained content. Only valid if we have a single element.
     /// </summary>
-    public (T, T2) Content => content;
+    public (T, T2) Content { get; private set; }
 
     /// <summary>
     /// Contained content. Only valid if we have a single element.
     /// </summary>
-    public (T, T2)[] Contents => contents;
+    public (T, T2)[] Contents { get; private set; } = [];
 
     /// <summary>
     /// The content with its entity, if available.
     /// </summary>
-    public (Entity, T, T2) ContentEntity => contentEntity;
+    public (Entity, T, T2) ContentEntity { get; private set; }
 
     /// <summary>
     /// The content with its entity, if available.
     /// </summary>
-    public (Entity, T, T2)[] ContentEntities => contentEntities;
+    public (Entity, T, T2)[] ContentEntities { get; private set; } = [];
 
-    public (T, T2) this[int index] => contents[index];
+    public (T, T2) this[int index] => Contents[index];
 
     /// <summary>
     /// Gets an entity and component at a specific index
     /// </summary>
     /// <param name="index">The index to get at</param>
     /// <returns>The entity and component as a tuple, if valid</returns>
-    public (Entity, T, T2) ContentEntityAt(int index) => index >= 0 && index < contentEntities.Length ? contentEntities[index] : default;
+    public (Entity, T, T2) ContentEntityAt(int index) => index >= 0 && index < ContentEntities.Length ? ContentEntities[index] : default;
 
     /// <summary>
     /// Creates an entity query for a specific entity.
@@ -249,20 +241,20 @@ public void Unregister()
     {
         World.RemoveSceneQuery(this);
 
-        content = default;
-        contentEntity = default;
+        Content = default;
+        ContentEntity = default;
 
-        contents = [];
-        contentEntities = [];
+        Contents = [];
+        ContentEntities = [];
     }
 
     public void WorldChanged()
     {
-        content = default;
-        contentEntity = default;
+        Content = default;
+        ContentEntity = default;
 
-        contents = [];
-        contentEntities = [];
+        Contents = [];
+        ContentEntities = [];
 
         if (!target.IsValid)
         {
@@ -413,28 +405,30 @@ void Recursive(Transform transform)
                 break;
         }
 
-        contents = items.ToArray();
+        Contents = items.ToArray();
 
-        if (contents.Length == 1)
+        if (Contents.Length == 1)
         {
-            content = contents[0];
+            Content = Contents[0];
         }
 
-        if (getEntities)
+        if (!getEntities)
         {
-            contentEntities = new (Entity, T, T2)[items.Count];
+            return;
+        }
 
-            for (var i = 0; i < items.Count; i++)
-            {
-                var item = items[i];
+        ContentEntities = new (Entity, T, T2)[items.Count];
 
-                contentEntities[i] = (World.Current.GetComponentEntity(item.Item1), item.Item1, item.Item2);
-            }
+        for (var i = 0; i < items.Count; i++)
+        {
+            var item = items[i];
 
-            if (items.Count == 1)
-            {
-                contentEntity = contentEntities[0];
-            }
+            ContentEntities[i] = (World.Current.GetComponentEntity(item.Item1), item.Item1, item.Item2);
+        }
+
+        if (items.Count == 1)
+        {
+            ContentEntity = ContentEntities[0];
         }
     }
 }

Engine/Staple.Core/Entities/Prefab.cs

@@ -9,9 +9,7 @@ public sealed class Prefab : IGuidAsset
 {
     internal SerializablePrefab data;
 
-    private readonly GuidHasher guidHasher = new();
-
-    public GuidHasher Guid => guidHasher;
+    public GuidHasher Guid { get; } = new();
 
     public static object Create(string guid)
     {

Engine/Staple.Core/External/StbRectPackSharp/src/Packer.cs

@@ -39,12 +39,11 @@ public PackerRectangle(Rectangle rect, object data)
 	unsafe class Packer : IDisposable
 	{
 		private readonly stbrp_context _context;
-		private readonly List<PackerRectangle> _rectangles = new List<PackerRectangle>();
 
 		public int Width => _context.width;
 		public int Height => _context.height;
 
-		public List<PackerRectangle> PackRectangles => _rectangles;
+		public List<PackerRectangle> PackRectangles { get; } = new List<PackerRectangle>();
 
 
 		public Packer(int width = 256, int height = 256)
@@ -85,7 +84,7 @@ public PackerRectangle PackRect(int width, int height, object userData)
 		{
 			var rect = new stbrp_rect
 			{
-				id = _rectangles.Count,
+				id = PackRectangles.Count,
 				w = width,
 				h = height
 			};
@@ -102,7 +101,7 @@ public PackerRectangle PackRect(int width, int height, object userData)
 			}
 
 			var packRectangle = new PackerRectangle(new Rectangle(rect.x, rect.y, rect.w, rect.h), userData);
-			_rectangles.Add(packRectangle);
+			PackRectangles.Add(packRectangle);
 
 			return packRectangle;
 		}

Engine/Staple.Core/Input/InputActions.cs

@@ -13,9 +13,7 @@ public sealed class InputActions : IStapleAsset, IGuidAsset
     /// </summary>
     public List<InputAction> actions = [];
 
-    private readonly GuidHasher guidHasher = new();
-
-    public GuidHasher Guid => guidHasher;
+    public GuidHasher Guid { get; } = new();
 
     public static object Create(string guid)
     {

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

@@ -10,17 +10,7 @@ namespace Staple.Internal;
 /// </summary>
 public sealed class Physics3D : ISubsystem
 {
-    private static Physics3D instance;
-
-    public static Physics3D Instance
-    {
-        get => instance;
-
-        internal set
-        {
-            instance = value;
-        }
-    }
+    public static Physics3D Instance { get; internal set; }
 
     public const int PhysicsPickLayer = 31;
 

Engine/Staple.Core/Rendering/Animation/SkinnedAnimationStateMachine.cs

@@ -179,9 +179,7 @@ public class EditorData
     [SerializeField]
     public EditorData editorData = new();
 
-    private readonly GuidHasher guidHasher = new();
-
-    public GuidHasher Guid => guidHasher;
+    public GuidHasher Guid { get; } = new();
 
     public static object Create(string guid)
     {

Engine/Staple.Core/Rendering/Animation/SkinnedMeshRenderSystem.cs

@@ -306,7 +306,7 @@ void SetupMaterial()
                         continue;
                     }
 
-                    material.ApplyProperties(Material.ApplyMode.All, ref renderState);
+                    material.ApplyProperties(ref renderState);
                 }
 
                 SetupMaterial();