From e007fa2c0b2e795ab1b74c75e48962b8dfacedba Mon Sep 17 00:00:00 2001 From: Ian Chen Date: Wed, 20 Sep 2023 16:41:02 -0700 Subject: [PATCH] Backport reset button fix (#2159) * Fix reset button in examples (#2151) Signed-off-by: Addisu Z. Taddese * fix reset button in more world sdf files Signed-off-by: Ian Chen --------- Signed-off-by: Addisu Z. Taddese Signed-off-by: Ian Chen Co-authored-by: Addisu Z. Taddese --- examples/plugin/rendering_plugins/rendering_plugins.sdf | 1 - examples/scripts/log_video_recorder/log_video_recorder.sdf | 1 - examples/worlds/boundingbox_camera.sdf | 1 - examples/worlds/camera_sensor.sdf | 1 - examples/worlds/dem_monterey_bay.sdf | 1 - examples/worlds/dem_moon.sdf | 1 - examples/worlds/dem_volcano.sdf | 1 - examples/worlds/depth_camera_sensor.sdf | 1 - examples/worlds/fuel_textured_mesh.sdf | 1 - examples/worlds/grid.sdf | 1 - examples/worlds/lrauv_control_demo.sdf | 1 - examples/worlds/minimal_scene.sdf | 1 - examples/worlds/optical_tactile_sensor_plugin.sdf | 1 - examples/worlds/plot_3d.sdf | 1 - examples/worlds/projector.sdf | 1 - examples/worlds/resource_spawner.sdf | 1 - examples/worlds/segmentation_camera.sdf | 1 - examples/worlds/sensors_demo.sdf | 1 - examples/worlds/shader_param.sdf | 1 - examples/worlds/sky.sdf | 1 - examples/worlds/spherical_coordinates.sdf | 1 - examples/worlds/thermal_camera.sdf | 1 - examples/worlds/tracked_vehicle_simple.sdf | 1 - examples/worlds/triggered_camera_sensor.sdf | 1 - examples/worlds/tunnel.sdf | 1 - examples/worlds/video_record_dbl_pendulum.sdf | 1 - examples/worlds/visibility.sdf | 1 - examples/worlds/visualize_contacts.sdf | 1 - examples/worlds/visualize_lidar.sdf | 1 - examples/worlds/wide_angle_camera.sdf | 1 - src/gui/playback_gui.config | 1 - 31 files changed, 31 deletions(-) diff --git a/examples/plugin/rendering_plugins/rendering_plugins.sdf b/examples/plugin/rendering_plugins/rendering_plugins.sdf index 785a510bdc..b25fd1a4f6 100644 --- a/examples/plugin/rendering_plugins/rendering_plugins.sdf +++ b/examples/plugin/rendering_plugins/rendering_plugins.sdf @@ -79,7 +79,6 @@ false false 72 - 121 1 floating diff --git a/examples/scripts/log_video_recorder/log_video_recorder.sdf b/examples/scripts/log_video_recorder/log_video_recorder.sdf index cde3d0cc51..a330ade288 100644 --- a/examples/scripts/log_video_recorder/log_video_recorder.sdf +++ b/examples/scripts/log_video_recorder/log_video_recorder.sdf @@ -75,7 +75,6 @@ false false 72 - 121 1 floating diff --git a/examples/worlds/boundingbox_camera.sdf b/examples/worlds/boundingbox_camera.sdf index 4aa95a96ae..7697d17684 100644 --- a/examples/worlds/boundingbox_camera.sdf +++ b/examples/worlds/boundingbox_camera.sdf @@ -82,7 +82,6 @@ false false 72 - 121 1 floating diff --git a/examples/worlds/camera_sensor.sdf b/examples/worlds/camera_sensor.sdf index 89a71652a8..3d967d701e 100644 --- a/examples/worlds/camera_sensor.sdf +++ b/examples/worlds/camera_sensor.sdf @@ -92,7 +92,6 @@ false false 72 - 121 1 floating diff --git a/examples/worlds/dem_monterey_bay.sdf b/examples/worlds/dem_monterey_bay.sdf index 953c7178c2..7f2d170121 100644 --- a/examples/worlds/dem_monterey_bay.sdf +++ b/examples/worlds/dem_monterey_bay.sdf @@ -71,7 +71,6 @@ false false 72 - 121 1 floating diff --git a/examples/worlds/dem_moon.sdf b/examples/worlds/dem_moon.sdf index 8cbbe830f9..a1de71ad5e 100644 --- a/examples/worlds/dem_moon.sdf +++ b/examples/worlds/dem_moon.sdf @@ -78,7 +78,6 @@ false false 72 - 121 1 floating diff --git a/examples/worlds/dem_volcano.sdf b/examples/worlds/dem_volcano.sdf index 979f0ca383..f48b2779a4 100644 --- a/examples/worlds/dem_volcano.sdf +++ b/examples/worlds/dem_volcano.sdf @@ -70,7 +70,6 @@ false false 72 - 121 1 floating diff --git a/examples/worlds/depth_camera_sensor.sdf b/examples/worlds/depth_camera_sensor.sdf index 5f17082d60..e666d12f42 100644 --- a/examples/worlds/depth_camera_sensor.sdf +++ b/examples/worlds/depth_camera_sensor.sdf @@ -82,7 +82,6 @@ false false 72 - 121 1 floating diff --git a/examples/worlds/fuel_textured_mesh.sdf b/examples/worlds/fuel_textured_mesh.sdf index 7ec952f40e..251e195810 100644 --- a/examples/worlds/fuel_textured_mesh.sdf +++ b/examples/worlds/fuel_textured_mesh.sdf @@ -95,7 +95,6 @@ false false 72 - 121 1 floating diff --git a/examples/worlds/grid.sdf b/examples/worlds/grid.sdf index 62028f2f84..184a946f85 100644 --- a/examples/worlds/grid.sdf +++ b/examples/worlds/grid.sdf @@ -67,7 +67,6 @@ false false 72 - 121 1 floating diff --git a/examples/worlds/lrauv_control_demo.sdf b/examples/worlds/lrauv_control_demo.sdf index bf0d43a12d..ebd990b301 100644 --- a/examples/worlds/lrauv_control_demo.sdf +++ b/examples/worlds/lrauv_control_demo.sdf @@ -111,7 +111,6 @@ false false 72 - 121 1 floating diff --git a/examples/worlds/minimal_scene.sdf b/examples/worlds/minimal_scene.sdf index ae6c78df09..59c67d10cd 100644 --- a/examples/worlds/minimal_scene.sdf +++ b/examples/worlds/minimal_scene.sdf @@ -134,7 +134,6 @@ Features: false false 72 - 121 1 floating diff --git a/examples/worlds/optical_tactile_sensor_plugin.sdf b/examples/worlds/optical_tactile_sensor_plugin.sdf index 2920a788ee..fcda4ad605 100644 --- a/examples/worlds/optical_tactile_sensor_plugin.sdf +++ b/examples/worlds/optical_tactile_sensor_plugin.sdf @@ -97,7 +97,6 @@ false false 72 - 121 1 floating diff --git a/examples/worlds/plot_3d.sdf b/examples/worlds/plot_3d.sdf index 2f0ed9874c..8abbd11a16 100644 --- a/examples/worlds/plot_3d.sdf +++ b/examples/worlds/plot_3d.sdf @@ -71,7 +71,6 @@ false false 72 - 121 1 floating diff --git a/examples/worlds/projector.sdf b/examples/worlds/projector.sdf index d2a601c348..00fa8747ce 100644 --- a/examples/worlds/projector.sdf +++ b/examples/worlds/projector.sdf @@ -97,7 +97,6 @@ false false 72 - 121 1 floating diff --git a/examples/worlds/resource_spawner.sdf b/examples/worlds/resource_spawner.sdf index ec9eb90392..ab101d4b38 100644 --- a/examples/worlds/resource_spawner.sdf +++ b/examples/worlds/resource_spawner.sdf @@ -81,7 +81,6 @@ false false 72 - 121 1 floating diff --git a/examples/worlds/segmentation_camera.sdf b/examples/worlds/segmentation_camera.sdf index c8644c42ae..c5f4df7def 100644 --- a/examples/worlds/segmentation_camera.sdf +++ b/examples/worlds/segmentation_camera.sdf @@ -85,7 +85,6 @@ false false 72 - 121 1 floating diff --git a/examples/worlds/sensors_demo.sdf b/examples/worlds/sensors_demo.sdf index 7bc724857f..3b6d49bbc9 100644 --- a/examples/worlds/sensors_demo.sdf +++ b/examples/worlds/sensors_demo.sdf @@ -87,7 +87,6 @@ false false 72 - 121 1 floating diff --git a/examples/worlds/shader_param.sdf b/examples/worlds/shader_param.sdf index 1c47a001e1..ae76f08d71 100644 --- a/examples/worlds/shader_param.sdf +++ b/examples/worlds/shader_param.sdf @@ -87,7 +87,6 @@ ShaderParam visual plugin over time. false false 72 - 121 1 floating diff --git a/examples/worlds/sky.sdf b/examples/worlds/sky.sdf index c1e2c620d5..e001ae59e5 100644 --- a/examples/worlds/sky.sdf +++ b/examples/worlds/sky.sdf @@ -70,7 +70,6 @@ Currently only supported using ogre2 rendering engine plugin. false false 72 - 121 1 floating diff --git a/examples/worlds/spherical_coordinates.sdf b/examples/worlds/spherical_coordinates.sdf index 1519bd64d7..5f76fe3844 100644 --- a/examples/worlds/spherical_coordinates.sdf +++ b/examples/worlds/spherical_coordinates.sdf @@ -163,7 +163,6 @@ gz service -s /world/spherical_coordinates/set_spherical_coordinates \ false false 72 - 121 1 floating diff --git a/examples/worlds/thermal_camera.sdf b/examples/worlds/thermal_camera.sdf index c857c36278..e585cbe66f 100644 --- a/examples/worlds/thermal_camera.sdf +++ b/examples/worlds/thermal_camera.sdf @@ -88,7 +88,6 @@ false false 72 - 121 1 floating diff --git a/examples/worlds/tracked_vehicle_simple.sdf b/examples/worlds/tracked_vehicle_simple.sdf index 0334c4666c..e475414035 100644 --- a/examples/worlds/tracked_vehicle_simple.sdf +++ b/examples/worlds/tracked_vehicle_simple.sdf @@ -1780,7 +1780,6 @@ 0 0 72 - 121 1 floating diff --git a/examples/worlds/triggered_camera_sensor.sdf b/examples/worlds/triggered_camera_sensor.sdf index 23e2a027d2..38c6af1d05 100644 --- a/examples/worlds/triggered_camera_sensor.sdf +++ b/examples/worlds/triggered_camera_sensor.sdf @@ -98,7 +98,6 @@ false false 72 - 121 1 floating diff --git a/examples/worlds/tunnel.sdf b/examples/worlds/tunnel.sdf index 2b70a68648..a902e40f03 100644 --- a/examples/worlds/tunnel.sdf +++ b/examples/worlds/tunnel.sdf @@ -108,7 +108,6 @@ false false 72 - 121 1 floating diff --git a/examples/worlds/video_record_dbl_pendulum.sdf b/examples/worlds/video_record_dbl_pendulum.sdf index aeebffde37..e5eed30f0d 100644 --- a/examples/worlds/video_record_dbl_pendulum.sdf +++ b/examples/worlds/video_record_dbl_pendulum.sdf @@ -164,7 +164,6 @@ false false 72 - 121 1 floating diff --git a/examples/worlds/visibility.sdf b/examples/worlds/visibility.sdf index 3f0f184837..ed669970a2 100644 --- a/examples/worlds/visibility.sdf +++ b/examples/worlds/visibility.sdf @@ -99,7 +99,6 @@ false false 72 - 121 1 floating diff --git a/examples/worlds/visualize_contacts.sdf b/examples/worlds/visualize_contacts.sdf index 4e78353353..e39092e014 100644 --- a/examples/worlds/visualize_contacts.sdf +++ b/examples/worlds/visualize_contacts.sdf @@ -89,7 +89,6 @@ Contacts will be visualized as blue spheres and green cylinders. false false 72 - 121 1 floating diff --git a/examples/worlds/visualize_lidar.sdf b/examples/worlds/visualize_lidar.sdf index 54dca0b06c..61f9397505 100644 --- a/examples/worlds/visualize_lidar.sdf +++ b/examples/worlds/visualize_lidar.sdf @@ -83,7 +83,6 @@ false false 72 - 121 1 floating diff --git a/examples/worlds/wide_angle_camera.sdf b/examples/worlds/wide_angle_camera.sdf index 602f9cd7cf..2fb2ddd773 100644 --- a/examples/worlds/wide_angle_camera.sdf +++ b/examples/worlds/wide_angle_camera.sdf @@ -133,7 +133,6 @@ false false 72 - 121 1 floating diff --git a/src/gui/playback_gui.config b/src/gui/playback_gui.config index f911c3730b..c76f551a71 100644 --- a/src/gui/playback_gui.config +++ b/src/gui/playback_gui.config @@ -111,7 +111,6 @@ false false 72 - 121 1 floating