remove unnecessary defines.

surfnerd · surfnerd · commit 46f657070ab3 · 2021-03-22T11:06:33.000-07:00
diff --git a/com.unity.ml-agents/Editor/RayPerceptionSensorComponentBaseEditor.cs b/com.unity.ml-agents/Editor/RayPerceptionSensorComponentBaseEditor.cs
@@ -1,11 +1,3 @@
-#if MLA_UNITY_PHYSICS_MODULE || !UNITY_2019_4_OR_NEWER
-#define MLA_UNITY_PHYSICS_MODULE_ENABLED
-#endif
-
-#if MLA_UNITY_PHYSICS2D_MODULE || !UNITY_2019_4_OR_NEWER
-#define MLA_UNITY_PHYSICS2D_MODULE_ENABLED
-#endif
-
 using UnityEngine;
 using UnityEditor;
 using Unity.MLAgents.Sensors;
@@ -18,19 +10,19 @@ internal class RayPerceptionSensorComponentBaseEditor : UnityEditor.Editor
 
         protected void OnRayPerceptionInspectorGUI(bool is3d)
         {
-#if !MLA_UNITY_PHYSICS_MODULE_ENABLED
+#if !MLA_UNITY_PHYSICS_MODULE
             if (is3d)
             {
-                EditorGUILayout.HelpBox("The Physics Module is not currently present.  "+
-                "Please add it to your project in order to use the Ray Perception APIs in the "+
+                EditorGUILayout.HelpBox("The Physics Module is not currently present.  " +
+                "Please add it to your project in order to use the Ray Perception APIs in the " +
                 $"{nameof(RayPerceptionSensorComponent3D)}", MessageType.Warning);
             }
 #endif
-#if !MLA_UNITY_PHYSICS2D_MODULE_ENABLED
+#if !MLA_UNITY_PHYSICS2D_MODULE
             if (!is3d)
             {
-                EditorGUILayout.HelpBox("The Physics2D Module is not currently present.  "+
-                "Please add it to your project in order to use the Ray Perception APIs in the "+
+                EditorGUILayout.HelpBox("The Physics2D Module is not currently present.  " +
+                "Please add it to your project in order to use the Ray Perception APIs in the " +
                 $"{nameof(RayPerceptionSensorComponent3D)}", MessageType.Warning);
             }
 #endif
diff --git a/com.unity.ml-agents/Runtime/Analytics/InferenceAnalytics.cs b/com.unity.ml-agents/Runtime/Analytics/InferenceAnalytics.cs
@@ -73,9 +73,6 @@ static bool EnableAnalytics()
             s_EventRegistered = false;
 #endif
             return s_EventRegistered;
-#else  // no editor, no analytics
-            return false;
-#endif
         }
 
         public static bool IsAnalyticsEnabled()
diff --git a/com.unity.ml-agents/Runtime/Sensors/RayPerceptionSensor.cs b/com.unity.ml-agents/Runtime/Sensors/RayPerceptionSensor.cs
@@ -1,11 +1,3 @@
-#if MLA_UNITY_PHYSICS_MODULE || !UNITY_2019_4_OR_NEWER
-#define MLA_UNITY_PHYSICS_MODULE_ENABLED
-#endif
-
-#if MLA_UNITY_PHYSICS2D_MODULE || !UNITY_2019_4_OR_NEWER
-#define MLA_UNITY_PHYSICS2D_MODULE_ENABLED
-#endif
-
 using System;
 using System.Collections.Generic;
 using UnityEngine;
@@ -436,7 +428,7 @@ out DebugDisplayInfo.RayInfo debugRayOut
 
             if (input.CastType == RayPerceptionCastType.Cast3D)
             {
-#if MLA_UNITY_PHYSICS_MODULE_ENABLED
+#if MLA_UNITY_PHYSICS_MODULE
                 RaycastHit rayHit;
                 if (scaledCastRadius > 0f)
                 {
@@ -457,7 +449,7 @@ out DebugDisplayInfo.RayInfo debugRayOut
             }
             else
             {
-#if MLA_UNITY_PHYSICS2D_MODULE_ENABLED
+#if MLA_UNITY_PHYSICS2D_MODULE
                 RaycastHit2D rayHit;
                 if (scaledCastRadius > 0f)
                 {
diff --git a/com.unity.ml-agents/Runtime/Sensors/RayPerceptionSensorComponent2D.cs b/com.unity.ml-agents/Runtime/Sensors/RayPerceptionSensorComponent2D.cs
@@ -1,11 +1,3 @@
-#if MLA_UNITY_PHYSICS_MODULE || !UNITY_2019_4_OR_NEWER
-#define MLA_UNITY_PHYSICS_MODULE_ENABLED
-#endif
-
-#if MLA_UNITY_PHYSICS2D_MODULE || !UNITY_2019_4_OR_NEWER
-#define MLA_UNITY_PHYSICS2D_MODULE_ENABLED
-#endif
-
 using UnityEngine;
 
 namespace Unity.MLAgents.Sensors
@@ -22,11 +14,7 @@ public class RayPerceptionSensorComponent2D : RayPerceptionSensorComponentBase
         public RayPerceptionSensorComponent2D()
         {
             // Set to the 2D defaults (just in case they ever diverge).
-#if MLA_UNITY_PHYSICS2D_MODULE_ENABLED
-            RayLayerMask = Physics2D.DefaultRaycastLayers;
-#else
             RayLayerMask = -5;
-#endif
         }
 
         /// <inheritdoc/>
diff --git a/com.unity.ml-agents/Runtime/Sensors/RayPerceptionSensorComponent3D.cs b/com.unity.ml-agents/Runtime/Sensors/RayPerceptionSensorComponent3D.cs
@@ -1,11 +1,3 @@
-#if MLA_UNITY_PHYSICS_MODULE || !UNITY_2019_4_OR_NEWER
-#define MLA_UNITY_PHYSICS_MODULE_ENABLED
-#endif
-
-#if MLA_UNITY_PHYSICS2D_MODULE || !UNITY_2019_4_OR_NEWER
-#define MLA_UNITY_PHYSICS2D_MODULE_ENABLED
-#endif
-
 using UnityEngine;
 using UnityEngine.Serialization;
 
diff --git a/com.unity.ml-agents/Runtime/Sensors/RayPerceptionSensorComponentBase.cs b/com.unity.ml-agents/Runtime/Sensors/RayPerceptionSensorComponentBase.cs
@@ -1,11 +1,3 @@
-#if MLA_UNITY_PHYSICS_MODULE || !UNITY_2019_4_OR_NEWER
-#define MLA_UNITY_PHYSICS_MODULE_ENABLED
-#endif
-
-#if MLA_UNITY_PHYSICS2D_MODULE || !UNITY_2019_4_OR_NEWER
-#define MLA_UNITY_PHYSICS2D_MODULE_ENABLED
-#endif
-
 using System;
 using System.Collections.Generic;
 using UnityEngine;
diff --git a/com.unity.ml-agents/Tests/Editor/PublicAPI/PublicApiValidation.cs b/com.unity.ml-agents/Tests/Editor/PublicAPI/PublicApiValidation.cs
@@ -1,11 +1,3 @@
-#if MLA_UNITY_PHYSICS_MODULE || !UNITY_2019_4_OR_NEWER
-#define MLA_UNITY_PHYSICS_MODULE_ENABLED
-#endif
-
-#if MLA_UNITY_PHYSICS2D_MODULE || !UNITY_2019_4_OR_NEWER
-#define MLA_UNITY_PHYSICS2D_MODULE_ENABLED
-#endif
-
 using System.Collections.Generic;
 using Unity.MLAgents.Sensors;
 using NUnit.Framework;
@@ -61,7 +53,7 @@ public void CheckSetupRenderTextureSensorComponent()
             Assert.IsTrue(sensorComponent.Grayscale);
         }
 
-#if MLA_UNITY_PHYSICS_MODULE_ENABLED
+#if MLA_UNITY_PHYSICS_MODULE
         [Test]
         public void CheckSetupRayPerceptionSensorComponent()
         {
diff --git a/com.unity.ml-agents/Tests/Runtime/Sensor/RayPerceptionSensorTests.cs b/com.unity.ml-agents/Tests/Runtime/Sensor/RayPerceptionSensorTests.cs
@@ -1,17 +1,9 @@
-#if MLA_UNITY_PHYSICS_MODULE || !UNITY_2019_4_OR_NEWER
-#define MLA_UNITY_PHYSICS_MODULE_ENABLED
-#endif
-
-#if MLA_UNITY_PHYSICS2D_MODULE || !UNITY_2019_4_OR_NEWER
-#define MLA_UNITY_PHYSICS2D_MODULE_ENABLED
-#endif
-
 using System;
 using System.Collections.Generic;
 using NUnit.Framework;
 using UnityEngine;
-using UnityEngine.TestTools;
 using Unity.MLAgents.Sensors;
+using UnityEngine.TestTools;
 
 namespace Unity.MLAgents.Tests
 {
@@ -35,15 +27,15 @@ public class RayPerception3DTests
         [Test]
         public void TestDefaultLayersAreNegativeFive()
         {
-#if MLA_UNITY_PHYSICS_MODULE_ENABLED
+#if MLA_UNITY_PHYSICS_MODULE
             Assert.IsTrue(Physics.DefaultRaycastLayers == -5);
 #endif
-#if MLA_UNITY_PHYSICS2D_MODULE_ENABLED
+#if MLA_UNITY_PHYSICS2D_MODULE
             Assert.IsTrue(Physics2D.DefaultRaycastLayers == -5);
 #endif
         }
 
-#if MLA_UNITY_PHYSICS_MODULE_ENABLED
+#if MLA_UNITY_PHYSICS_MODULE
         // Use built-in tags
         const string k_CubeTag = "Player";
         const string k_SphereTag = "Respawn";
diff --git a/com.unity.ml-agents/Tests/Runtime/Sensor/Unity.ML-Agents.Runtime.Sensor.Tests.asmdef b/com.unity.ml-agents/Tests/Runtime/Sensor/Unity.ML-Agents.Runtime.Sensor.Tests.asmdef
@@ -21,5 +21,17 @@
     "autoReferenced": false,
     "defineConstraints": [
         "UNITY_INCLUDE_TESTS"
+    ],
+    "versionDefines": [
+        {
+            "name": "com.unity.modules.physics",
+            "expression": "1.0.0",
+            "define": "MLA_UNITY_PHYSICS_MODULE"
+        },
+        {
+            "name": "com.unity.modules.physics2d",
+            "expression": "1.0.0",
+            "define": "MLA_UNITY_PHYSICS2D_MODULE"
+        }
     ]
 }
diff --git a/com.unity.ml-agents/Tests/Runtime/Unity.ML-Agents.Runtime.Tests.asmdef b/com.unity.ml-agents/Tests/Runtime/Unity.ML-Agents.Runtime.Tests.asmdef
@@ -21,5 +21,17 @@
     "autoReferenced": false,
     "defineConstraints": [
         "UNITY_INCLUDE_TESTS"
+    ],
+    "versionDefines": [
+        {
+            "name": "com.unity.modules.physics",
+            "expression": "1.0.0",
+            "define": "MLA_UNITY_PHYSICS_MODULE"
+        },
+        {
+            "name": "com.unity.modules.physics2d",
+            "expression": "1.0.0",
+            "define": "MLA_UNITY_PHYSICS2D_MODULE"
+        }
     ]
 }

Original file line number	Diff line number	Diff line change
`@@ -73,9 +73,6 @@ static bool EnableAnalytics()`
`73`	`73`	`s_EventRegistered = false;`
`74`	`74`	`#endif`
`75`	`75`	`return s_EventRegistered;`
`76`		`-#else // no editor, no analytics`
`77`		`- return false;`
`78`		`-#endif`
`79`	`76`	`}`
`80`	`77`
`81`	`78`	`public static bool IsAnalyticsEnabled()`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,3 @@`
`1`		`-#if MLA_UNITY_PHYSICS_MODULE \|\| !UNITY_2019_4_OR_NEWER`
`2`		`-#define MLA_UNITY_PHYSICS_MODULE_ENABLED`
`3`		`-#endif`
`4`		`-`
`5`		`-#if MLA_UNITY_PHYSICS2D_MODULE \|\| !UNITY_2019_4_OR_NEWER`
`6`		`-#define MLA_UNITY_PHYSICS2D_MODULE_ENABLED`
`7`		`-#endif`
`8`		`-`
`9`	`1`	`using System;`
`10`	`2`	`using System.Collections.Generic;`
`11`	`3`	`using UnityEngine;`
`@@ -436,7 +428,7 @@ out DebugDisplayInfo.RayInfo debugRayOut`
`436`	`428`
`437`	`429`	`if (input.CastType == RayPerceptionCastType.Cast3D)`
`438`	`430`	`{`
`439`		`-#if MLA_UNITY_PHYSICS_MODULE_ENABLED`
	`431`	`+#if MLA_UNITY_PHYSICS_MODULE`
`440`	`432`	`RaycastHit rayHit;`
`441`	`433`	`if (scaledCastRadius > 0f)`
`442`	`434`	`{`
`@@ -457,7 +449,7 @@ out DebugDisplayInfo.RayInfo debugRayOut`
`457`	`449`	`}`
`458`	`450`	`else`
`459`	`451`	`{`
`460`		`-#if MLA_UNITY_PHYSICS2D_MODULE_ENABLED`
	`452`	`+#if MLA_UNITY_PHYSICS2D_MODULE`
`461`	`453`	`RaycastHit2D rayHit;`
`462`	`454`	`if (scaledCastRadius > 0f)`
`463`	`455`	`{`