Fix PhysicsManager not properly resetting

Author: nibsbin

Core/Game/Agents/AgentController.cs

@@ -271,7 +271,10 @@ private static void DestroyAgentBuffer (DeactivationData data)
 
 public static void CacheAgent (LSAgent agent)
 {
+if (LockstepManager.PoolingEnabled)
 CachedAgents [agent.MyAgentCode].Add (agent);
+else
+GameObject.Destroy(agent.gameObject);
 }
 
 private static void UpdateDiplomacy (AgentController newCont)
@@ -305,10 +308,6 @@ public static int GetStateHash ()
 if (operationToggle >= 2) {
 operationToggle = 0;
 }
-if (agent.Body.IsNotNull ()) {
-hash ^= agent.Body._position.GetStateHash ();
-hash ^= agent.Body._position.GetStateHash ();
-}
 }
 }
 

Core/Game/Determinism/DeterminismTester.cs

@@ -1,7 +1,7 @@
 using Lockstep;
 using System;
 using UnityEngine;
-
+using System.Linq;
 namespace Lockstep
 {
  public class DeterminismTester : BehaviourHelper
@@ -28,14 +28,18 @@ protected override void OnSimulate()
  long lastHash = Hashes [LockstepManager.FrameCount];
  if (lastHash != hash)
  {
- Debug.Log("Desynced");
+Debug.Log("Desynced");// frame " + LockstepManager.FrameCount);
  }
  }
  } else
  {
  Hashes.InsertAt(hash, LockstepManager.FrameCount);
  }
+
  }
- 
+ protected override void OnDeactivate ()
+{
+iteration++;
+}
  }
 }

Core/Game/Managers/LockstepManager.cs

@@ -57,6 +57,8 @@ public static class LockstepManager
 
 public static bool Loaded { get; private set; }
 
+//for testing purposes
+public const bool PoolingEnabled = true;
 private static GameManager _mainGameManager;
 
 public static event Action onSetup;

Core/Simulation/Grid/Core/GridManager.cs

@@ -135,7 +135,8 @@ public static void Setup () {
 public static void Initialize ()
 {
 GridVersion = 1;
-
+if (!LockstepManager.PoolingEnabled)
+_settingsChanged = true;
  if (_settingsChanged) {
  if (_settings == null)
  _settings = DefaultSettings;

Core/Simulation/Physics/Core/CollisionPair.cs

@@ -59,7 +59,7 @@ public void Initialize(LSBody b1, LSBody b2)
 }
 
 _ranIndex = -1;
-;
+
 _isColliding = false;
 
 DistX = 0;
@@ -146,7 +146,7 @@ private void DistributeCollision()
 
 
 
-if (Body1.IsTrigger || Body2.IsTrigger)
+if (!DoPhysics)
 return;
 
 switch (LeCollisionType)

Core/Simulation/Physics/Core/PhysicsManager.cs

@@ -103,23 +103,38 @@ public static void Setup()
 
 public static void Initialize()
 {
-Raycaster._Version = 0;
-PeakCount = 0;
 
-CachedIDs.FastClear();
 
-CollisionPair.CurrentCollisionPair = null;
 
-PeakCount = 0;
-AssimilatedCount = 0;
 
-Partition.Initialize();
+
 
 if (SettingsChanged)
 {
 SettingsChanged = false;
 }
 
+
+ResetVars();
+}
+
+static void ResetVars () {
+for (int i = 0; i < PeakCount; i++) {
+SimObjects[i] = null;
+}
+DynamicSimObjects.FastClear();
+Raycaster._Version = 0;
+PeakCount = 0;
+CachedIDs.FastClear();
+
+CollisionPair.CurrentCollisionPair = null;
+
+PeakCount = 0;
+AssimilatedCount = 0;
+
+Partition.Initialize();
+RanCollisionPairs.FastClear();
+InactiveCollisionPairs.FastClear();
 AccumulatedTime = 0;
 LastTime = 0;
 }
@@ -232,6 +247,7 @@ public static void LateSimulate()
 public static void Deactivate()
 {
 Partition.Deactivate();
+
 }
 
 public static float LerpTime { get; private set; }
@@ -383,6 +399,7 @@ public static void DeactivateCollisionPair(CollisionPair pair)
 public static void PoolPair(CollisionPair pair)
 {
 pair.Deactivate();
+if (LockstepManager.PoolingEnabled)
 CachedCollisionPairs.Add(pair);
 }
 

Core/Simulation/Physics/Core/UnityLSBody.cs

@@ -19,8 +19,6 @@ public void Initialize(Vector3d StartPosition, Vector2d StartRotation, bool isDy
 {
 if (_internalBody.IsNull())
 _internalBody = new LSBody();
-InternalBody.transform = transform;
-InternalBody.Reset();
 InternalBody.Initialize (StartPosition,StartRotation,isDynamic);
 }
 

Example/AutoSpawner.cs

@@ -8,62 +8,64 @@ public class AutoSpawner : BehaviourHelper
 {
 [SerializeField]
 private SpawnInfo[] Spawns;
-protected override void OnInitialize()
+public bool AutoCommand = true;
+
+protected override void OnInitialize ()
 {
 }
-protected override void OnGameStart()
+
+protected override void OnGameStart ()
 {
 
 
-for (int i = 0; i < Spawns.Length; i++)
-{
-SpawnInfo info = Spawns[i];
-while (AgentController.InstanceManagers.Count <= info.ControllerIndex)
-{
+for (int i = 0; i < Spawns.Length; i++) {
+SpawnInfo info = Spawns [i];
+while (AgentController.InstanceManagers.Count <= info.ControllerIndex) {
 
-AgentController cont = AgentController.Create();
-PlayerManager.AddController(cont);
-for (int j = 0; j < AgentController.InstanceManagers.Count; j++)
-{
-AgentController ac = AgentController.InstanceManagers[j];
-if (ac != cont)
-{
-cont.SetAllegiance(ac, AllegianceType.Enemy);
-ac.SetAllegiance(cont, AllegianceType.Enemy);
+AgentController cont = AgentController.Create ();
+PlayerManager.AddController (cont);
+for (int j = 0; j < AgentController.InstanceManagers.Count; j++) {
+AgentController ac = AgentController.InstanceManagers [j];
+if (ac != cont) {
+cont.SetAllegiance (ac, AllegianceType.Enemy);
+ac.SetAllegiance (cont, AllegianceType.Enemy);
 }
 }
 
 }
 
-AgentController controller = AgentController.InstanceManagers[info.ControllerIndex];
+AgentController controller = AgentController.InstanceManagers [info.ControllerIndex];
 
-for (int j = 0; j < info.Count; j++)
-{
-LSAgent agent = controller.CreateAgent(info.AgentCode, info.Position);
-Selector.Add(agent);
+for (int j = 0; j < info.Count; j++) {
+LSAgent agent = controller.CreateAgent (info.AgentCode, info.Position);
+if (AutoCommand)
+Selector.Add (agent);
 }
 }
 
-//Find average of spawn positions
-Vector2d battlePos = Vector2d.zero;
-for (int i = 0; i < Spawns.Length; i++)
-{
-battlePos += Spawns[i].Position;
-}
-battlePos /= Spawns.Length;
-Command com = new Command(Lockstep.Data.AbilityDataItem.FindInterfacer<Scan>().ListenInputID);
-com.Add<Vector2d>(battlePos);
+if (AutoCommand) {
 
-//PlayerManager.SendCommand(com);
+//Find average of spawn positions
+Vector2d battlePos = Vector2d.zero;
+for (int i = 0; i < Spawns.Length; i++) {
+battlePos += Spawns [i].Position;
+}
+battlePos /= Spawns.Length;
+Command com = new Command (Lockstep.Data.AbilityDataItem.FindInterfacer<Scan> ().ListenInputID);
+com.Add<Vector2d> (battlePos);
 
-Selector.Clear();
+PlayerManager.SendCommand (com);
+Selector.Clear ();
+
+}
 }
 }
+
 [System.Serializable]
 public struct SpawnInfo
 {
 
-[DataCode("Agents")]
+[DataCode ("Agents")]
 public string AgentCode;
 public int Count;
 public int ControllerIndex;