Merge pull request #4042 from pleroy/4025b

Early detection of NaN in terrain computation
mockingbirdnest · Jul 22, 2024 · 06bce52 · 06bce52
2 parents fefff88 + 81b6b3a
commit 06bce52
Showing 1 changed file with 47 additions and 10 deletions.
diff --git a/ksp_plugin_adapter/ksp_plugin_adapter.cs b/ksp_plugin_adapter/ksp_plugin_adapter.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Runtime.CompilerServices;
 using UnityEngine.Profiling;
 using static principia.ksp_plugin_adapter.FrameType;
 
@@ -94,6 +95,7 @@ internal IntPtr Plugin() {
   // EulerSolver.
   CelestialBody last_main_body_;
   private int main_body_change_countdown_ = 1;
+  private bool celestial_terrains_were_validated_ = false;
 
   private PlanetariumCameraAdjuster planetarium_camera_adjuster_;
 
@@ -720,6 +722,37 @@ public static void LoadTextureOrDie(out UnityEngine.Texture texture,
     }
   }
 
+  public static double RadiusAt(CelestialBody centre,
+                                double latitude,
+                                double longitude) {
+    double altitude = centre.TerrainAltitude(
+        latitude,
+        longitude,
+        allowNegative: !centre.ocean);
+    if (double.IsNaN(altitude)) {
+      Log.Fatal("Terrain system returned NaN for altitude at latitude " +
+                latitude +
+                ", longitude " +
+                longitude +
+                " for celestial " +
+                centre.name);
+    }
+    if (double.IsNaN(centre.Radius)) {
+      Log.Fatal("Radius is NaN for celestial " + centre.name);
+    }
+    return altitude + centre.Radius;
+  }
+
+  [MethodImpl(MethodImplOptions.NoOptimization)]
+  public static void ValidateCelestialTerrain(CelestialBody centre,
+                                              Random random) {
+    for (int i = 0; i < 5; ++i) {
+      double latitude = random.NextDouble() * 360.0 - 180.0;
+      double longitude = random.NextDouble() * 360.0 - 180.0;
+      RadiusAt(centre, latitude: latitude, longitude: longitude);
+    }
+  }
+
   #region ScenarioModule lifecycle
 
   // These functions override virtual ones from |ScenarioModule|, but it seems
@@ -1804,6 +1837,14 @@ private void BetterLateThanNever() {
   }
 
   private void BetterLateThanNeverLateUpdate() {
+    if (!celestial_terrains_were_validated_) {
+      var random = new Random();
+      foreach (CelestialBody celestial in FlightGlobals.Bodies) {
+        ValidateCelestialTerrain(celestial, random);
+      }
+      celestial_terrains_were_validated_ = true;
+    }
+
     // While we draw the trajectories directly (and thus do so after everything
     // else has been rendered), we rely on the game to render its map nodes.
     // Since the screen position is determined in |MapNode.NodeUpdate|, it must
@@ -2327,11 +2368,9 @@ private void RenderManœuvreMarkers() {
           return null;
         }
       }
-      executor.CollisionSetRadius(centre.TerrainAltitude(
-                                      trial_latitude,
-                                      trial_longitude,
-                                      allowNegative: !centre.ocean) +
-                                  centre.Radius);
+      executor.CollisionSetRadius(RadiusAt(centre,
+                                           latitude: trial_latitude,
+                                           longitude: trial_longitude));
     }
   }
 
@@ -2355,11 +2394,9 @@ private void RenderManœuvreMarkers() {
           return null;
         }
       }
-      executor.CollisionSetRadius(centre.TerrainAltitude(
-                                      trial_latitude,
-                                      trial_longitude,
-                                      allowNegative: !centre.ocean) +
-                                  centre.Radius);
+      executor.CollisionSetRadius(RadiusAt(centre,
+                                           latitude: trial_latitude,
+                                           longitude: trial_longitude));
     }
   }