Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
<pose>2.37593 0 0.8 0 -0 0</pose>
<geometry>
<box>
<size>3.523 0.15 0</size>
<size>3.523 0.15 0.1</size>
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is the change required because walls with a depth of 0 are not rendered properly in ignition?

</box>
</geometry>
<material>
Expand All @@ -129,7 +129,7 @@
<collision name='Wall_0_Collision_4'>
<geometry>
<box>
<size>3.523 0.15 0</size>
<size>3.523 0.15 0.1</size>
</box>
</geometry>
<pose>2.37593 0 0.8 0 -0 0</pose>
Expand Down
6 changes: 3 additions & 3 deletions interbotix_common_toolbox/interbotix_common_sim/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@

<buildtool_depend>ament_cmake</buildtool_depend>

<exec_depend>gazebo_ros</exec_depend>
<!-- <exec_depend>gazebo_ros</exec_depend> -->

<export>
<build_type>ament_cmake</build_type>
<gazebo_ros gazebo_model_path="${prefix}/models"/>
<!-- <gazebo_ros gazebo_model_path="${prefix}/models"/>
<gazebo_ros gazebo_media_path="${prefix}/worlds"/>
<gazebo_ros gazebo_media_path="${prefix}/media"/>
<gazebo_ros gazebo_media_path="${prefix}/media"/> -->
</export>
</package>
Original file line number Diff line number Diff line change
@@ -1,14 +1,42 @@
<?xml version="1.0" ?>
<sdf version="1.5">
<world name="default">

<plugin
filename="gz-sim-physics-system"
name="gz::sim::systems::Physics">
</plugin>
<plugin
filename="gz-sim-user-commands-system"
name="gz::sim::systems::UserCommands">
</plugin>
<plugin
filename="gz-sim-scene-broadcaster-system"
name="gz::sim::systems::SceneBroadcaster">
</plugin>
<plugin
filename="gz-sim-sensors-system"
name="gz::sim::systems::Sensors">
<render_engine>ogre2</render_engine>
</plugin>
<plugin
filename="gz-sim-imu-system"
name="gz::sim::systems::Imu">
</plugin>

<!-- A global light source -->
<include>
<uri>model://sun</uri>
<uri>
https://fuel.gazebosim.org/1.0/OpenRobotics/models/Sun
</uri>
</include>
<!-- A ground plane -->
<include>
<uri>model://ground_plane</uri>
</include>
<uri>
https://fuel.gazebosim.org/1.0/OpenRobotics/models/Ground Plane
</uri>
</include>

<!-- Trossen Robotics Offices -->
<include>
<uri>model://TrossenRoboticsOfficeBuilding</uri>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,7 @@ def declare_interbotix_xslocobot_robot_description_launch_arguments(
choices=(
'actual',
'fake',
'gz_classic',
'gz_sim',
),
default_value=hardware_type,
description=(
Expand Down Expand Up @@ -556,7 +556,7 @@ def determine_use_sim_time_param(
:param hardware_type: The `hardware_type` LaunchConfiguration
:return: True if hardware is simulated, the `use_sim_time` LaunchConfiguration otherwise
"""
if hardware_type_launch_arg.perform(context) in ('gz_classic'):
if hardware_type_launch_arg.perform(context) in ('gz_sim'):
return TextSubstitution(text='true')
else:
return LaunchConfiguration('use_sim_time')