Use AddComponentMenu for MonoBehaviours (#3231)

Chris Elion · web-flow · commit 25f36978b158 · 2020-01-16T15:43:53.000-08:00
* Set AddComponentMenu for MonoBehaviours

* don't add Monitor

* pass componentOrder instead of nesting
diff --git a/UnitySDK/Assets/ML-Agents/Scripts/Constants.cs b/UnitySDK/Assets/ML-Agents/Scripts/Constants.cs
@@ -0,0 +1,11 @@
+namespace MLAgents
+{
+    /// <summary>
+    /// Grouping for use in AddComponentMenu (instead of nesting the menus).
+    /// </summary>
+    public enum MenuGroup
+    {
+        Default=0,
+        Sensors=50
+    }
+}
diff --git a/UnitySDK/Assets/ML-Agents/Scripts/Constants.cs.meta b/UnitySDK/Assets/ML-Agents/Scripts/Constants.cs.meta
diff --git a/UnitySDK/Assets/ML-Agents/Scripts/DemonstrationRecorder.cs b/UnitySDK/Assets/ML-Agents/Scripts/DemonstrationRecorder.cs
@@ -10,6 +10,7 @@ namespace MLAgents
     /// Demonstration Recorder Component.
     /// </summary>
     [RequireComponent(typeof(Agent))]
+    [AddComponentMenu("ML Agents/Demonstration Recorder", (int) MenuGroup.Default)]
     public class DemonstrationRecorder : MonoBehaviour
     {
         public bool record;
diff --git a/UnitySDK/Assets/ML-Agents/Scripts/Policy/BehaviorParameters.cs b/UnitySDK/Assets/ML-Agents/Scripts/Policy/BehaviorParameters.cs
@@ -9,6 +9,8 @@ namespace MLAgents
     /// <summary>
     /// The Factory to generate policies.
     /// </summary>
+    ///
+    [AddComponentMenu("ML Agents/Behavior Parameters", (int) MenuGroup.Default)]
     public class BehaviorParameters : MonoBehaviour
     {
 
diff --git a/UnitySDK/Assets/ML-Agents/Scripts/Sensor/CameraSensorComponent.cs b/UnitySDK/Assets/ML-Agents/Scripts/Sensor/CameraSensorComponent.cs
@@ -3,6 +3,7 @@
 
 namespace MLAgents.Sensor
 {
+    [AddComponentMenu("ML Agents/Camera Sensor", (int) MenuGroup.Sensors)]
     public class CameraSensorComponent : SensorComponent
     {
         public new Camera camera;
diff --git a/UnitySDK/Assets/ML-Agents/Scripts/Sensor/ISensor.cs b/UnitySDK/Assets/ML-Agents/Scripts/Sensor/ISensor.cs
@@ -75,5 +75,4 @@ public static int ObservationSize(this ISensor sensor)
             return count;
         }
     }
-
 }
diff --git a/UnitySDK/Assets/ML-Agents/Scripts/Sensor/RayPerceptionSensorComponent2D.cs b/UnitySDK/Assets/ML-Agents/Scripts/Sensor/RayPerceptionSensorComponent2D.cs
@@ -1,5 +1,8 @@
+using UnityEngine;
+
 namespace MLAgents.Sensor
 {
+    [AddComponentMenu("ML Agents/Ray Perception Sensor 2D", (int) MenuGroup.Sensors)]
     public class RayPerceptionSensorComponent2D : RayPerceptionSensorComponentBase
     {
         public override RayPerceptionSensor.CastType GetCastType()
diff --git a/UnitySDK/Assets/ML-Agents/Scripts/Sensor/RayPerceptionSensorComponent3D.cs b/UnitySDK/Assets/ML-Agents/Scripts/Sensor/RayPerceptionSensorComponent3D.cs
@@ -3,6 +3,7 @@
 
 namespace MLAgents.Sensor
 {
+    [AddComponentMenu("ML Agents/Ray Perception Sensor 3D", (int) MenuGroup.Sensors)]
     public class RayPerceptionSensorComponent3D : RayPerceptionSensorComponentBase
     {
         [Header("3D Properties", order = 100)]
diff --git a/UnitySDK/Assets/ML-Agents/Scripts/Sensor/RenderTextureSensorComponent.cs b/UnitySDK/Assets/ML-Agents/Scripts/Sensor/RenderTextureSensorComponent.cs
@@ -3,6 +3,7 @@
 
 namespace MLAgents.Sensor
 {
+    [AddComponentMenu("ML Agents/Render Texture Sensor", (int) MenuGroup.Sensors)]
     public class RenderTextureSensorComponent : SensorComponent
     {
         public RenderTexture renderTexture;

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ namespace MLAgents`
`10`	`10`	`/// Demonstration Recorder Component.`
`11`	`11`	`/// </summary>`
`12`	`12`	`[RequireComponent(typeof(Agent))]`
	`13`	`+ [AddComponentMenu("ML Agents/Demonstration Recorder", (int) MenuGroup.Default)]`
`13`	`14`	`public class DemonstrationRecorder : MonoBehaviour`
`14`	`15`	`{`
`15`	`16`	`public bool record;`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,8 @@ namespace MLAgents`
`9`	`9`	`/// <summary>`
`10`	`10`	`/// The Factory to generate policies.`
`11`	`11`	`/// </summary>`
	`12`	`+ ///`
	`13`	`+ [AddComponentMenu("ML Agents/Behavior Parameters", (int) MenuGroup.Default)]`
`12`	`14`	`public class BehaviorParameters : MonoBehaviour`
`13`	`15`	`{`
`14`	`16`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`
`4`	`4`	`namespace MLAgents.Sensor`
`5`	`5`	`{`
	`6`	`+ [AddComponentMenu("ML Agents/Camera Sensor", (int) MenuGroup.Sensors)]`
`6`	`7`	`public class CameraSensorComponent : SensorComponent`
`7`	`8`	`{`
`8`	`9`	`public new Camera camera;`
Original file line number	Diff line number	Diff line change
`@@ -75,5 +75,4 @@ public static int ObservationSize(this ISensor sensor)`
`75`	`75`	`return count;`
`76`	`76`	`}`
`77`	`77`	`}`
`78`		`-`
`79`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,8 @@`
	`1`	`+using UnityEngine;`
	`2`	`+`
`1`	`3`	`namespace MLAgents.Sensor`
`2`	`4`	`{`
	`5`	`+ [AddComponentMenu("ML Agents/Ray Perception Sensor 2D", (int) MenuGroup.Sensors)]`
`3`	`6`	`public class RayPerceptionSensorComponent2D : RayPerceptionSensorComponentBase`
`4`	`7`	`{`
`5`	`8`	`public override RayPerceptionSensor.CastType GetCastType()`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`
`4`	`4`	`namespace MLAgents.Sensor`
`5`	`5`	`{`
	`6`	`+ [AddComponentMenu("ML Agents/Render Texture Sensor", (int) MenuGroup.Sensors)]`
`6`	`7`	`public class RenderTextureSensorComponent : SensorComponent`
`7`	`8`	`{`
`8`	`9`	`public RenderTexture renderTexture;`