add: v5.2.0 experiments

colourfulspring · Feb 16, 2024 · c3e473b · c3e473b
1 parent c984c83
commit c3e473b
Show file tree

Hide file tree

Showing 17 changed files with 58 additions and 22 deletions.
diff --git a/Project/Assets/ML-Agents/Examples/CarCatching/Prefabs/CarAgentGridCollab.prefab b/Project/Assets/ML-Agents/Examples/CarCatching/Prefabs/CarAgentGridCollab.prefab
@@ -16,7 +16,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &2709359580712052713
 Transform:
   m_ObjectHideFlags: 0
@@ -47,7 +47,7 @@ MonoBehaviour:
   m_SensorName: GridSensor
   m_CellScale: {x: 10, y: 10, z: 10}
   m_GridSize: {x: 40, y: 1, z: 40}
-  m_RotateWithAgent: 1
+  m_RotateWithAgent: 0
   m_AgentGameObject: {fileID: 2710286047221272849}
   m_DetectableTags:
   - wall
@@ -366,7 +366,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_BrainParameters:
-    VectorObservationSize: 8
+    VectorObservationSize: 0
     NumStackedVectorObservations: 1
     m_ActionSpec:
       m_NumContinuousActions: 2

diff --git a/Project/Assets/ML-Agents/Examples/CarCatching/Prefabs/CarCatchingArea.prefab b/Project/Assets/ML-Agents/Examples/CarCatching/Prefabs/CarCatchingArea.prefab
@@ -184,11 +184,6 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 1581870063183487095}
     m_Modifications:
-    - target: {fileID: 1548337883655231979, guid: a431228058383324287911e110279f5a,
-        type: 3}
-      propertyPath: m_ShowGizmos
-      value: 1
-      objectReference: {fileID: 0}
     - target: {fileID: 2708762399863795223, guid: a431228058383324287911e110279f5a,
         type: 3}
       propertyPath: m_RootOrder
@@ -411,6 +406,11 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 1581870063183487095}
     m_Modifications:
+    - target: {fileID: 1548337883655231979, guid: a431228058383324287911e110279f5a,
+        type: 3}
+      propertyPath: m_ShowGizmos
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 2708762399863795223, guid: a431228058383324287911e110279f5a,
         type: 3}
       propertyPath: m_RootOrder
@@ -522,6 +522,11 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 1581870063183487095}
     m_Modifications:
+    - target: {fileID: 1548337883655231979, guid: a431228058383324287911e110279f5a,
+        type: 3}
+      propertyPath: m_ShowGizmos
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 2708762399863795223, guid: a431228058383324287911e110279f5a,
         type: 3}
       propertyPath: m_RootOrder
@@ -597,6 +602,12 @@ PrefabInstance:
       propertyPath: m_Enabled
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 8110157416270102484, guid: a431228058383324287911e110279f5a,
+        type: 3}
+      propertyPath: m_Model
+      value: 
+      objectReference: {fileID: 5022602860645237092, guid: 726ec16aea5d20ea395b545ac6d82435,
+        type: 3}
     - target: {fileID: 8110157416270102484, guid: a431228058383324287911e110279f5a,
         type: 3}
       propertyPath: m_BehaviorType

diff --git a/...atching/Prefabs/NavMesh-RealScene 1.asset → ...rCatching/Prefabs/NavMesh-RealScene.asset b/...atching/Prefabs/NavMesh-RealScene 1.asset → ...rCatching/Prefabs/NavMesh-RealScene.asset
diff --git a/...ng/Prefabs/NavMesh-RealScene 1.asset.meta → ...hing/Prefabs/NavMesh-RealScene.asset.meta b/...ng/Prefabs/NavMesh-RealScene 1.asset.meta → ...hing/Prefabs/NavMesh-RealScene.asset.meta
diff --git a/Project/Assets/ML-Agents/Examples/CarCatching/Prefabs/RealScene.prefab b/Project/Assets/ML-Agents/Examples/CarCatching/Prefabs/RealScene.prefab
@@ -37,7 +37,7 @@ Transform:
   - {fileID: 308845294073645104}
   - {fileID: 7942513896127864483}
   m_Father: {fileID: 0}
-  m_RootOrder: 0
+  m_RootOrder: -1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &9194218059880268
 MonoBehaviour:
@@ -68,7 +68,7 @@ MonoBehaviour:
   m_OverrideVoxelSize: 0
   m_VoxelSize: 7.6666665
   m_MinRegionArea: 2
-  m_NavMeshData: {fileID: 23800000, guid: e472e384e854dd4c79ba675e55051496, type: 2}
+  m_NavMeshData: {fileID: 23800000, guid: ae4d8b7a0942cd60b81208f464df8e05, type: 2}
   m_BuildHeightMesh: 0
 --- !u!1 &2377625989666082036
 GameObject:

diff --git a/Project/Assets/ML-Agents/Examples/CarCatching/Scripts/CarAgent.cs b/Project/Assets/ML-Agents/Examples/CarCatching/Scripts/CarAgent.cs
@@ -58,12 +58,12 @@ public override void CollectObservations(VectorSensor sensor)
         Debug.Log(this.transform.parent.gameObject.name +
                   ", " + this.name + "  CollectObservations: " + carCatchingEnvController.ResetTimer);
         Vector2[] obs = carCatchingEnvController.GetAgentPosObs(this);
-        foreach (var myobs in obs)
-        {
-            Debug.Log(this.transform.parent.gameObject.name +
-                      ", " + this.name + "  Observations: " + myobs);
-            sensor.AddObservation(myobs);
-        }
+        // foreach (var myobs in obs)
+        // {
+        //     Debug.Log(this.transform.parent.gameObject.name +
+        //               ", " + this.name + "  Observations: " + myobs);
+        //     sensor.AddObservation(myobs);
+        // }
         // sensor.AddOneHotObservation(2, 8);
     }
 

diff --git a/Project/Assets/ML-Agents/Examples/CarCatching/TorchModels/v5.0.0.onnx b/Project/Assets/ML-Agents/Examples/CarCatching/TorchModels/v5.0.0.onnx
diff --git a/Project/Assets/ML-Agents/Examples/CarCatching/TorchModels/v5.0.1.onnx b/Project/Assets/ML-Agents/Examples/CarCatching/TorchModels/v5.0.1.onnx
diff --git a/.../CarCatching/TorchModels/v5.0.0.onnx.meta → .../CarCatching/TorchModels/v5.0.1.onnx.meta b/.../CarCatching/TorchModels/v5.0.0.onnx.meta → .../CarCatching/TorchModels/v5.0.1.onnx.meta
diff --git a/Project/Assets/ML-Agents/Examples/CarCatching/TorchModels/v5.1.0.onnx b/Project/Assets/ML-Agents/Examples/CarCatching/TorchModels/v5.1.0.onnx
diff --git a/Project/Assets/ML-Agents/Examples/CarCatching/TorchModels/v5.1.0.onnx.meta b/Project/Assets/ML-Agents/Examples/CarCatching/TorchModels/v5.1.0.onnx.meta
diff --git a/Project/Assets/ML-Agents/Examples/NavMeshTest/Scenes/Floor.prefab b/Project/Assets/ML-Agents/Examples/NavMeshTest/Scenes/Floor.prefab
@@ -34,7 +34,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: -1
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &718127299357063990
 MeshFilter:
@@ -134,9 +134,9 @@ MonoBehaviour:
   m_OverrideTileSize: 0
   m_TileSize: 256
   m_OverrideVoxelSize: 0
-  m_VoxelSize: 7.3333335
+  m_VoxelSize: 3.3333333
   m_MinRegionArea: 2
-  m_NavMeshData: {fileID: 23800000, guid: 767051749d8e57f35865e979b2877671, type: 2}
+  m_NavMeshData: {fileID: 23800000, guid: 858817aa4f824e180a4a23ae2fdbd0b8, type: 2}
   m_BuildHeightMesh: 0
 --- !u!114 &5153898628670658174
 MonoBehaviour:

diff --git a/Project/Assets/ML-Agents/Examples/NavMeshTest/Scenes/NavMesh-Floor 1.asset b/Project/Assets/ML-Agents/Examples/NavMeshTest/Scenes/NavMesh-Floor 1.asset
diff --git a/Project/Assets/ML-Agents/Examples/NavMeshTest/Scenes/NavMesh-Floor 1.asset.meta b/Project/Assets/ML-Agents/Examples/NavMeshTest/Scenes/NavMesh-Floor 1.asset.meta
diff --git a/...evMeshTest-LargePlane/NavMesh-Floor.asset → ...es/NavMeshTest/Scenes/NavMesh-Floor.asset b/...evMeshTest-LargePlane/NavMesh-Floor.asset → ...es/NavMeshTest/Scenes/NavMesh-Floor.asset
diff --git a/...hTest-LargePlane/NavMesh-Floor.asset.meta → ...vMeshTest/Scenes/NavMesh-Floor.asset.meta b/...hTest-LargePlane/NavMesh-Floor.asset.meta → ...vMeshTest/Scenes/NavMesh-Floor.asset.meta
diff --git a/Project/Assets/ML-Agents/Examples/NavMeshTest/Scenes/NevMeshTest-LargePlane.prefab b/Project/Assets/ML-Agents/Examples/NavMeshTest/Scenes/NevMeshTest-LargePlane.prefab
@@ -55,6 +55,12 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 8198776141264093339}
     m_Modifications:
+    - target: {fileID: 1766586163764417171, guid: 72bb4f247b2a5a04190f880c753fce87,
+        type: 3}
+      propertyPath: m_NavMeshData
+      value: 
+      objectReference: {fileID: 23800000, guid: 8576add41dfd10590ac211632f6cea8a,
+        type: 2}
     - target: {fileID: 4576892308276798917, guid: 72bb4f247b2a5a04190f880c753fce87,
         type: 3}
       propertyPath: m_Name