Added new Menus

Toaschty · Oct 7, 2023 · 6b5c259 · 6b5c259
1 parent 2be8756
commit 6b5c259
Show file tree

Hide file tree

Showing 9 changed files with 18,486 additions and 9,430 deletions.
diff --git a/Assets/Prefabs/Ant.prefab b/Assets/Prefabs/Ant.prefab
diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity
diff --git a/Assets/Scenes/MainScene/EntityScene.unity b/Assets/Scenes/MainScene/EntityScene.unity
@@ -382,7 +382,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   DistanceBetweenPheromones: 0.2
-  PheromoneMaxTime: 30
+  PheromoneMaxTime: 2
   MaxPathLength: 200
   PendingPheromone: {fileID: 4450744419724839566, guid: c35086f34f935164e8201ba616f0e794,
     type: 3}

diff --git a/Assets/Scripts/Authoring/AntAuthoring.cs b/Assets/Scripts/Authoring/AntAuthoring.cs
@@ -9,7 +9,6 @@ public class AntAuthoring : MonoBehaviour
     [Header("Movement Settings")]
     public float MaxSpeed = 2f;
     public float SteerStrength = 2f;
-    public float WanderStrength = 1f;
     public float SensorStrength = 0.9f;
     public float RandomDirectionAngle = 90f;
     public float MaxSlopeAngle = 65f;
@@ -25,7 +24,6 @@ public class AntAuthoring : MonoBehaviour
     [Header("Detection Settings")]
     public float ViewAngle = 90f;
     public float ViewRadius = 4f;
-    public float PickUpRadius = 0.5f;
 
     [Header("Sensors")]
     public GameObject LeftSensor;
@@ -42,7 +40,6 @@ public override void Bake(AntAuthoring authoring)
                 State = AntState.SearchingFood,
                 MaxSpeed = authoring.MaxSpeed,
                 SteerStrength = authoring.SteerStrength,
-                WanderStrength = authoring.WanderStrength,
                 SensorStength = authoring.SensorStrength,
                 RandomDirectionAngle = authoring.RandomDirectionAngle,
                 RandomSteerForce = float3.zero,
@@ -96,7 +93,6 @@ public struct Ant : IComponentData
     // Movement
     public float MaxSpeed;
     public float SteerStrength;
-    public float WanderStrength;
     public float SensorStength;
     public float RandomDirectionAngle;
     public float MaxRandomSteerDuration;

diff --git a/Assets/Scripts/Authoring/AntSpawnerAuthoring.cs b/Assets/Scripts/Authoring/AntSpawnerAuthoring.cs
@@ -25,6 +25,10 @@ public struct AntSpawner : IComponentData
     public Entity ant;
 }
 
+public struct StartSimulation : IComponentData
+{ 
+}
+
 public struct RunningSimulation : IComponentData
 {
 }

diff --git a/Assets/Scripts/Monobehaviour/UI/SimulationManager.cs b/Assets/Scripts/Monobehaviour/UI/SimulationManager.cs
@@ -39,6 +39,7 @@ public void StartSim()
         if (!query.HasSingleton<RunningSimulation>())
         {
             manager.AddComponent<RunningSimulation>(simulation);
+            manager.AddComponent<StartSimulation>(simulation);
 
             // Enable "Reset Simulation" Button
             ResetSimulationButton.SetActive(true);

diff --git a/Assets/Scripts/Systems/AntSpawnerSystem.cs b/Assets/Scripts/Systems/AntSpawnerSystem.cs
@@ -10,15 +10,12 @@ public partial struct AntSpawnerSystem : ISystem
     public void OnCreate(ref SystemState state)
     {
         state.RequireForUpdate<AntSpawner>();
-        state.RequireForUpdate<RunningSimulation>();
+        state.RequireForUpdate<StartSimulation>();
     }
 
     [BurstCompile]
     public void OnUpdate(ref SystemState state)
     {
-        // Only spawn ants once
-        state.Enabled = false;
-
         AntSpawner spawner = SystemAPI.GetSingleton<AntSpawner>();
         EntityCommandBuffer ecb = new EntityCommandBuffer(Allocator.Temp);
 
@@ -49,5 +46,7 @@ public void OnUpdate(ref SystemState state)
             ant.ValueRW.Velocity = ant.ValueRO.DesiredDirection;
         }
 
+        // Remove component so system only updates once
+        state.EntityManager.RemoveComponent<StartSimulation>(SystemAPI.GetSingletonEntity<StartSimulation>());
     }
 }
diff --git a/Assets/Sprites/Buttons/Path.png b/Assets/Sprites/Buttons/Path.png
diff --git a/Assets/Sprites/Buttons/Path.png.meta b/Assets/Sprites/Buttons/Path.png.meta
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,6 +25,10 @@ public struct AntSpawner : IComponentData @@
         public Entity ant;
     }
+    public struct StartSimulation : IComponentData
+    {
+    }
     public struct RunningSimulation : IComponentData
     {
     }
@@ Expand Down @@