Skip to content

gz: use server config file for loading world plugins #24441

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

Merged
merged 15 commits into from
Mar 6, 2025
Merged

gz: use server config file for loading world plugins #24441

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
d5d7321
gz: use server config file for loading world plugins
dakejahl Mar 3, 2025
8a02f9d
submodule
dakejahl Mar 4, 2025
35fb095
use server.config in tree
dakejahl Mar 4, 2025
f1d2113
newlines
dakejahl Mar 4, 2025
c93642e
format
dakejahl Mar 4, 2025
b60edf1
gzbridge: rename function
dakejahl Mar 4, 2025
61cc95a
format
dakejahl Mar 4, 2025
8f6e514
gzbridge: add magnetometer callback
dakejahl Mar 4, 2025
8407eb5
change gz_find_package to find_package
dakejahl Mar 4, 2025
de76eaf
fix up directory structure and cmake to allow multiple plugins
dakejahl Mar 4, 2025
029189c
newlines
dakejahl Mar 4, 2025
ca1bea2
add comment block explaining gz_env.sh
dakejahl Mar 4, 2025
d336f51
remove dupe readme
dakejahl Mar 4, 2025
b001a2e
remove SENS_EN_MAGSIM from all gz airframe files except spacecraft
dakejahl Mar 5, 2025
b3498dd
update gz submodule
dakejahl Mar 5, 2025
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 Tools/simulation/gz
Open in desktop
Submodule gz updated 11 files
+1 −1 models/advanced_plane/model.sdf
+1 −1 sdf_parsing/check_sdf.cc
+0 −11 worlds/aruco.sdf
+0 −11 worlds/baylands.sdf
+1 −13 worlds/default.sdf
+0 −15 worlds/forest.sdf
+0 −11 worlds/frictionless.sdf
+0 −11 worlds/lawn.sdf
+0 −11 worlds/rover.sdf
+0 −11 worlds/walls.sdf
+1 −12 worlds/windy.sdf
5 changes: 4 additions & 1 deletion src/modules/simulation/gz_bridge/gz_env.sh.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
#!/usr/bin/env bash

export PX4_GZ_MODELS=@PX4_SOURCE_DIR@/Tools/simulation/gz/models
export PX4_GZ_WORLDS=@PX4_SOURCE_DIR@/Tools/simulation/gz/worlds
export PX4_GZ_PLUGINS=@PX4_BINARY_DIR@/src/modules/simulation/gz_plugins
export PX4_GZ_SERVER_CONFIG=@PX4_SOURCE_DIR@/src/modules/simulation/gz_bridge/server.config

export GZ_SIM_RESOURCE_PATH=$GZ_SIM_RESOURCE_PATH:$PX4_GZ_MODELS:$PX4_GZ_WORLDS
export GZ_SIM_SYSTEM_PLUGIN_PATH=$GZ_SIM_SYSTEM_PLUGIN_PATH:$PX4_GZ_PLUGINS
# We load plugins specific for PX4 through our own server config file
# See https://gazebosim.org/api/sim/8/server_config.html
export GZ_SIM_SERVER_CONFIG_PATH=$PX4_GZ_SERVER_CONFIG
17 changes: 17 additions & 0 deletions src/modules/simulation/gz_bridge/server.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<server_config>
<plugins>
<plugin entity_name="*" entity_type="world" filename="gz-sim-physics-system" name="gz::sim::systems::Physics"/>
<plugin entity_name="*" entity_type="world" filename="gz-sim-user-commands-system" name="gz::sim::systems::UserCommands"/>
<plugin entity_name="*" entity_type="world" filename="gz-sim-scene-broadcaster-system" name="gz::sim::systems::SceneBroadcaster"/>
<plugin entity_name="*" entity_type="world" filename="gz-sim-contact-system" name="gz::sim::systems::Contact"/>
<plugin entity_name="*" entity_type="world" filename="gz-sim-imu-system" name="gz::sim::systems::Imu"/>
<plugin entity_name="*" entity_type="world" filename="gz-sim-air-pressure-system" name="gz::sim::systems::AirPressure"/>
<plugin entity_name="*" entity_type="world" filename="gz-sim-air-speed-system" name="gz::sim::systems::AirSpeed"/>
<plugin entity_name="*" entity_type="world" filename="gz-sim-apply-link-wrench-system" name="gz::sim::systems::ApplyLinkWrench"/>
<plugin entity_name="*" entity_type="world" filename="gz-sim-navsat-system" name="gz::sim::systems::NavSat"/>
<plugin entity_name="*" entity_type="world" filename="gz-sim-sensors-system" name="gz::sim::systems::Sensors">
<render_engine>ogre2</render_engine>
</plugin>
<plugin entity_name="*" entity_type="world" filename="libOpticalFlowSystem.so" name="custom::OpticalFlowSystem"/>
</plugins>
</server_config>
Loading