Move GridSensor into main package (#5256)

* move OneHotGridSensor into main package * changelog and migration guide * remove old doc * check if physics module presents
Unity-Technologies · Apr 14, 2021 · 30fc6bd · 30fc6bd
1 parent 4015dac
commit 30fc6bd
Show file tree

Hide file tree

Showing 36 changed files with 322 additions and 571 deletions.
diff --git a/Project/Assets/ML-Agents/Examples/PushBlock/Prefabs/PushBlockAgentGridCollab.prefab b/Project/Assets/ML-Agents/Examples/PushBlock/Prefabs/PushBlockAgentGridCollab.prefab
@@ -9,7 +9,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 2709359580712052713}
-  - component: {fileID: 2709359580712052712}
+  - component: {fileID: 1548337883655231979}
   m_Layer: 0
   m_Name: GridSensor
   m_TagString: Untagged
@@ -31,7 +31,7 @@ Transform:
   m_Father: {fileID: 2708762399863795223}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &2709359580712052712
+--- !u!114 &1548337883655231979
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -40,44 +40,36 @@ MonoBehaviour:
   m_GameObject: {fileID: 2709359580712052714}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 801669c0cdece6b40b2e741ad0b119ac, type: 3}
+  m_Script: {fileID: 11500000, guid: 2a501962d056745d1a30e99146ee39fe, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  Name: AgentGrid
-  CellScaleX: 1
-  CellScaleZ: 1
-  GridNumSideX: 20
-  GridNumSideZ: 20
-  CellScaleY: 0.5
-  RotateToAgent: 1
-  ChannelDepth: 07000000
-  DetectableObjects:
+  m_SensorName: GridSensor
+  m_CellScale: {x: 1, y: 0.5, z: 1}
+  m_GridSize: {x: 20, y: 1, z: 20}
+  m_RotateWithAgent: 1
+  m_DetectableTags:
   - wall
   - agent
   - goal
   - blockSmall
   - blockLarge
   - blockVeryLarge
-  ObserveMask:
+  m_ColliderMask:
     serializedVersion: 2
     m_Bits: 1
-  gridDepthType: 1
-  rootReference: {fileID: 2710286047221272849}
-  MaxColliderBufferSize: 500
-  InitialColliderBufferSize: 16
-  ObservationPerCell: 7
-  NumberOfObservations: 2800
-  ChannelOffsets: 00000000
-  DebugColors:
+  m_MaxColliderBufferSize: 500
+  m_InitialColliderBufferSize: 16
+  m_DebugColors:
   - {r: 0, g: 0, b: 0, a: 0}
-  - {r: 0, g: 0.51824737, b: 1, a: 1}
-  - {r: 0.4680206, g: 0.7058824, b: 0.35155708, a: 1}
-  - {r: 1, g: 0.99570733, b: 0.984, a: 1}
-  - {r: 0.4811321, g: 0.4811321, b: 0.4811321, a: 1}
-  - {r: 0.3584906, g: 0.3584906, b: 0.3584906, a: 0}
-  GizmoYOffset: 0
-  ShowGizmos: 0
-  CompressionType: 1
+  - {r: 0, g: 0.5176471, b: 1, a: 0}
+  - {r: 0.46666667, g: 0.7058824, b: 0.3529412, a: 0}
+  - {r: 1, g: 0.99607843, b: 0.9843137, a: 0}
+  - {r: 0.48235294, g: 0.48235294, b: 0.48235294, a: 0}
+  - {r: 0.35686275, g: 0.35686275, b: 0.35686275, a: 0}
+  m_GizmoYOffset: 0
+  m_ShowGizmos: 0
+  m_CompressionType: 1
+  m_ObservationStacks: 1
 --- !u!1 &2709573194145405553
 GameObject:
   m_ObjectHideFlags: 0
@@ -132,6 +124,7 @@ MeshRenderer:
   m_MotionVectors: 1
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -143,6 +136,7 @@ MeshRenderer:
   m_ProbeAnchor: {fileID: 0}
   m_LightProbeVolumeOverride: {fileID: 0}
   m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
   m_PreserveUVs: 1
   m_IgnoreNormalsForChartDetection: 0
   m_ImportantGI: 0
@@ -209,6 +203,7 @@ MeshRenderer:
   m_MotionVectors: 1
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -220,6 +215,7 @@ MeshRenderer:
   m_ProbeAnchor: {fileID: 0}
   m_LightProbeVolumeOverride: {fileID: 0}
   m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
   m_PreserveUVs: 1
   m_IgnoreNormalsForChartDetection: 0
   m_ImportantGI: 0
@@ -286,6 +282,7 @@ MeshRenderer:
   m_MotionVectors: 1
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -297,6 +294,7 @@ MeshRenderer:
   m_ProbeAnchor: {fileID: 0}
   m_LightProbeVolumeOverride: {fileID: 0}
   m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
   m_PreserveUVs: 1
   m_IgnoreNormalsForChartDetection: 0
   m_ImportantGI: 0
@@ -532,6 +530,7 @@ MeshRenderer:
   m_MotionVectors: 1
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -543,6 +542,7 @@ MeshRenderer:
   m_ProbeAnchor: {fileID: 0}
   m_LightProbeVolumeOverride: {fileID: 0}
   m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
   m_PreserveUVs: 1
   m_IgnoreNormalsForChartDetection: 0
   m_ImportantGI: 0
@@ -609,6 +609,7 @@ MeshRenderer:
   m_MotionVectors: 1
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -620,6 +621,7 @@ MeshRenderer:
   m_ProbeAnchor: {fileID: 0}
   m_LightProbeVolumeOverride: {fileID: 0}
   m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
   m_PreserveUVs: 1
   m_IgnoreNormalsForChartDetection: 0
   m_ImportantGI: 0

diff --git a/Project/Assets/ML-Agents/Examples/PushBlock/Prefabs/PushBlockCollabAreaGrid.prefab b/Project/Assets/ML-Agents/Examples/PushBlock/Prefabs/PushBlockCollabAreaGrid.prefab
@@ -1486,47 +1486,6 @@ MonoBehaviour:
   onTriggerExitEvent:
     m_PersistentCalls:
       m_Calls: []
---- !u!114 &1809664679221531284
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8191066182862526894}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 2a501962d056745d1a30e99146ee39fe, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_SensorName: GridSensor
-  m_CellScale: {x: 1, y: 0.01, z: 1}
-  m_GridSize: {x: 20, y: 1, z: 20}
-  m_RotateWithAgent: 1
-  m_DetectableTags:
-  - wall
-  - agent
-  - goal
-  - blockSmall
-  - blockLarge
-  - blockVeryLarge
-  m_ColliderMask:
-    serializedVersion: 2
-    m_Bits: 1
-  m_MaxColliderBufferSize: 500
-  m_InitialColliderBufferSize: 16
-  m_DebugColors:
-  - {r: 0, g: 0, b: 0, a: 0}
-  - {r: 0, g: 0.5176471, b: 1, a: 0}
-  - {r: 0.46666667, g: 0.7058824, b: 0.3529412, a: 0}
-  - {r: 1, g: 0.99607843, b: 0.9843137, a: 0}
-  - {r: 0.48235294, g: 0.48235294, b: 0.48235294, a: 0}
-  - {r: 0.35686275, g: 0.35686275, b: 0.35686275, a: 0}
-  m_GizmoYOffset: 0
-  m_ShowGizmos: 0
-  m_CompressionType: 1
-  m_ObservationStacks: 1
-  m_UseOneHotTag: 1
-  m_CountColliders: 0
 --- !u!1 &8191066182918326564
 GameObject:
   m_ObjectHideFlags: 0
@@ -2214,47 +2173,6 @@ MonoBehaviour:
   UseRandomAgentPosition: 1
   UseRandomBlockRotation: 1
   UseRandomBlockPosition: 1
---- !u!114 &4609315540733531199
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8696048509000480032}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 2a501962d056745d1a30e99146ee39fe, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_SensorName: GridSensor
-  m_CellScale: {x: 1, y: 0.01, z: 1}
-  m_GridSize: {x: 20, y: 1, z: 20}
-  m_RotateWithAgent: 1
-  m_DetectableTags:
-  - wall
-  - agent
-  - goal
-  - blockSmall
-  - blockLarge
-  - blockVeryLarge
-  m_ColliderMask:
-    serializedVersion: 2
-    m_Bits: 1
-  m_MaxColliderBufferSize: 500
-  m_InitialColliderBufferSize: 16
-  m_DebugColors:
-  - {r: 0, g: 0, b: 0, a: 0}
-  - {r: 0, g: 0.5176471, b: 1, a: 0}
-  - {r: 0.46666667, g: 0.7058824, b: 0.3529412, a: 0}
-  - {r: 1, g: 0.99607843, b: 0.9843137, a: 0}
-  - {r: 0.48235294, g: 0.48235294, b: 0.48235294, a: 0}
-  - {r: 0.35686275, g: 0.35686275, b: 0.35686275, a: 0}
-  m_GizmoYOffset: 0
-  m_ShowGizmos: 0
-  m_CompressionType: 1
-  m_ObservationStacks: 1
-  m_UseOneHotTag: 1
-  m_CountColliders: 0
 --- !u!1 &8821353056066081524
 GameObject:
   m_ObjectHideFlags: 0
@@ -2336,47 +2254,6 @@ MonoBehaviour:
   m_FallbackScreenDPI: 96
   m_DefaultSpriteDPI: 96
   m_DynamicPixelsPerUnit: 1
---- !u!114 &6319243058783963332
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9116780590443581137}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 2a501962d056745d1a30e99146ee39fe, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_SensorName: GridSensor
-  m_CellScale: {x: 1, y: 0.01, z: 1}
-  m_GridSize: {x: 20, y: 1, z: 20}
-  m_RotateWithAgent: 1
-  m_DetectableTags:
-  - wall
-  - agent
-  - goal
-  - blockSmall
-  - blockLarge
-  - blockVeryLarge
-  m_ColliderMask:
-    serializedVersion: 2
-    m_Bits: 1
-  m_MaxColliderBufferSize: 500
-  m_InitialColliderBufferSize: 16
-  m_DebugColors:
-  - {r: 0, g: 0, b: 0, a: 0}
-  - {r: 0, g: 0.5176471, b: 1, a: 0}
-  - {r: 0.46666667, g: 0.7058824, b: 0.3529412, a: 0}
-  - {r: 1, g: 0.99607843, b: 0.9843137, a: 0}
-  - {r: 0.48235294, g: 0.48235294, b: 0.48235294, a: 0}
-  - {r: 0.35686275, g: 0.35686275, b: 0.35686275, a: 0}
-  m_GizmoYOffset: 0
-  m_ShowGizmos: 0
-  m_CompressionType: 1
-  m_ObservationStacks: 1
-  m_UseOneHotTag: 1
-  m_CountColliders: 0
 --- !u!1001 &6067781793364901444
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -2453,12 +2330,6 @@ PrefabInstance:
     m_RemovedComponents:
     - {fileID: 2709359580712052712, guid: ac01d0f42c5e1463e943632a60d99967, type: 3}
   m_SourcePrefab: {fileID: 100100000, guid: ac01d0f42c5e1463e943632a60d99967, type: 3}
---- !u!1 &8191066182862526894 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 2709359580712052714, guid: ac01d0f42c5e1463e943632a60d99967,
-    type: 3}
-  m_PrefabInstance: {fileID: 6067781793364901444}
-  m_PrefabAsset: {fileID: 0}
 --- !u!114 &8190299122290044756 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 2710286047221272848, guid: ac01d0f42c5e1463e943632a60d99967,
@@ -2558,12 +2429,6 @@ PrefabInstance:
     m_RemovedComponents:
     - {fileID: 2709359580712052712, guid: ac01d0f42c5e1463e943632a60d99967, type: 3}
   m_SourcePrefab: {fileID: 100100000, guid: ac01d0f42c5e1463e943632a60d99967, type: 3}
---- !u!1 &9116780590443581137 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 2709359580712052714, guid: ac01d0f42c5e1463e943632a60d99967,
-    type: 3}
-  m_PrefabInstance: {fileID: 6565363751102736699}
-  m_PrefabAsset: {fileID: 0}
 --- !u!114 &9115291448867436587 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 2710286047221272848, guid: ac01d0f42c5e1463e943632a60d99967,
@@ -2663,12 +2528,6 @@ PrefabInstance:
     m_RemovedComponents:
     - {fileID: 2709359580712052712, guid: ac01d0f42c5e1463e943632a60d99967, type: 3}
   m_SourcePrefab: {fileID: 100100000, guid: ac01d0f42c5e1463e943632a60d99967, type: 3}
---- !u!1 &8696048509000480032 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 2709359580712052714, guid: ac01d0f42c5e1463e943632a60d99967,
-    type: 3}
-  m_PrefabInstance: {fileID: 6716844123244810954}
-  m_PrefabAsset: {fileID: 0}
 --- !u!114 &8695281997955662810 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 2710286047221272848, guid: ac01d0f42c5e1463e943632a60d99967,