Add collsion layers and group to disable NPC collisions with robots

Signed-off-by: Michał Pełka <[email protected]>
RobotecAI · Oct 2, 2024 · 2883752 · 2883752
1 parent 5a0dab2
commit 2883752
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 6 deletions.
diff --git a/Project/Prefabs/Features/HumanNavigation.prefab b/Project/Prefabs/Features/HumanNavigation.prefab
@@ -1226,9 +1226,9 @@
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/TransformComponent/Transform Data/Translate/1",
-                    "value": 10.576000213623047
+                    "value": 10.576000213623049
                 }
             ]
         }
     }
-}
+}
diff --git a/Project/Registry/physxsystemconfiguration.setreg b/Project/Registry/physxsystemconfiguration.setreg
@@ -10,8 +10,8 @@
                                 "Default",
                                 "Navigation",
                                 "Lidar",
-                                {},
-                                {},
+                                "NPCs",
+                                "Ground",
                                 {},
                                 {},
                                 {},
@@ -106,6 +106,15 @@
                                     "Group": {
                                         "Mask": 18446744073709551613
                                     }
+                                },
+                                {
+                                    "Id": {
+                                        "GroupId": "{72AB7AF0-F57A-4DA8-8498-3DBCF3789BAE}"
+                                    },
+                                    "Name": "NPCGroup",
+                                    "Group": {
+                                        "Mask": 18446744073709551608
+                                    }
                                 }
                             ]
                         }
@@ -114,4 +123,4 @@
             }
         }
     }
-}
+}
diff --git a/Project/Registry/sim_config.setreg b/Project/Registry/sim_config.setreg
@@ -0,0 +1,18 @@
+{
+
+    "O3DE":
+    {
+        "InputSystem":
+        {
+            "Mouse":
+            {
+                "CaptureMouseCursor": false
+            }
+        },
+        "ROS2":
+        {
+            "SteadyClock" : true
+        }
+
+    }
+}
diff --git a/ros2_ws/src/Universal_Robots_ROS2_Driver b/ros2_ws/src/Universal_Robots_ROS2_Driver