Skip to content

Commit 54d7bfa

Browse files
Switch to using ros_gz_sim to run Gazebo (#344)
Signed-off-by: Luca Della Vedova <lucadv@intrinsic.ai>
1 parent 5cd0bf4 commit 54d7bfa

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

rmf_demos_gz/launch/simulation.launch.xml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,13 @@
1717
<let name="gz_headless" unless="$(var headless)" value="" />
1818

1919
<!-- TODO(luca) Remove the manual concatenation of GZ_SIM_RESOURCE_PATH and just use environment hooks -->
20-
<executable cmd="gz sim $(var gz_headless) -r -v 3 $(var world_path) -z $(var sim_update_rate)" output="both">
21-
<env name="GZ_SIM_RESOURCE_PATH" value="$(env GZ_SIM_RESOURCE_PATH):$(var model_path)" />
22-
<env name="MENGE_RESOURCE_PATH" value="$(var menge_resource_path)"/>
23-
</executable>
20+
<group>
21+
<set_env name="GZ_SIM_RESOURCE_PATH" value="$(env GZ_SIM_RESOURCE_PATH):$(var model_path)" />
22+
<set_env name="MENGE_RESOURCE_PATH" value="$(var menge_resource_path)"/>
23+
<include file="$(find-pkg-share ros_gz_sim)/launch/gz_sim.launch.py">
24+
<arg name="gz_args" value="$(var gz_headless) -r -v 3 $(var world_path) -z $(var sim_update_rate)"/>
25+
</include>
26+
</group>
2427

2528
<!-- ros_gz bridge for simulation clock -->
2629
<node pkg="ros_gz_bridge" exec="parameter_bridge"

rmf_demos_gz/package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
<exec_depend>teleop_twist_keyboard</exec_depend>
1919
<exec_depend>launch_xml</exec_depend>
2020
<exec_depend>ros2launch</exec_depend>
21-
<exec_depend>gz_sim_vendor</exec_depend>
2221

2322
<exec_depend>ros_gz_bridge</exec_depend>
23+
<exec_depend>ros_gz_sim</exec_depend>
2424

2525
<export>
2626
<build_type>ament_cmake</build_type>

0 commit comments

Comments
 (0)