From a25b01bde0e69653fb40af67f2eec8d5494d2db2 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Fri, 9 Sep 2022 20:37:05 +0200 Subject: [PATCH 1/5] Use gz instead of ign --- garden/tutorials/sdf_worlds/world_demo.sdf | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/garden/tutorials/sdf_worlds/world_demo.sdf b/garden/tutorials/sdf_worlds/world_demo.sdf index 3420dd8b8..8135ffcd8 100644 --- a/garden/tutorials/sdf_worlds/world_demo.sdf +++ b/garden/tutorials/sdf_worlds/world_demo.sdf @@ -6,16 +6,16 @@ 1.0 + filename="libgz-sim-physics-system.so" + name="gz::sim::systems::Physics"> + filename="libgz-sim-user-commands-system.so" + name="gz::sim::systems::UserCommands"> + filename="libgz-sim-scene-broadcaster-system.so" + name="gz::sim::systems::SceneBroadcaster"> @@ -37,7 +37,7 @@ - + World control false false @@ -50,7 +50,7 @@ - + true true @@ -62,7 +62,7 @@ - + World stats false false @@ -75,7 +75,7 @@ - + true true From d249a113ef0d2b238eb8ba609d0542044701409e Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Fri, 9 Sep 2022 20:37:31 +0200 Subject: [PATCH 2/5] Try to replace GzScene3D with Migration.md instructions --- garden/tutorials/sdf_worlds/world_demo.sdf | 40 +++++++++++++++------- 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/garden/tutorials/sdf_worlds/world_demo.sdf b/garden/tutorials/sdf_worlds/world_demo.sdf index 8135ffcd8..9b0f664fa 100644 --- a/garden/tutorials/sdf_worlds/world_demo.sdf +++ b/garden/tutorials/sdf_worlds/world_demo.sdf @@ -21,20 +21,34 @@ - - - 3D View - false - docked - - - ogre2 - scene - 0.4 0.4 0.4 - 0.8 0.8 0.8 - -6 0 6 0 0.5 0 + + + 3D View + docked + + ogre2 + scene + 0.4 0.4 0.4 + 0.8 0.8 0.8 + -6 0 6 0 0.5 0 + + + + + + + + false + 5 + 5 + floating + false + + /example/scene + /example/pose + /example/delete + /example/scene - From dd5db60ef8335639938de7e6ae190a8e6f7b0109 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Tue, 13 Sep 2022 00:40:22 +0200 Subject: [PATCH 3/5] Update world_demo.sdf after the removal of Scene3D Signed-off-by: Jose Luis Rivero --- garden/tutorials/sdf_worlds/world_demo.sdf | 105 +++++++++++++++++---- 1 file changed, 88 insertions(+), 17 deletions(-) diff --git a/garden/tutorials/sdf_worlds/world_demo.sdf b/garden/tutorials/sdf_worlds/world_demo.sdf index 9b0f664fa..0ba87a72f 100644 --- a/garden/tutorials/sdf_worlds/world_demo.sdf +++ b/garden/tutorials/sdf_worlds/world_demo.sdf @@ -19,22 +19,73 @@ - - - - 3D View - docked - - ogre2 - scene - 0.4 0.4 0.4 - 0.8 0.8 0.8 - -6 0 6 0 0.5 0 + + + 3D View + false + docked + + + ogre2 + scene + 0.4 0.4 0.4 + 0.8 0.8 0.8 + -6 0 6 0 0.5 0 + + 0.25 + 25000 + - + + + - + floating + 5 + 5 + false + + + + + false + 5 + 5 + floating + false + + + + + false + 5 + 5 + floating + false + + + + + false + 5 + 5 + floating + false + + + + + false + 5 + 5 + floating + false + + + + + @@ -44,11 +95,31 @@ floating false - /example/scene - /example/pose - /example/delete - /example/scene + + + false + 5 + 5 + floating + false + + + + + + + + + + false + 5 + 5 + floating + false + + + From 3f2366b49b3a1b577aa23dd57dddc8f364e23667 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Tue, 13 Sep 2022 00:40:42 +0200 Subject: [PATCH 4/5] Update instructions after the removal of Scene3D Signed-off-by: Jose Luis Rivero --- garden/sdf_worlds.md | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/garden/sdf_worlds.md b/garden/sdf_worlds.md index 34100010b..5f8af1e58 100644 --- a/garden/sdf_worlds.md +++ b/garden/sdf_worlds.md @@ -80,28 +80,37 @@ Now let's define the GUI. Under the `` tag we specify anything related to t ```xml - + - 3D View - false - docked + 3D View + docked - ogre2 scene - 1.0 1.0 1.0 + 0.4 0.4 0.4 0.8 0.8 0.8 -6 0 6 0 0.5 0 ``` -The `GzScene3D` plugin is responsible for displaying the 3D scene of our world. It has the following properties (most of the GUI plugins have them): +The `MinimalScene` plugin is responsible for displaying the 3D scene of our world. It has the following properties (most of the GUI plugins have them): -* `showTitleBar` if true it will show the blue title bar over the plugin with the name mentioned in the `` tag. * `state` is the state of the plugin it can be docked in its place using `docked` or it can be `floating`. For the rendering engine we can choose `ogre` or `ogre2`. The `<ambient_light>` and the `<background_color>` specify the ambient and the background color of the scene. `<camera_pose>` specifies the `X Y Z` position of the camera followed by its rotation in `Roll Pitch Yaw`. +#### Common used 3D scene controllers + +To provide some minimal functionality and controls, a part of the 3D scene implemented by `MinimalScene`, +a [usual set of plugins](https://github.com/gazebosim/gz-sim/blob/ff1c82b41e548dfdc8076374f9500db2df2c35a1/examples/worlds/minimal_scene.sdf#L29-L128) can be copied from the `gz-sim` repository. + +These plugins have the following properties (most of the GUI plugins have them): + +* `resizable`: if true the user can change plugin size in the interface +* `height` and `width`: size measures of the plugin +* `state` is the state of the plugin it can be docked in its place using `docked` or it can be `floating`. +* `showTitleBar` if true it will show the blue title bar over the plugin with the name mentioned in the `<title>` tag. + ### World control plugin ```xml From 5120e6939b7d82a1471ef0ade389de2a392a17e7 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero <jrivero@osrfoundation.org> Date: Mon, 17 Jun 2024 19:41:13 +0200 Subject: [PATCH 5/5] Update garden/sdf_worlds.md Co-authored-by: Jenn Nguyen <jennuine@intrinsic.ai> Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org> --- garden/sdf_worlds.md | 1 - 1 file changed, 1 deletion(-) diff --git a/garden/sdf_worlds.md b/garden/sdf_worlds.md index 5f8af1e58..66eae6e02 100644 --- a/garden/sdf_worlds.md +++ b/garden/sdf_worlds.md @@ -95,7 +95,6 @@ Now let's define the GUI. Under the `<gui>` tag we specify anything related to t The `MinimalScene` plugin is responsible for displaying the 3D scene of our world. It has the following properties (most of the GUI plugins have them): -* `state` is the state of the plugin it can be docked in its place using `docked` or it can be `floating`. For the rendering engine we can choose `ogre` or `ogre2`. The `<ambient_light>` and the `<background_color>` specify the ambient and the background color of the scene. `<camera_pose>` specifies the `X Y Z` position of the camera followed by its rotation in `Roll Pitch Yaw`.