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
30 changes: 25 additions & 5 deletions rosflight_sim/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -144,14 +144,34 @@ install(
TARGETS sil_board
DESTINATION lib/${PROJECT_NAME})

# Gazebo dynamics and simulator
add_subdirectory(simulators/gazebo_sim)

# Standalone simulator
add_subdirectory(simulators/standalone_sim)

# HoloOcean simulator
add_subdirectory(simulators/holoocean_sim)
# Optional simulator visualizers. These repositories may be cloned into the
# rosflight_sim/simulators directory independently of rosflight_sim.
set(ROSFIGHT_SIMULATORS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/simulators")

set(ROSFIGHT_GAZEBO_CLASSIC_DIR "${ROSFIGHT_SIMULATORS_DIR}/rosflight_viz_gazebo_classic")
if(EXISTS "${ROSFIGHT_GAZEBO_CLASSIC_DIR}/CMakeLists.txt")
if("$ENV{ROS_DISTRO}" STREQUAL "humble")
add_subdirectory(simulators/rosflight_viz_gazebo_classic)
else()
message(WARNING
"rosflight_viz_gazebo_classic found, but Gazebo Classic visualizer is only built on ROS 2 Humble; skipping")
endif()
endif()

set(ROSFIGHT_GAZEBO_DIR "${ROSFIGHT_SIMULATORS_DIR}/rosflight_viz_gazebo")
if(EXISTS "${ROSFIGHT_GAZEBO_DIR}/CMakeLists.txt")
add_subdirectory(simulators/rosflight_viz_gazebo)
else()
message(WARNING "rosflight_viz_gazebo not found; skipping modern Gazebo visualizer")
endif()

set(ROSFIGHT_HOLOOCEAN_DIR "${ROSFIGHT_SIMULATORS_DIR}/rosflight_viz_holoocean")
if(EXISTS "${ROSFIGHT_HOLOOCEAN_DIR}/CMakeLists.txt")
add_subdirectory(simulators/rosflight_viz_holoocean)
endif()

#############
## Install ##
Expand Down
6 changes: 0 additions & 6 deletions rosflight_sim/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,6 @@
<depend>rclcpp</depend>
<depend>rclpy</depend>

<depend condition="$ROS_DISTRO == 'humble'">gazebo_dev</depend>

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

How do we make sure users get these deps when they are using Gazebo classic? I briefly glanced at the rosflight_viz_gazebo_classic, but didn't see a fix (just a warning). These tags are needed to successfully install deps for GZ classic when doing the "rosdep install ..." command.

<depend condition="$ROS_DISTRO == 'humble'">gazebo_plugins</depend>
<depend condition="$ROS_DISTRO == 'humble'">gazebo_ros</depend>
<depend condition="$ROS_DISTRO == 'humble'">gazebo</depend>
<depend condition="$ROS_DISTRO == 'humble'">xacro</depend>

<depend>geometry_msgs</depend>
<depend>nav_msgs</depend>
<depend>rosflight_msgs</depend>
Expand Down
3 changes: 3 additions & 0 deletions rosflight_sim/simulators/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Using Other Visualizations.

To use another visualizer, git clone one of the `rosflight_viz_*` repos from the ROSflight organization on GitHub into this repo and build as normal.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This is nitpicky. Could we maybe move this READme to the top level rosflight_ros_pkgs readme? Otherwise I could see people having a hard time finding it.

We should also tell them exactly which directory to clone the rosflight_viz_* packages into, to avoid confusion.

78 changes: 0 additions & 78 deletions rosflight_sim/simulators/gazebo_sim/CMakeLists.txt

This file was deleted.

81 changes: 0 additions & 81 deletions rosflight_sim/simulators/gazebo_sim/gazebo_resource/asphalt.world

This file was deleted.

97 changes: 0 additions & 97 deletions rosflight_sim/simulators/gazebo_sim/gazebo_resource/runway.world

This file was deleted.

69 changes: 0 additions & 69 deletions rosflight_sim/simulators/gazebo_sim/include/gazebo_dynamics.hpp

This file was deleted.

Loading
Loading