Merge commit '29980613b16128eed4a446c9815dc6bc98c0a8fa' into wjunhao/…

…gitflow_230425_o3de_extras Signed-off-by: Junhao Wang <[email protected]>
o3de · Apr 25, 2023 · aedec80 · aedec80
2 parents df57dcc + 2998061
commit aedec80
Show file tree

Hide file tree

Showing 9 changed files with 1,964 additions and 713 deletions.
diff --git a/Gems/RosRobotSample/Assets/ROSBot_slamtec.prefab b/Gems/RosRobotSample/Assets/ROSBot_slamtec.prefab
diff --git a/Gems/RosRobotSample/Assets/ROSbot.prefab b/Gems/RosRobotSample/Assets/ROSbot.prefab
diff --git a/Gems/RosRobotSample/Assets/ROSbot_velodyne.prefab b/Gems/RosRobotSample/Assets/ROSbot_velodyne.prefab
diff --git a/Gems/RosRobotSample/Assets/robot/ros_components_description/meshes/slamtec_rplidar_s1.dae b/Gems/RosRobotSample/Assets/robot/ros_components_description/meshes/slamtec_rplidar_s1.dae
diff --git a/...otSample/Assets/robot/ros_components_description/meshes/slamtec_rplidar_s1_black.material b/...otSample/Assets/robot/ros_components_description/meshes/slamtec_rplidar_s1_black.material
@@ -0,0 +1,22 @@
+{
+    "materialType": "@projectroot@/Cache/Intermediate Assets/materials/types/standardpbr_generated.materialtype",
+    "materialTypeVersion": 5,
+    "propertyValues": {
+        "baseColor.color": [
+            0.019999999552965164,
+            0.019999999552965164,
+            0.019999999552965164,
+            1.0
+        ],
+        "emissive.color": [
+            0.0,
+            0.0,
+            0.0,
+            1.0
+        ],
+        "metallic.factor": 0.029999999329447746,
+        "opacity.factor": 1.0,
+        "roughness.factor": 0.3700000047683716,
+        "specularF0.factor": 0.6000000238418579
+    }
+}
diff --git a/...botSample/Assets/robot/ros_components_description/meshes/slamtec_rplidar_s1_gray.material b/...botSample/Assets/robot/ros_components_description/meshes/slamtec_rplidar_s1_gray.material
@@ -0,0 +1,20 @@
+{
+    "materialType": "@projectroot@/Cache/Intermediate Assets/materials/types/standardpbr_generated.materialtype",
+    "materialTypeVersion": 5,
+    "propertyValues": {
+        "baseColor.color": [
+            0.05000000074505806,
+            0.05000000074505806,
+            0.05000000074505806,
+            1.0
+        ],
+        "emissive.color": [
+            0.0,
+            0.0,
+            0.0,
+            1.0
+        ],
+        "opacity.factor": 1.0,
+        "roughness.factor": 0.4099999964237213
+    }
+}
diff --git a/...otSample/Assets/robot/ros_components_description/meshes/slamtec_rplidar_s1_white.material b/...otSample/Assets/robot/ros_components_description/meshes/slamtec_rplidar_s1_white.material
@@ -0,0 +1,19 @@
+{
+    "materialType": "@projectroot@/Cache/Intermediate Assets/materials/types/standardpbr_generated.materialtype",
+    "materialTypeVersion": 5,
+    "propertyValues": {
+        "baseColor.color": [
+            0.9258266091346741,
+            0.9258266091346741,
+            0.9258266091346741,
+            1.0
+        ],
+        "emissive.color": [
+            0.0,
+            0.0,
+            0.0,
+            1.0
+        ],
+        "opacity.factor": 1.0
+    }
+}
diff --git a/Templates/Ros2ProjectTemplate/Template/Examples/slam_navigation/launch/slam.launch.py b/Templates/Ros2ProjectTemplate/Template/Examples/slam_navigation/launch/slam.launch.py
@@ -30,18 +30,5 @@ def generate_launch_description():
             launch_arguments = {
                 'slam_params_file': str(pathlib.Path(__file__).parent.absolute().joinpath('config', 'slam_params.yaml'))
             }.items()
-        ),
-        Node(
-            package='pointcloud_to_laserscan',
-            executable='pointcloud_to_laserscan_node',
-            name='pc_to_laserscan',
-            parameters=[{
-                'min_height': 0.0,
-                'max_height': 0.4,
-                'range_min': 0.05
-            }],
-            remappings=[
-                ('/cloud_in', '/pc'),
-            ]
         )
     ])
diff --git a/Templates/Ros2ProjectTemplate/Template/Levels/DemoLevel/DemoLevel.prefab b/Templates/Ros2ProjectTemplate/Template/Levels/DemoLevel/DemoLevel.prefab