Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use <gazebo_ros ...> to export paths #507

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use <gazebo_ros ...> to export paths #507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions rotors_gazebo/launch/firefly_swarm_hovering_example.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
<arg name="enable_ground_truth" default="true"/>
<arg name="mav_name" default="firefly" />

<env name="GAZEBO_MODEL_PATH" value="${GAZEBO_MODEL_PATH}:$(find rotors_gazebo)/models"/>
<env name="GAZEBO_RESOURCE_PATH" value="${GAZEBO_RESOURCE_PATH}:$(find rotors_gazebo)/models"/>
<include file="$(find gazebo_ros)/launch/empty_world.launch">
<arg name="world_name" value="$(find rotors_gazebo)/worlds/$(arg world_name).world"/>
<!-- <arg name="debug" value="true"/> -->
Expand Down
2 changes: 0 additions & 2 deletions rotors_gazebo/launch/fixed_wing.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@
(even when Gazebo is started through roslaunch) -->
<arg name="verbose" default="false"/>

<env name="GAZEBO_MODEL_PATH" value="${GAZEBO_MODEL_PATH}:$(find rotors_gazebo)/models"/>
<env name="GAZEBO_RESOURCE_PATH" value="${GAZEBO_RESOURCE_PATH}:$(find rotors_gazebo)/models"/>
<include file="$(find gazebo_ros)/launch/empty_world.launch">
<arg name="world_name" value="$(find rotors_gazebo)/worlds/$(arg world_name).world"/>
<arg name="debug" value="$(arg debug)" />
Expand Down
2 changes: 0 additions & 2 deletions rotors_gazebo/launch/fixed_wing_hil.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@
(even when Gazebo is started through roslaunch) -->
<arg name="verbose" default="false"/>

<env name="GAZEBO_MODEL_PATH" value="${GAZEBO_MODEL_PATH}:$(find rotors_gazebo)/models"/>
<env name="GAZEBO_RESOURCE_PATH" value="${GAZEBO_RESOURCE_PATH}:$(find rotors_gazebo)/models"/>
<include file="$(find gazebo_ros)/launch/empty_world.launch">
<arg name="world_name" value="$(find rotors_gazebo)/worlds/$(arg world_name).world"/>
<arg name="debug" value="$(arg debug)" />
Expand Down
2 changes: 0 additions & 2 deletions rotors_gazebo/launch/fixed_wing_with_joy.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@
(even when Gazebo is started through roslaunch) -->
<arg name="verbose" default="false"/>

<env name="GAZEBO_MODEL_PATH" value="${GAZEBO_MODEL_PATH}:$(find rotors_gazebo)/models"/>
<env name="GAZEBO_RESOURCE_PATH" value="${GAZEBO_RESOURCE_PATH}:$(find rotors_gazebo)/models"/>
<include file="$(find gazebo_ros)/launch/empty_world.launch">
<arg name="world_name" value="$(find rotors_gazebo)/worlds/$(arg world_name).world"/>
<arg name="debug" value="$(arg debug)" />
Expand Down
2 changes: 0 additions & 2 deletions rotors_gazebo/launch/mav.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@
(even when Gazebo is started through roslaunch) -->
<arg name="verbose" default="false"/>

<env name="GAZEBO_MODEL_PATH" value="${GAZEBO_MODEL_PATH}:$(find rotors_gazebo)/models"/>
<env name="GAZEBO_RESOURCE_PATH" value="${GAZEBO_RESOURCE_PATH}:$(find rotors_gazebo)/models"/>
<include file="$(find gazebo_ros)/launch/empty_world.launch">
<arg name="world_name" value="$(find rotors_gazebo)/worlds/$(arg world_name).world"/>
<arg name="debug" value="$(arg debug)" />
Expand Down
2 changes: 0 additions & 2 deletions rotors_gazebo/launch/mav_hovering_example.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@
(even when Gazebo is started through roslaunch) -->
<arg name="verbose" default="false"/>

<env name="GAZEBO_MODEL_PATH" value="${GAZEBO_MODEL_PATH}:$(find rotors_gazebo)/models"/>
<env name="GAZEBO_RESOURCE_PATH" value="${GAZEBO_RESOURCE_PATH}:$(find rotors_gazebo)/models"/>
<include file="$(find gazebo_ros)/launch/empty_world.launch">
<arg name="world_name" value="$(find rotors_gazebo)/worlds/$(arg world_name).world" />
<arg name="debug" value="$(arg debug)" />
Expand Down
2 changes: 0 additions & 2 deletions rotors_gazebo/launch/mav_hovering_example_with_vi_sensor.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
<arg name="enable_ground_truth" default="true" />
<arg name="log_file" default="$(arg mav_name)" />

<env name="GAZEBO_MODEL_PATH" value="${GAZEBO_MODEL_PATH}:$(find rotors_gazebo)/models"/>
<env name="GAZEBO_RESOURCE_PATH" value="${GAZEBO_RESOURCE_PATH}:$(find rotors_gazebo)/models"/>
<include file="$(find gazebo_ros)/launch/empty_world.launch">
<arg name="world_name" value="$(find rotors_gazebo)/worlds/$(arg world_name).world" />
<!-- <arg name="debug" value="true"/> -->
Expand Down
2 changes: 0 additions & 2 deletions rotors_gazebo/launch/mav_powerplant_with_waypoint_publisher.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
<arg name="enable_ground_truth" default="true" />
<arg name="log_file" default="$(arg mav_name)" />

<env name="GAZEBO_MODEL_PATH" value="${GAZEBO_MODEL_PATH}:$(find rotors_gazebo)/models"/>
<env name="GAZEBO_RESOURCE_PATH" value="${GAZEBO_RESOURCE_PATH}:$(find rotors_gazebo)/models"/>
<include file="$(find gazebo_ros)/launch/empty_world.launch">
<arg name="world_name" value="$(find rotors_gazebo)/worlds/powerplant.world"/>
<!-- <arg name="debug" value="true"/> -->
Expand Down
2 changes: 0 additions & 2 deletions rotors_gazebo/launch/mav_with_joy.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
<arg name="enable_ground_truth" default="true" />
<arg name="log_file" default="$(arg mav_name)" />

<env name="GAZEBO_MODEL_PATH" value="${GAZEBO_MODEL_PATH}:$(find rotors_gazebo)/models"/>
<env name="GAZEBO_RESOURCE_PATH" value="${GAZEBO_RESOURCE_PATH}:$(find rotors_gazebo)/models"/>
<include file="$(find gazebo_ros)/launch/empty_world.launch">
<arg name="world_name" value="$(find rotors_gazebo)/worlds/$(arg world_name).world"/>
<!-- <arg name="debug" value="true"/> -->
Expand Down
2 changes: 0 additions & 2 deletions rotors_gazebo/launch/mav_with_keyboard.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
<arg name="enable_ground_truth" default="true" />
<arg name="log_file" default="$(arg mav_name)" />

<env name="GAZEBO_MODEL_PATH" value="${GAZEBO_MODEL_PATH}:$(find rotors_gazebo)/models"/>
<env name="GAZEBO_RESOURCE_PATH" value="${GAZEBO_RESOURCE_PATH}:$(find rotors_gazebo)/models"/>
<include file="$(find gazebo_ros)/launch/empty_world.launch">
<arg name="world_name" value="$(find rotors_gazebo)/worlds/$(arg world_name).world"/>
<!-- <arg name="debug" value="true"/> -->
Expand Down
2 changes: 0 additions & 2 deletions rotors_gazebo/launch/mav_with_waypoint_publisher.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
<arg name="enable_ground_truth" default="true" />
<arg name="log_file" default="$(arg mav_name)" />

<env name="GAZEBO_MODEL_PATH" value="${GAZEBO_MODEL_PATH}:$(find rotors_gazebo)/models"/>
<env name="GAZEBO_RESOURCE_PATH" value="${GAZEBO_RESOURCE_PATH}:$(find rotors_gazebo)/models"/>
<include file="$(find gazebo_ros)/launch/empty_world.launch">
<arg name="world_name" value="$(find rotors_gazebo)/worlds/$(arg world_name).world" />
<!-- <arg name="debug" value="true"/> -->
Expand Down
2 changes: 0 additions & 2 deletions rotors_gazebo/launch/mav_with_wind_gust.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
<arg name="enable_ground_truth" default="true"/>
<arg name="log_file" default="$(arg mav_name)"/>

<env name="GAZEBO_MODEL_PATH" value="${GAZEBO_MODEL_PATH}:$(find rotors_gazebo)/models"/>
<env name="GAZEBO_RESOURCE_PATH" value="${GAZEBO_RESOURCE_PATH}:$(find rotors_gazebo)/models"/>
<include file="$(find gazebo_ros)/launch/empty_world.launch">
<arg name="world_name" value="$(find rotors_gazebo)/worlds/$(arg world_name).world"/>
<!-- <arg name="debug" value="true" /> -->
Expand Down
2 changes: 0 additions & 2 deletions rotors_gazebo/launch/three_multicopters_hovering_example.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
<arg name="enable_ground_truth" default="true"/>
<arg name="paused" value="false"/>

<env name="GAZEBO_MODEL_PATH" value="${GAZEBO_MODEL_PATH}:$(find rotors_gazebo)/models"/>
<env name="GAZEBO_RESOURCE_PATH" value="${GAZEBO_RESOURCE_PATH}:$(find rotors_gazebo)/models"/>
<include file="$(find gazebo_ros)/launch/empty_world.launch">
<arg name="world_name" value="$(find rotors_gazebo)/worlds/$(arg world_name).world"/>
<!-- <arg name="debug" value="true"/> -->
Expand Down
2 changes: 0 additions & 2 deletions rotors_gazebo/launch/vi_sensor.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
<arg name="enable_depth" default="true"/>
<arg name="enable_ground_truth" default="false"/>

<env name="GAZEBO_MODEL_PATH" value="${GAZEBO_MODEL_PATH}:$(find rotors_gazebo)/models"/>
<env name="GAZEBO_RESOURCE_PATH" value="${GAZEBO_RESOURCE_PATH}:$(find rotors_gazebo)/models"/>
<include file="$(find gazebo_ros)/launch/empty_world.launch">
<arg name="world_name" value="$(find rotors_gazebo)/worlds/$(arg world_name).world"/>
<!-- <arg name="debug" value="true" /> -->
Expand Down
4 changes: 4 additions & 0 deletions rotors_gazebo/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,8 @@
<run_depend>roscpp</run_depend>
<run_depend>sensor_msgs</run_depend>

<export>
<gazebo_ros gazebo_model_path="${prefix}/models"/>
<gazebo_ros gazebo_media_path="${prefix}/models"/>
</export>
</package>
4 changes: 4 additions & 0 deletions rotors_gazebo_plugins/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,8 @@
<run_depend>tf</run_depend>
<run_depend>yaml-cpp</run_depend>

<export>
<gazebo_ros plugin_path="${prefix}/lib"/>
</export>

</package>