Skip to content

Commit 30fc6bd

Browse files
author
Ruo-Ping Dong
authored
Move GridSensor into main package (#5256)
* move OneHotGridSensor into main package * changelog and migration guide * remove old doc * check if physics module presents
1 parent 4015dac commit 30fc6bd

36 files changed

+322
-571
lines changed

Project/Assets/ML-Agents/Examples/PushBlock/Prefabs/PushBlockAgentGridCollab.prefab

Lines changed: 31 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ GameObject:
99
serializedVersion: 6
1010
m_Component:
1111
- component: {fileID: 2709359580712052713}
12-
- component: {fileID: 2709359580712052712}
12+
- component: {fileID: 1548337883655231979}
1313
m_Layer: 0
1414
m_Name: GridSensor
1515
m_TagString: Untagged
@@ -31,7 +31,7 @@ Transform:
3131
m_Father: {fileID: 2708762399863795223}
3232
m_RootOrder: 1
3333
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
34-
--- !u!114 &2709359580712052712
34+
--- !u!114 &1548337883655231979
3535
MonoBehaviour:
3636
m_ObjectHideFlags: 0
3737
m_CorrespondingSourceObject: {fileID: 0}
@@ -40,44 +40,36 @@ MonoBehaviour:
4040
m_GameObject: {fileID: 2709359580712052714}
4141
m_Enabled: 1
4242
m_EditorHideFlags: 0
43-
m_Script: {fileID: 11500000, guid: 801669c0cdece6b40b2e741ad0b119ac, type: 3}
43+
m_Script: {fileID: 11500000, guid: 2a501962d056745d1a30e99146ee39fe, type: 3}
4444
m_Name:
4545
m_EditorClassIdentifier:
46-
Name: AgentGrid
47-
CellScaleX: 1
48-
CellScaleZ: 1
49-
GridNumSideX: 20
50-
GridNumSideZ: 20
51-
CellScaleY: 0.5
52-
RotateToAgent: 1
53-
ChannelDepth: 07000000
54-
DetectableObjects:
46+
m_SensorName: GridSensor
47+
m_CellScale: {x: 1, y: 0.5, z: 1}
48+
m_GridSize: {x: 20, y: 1, z: 20}
49+
m_RotateWithAgent: 1
50+
m_DetectableTags:
5551
- wall
5652
- agent
5753
- goal
5854
- blockSmall
5955
- blockLarge
6056
- blockVeryLarge
61-
ObserveMask:
57+
m_ColliderMask:
6258
serializedVersion: 2
6359
m_Bits: 1
64-
gridDepthType: 1
65-
rootReference: {fileID: 2710286047221272849}
66-
MaxColliderBufferSize: 500
67-
InitialColliderBufferSize: 16
68-
ObservationPerCell: 7
69-
NumberOfObservations: 2800
70-
ChannelOffsets: 00000000
71-
DebugColors:
60+
m_MaxColliderBufferSize: 500
61+
m_InitialColliderBufferSize: 16
62+
m_DebugColors:
7263
- {r: 0, g: 0, b: 0, a: 0}
73-
- {r: 0, g: 0.51824737, b: 1, a: 1}
74-
- {r: 0.4680206, g: 0.7058824, b: 0.35155708, a: 1}
75-
- {r: 1, g: 0.99570733, b: 0.984, a: 1}
76-
- {r: 0.4811321, g: 0.4811321, b: 0.4811321, a: 1}
77-
- {r: 0.3584906, g: 0.3584906, b: 0.3584906, a: 0}
78-
GizmoYOffset: 0
79-
ShowGizmos: 0
80-
CompressionType: 1
64+
- {r: 0, g: 0.5176471, b: 1, a: 0}
65+
- {r: 0.46666667, g: 0.7058824, b: 0.3529412, a: 0}
66+
- {r: 1, g: 0.99607843, b: 0.9843137, a: 0}
67+
- {r: 0.48235294, g: 0.48235294, b: 0.48235294, a: 0}
68+
- {r: 0.35686275, g: 0.35686275, b: 0.35686275, a: 0}
69+
m_GizmoYOffset: 0
70+
m_ShowGizmos: 0
71+
m_CompressionType: 1
72+
m_ObservationStacks: 1
8173
--- !u!1 &2709573194145405553
8274
GameObject:
8375
m_ObjectHideFlags: 0
@@ -132,6 +124,7 @@ MeshRenderer:
132124
m_MotionVectors: 1
133125
m_LightProbeUsage: 1
134126
m_ReflectionProbeUsage: 1
127+
m_RayTracingMode: 2
135128
m_RenderingLayerMask: 1
136129
m_RendererPriority: 0
137130
m_Materials:
@@ -143,6 +136,7 @@ MeshRenderer:
143136
m_ProbeAnchor: {fileID: 0}
144137
m_LightProbeVolumeOverride: {fileID: 0}
145138
m_ScaleInLightmap: 1
139+
m_ReceiveGI: 1
146140
m_PreserveUVs: 1
147141
m_IgnoreNormalsForChartDetection: 0
148142
m_ImportantGI: 0
@@ -209,6 +203,7 @@ MeshRenderer:
209203
m_MotionVectors: 1
210204
m_LightProbeUsage: 1
211205
m_ReflectionProbeUsage: 1
206+
m_RayTracingMode: 2
212207
m_RenderingLayerMask: 1
213208
m_RendererPriority: 0
214209
m_Materials:
@@ -220,6 +215,7 @@ MeshRenderer:
220215
m_ProbeAnchor: {fileID: 0}
221216
m_LightProbeVolumeOverride: {fileID: 0}
222217
m_ScaleInLightmap: 1
218+
m_ReceiveGI: 1
223219
m_PreserveUVs: 1
224220
m_IgnoreNormalsForChartDetection: 0
225221
m_ImportantGI: 0
@@ -286,6 +282,7 @@ MeshRenderer:
286282
m_MotionVectors: 1
287283
m_LightProbeUsage: 1
288284
m_ReflectionProbeUsage: 1
285+
m_RayTracingMode: 2
289286
m_RenderingLayerMask: 1
290287
m_RendererPriority: 0
291288
m_Materials:
@@ -297,6 +294,7 @@ MeshRenderer:
297294
m_ProbeAnchor: {fileID: 0}
298295
m_LightProbeVolumeOverride: {fileID: 0}
299296
m_ScaleInLightmap: 1
297+
m_ReceiveGI: 1
300298
m_PreserveUVs: 1
301299
m_IgnoreNormalsForChartDetection: 0
302300
m_ImportantGI: 0
@@ -532,6 +530,7 @@ MeshRenderer:
532530
m_MotionVectors: 1
533531
m_LightProbeUsage: 1
534532
m_ReflectionProbeUsage: 1
533+
m_RayTracingMode: 2
535534
m_RenderingLayerMask: 1
536535
m_RendererPriority: 0
537536
m_Materials:
@@ -543,6 +542,7 @@ MeshRenderer:
543542
m_ProbeAnchor: {fileID: 0}
544543
m_LightProbeVolumeOverride: {fileID: 0}
545544
m_ScaleInLightmap: 1
545+
m_ReceiveGI: 1
546546
m_PreserveUVs: 1
547547
m_IgnoreNormalsForChartDetection: 0
548548
m_ImportantGI: 0
@@ -609,6 +609,7 @@ MeshRenderer:
609609
m_MotionVectors: 1
610610
m_LightProbeUsage: 1
611611
m_ReflectionProbeUsage: 1
612+
m_RayTracingMode: 2
612613
m_RenderingLayerMask: 1
613614
m_RendererPriority: 0
614615
m_Materials:
@@ -620,6 +621,7 @@ MeshRenderer:
620621
m_ProbeAnchor: {fileID: 0}
621622
m_LightProbeVolumeOverride: {fileID: 0}
622623
m_ScaleInLightmap: 1
624+
m_ReceiveGI: 1
623625
m_PreserveUVs: 1
624626
m_IgnoreNormalsForChartDetection: 0
625627
m_ImportantGI: 0

Project/Assets/ML-Agents/Examples/PushBlock/Prefabs/PushBlockCollabAreaGrid.prefab

Lines changed: 0 additions & 141 deletions
Original file line numberDiff line numberDiff line change
@@ -1486,47 +1486,6 @@ MonoBehaviour:
14861486
onTriggerExitEvent:
14871487
m_PersistentCalls:
14881488
m_Calls: []
1489-
--- !u!114 &1809664679221531284
1490-
MonoBehaviour:
1491-
m_ObjectHideFlags: 0
1492-
m_CorrespondingSourceObject: {fileID: 0}
1493-
m_PrefabInstance: {fileID: 0}
1494-
m_PrefabAsset: {fileID: 0}
1495-
m_GameObject: {fileID: 8191066182862526894}
1496-
m_Enabled: 1
1497-
m_EditorHideFlags: 0
1498-
m_Script: {fileID: 11500000, guid: 2a501962d056745d1a30e99146ee39fe, type: 3}
1499-
m_Name:
1500-
m_EditorClassIdentifier:
1501-
m_SensorName: GridSensor
1502-
m_CellScale: {x: 1, y: 0.01, z: 1}
1503-
m_GridSize: {x: 20, y: 1, z: 20}
1504-
m_RotateWithAgent: 1
1505-
m_DetectableTags:
1506-
- wall
1507-
- agent
1508-
- goal
1509-
- blockSmall
1510-
- blockLarge
1511-
- blockVeryLarge
1512-
m_ColliderMask:
1513-
serializedVersion: 2
1514-
m_Bits: 1
1515-
m_MaxColliderBufferSize: 500
1516-
m_InitialColliderBufferSize: 16
1517-
m_DebugColors:
1518-
- {r: 0, g: 0, b: 0, a: 0}
1519-
- {r: 0, g: 0.5176471, b: 1, a: 0}
1520-
- {r: 0.46666667, g: 0.7058824, b: 0.3529412, a: 0}
1521-
- {r: 1, g: 0.99607843, b: 0.9843137, a: 0}
1522-
- {r: 0.48235294, g: 0.48235294, b: 0.48235294, a: 0}
1523-
- {r: 0.35686275, g: 0.35686275, b: 0.35686275, a: 0}
1524-
m_GizmoYOffset: 0
1525-
m_ShowGizmos: 0
1526-
m_CompressionType: 1
1527-
m_ObservationStacks: 1
1528-
m_UseOneHotTag: 1
1529-
m_CountColliders: 0
15301489
--- !u!1 &8191066182918326564
15311490
GameObject:
15321491
m_ObjectHideFlags: 0
@@ -2214,47 +2173,6 @@ MonoBehaviour:
22142173
UseRandomAgentPosition: 1
22152174
UseRandomBlockRotation: 1
22162175
UseRandomBlockPosition: 1
2217-
--- !u!114 &4609315540733531199
2218-
MonoBehaviour:
2219-
m_ObjectHideFlags: 0
2220-
m_CorrespondingSourceObject: {fileID: 0}
2221-
m_PrefabInstance: {fileID: 0}
2222-
m_PrefabAsset: {fileID: 0}
2223-
m_GameObject: {fileID: 8696048509000480032}
2224-
m_Enabled: 1
2225-
m_EditorHideFlags: 0
2226-
m_Script: {fileID: 11500000, guid: 2a501962d056745d1a30e99146ee39fe, type: 3}
2227-
m_Name:
2228-
m_EditorClassIdentifier:
2229-
m_SensorName: GridSensor
2230-
m_CellScale: {x: 1, y: 0.01, z: 1}
2231-
m_GridSize: {x: 20, y: 1, z: 20}
2232-
m_RotateWithAgent: 1
2233-
m_DetectableTags:
2234-
- wall
2235-
- agent
2236-
- goal
2237-
- blockSmall
2238-
- blockLarge
2239-
- blockVeryLarge
2240-
m_ColliderMask:
2241-
serializedVersion: 2
2242-
m_Bits: 1
2243-
m_MaxColliderBufferSize: 500
2244-
m_InitialColliderBufferSize: 16
2245-
m_DebugColors:
2246-
- {r: 0, g: 0, b: 0, a: 0}
2247-
- {r: 0, g: 0.5176471, b: 1, a: 0}
2248-
- {r: 0.46666667, g: 0.7058824, b: 0.3529412, a: 0}
2249-
- {r: 1, g: 0.99607843, b: 0.9843137, a: 0}
2250-
- {r: 0.48235294, g: 0.48235294, b: 0.48235294, a: 0}
2251-
- {r: 0.35686275, g: 0.35686275, b: 0.35686275, a: 0}
2252-
m_GizmoYOffset: 0
2253-
m_ShowGizmos: 0
2254-
m_CompressionType: 1
2255-
m_ObservationStacks: 1
2256-
m_UseOneHotTag: 1
2257-
m_CountColliders: 0
22582176
--- !u!1 &8821353056066081524
22592177
GameObject:
22602178
m_ObjectHideFlags: 0
@@ -2336,47 +2254,6 @@ MonoBehaviour:
23362254
m_FallbackScreenDPI: 96
23372255
m_DefaultSpriteDPI: 96
23382256
m_DynamicPixelsPerUnit: 1
2339-
--- !u!114 &6319243058783963332
2340-
MonoBehaviour:
2341-
m_ObjectHideFlags: 0
2342-
m_CorrespondingSourceObject: {fileID: 0}
2343-
m_PrefabInstance: {fileID: 0}
2344-
m_PrefabAsset: {fileID: 0}
2345-
m_GameObject: {fileID: 9116780590443581137}
2346-
m_Enabled: 1
2347-
m_EditorHideFlags: 0
2348-
m_Script: {fileID: 11500000, guid: 2a501962d056745d1a30e99146ee39fe, type: 3}
2349-
m_Name:
2350-
m_EditorClassIdentifier:
2351-
m_SensorName: GridSensor
2352-
m_CellScale: {x: 1, y: 0.01, z: 1}
2353-
m_GridSize: {x: 20, y: 1, z: 20}
2354-
m_RotateWithAgent: 1
2355-
m_DetectableTags:
2356-
- wall
2357-
- agent
2358-
- goal
2359-
- blockSmall
2360-
- blockLarge
2361-
- blockVeryLarge
2362-
m_ColliderMask:
2363-
serializedVersion: 2
2364-
m_Bits: 1
2365-
m_MaxColliderBufferSize: 500
2366-
m_InitialColliderBufferSize: 16
2367-
m_DebugColors:
2368-
- {r: 0, g: 0, b: 0, a: 0}
2369-
- {r: 0, g: 0.5176471, b: 1, a: 0}
2370-
- {r: 0.46666667, g: 0.7058824, b: 0.3529412, a: 0}
2371-
- {r: 1, g: 0.99607843, b: 0.9843137, a: 0}
2372-
- {r: 0.48235294, g: 0.48235294, b: 0.48235294, a: 0}
2373-
- {r: 0.35686275, g: 0.35686275, b: 0.35686275, a: 0}
2374-
m_GizmoYOffset: 0
2375-
m_ShowGizmos: 0
2376-
m_CompressionType: 1
2377-
m_ObservationStacks: 1
2378-
m_UseOneHotTag: 1
2379-
m_CountColliders: 0
23802257
--- !u!1001 &6067781793364901444
23812258
PrefabInstance:
23822259
m_ObjectHideFlags: 0
@@ -2453,12 +2330,6 @@ PrefabInstance:
24532330
m_RemovedComponents:
24542331
- {fileID: 2709359580712052712, guid: ac01d0f42c5e1463e943632a60d99967, type: 3}
24552332
m_SourcePrefab: {fileID: 100100000, guid: ac01d0f42c5e1463e943632a60d99967, type: 3}
2456-
--- !u!1 &8191066182862526894 stripped
2457-
GameObject:
2458-
m_CorrespondingSourceObject: {fileID: 2709359580712052714, guid: ac01d0f42c5e1463e943632a60d99967,
2459-
type: 3}
2460-
m_PrefabInstance: {fileID: 6067781793364901444}
2461-
m_PrefabAsset: {fileID: 0}
24622333
--- !u!114 &8190299122290044756 stripped
24632334
MonoBehaviour:
24642335
m_CorrespondingSourceObject: {fileID: 2710286047221272848, guid: ac01d0f42c5e1463e943632a60d99967,
@@ -2558,12 +2429,6 @@ PrefabInstance:
25582429
m_RemovedComponents:
25592430
- {fileID: 2709359580712052712, guid: ac01d0f42c5e1463e943632a60d99967, type: 3}
25602431
m_SourcePrefab: {fileID: 100100000, guid: ac01d0f42c5e1463e943632a60d99967, type: 3}
2561-
--- !u!1 &9116780590443581137 stripped
2562-
GameObject:
2563-
m_CorrespondingSourceObject: {fileID: 2709359580712052714, guid: ac01d0f42c5e1463e943632a60d99967,
2564-
type: 3}
2565-
m_PrefabInstance: {fileID: 6565363751102736699}
2566-
m_PrefabAsset: {fileID: 0}
25672432
--- !u!114 &9115291448867436587 stripped
25682433
MonoBehaviour:
25692434
m_CorrespondingSourceObject: {fileID: 2710286047221272848, guid: ac01d0f42c5e1463e943632a60d99967,
@@ -2663,12 +2528,6 @@ PrefabInstance:
26632528
m_RemovedComponents:
26642529
- {fileID: 2709359580712052712, guid: ac01d0f42c5e1463e943632a60d99967, type: 3}
26652530
m_SourcePrefab: {fileID: 100100000, guid: ac01d0f42c5e1463e943632a60d99967, type: 3}
2666-
--- !u!1 &8696048509000480032 stripped
2667-
GameObject:
2668-
m_CorrespondingSourceObject: {fileID: 2709359580712052714, guid: ac01d0f42c5e1463e943632a60d99967,
2669-
type: 3}
2670-
m_PrefabInstance: {fileID: 6716844123244810954}
2671-
m_PrefabAsset: {fileID: 0}
26722531
--- !u!114 &8695281997955662810 stripped
26732532
MonoBehaviour:
26742533
m_CorrespondingSourceObject: {fileID: 2710286047221272848, guid: ac01d0f42c5e1463e943632a60d99967,

0 commit comments

Comments
 (0)