Fix issues caused by AstroObjects getting disabled

SkutteOleg · Feb 8, 2023 · e07999c · e07999c
1 parent 4ddeb2e
commit e07999c
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 16 deletions.
diff --git a/TrajectoryPrediction/AstroObjectTrajectory.cs b/TrajectoryPrediction/AstroObjectTrajectory.cs
@@ -23,17 +23,25 @@ private void Start()
         _astroObject = GetComponent<AstroObject>();
         _body = _astroObject.GetOWRigidbody();
         _gravityVolume = _astroObject.GetGravityVolume();
-        
+
         if (_gravityVolume)
             _visualizer = gameObject.AddComponent<TrajectoryVisualizer>();
 
+        Enable();
+    }
+
+    private void Enable()
+    {
+        if (!_astroObject)
+            return;
+
         TrajectoryPrediction.AstroObjectToTrajectoryMap[_astroObject] = this;
         if (_gravityVolume)
         {
             if (_gravityVolume.GetOWTriggerVolume().GetShape())
                 _triggerRadius = _gravityVolume.GetOWTriggerVolume().GetShape().localBounds.radius;
             if (_gravityVolume.GetOWTriggerVolume().GetOWCollider())
-                _triggerRadius = ((SphereCollider)_gravityVolume.GetOWTriggerVolume().GetOWCollider().GetCollider()).radius;
+                _triggerRadius = ((SphereCollider) _gravityVolume.GetOWTriggerVolume().GetOWCollider().GetCollider()).radius;
 
             TrajectoryPrediction.GravityVolumeToTrajectoryMap[_gravityVolume] = this;
             TrajectoryPrediction.AddTrajectory(this);
@@ -46,7 +54,12 @@ private void Start()
         TrajectoryPrediction.OnEndFrame += EndFrame;
     }
 
-    private void OnDestroy()
+    private void OnEnable()
+    {
+        Enable();
+    }
+
+    private void OnDisable()
     {
         TrajectoryPrediction.AstroObjectToTrajectoryMap.Remove(_astroObject);
         if (_gravityVolume)

diff --git a/TrajectoryPrediction/MapMarkerTrajectory.cs b/TrajectoryPrediction/MapMarkerTrajectory.cs
@@ -29,6 +29,15 @@ private void Start()
 
         _forceDetector = _body.GetAttachedForceDetector();
         _visualizer = gameObject.AddComponent<TrajectoryVisualizer>();
+
+        Enable();
+    }
+
+    private void Enable()
+    {
+        if (!_marker)
+            return;
+
         ApplyConfig();
 
         TrajectoryPrediction.OnConfigUpdate += ApplyConfig;
@@ -44,7 +53,12 @@ private void Start()
         }
     }
 
-    private void OnDestroy()
+    private void OnEnable()
+    {
+        Enable();
+    }
+
+    private void OnDisable()
     {
         TrajectoryPrediction.OnConfigUpdate -= ApplyConfig;
         TrajectoryPrediction.OnBeginFrame -= BeginFrame;

diff --git a/TrajectoryPrediction/TrajectoryVisualizer.cs b/TrajectoryPrediction/TrajectoryVisualizer.cs
@@ -22,6 +22,15 @@ private void Start()
         material.SetTexture(MainTex, Resources.FindObjectsOfTypeAll<Texture2D>().First(texture => texture.name == "Effects_SPA_OrbitLine_Dotted_d"));
         _lineRenderer.material = material;
         _lineRenderer.textureMode = LineTextureMode.RepeatPerSegment;
+
+        Enable();
+    }
+
+    private void Enable()
+    {
+        if (_trajectory == null)
+            return;
+
         TrajectoryPrediction.AddVisualizer(this);
         UpdateVisibility();
         UpdateColor();
@@ -33,7 +42,12 @@ private void Start()
         TrajectoryPrediction.OnBeginFrame += BeginFrame;
     }
 
-    private void OnDestroy()
+    private void OnEnable()
+    {
+        Enable();
+    }
+
+    private void OnDisable()
     {
         TrajectoryPrediction.RemoveVisualizer(this);
         GlobalMessenger.RemoveListener("EnterMapView", OnEnterMapView);
@@ -50,9 +64,9 @@ public void SetVisibility(bool value)
 
     private void UpdateVisibility()
     {
-        if (!_lineRenderer) 
+        if (!_lineRenderer)
             return;
-        
+
         _lineRenderer.enabled = _visible;
     }
 
@@ -64,9 +78,9 @@ public void SetColor(Color color)
 
     private void UpdateColor()
     {
-        if (!_lineRenderer) 
+        if (!_lineRenderer)
             return;
-        
+
         _lineRenderer.startColor = _color;
         _lineRenderer.endColor = new Color(_color.r, _color.g, _color.b, 0);
     }
@@ -110,7 +124,7 @@ private void Update()
 
         for (var i = 0; i < _lineRenderer.positionCount; i++)
         {
-            int step = TrajectoryPrediction.HighPrecisionMode ? Mathf.Min((int)((i + _timeSinceUpdate) / Time.fixedDeltaTime), _trajectory.TrajectoryCache.Length - 1) : i;
+            var step = TrajectoryPrediction.HighPrecisionMode ? Mathf.Min((int) ((i + _timeSinceUpdate) / Time.fixedDeltaTime), _trajectory.TrajectoryCache.Length - 1) : i;
 
             if (_trajectory.TrajectoryCache[step] == Vector3.zero)
             {

diff --git a/TrajectoryPrediction/manifest.json b/TrajectoryPrediction/manifest.json
@@ -3,12 +3,8 @@
   "filename": "TrajectoryPrediction.dll",
   "author": "Oleg Skutte",
   "name": "Trajectory Prediction",
-  "warning": {
-    "title": "Incremental GC is recommended",
-    "body": "Trajectory Prediction uses a lot of RAM and may cause lag spikes if incremental GC is disabled.\nYou can enable incremental GC in the mod manager settings."
-  },
   "uniqueName": "OlegSkutte.TrajectoryPrediction",
-  "version": "0.6.4",
-  "owmlVersion": "2.7.5",
+  "version": "0.6.5",
+  "owmlVersion": "2.9.0",
   "dependencies": []
 }