Merge remote-tracking branch 'leftler/NullableReturn' into 1.6.0

erendrake · erendrake · commit 3571dc207bbf · 2015-01-06T22:45:18.000-07:00
diff --git a/src/RemoteTech/NetworkManager.cs b/src/RemoteTech/NetworkManager.cs
@@ -208,15 +208,13 @@ IEnumerator IEnumerable.GetEnumerator()
         }
 
         /// <summary>Gets the position of a RemoteTech target from its id</summary>
-        /// <returns>The absolute position.</returns>
+        /// <returns>The absolute position or null if <paramref name="targetable"/> is neither 
+        /// a satellite nor a celestial body.</returns>
         /// <param name="targetable">The id of the satellite or celestial body whose position is 
-        /// desired. May be the active vessel Guid.</param>
-        /// 
-        /// <exception cref="System.ArgumentException">Thrown if <paramref name="targetable"/> is neither 
-        /// a satellite nor a celestial body.</exception>
+        ///     desired. May be the active vessel Guid.</param>
         /// 
         /// <exceptsafe>The program state is unchanged in the event of an exception.</exceptsafe>
-        internal Vector3d GetPositionFromGuid(Guid targetable)
+        internal Vector3d? GetPositionFromGuid(Guid targetable)
         {
             ISatellite targetSat = this[targetable];
             if (targetSat != null) {
@@ -227,7 +225,7 @@ internal Vector3d GetPositionFromGuid(Guid targetable)
                 return Planets[targetable].position;
             }
 
-            throw new ArgumentException("Guid is neither a satellite nor a celestial body: ", "targetable");
+            return null;
         }
     }
 
diff --git a/src/RemoteTech/NetworkRenderer.cs b/src/RemoteTech/NetworkRenderer.cs
@@ -2,6 +2,7 @@
 using System.Linq;
 using System.Collections.Generic;
 using UnityEngine;
+using Debug = System.Diagnostics.Debug;
 
 namespace RemoteTech
 {
@@ -141,9 +142,16 @@ private void UpdateNetworkCones()
                 mCones[i].Material = MapView.fetch.orbitLinesMaterial;
                 mCones[i].LineWidth = 2.0f;
                 mCones[i].Antenna = antennas[i];
-                mCones[i].Center = RTCore.Instance.Network.GetPositionFromGuid(antennas[i].Target);
                 mCones[i].Color = Color.gray;
                 mCones[i].Active = ShowCone;
+
+                var center = RTCore.Instance.Network.GetPositionFromGuid(antennas[i].Target);
+                Debug.Assert(center != null, 
+                             "center != null", 
+                             String.Format("GetPositionFromGuid retuned a null value for the target {0}", 
+                                           antennas[i].Target)
+                             );
+                mCones[i].Center = center.Value;
             }
         }
 
diff --git a/src/RemoteTech/RangeModel/RangeModelExtensions.cs b/src/RemoteTech/RangeModel/RangeModelExtensions.cs
@@ -46,17 +46,21 @@ public static bool IsInFieldOfView(this IAntenna dish, ISatellite target, ISatel
                 return false;
             }
 
-            try {
-                Vector3d coneCenter = RTCore.Instance.Network.GetPositionFromGuid(dish.Target);
+            Vector3d? coneCenter = RTCore.Instance.Network.GetPositionFromGuid(dish.Target);
 
-                Vector3d dirToConeCenter = (coneCenter      - antennaSat.Position);
-                Vector3d dirToTarget     = (target.Position - antennaSat.Position);
+            if (coneCenter.HasValue)
+            {
+                Vector3d dirToConeCenter = (coneCenter.Value - antennaSat.Position);
+                Vector3d dirToTarget     = (target.Position  - antennaSat.Position);
 
                 return (Vector3d.Dot(dirToConeCenter.normalized, dirToTarget.normalized) >= dish.CosAngle);
-            } catch (ArgumentException e) {
-                RTLog.Notify("Unexpected dish target: {0}", e);
+            }
+            else
+            {
+                RTLog.Notify("Unexpected dish target: {0}", dish.Target);
                 return false;
             }
+            
         }
 
         /// <summary>Finds the distance between two ISatellites</summary>

Original file line number	Diff line number	Diff line change
`@@ -208,15 +208,13 @@ IEnumerator IEnumerable.GetEnumerator()`
`208`	`208`	`}`
`209`	`209`
`210`	`210`	`/// <summary>Gets the position of a RemoteTech target from its id</summary>`
`211`		`- /// <returns>The absolute position.</returns>`
	`211`	`+ /// <returns>The absolute position or null if <paramref name="targetable"/> is neither`
	`212`	`+ /// a satellite nor a celestial body.</returns>`
`212`	`213`	`/// <param name="targetable">The id of the satellite or celestial body whose position is`
`213`		`- /// desired. May be the active vessel Guid.</param>`
`214`		`- ///`
`215`		`- /// <exception cref="System.ArgumentException">Thrown if <paramref name="targetable"/> is neither`
`216`		`- /// a satellite nor a celestial body.</exception>`
	`214`	`+ /// desired. May be the active vessel Guid.</param>`
`217`	`215`	`///`
`218`	`216`	`/// <exceptsafe>The program state is unchanged in the event of an exception.</exceptsafe>`
`219`		`- internal Vector3d GetPositionFromGuid(Guid targetable)`
	`217`	`+ internal Vector3d? GetPositionFromGuid(Guid targetable)`
`220`	`218`	`{`
`221`	`219`	`ISatellite targetSat = this[targetable];`
`222`	`220`	`if (targetSat != null) {`
`@@ -227,7 +225,7 @@ internal Vector3d GetPositionFromGuid(Guid targetable)`
`227`	`225`	`return Planets[targetable].position;`
`228`	`226`	`}`
`229`	`227`
`230`		`- throw new ArgumentException("Guid is neither a satellite nor a celestial body: ", "targetable");`
	`228`	`+ return null;`
`231`	`229`	`}`
`232`	`230`	`}`
`233`	`231`