fix broken test

Co-Authored-By: cosmonaut <evan@moonside.games>
Co-Committed-By: cosmonaut <evan@moonside.games>

.drone.yml

@@ -7,13 +7,13 @@
 
     steps:
     - name: test
-      image: mcr.microsoft.com/dotnet/core/sdk:3.1
+      image: mcr.microsoft.com/dotnet/sdk:5.0.102-ca-patch-buster-slim
       commands:
         - dotnet build -c Release
         - dotnet test -c Release
 
     - name: deploy
-      image: mcr.microsoft.com/dotnet/core/sdk:3.1
+      image: mcr.microsoft.com/dotnet/sdk:5.0.102-ca-patch-buster-slim
       environment:
         API_KEY:
           from_secret: API_KEY

TODO

@@ -1,7 +0,0 @@
-- immutable component system?
-
-- method to remove all components of a type without destroying Entities
-- method to remove a component of a type without destroying entity
-
-- look at test coverage
-- docs

encompass-cs.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
+# Visual Studio Version 16
-VisualStudioVersion = 15.0.26124.0
+VisualStudioVersion = 16.0.30717.126
 MinimumVisualStudioVersion = 15.0.26124.0
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "encompass-cs", "encompass-cs\encompass-cs.csproj", "{B862FC25-0740-4CEA-BC53-3C5F43DCD985}"
 EndProject
@@ -9,38 +9,28 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "test", "test\test.csproj",
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B862FC25-0740-4CEA-BC53-3C5F43DCD985}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B862FC25-0740-4CEA-BC53-3C5F43DCD985}.Debug|x64.ActiveCfg = Debug|x64
-		{B862FC25-0740-4CEA-BC53-3C5F43DCD985}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B862FC25-0740-4CEA-BC53-3C5F43DCD985}.Debug|x64.Build.0 = Debug|x64
-		{B862FC25-0740-4CEA-BC53-3C5F43DCD985}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B862FC25-0740-4CEA-BC53-3C5F43DCD985}.Debug|x86.ActiveCfg = Debug|x86
-		{B862FC25-0740-4CEA-BC53-3C5F43DCD985}.Debug|x64.Build.0 = Debug|Any CPU
+		{B862FC25-0740-4CEA-BC53-3C5F43DCD985}.Debug|x86.Build.0 = Debug|x86
-		{B862FC25-0740-4CEA-BC53-3C5F43DCD985}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B862FC25-0740-4CEA-BC53-3C5F43DCD985}.Release|x64.ActiveCfg = Release|x64
-		{B862FC25-0740-4CEA-BC53-3C5F43DCD985}.Debug|x86.Build.0 = Debug|Any CPU
+		{B862FC25-0740-4CEA-BC53-3C5F43DCD985}.Release|x64.Build.0 = Release|x64
-		{B862FC25-0740-4CEA-BC53-3C5F43DCD985}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B862FC25-0740-4CEA-BC53-3C5F43DCD985}.Release|x86.ActiveCfg = Release|x86
-		{B862FC25-0740-4CEA-BC53-3C5F43DCD985}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B862FC25-0740-4CEA-BC53-3C5F43DCD985}.Release|x86.Build.0 = Release|x86
-		{B862FC25-0740-4CEA-BC53-3C5F43DCD985}.Release|x64.ActiveCfg = Release|Any CPU
+		{23D6C29C-A310-4D3E-8455-8D0B8CA1FC06}.Debug|x64.ActiveCfg = Debug|x64
-		{B862FC25-0740-4CEA-BC53-3C5F43DCD985}.Release|x64.Build.0 = Release|Any CPU
+		{23D6C29C-A310-4D3E-8455-8D0B8CA1FC06}.Debug|x64.Build.0 = Debug|x64
-		{B862FC25-0740-4CEA-BC53-3C5F43DCD985}.Release|x86.ActiveCfg = Release|Any CPU
+		{23D6C29C-A310-4D3E-8455-8D0B8CA1FC06}.Debug|x86.ActiveCfg = Debug|x86
-		{B862FC25-0740-4CEA-BC53-3C5F43DCD985}.Release|x86.Build.0 = Release|Any CPU
+		{23D6C29C-A310-4D3E-8455-8D0B8CA1FC06}.Debug|x86.Build.0 = Debug|x86
-		{23D6C29C-A310-4D3E-8455-8D0B8CA1FC06}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{23D6C29C-A310-4D3E-8455-8D0B8CA1FC06}.Release|x64.ActiveCfg = Release|x64
-		{23D6C29C-A310-4D3E-8455-8D0B8CA1FC06}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{23D6C29C-A310-4D3E-8455-8D0B8CA1FC06}.Release|x64.Build.0 = Release|x64
-		{23D6C29C-A310-4D3E-8455-8D0B8CA1FC06}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{23D6C29C-A310-4D3E-8455-8D0B8CA1FC06}.Release|x86.ActiveCfg = Release|x86
-		{23D6C29C-A310-4D3E-8455-8D0B8CA1FC06}.Debug|x64.Build.0 = Debug|Any CPU
+		{23D6C29C-A310-4D3E-8455-8D0B8CA1FC06}.Release|x86.Build.0 = Release|x86
-		{23D6C29C-A310-4D3E-8455-8D0B8CA1FC06}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{23D6C29C-A310-4D3E-8455-8D0B8CA1FC06}.Debug|x86.Build.0 = Debug|Any CPU
-		{23D6C29C-A310-4D3E-8455-8D0B8CA1FC06}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{23D6C29C-A310-4D3E-8455-8D0B8CA1FC06}.Release|Any CPU.Build.0 = Release|Any CPU
-		{23D6C29C-A310-4D3E-8455-8D0B8CA1FC06}.Release|x64.ActiveCfg = Release|Any CPU
-		{23D6C29C-A310-4D3E-8455-8D0B8CA1FC06}.Release|x64.Build.0 = Release|Any CPU
-		{23D6C29C-A310-4D3E-8455-8D0B8CA1FC06}.Release|x86.ActiveCfg = Release|Any CPU
-		{23D6C29C-A310-4D3E-8455-8D0B8CA1FC06}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

encompass-cs/Attributes/Adds.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+
+namespace Encompass
+{
+    [AttributeUsage(AttributeTargets.Class)]
+    public class Adds : Attribute
+    {
+        public readonly HashSet<Type> addTypes;
+
+        public Adds(params Type[] addTypes)
+        {
+            this.addTypes = new HashSet<Type>(addTypes);
+        }
+    }
+}

encompass-cs/Attributes/Receives.cs

@@ -1,7 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using Encompass.Exceptions;
 
 namespace Encompass
 {
@@ -12,15 +10,6 @@ namespace Encompass
 
         public Receives(params Type[] receiveTypes)
         {
-            foreach (var receiveType in receiveTypes)
-            {
-                var isMessage = receiveType.GetInterfaces().Contains(typeof(IMessage));
-                if (!isMessage)
-                {
-                    throw new IllegalSendTypeException("{0} must be a Message", receiveType.Name);
-                }
-            }
-
             ReceiveTypes = new HashSet<Type>(receiveTypes);
         }
     }

encompass-cs/Attributes/Sends.cs

@@ -1,7 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using Encompass.Exceptions;
 
 namespace Encompass
 {
@@ -12,15 +10,6 @@ namespace Encompass
 
         public Sends(params Type[] sendTypes)
         {
-            foreach (var sendType in sendTypes)
-            {
-                var isMessage = sendType.GetInterfaces().Contains(typeof(IMessage));
-                if (!isMessage)
-                {
-                    throw new IllegalSendTypeException("{0} must be a Message", sendType.Name);
-                }
-            }
-
             this.SendTypes = new HashSet<Type>(sendTypes);
         }
     }

encompass-cs/Collections/BitSet512.cs

@@ -0,0 +1,156 @@
+using System;
+
+namespace Encompass
+{
+    public static unsafe class MemoryHelper
+    {
+        public static void Copy(uint* src, uint* dest, int count)
+        {
+            for (; count != 0; count--) *dest++ = *src++;
+        }
+
+        public static void Fill(uint* p, int count, uint value)
+        {
+            for (; count != 0; count--) *p++ = value;
+        }
+
+        public static void And(uint* p, uint* q, uint* result, int count)
+        {
+            for (; count != 0; count--) *result++ = *p++ & *q++;
+        }
+
+        public static void Or(uint* p, uint* q, uint* result, int count)
+        {
+            for (; count != 0; count--) *result++ = *p++ | *q++;
+        }
+
+        public static void Not(uint* p, uint* result, int count)
+        {
+            for (; count != 0; count--) *result++ = ~*p++;
+        }
+
+        public static bool Equal(uint* p, uint* q, int count)
+        {
+            for (; count != 0; count--) if (*p++ != *q++) { return false;  }
+            return true;
+        }
+    }
+
+    public unsafe struct BitSet512 : IEquatable<BitSet512>
+    {
+        public static BitSet512 Zero { get; } = new BitSet512(0);
+        public static BitSet512 Ones { get; } = new BitSet512(uint.MaxValue);
+
+        private const int _uintLength = 16;
+
+        private fixed uint _buffer[_uintLength];
+
+        public BitSet512(uint value)
+        {
+            fixed (uint* p = _buffer) MemoryHelper.Fill(p, _uintLength, value);
+        }
+
+        public BitSet512(uint* src)
+        {
+            fixed (uint* dest = _buffer) MemoryHelper.Copy(src, dest, _uintLength);
+        }
+
+        public static BitSet512 operator &(BitSet512 a, BitSet512 b)
+        {
+            var tmp = stackalloc uint[_uintLength];
+            MemoryHelper.And(a._buffer, b._buffer, tmp, _uintLength);
+            return new BitSet512(tmp);
+        }
+
+        public static BitSet512 operator |(BitSet512 a, BitSet512 b)
+        {
+            var tmp = stackalloc uint[_uintLength];
+            MemoryHelper.Or(a._buffer, b._buffer, tmp, _uintLength);
+            return new BitSet512(tmp);
+        }
+
+        public static BitSet512 operator ~(BitSet512 a)
+        {
+            var tmp = stackalloc uint[_uintLength];
+            MemoryHelper.Not(a._buffer, tmp, _uintLength);
+            return new BitSet512(tmp);
+        }
+
+        public static bool operator ==(BitSet512 left, BitSet512 right)
+        {
+            return left.Equals(right);
+        }
+
+        public static bool operator !=(BitSet512 left, BitSet512 right)
+        {
+            return !(left == right);
+        }
+
+        public BitSet512 Set(int index)
+        {
+            var tmp = stackalloc uint[_uintLength];
+            fixed (uint* p = _buffer) MemoryHelper.Copy(p, tmp, _uintLength);
+            tmp[index / 32] |= (uint)(1 << index % 32);
+            return new BitSet512(tmp);
+        }
+
+        public BitSet512 UnSet(int index)
+        {
+            var tmp = stackalloc uint[_uintLength];
+            fixed (uint* p = _buffer) MemoryHelper.Copy(p, tmp, _uintLength);
+            tmp[index / 32] &= ~(uint)(1 << index % 32);
+            return new BitSet512(tmp);
+        }
+
+        public bool Get(int bitIndex)
+        {
+            var bitInt = (uint)(1 << bitIndex % 32);
+            return (_buffer[bitIndex / 32] & bitInt) == bitInt;
+        }
+
+        public bool AllTrue()
+        {
+            return this == Ones;
+        }
+
+        public bool AllFalse()
+        {
+            return this == Zero;
+        }
+
+        public static BitSet512 BitwiseAnd(BitSet512 left, BitSet512 right)
+        {
+            return left & right;
+        }
+
+        public static BitSet512 BitwiseOr(BitSet512 left, BitSet512 right)
+        {
+            return left | right;
+        }
+
+        public static BitSet512 OnesComplement(BitSet512 bitSet)
+        {
+            return ~bitSet;
+        }
+
+        public override bool Equals(object obj)
+        {
+            return obj is BitSet512 set && Equals(set);
+        }
+
+        public bool Equals(BitSet512 other)
+        {
+            fixed (uint* p = _buffer) return MemoryHelper.Equal(p, other._buffer, _uintLength);
+        }
+
+        public override int GetHashCode()
+        {
+            var hc = 0;
+            for (var i = 0; i < _uintLength; i++)
+            {
+                hc ^= _buffer[i].GetHashCode();
+            }
+            return hc;
+        }
+    }
+}

encompass-cs/Collections/ComponentBitSet.cs

@@ -1,4 +1,3 @@
-using MoonTools.FastCollections;
 using System;
 using System.Collections.Generic;
 

encompass-cs/Collections/ComponentDeltaStore.cs

@@ -74,7 +74,7 @@ namespace Encompass
             }
         }
 
-        public Span<Entity> AllEntities<TComponent>() where TComponent : struct
+        public ReadOnlySpan<Entity> AllEntities<TComponent>() where TComponent : struct
         {
             return _store.AllEntities<TComponent>();
         }

encompass-cs/Collections/ComponentStore.cs

@@ -1,5 +1,4 @@
 using Encompass.Exceptions;
-using MoonTools.FastCollections;
 using System;
 using System.Collections.Generic;
 
@@ -113,16 +112,26 @@ namespace Encompass
             return Lookup<TComponent>().Count > 0;
         }
 
-        public Span<TComponent> All<TComponent>() where TComponent : struct
+        public ReadOnlySpan<TComponent> All<TComponent>() where TComponent : struct
         {
             return Lookup<TComponent>().AllComponents();
         }
 
-        public Span<Entity> AllEntities<TComponent>() where TComponent : struct
+        public IEnumerable<TComponent> AllAsEnumerable<TComponent>() where TComponent : struct
+        {
+            return Lookup<TComponent>().AllComponentsAsEnumerable();
+        }
+
+        public ReadOnlySpan<Entity> AllEntities<TComponent>() where TComponent : struct
         {
             return Lookup<TComponent>().AllEntities();
         }
 
+        public IEnumerable<Entity> AllEntitiesAsEnumerable<TComponent>() where TComponent : struct
+        {
+            return Lookup<TComponent>().AllEntitiesAsEnumerable();
+        }
+
         public void Clear<TComponent>() where TComponent : struct
         {
             Lookup<TComponent>().Clear();

encompass-cs/Collections/MessageStore.cs

@@ -8,60 +8,60 @@ namespace Encompass
     {
         private readonly Dictionary<Type, TypedMessageStore> _stores = new Dictionary<Type, TypedMessageStore>(512);
 
-        private void RegisterMessageType<TMessage>() where TMessage : struct, IMessage
+        private void RegisterMessageType<TMessage>() where TMessage : struct
         {
             _stores.Add(typeof(TMessage), new TypedMessageStore<TMessage>());
         }
 
-        private TypedMessageStore<TMessage> Lookup<TMessage>() where TMessage : struct, IMessage
+        private TypedMessageStore<TMessage> Lookup<TMessage>() where TMessage : struct
         {
             if (!_stores.ContainsKey(typeof(TMessage))) { RegisterMessageType<TMessage>(); }
             return _stores[typeof(TMessage)] as TypedMessageStore<TMessage>;
         }
 
-        public void AddMessage<TMessage>(in TMessage message) where TMessage : struct, IMessage
+        public void AddMessage<TMessage>(in TMessage message) where TMessage : struct
         {
             Lookup<TMessage>().Add(message);
         }
 
-        public void AddMessage<TMessage>(in TMessage message, double time) where TMessage : struct, IMessage
+        public void AddMessage<TMessage>(in TMessage message, double time) where TMessage : struct
         {
             Lookup<TMessage>().Add(message, time);
         }
 
-        public void AddMessageIgnoringTimeDilation<TMessage>(in TMessage message, double time) where TMessage : struct, IMessage
+        public void AddMessageIgnoringTimeDilation<TMessage>(in TMessage message, double time) where TMessage : struct
         {
             Lookup<TMessage>().AddIgnoringTimeDilation(message, time);
         }
 
-        public ref readonly TMessage First<TMessage>() where TMessage : struct, IMessage
+        public ref readonly TMessage First<TMessage>() where TMessage : struct
         {
             if (!Any<TMessage>()) { throw new NoMessageOfTypeException("No Message of type {0} exists", typeof(TMessage).Name); }
 
             return ref Lookup<TMessage>().First();
         }
 
-        public Span<TMessage> All<TMessage>() where TMessage : struct, IMessage
+        public ReadOnlySpan<TMessage> All<TMessage>() where TMessage : struct
         {
             return Lookup<TMessage>().All();
         }
 
-        public bool Any<TMessage>() where TMessage : struct, IMessage
+        public bool Any<TMessage>() where TMessage : struct
         {
             return Lookup<TMessage>().Any();
         }
 
-        public IEnumerable<TMessage> WithEntity<TMessage>(int entityID) where TMessage : struct, IMessage, IHasEntity
+        public IEnumerable<TMessage> WithEntity<TMessage>(int entityID) where TMessage : struct, IHasEntity
         {
             return Lookup<TMessage>().WithEntity(entityID);
         }
 
-        public ref readonly TMessage FirstWithEntity<TMessage>(int entityID) where TMessage : struct, IMessage
+        public ref readonly TMessage FirstWithEntity<TMessage>(int entityID) where TMessage : struct
         {
             return ref Lookup<TMessage>().FirstWithEntity(entityID);
         }
 
-        public bool SomeWithEntity<TMessage>(int entityID) where TMessage : struct, IMessage, IHasEntity
+        public bool SomeWithEntity<TMessage>(int entityID) where TMessage : struct, IHasEntity
         {
             return Lookup<TMessage>().SomeWithEntity(entityID);
         }

encompass-cs/Collections/TypedComponentStore.cs

@@ -78,8 +78,8 @@ namespace Encompass
         {
             if (!_priorities.ContainsKey(entityID) || priority <= _priorities[entityID]) // if priorities are equal that means it's the same engine
             {
-                _priorities[entityID] = priority;
                 ForceRemove(entityID);
+                _priorities[entityID] = priority;
                 return true;
             }
 
@@ -92,7 +92,6 @@ namespace Encompass
             {
                 var storageIndex = _entityIDToStorageIndex[entityID];
                 _entityIDToStorageIndex.Remove(entityID);
-                _priorities.Remove(entityID);
 
                 // move a component into the hole to maintain contiguous memory
                 if (_nextID > 1 && storageIndex != _nextID - 1)
@@ -127,14 +126,24 @@ namespace Encompass
             _priorities.Clear();
         }
 
-        public Span<Entity> AllEntities()
+        public ReadOnlySpan<Entity> AllEntities()
         {
-            return new Span<Entity>(_storageIndexToEntities, 0, _nextID);
+            return new ReadOnlySpan<Entity>(_storageIndexToEntities, 0, _nextID);
         }
 
-        public Span<TComponent> AllComponents()
+        public IEnumerable<Entity> AllEntitiesAsEnumerable()
         {
-            return new Span<TComponent>(_components, 0, _nextID);
+            return new ArraySegment<Entity>(_storageIndexToEntities, 0, _nextID);
+        }
+
+        public ReadOnlySpan<TComponent> AllComponents()
+        {
+            return new ReadOnlySpan<TComponent>(_components, 0, _nextID);
+        }
+
+        public IEnumerable<TComponent> AllComponentsAsEnumerable()
+        {
+            return new ArraySegment<TComponent>(_components, 0, _nextID);
         }
     }
 }

encompass-cs/Collections/TypedMessageStore.cs

@@ -9,7 +9,7 @@ namespace Encompass
         public abstract void Clear();
     }
 
-    internal class TypedMessageStore<TMessage> : TypedMessageStore where TMessage : struct, IMessage
+    internal class TypedMessageStore<TMessage> : TypedMessageStore where TMessage : struct
     {
         // messages are placed in a contiguous region
         // so we can return the collection as a Span
@@ -92,9 +92,9 @@ namespace Encompass
             return _nextIndex != 0;
         }
 
-        public Span<TMessage> All()
+        public ReadOnlySpan<TMessage> All()
         {
-            return new Span<TMessage>(_store, 0, _nextIndex);
+            return new ReadOnlySpan<TMessage>(_store, 0, _nextIndex);
         }
 
         public IEnumerable<TMessage> WithEntity(int entityID)

encompass-cs/ComponentManager.cs

@@ -5,8 +5,6 @@ namespace Encompass
 {
     internal class ComponentManager
     {
-        private readonly DrawLayerManager _drawLayerManager;
-
         private readonly ComponentStore _existingComponentStore;
         private readonly ComponentStore _immediateComponentStore;
         private readonly ComponentDeltaStore _replayStore;
@@ -19,9 +17,8 @@ namespace Encompass
         internal ComponentBitSet ImmediateBits { get { return _immediateComponentStore.ComponentBitSet; } }
         internal ComponentBitSet ExistingBits { get { return _existingComponentStore.ComponentBitSet; } }
 
-        public ComponentManager(DrawLayerManager drawLayerManager, Dictionary<Type, int> typeToIndex)
+        public ComponentManager(Dictionary<Type, int> typeToIndex)
         {
-            this._drawLayerManager = drawLayerManager;
             _existingComponentStore = new ComponentStore(typeToIndex);
             _immediateComponentStore = new ComponentStore(typeToIndex);
             _replayStore = new ComponentDeltaStore(typeToIndex);
@@ -47,11 +44,6 @@ namespace Encompass
             _upToDateComponentStore.SwapWith(componentStore);
         }
 
-        internal void RegisterDrawableComponent<TComponent>(int entityID, int layer) where TComponent : struct
-        {
-            _drawLayerManager.RegisterComponentWithLayer<TComponent>(entityID, layer);
-        }
-
         internal void WriteComponents()
         {
             _existingComponentStore.UpdateUsing(_replayStore);
@@ -98,7 +90,7 @@ namespace Encompass
 
         // existing or immediate reads
 
-        internal Span<TComponent> ReadExistingAndImmediateComponentsByType<TComponent>() where TComponent : struct
+        internal ReadOnlySpan<TComponent> ReadExistingAndImmediateComponentsByType<TComponent>() where TComponent : struct
         {
             return _upToDateComponentStore.All<TComponent>();
         }
@@ -108,7 +100,7 @@ namespace Encompass
             return ref _upToDateComponentStore.Singular<TComponent>();
         }
 
-        internal Span<Entity> GetExistingAndImmediateEntities<TComponent>() where TComponent : struct
+        internal ReadOnlySpan<Entity> GetExistingAndImmediateEntities<TComponent>() where TComponent : struct
         {
             return _upToDateComponentStore.AllEntities<TComponent>();
         }
@@ -125,7 +117,7 @@ namespace Encompass
 
         // existing reads
 
-        internal Span<TComponent> GetExistingComponents<TComponent>() where TComponent : struct
+        internal ReadOnlySpan<TComponent> GetExistingComponents<TComponent>() where TComponent : struct
         {
             return _existingComponentStore.All<TComponent>();
         }
@@ -135,11 +127,16 @@ namespace Encompass
             return ref _existingComponentStore.Singular<TComponent>();
         }
 
-        internal Span<Entity> GetExistingEntities<TComponent>() where TComponent : struct
+        internal ReadOnlySpan<Entity> GetExistingEntities<TComponent>() where TComponent : struct
         {
             return _existingComponentStore.AllEntities<TComponent>();
         }
 
+        internal IEnumerable<Entity> GetExistingEntitiesAsEnumerable<TComponent>() where TComponent : struct
+        {
+            return _existingComponentStore.AllEntitiesAsEnumerable<TComponent>();
+        }
+
         internal ref readonly Entity ExistingSingularEntity<TComponent>() where TComponent : struct
         {
             return ref _existingComponentStore.SingularEntity<TComponent>();
@@ -152,7 +149,7 @@ namespace Encompass
 
         // immediate reads
 
-        internal Span<TComponent> ReadImmediateComponentsByType<TComponent>() where TComponent : struct
+        internal ReadOnlySpan<TComponent> ReadImmediateComponentsByType<TComponent>() where TComponent : struct
         {
             return _immediateComponentStore.All<TComponent>();
         }
@@ -162,7 +159,7 @@ namespace Encompass
             return ref _immediateComponentStore.Singular<TComponent>();
         }
 
-        internal Span<Entity> GetImmediateEntities<TComponent>() where TComponent : struct
+        internal ReadOnlySpan<Entity> GetImmediateEntities<TComponent>() where TComponent : struct
         {
             return _immediateComponentStore.AllEntities<TComponent>();
         }
@@ -226,11 +223,16 @@ namespace Encompass
             return _immediateComponentStore.Has(type, entityID);
         }
 
-        internal Span<TComponent> GetComponentsByType<TComponent>() where TComponent : struct
+        internal ReadOnlySpan<TComponent> GetComponentsByType<TComponent>() where TComponent : struct
         {
             return _existingComponentStore.All<TComponent>();
         }
 
+        internal IEnumerable<TComponent> GetComponentsByTypeEnumerable<TComponent>() where TComponent : struct
+        {
+            return _existingComponentStore.AllAsEnumerable<TComponent>();
+        }
+
         internal ref readonly TComponent GetComponentByEntityAndType<TComponent>(int entityID) where TComponent : struct
         {
             return ref _existingComponentStore.Get<TComponent>(entityID);
@@ -254,7 +256,6 @@ namespace Encompass
                 _immediateComponentStore.Remove(entityID);
                 _replayStore.Remove(entityID);
                 _upToDateComponentStore.Remove(entityID);
-                _drawLayerManager.UnRegisterEntityWithLayer(entityID);
             }
 
             _entitiesMarkedForRemoval.Clear();
@@ -266,7 +267,6 @@ namespace Encompass
             {
                 _replayStore.Remove<TComponent>(entityID, priority);
                 _upToDateComponentStore.Remove<TComponent>(entityID, priority);
-                _drawLayerManager.UnRegisterComponentWithLayer<TComponent>(entityID);
                 return true;
             }
             return false;
@@ -277,7 +277,6 @@ namespace Encompass
             if (_upToDateComponentStore.Remove<TComponent>(entityID, priority))
             {
                 _replayStore.Remove<TComponent>(entityID, priority);
-                _drawLayerManager.UnRegisterComponentWithLayer<TComponent>(entityID);
             }
         }
 

encompass-cs/DrawLayerManager.cs

@@ -1,132 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Encompass.Exceptions;
-
-namespace Encompass
-{
-    internal class DrawLayerManager
-    {
-        private readonly SortedList<int, int> _layerOrder = new SortedList<int, int>();
-
-        private readonly Dictionary<int, Dictionary<Type, HashSet<int>>> _layerIndexToTypeToID = new Dictionary<int, Dictionary<Type, HashSet<int>>>();
-        private readonly Dictionary<int, HashSet<GeneralRenderer>> _layerIndexToGeneralRenderers = new Dictionary<int, HashSet<GeneralRenderer>>(512);
-
-        private readonly Dictionary<Type, Dictionary<int, int>> _typeToEntityToLayer = new Dictionary<Type, Dictionary<int, int>>(512);
-        public IEnumerable<int> LayerOrder { get { return _layerOrder.Values; } }
-
-        public DrawLayerManager()
-        {
-            RegisterDrawLayer(0);
-        }
-
-        public void RegisterDrawLayer(int layer)
-        {
-            if (!_layerIndexToTypeToID.ContainsKey(layer))
-            {
-                _layerOrder.Add(layer, layer);
-                _layerIndexToGeneralRenderers.Add(layer, new HashSet<GeneralRenderer>());
-                _layerIndexToTypeToID.Add(layer, new Dictionary<Type, HashSet<int>>());
-            }
-        }
-
-        public void RegisterOrderedDrawable<TComponent>() where TComponent : struct
-        {
-            if (!_typeToEntityToLayer.ContainsKey(typeof(TComponent)))
-            {
-                _typeToEntityToLayer.Add(typeof(TComponent), new Dictionary<int, int>(128));
-            }
-
-            foreach (var pair in _layerIndexToTypeToID)
-            {
-                if (!pair.Value.ContainsKey(typeof(TComponent)))
-                {
-                    pair.Value.Add(typeof(TComponent), new HashSet<int>());
-                }
-            }
-        }
-
-        public void RegisterGeneralRendererWithLayer(GeneralRenderer renderer, int layer)
-        {
-            RegisterDrawLayer(layer);
-            var set = _layerIndexToGeneralRenderers[layer];
-            set.Add(renderer);
-        }
-
-        public void RegisterComponentWithLayer<TComponent>(int entityID, int layer) where TComponent : struct
-        {
-            if (!_layerIndexToTypeToID.ContainsKey(layer))
-            {
-                throw new UndefinedLayerException("Layer {0} is not defined. Use WorldBuilder.RegisterDrawLayer to register the layer.", layer);
-            }
-
-            if (_typeToEntityToLayer[typeof(TComponent)].ContainsKey(entityID))
-            {
-                if (_typeToEntityToLayer[typeof(TComponent)][entityID] != layer)
-                {
-                    UnRegisterComponentWithLayer<TComponent>(entityID);
-
-                    var set = _layerIndexToTypeToID[layer][typeof(TComponent)];
-                    set.Add(entityID);
-
-                    _typeToEntityToLayer[typeof(TComponent)].Add(entityID, layer);
-                }
-            }
-            else
-            {
-                var set = _layerIndexToTypeToID[layer][typeof(TComponent)];
-                set.Add(entityID);
-
-                _typeToEntityToLayer[typeof(TComponent)].Add(entityID, layer);
-            }
-        }
-
-        public void UnRegisterComponentWithLayer<TComponent>(int entityID) where TComponent : struct
-        {
-            if (!_typeToEntityToLayer.ContainsKey(typeof(TComponent))) { return; }
-
-            if (_typeToEntityToLayer[typeof(TComponent)].ContainsKey(entityID))
-            {
-                var layer = _typeToEntityToLayer[typeof(TComponent)][entityID];
-                _layerIndexToTypeToID[layer][typeof(TComponent)].Remove(entityID);
-            }
-            _typeToEntityToLayer[typeof(TComponent)].Remove(entityID);
-        }
-
-        public void UnRegisterEntityWithLayer(int entityID)
-        {
-            foreach (var store in _layerIndexToTypeToID.Values)
-            {
-                foreach (var typeToSet in store)
-                {
-                    var type = typeToSet.Key;
-                    var set = typeToSet.Value;
-
-                    if (set.Contains(entityID))
-                    {
-                        _typeToEntityToLayer[type].Remove(entityID);
-                        set.Remove(entityID);
-                    }
-                }
-            }
-        }
-
-        public IEnumerable<GeneralRenderer> GeneralRenderersByLayer(int layer)
-        {
-            return _layerIndexToGeneralRenderers.ContainsKey(layer) ?
-                _layerIndexToGeneralRenderers[layer] :
-                Enumerable.Empty<GeneralRenderer>();
-        }
-
-        public IEnumerable<(int, Type)> AllInLayer(int layer)
-        {
-            foreach (var kvp in _layerIndexToTypeToID[layer])
-            {
-                foreach (var id in kvp.Value)
-                {
-                    yield return (id, kvp.Key);
-                }
-            }
-        }
-    }
-}

encompass-cs/Engine.cs

@@ -3,7 +3,6 @@ using System.Reflection;
 using System.Collections.Generic;
 using System.Linq;
 using Encompass.Exceptions;
-using MoonTools.FastCollections;
 
 namespace Encompass
 {
@@ -24,6 +23,7 @@ namespace Encompass
         internal readonly HashSet<Type> WriteImmediateTypes = new HashSet<Type>();
         internal readonly HashSet<Type> QueryWithTypes = new HashSet<Type>();
         internal readonly HashSet<Type> QueryWithoutTypes = new HashSet<Type>();
+        internal readonly HashSet<Type> AddTypes = new HashSet<Type>();
         internal readonly Dictionary<Type, int> WritePriorities = new Dictionary<Type, int>();
         internal readonly int DefaultWritePriority = 0;
 
@@ -59,6 +59,12 @@ namespace Encompass
         {
             _id = Guid.NewGuid();
 
+            var addsAttribute = GetType().GetCustomAttribute<Adds>(false);
+            if (addsAttribute != null)
+            {
+                AddTypes = addsAttribute.addTypes;
+            }
+
             var sendsAttribute = GetType().GetCustomAttribute<Sends>(false);
             if (sendsAttribute != null)
             {
@@ -170,7 +176,7 @@ namespace Encompass
             _trackingManager = trackingManager;
         }
 
-        internal void CheckMessageRead<TMessage>() where TMessage : struct, IMessage
+        internal void CheckMessageRead<TMessage>() where TMessage : struct
         {
             if (!ReceiveTypes.Contains(typeof(TMessage)))
             {
@@ -223,7 +229,7 @@ namespace Encompass
         /// <summary>
         /// Returns all Entities containing the specified Component type.
         /// </summary>
-        protected Span<Entity> ReadEntities<TComponent>() where TComponent : struct, IComponent
+        protected ReadOnlySpan<Entity> ReadEntities<TComponent>() where TComponent : struct
         {
             var immediateRead = ReadImmediateTypes.Contains(typeof(TComponent));
             var existingRead = ReadTypes.Contains(typeof(TComponent));
@@ -248,7 +254,7 @@ namespace Encompass
         /// <summary>
         /// Returns an Entity containing the specified Component type.
         /// </summary>
-        protected ref readonly Entity ReadEntity<TComponent>() where TComponent : struct, IComponent
+        protected ref readonly Entity ReadEntity<TComponent>() where TComponent : struct
         {
             var immediateRead = ReadImmediateTypes.Contains(typeof(TComponent));
             var existingRead = ReadTypes.Contains(typeof(TComponent));
@@ -273,7 +279,7 @@ namespace Encompass
         /// <summary>
         /// Returns all of the Components with the specified Component Type.
         /// </summary>
-        protected Span<TComponent> ReadComponents<TComponent>() where TComponent : struct, IComponent
+        protected ReadOnlySpan<TComponent> ReadComponents<TComponent>() where TComponent : struct
         {
             var immediateRead = ReadImmediateTypes.Contains(typeof(TComponent));
             var existingRead = ReadTypes.Contains(typeof(TComponent));
@@ -298,7 +304,7 @@ namespace Encompass
         /// <summary>
         /// Returns a Component with the specified Component Type. If multiples exist, an arbitrary Component is returned.
         /// </summary>
-        protected ref readonly TComponent ReadComponent<TComponent>() where TComponent : struct, IComponent
+        protected ref readonly TComponent ReadComponent<TComponent>() where TComponent : struct
         {
             var immediateRead = ReadImmediateTypes.Contains(typeof(TComponent));
             var existingRead = ReadTypes.Contains(typeof(TComponent));
@@ -323,7 +329,7 @@ namespace Encompass
         /// <summary>
         /// Returns true if any Component with the specified Component Type exists.
         /// </summary>
-        protected bool SomeComponent<TComponent>() where TComponent : struct, IComponent
+        protected bool SomeComponent<TComponent>() where TComponent : struct
         {
             var immediateRead = ReadImmediateTypes.Contains(typeof(TComponent));
             var existingRead = ReadTypes.Contains(typeof(TComponent));
@@ -345,7 +351,7 @@ namespace Encompass
             }
         }
 
-        private ref TComponent GetComponentHelper<TComponent>(int entityID) where TComponent : struct, IComponent
+        private ref TComponent GetComponentHelper<TComponent>(int entityID) where TComponent : struct
         {
             var immediateRead = ReadImmediateTypes.Contains(typeof(TComponent));
             var existingRead = ReadTypes.Contains(typeof(TComponent));
@@ -376,7 +382,7 @@ namespace Encompass
         /// <exception cref="Encompass.Exceptions.IllegalReadException">
         /// Thrown when the Engine does not declare that it reads the given Component Type.
         /// </exception>
-        protected ref readonly TComponent GetComponent<TComponent>(in Entity entity) where TComponent : struct, IComponent
+        protected ref readonly TComponent GetComponent<TComponent>(in Entity entity) where TComponent : struct
         {
             return ref GetComponentHelper<TComponent>(entity.ID);
         }
@@ -387,7 +393,7 @@ namespace Encompass
         /// <exception cref="Encompass.Exceptions.IllegalReadException">
         /// Thrown when the Engine does not declare that is Reads the given Component Type.
         /// </exception>
-        protected bool HasComponent<TComponent>(in Entity entity) where TComponent : struct, IComponent
+        protected bool HasComponent<TComponent>(in Entity entity) where TComponent : struct
         {
             var immediateRead = ReadImmediateTypes.Contains(typeof(TComponent));
             var existingRead = ReadTypes.Contains(typeof(TComponent));
@@ -445,7 +451,7 @@ namespace Encompass
         /// <exception cref="Encompass.Exceptions.IllegalWriteException">
         /// Thrown when the Engine does not declare that it Writes the given Component Type.
         /// </exception>
-        protected void SetComponent<TComponent>(in Entity entity, in TComponent component) where TComponent : struct, IComponent
+        protected void SetComponent<TComponent>(in Entity entity, in TComponent component) where TComponent : struct
         {
             var priority = WritePriorities.ContainsKey(typeof(TComponent)) ? WritePriorities[typeof(TComponent)] : DefaultWritePriority;
 
@@ -472,11 +478,6 @@ namespace Encompass
             {
                 _trackingManager.RegisterAddition(entity.ID, typeof(TComponent));
             }
-
-            if (written && component is IDrawableComponent drawableComponent)
-            {
-                _componentManager.RegisterDrawableComponent<TComponent>(entity.ID, drawableComponent.Layer);
-            }
         }
 
         /// <summary>
@@ -485,8 +486,13 @@ namespace Encompass
         /// <exception cref="Encompass.Exceptions.IllegalWriteException">
         /// Thrown when the Engine does not declare that it Writes the given Component Type.
         /// </exception>
-        protected void AddComponent<TComponent>(in Entity entity, in TComponent component) where TComponent : struct, IComponent
+        protected void AddComponent<TComponent>(in Entity entity, in TComponent component) where TComponent : struct
         {
+            if (!AddTypes.Contains(typeof(TComponent)))
+            {
+                throw new IllegalWriteException("Engine {0} tried to add undeclared Component {1}", GetType().Name, typeof(TComponent).Name);
+            }
+
             if (!EntityCreatedThisFrame(entity.ID))
             {
                 throw new IllegalWriteException("AddComponent used on Entity that was not created in this context. Use SetComponent instead.");
@@ -503,11 +509,6 @@ namespace Encompass
             }
 
             _trackingManager.RegisterAddition(entity.ID, typeof(TComponent));
-
-            if (component is IDrawableComponent drawableComponent)
-            {
-                _componentManager.RegisterDrawableComponent<TComponent>(entity.ID, drawableComponent.Layer);
-            }
         }
 
         /// <summary>
@@ -516,7 +517,7 @@ namespace Encompass
         /// <exception cref="Encompass.Exceptions.IllegalSendException">
         /// Thrown when the Engine does not declare that it Sends the Message Type.
         /// </exception>
-        protected void SendMessage<TMessage>(in TMessage message) where TMessage : struct, IMessage
+        protected void SendMessage<TMessage>(in TMessage message) where TMessage : struct
         {
             if (!SendTypes.Contains(typeof(TMessage)))
             {
@@ -530,7 +531,7 @@ namespace Encompass
         /// Sends a message after the specified number of seconds, respecting time dilation.
         /// </summary>
         /// <param name="time">The time in seconds that will elapse before the message is sent.</param>
-        protected void SendMessage<TMessage>(in TMessage message, double time) where TMessage : struct, IMessage
+        protected void SendMessage<TMessage>(in TMessage message, double time) where TMessage : struct
         {
             _messageManager.AddMessage(message, time);
         }
@@ -539,7 +540,7 @@ namespace Encompass
         /// Sends a message after the specified number of seconds, ignoring time dilation.
         /// </summary>
         /// <param name="time">The time in seconds that will elapse before the message is sent.</param>
-        protected void SendMessageIgnoringTimeDilation<TMessage>(in TMessage message, double time) where TMessage : struct, IMessage
+        protected void SendMessageIgnoringTimeDilation<TMessage>(in TMessage message, double time) where TMessage : struct
         {
             _messageManager.AddMessageIgnoringTimeDilation(message, time);
         }
@@ -550,7 +551,7 @@ namespace Encompass
         /// <exception cref="Encompass.Exceptions.IllegalReadException">
         /// Thrown when the Engine does not declare that it Receives the specified Message Type.
         /// </exception>
-        protected Span<TMessage> ReadMessages<TMessage>() where TMessage : struct, IMessage
+        protected ReadOnlySpan<TMessage> ReadMessages<TMessage>() where TMessage : struct
         {
             CheckMessageRead<TMessage>();
             return _messageManager.GetMessagesByType<TMessage>();
@@ -562,7 +563,7 @@ namespace Encompass
         /// <exception cref="Encompass.Exceptions.IllegalReadException">
         /// Thrown when the Engine does not declare that it Receives the specified Message Type.
         /// </exception>
-        protected ref readonly TMessage ReadMessage<TMessage>() where TMessage : struct, IMessage
+        protected ref readonly TMessage ReadMessage<TMessage>() where TMessage : struct
         {
             CheckMessageRead<TMessage>();
             return ref _messageManager.First<TMessage>();
@@ -574,7 +575,7 @@ namespace Encompass
         /// <exception cref="Encompass.Exceptions.IllegalReadException">
         /// Thrown when the Engine does not declare that it Receives the specified Message Type.
         /// </exception>
-        protected bool SomeMessage<TMessage>() where TMessage : struct, IMessage
+        protected bool SomeMessage<TMessage>() where TMessage : struct
         {
             CheckMessageRead<TMessage>();
             return _messageManager.Any<TMessage>();
@@ -593,7 +594,7 @@ namespace Encompass
         /// Destroys an arbitrary Entity containing a Component of the specified Type.
         /// Entity destruction takes place after all the Engines have been processed by World Update.
         /// </summary>
-        protected void DestroyWith<TComponent>() where TComponent : struct, IComponent
+        protected void DestroyWith<TComponent>() where TComponent : struct
         {
             Destroy(ReadEntity<TComponent>());
         }
@@ -602,7 +603,7 @@ namespace Encompass
         /// Destroys all Entities containing a Component of the specified Type.
         /// Entity destruction takes place after all the Engines have been processed by World Update.
         /// </summary>
-        protected void DestroyAllWith<TComponent>() where TComponent : struct, IComponent
+        protected void DestroyAllWith<TComponent>() where TComponent : struct
         {
             foreach (var entity in ReadEntities<TComponent>())
             {
@@ -615,7 +616,7 @@ namespace Encompass
         /// Note that the Engine must Read the Component type that is being removed.
         /// If a Component with the specified type does not exist on the Entity, returns false and does not mutate the Entity.
         /// </summary>
-        protected void RemoveComponent<TComponent>(in Entity entity) where TComponent : struct, IComponent
+        protected void RemoveComponent<TComponent>(in Entity entity) where TComponent : struct
         {
             var priority = WritePriorities.ContainsKey(typeof(TComponent)) ? WritePriorities[typeof(TComponent)] : DefaultWritePriority;
 
@@ -708,7 +709,7 @@ namespace Encompass
         /// <typeparam name="TMessage">The Message subtype.</typeparam>
         /// <param name="entity">The entity that all messages in the IEnumerable refer to.</param>
         /// <returns></returns>
-        protected IEnumerable<TMessage> ReadMessagesWithEntity<TMessage>(in Entity entity) where TMessage : struct, IMessage, IHasEntity
+        protected IEnumerable<TMessage> ReadMessagesWithEntity<TMessage>(in Entity entity) where TMessage : struct, IHasEntity
         {
             CheckMessageRead<TMessage>();
             return _messageManager.WithEntity<TMessage>(entity.ID);
@@ -718,7 +719,7 @@ namespace Encompass
         /// Efficiently reads a single Message of a given type that references a given Entity.
         /// It is recommended to use this method in conjunction with SomeMessageWithEntity to prevent errors.
         /// </summary>
-        protected ref readonly TMessage ReadMessageWithEntity<TMessage>(in Entity entity) where TMessage : struct, IMessage, IHasEntity
+        protected ref readonly TMessage ReadMessageWithEntity<TMessage>(in Entity entity) where TMessage : struct, IHasEntity
         {
             CheckMessageRead<TMessage>();
             return ref _messageManager.WithEntitySingular<TMessage>(entity.ID);
@@ -727,7 +728,7 @@ namespace Encompass
         /// <summary>
         /// Efficiently checks if any Message of a given type referencing a given Entity exists.
         /// </summary>
-        protected bool SomeMessageWithEntity<TMessage>(in Entity entity) where TMessage : struct, IMessage, IHasEntity
+        protected bool SomeMessageWithEntity<TMessage>(in Entity entity) where TMessage : struct, IHasEntity
         {
             CheckMessageRead<TMessage>();
             return _messageManager.SomeWithEntity<TMessage>(entity.ID);

encompass-cs/Engines/Spawner.cs

@@ -6,7 +6,7 @@ namespace Encompass
     /// A Spawner is a special type of Engine that runs a Spawn method in response to each Message it receives.
     /// Spawners are useful for organizing the building of new Entities in your game.
     /// </summary>
-    public abstract class Spawner<TMessage> : Engine where TMessage : struct, IMessage
+    public abstract class Spawner<TMessage> : Engine where TMessage : struct
     {
         protected Spawner() : base()
         {

encompass-cs/EntitySetQuery.cs

@@ -1,6 +1,4 @@
-using MoonTools.FastCollections;
+namespace Encompass
-
-namespace Encompass
 {
     internal struct EntitySetQuery
     {

encompass-cs/Exceptions/IllegalSendTypeException.cs

@@ -1,12 +0,0 @@
-using System;
-
-namespace Encompass.Exceptions
-{
-    public class IllegalSendTypeException : Exception
-    {
-        public IllegalSendTypeException(
-            string format,
-            params object[] args
-        ) : base(string.Format(format, args)) { }
-    }
-}

encompass-cs/Graph/DirectedGraph.cs

@@ -0,0 +1,390 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Encompass
+{
+    internal class DirectedGraph<TNode> where TNode : IEquatable<TNode>
+    {
+        protected HashSet<TNode> nodes = new HashSet<TNode>();
+        protected Dictionary<TNode, HashSet<TNode>> neighbors = new Dictionary<TNode, HashSet<TNode>>();
+
+        protected HashSet<(TNode, TNode)> edges = new HashSet<(TNode, TNode)>();
+
+        public IEnumerable<TNode> Nodes => nodes;
+        public IEnumerable<(TNode, TNode)> Edges => edges;
+
+        public void AddNode(TNode node)
+        {
+            if (!Exists(node))
+            {
+                nodes.Add(node);
+                neighbors.Add(node, new HashSet<TNode>());
+            }
+        }
+
+        public void AddNodes(params TNode[] nodes)
+        {
+            foreach (var node in nodes)
+            {
+                AddNode(node);
+            }
+        }
+
+        public void RemoveNode(TNode node)
+        {
+            CheckNodes(node);
+
+            var edgesToRemove = new List<(TNode, TNode)>();
+
+            foreach (var entry in neighbors)
+            {
+                if (entry.Value.Contains(node))
+                {
+                    edgesToRemove.Add((entry.Key, node));
+                }
+            }
+
+            foreach (var edge in edgesToRemove)
+            {
+                RemoveEdge(edge.Item1, edge.Item2);
+            }
+
+            nodes.Remove(node);
+            neighbors.Remove(node);
+        }
+
+        public void RemoveEdge(TNode v, TNode u)
+        {
+            CheckEdge(v, u);
+            neighbors[v].Remove(u);
+            edges.Remove((v, u));
+        }
+
+        public void AddEdge(TNode v, TNode u)
+        {
+            CheckNodes(v, u);
+            if (Exists(v, u)) { throw new ArgumentException($"Edge between {v} and {u} already exists in the graph"); }
+
+            if (v.Equals(u)) { throw new ArgumentException("Self-edges are not allowed in a simple graph. Use a multigraph instead"); }
+
+            neighbors[v].Add(u);
+            edges.Add((v, u));
+        }
+
+        public bool Exists(TNode node)
+        {
+            return nodes.Contains(node);
+        }
+
+        public bool Exists(TNode v, TNode u)
+        {
+            CheckNodes(v, u);
+            return edges.Contains((v, u));
+        }
+
+        protected void CheckNodes(params TNode[] givenNodes)
+        {
+            foreach (var node in givenNodes)
+            {
+                if (!Exists(node))
+                {
+                    throw new System.ArgumentException($"Vertex {node} does not exist in the graph");
+                }
+            }
+        }
+
+        protected void CheckEdge(TNode v, TNode u)
+        {
+            CheckNodes(v, u);
+            if (!Exists(v, u)) { throw new ArgumentException($"Edge between vertex {v} and vertex {u} does not exist in the graph"); }
+        }
+
+        public IEnumerable<TNode> Neighbors(TNode node)
+        {
+            CheckNodes(node);
+            return neighbors[node];
+        }
+
+        public DirectedGraph<TNode> Clone()
+        {
+            var clone = new DirectedGraph<TNode>();
+            clone.AddNodes(Nodes.ToArray());
+
+            foreach (var v in Nodes)
+            {
+                foreach (var n in Neighbors(v))
+                {
+                    clone.AddEdge(v, n);
+                }
+            }
+
+            return clone;
+        }
+
+        public DirectedGraph<TNode> SubGraph(params TNode[] subVertices)
+        {
+            var subGraph = new DirectedGraph<TNode>();
+            subGraph.AddNodes(subVertices.ToArray());
+
+            foreach (var n in Nodes)
+            {
+                if (Nodes.Contains(n))
+                {
+                    var neighbors = Neighbors(n);
+                    foreach (var u in neighbors)
+                    {
+                        if (subVertices.Contains(u))
+                        {
+                            subGraph.AddEdge(n, u);
+                        }
+                    }
+                }
+            }
+
+            return subGraph;
+        }
+
+        private IEnumerable<TNode> PostorderNodeDFSHelper(HashSet<TNode> discovered, TNode v)
+        {
+            discovered.Add(v);
+
+            foreach (var neighbor in Neighbors(v))
+            {
+                if (!discovered.Contains(neighbor))
+                {
+                    foreach (var node in PostorderNodeDFSHelper(discovered, neighbor))
+                    {
+                        yield return node;
+                    }
+                }
+            }
+
+            yield return v;
+        }
+
+        protected IEnumerable<TNode> PostorderNodeDFS()
+        {
+            var dfsDiscovered = new HashSet<TNode>();
+
+            foreach (var node in Nodes)
+            {
+                if (!dfsDiscovered.Contains(node))
+                {
+                    foreach (var thing in PostorderNodeDFSHelper(dfsDiscovered, node))
+                    {
+                        yield return thing;
+                    }
+                }
+            }
+        }
+
+        public IEnumerable<TNode> TopologicalSort()
+        {
+            return PostorderNodeDFS().Reverse();
+        }
+
+        public bool Cyclic()
+        {
+            return StronglyConnectedComponents().Any((scc) => scc.Count() > 1);
+        }
+
+        public IEnumerable<IEnumerable<TNode>> SimpleCycles()
+        {
+            void unblock(TNode thisnode, HashSet<TNode> blocked, Dictionary<TNode, HashSet<TNode>> B) //refactor to remove closure
+            {
+                var stack = new Stack<TNode>();
+                stack.Push(thisnode);
+
+                while (stack.Count > 0)
+                {
+                    var node = stack.Pop();
+                    if (blocked.Contains(thisnode))
+                    {
+                        blocked.Remove(thisnode);
+                        if (B.ContainsKey(node))
+                        {
+                            foreach (var n in B[node])
+                            {
+                                if (!stack.Contains(n))
+                                {
+                                    stack.Push(n);
+                                }
+                            }
+                            B[node].Clear();
+                        }
+                    }
+                }
+            }
+
+            List<List<TNode>> result = new List<List<TNode>>();
+            var subGraph = Clone();
+
+            var sccs = new Stack<IEnumerable<TNode>>();
+            foreach (var scc in StronglyConnectedComponents())
+            {
+                sccs.Push(scc);
+            }
+
+            while (sccs.Count > 0)
+            {
+                var scc = new Stack<TNode>(sccs.Pop());
+                var startNode = scc.Pop();
+                var path = new Stack<TNode>();
+                path.Push(startNode);
+                var blocked = new HashSet<TNode>
+                {
+                    startNode
+                };
+                var closed = new HashSet<TNode>();
+                var B = new Dictionary<TNode, HashSet<TNode>>();
+                var stack = new Stack<(TNode, Stack<TNode>)>();
+                stack.Push((startNode, new Stack<TNode>(subGraph.Neighbors(startNode))));
+
+                while (stack.Count > 0)
+                {
+                    var entry = stack.Peek();
+                    var thisnode = entry.Item1;
+                    var neighbors = entry.Item2;
+
+                    if (neighbors.Count > 0)
+                    {
+                        var nextNode = neighbors.Pop();
+
+                        if (nextNode.Equals(startNode))
+                        {
+                            var resultPath = new List<TNode>();
+                            foreach (var v in path)
+                            {
+                                resultPath.Add(v);
+                            }
+                            result.Add(resultPath);
+                            foreach (var v in path)
+                            {
+                                closed.Add(v);
+                            }
+                        }
+                        else if (!blocked.Contains(nextNode))
+                        {
+                            path.Push(nextNode);
+                            stack.Push((nextNode, new Stack<TNode>(subGraph.Neighbors(nextNode))));
+                            closed.Remove(nextNode);
+                            blocked.Add(nextNode);
+                            continue;
+                        }
+                    }
+
+                    if (neighbors.Count == 0)
+                    {
+                        if (closed.Contains(thisnode))
+                        {
+                            unblock(thisnode, blocked, B);
+                        }
+                        else
+                        {
+                            foreach (var neighbor in subGraph.Neighbors(thisnode))
+                            {
+                                if (!B.ContainsKey(neighbor))
+                                {
+                                    B[neighbor] = new HashSet<TNode>();
+                                }
+                                B[neighbor].Add(thisnode);
+                            }
+                        }
+
+                        stack.Pop();
+                        path.Pop();
+                    }
+                }
+
+                subGraph.RemoveNode(startNode);
+                var H = subGraph.SubGraph(scc.ToArray());
+                var HSccs = H.StronglyConnectedComponents();
+                foreach (var HScc in HSccs)
+                {
+                    sccs.Push(HScc);
+                }
+            }
+
+            return result.Distinct(new SimpleCycleComparer<TNode>());
+        }
+
+        protected IEnumerable<IEnumerable<TNode>> StronglyConnectedComponents()
+        {
+            var preorder = new Dictionary<TNode, uint>();
+            var lowlink = new Dictionary<TNode, uint>();
+            var sccFound = new Dictionary<TNode, bool>();
+            var sccQueue = new Stack<TNode>();
+
+            uint preorderCounter = 0;
+
+            foreach (var source in Nodes)
+            {
+                if (!sccFound.ContainsKey(source))
+                {
+                    var queue = new Stack<TNode>();
+                    queue.Push(source);
+
+                    while (queue.Count > 0)
+                    {
+                        var v = queue.Peek();
+                        if (!preorder.ContainsKey(v))
+                        {
+                            preorderCounter++;
+                            preorder[v] = preorderCounter;
+                        }
+
+                        var done = true;
+                        var vNeighbors = Neighbors(v);
+                        foreach (var w in vNeighbors)
+                        {
+                            if (!preorder.ContainsKey(w))
+                            {
+                                queue.Push(w);
+                                done = false;
+                                break;
+                            }
+                        }
+
+                        if (done)
+                        {
+                            lowlink[v] = preorder[v];
+                            foreach (var w in vNeighbors)
+                            {
+                                if (!sccFound.ContainsKey(w))
+                                {
+                                    if (preorder[w] > preorder[v])
+                                    {
+                                        lowlink[v] = Math.Min(lowlink[v], lowlink[w]);
+                                    }
+                                    else
+                                    {
+                                        lowlink[v] = Math.Min(lowlink[v], preorder[w]);
+                                    }
+                                }
+                            }
+                            queue.Pop();
+                            if (lowlink[v] == preorder[v])
+                            {
+                                sccFound[v] = true;
+                                var scc = new List<TNode>() { v };
+                                while (sccQueue.Count > 0 && preorder[sccQueue.Peek()] > preorder[v])
+                                {
+                                    var k = sccQueue.Pop();
+                                    sccFound[k] = true;
+                                    scc.Add(k);
+                                }
+
+                                yield return scc;
+                            }
+                            else
+                            {
+                                sccQueue.Push(v);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

encompass-cs/Graph/SimpleCycleComparer.cs

@@ -0,0 +1,18 @@
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Encompass
+{
+    internal class SimpleCycleComparer<TNode> : IEqualityComparer<IEnumerable<TNode>>
+    {
+        public bool Equals(IEnumerable<TNode> x, IEnumerable<TNode> y)
+        {
+            return x.SequenceEqual(y);
+        }
+
+        public int GetHashCode(IEnumerable<TNode> obj)
+        {
+            return obj.Aggregate(0, (current, next) => current.GetHashCode() ^ next.GetHashCode());
+        }
+    }
+}

encompass-cs/IMessage.cs

@@ -1,7 +0,0 @@
-namespace Encompass
-{
-    /// <summary>
-    /// Structs that implement IMessage are considered to be Messages.
-    /// </summary>
-    public interface IMessage { }
-}

encompass-cs/Interfaces/IComponent.cs

@@ -1,4 +0,0 @@
-namespace Encompass
-{
-    public interface IComponent { }
-}

encompass-cs/Interfaces/IDrawableComponent.cs

@@ -1,7 +0,0 @@
-namespace Encompass
-{
-    public interface IDrawableComponent
-    {
-        int Layer { get; }
-    }
-}

encompass-cs/MessageManager.cs

@@ -13,17 +13,17 @@ namespace Encompass
             _timeManager = timeManager;
         }
 
-        internal void AddMessage<TMessage>(in TMessage message) where TMessage : struct, IMessage
+        internal void AddMessage<TMessage>(in TMessage message) where TMessage : struct
         {
             _messageStore.AddMessage(message);
         }
 
-        internal void AddMessage<TMessage>(in TMessage message, double time) where TMessage : struct, IMessage
+        internal void AddMessage<TMessage>(in TMessage message, double time) where TMessage : struct
         {
             _messageStore.AddMessage(message, time);
         }
 
-        internal void AddMessageIgnoringTimeDilation<TMessage>(in TMessage message, double time) where TMessage : struct, IMessage
+        internal void AddMessageIgnoringTimeDilation<TMessage>(in TMessage message, double time) where TMessage : struct
         {
             _messageStore.AddMessageIgnoringTimeDilation(message, time);
         }
@@ -38,32 +38,32 @@ namespace Encompass
             _messageStore.ProcessDelayedMessages(dt * _timeManager.TimeDilationFactor, dt);
         }
 
-        internal Span<TMessage> GetMessagesByType<TMessage>() where TMessage : struct, IMessage
+        internal ReadOnlySpan<TMessage> GetMessagesByType<TMessage>() where TMessage : struct
         {
             return _messageStore.All<TMessage>();
         }
 
-        internal bool Any<TMessage>() where TMessage : struct, IMessage
+        internal bool Any<TMessage>() where TMessage : struct
         {
             return _messageStore.Any<TMessage>();
         }
 
-        internal ref readonly TMessage First<TMessage>() where TMessage : struct, IMessage
+        internal ref readonly TMessage First<TMessage>() where TMessage : struct
         {
             return ref _messageStore.First<TMessage>();
         }
 
-        internal IEnumerable<TMessage> WithEntity<TMessage>(int entityID) where TMessage : struct, IMessage, IHasEntity
+        internal IEnumerable<TMessage> WithEntity<TMessage>(int entityID) where TMessage : struct, IHasEntity
         {
             return _messageStore.WithEntity<TMessage>(entityID);
         }
 
-        internal ref readonly TMessage WithEntitySingular<TMessage>(int entityID) where TMessage : struct, IMessage, IHasEntity
+        internal ref readonly TMessage WithEntitySingular<TMessage>(int entityID) where TMessage : struct, IHasEntity
         {
             return ref _messageStore.FirstWithEntity<TMessage>(entityID);
         }
 
-        internal bool SomeWithEntity<TMessage>(int entityID) where TMessage : struct, IMessage, IHasEntity
+        internal bool SomeWithEntity<TMessage>(int entityID) where TMessage : struct, IHasEntity
         {
             return _messageStore.SomeWithEntity<TMessage>(entityID);
         }

encompass-cs/RenderManager.cs

@@ -1,51 +1,27 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
 
 namespace Encompass
 {
     internal class RenderManager
     {
         private readonly EntityManager _entityManager;
-        private readonly DrawLayerManager _drawLayerManager;
+        private readonly List<Renderer> renderers = new List<Renderer>();
 
-        private readonly Dictionary<Type, Action<Entity>> _drawComponentTypeToOrderedRenderer = new Dictionary<Type, Action<Entity>>(256);
+        public RenderManager(EntityManager entityManager)
-
-        public RenderManager(EntityManager entityManager, DrawLayerManager drawLayerManager)
         {
             _entityManager = entityManager;
-            _drawLayerManager = drawLayerManager;
         }
 
-        public void RegisterOrderedRenderer<TComponent>(Action<Entity> renderAction) where TComponent : struct
+        public void AddRenderer(Renderer renderer)
         {
-            _drawComponentTypeToOrderedRenderer.Add(typeof(TComponent), renderAction);
+            renderers.Add(renderer);
-            _drawLayerManager.RegisterOrderedDrawable<TComponent>();
         }
 
-        public void RegisterGeneralRendererWithLayer(GeneralRenderer renderer, int layer)
+        public void Draw(double dt, double alpha)
         {
-            _drawLayerManager.RegisterGeneralRendererWithLayer(renderer, layer);
+            foreach (var renderer in renderers)
-        }
-
-        public void Draw()
             {
-            foreach (var layer in _drawLayerManager.LayerOrder)
+                renderer.Render(dt, alpha);
-            {
-                var generalRendererSet = _drawLayerManager.GeneralRenderersByLayer(layer);
-
-                foreach (var (entityID, componentType) in _drawLayerManager.AllInLayer(layer))
-                {
-                    if (_drawComponentTypeToOrderedRenderer.ContainsKey(componentType))
-                    {
-                        var internalRenderAction = _drawComponentTypeToOrderedRenderer[componentType];
-                        internalRenderAction(_entityManager.GetEntity(entityID));
-                    }
-                }
-
-                foreach (var generalRenderer in generalRendererSet)
-                {
-                    generalRenderer.Render();
-                }
             }
         }
     }

encompass-cs/Renderer.cs

@@ -18,37 +18,49 @@ namespace Encompass
             _componentManager = componentManager;
         }
 
-        protected Span<Entity> ReadEntities<TComponent>() where TComponent : struct, IComponent
+        public abstract void Render(double dt, double alpha);
+
+        protected ReadOnlySpan<Entity> ReadEntities<TComponent>() where TComponent : struct
         {
             return _componentManager.GetExistingEntities<TComponent>();
         }
 
-        protected ref readonly Entity ReadEntity<TComponent>() where TComponent : struct, IComponent
+        protected IEnumerable<Entity> ReadEntitiesAsEnumerable<TComponent>() where TComponent : struct
+        {
+            return _componentManager.GetExistingEntitiesAsEnumerable<TComponent>();
+        }
+
+        protected ref readonly Entity ReadEntity<TComponent>() where TComponent : struct
         {
             return ref _componentManager.ExistingSingularEntity<TComponent>();
         }
 
-        protected Span<TComponent> ReadComponents<TComponent>() where TComponent : struct, IComponent
+        protected ReadOnlySpan<TComponent> ReadComponents<TComponent>() where TComponent : struct
         {
             return _componentManager.GetComponentsByType<TComponent>();
         }
 
-        protected ref readonly TComponent ReadComponent<TComponent>() where TComponent : struct, IComponent
+        protected IEnumerable<TComponent> ReadComponentsAsEnumerable<TComponent>() where TComponent : struct
+        {
+            return _componentManager.GetComponentsByTypeEnumerable<TComponent>();
+        }
+
+        protected ref readonly TComponent ReadComponent<TComponent>() where TComponent : struct
         {
             return ref _componentManager.ExistingSingular<TComponent>();
         }
 
-        protected ref readonly TComponent GetComponent<TComponent>(Entity entity) where TComponent : struct, IComponent
+        protected ref readonly TComponent GetComponent<TComponent>(Entity entity) where TComponent : struct
         {
             return ref _componentManager.GetComponentByEntityAndType<TComponent>(entity.ID);
         }
 
-        protected bool HasComponent<TComponent>(Entity entity) where TComponent : struct, IComponent
+        protected bool HasComponent<TComponent>(Entity entity) where TComponent : struct
         {
             return _componentManager.EntityHasComponentOfType<TComponent>(entity.ID);
         }
 
-        protected bool SomeComponent<TComponent>() where TComponent : struct, IComponent
+        protected bool SomeComponent<TComponent>() where TComponent : struct
         {
             return _componentManager.SomeExistingComponent<TComponent>();
         }

encompass-cs/Renderers/GeneralRenderer.cs

@@ -1,11 +0,0 @@
-namespace Encompass
-{
-    /// <summary>
-    /// GeneralRenderer is a Renderer which generically reads the game state in order to draw elements to the screen.
-    /// GeneralRenderers have a layer specified when they are added to the World.
-    /// </summary>
-    public abstract class GeneralRenderer : Renderer
-    {
-        public abstract void Render();
-    }
-}

encompass-cs/Renderers/OrderedRenderer.cs

@@ -1,18 +0,0 @@
-using System;
-
-namespace Encompass
-{
-    /// <summary>
-    /// OrdereredRenderer provides a structure for the common pattern of wishing to draw a specific DrawComponent at a specific layer.
-    /// </summary>
-    public abstract class OrderedRenderer<TComponent> : Renderer where TComponent : struct, IComponent, IDrawableComponent
-    {
-        public abstract void Render(Entity entity, in TComponent drawComponent);
-
-        internal void InternalRender(Entity entity)
-        {
-            ref readonly var component = ref GetComponent<TComponent>(entity);
-            Render(entity, component);
-        }
-    }
-}

encompass-cs/UberEngine.cs

@@ -14,6 +14,7 @@ namespace Encompass
         {
             _componentTypes = componentTypes;
             _messageTypes = messageTypes;
+            AddTypes.UnionWith(componentTypes);
             ReadTypes.UnionWith(componentTypes);
             WriteTypes.UnionWith(componentTypes);
             SendTypes.UnionWith(messageTypes);
@@ -54,7 +55,7 @@ namespace Encompass
 
         // we can't reflect invoke on byref returns or Span returns right now... so we have non-return wrapper methods
 
-        protected void CallAllComponentMethods<TComponent>() where TComponent : struct, IComponent
+        protected void CallAllComponentMethods<TComponent>() where TComponent : struct
         {
             ReadComponent<TComponent>();
             ReadComponents<TComponent>();
@@ -69,7 +70,7 @@ namespace Encompass
             AddComponent<TComponent>(Entity, default);
         }
 
-        protected void CallAllMessageMethods<TMessage>() where TMessage : struct, IMessage
+        protected void CallAllMessageMethods<TMessage>() where TMessage : struct
         {
             SendMessageIgnoringTimeDilation<TMessage>(default, 0.1);
             SendMessage<TMessage>(default);
@@ -79,7 +80,7 @@ namespace Encompass
             SomeMessage<TMessage>();
         }
 
-        protected void CallAllEntityMessageMethods<TMessage>() where TMessage : struct, IMessage, IHasEntity
+        protected void CallAllEntityMessageMethods<TMessage>() where TMessage : struct, IHasEntity
         {
             ReadMessagesWithEntity<TMessage>(Entity);
             ReadMessageWithEntity<TMessage>(Entity);

encompass-cs/UberRenderer.cs

@@ -20,7 +20,7 @@ namespace Encompass
         }
 
         // can't reflect invoke on Span returns...
-        public void Render()
+        public override void Render(double dt, double alpha)
         {
             foreach (var type in _componentTypes)
             {
@@ -28,7 +28,7 @@ namespace Encompass
             }
         }
 
-        protected void CallAllComponentMethods<TComponent>() where TComponent : struct, IComponent
+        protected void CallAllComponentMethods<TComponent>() where TComponent : struct
         {
             ReadEntity<TComponent>();
             ReadEntities<TComponent>();

encompass-cs/World.cs

@@ -69,9 +69,9 @@ namespace Encompass
         /// <summary>
         /// Causes the Renderers to draw.
         /// </summary>
-        public void Draw()
+        public void Draw(double dt, double alpha)
         {
-            _renderManager.Draw();
+            _renderManager.Draw(dt, alpha);
         }
     }
 }

encompass-cs/WorldBuilder.cs

@@ -3,8 +3,6 @@ using System.Collections.Generic;
 using System.Reflection;
 using System.Linq;
 using Encompass.Exceptions;
-using MoonTools.Core.Graph;
-using MoonTools.Core.Graph.Extensions;
 
 namespace Encompass
 {
@@ -20,7 +18,7 @@ namespace Encompass
     {
         private readonly int _entityCapacity;
         private readonly List<Engine> _engines = new List<Engine>();
-        private readonly DirectedGraph<Engine, Unit> _engineGraph = GraphBuilder.DirectedGraph<Engine>();
+        private readonly DirectedGraph<Engine> _engineGraph = new DirectedGraph<Engine>();
         private readonly ComponentStore _startingExistingComponentStore;
         private readonly ComponentStore _startingUpToDateComponentStore;
 
@@ -28,7 +26,6 @@ namespace Encompass
         private readonly EntityManager _entityManager;
         private readonly MessageManager _messageManager;
         private readonly TimeManager _timeManager;
-        private readonly DrawLayerManager _drawLayerManager;
         private readonly RenderManager _renderManager;
         private readonly TrackingManager _trackingManager;
 
@@ -38,18 +35,15 @@ namespace Encompass
         private readonly HashSet<Type> _messageTypes = new HashSet<Type>();
         private readonly Dictionary<Type, int> _typeToIndex = new Dictionary<Type, int>();
 
-        private bool _rendererRegistered = false;
-
         public WorldBuilder(int entityCapacity = 32768)
         {
             _entityCapacity = entityCapacity;
-            _drawLayerManager = new DrawLayerManager();
             _timeManager = new TimeManager();
             _trackingManager = new TrackingManager();
-            _componentManager = new ComponentManager(_drawLayerManager, _typeToIndex);
+            _componentManager = new ComponentManager(_typeToIndex);
             _messageManager = new MessageManager(_timeManager);
             _entityManager = new EntityManager(_componentManager, entityCapacity);
-            _renderManager = new RenderManager(_entityManager, _drawLayerManager);
+            _renderManager = new RenderManager(_entityManager);
 
             _startingExistingComponentStore = new ComponentStore(_typeToIndex);
             _startingUpToDateComponentStore = new ComponentStore(_typeToIndex);
@@ -66,7 +60,7 @@ namespace Encompass
         /// <summary>
         /// Specifies that the given Message should be sent immediately on the first World Update.
         /// </summary>
-        public void SendMessage<TMessage>(in TMessage message) where TMessage : struct, IMessage
+        public void SendMessage<TMessage>(in TMessage message) where TMessage : struct
         {
             _messageManager.AddMessage(message);
         }
@@ -74,7 +68,7 @@ namespace Encompass
         /// <summary>
         /// Specifies that the given Message should be sent after the specified number of seconds after the first World Update.
         /// </summary>
-        public void SendMessage<TMessage>(in TMessage message, double time) where TMessage : struct, IMessage
+        public void SendMessage<TMessage>(in TMessage message, double time) where TMessage : struct
         {
             _messageManager.AddMessage<TMessage>(message, time);
         }
@@ -87,12 +81,13 @@ namespace Encompass
             RegisterComponentType<TComponent>();
             _startingExistingComponentStore.Set(entity.ID, component);
             _startingUpToDateComponentStore.Set(entity.ID, component);
-
-            if (component is IDrawableComponent drawableComponent)
-            {
-                _componentManager.RegisterDrawableComponent<TComponent>(entity.ID, drawableComponent.Layer);
-                _drawLayerManager.RegisterOrderedDrawable<TComponent>();
         }
+
+        internal void RegisterComponentTypeNonGeneric(Type type)
+        {
+            var method = GetType().GetMethod("RegisterComponentType", BindingFlags.NonPublic | BindingFlags.Instance);
+            var generic = method.MakeGenericMethod(type);
+            generic.Invoke(this, null);
         }
 
         internal void RegisterComponentType<TComponent>() where TComponent : struct
@@ -130,16 +125,29 @@ namespace Encompass
             var messageReceiveTypes = engine.ReceiveTypes;
             var messageSendTypes = engine.SendTypes;
 
-            RegisterMessageTypes(engine.ReceiveTypes.Union(engine.SendTypes));
+            RegisterMessageTypes(engine.ReceiveTypes);
+            RegisterMessageTypes(engine.SendTypes);
 
-            foreach (var writeImmediateType in engine.WriteImmediateTypes.Intersect(engine.ReadImmediateTypes))
+            foreach (var writeImmediateType in engine.WriteImmediateTypes)
+            {
+                foreach (var readImmediateType in engine.ReadImmediateTypes)
+                {
+                    if (readImmediateType == writeImmediateType)
                     {
                         throw new EngineSelfCycleException("Engine {0} both writes and reads immediate Component {1}", engine.GetType().Name, writeImmediateType.Name);
                     }
+                }
+            }
 
-            foreach (var messageType in messageReceiveTypes.Intersect(messageSendTypes))
+            foreach (var messageReceiveType in messageReceiveTypes)
             {
-                throw new EngineSelfCycleException("Engine {0} both receives and sends Message {1}", engine.GetType().Name, messageType.Name);
+                foreach (var messageSendType in messageSendTypes)
+                {
+                    if (messageReceiveType == messageSendType)
+                    {
+                        throw new EngineSelfCycleException("Engine {0} both receives and sends Message {1}", engine.GetType().Name, messageReceiveType.Name);
+                    }
+                }
             }
 
             if (messageSendTypes.Count > 0 || engine.WriteImmediateTypes.Count > 0)
@@ -147,7 +155,27 @@ namespace Encompass
                 _senders.Add(engine);
             }
 
-            foreach (var componentType in engine.QueryWithTypes.Union(engine.QueryWithoutTypes))
+            foreach (var componentType in engine.ReadTypes)
+            {
+                RegisterComponentTypeNonGeneric(componentType);
+            }
+
+            foreach (var componentType in engine.AddTypes)
+            {
+                RegisterComponentTypeNonGeneric(componentType);
+            }
+
+            foreach (var componentType in engine.WriteTypes)
+            {
+                RegisterComponentTypeNonGeneric(componentType);
+            }
+
+            foreach (var componentType in engine.WriteImmediateTypes)
+            {
+                RegisterComponentTypeNonGeneric(componentType);
+            }
+
+            foreach (var componentType in engine.QueryWithTypes)
             {
                 _trackingManager.RegisterComponentTypeToEngine(componentType, engine);
                 if (engine.ReadImmediateTypes.Contains(componentType))
@@ -156,7 +184,26 @@ namespace Encompass
                 }
             }
 
-            foreach (var receiveType in engine.ReceiveTypes.Union(engine.ReadImmediateTypes))
+            foreach (var componentType in engine.QueryWithoutTypes)
+            {
+                _trackingManager.RegisterComponentTypeToEngine(componentType, engine);
+                if (engine.ReadImmediateTypes.Contains(componentType))
+                {
+                    _trackingManager.RegisterImmediateComponentTypeToEngine(componentType, engine);
+                }
+            }
+
+            foreach (var receiveType in engine.ReceiveTypes)
+            {
+                if (!_typeToReaders.ContainsKey(receiveType))
+                {
+                    _typeToReaders.Add(receiveType, new HashSet<Engine>());
+                }
+
+                _typeToReaders[receiveType].Add(engine);
+            }
+
+            foreach (var receiveType in engine.ReadImmediateTypes)
             {
                 if (!_typeToReaders.ContainsKey(receiveType))
                 {
@@ -170,51 +217,37 @@ namespace Encompass
         }
 
         /// <summary>
-        /// Registers a draw layer. This must be done before any Renderers are registered.
+        /// Adds the specified Renderer to the World.
         /// </summary>
-        /// <param name="layer">The draw layer to register.</param>
+        public void AddRenderer(Renderer renderer)
-        public void RegisterDrawLayer(int layer)
         {
-            if (_rendererRegistered)
-            {
-                throw new IllegalDrawLayerException("Cannot register a draw layer after a Renderer has been registered.");
-            }
-            _drawLayerManager.RegisterDrawLayer(layer);
-        }
-
-        /// <summary>
-        /// Adds the specified OrderedRenderer to the World.
-        /// </summary>
-        public OrderedRenderer<TComponent> AddOrderedRenderer<TComponent>(OrderedRenderer<TComponent> renderer) where TComponent : struct, IComponent, IDrawableComponent
-        {
-            RegisterComponentType<TComponent>();
-            renderer.AssignEntityManager(_entityManager);
             renderer.AssignComponentManager(_componentManager);
-            _renderManager.RegisterOrderedRenderer<TComponent>(renderer.InternalRender);
-            _rendererRegistered = true;
-            return renderer;
-        }
-
-        /// <summary>
-        /// Adds the specified GeneralRenderer to the World at the specified layer.
-        /// Higher layer numbers draw on top of lower layer numbers.
-        /// </summary>
-        /// <param name="renderer">An instance of a GeneralRenderer.</param>
-        /// <param name="layer">The layer at which the GeneralRenderer should render. Higher numbers draw over lower numbers.</param>
-        public TRenderer AddGeneralRenderer<TRenderer>(TRenderer renderer, int layer) where TRenderer : GeneralRenderer
-        {
             renderer.AssignEntityManager(_entityManager);
-            renderer.AssignComponentManager(_componentManager);
+            _renderManager.AddRenderer(renderer);
-            _renderManager.RegisterGeneralRendererWithLayer(renderer, layer);
-            _rendererRegistered = true;
-            return renderer;
         }
 
         private void BuildEngineGraph()
         {
             foreach (var senderEngine in _senders)
             {
-                foreach (var messageType in senderEngine.SendTypes.Union(senderEngine.WriteImmediateTypes))
+                foreach (var messageType in senderEngine.SendTypes)
+                {
+                    if (_typeToReaders.ContainsKey(messageType))
+                    {
+                        foreach (var readerEngine in _typeToReaders[messageType])
+                        {
+                            if (senderEngine != readerEngine)
+                            {
+                                if (!_engineGraph.Exists(senderEngine, readerEngine))
+                                {
+                                    _engineGraph.AddEdge(senderEngine, readerEngine);
+                                }
+                            }
+                        }
+                    }
+                }
+
+                foreach (var messageType in senderEngine.WriteImmediateTypes)
                 {
                     if (_typeToReaders.ContainsKey(messageType))
                     {
@@ -394,44 +427,20 @@ namespace Encompass
         {
             var dummyTimeManager = new TimeManager();
             var dummyMessageManager = new MessageManager(dummyTimeManager);
-            var dummyDrawLayerManager = new DrawLayerManager();
             var dummyTrackingManager = new TrackingManager();
-            var dummyComponentManager = new ComponentManager(dummyDrawLayerManager, _typeToIndex);
+            var dummyComponentManager = new ComponentManager(_typeToIndex);
             var dummyEntityManager = new EntityManager(dummyComponentManager, _entityCapacity);
-            var dummyRenderManager = new RenderManager(dummyEntityManager, dummyDrawLayerManager);
+            var dummyRenderManager = new RenderManager(dummyEntityManager);
 
-            // doing reflection to grab all component types, because not all writes need to be declared
+            var prepEngineOrder = new List<Engine>();
-            foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies())
-            {
-                foreach (var componentType in assembly.GetTypes())
-                {
-                    if (typeof(IComponent).IsAssignableFrom(componentType) && componentType.IsValueType && !componentType.IsEnum && !componentType.IsPrimitive)
-                    {
-                        var method = typeof(WorldBuilder).GetMethod("RegisterComponentType", BindingFlags.NonPublic | BindingFlags.Instance);
-                        var generic = method.MakeGenericMethod(componentType);
-                        generic.Invoke(this, null);
 
+            foreach (var componentType in _componentTypesToPreload)
+            {
                 var dummyRegisterMethod = typeof(ComponentManager).GetMethod("RegisterComponentType", BindingFlags.Public | BindingFlags.Instance);
                 var dummyGeneric = dummyRegisterMethod.MakeGenericMethod(componentType);
                 dummyGeneric.Invoke(dummyComponentManager, null);
             }
 
-                    if (componentType.GetInterface("IDrawableComponent") != null)
-                    {
-                        // register draw layer using property value
-                        var instance = Activator.CreateInstance(componentType);
-                        var layerPropertyInfo = componentType.GetProperty("Layer");
-                        dummyDrawLayerManager.RegisterDrawLayer((int)layerPropertyInfo.GetValue(instance));
-
-                        var drawLayerManagerRegisterMethod = typeof(DrawLayerManager).GetMethod("RegisterOrderedDrawable");
-                        var drawLayerManagerRegisterGenericMethod = drawLayerManagerRegisterMethod.MakeGenericMethod(componentType);
-                        drawLayerManagerRegisterGenericMethod.Invoke(dummyDrawLayerManager, null);
-                    }
-                }
-            }
-
-            var prepEngineOrder = new List<Engine>();
-
             var uberEngine = new UberEngine(_componentTypesToPreload, messageTypes);
 
             uberEngine.AssignEntityManager(dummyEntityManager);
@@ -465,7 +474,7 @@ namespace Encompass
             dummyComponentManager.WriteComponents();
 
             uberRenderer.SetEntity(uberEngine.Entity);
-            uberRenderer.Render();
+            uberRenderer.Render(1, 0);
         }
     }
 }

encompass-cs/encompass-cs.csproj

@@ -5,7 +5,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <RootNamespace>Encompass</RootNamespace>
     <PackageId>EncompassECS.Framework</PackageId>
-    <Version>0.22.0</Version>
+    <Version>0.23.0</Version>
     <Authors>Evan Hemsley</Authors>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <Company>Moonside Games</Company>
@@ -17,6 +17,7 @@
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <AssemblyName>EncompassECS.Framework</AssemblyName>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
+    <Platforms>x64;x86</Platforms>
   </PropertyGroup>
   <ItemGroup>
     <None Include="..\LICENSE">
@@ -25,8 +26,6 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="MoonTools.Core.Graph" Version="1.0.0" />
-    <PackageReference Include="MoonTools.FastCollections" Version="1.0.0" />
     <PackageReference Include="System.Collections.Immutable" Version="1.7.0" />
     <PackageReference Include="Microsoft.Bcl.HashCode" Version="1.1.0" />
   </ItemGroup>

test/ComponentTest.cs

@@ -8,12 +8,12 @@ namespace Tests
 {
     public class ComponentTests
     {
-        struct MockComponent : IComponent
+        struct MockComponent
         {
             public int myInt;
         }
 
-        struct EntityMessage : IMessage
+        struct EntityMessage
         {
             public Entity entity;
         }
@@ -33,7 +33,7 @@ namespace Tests
             }
         }
 
-        struct AddComponentTestMessage : IMessage
+        struct AddComponentTestMessage
         {
             public Entity entity;
             public MockComponent mockComponent;
@@ -62,8 +62,6 @@ namespace Tests
 
             var entity = worldBuilder.CreateEntity();
 
-            const string MyString = "hello";
-
             MockComponent mockComponent;
             mockComponent.myInt = 3;
 
@@ -174,7 +172,7 @@ namespace Tests
             Assert.DoesNotThrow(() => world.Update(0.01));
         }
 
-        struct AddMockComponentMessage : IMessage
+        struct AddMockComponentMessage
         {
             public Entity entity;
             public MockComponent mockComponent;
@@ -271,7 +269,7 @@ namespace Tests
 
             Assert.AreEqual(mockComponent, gottenMockComponent);
         }
-        struct HasComponentTestMessage : IMessage
+        struct HasComponentTestMessage
         {
             public Entity entity;
         }
@@ -369,7 +367,7 @@ namespace Tests
             Assert.IsFalse(hasComponentRuntimeTypeResult);
         }
 
-        struct RemoveComponentTestMessage : IMessage
+        struct RemoveComponentTestMessage
         {
             public Entity entity;
         }
@@ -463,7 +461,7 @@ namespace Tests
             hasComponentResult.Should().BeFalse();
         }
 
-        struct CheckHasMockComponentMessage : IMessage
+        struct CheckHasMockComponentMessage
         {
             public Entity entity;
             public bool shouldHaveComponent;

test/EngineTest.cs

@@ -10,7 +10,7 @@ using Encompass.Exceptions;
 
 namespace Tests
 {
-    struct MockComponent : IComponent
+    struct MockComponent
     {
         public int myInt;
     }
@@ -271,7 +271,7 @@ namespace Tests
             Assert.That(ex.Message, Is.EqualTo("Engine UndeclaredUpdateComponentTestEngine tried to update undeclared Component MockComponent"));
         }
 
-        struct MockMessage : IMessage
+        struct MockMessage
         {
             public string myString;
         }
@@ -435,7 +435,7 @@ namespace Tests
             Assert.Throws<IllegalReadException>(() => world.Update(0.01f));
         }
 
-        struct EntityMessage : IMessage, IHasEntity
+        struct EntityMessage : IHasEntity
         {
             public EntityMessage(Entity entity, int myInt)
             {
@@ -650,7 +650,7 @@ namespace Tests
             world.Update(0.01f);
         }
 
-        struct DestroyerComponent : IComponent { }
+        struct DestroyerComponent { }
 
         [Reads(typeof(DestroyerComponent))]
         class DestroyerEngine : Engine
@@ -955,7 +955,7 @@ namespace Tests
             resultComponents.Should().BeEmpty();
         }
 
-        struct DestroyComponentMessage : IMessage { public Entity entity; }
+        struct DestroyComponentMessage { public Entity entity; }
 
         [Reads(typeof(MockComponent))]
         [Writes(typeof(MockComponent))]
@@ -1007,7 +1007,7 @@ namespace Tests
             Assert.Throws<NoComponentOfTypeException>(() => world.Update(0.01), "No component of type MockComponent exists");
         }
 
-        struct MockComponentB : IComponent
+        struct MockComponentB
         {
             private int value;
 
@@ -1324,6 +1324,7 @@ namespace Tests
             undilatedDeltaTime.Should().Be(0.5);
         }
 
+        [Adds(typeof(MockComponent))]
         class AddComponentWithoutPriorityEngine : Engine
         {
             public override void Update(double dt)
@@ -1380,6 +1381,7 @@ namespace Tests
             Assert.Throws<IllegalWriteException>(() => world.Update(0.01));
         }
 
+        [Adds(typeof(MockComponentB))]
         [WritesImmediate(typeof(MockComponentB))]
         class AddImmediateComponentEngine : Engine
         {
@@ -1450,9 +1452,9 @@ namespace Tests
 
         public class QueryTests
         {
-            struct MockComponentB : IComponent { }
+            struct MockComponentB { }
-            struct MockComponentC : IComponent { }
+            struct MockComponentC { }
-            struct MockComponentD : IComponent { }
+            struct MockComponentD { }
 
             [Writes(typeof(MockComponentB))]
             [QueryWith(typeof(MockComponent), typeof(MockComponentB))]
@@ -1902,7 +1904,7 @@ namespace Tests
                 _components.Should().NotBeEmpty();
             }
 
-            struct MockTimerComponent : IComponent
+            struct MockTimerComponent
             {
                 public double Timer { get; }
 

test/OrderedRendererTest.cs

@@ -1,109 +0,0 @@
-using System;
-
-using NUnit.Framework;
-using FluentAssertions;
-using Encompass;
-using System.Collections.Generic;
-
-namespace Tests
-{
-    public class OrderedRendererTest
-    {
-        struct AComponent : IComponent { }
-        struct BComponent : IComponent { }
-        struct CComponent : IComponent { }
-
-        struct TestDrawComponent : IComponent, IDrawableComponent
-        {
-            public int Layer { get; set; }
-        }
-
-        class TestRenderer : OrderedRenderer<TestDrawComponent>
-        {
-            public override void Render(Entity entity, in TestDrawComponent testDrawComponent) { }
-        }
-
-        static bool called = false;
-        class DeactivatedRenderer : TestRenderer
-        {
-            public override void Render(Entity entity, in TestDrawComponent testDrawComponent)
-            {
-                called = true;
-            }
-        }
-
-        static bool calledOnDraw = false;
-        static (TestDrawComponent, Entity) resultComponent;
-
-        class CalledRenderer : OrderedRenderer<TestDrawComponent>
-        {
-            public override void Render(Entity entity, in TestDrawComponent testDrawComponent)
-            {
-                resultComponent = (testDrawComponent, entity);
-                calledOnDraw = true;
-            }
-        }
-
-        [Test]
-        public void RenderMethodCalledOnWorldDraw()
-        {
-            var worldBuilder = new WorldBuilder();
-            worldBuilder.RegisterDrawLayer(2);
-
-            var renderer = worldBuilder.AddOrderedRenderer(new CalledRenderer());
-
-            AComponent aComponent;
-            CComponent cComponent;
-
-            var testDrawComponent = new TestDrawComponent { Layer = 2 };
-
-            var entity = worldBuilder.CreateEntity();
-            worldBuilder.SetComponent(entity, aComponent);
-            worldBuilder.SetComponent(entity, cComponent);
-            worldBuilder.SetComponent(entity, testDrawComponent);
-
-            var world = worldBuilder.Build();
-
-            world.Update(0.01f);
-            world.Draw();
-
-            Assert.IsTrue(calledOnDraw);
-            resultComponent.Should().BeEquivalentTo((testDrawComponent, entity));
-        }
-
-        [Reads(typeof(TestDrawComponent))]
-        class DestroyerEngine : Engine
-        {
-            public override void Update(double dt)
-            {
-                foreach (var entity in ReadEntities<TestDrawComponent>())
-                {
-                    Destroy(entity);
-                }
-            }
-        }
-        [Test]
-        public void RenderMethodNotCalledAfterDestroy()
-        {
-            calledOnDraw = false;
-
-            var worldBuilder = new WorldBuilder();
-            worldBuilder.RegisterDrawLayer(1);
-
-            worldBuilder.AddEngine(new DestroyerEngine());
-            var renderer = worldBuilder.AddOrderedRenderer(new CalledRenderer());
-
-            TestDrawComponent testDrawComponent = new TestDrawComponent { Layer = 1 };
-
-            var entity = worldBuilder.CreateEntity();
-            worldBuilder.SetComponent(entity, testDrawComponent);
-
-            var world = worldBuilder.Build();
-
-            world.Update(0.01);
-            world.Draw();
-
-            Assert.IsFalse(calledOnDraw);
-        }
-    }
-}

test/RendererTest.cs

@@ -5,15 +5,15 @@ namespace Tests
 {
     public static class GeneralRendererTest
     {
-        struct AComponent : IComponent { }
+        struct AComponent { }
 
         public class SingletonRead
         {
             static (AComponent, Entity) result;
 
-            class TestRenderer : GeneralRenderer
+            class TestRenderer : Renderer
             {
-                public override void Render()
+                public override void Render(double dt, double alpha)
                 {
                     ref readonly var entity = ref ReadEntity<AComponent>();
                     result = (GetComponent<AComponent>(entity), entity);
@@ -24,7 +24,7 @@ namespace Tests
             public void SingletonComponent()
             {
                 var worldBuilder = new WorldBuilder();
-                worldBuilder.AddGeneralRenderer(new TestRenderer(), 1);
+                worldBuilder.AddRenderer(new TestRenderer());
 
                 AComponent aComponent;
 
@@ -34,10 +34,10 @@ namespace Tests
                 var world = worldBuilder.Build();
 
                 world.Update(0.01f);
-                world.Draw();
+                world.Draw(0.01f, 0);
 
                 world.Update(0.01);
-                world.Draw();
+                world.Draw(0.01f, 0);
 
                 Assert.That(result, Is.EqualTo((aComponent, entity)));
             }
@@ -46,7 +46,7 @@ namespace Tests
             public void MultipleComponents()
             {
                 var worldBuilder = new WorldBuilder();
-                worldBuilder.AddGeneralRenderer(new TestRenderer(), 1);
+                worldBuilder.AddRenderer(new TestRenderer());
 
                 AComponent aComponent;
                 AComponent aComponentTwo;
@@ -59,10 +59,10 @@ namespace Tests
                 var world = worldBuilder.Build();
 
                 world.Update(0.01f);
-                world.Draw();
+                world.Draw(0.01f, 0);
 
                 world.Update(0.01f);
-                world.Draw();
+                world.Draw(0.01f, 0);
 
                 Assert.That(result, Is.EqualTo((aComponent, entity)).Or.EqualTo((aComponentTwo, entityB)));
             }

test/SpawnerTest.cs

@@ -5,8 +5,8 @@ namespace Tests
 {
     public class SpawnerTest
     {
-        struct TestComponent : IComponent { }
+        struct TestComponent { }
-        struct SpawnMessageA : IMessage { }
+        struct SpawnMessageA { }
 
         static Entity resultEntity;
 

test/WorldBuilderTest.cs

@@ -13,8 +13,8 @@ namespace Tests
     {
         public class EngineCycleSimple
         {
-            struct AMessage : IMessage { }
+            struct AMessage { }
-            struct BMessage : IMessage { }
+            struct BMessage { }
 
             [Receives(typeof(AMessage))]
             [Sends(typeof(BMessage))]
@@ -51,10 +51,10 @@ namespace Tests
 
         public class EngineCycleComplex
         {
-            struct AMessage : IMessage { }
+            struct AMessage { }
-            struct BMessage : IMessage { }
+            struct BMessage { }
-            struct CMessage : IMessage { }
+            struct CMessage { }
-            struct DMessage : IMessage { }
+            struct DMessage { }
 
             [Receives(typeof(AMessage))]
             [Sends(typeof(BMessage))]
@@ -142,12 +142,12 @@ namespace Tests
 
         public class MultipleEngineWriteWithPriority
         {
-            struct SetMessage : IMessage
+            struct SetMessage
             {
                 public Entity entity;
             }
 
-            struct AComponent : IComponent
+            struct AComponent
             {
                 public int myInt;
             }
@@ -211,12 +211,12 @@ namespace Tests
 
         public class DefaultWritePriority
         {
-            struct SetMessage : IMessage
+            struct SetMessage
             {
                 public Entity entity;
             }
 
-            struct AComponent : IComponent
+            struct AComponent
             {
                 public int myInt;
             }
@@ -298,7 +298,7 @@ namespace Tests
 
         public class EngineMessageSelfCycle
         {
-            struct AMessage : IMessage { }
+            struct AMessage { }
 
             [Receives(typeof(AMessage))]
             [Sends(typeof(AMessage))]
@@ -319,28 +319,6 @@ namespace Tests
             }
         }
 
-        public class IllegalWriteType
-        {
-            struct ANonMessage { }
-
-            [Sends(typeof(ANonMessage))]
-            class MyEngine : Engine
-            {
-                public override void Update(double dt)
-                {
-
-                }
-            }
-
-            [Test]
-            public void ThrowsError()
-            {
-                var worldBuilder = new WorldBuilder();
-
-                Assert.Throws<IllegalSendTypeException>(() => worldBuilder.AddEngine(new MyEngine()), "ANonMessage must be a Message or Component");
-            }
-        }
-
         public class PriorityConflict
         {
             [Writes(typeof(MockComponent), 2)]
@@ -407,13 +385,13 @@ namespace Tests
         {
             static List<Engine> order = new List<Engine>();
 
-            struct AComponent : IComponent { }
+            struct AComponent { }
-            struct BComponent : IComponent { }
+            struct BComponent { }
 
-            struct AMessage : IMessage { }
+            struct AMessage { }
-            struct BMessage : IMessage { }
+            struct BMessage { }
-            struct CMessage : IMessage { }
+            struct CMessage { }
-            struct DMessage : IMessage { }
+            struct DMessage { }
 
             [Sends(typeof(AMessage))]
             class AEngine : Engine
@@ -520,8 +498,8 @@ namespace Tests
         {
             static List<Engine> order = new List<Engine>();
 
-            struct AMessage : IMessage { }
+            struct AMessage { }
-            struct BMessage : IMessage { }
+            struct BMessage { }
 
             [Sends(typeof(AMessage), typeof(BMessage))]
             class AEngine : Engine
@@ -558,57 +536,5 @@ namespace Tests
                 Assert.That(order.IndexOf(engineA), Is.LessThan(order.IndexOf(engineB)));
             }
         }
-
-        public class DrawLayerRegister
-        {
-            struct AComponent : IComponent, IDrawableComponent
-            {
-                public int Layer { get; }
-            }
-
-            struct BComponent : IComponent, IDrawableComponent
-            {
-                public int Layer { get => 3; }
-            }
-
-            class ARenderer : OrderedRenderer<AComponent>
-            {
-                public override void Render(Entity entity, in AComponent drawComponent) { }
-            }
-
-            class BRenderer : OrderedRenderer<BComponent>
-            {
-                public override void Render(Entity entity, in BComponent drawComponent) { }
-            }
-
-            [Test]
-            public void DrawLayerRegisterAfterOrderedRendererRegisterThrows()
-            {
-                var worldBuilder = new WorldBuilder();
-
-                var rendererA = worldBuilder.AddOrderedRenderer(new ARenderer());
-
-                Assert.Throws<IllegalDrawLayerException>(() => worldBuilder.RegisterDrawLayer(1));
-            }
-
-            [Test]
-            public void DrawLayerRegisterBeforeOrderedRendererDoesNotThrow()
-            {
-                var worldBuilder = new WorldBuilder();
-
-                Assert.DoesNotThrow(() => worldBuilder.RegisterDrawLayer(1));
-                Assert.DoesNotThrow(() => worldBuilder.AddOrderedRenderer(new ARenderer()));
-            }
-
-            [Test]
-            public void DrawLayerWithProperty()
-            {
-                var worldBuilder = new WorldBuilder();
-
-                var rendererB = worldBuilder.AddOrderedRenderer(new BRenderer());
-
-                Assert.DoesNotThrow(() => worldBuilder.Build());
-            }
-        }
     }
 }

test/WorldTest.cs

@@ -1,81 +0,0 @@
-using NUnit.Framework;
-using FluentAssertions;
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-using Encompass;
-
-namespace Tests
-{
-    public class WorldTest
-    {
-        struct TestComponent : IComponent { }
-        struct TestDrawComponent : IComponent, IDrawableComponent
-        {
-            public int Layer { get; set; }
-        }
-
-        static List<object> drawOrder = new List<object>();
-
-        class TestEntityRenderer : OrderedRenderer<TestDrawComponent>
-        {
-            public override void Render(Entity entity, in TestDrawComponent testDrawComponent)
-            {
-                drawOrder.Add(entity);
-            }
-        }
-
-        class TestGeneralRenderer : GeneralRenderer
-        {
-            public override void Render()
-            {
-                drawOrder.Add(this);
-            }
-        }
-
-        [Test]
-        public void DrawOrder()
-        {
-            var worldBuilder = new WorldBuilder();
-            worldBuilder.RegisterDrawLayer(1);
-            worldBuilder.RegisterDrawLayer(2);
-            worldBuilder.RegisterDrawLayer(3);
-            worldBuilder.RegisterDrawLayer(4);
-            worldBuilder.RegisterDrawLayer(7);
-
-            worldBuilder.AddOrderedRenderer(new TestEntityRenderer());
-            var testGeneralRenderer = worldBuilder.AddGeneralRenderer(new TestGeneralRenderer(), 7);
-
-            TestComponent testComponent;
-            TestDrawComponent drawComponentThree = new TestDrawComponent { Layer = 3 };
-            var drawComponentTwo = new TestDrawComponent { Layer = 2 };
-            var drawComponentOne = new TestDrawComponent { Layer = 1 };
-            var drawComponentFour = new TestDrawComponent { Layer = 4 };
-
-            var entity = worldBuilder.CreateEntity();
-            worldBuilder.SetComponent(entity, testComponent);
-            worldBuilder.SetComponent(entity, drawComponentThree);
-
-            var entityTwo = worldBuilder.CreateEntity();
-            worldBuilder.SetComponent(entityTwo, testComponent);
-            worldBuilder.SetComponent(entityTwo, drawComponentTwo);
-
-            var entityThree = worldBuilder.CreateEntity();
-            worldBuilder.SetComponent(entityThree, testComponent);
-            worldBuilder.SetComponent(entityThree, drawComponentThree);
-
-            var entityFour = worldBuilder.CreateEntity();
-            worldBuilder.SetComponent(entityFour, testComponent);
-            worldBuilder.SetComponent(entityFour, drawComponentFour);
-
-            var world = worldBuilder.Build();
-
-            world.Update(0.01f);
-            world.Draw();
-
-            drawOrder.Should().BeEquivalentTo(entityFour, entityTwo, entity, entityThree, testGeneralRenderer);
-        }
-    }
-}

test/test.csproj

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <RootNamespace>Tests</RootNamespace>
     <AssemblyName>EncompassECS.Framework.Tests</AssemblyName>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Platforms>x64;x86</Platforms>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="5.7.0" />