Skip to content

Commit 15d1202

Browse files
jasmeet0915mkhansenbot
authored andcommitted
Updated names from ignition gazebo to Gz Sim (space-ros#46)
Signed-off-by: Jasmeet Singh <[email protected]>
1 parent 4bde781 commit 15d1202

File tree

2 files changed

+18
-17
lines changed

2 files changed

+18
-17
lines changed

mars_rover/launch/mars_rover.launch.py

+8-8
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ def generate_launch_description():
2323
mars_rover_demos_path = get_package_share_directory('mars_rover')
2424
mars_rover_models_path = get_package_share_directory('simulation')
2525

26-
env = {'IGN_GAZEBO_SYSTEM_PLUGIN_PATH':
27-
':'.join([environ.get('IGN_GAZEBO_SYSTEM_PLUGIN_PATH', default=''),
26+
env = {'GZ_SIM_SYSTEM_PLUGIN_PATH':
27+
':'.join([environ.get('GZ_SIM_SYSTEM_PLUGIN_PATH', default=''),
2828
environ.get('LD_LIBRARY_PATH', default='')]),
29-
'IGN_GAZEBO_RESOURCE_PATH':
30-
':'.join([environ.get('IGN_GAZEBO_RESOURCE_PATH', default=''), mars_rover_demos_path])}
31-
29+
'GZ_SIM_RESOURCE_PATH':
30+
':'.join([mars_rover_demos_path])}
31+
3232
urdf_model_path = os.path.join(mars_rover_models_path, 'models', 'curiosity_path',
3333
'urdf', 'curiosity_mars_rover.xacro')
3434
mars_world_model = os.path.join(mars_rover_demos_path, 'worlds', 'mars_curiosity.world')
@@ -67,7 +67,7 @@ def generate_launch_description():
6767
)
6868

6969
start_world = ExecuteProcess(
70-
cmd=['ign gazebo', mars_world_model, '-r'],
70+
cmd=['gz sim', mars_world_model, '-r'],
7171
output='screen',
7272
additional_env=env,
7373
shell=True
@@ -97,7 +97,7 @@ def generate_launch_description():
9797
output='screen')
9898

9999
spawn = Node(
100-
package='ros_ign_gazebo', executable='create',
100+
package='ros_gz_sim', executable='create',
101101
arguments=[
102102
'-name', 'curiosity_mars_rover',
103103
'-topic', robot_description,
@@ -110,7 +110,7 @@ def generate_launch_description():
110110

111111
## Control Components
112112

113-
component_state_msg = '{name: "IgnitionSystem", target_state: {id: 3, label: ""}}'
113+
component_state_msg = '{name: "GazeboSimSystem", target_state: {id: 3, label: ""}}'
114114

115115
## a hack to resolve current bug
116116
set_hardware_interface_active = ExecuteProcess(

mars_rover/worlds/mars_curiosity.world

+10-9
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,38 @@
1-
<sdf version="1.5">
1+
<?xml version="1.0" ?>
2+
<sdf version="1.11">
23
<world name="default">
34
<gui fullscreen="0">
45

56
<plugin filename="GzScene3D" name="3D View">
6-
<ignition-gui>
7+
<gz-gui>
78
<title>3D View</title>
89
<property type="bool" key="showTitleBar">false</property>
910
<property type="string" key="state">docked</property>
10-
</ignition-gui>
11+
</gz-gui>
1112
<engine>ogre2</engine>
1213
<scene>scene</scene>
1314
<background_color>0.9 0.753 0.66</background_color>
1415
<camera_pose>-5.0 0.0 -6.0 0.0 0.0 0.0</camera_pose>
1516
</plugin>
1617

1718
<plugin filename="ImageDisplay" name="Image Display">
18-
<ignition-gui>
19+
<gz-gui>
1920
<property key="state" type="string">floating</property>
20-
</ignition-gui>
21+
</gz-gui>
2122
</plugin>
2223
</gui>
2324

2425
<server_config>
2526
<plugins>
2627
<plugin entity_name="*"
2728
entity_type="world"
28-
filename="ignition-gazebo-scene-broadcaster-system"
29-
name="ignition::gazebo::systems::SceneBroadcaster">
29+
filename="gz-sim-scene-broadcaster-system"
30+
name="gz::sim::systems::SceneBroadcaster">
3031
</plugin>
3132
<plugin entity_name="*"
3233
entity_type="world"
33-
filename="ignition-gazebo-sensors-system"
34-
name="ignition::gazebo::systems::Sensors">
34+
filename="gz-sim-sensors-system"
35+
name="gz::sim::systems::Sensors">
3536
<render_engine>ogre2</render_engine>
3637
</plugin>
3738
</plugins>

0 commit comments

Comments
 (0)