diff --git a/examples/plugin/command_actor/command_actor.sdf b/examples/plugin/command_actor/command_actor.sdf index 390a8e86a0..e091290e95 100644 --- a/examples/plugin/command_actor/command_actor.sdf +++ b/examples/plugin/command_actor/command_actor.sdf @@ -10,74 +10,6 @@ name="ignition::gazebo::systems::SceneBroadcaster"> - - - - - 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 - - - - - - World control - false - false - 72 - 121 - 1 - - floating - - - - - - - true - true - true - /world/actors/control - /world/actors/stats - - - - - - - World stats - false - false - 110 - 290 - 1 - - floating - - - - - - - true - true - true - true - /world/actors/stats - - - - - true 0 0 10 0 0 0 diff --git a/examples/plugin/rendering_plugins/rendering_plugins.sdf b/examples/plugin/rendering_plugins/rendering_plugins.sdf index 8fbb572bda..eb56737121 100644 --- a/examples/plugin/rendering_plugins/rendering_plugins.sdf +++ b/examples/plugin/rendering_plugins/rendering_plugins.sdf @@ -17,7 +17,7 @@ - + 3D View false @@ -31,6 +31,47 @@ -6 0 6 0 0.5 0 + + + + floating + 5 + 5 + false + + + + + false + 5 + 5 + floating + false + + + + + false + 5 + 5 + floating + false + + + + + + + + + false + 5 + 5 + floating + false + + + diff --git a/examples/scripts/distributed/primary.sdf b/examples/scripts/distributed/primary.sdf index 62961b3008..20644d3006 100644 --- a/examples/scripts/distributed/primary.sdf +++ b/examples/scripts/distributed/primary.sdf @@ -6,75 +6,6 @@ name="ignition::gazebo::systems::SceneBroadcaster"> - - - - - - 3D View - false - docked - - - ogre - scene - 0.4 0.4 0.4 - 0.8 0.8 0.8 - -6 0 6 0 0.5 0 - - - - - - World control - false - false - 72 - 121 - 1 - - floating - - - - - - - true - true - true - /world/default/control - /world/default/stats - - - - - - - World stats - false - false - 110 - 290 - 1 - - floating - - - - - - - true - true - true - true - /world/default/stats - - - - - 0.8 0.8 0.8 1.0 0.34 0.39 0.43 1.0 diff --git a/examples/scripts/distributed/standalone.sdf b/examples/scripts/distributed/standalone.sdf index 1b95237900..6bdac8c0c4 100644 --- a/examples/scripts/distributed/standalone.sdf +++ b/examples/scripts/distributed/standalone.sdf @@ -10,75 +10,6 @@ name="ignition::gazebo::systems::Physics"> - - - - - - 3D View - false - docked - - - ogre - scene - 0.4 0.4 0.4 - 0.8 0.8 0.8 - -6 0 6 0 0.5 0 - - - - - - World control - false - false - 72 - 121 - 1 - - floating - - - - - - - true - true - true - /world/default/control - /world/default/stats - - - - - - - World stats - false - false - 110 - 290 - 1 - - floating - - - - - - - true - true - true - true - /world/default/stats - - - - - 0.8 0.8 0.8 1.0 0.34 0.39 0.43 1.0 diff --git a/examples/scripts/distributed_levels/distributed_levels.sdf.erb b/examples/scripts/distributed_levels/distributed_levels.sdf.erb index 1b0b16e663..b3f03c56ed 100644 --- a/examples/scripts/distributed_levels/distributed_levels.sdf.erb +++ b/examples/scripts/distributed_levels/distributed_levels.sdf.erb @@ -113,75 +113,6 @@ filename="ignition-gazebo-scene-broadcaster-system" name="ignition::gazebo::systems::SceneBroadcaster"> - - - - - - - 3D View - false - docked - - - ogre - scene - 0.4 0.4 0.4 - 0.8 0.8 0.8 - -6 0 6 0 0.5 0 - - - - - - World control - false - false - 72 - 121 - 1 - - floating - - - - - - - true - true - true - /world/default/control - /world/default/stats - - - - - - - World stats - false - false - 110 - 290 - 1 - - floating - - - - - - - true - true - true - true - /world/default/stats - - - - <% end %> diff --git a/examples/scripts/distributed_levels/primary.sdf b/examples/scripts/distributed_levels/primary.sdf index 9e79e592af..b9074299cf 100644 --- a/examples/scripts/distributed_levels/primary.sdf +++ b/examples/scripts/distributed_levels/primary.sdf @@ -10,84 +10,11 @@ - - - - - - - - - 3D View - false - docked - - - ogre - scene - 0.4 0.4 0.4 - 0.8 0.8 0.8 - -6 0 6 0 0.5 0 - - - - - - World control - false - false - 72 - 121 - 1 - - floating - - - - - - - true - true - true - /world/default/control - /world/default/stats - - - - - - - World stats - false - false - 110 - 290 - 1 - - floating - - - - - - - true - true - true - true - /world/default/stats - - - - - - 0.8 0.8 0.8 1.0 0.34 0.39 0.43 1.0 diff --git a/examples/scripts/distributed_levels/standalone.sdf b/examples/scripts/distributed_levels/standalone.sdf index b481243aba..8b996ee96c 100644 --- a/examples/scripts/distributed_levels/standalone.sdf +++ b/examples/scripts/distributed_levels/standalone.sdf @@ -23,75 +23,6 @@ name="ignition::gazebo::systems::SceneBroadcaster"> - - - - - - 3D View - false - docked - - - ogre - scene - 0.4 0.4 0.4 - 0.8 0.8 0.8 - -6 0 6 0 0.5 0 - - - - - - World control - false - false - 72 - 121 - 1 - - floating - - - - - - - true - true - true - /world/default/control - /world/default/stats - - - - - - - World stats - false - false - 110 - 290 - 1 - - floating - - - - - - - true - true - true - true - /world/default/stats - - - - - 0.8 0.8 0.8 1.0 diff --git a/examples/scripts/log_video_recorder/README.md b/examples/scripts/log_video_recorder/README.md index aa679d2f7d..3dc25c22d6 100644 --- a/examples/scripts/log_video_recorder/README.md +++ b/examples/scripts/log_video_recorder/README.md @@ -34,14 +34,8 @@ timestamped directory where the `record_one_run.bash` is in. ## Changing camera follow behavior -The camera follow behavior can be configured by setting the `` -parameters in the GzScene3d GUI plugin in `log_video_recorder.sdf`, i.e. - - - 0.01 - true - -1.0 0 2.5 - +> This feature hasn't been ported to Fortress yet, see +> https://github.com/ignitionrobotics/ign-gui/issues/298 ## Troubleshooting diff --git a/examples/scripts/log_video_recorder/log_video_recorder.sdf b/examples/scripts/log_video_recorder/log_video_recorder.sdf index 9734ebfc85..e2cdc72a9d 100644 --- a/examples/scripts/log_video_recorder/log_video_recorder.sdf +++ b/examples/scripts/log_video_recorder/log_video_recorder.sdf @@ -34,7 +34,7 @@ - + 3D View false @@ -45,6 +45,24 @@ 0.4 0.4 0.4 0.8 0.8 0.8 -6 0 6 0 0.5 0 + + + + false + 5 + 5 + floating + false + + + + + false + 5 + 5 + floating + false + 0.01 true @@ -91,6 +109,28 @@ true /world/default/stats + + + + false + 0 + 0 + 50 + 50 + floating + false + #777777 + + + + true + true + 4000000 + + + + false + diff --git a/examples/worlds/3k_shapes.sdf b/examples/worlds/3k_shapes.sdf index e0f014f1a1..171a9cbe92 100644 --- a/examples/worlds/3k_shapes.sdf +++ b/examples/worlds/3k_shapes.sdf @@ -26,89 +26,6 @@ 0.8 0.8 0.8 - - - - - - 3D View - false - docked - - - ogre2 - scene - 1.0 1.0 1.0 - 0.8 0.8 0.8 - -6 0 6 0 0.5 0 - - - - - - World control - false - false - 72 - 121 - 1 - - floating - - - - - - - true - true - true - /world/shapes/control - /world/shapes/stats - - - - - - - World stats - false - false - 110 - 290 - 1 - - floating - - - - - - - true - true - true - true - /world/shapes/stats - - - - - - - false - docked - - - - - - - - - - - true 0 0 10 0 0 0 diff --git a/examples/worlds/actor.sdf b/examples/worlds/actor.sdf index 346c511b26..2c8c3c5679 100644 --- a/examples/worlds/actor.sdf +++ b/examples/worlds/actor.sdf @@ -22,89 +22,6 @@ name="ignition::gazebo::systems::SceneBroadcaster"> - - - - - 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 - - - - - - World control - false - false - 72 - 121 - 1 - - floating - - - - - - - true - true - true - /world/actors/control - /world/actors/stats - - - - - - - World stats - false - false - 110 - 290 - 1 - - floating - - - - - - - true - true - true - true - /world/actors/stats - - - - - - - docked - - - - - - - false - docked - - - - - true 0 0 10 0 0 0 diff --git a/examples/worlds/actor_crowd.sdf b/examples/worlds/actor_crowd.sdf index 545e475a1d..b53d19e91a 100644 --- a/examples/worlds/actor_crowd.sdf +++ b/examples/worlds/actor_crowd.sdf @@ -17,82 +17,6 @@ name="ignition::gazebo::systems::SceneBroadcaster"> - - - - - 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 - - - - - - World control - false - false - 72 - 121 - 1 - - floating - - - - - - - true - true - true - /world/actors/control - /world/actors/stats - - - - - - - World stats - false - false - 110 - 290 - 1 - - floating - - - - - - - true - true - true - true - /world/actors/stats - - - - - - - false - docked - - - - - true 0 0 10 0 0 0 diff --git a/examples/worlds/actors_population.sdf.erb b/examples/worlds/actors_population.sdf.erb index 98bc2a2ad0..c885588bde 100644 --- a/examples/worlds/actors_population.sdf.erb +++ b/examples/worlds/actors_population.sdf.erb @@ -21,82 +21,6 @@ name="ignition::gazebo::systems::SceneBroadcaster"> - - - - - 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 - - - - - - World control - false - false - 72 - 121 - 1 - - floating - - - - - - - true - true - true - /world/actors/control - /world/actors/stats - - - - - - - World stats - false - false - 110 - 290 - 1 - - floating - - - - - - - true - true - true - true - /world/actors/stats - - - - - - - false - docked - - - - - true 0 0 10 0 0 0 diff --git a/examples/worlds/buoyancy.sdf b/examples/worlds/buoyancy.sdf index 66823419ed..7ba29ec521 100644 --- a/examples/worlds/buoyancy.sdf +++ b/examples/worlds/buoyancy.sdf @@ -44,74 +44,6 @@ 1000 - - - - - - 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 - - - - - - World control - false - false - 72 - 121 - 1 - - floating - - - - - - - true - true - true - /world/buoyancy/control - /world/buoyancy/stats - - - - - - - World stats - false - false - 110 - 290 - 1 - - floating - - - - - - - true - true - true - true - /world/buoyancy/stats - - - - true 0 0 10 0 0 0 @@ -641,4 +573,3 @@ - diff --git a/examples/worlds/camera_sensor.sdf b/examples/worlds/camera_sensor.sdf index b79e76b81b..48d052d355 100644 --- a/examples/worlds/camera_sensor.sdf +++ b/examples/worlds/camera_sensor.sdf @@ -35,20 +35,56 @@ - + 3D View false docked - ogre + 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 + + + + floating + 5 + 5 + false + + + + + false + 5 + 5 + floating + false + + + + + false + 5 + 5 + floating + false + + + + + false + 5 + 5 + floating + false + + @@ -100,6 +136,20 @@ docked + + + + + docked + + + + + + + docked + + diff --git a/examples/worlds/depth_camera_sensor.sdf b/examples/worlds/depth_camera_sensor.sdf index ce693fe1b0..80ce0abf93 100644 --- a/examples/worlds/depth_camera_sensor.sdf +++ b/examples/worlds/depth_camera_sensor.sdf @@ -25,7 +25,7 @@ - + 3D View false @@ -39,50 +39,41 @@ -6 0 6 0 0.5 0 - - + + - World control - false - false - 72 - 121 - 1 - - floating - - - - + floating + 5 + 5 + false - - true - true - true - - - - + - World stats - false - false - 110 - 290 - 1 - - floating - - - - + false + 5 + 5 + floating + false + + + + + false + 5 + 5 + floating + false + + + + + false + 5 + 5 + floating + false - - true - true - true - true diff --git a/examples/worlds/follow_actor.sdf b/examples/worlds/follow_actor.sdf index 468e3e6895..7570ae127d 100644 --- a/examples/worlds/follow_actor.sdf +++ b/examples/worlds/follow_actor.sdf @@ -23,97 +23,6 @@ name="ignition::gazebo::systems::SceneBroadcaster"> - - - - - 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 - - - - - - World control - false - false - 72 - 121 - 1 - - floating - - - - - - - true - true - true - /world/actors/control - /world/actors/stats - - - - - - - World stats - false - false - 110 - 290 - 1 - - floating - - - - - - - true - true - true - true - /world/actors/stats - - - - - - - 0 - 0 - 263 - 50 - floating - false - #03a9f4 - - - - - - - false - docked - - - - - - - true 0 0 10 0 0 0 diff --git a/examples/worlds/fuel_textured_mesh.sdf b/examples/worlds/fuel_textured_mesh.sdf index 7c2a39f95a..8b9e9147b2 100644 --- a/examples/worlds/fuel_textured_mesh.sdf +++ b/examples/worlds/fuel_textured_mesh.sdf @@ -37,7 +37,7 @@ - + 3D View false @@ -46,11 +46,48 @@ 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 + + + + floating + 5 + 5 + false + + + + + false + 5 + 5 + floating + false + + + + + false + 5 + 5 + floating + false + + + + + false + 5 + 5 + floating + false + + + @@ -95,7 +132,6 @@ true true true - @@ -103,7 +139,6 @@ docked - diff --git a/examples/worlds/graded_buoyancy.sdf b/examples/worlds/graded_buoyancy.sdf index f51a5f4609..7b5b8936c7 100644 --- a/examples/worlds/graded_buoyancy.sdf +++ b/examples/worlds/graded_buoyancy.sdf @@ -285,4 +285,3 @@ - diff --git a/examples/worlds/grid.sdf b/examples/worlds/grid.sdf index b775544573..efab4d2549 100644 --- a/examples/worlds/grid.sdf +++ b/examples/worlds/grid.sdf @@ -28,20 +28,38 @@ - + 3D View false docked - ogre + 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 + + + + + false + 5 + 5 + floating + false + + @@ -86,7 +104,6 @@ true true true - @@ -95,11 +112,6 @@ Grid Config - - - - - diff --git a/examples/worlds/heightmap.sdf b/examples/worlds/heightmap.sdf index 6c2de6cb05..c73203683f 100644 --- a/examples/worlds/heightmap.sdf +++ b/examples/worlds/heightmap.sdf @@ -13,128 +13,6 @@ - - - - - 3D View - false - docked - - - ogre - scene - 0.4 0.4 0.4 - 0.8 0.8 0.8 - -80 40 60 0.0 0.4 -0.45 - - - - - - World control - false - false - 72 - 121 - 1 - - floating - - - - - - - true - true - true - - - - - - World stats - false - false - 110 - 290 - 1 - - floating - - - - - - - true - true - true - true - - - - - - Transform control - false - 0 - 0 - 250 - 50 - floating - false - #666666 - - - - - - - false - 250 - 0 - 150 - 50 - floating - false - #666666 - - - - - - - false - 400 - 0 - 150 - 50 - floating - false - #666666 - - - - - - - false - docked - - - - - - - false - docked - - - - - true 0 0 10 0 0 0 diff --git a/examples/worlds/import_mesh.sdf b/examples/worlds/import_mesh.sdf index 1309625e2d..685bace5d0 100644 --- a/examples/worlds/import_mesh.sdf +++ b/examples/worlds/import_mesh.sdf @@ -29,72 +29,6 @@ name="ignition::gazebo::systems::SceneBroadcaster"> - - - - - 3D View - false - docked - - - ogre2 - scene - 1.0 1.0 1.0 - 0.8 0.8 0.8 - -2 0 2 0 0.5 0 - - - - - - World control - false - false - 72 - 121 - 1 - - floating - - - - - - - true - true - true - /world/fuel/control - /world/fuel/stats - - - - - - - World stats - false - false - 110 - 290 - 1 - - floating - - - - - - - true - true - true - true - /world/fuel/stats - - - true 0 0 10 0 0 0 diff --git a/examples/worlds/joint_controller.sdf b/examples/worlds/joint_controller.sdf index 86e54350a7..b3838229b7 100644 --- a/examples/worlds/joint_controller.sdf +++ b/examples/worlds/joint_controller.sdf @@ -25,44 +25,6 @@ name="ignition::gazebo::systems::SceneBroadcaster"> - - - - - 3D View - false - docked - - - ogre - scene - 0.4 0.4 0.4 - 0.8 0.8 0.8 - 1 0 0.1 0 0.05 3.14 - - - - - - World control - false - false - 72 - 121 - 1 - - floating - - - - - - true - true - true - - - true 0 0 10 0 0 0 diff --git a/examples/worlds/joint_position_controller.sdf b/examples/worlds/joint_position_controller.sdf index b2bd104509..d1c09e43d4 100644 --- a/examples/worlds/joint_position_controller.sdf +++ b/examples/worlds/joint_position_controller.sdf @@ -19,46 +19,6 @@ name="ignition::gazebo::systems::SceneBroadcaster"> - - - - - - 3D View - false - docked - - - ogre - scene - 0.4 0.4 0.4 - 0.8 0.8 0.8 - 1 0 0.1 0 0.05 3.14 - - - - - - World control - false - false - 72 - 121 - 1 - - floating - - - - - - - true - true - true - - - true 0 0 10 0 0 0 diff --git a/examples/worlds/joint_trajectory_controller.sdf b/examples/worlds/joint_trajectory_controller.sdf index 556eb8ad52..6d5155129e 100644 --- a/examples/worlds/joint_trajectory_controller.sdf +++ b/examples/worlds/joint_trajectory_controller.sdf @@ -154,64 +154,6 @@ false - - - - - - - - 3D View - false - docked - - ogre - scene - 1 0 0 0 0 3.1416 - - - - - - World control - false - false - 50 - 100 - 1 - floating - - - - - - true - true - true - - - - - - World stats - false - false - 250 - 110 - 1 - floating - - - - - - true - true - true - true - - - diff --git a/examples/worlds/lightmap.sdf b/examples/worlds/lightmap.sdf index 8686531441..51cd2ab882 100644 --- a/examples/worlds/lightmap.sdf +++ b/examples/worlds/lightmap.sdf @@ -18,71 +18,6 @@ There are no dynamic lights or shadows in the scene. false - - - - - - 3D View - false - docked - - - ogre2 - scene - 1.0 1.0 1.0 - 0.8 0.8 0.8 - -5.5 -2 0.5 0 0.0 0 - - - - - - World control - false - false - 72 - 121 - 1 - - floating - - - - - - - true - true - true - - - - - - - World stats - false - false - 110 - 290 - 1 - - floating - - - - - - - true - true - true - true - - - - true Indoor Lightmap diff --git a/examples/worlds/optical_tactile_sensor_plugin.sdf b/examples/worlds/optical_tactile_sensor_plugin.sdf index 08a900120f..d458079a15 100644 --- a/examples/worlds/optical_tactile_sensor_plugin.sdf +++ b/examples/worlds/optical_tactile_sensor_plugin.sdf @@ -40,7 +40,7 @@ - + 3D View false @@ -51,10 +51,45 @@ scene 0.4 0.4 0.4 0.8 0.8 0.8 - 0.35 0.23 0.94 0 0.05 -2.53 - + -6 0 6 0 0.5 0 + + + + floating + 5 + 5 + false + + + + + false + 5 + 5 + floating + false + + + + + false + 5 + 5 + floating + false + + + + + false + 5 + 5 + floating + false + + @@ -75,10 +110,6 @@ true true true - /world/optical_tactile_plugin/control - /world/optical_tactile_plugin/stats - /world/depth_camera_sensor/control - /world/depth_camera_sensor/stats @@ -103,39 +134,37 @@ true true true - /world/optical_tactile_plugin/stats - /world/depth_camera_sensor/stats - + + - docked + docked_collapsed + + + + + + + docked_collapsed - - + - 0 - 0 - 263 - 50 + false + 5 + 5 floating false - #03a9f4 - - + - false - docked + docked - - - true diff --git a/examples/worlds/plane_propeller_demo.sdf b/examples/worlds/plane_propeller_demo.sdf index 6de0ef7e92..d7f104cbf0 100644 --- a/examples/worlds/plane_propeller_demo.sdf +++ b/examples/worlds/plane_propeller_demo.sdf @@ -24,69 +24,6 @@ filename="ignition-gazebo-scene-broadcaster-system" name="ignition::gazebo::systems::SceneBroadcaster"> - - - - - - 3D View - false - docked - - - ogre2 - scene - 0.4 0.4 0.4 - 0.8 0.8 0.8 - 20 0 3 0 0.0 3.14 - - - - - - World control - false - false - 72 - 121 - 1 - - floating - - - - - - - true - true - true - - - - - - - World stats - false - false - 110 - 290 - 1 - - floating - - - - - - - true - true - true - true - - true diff --git a/examples/worlds/plot_3d.sdf b/examples/worlds/plot_3d.sdf index afa33866c3..59b7c09c6a 100644 --- a/examples/worlds/plot_3d.sdf +++ b/examples/worlds/plot_3d.sdf @@ -14,7 +14,7 @@ - + 3D View false @@ -28,6 +28,42 @@ 5 -1.5 3 0 0.37 2.8 + + + + floating + 5 + 5 + false + + + + + false + 5 + 5 + floating + false + + + + + false + 5 + 5 + floating + false + + + + + false + 5 + 5 + floating + false + + @@ -48,6 +84,7 @@ true true true + @@ -73,6 +110,16 @@ true + + + false + 5 + 5 + floating + false + + + diff --git a/examples/worlds/segmentation_camera.sdf b/examples/worlds/segmentation_camera.sdf index 82d0f0649d..4e0840a37e 100644 --- a/examples/worlds/segmentation_camera.sdf +++ b/examples/worlds/segmentation_camera.sdf @@ -28,20 +28,56 @@ - + 3D View false docked - ogre + 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 + + + + floating + 5 + 5 + false + + + + + false + 5 + 5 + floating + false + + + + + false + 5 + 5 + floating + false + + + + + false + 5 + 5 + floating + false + + @@ -88,6 +124,20 @@ true + + + + docked_collapsed + + + + + + + docked_collapsed + + + diff --git a/examples/worlds/sensors_demo.sdf b/examples/worlds/sensors_demo.sdf index 9e0d2414e3..c679e2ebeb 100644 --- a/examples/worlds/sensors_demo.sdf +++ b/examples/worlds/sensors_demo.sdf @@ -26,10 +26,11 @@ name="ignition::gazebo::systems::SceneBroadcaster"> + - + 3D View false @@ -43,6 +44,42 @@ -6 0 6 0 0.5 0 + + + + floating + 5 + 5 + false + + + + + false + 5 + 5 + floating + false + + + + + false + 5 + 5 + floating + false + + + + + false + 5 + 5 + floating + false + + @@ -89,7 +126,18 @@ true + + + + docked + + + + + + docked + diff --git a/examples/worlds/shapes_population.sdf.erb b/examples/worlds/shapes_population.sdf.erb index b65cc9c3ce..91b52529c4 100644 --- a/examples/worlds/shapes_population.sdf.erb +++ b/examples/worlds/shapes_population.sdf.erb @@ -26,89 +26,6 @@ 0.8 0.8 0.8 - - - - - - 3D View - false - docked - - - ogre2 - scene - 1.0 1.0 1.0 - 0.8 0.8 0.8 - -6 0 6 0 0.5 0 - - - - - - World control - false - false - 72 - 121 - 1 - - floating - - - - - - - true - true - true - /world/shapes/control - /world/shapes/stats - - - - - - - World stats - false - false - 110 - 290 - 1 - - floating - - - - - - - true - true - true - true - /world/shapes/stats - - - - - - - false - docked - - - - - - - - - - - true 0 0 10 0 0 0 diff --git a/examples/worlds/sky.sdf b/examples/worlds/sky.sdf index d555a0a0b4..c22442bac2 100644 --- a/examples/worlds/sky.sdf +++ b/examples/worlds/sky.sdf @@ -10,9 +10,10 @@ Currently only supported using ogre2 rendering engine plugin. - + + - + 3D View false @@ -23,11 +24,46 @@ Currently only supported using ogre2 rendering engine plugin. scene 0.4 0.4 0.4 0.8 0.8 0.8 - - 6 0 1.0 0 0.0 3.14 + -6 0 6 0 0.5 0 - + + + + floating + 5 + 5 + false + + + + + false + 5 + 5 + floating + false + + + + + false + 5 + 5 + floating + false + + + + + false + 5 + 5 + floating + false + + + World control @@ -50,7 +86,7 @@ Currently only supported using ogre2 rendering engine plugin. - + World stats @@ -71,20 +107,28 @@ Currently only supported using ogre2 rendering engine plugin. true true true - - RGB camera - 350 - 315 + docked - camera - + + + + docked + + + + + + docked + + + 0.001 @@ -302,4 +346,3 @@ Currently only supported using ogre2 rendering engine plugin. - diff --git a/examples/worlds/spherical_coordinates.sdf b/examples/worlds/spherical_coordinates.sdf index 24492c8213..b8195168fb 100644 --- a/examples/worlds/spherical_coordinates.sdf +++ b/examples/worlds/spherical_coordinates.sdf @@ -76,31 +76,5 @@ ign service -s /world/spherical_coordinates/set_spherical_coordinates \ 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 - - - - - - docked - - - - - diff --git a/examples/worlds/thermal_camera.sdf b/examples/worlds/thermal_camera.sdf index e21215537a..03be5f2d64 100644 --- a/examples/worlds/thermal_camera.sdf +++ b/examples/worlds/thermal_camera.sdf @@ -31,7 +31,7 @@ - + 3D View false @@ -45,6 +45,42 @@ -6 0 6 0 0.5 0 + + + + floating + 5 + 5 + false + + + + + false + 5 + 5 + floating + false + + + + + false + 5 + 5 + floating + false + + + + + false + 5 + 5 + floating + false + + @@ -65,8 +101,6 @@ true true true - /world/thermal_camera/control - /world/thermal_camera/stats @@ -91,7 +125,20 @@ true true true - /world/thermal_camera/stats + + + + + + docked + + + + + + + docked + diff --git a/examples/worlds/triggered_publisher.sdf b/examples/worlds/triggered_publisher.sdf index bb48095a06..303f78beca 100644 --- a/examples/worlds/triggered_publisher.sdf +++ b/examples/worlds/triggered_publisher.sdf @@ -39,72 +39,6 @@ start falling. name="ignition::gazebo::systems::Altimeter"> - - - - - - 3D View - false - docked - - - ogre2 - scene - 0.4 0.4 0.4 - 0.8 0.8 0.8 - 3 -9 9 0 0.6 1.3 - - - - - - World control - false - false - 72 - 121 - 1 - - floating - - - - - - - true - true - true - - - - - - - World stats - false - false - 110 - 290 - 1 - - floating - - - - - - - true - true - true - true - - - - - true 0 0 10 0 0 0 diff --git a/examples/worlds/trisphere_cycle_wheel_slip.sdf b/examples/worlds/trisphere_cycle_wheel_slip.sdf index 7738361315..84ddecc6ff 100644 --- a/examples/worlds/trisphere_cycle_wheel_slip.sdf +++ b/examples/worlds/trisphere_cycle_wheel_slip.sdf @@ -27,74 +27,6 @@ name="ignition::gazebo::systems::SceneBroadcaster"> - - - - - - 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 - - - - - - World control - false - false - 72 - 121 - 1 - - floating - - - - - - - true - true - true - /world/wheel_slip/control - /world/wheel_slip/stats - - - - - - - World stats - false - false - 110 - 290 - 1 - - floating - - - - - - - true - true - true - true - /world/wheel_slip/stats - - - - true diff --git a/examples/worlds/tunnel.sdf b/examples/worlds/tunnel.sdf index 796d77fd7b..496c2a1781 100644 --- a/examples/worlds/tunnel.sdf +++ b/examples/worlds/tunnel.sdf @@ -24,7 +24,7 @@ - + 3D View false @@ -38,6 +38,77 @@ -6 0 6 0 0.5 0 + + + + floating + 5 + 5 + false + + + + + false + 5 + 5 + floating + false + + + + + false + 5 + 5 + floating + false + + + + + false + 5 + 5 + floating + false + + + + + + Transform control + + + + + false + 230 + 50 + floating + false + #666666 + + + + false + + + + + + + + + + false + 200 + 50 + floating + false + #666666 + + @@ -84,20 +155,6 @@ true - - - - docked_collapsed - - - - - - - docked_collapsed - - - Vehicle camera @@ -107,39 +164,19 @@ false - - + + - Transform control - - - - - false - 230 - 50 - floating - false - #666666 + docked_collapsed - - + + - - - - - false - 200 - 50 - floating - false - #666666 + docked_collapsed - @@ -155,6 +192,7 @@ + diff --git a/examples/worlds/velocity_control.sdf b/examples/worlds/velocity_control.sdf index 71c30486f9..1150268c3e 100644 --- a/examples/worlds/velocity_control.sdf +++ b/examples/worlds/velocity_control.sdf @@ -29,75 +29,6 @@ name="ignition::gazebo::systems::SceneBroadcaster"> - - - - - - 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 - - - - - - World control - false - false - 72 - 121 - 1 - - floating - - - - - - - true - true - true - /world/velocity_control/control - /world/velocity_control/stats - - - - - - - World stats - false - false - 110 - 290 - 1 - - floating - - - - - - - true - true - true - true - /world/velocity_control/stats - - - - - true 0 0 10 0 0 0 diff --git a/examples/worlds/video_record_dbl_pendulum.sdf b/examples/worlds/video_record_dbl_pendulum.sdf index ddbe423ff3..d7cf86abbf 100644 --- a/examples/worlds/video_record_dbl_pendulum.sdf +++ b/examples/worlds/video_record_dbl_pendulum.sdf @@ -31,7 +31,7 @@ - + 3D View false @@ -45,6 +45,121 @@ -6 0 6 0 0.5 0 + + + + floating + 5 + 5 + false + + + + + false + 5 + 5 + floating + false + + + + + false + 5 + 5 + floating + false + + + + + + + + + false + 5 + 5 + floating + false + + + + + false + 5 + 5 + floating + false + + + + + + false + 0 + 0 + 250 + 50 + floating + false + #666666 + + + + + + + false + 250 + 0 + 150 + 50 + floating + false + #666666 + + + + + + + false + 0 + 50 + 250 + 50 + floating + false + #777777 + + + + false + + + + + false + 250 + 50 + 50 + 50 + floating + false + #777777 + + + + + false + 5 + 5 + floating + false + + @@ -89,13 +204,30 @@ true true true - - - + + + false + 300 + 50 + 50 + 50 + floating + false + #777777 + + + true + true + 4000000 + + + + false + diff --git a/examples/worlds/visibility.sdf b/examples/worlds/visibility.sdf index 01b2ca0048..33480d9de5 100644 --- a/examples/worlds/visibility.sdf +++ b/examples/worlds/visibility.sdf @@ -42,7 +42,7 @@ - + 3D View false @@ -51,12 +51,47 @@ 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 - 0x05 + + + + floating + 5 + 5 + false + + + + + false + 5 + 5 + floating + false + + + + + false + 5 + 5 + floating + false + + + + + false + 5 + 5 + floating + false + + @@ -77,8 +112,6 @@ true true true - /world/shapes/control - /world/shapes/stats @@ -103,8 +136,6 @@ true true true - /world/shapes/stats - @@ -126,6 +157,19 @@ false + + + + docked + + + + + + + docked + + diff --git a/examples/worlds/visualize_contacts.sdf b/examples/worlds/visualize_contacts.sdf index 5db0ca25d2..357e4b5adb 100644 --- a/examples/worlds/visualize_contacts.sdf +++ b/examples/worlds/visualize_contacts.sdf @@ -1,7 +1,7 @@ - + 3D View false docked - ogre + ogre2 scene 0.4 0.4 0.4 0.8 0.8 0.8 -6 0 6 0 0.5 0 + + + + floating + 5 + 5 + false + + + + + false + 5 + 5 + floating + false + + + + + false + 5 + 5 + floating + false + + + + + false + 5 + 5 + floating + false + + @@ -65,8 +102,6 @@ Contacts will be visualized as blue spheres and green cylinders. true true true - /world/visualize_contacts/control - /world/visualize_contacts/stats @@ -91,21 +126,16 @@ Contacts will be visualized as blue spheres and green cylinders. true true true - /world/visualize_contacts/stats - - - - - 0 - 0 - 263 - 50 - floating - false - #03a9f4 - + + + false + 5 + 5 + floating + false + diff --git a/examples/worlds/visualize_lidar.sdf b/examples/worlds/visualize_lidar.sdf index 311aa688c6..7d01bf2a76 100644 --- a/examples/worlds/visualize_lidar.sdf +++ b/examples/worlds/visualize_lidar.sdf @@ -26,7 +26,7 @@ - + 3D View false @@ -40,6 +40,42 @@ -6 0 6 0 0.5 0 + + + + floating + 5 + 5 + false + + + + + false + 5 + 5 + floating + false + + + + + false + 5 + 5 + floating + false + + + + + false + 5 + 5 + floating + false + + @@ -60,8 +96,6 @@ true true true - /world/visualize_lidar_world/control - /world/visualize_lidar_world/stats @@ -86,11 +120,22 @@ true true true - /world/visualize_lidar_world/stats + + + + + + + docked + + + + + - docked + docked diff --git a/examples/worlds/wind.sdf b/examples/worlds/wind.sdf index d5d58b73b7..34cfceffa5 100644 --- a/examples/worlds/wind.sdf +++ b/examples/worlds/wind.sdf @@ -22,72 +22,6 @@ Example: name="ignition::gazebo::systems::SceneBroadcaster"> - - - - - - 3D View - false - docked - - - ogre2 - scene - 0.4 0.4 0.4 - 0.8 0.8 0.8 - -1 0 1 0 0.5 0 - - - - - - World control - false - false - 72 - 121 - 1 - - floating - - - - - - - true - true - true - - - - - - - World stats - false - false - 110 - 290 - 1 - - floating - - - - - - - true - true - true - true - - - - - true 0 0 10 0 0 0 diff --git a/src/SimulationRunner_TEST.cc b/src/SimulationRunner_TEST.cc index cd2a864eb1..6af7a70a90 100644 --- a/src/SimulationRunner_TEST.cc +++ b/src/SimulationRunner_TEST.cc @@ -1532,7 +1532,7 @@ TEST_P(SimulationRunnerTest, GuiInfo) auto plugin = res.plugin(0); EXPECT_EQ("3D View", plugin.name()); - EXPECT_EQ("GzScene3D", plugin.filename()); + EXPECT_EQ("MinimalScene", plugin.filename()); EXPECT_NE(plugin.innerxml().find(""), std::string::npos); EXPECT_NE(plugin.innerxml().find(""), std::string::npos); EXPECT_EQ(plugin.innerxml().find(""), std::string::npos); diff --git a/src/gui/plugins/transform_control/TransformControl.cc b/src/gui/plugins/transform_control/TransformControl.cc index b33d6f86c2..b05f48c6a1 100644 --- a/src/gui/plugins/transform_control/TransformControl.cc +++ b/src/gui/plugins/transform_control/TransformControl.cc @@ -178,7 +178,7 @@ namespace ignition::gazebo /// \brief Enable legacy features for plugin to work with GzScene3D. /// Disable them to work with the new MinimalScene plugin. - public: bool legacy{true}; + public: bool legacy{false}; }; } diff --git a/src/gui/plugins/video_recorder/VideoRecorder.cc b/src/gui/plugins/video_recorder/VideoRecorder.cc index c3aafbe71f..1eb9b3e69a 100644 --- a/src/gui/plugins/video_recorder/VideoRecorder.cc +++ b/src/gui/plugins/video_recorder/VideoRecorder.cc @@ -117,7 +117,7 @@ namespace ignition::gazebo /// \brief Enable legacy features for plugin to work with GzScene3D. /// Disable them to work with the new MinimalScene plugin. - public: bool legacy{true}; + public: bool legacy{false}; }; } diff --git a/src/gui/plugins/view_angle/ViewAngle.cc b/src/gui/plugins/view_angle/ViewAngle.cc index a972b6faf9..0137aff389 100644 --- a/src/gui/plugins/view_angle/ViewAngle.cc +++ b/src/gui/plugins/view_angle/ViewAngle.cc @@ -92,7 +92,7 @@ namespace ignition::gazebo /// \brief Enable legacy features for plugin to work with GzScene3D. /// Disable them to work with the new MinimalScene plugin. - public: bool legacy{true}; + public: bool legacy{false}; }; } diff --git a/test/worlds/canonical.sdf b/test/worlds/canonical.sdf index b45d3de65b..e69b2d41c1 100644 --- a/test/worlds/canonical.sdf +++ b/test/worlds/canonical.sdf @@ -10,48 +10,6 @@ name="ignition::gazebo::systems::SceneBroadcaster"> - - - - - - 3D View - false - false - 0 - - - - - - - ogre - scene - 0.4 0.4 0.4 - 0.8 0.8 0.8 - -1 0 1 0 0.5 0 - - - - - - World control - false - false - 72 - 121 - 1 - - - - - true - true - true - - - - 0 0 0 diff --git a/test/worlds/demo_joint_types.sdf b/test/worlds/demo_joint_types.sdf index 12bedec0c4..4125a6c1ce 100644 --- a/test/worlds/demo_joint_types.sdf +++ b/test/worlds/demo_joint_types.sdf @@ -10,46 +10,6 @@ name="ignition::gazebo::systems::SceneBroadcaster"> - - - - - - 3D View - false - docked - - - ogre - scene - 0.4 0.4 0.4 - 0.8 0.8 0.8 - 1 -2 1.2 0 0.5 2 - - - - - - World control - false - false - 72 - 121 - 1 - - floating - - - - - - - true - true - true - - - true diff --git a/test/worlds/joint_controller.sdf b/test/worlds/joint_controller.sdf index 0f3678be24..ecb5f96968 100644 --- a/test/worlds/joint_controller.sdf +++ b/test/worlds/joint_controller.sdf @@ -9,48 +9,6 @@ filename="ignition-gazebo-scene-broadcaster-system" name="ignition::gazebo::systems::SceneBroadcaster"> - - - - - - - 3D View - false - false - 0 - - - - - - - ogre - scene - 0.4 0.4 0.4 - 0.8 0.8 0.8 - -1 0 1 0 0.5 0 - - - - - - World control - false - false - 72 - 121 - 1 - - - - - true - true - true - - - true diff --git a/test/worlds/joint_position_controller.sdf b/test/worlds/joint_position_controller.sdf index 906521db60..d38f710aac 100644 --- a/test/worlds/joint_position_controller.sdf +++ b/test/worlds/joint_position_controller.sdf @@ -10,47 +10,6 @@ name="ignition::gazebo::systems::SceneBroadcaster"> - - - - - - 3D View - false - false - 0 - - - - - - - ogre - scene - 0.4 0.4 0.4 - 0.8 0.8 0.8 - -1 0 1 0 0.5 0 - - - - - - World control - false - false - 72 - 121 - 1 - - - - - true - true - true - - - true diff --git a/test/worlds/joint_position_controller_velocity.sdf b/test/worlds/joint_position_controller_velocity.sdf index ca1e65bc47..f730f6069e 100644 --- a/test/worlds/joint_position_controller_velocity.sdf +++ b/test/worlds/joint_position_controller_velocity.sdf @@ -10,47 +10,6 @@ name="ignition::gazebo::systems::SceneBroadcaster"> - - - - - - 3D View - false - false - 0 - - - - - - - ogre - scene - 0.4 0.4 0.4 - 0.8 0.8 0.8 - -1 0 1 0 0.5 0 - - - - - - World control - false - false - 72 - 121 - 1 - - - - - true - true - true - - - true diff --git a/test/worlds/joint_trajectory_controller.sdf b/test/worlds/joint_trajectory_controller.sdf index 4aaee68ca5..69f9ca0d97 100644 --- a/test/worlds/joint_trajectory_controller.sdf +++ b/test/worlds/joint_trajectory_controller.sdf @@ -17,64 +17,6 @@ false - - - - - - - - 3D View - false - docked - - ogre - scene - 0 0 1 0 1.5708 0 - - - - - - World control - false - false - 50 - 100 - 1 - floating - - - - - - true - true - true - - - - - - World stats - false - false - 250 - 110 - 1 - floating - - - - - - true - true - true - true - - - @@ -402,7 +344,7 @@ test_custom_topic/velocity_control - 0.6 175 diff --git a/test/worlds/nondefault_canonical.sdf b/test/worlds/nondefault_canonical.sdf index 56c303542d..1d0e485846 100644 --- a/test/worlds/nondefault_canonical.sdf +++ b/test/worlds/nondefault_canonical.sdf @@ -10,50 +10,6 @@ name="ignition::gazebo::systems::SceneBroadcaster"> - - - - - - 3D View - false - false - 0 - - - - - - - ogre - scene - 0.4 0.4 0.4 - 0.8 0.8 0.8 - -1 0 1 0 0.5 0 - - - - - - World control - false - false - 72 - 121 - 1 - - - - - true - true - true - /world/default/control - /world/default/stats - - - - true diff --git a/test/worlds/office.sdf b/test/worlds/office.sdf index baa2c15981..9b4df1b5d0 100644 --- a/test/worlds/office.sdf +++ b/test/worlds/office.sdf @@ -1,3 +1,4 @@ + @@ -13,107 +14,6 @@ 0.8 0.8 0.8 false - - - 1000 - 845 -