preliminary version with a group of systems that run before the pre-s…

…im ECB, useful for resetting sim state
tbg10101 · Jan 3, 2021 · b090618 · b090618
1 parent b54f288
commit b090618
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 8 deletions.
diff --git a/Runtime/Scripts/MonoBehaviours/Bootstrapper.cs b/Runtime/Scripts/MonoBehaviours/Bootstrapper.cs
@@ -40,7 +40,11 @@ public class Bootstrapper : WorldBehaviour {
         private readonly Dictionary<ArchetypeProducer, int> _archetypeProducerIndices = new Dictionary<ArchetypeProducer, int>();
 
         [SerializeField]
-        private SystemTypeReference[] _simulationSystems = new SystemTypeReference[0];
+        private SystemTypeReference[] _simulationResetSystems = new SystemTypeReference[0];
+
+        [FormerlySerializedAs("_simulationSystems")]
+        [SerializeField]
+        private SystemTypeReference[] _mainSimulationSystems = new SystemTypeReference[0];
 
         [FormerlySerializedAs("_presentationSystems")]
         [SerializeField]
@@ -55,9 +59,20 @@ protected virtual void Start() {
             {
                 AddSystem(simGroup, new SimulationDestroySystem());
 
+                SimulationResetSystemGroup simResetGroup = AddSystem(simGroup, new SimulationResetSystemGroup());
+                {
+                    foreach (SystemTypeReference systemTypeReference in _simulationResetSystems) {
+                        GetOrCreateSystem(simResetGroup, systemTypeReference.SystemType);
+                    }
+                }
+
                 AddSystem(simGroup, new PreSimulationEntityCommandBufferSystem());
-                foreach (SystemTypeReference systemTypeReference in _simulationSystems) {
-                    GetOrCreateSystem(simGroup, systemTypeReference.SystemType);
+
+                SimulationMainSystemGroup simMainGroup = AddSystem(simGroup, new SimulationMainSystemGroup());
+                {
+                    foreach (SystemTypeReference systemTypeReference in _mainSimulationSystems) {
+                        GetOrCreateSystem(simMainGroup, systemTypeReference.SystemType);
+                    }
                 }
 
                 AddSystem(simGroup, new PostSimulationEntityCommandBufferSystem());
@@ -71,17 +86,21 @@ protected virtual void Start() {
                 AddSystem(presGroup, new PrePresentationEntityCommandBufferSystem());
 
                 PresentationPreUpdateSystemGroup presPreUpdateGroup = AddSystem(presGroup, new PresentationPreUpdateSystemGroup());
-                foreach (SystemTypeReference systemTypeReference in _presentationPreUpdateSystems) {
-                    GetOrCreateSystem(presPreUpdateGroup, systemTypeReference.SystemType);
+                {
+                    foreach (SystemTypeReference systemTypeReference in _presentationPreUpdateSystems) {
+                        GetOrCreateSystem(presPreUpdateGroup, systemTypeReference.SystemType);
+                    }
                 }
 
                 AddSystem(presGroup, new PreManagedMonoBehaviourUpdateEntityCommandBufferSystem());
                 AddSystem(presGroup, new ManagedMonoBehaviourUpdateSystem());
                 AddSystem(presGroup, new PostManagedMonoBehaviourUpdateEntityCommandBufferSystem());
 
                 PresentationPostUpdateSystemGroup presPostUpdateGroup = AddSystem(presGroup, new PresentationPostUpdateSystemGroup());
-                foreach (SystemTypeReference systemTypeReference in _presentationPostUpdateSystems) {
-                    GetOrCreateSystem(presPostUpdateGroup, systemTypeReference.SystemType);
+                {
+                    foreach (SystemTypeReference systemTypeReference in _presentationPostUpdateSystems) {
+                        GetOrCreateSystem(presPostUpdateGroup, systemTypeReference.SystemType);
+                    }
                 }
 
                 AddSystem(presGroup, new PostPresentationEntityCommandBufferSystem());

diff --git a/Runtime/Scripts/Systems/Groups/SimulationMainSystemGroup.cs b/Runtime/Scripts/Systems/Groups/SimulationMainSystemGroup.cs
@@ -0,0 +1,3 @@
+namespace Software10101.DOTS.Systems.Groups {
+    internal sealed class SimulationMainSystemGroup : ListComponentSystemGroup { }
+}
diff --git a/Runtime/Scripts/Systems/Groups/SimulationMainSystemGroup.cs.meta b/Runtime/Scripts/Systems/Groups/SimulationMainSystemGroup.cs.meta
diff --git a/Runtime/Scripts/Systems/Groups/SimulationResetSystemGroup.cs b/Runtime/Scripts/Systems/Groups/SimulationResetSystemGroup.cs
@@ -0,0 +1,3 @@
+namespace Software10101.DOTS.Systems.Groups {
+    internal sealed class SimulationResetSystemGroup : ListComponentSystemGroup { }
+}
diff --git a/Runtime/Scripts/Systems/Groups/SimulationResetSystemGroup.cs.meta b/Runtime/Scripts/Systems/Groups/SimulationResetSystemGroup.cs.meta
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "com.10101software.dots.hybridsimulation",
   "description": "A framework for using FixedUpdate in a simulation world which is linked to a GameObject-based presentation layer.",
-  "version": "0.7.4",
+  "version": "0.7.5-preview.1",
   "unity": "2020.2",
   "displayName": "DOTS Hybrid Simulation Worlds",
   "dependencies": {