Rename variables in Grid Sensor (#5217)

Author: Ruo-Ping Dong

Project/Assets/ML-Agents/Examples/FoodCollector/Prefabs/FoodCollectorArea.prefab

@@ -2308,16 +2308,16 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_SensorName: GridSensor
   m_CellScale: {x: 1, y: 0.01, z: 1}
-  m_GridNumSide: {x: 40, y: 1, z: 40}
+  m_GridSize: {x: 40, y: 1, z: 40}
   m_RotateWithAgent: 1
-  m_ChannelDepth: 06000000
+  m_ChannelDepths: 06000000
   m_DetectableObjects:
   - food
   - agent
   - wall
   - badFood
   - frozenAgent
-  m_ObserveMask:
+  m_ColliderMask:
     serializedVersion: 2
     m_Bits: 307
   m_DepthType: 1
@@ -2653,16 +2653,16 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_SensorName: GridSensor
   m_CellScale: {x: 1, y: 0.01, z: 1}
-  m_GridNumSide: {x: 40, y: 1, z: 40}
+  m_GridSize: {x: 40, y: 1, z: 40}
   m_RotateWithAgent: 1
-  m_ChannelDepth: 06000000
+  m_ChannelDepths: 06000000
   m_DetectableObjects:
   - food
   - agent
   - wall
   - badFood
   - frozenAgent
-  m_ObserveMask:
+  m_ColliderMask:
     serializedVersion: 2
     m_Bits: 307
   m_DepthType: 1
@@ -3003,16 +3003,16 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_SensorName: GridSensor
   m_CellScale: {x: 1, y: 0.01, z: 1}
-  m_GridNumSide: {x: 40, y: 1, z: 40}
+  m_GridSize: {x: 40, y: 1, z: 40}
   m_RotateWithAgent: 1
-  m_ChannelDepth: 06000000
+  m_ChannelDepths: 06000000
   m_DetectableObjects:
   - food
   - agent
   - wall
   - badFood
   - frozenAgent
-  m_ObserveMask:
+  m_ColliderMask:
     serializedVersion: 2
     m_Bits: 307
   m_DepthType: 1
@@ -3622,16 +3622,16 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_SensorName: GridSensor
   m_CellScale: {x: 1, y: 0.01, z: 1}
-  m_GridNumSide: {x: 40, y: 1, z: 40}
+  m_GridSize: {x: 40, y: 1, z: 40}
   m_RotateWithAgent: 1
-  m_ChannelDepth: 06000000
+  m_ChannelDepths: 06000000
   m_DetectableObjects:
   - food
   - agent
   - wall
   - badFood
   - frozenAgent
-  m_ObserveMask:
+  m_ColliderMask:
     serializedVersion: 2
     m_Bits: 307
   m_DepthType: 1
@@ -3958,16 +3958,16 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_SensorName: GridSensor
   m_CellScale: {x: 1, y: 0.01, z: 1}
-  m_GridNumSide: {x: 40, y: 1, z: 40}
+  m_GridSize: {x: 40, y: 1, z: 40}
   m_RotateWithAgent: 1
-  m_ChannelDepth: 06000000
+  m_ChannelDepths: 06000000
   m_DetectableObjects:
   - food
   - agent
   - wall
   - badFood
   - frozenAgent
-  m_ObserveMask:
+  m_ColliderMask:
     serializedVersion: 2
     m_Bits: 307
   m_DepthType: 1

com.unity.ml-agents.extensions/Editor/GridSensorComponentEditor.cs

@@ -26,10 +26,10 @@ public override void OnInspectorGUI()
                 EditorGUILayout.LabelField("Grid Settings", EditorStyles.boldLabel);
                 EditorGUILayout.PropertyField(so.FindProperty(nameof(GridSensorComponent.m_CellScale)), true);
                 // We only supports 2D GridSensor now so display gridNumSide as Vector2
-                var gridNumSide = so.FindProperty(nameof(GridSensorComponent.m_GridNumSide));
-                var gridNumSide2d = new Vector2Int(gridNumSide.vector3IntValue.x, gridNumSide.vector3IntValue.z);
-                var newGridNumSide = EditorGUILayout.Vector2IntField("Grid Num Side", gridNumSide2d);
-                gridNumSide.vector3IntValue = new Vector3Int(newGridNumSide.x, 1, newGridNumSide.y);
+                var gridSize = so.FindProperty(nameof(GridSensorComponent.m_GridSize));
+                var gridSize2d = new Vector2Int(gridSize.vector3IntValue.x, gridSize.vector3IntValue.z);
+                var newGridSize = EditorGUILayout.Vector2IntField("Grid Size", gridSize2d);
+                gridSize.vector3IntValue = new Vector3Int(newGridSize.x, 1, newGridSize.y);
                 EditorGUILayout.PropertyField(so.FindProperty(nameof(GridSensorComponent.m_RootReference)), true);
             }
             EditorGUI.EndDisabledGroup();
@@ -41,7 +41,7 @@ public override void OnInspectorGUI()
                 EditorGUILayout.PropertyField(so.FindProperty(nameof(GridSensorComponent.m_DepthType)), true);
 
                 // channel depth
-                var channelDepth = so.FindProperty(nameof(GridSensorComponent.m_ChannelDepth));
+                var channelDepth = so.FindProperty(nameof(GridSensorComponent.m_ChannelDepths));
                 var newDepth = EditorGUILayout.IntField("Channel Depth", channelDepth.arraySize);
                 if (newDepth != channelDepth.arraySize)
                 {
@@ -75,7 +75,7 @@ public override void OnInspectorGUI()
                 EditorGUILayout.PropertyField(so.FindProperty(nameof(GridSensorComponent.m_InitialColliderBufferSize)), true);
             }
             EditorGUI.EndDisabledGroup();
-            EditorGUILayout.PropertyField(so.FindProperty(nameof(GridSensorComponent.m_ObserveMask)), true);
+            EditorGUILayout.PropertyField(so.FindProperty(nameof(GridSensorComponent.m_ColliderMask)), true);
             EditorGUI.BeginDisabledGroup(!EditorUtilities.CanUpdateModelProperties());
             {
                 EditorGUILayout.LabelField("Sensor Settings", EditorStyles.boldLabel);