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

Jump to bottom

modify plugin path to match rmf_simulation install #108

Merged
merged 2 commits into from
Nov 12, 2021
Merged

modify plugin path to match rmf_simulation install #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
35538ab
modify plugin path to match rmf_simulation install
Nov 11, 2021
870ca8f
Merge branch 'main' into changing_plugin_search_path
Nov 12, 2021
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: 1 addition & 1 deletion rmf_demos_gz/launch/simulation.launch.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<let name="world_path" value="$(find-pkg-share $(var map_package))/maps/$(var map_name)/$(var map_name).world" />
<let name="model_path" value="$(find-pkg-share $(var map_package))/maps/$(var map_name)/models:$(find-pkg-share rmf_demos_assets)/models:/usr/share/gazebo-$(var gazebo_version)/models" />
<let name="resource_path" value="$(find-pkg-share rmf_demos_assets):/usr/share/gazebo-$(var gazebo_version)" />
<let name="plugin_path" value="$(find-pkg-prefix rmf_robot_sim_gazebo_plugins)/lib:$(find-pkg-prefix rmf_building_sim_gazebo_plugins)/lib:/usr/share/gazebo-$(var gazebo_version)" />
<let name="plugin_path" value="$(find-pkg-prefix rmf_robot_sim_gazebo_plugins)/lib/rmf_robot_sim_gazebo_plugins:$(find-pkg-prefix rmf_building_sim_gazebo_plugins)/lib/rmf_building_sim_gazebo_plugins:/usr/share/gazebo-$(var gazebo_version)" />

<!-- Use crowd sim if `use_crowdsim` is true-->
<let name="menge_resource_path" if="$(var use_crowdsim)" value="$(find-pkg-share $(var map_package))/maps/$(var map_name)/config_resource"/>
Expand Down
2 changes: 1 addition & 1 deletion rmf_demos_ign/launch/simulation.launch.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<let name="world_path" value="$(find-pkg-share $(var map_package))/maps/$(var map_name)_ign/$(var map_name).world" />
<let name="model_path" value="$(find-pkg-share $(var map_package))/maps/$(var map_name)/models:$(find-pkg-share $(var map_package))/maps/$(var map_name)_ign/models:$(find-pkg-share rmf_demos_assets)/models:$(env HOME)/.gazebo/models" />
<let name="plugin_path" value="$(find-pkg-prefix rmf_robot_sim_ignition_plugins)/lib:$(find-pkg-prefix rmf_building_sim_ignition_plugins)/lib" />
<let name="plugin_path" value="$(find-pkg-prefix rmf_robot_sim_ignition_plugins)/lib/rmf_robot_sim_ignition_plugins:$(find-pkg-prefix rmf_building_sim_ignition_plugins)/lib/rmf_building_sim_ignition_plugins" />
<!-- Use TPE if` use_tpe` is set to true-->
<!-- TODO use the variable below and remove code duplication (second ign gazebo command) when substitution in XML with ignition gazebo works -->
<let name="tpe_engine" value="\-\-physics-engine ignition-physics-tpe-plugin" />
Expand Down