Skip to content

Commit 4144502

Browse files
ahcordeahcorde
authored
Deprecate GzScene3D from Fortress and fix some links (gazebosim#325)
Signed-off-by: Alejandro Hernández Cordero <[email protected]>
1 parent 7e0cb47 commit 4144502

File tree

9 files changed

+545
-454
lines changed

9 files changed

+545
-454
lines changed

‎fortress/actors.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ for example, and add an actor called `actor_walking` as follows:
4242
```xml
4343
<actor name="actor_walking">
4444
<skin>
45-
<filename>https://fuel.ignitionrobotics.org/1.0/Mingfei/models/actor/tip/files/meshes/walk.dae</filename>
45+
<filename>https://fuel.gazebosim.org/1.0/Mingfei/models/actor/tip/files/meshes/walk.dae</filename>
4646
<scale>1.0</scale>
4747
</skin>
4848
<animation name="walk">
49-
<filename>https://fuel.ignitionrobotics.org/1.0/Mingfei/models/actor/tip/files/meshes/walk.dae</filename>
49+
<filename>https://fuel.gazebosim.org/1.0/Mingfei/models/actor/tip/files/meshes/walk.dae</filename>
5050
</animation>
5151
</actor>
5252
```

‎fortress/sdf_worlds.md‎

Lines changed: 29 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -76,26 +76,40 @@ Now let's define the GUI. Under the `<gui>` tag we specify anything related to t
7676

7777
[ignition-gui](https://github.com/gazebosim/gz-gui/) has a bunch of plugins to choose from. We will add the ones that are necessary to get our world up and running with basic functionality.
7878

79-
### Scene 3D plugin
79+
### Minimal Scene and GzSceneManager plugins
8080

8181
```xml
8282
<!-- 3D scene -->
83-
<plugin filename="GzScene3D" name="3D View">
84-
<ignition-gui>
85-
<title>3D View</title>
86-
<property type="bool" key="showTitleBar">false</property>
87-
<property type="string" key="state">docked</property>
88-
</ignition-gui>
89-
90-
<engine>ogre2</engine>
91-
<scene>scene</scene>
92-
<ambient_light>1.0 1.0 1.0</ambient_light>
93-
<background_color>0.8 0.8 0.8</background_color>
94-
<camera_pose>-6 0 6 0 0.5 0</camera_pose>
83+
<plugin filename="MinimalScene" name="3D View">
84+
<gz-gui>
85+
<title>3D View</title>
86+
<property type="bool" key="showTitleBar">false</property>
87+
<property type="string" key="state">docked</property>
88+
</gz-gui>
89+
90+
<engine>ogre2</engine>
91+
<scene>scene</scene>
92+
<ambient_light>0.4 0.4 0.4</ambient_light>
93+
<background_color>0.8 0.8 0.8</background_color>
94+
<camera_pose>-6 0 6 0 0.5 0</camera_pose>
95+
<camera_clip>
96+
<near>0.25</near>
97+
<far>25000</far>
98+
</camera_clip>
99+
</plugin>
100+
<plugin filename="GzSceneManager" name="Scene Manager">
101+
<gz-gui>
102+
<property key="resizable" type="bool">false</property>
103+
<property key="width" type="double">5</property>
104+
<property key="height" type="double">5</property>
105+
<property key="state" type="string">floating</property>
106+
<property key="showTitleBar" type="bool">false</property>
107+
</gz-gui>
95108
</plugin>
96109
```
97110

98-
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):
111+
The `GzScene3D` plugin is deprecated, from Fortress `MinimalScene` and `GzSceneManager`
112+
are responsible for displaying the 3D scene of our world. It has the following properties (most of the GUI plugins have them):
99113

100114
* `showTitleBar` if true it will show the blue title bar over the plugin with the name mentioned in the `<title>` tag.
101115
* `state` is the state of the plugin it can be docked in its place using `docked` or it can be `floating`.
@@ -244,7 +258,7 @@ Another way of adding the model to your world is to use the model link. Visit th
244258
```xml
245259
<include>
246260
<uri>
247-
https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/Coke
261+
https://fuel.gazebosim.org/1.0/OpenRobotics/models/Coke
248262
</uri>
249263
</include>
250264
```

‎fortress/tutorials/actors/actor_demo.sdf‎

Lines changed: 2 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -18,79 +18,6 @@
1818
name="ignition::gazebo::systems::SceneBroadcaster">
1919
</plugin>
2020

21-
<gui fullscreen="0">
22-
<!-- 3D scene -->
23-
<plugin filename="GzScene3D" name="3D View">
24-
<ignition-gui>
25-
<title>3D View</title>
26-
<property type="bool" key="showTitleBar">false</property>
27-
<property type="string" key="state">docked</property>
28-
</ignition-gui>
29-
30-
<engine>ogre</engine>
31-
<scene>scene</scene>
32-
<ambient_light>0.4 0.4 0.4</ambient_light>
33-
<background_color>0.8 0.8 0.8</background_color>
34-
<camera_pose>-6 0 6 0 0.5 0</camera_pose>
35-
</plugin>
36-
37-
<!-- World control -->
38-
<plugin filename="WorldControl" name="World control">
39-
<ignition-gui>
40-
<title>World control</title>
41-
<property type="bool" key="showTitleBar">false</property>
42-
<property type="bool" key="resizable">false</property>
43-
<property type="double" key="height">72</property>
44-
<property type="double" key="width">121</property>
45-
<property type="double" key="z">1</property>
46-
47-
<property type="string" key="state">floating</property>
48-
<anchors target="3D View">
49-
<line own="left" target="left"/>
50-
<line own="bottom" target="bottom"/>
51-
</anchors>
52-
</ignition-gui>
53-
54-
<play_pause>true</play_pause>
55-
<step>true</step>
56-
<start_paused>false</start_paused>
57-
<service>/world/actors/control</service>
58-
<stats_topic>/world/actors/stats</stats_topic>
59-
</plugin>
60-
61-
<!-- World statistics -->
62-
<plugin filename="WorldStats" name="World stats">
63-
<ignition-gui>
64-
<title>World stats</title>
65-
<property type="bool" key="showTitleBar">false</property>
66-
<property type="bool" key="resizable">false</property>
67-
<property type="double" key="height">110</property>
68-
<property type="double" key="width">290</property>
69-
<property type="double" key="z">1</property>
70-
71-
<property type="string" key="state">floating</property>
72-
<anchors target="3D View">
73-
<line own="right" target="right"/>
74-
<line own="bottom" target="bottom"/>
75-
</anchors>
76-
</ignition-gui>
77-
78-
<sim_time>true</sim_time>
79-
<real_time>true</real_time>
80-
<real_time_factor>true</real_time_factor>
81-
<iterations>true</iterations>
82-
<topic>/world/actors/stats</topic>
83-
</plugin>
84-
85-
<!-- Entity tree -->
86-
<plugin filename="EntityTree" name="Entity tree">
87-
<ignition-gui>
88-
<property type="bool" key="showTitleBar">false</property>
89-
<property type="string" key="state">docked</property>
90-
</ignition-gui>
91-
</plugin>
92-
</gui>
93-
9421
<light type="directional" name="sun">
9522
<cast_shadows>true</cast_shadows>
9623
<pose>0 0 10 0 0 0</pose>
@@ -133,11 +60,11 @@
13360

13461
<actor name="actor_walking">
13562
<skin>
136-
<filename>https://fuel.ignitionrobotics.org/1.0/Mingfei/models/actor/tip/files/meshes/walk.dae</filename>
63+
<filename>https://fuel.gazebosim.org/1.0/Mingfei/models/actor/tip/files/meshes/walk.dae</filename>
13764
<scale>1.0</scale>
13865
</skin>
13966
<animation name='walk'>
140-
<filename>https://fuel.ignitionrobotics.org/1.0/Mingfei/models/actor/tip/files/meshes/walk.dae</filename>
67+
<filename>https://fuel.gazebosim.org/1.0/Mingfei/models/actor/tip/files/meshes/walk.dae</filename>
14168
</animation>
14269
<script>
14370
<loop>true</loop>

‎fortress/tutorials/sdf_worlds/world_demo.sdf‎

Lines changed: 1 addition & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -18,78 +18,6 @@
1818
name="ignition::gazebo::systems::SceneBroadcaster">
1919
</plugin>
2020

21-
<gui fullscreen="0">
22-
23-
<!-- 3D scene -->
24-
<plugin filename="GzScene3D" name="3D View">
25-
<ignition-gui>
26-
<title>3D View</title>
27-
<property type="bool" key="showTitleBar">false</property>
28-
<property type="string" key="state">docked</property>
29-
</ignition-gui>
30-
31-
<engine>ogre2</engine>
32-
<scene>scene</scene>
33-
<ambient_light>0.4 0.4 0.4</ambient_light>
34-
<background_color>0.8 0.8 0.8</background_color>
35-
<camera_pose>-6 0 6 0 0.5 0</camera_pose>
36-
</plugin>
37-
38-
<!-- World control -->
39-
<plugin filename="WorldControl" name="World control">
40-
<ignition-gui>
41-
<title>World control</title>
42-
<property type="bool" key="showTitleBar">false</property>
43-
<property type="bool" key="resizable">false</property>
44-
<property type="double" key="height">72</property>
45-
<property type="double" key="width">121</property>
46-
<property type="double" key="z">1</property>
47-
48-
<property type="string" key="state">floating</property>
49-
<anchors target="3D View">
50-
<line own="left" target="left"/>
51-
<line own="bottom" target="bottom"/>
52-
</anchors>
53-
</ignition-gui>
54-
55-
<play_pause>true</play_pause>
56-
<step>true</step>
57-
<start_paused>true</start_paused>
58-
<service>/world/world_demo/control</service>
59-
<stats_topic>/world/world_demo/stats</stats_topic>
60-
61-
</plugin>
62-
63-
<!-- World statistics -->
64-
<plugin filename="WorldStats" name="World stats">
65-
<ignition-gui>
66-
<title>World stats</title>
67-
<property type="bool" key="showTitleBar">false</property>
68-
<property type="bool" key="resizable">false</property>
69-
<property type="double" key="height">110</property>
70-
<property type="double" key="width">290</property>
71-
<property type="double" key="z">1</property>
72-
73-
<property type="string" key="state">floating</property>
74-
<anchors target="3D View">
75-
<line own="right" target="right"/>
76-
<line own="bottom" target="bottom"/>
77-
</anchors>
78-
</ignition-gui>
79-
80-
<sim_time>true</sim_time>
81-
<real_time>true</real_time>
82-
<real_time_factor>true</real_time_factor>
83-
<iterations>true</iterations>
84-
<topic>/world/world_demo/stats</topic>
85-
86-
</plugin>
87-
88-
<!-- Entity tree -->
89-
<plugin filename="EntityTree" name="Entity tree">
90-
</plugin>
91-
</gui>
92-
9321
<!--light-->
9422
<light type="directional" name="sun">
9523
<cast_shadows>true</cast_shadows>
@@ -107,7 +35,7 @@
10735

10836
<include>
10937
<uri>
110-
https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/Coke
38+
https://fuel.gazebosim.org/1.0/OpenRobotics/models/Coke
11139
</uri>
11240
</include>
11341
</world>

0 commit comments

Comments
 (0)