Remove commented out sections in SDFs, remove GUI plugins from SDF be…

…cause unused, redo links Signed-off-by: Athena Z <[email protected]>
gazebosim · Sep 7, 2024 · 95530a6 · 95530a6
1 parent f04599f
commit 95530a6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 98 deletions.
diff --git a/test/worlds/camera_sensor_gi_enabled_false.sdf b/test/worlds/camera_sensor_gi_enabled_false.sdf
@@ -1,10 +1,6 @@
 <?xml version="1.0" ?>
 <sdf version="1.6">
  <world name="sensors">
- <!-- <physics name="1ms" type="ignored">
- <max_step_size>.001</max_step_size>
- <real_time_factor>0</real_time_factor>
- </physics> -->
  <plugin
  filename="gz-sim-physics-system"
  name="gz::sim::systems::Physics">
@@ -30,55 +26,12 @@
  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> -->
 
  <scene>
  <ambient>0 0 0</ambient>
  <background>0.1 0.1 0.1</background>
  </scene>
-
- <gui>
- <plugin filename="MinimalScene" name="3D View">
- <engine>ogre2</engine>
- <camera_pose>0 2.5 1.25 0 0 -1.57</camera_pose>
- </plugin>
-
- <plugin filename="ImageDisplay" name="Image Display">
- <topic>camera</topic>
- </plugin>
-
- <!-- <plugin filename="GlobalIlluminationVct" name="Global Illumination Vct">
- </plugin> -->
-
- <plugin filename="GzSceneManager" name="Scene Manager"/>
- <plugin filename="InteractiveViewControl" name="Interactive view control"/>
-
- <plugin filename="TransformControl" name="Transform control">
- <gz-gui>
- <property key="resizable" type="bool">false</property>
- <property key="x" type="double">0</property>
- <property key="y" type="double">50</property>
- <property key="width" type="double">250</property>
- <property key="height" type="double">50</property>
- <property key="state" type="string">docked</property>
- <property key="showTitleBar" type="bool">true</property>
- <property key="cardBackground" type="string">#777777</property>
- </gz-gui>
- </plugin>
- <plugin filename="SelectEntities" name="Select Entities">
- <gz-gui>
- <property key="resizable" type="bool">false</property>
- <property key="width" type="double">5</property>
- <property key="height" type="double">5</property>
- <property key="state" type="string">floating</property>
- <property key="showTitleBar" type="bool">false</property>
- </gz-gui>
- </plugin>
- </gui>
-
+
  <!--lighting-->
  <light type="point" name="ceiling_light">
  <pose>0 -0.5 2.5 0 0 0</pose>

diff --git a/test/worlds/camera_sensor_gi_enabled_true.sdf b/test/worlds/camera_sensor_gi_enabled_true.sdf
@@ -1,10 +1,6 @@
 <?xml version="1.0" ?>
 <sdf version="1.6">
  <world name="sensors">
- <!-- <physics name="1ms" type="ignored">
- <max_step_size>.001</max_step_size>
- <real_time_factor>0</real_time_factor>
- </physics> -->
  <plugin
  filename="gz-sim-physics-system"
  name="gz::sim::systems::Physics">
@@ -30,55 +26,12 @@
  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> -->
 
  <scene>
  <ambient>0 0 0</ambient>
  <background>0.1 0.1 0.1</background>
  </scene>
 
- <gui>
- <plugin filename="MinimalScene" name="3D View">
- <engine>ogre2</engine>
- <camera_pose>0 2.5 1.25 0 0 -1.57</camera_pose>
- </plugin>
-
- <plugin filename="ImageDisplay" name="Image Display">
- <topic>camera</topic>
- </plugin>
-
- <!-- <plugin filename="GlobalIlluminationVct" name="Global Illumination Vct">
- </plugin> -->
-
- <plugin filename="GzSceneManager" name="Scene Manager"/>
- <plugin filename="InteractiveViewControl" name="Interactive view control"/>
-
- <plugin filename="TransformControl" name="Transform control">
- <gz-gui>
- <property key="resizable" type="bool">false</property>
- <property key="x" type="double">0</property>
- <property key="y" type="double">50</property>
- <property key="width" type="double">250</property>
- <property key="height" type="double">50</property>
- <property key="state" type="string">docked</property>
- <property key="showTitleBar" type="bool">true</property>
- <property key="cardBackground" type="string">#777777</property>
- </gz-gui>
- </plugin>
- <plugin filename="SelectEntities" name="Select Entities">
- <gz-gui>
- <property key="resizable" type="bool">false</property>
- <property key="width" type="double">5</property>
- <property key="height" type="double">5</property>
- <property key="state" type="string">floating</property>
- <property key="showTitleBar" type="bool">false</property>
- </gz-gui>
- </plugin>
- </gui>
-
  <!--lighting-->
  <light type="point" name="ceiling_light">
  <pose>0 -0.5 2.5 0 0 0</pose>

diff --git a/tutorials/global_illumination.md b/tutorials/global_illumination.md
@@ -55,7 +55,7 @@ GI can be enabled for the GUI through a GUI plugin. Both VCT and CI VCT are supp
 #### Example usage for VCT
 
 1) Open the [global_illumination.sdf](
-https:/gazebosim/gz-sim/blob/main/examples/worlds/global_illumination.sdf) world with
+https:/gazebosim/gz-sim/tree/gz-sim8/examples/worlds/global_illumination.sdf) world with
 
 ```bash
 gz sim global_illumination.sdf
@@ -76,7 +76,7 @@ gz sim global_illumination.sdf
 #### Example usage for CI VCT
 
 1) Open the [global_illumination.sdf](
-https:/gazebosim/gz-sim/blob/main/examples/worlds/global_illumination.sdf) world using Vulkan with
+https:/gazebosim/gz-sim/tree/gz-sim8/examples/worlds/global_illumination.sdf) world using Vulkan with
 
 ```bash
 gz sim global_illumination.sdf --render-engine-api-backend vulkan
@@ -93,7 +93,7 @@ GI can be enabled for sensors through the `<global_illumination>` element in the
 #### Example usage with VCT
 
 We will demonstrate how to enable VCT for the sensor with the SDF file below. (The finished SDF file can be viewed [here](
-https:/gazebosim/gz-sim/blob/main/examples/worlds/global_illumination.sdf).)
+https:/gazebosim/gz-sim/tree/gz-sim8/examples/worlds/global_illumination.sdf).)
 
 1) Save the below in an SDF file named `gi_demo.sdf`: