Skip to content

Commit 61df2c3

Browse files
nkoenigchapulinamethylDragonjennuinearjo129
authored
3 to 6 20221013 (#1762)
* 🎈 3.14.0~pre1 (#1650) Signed-off-by: Louise Poubel <louise@openrobotics.org> * Remove redundant namespace references (#1635) Signed-off-by: methylDragon <methylDragon@gmail.com> * 🎈 3.14.0 (#1657) Signed-off-by: Louise Poubel <louise@openrobotics.org> Signed-off-by: Louise Poubel <louise@openrobotics.org> * readd namespaces for Q_ARGS (#1670) * Remove actors from screen when they are supposed to (#1699) # 🦟 Bug fix Supercedes #1697. Note: When forward porting we will have to update the hashmaps to erase the new hashmaps created. Fixes #<NUMBER> ## Summary Found that when actors are De-spawned the actor visuals are not destroyed. This commit addresses this bug by adding the missing remove logic in RenderUtils. ## Before ![bug](https://user-images.githubusercontent.com/542272/189558600-196d98c5-1dcf-4d6c-93d6-7493df38c0e4.gif) ## After ![no_bug](https://user-images.githubusercontent.com/542272/189558924-3f2e3c5d-68f3-4d80-aee4-3dc3ce6742a1.gif) ## Notes: Theres a lot of hashmaps being populated in RenderUtils whenever a new actor is spawned. I hope I've caught them all. Also while I need these working in garden (as all the projects Im working on use garden), should I backport these changes? Signed-off-by: Arjo Chakravarty <arjo@openrobotics.org> * Update examples to use gazebosim.org Signed-off-by: Nate Koenig <nate@openrobotics.org> * Citadel: Removed warnings (#1753) Signed-off-by: ahcorde <ahcorde@gmail.com> * Added collection name to About Dialog (#1756) Signed-off-by: ahcorde <ahcorde@gmail.com> * Convert ignitionrobotics to gazebosim in tests directory (#1757) * Convert ignitionrobotics to gaazebosim in tests directory Signed-off-by: Nate Koenig <nate@openrobotics.org> * fix gz-gazebo Signed-off-by: Nate Koenig <nate@openrobotics.org> Signed-off-by: Nate Koenig <nate@openrobotics.org> Co-authored-by: Nate Koenig <nate@openrobotics.org> * Convert ignitionrobotics to gazebosim in sources and includes (#1758) Signed-off-by: Nate Koenig <nate@openrobotics.org> Signed-off-by: Nate Koenig <nate@openrobotics.org> Co-authored-by: Nate Koenig <nate@openrobotics.org> * Convert ignitionrobotics to gazebosim in tutorials (#1759) Signed-off-by: Nate Koenig <nate@openrobotics.org> Signed-off-by: Nate Koenig <nate@openrobotics.org> Co-authored-by: Nate Koenig <nate@openrobotics.org> * Final update of ignitionrobotics to gazebosim for citadel (#1760) Signed-off-by: Nate Koenig <nate@openrobotics.org> Signed-off-by: Nate Koenig <nate@openrobotics.org> Co-authored-by: Nate Koenig <nate@openrobotics.org> * remove PlotIcon (#1658) Signed-off-by: youhy <haoyuan2019@outlook.com> Signed-off-by: youhy <haoyuan2019@outlook.com> * Fix UNIT_ign_TEST Signed-off-by: Nate Koenig <nate@openrobotics.org> Signed-off-by: Louise Poubel <louise@openrobotics.org> Signed-off-by: methylDragon <methylDragon@gmail.com> Signed-off-by: Arjo Chakravarty <arjo@openrobotics.org> Signed-off-by: Nate Koenig <nate@openrobotics.org> Signed-off-by: ahcorde <ahcorde@gmail.com> Signed-off-by: youhy <haoyuan2019@outlook.com> Co-authored-by: Louise Poubel <louise@openrobotics.org> Co-authored-by: methylDragon <methylDragon@gmail.com> Co-authored-by: Jenn Nguyen <jenn@openrobotics.org> Co-authored-by: Arjo Chakravarty <arjo@openrobotics.org> Co-authored-by: Nate Koenig <nate@openrobotics.org> Co-authored-by: Alejandro Hernández Cordero <ahcorde@gmail.com> Co-authored-by: AzulRadio <50132891+AzulRadio@users.noreply.github.com>
1 parent 132555a commit 61df2c3

File tree

191 files changed

+1949
-1860
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

191 files changed

+1949
-1860
lines changed

‎CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ configure_file(${CMAKE_SOURCE_DIR}/tools/desktop/ignition-gazebo.svg.in ${CMAKE_
235235

236236
# disable doxygen on macOS due to issues with doxygen 1.9.0
237237
# there is an unreleased fix; revert this when 1.9.1 is released
238-
# https://github.com/ignitionrobotics/ign-gazebo/issues/520
238+
# https://github.com/gazebosim/gz-sim/issues/520
239239
if (NOT APPLE)
240240
ign_create_docs(
241241
API_MAINPAGE_MD "${CMAKE_BINARY_DIR}/api.md"

‎CODE_OF_CONDUCT.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ further defined and clarified by project maintainers.
5656
## Enforcement
5757

5858
Instances of abusive, harassing, or otherwise unacceptable behavior may be
59-
reported by contacting the project team at [https://ignitionrobotics.org/support](https://ignitionrobotics.org/support). All
59+
reported by contacting the project team at [https://gazebosim.org/support](https://gazebosim.org/support). All
6060
complaints will be reviewed and investigated and will result in a response that
6161
is deemed necessary and appropriate to the circumstances. The project team is
6262
obligated to maintain confidentiality with regard to the reporter of an incident.

‎CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
See the [Ignition Robotics contributing guide](https://ignitionrobotics.org/docs/all/contributing).
1+
See [Gazebo's contribution guide](https://gazebosim.org/docs/all/contributing).

‎Changelog.md

+301-248
Large diffs are not rendered by default.

‎NEWS

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
http://ignitionrobotics.org
1+
http://gazebosim.org

‎docker/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ section below for usage information about
1010

1111
This section describes how to build and run a docker image based on
1212
nightly builds of downstream
13-
[Ignition libraries](https://ignitionrobotics.org/libs). The Docker image will
13+
[Ignition libraries](https://gazebosim.org/libs). The Docker image will
1414
use the Ignition Gazebo code found in the current source tree.
1515

1616
**Requirements**

‎docker/scripts/build_ign.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/bin/bash
22
# Command line parameters:
3-
# 1 - github organization name. For example ignitionrobotics or osrf.
4-
# 2 - the name of the ignition repository. For example ign-math.
5-
# 3 - the name of the branch. For example ign-math6
3+
# 1 - github organization name. For example gazebosim or osrf.
4+
# 2 - the name of the ignition repository. For example gz-sim.
5+
# 3 - the name of the branch. For example gz-math7
66

77
set -o errexit
88
set -o verbose

‎docker/scripts/upload_json_benchmark.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
#!/bin/bash
22
# Command line parameters:
3-
# 1 - github organization name. For example ignitionrobotics or osrf.
4-
# 2 - the name of the ignition repository. For example ign-math.
5-
# 3 - the name of the branch. For example ign-math6
3+
# 1 - github organization name. For example gazebosim or osrf.
4+
# 2 - the name of the ignition repository. For example gz-math.
5+
# 3 - the name of the branch. For example gz-math7
66

77
set -o errexit
88
set -o verbose
99

1010
# todo(nkoenig) Update the database to handle templated names.
1111
# todo(nkoenig) Use application tokens instead of jwt, which can expire.
12-
curl -k -X POST -d @$1 https://api.ignitionrobotics.org/1.0/benchmarks/gazebo --header 'authorization: Bearer '$AUTH0_JWT_TOKEN
12+
curl -k -X POST -d @$1 https://api.gazebosim.org/1.0/benchmarks/gazebo --header 'authorization: Bearer '$AUTH0_JWT_TOKEN

‎examples/standalone/joy_to_twist/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# Joy to Twist
22

33
Standalone program that subscribes to
4-
[ignition::msgs::Joy](https://ignitionrobotics.org/api/msgs/5.6/classignition_1_1msgs_1_1Joy.html)
4+
[ignition::msgs::Joy](https://gazebosim.org/api/msgs/5.6/classignition_1_1msgs_1_1Joy.html)
55
messages and converts publishes
6-
[ignition::msgs::Twist](https://ignitionrobotics.org/api/msgs/5.6/classignition_1_1msgs_1_1Twist.html)
6+
[ignition::msgs::Twist](https://gazebosim.org/api/msgs/5.6/classignition_1_1msgs_1_1Twist.html)
77
messages according to user-defined configuration.
88

99
## Build

‎examples/standalone/joystick/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Joystick
22

33
Standalone program that publishes
4-
[ignition::msgs::Joy](https://ignitionrobotics.org/api/msgs/5.6/classignition_1_1msgs_1_1Joy.html)
4+
[ignition::msgs::Joy](https://gazebosim.org/api/msgs/5.6/classignition_1_1msgs_1_1Joy.html)
55
messages from a joystick device using Ignition Transport.
66

77
The mapping of joystick buttons to fields in the message is the same as [this](http://wiki.ros.org/joy).

‎examples/worlds/actor.sdf

+3-3
Original file line numberDiff line numberDiff line change
@@ -67,16 +67,16 @@
6767
<name>demo_actor</name>
6868
<!-- override actor's pose, which has 1m in Z -->
6969
<pose>0 0 0 0 0 0</pose>
70-
<uri>https://fuel.ignitionrobotics.org/1.0/Mingfei/models/actor</uri>
70+
<uri>https://fuel.gazebosim.org/1.0/Mingfei/models/actor</uri>
7171
</include>
7272

7373
<actor name="actor_talking">
7474
<skin>
75-
<filename>https://fuel.ignitionrobotics.org/1.0/Mingfei/models/actor/tip/files/meshes/talk_b.dae</filename>
75+
<filename>https://fuel.gazebosim.org/1.0/Mingfei/models/actor/tip/files/meshes/talk_b.dae</filename>
7676
<scale>1.0</scale>
7777
</skin>
7878
<animation name="talk_b">
79-
<filename>https://fuel.ignitionrobotics.org/1.0/Mingfei/models/actor/tip/files/meshes/talk_b.dae</filename>
79+
<filename>https://fuel.gazebosim.org/1.0/Mingfei/models/actor/tip/files/meshes/talk_b.dae</filename>
8080
<scale>0.055</scale>
8181
<interpolate_x>true</interpolate_x>
8282
</animation>

‎examples/worlds/actors_population.sdf.erb

+2-2
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,11 @@
8484

8585
<actor name="actor_<%= j*column + i %>">
8686
<skin>
87-
<filename>https://fuel.ignitionrobotics.org/1.0/Mingfei/models/actor/tip/files/meshes/talk_b.dae</filename>
87+
<filename>https://fuel.gazebosim.org/1.0/Mingfei/models/actor/tip/files/meshes/talk_b.dae</filename>
8888
<scale>1.0</scale>
8989
</skin>
9090
<animation name="talk_b">
91-
<filename>https://fuel.ignitionrobotics.org/1.0/Mingfei/models/actor/tip/files/meshes/talk_b.dae</filename>
91+
<filename>https://fuel.gazebosim.org/1.0/Mingfei/models/actor/tip/files/meshes/talk_b.dae</filename>
9292
<scale>0.055</scale>
9393
<interpolate_x>true</interpolate_x>
9494
</animation>

‎examples/worlds/breadcrumbs.sdf

+1-1
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@
404404
<pose>-2 0 0 0 0 0</pose>
405405
<include>
406406
<uri>
407-
https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/X2 Config 1
407+
https://fuel.gazebosim.org/1.0/OpenRobotics/models/X2 Config 1
408408
</uri>
409409
</include>
410410
</model>

‎examples/worlds/camera_sensor.sdf

+1-1
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@
307307
<include>
308308
<pose>0 1 3 0.0 0.0 1.57</pose>
309309
<uri>
310-
https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/Construction Cone
310+
https://fuel.gazebosim.org/1.0/OpenRobotics/models/Construction Cone
311311
</uri>
312312
</include>
313313

‎examples/worlds/depth_camera_sensor.sdf

+1-1
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@
216216
<include>
217217
<pose>0 1 3 0.0 0.0 1.57</pose>
218218
<uri>
219-
https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/Construction Barrel
219+
https://fuel.gazebosim.org/1.0/OpenRobotics/models/Construction Barrel
220220
</uri>
221221
</include>
222222

‎examples/worlds/elevator.sdf

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
</model>
7474

7575
<include>
76-
<uri>https://fuel.ignitionrobotics.org/1.0/nlamprian/models/Elevator</uri>
76+
<uri>https://fuel.gazebosim.org/1.0/nlamprian/models/Elevator</uri>
7777
</include>
7878

7979
</world>

‎examples/worlds/fuel.sdf

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" ?>
22
<!--
3-
Demo of models being downloaded from http://app.ignitionrobotics.org/
3+
Demo of models being downloaded from http://app.gazebosim.org/
44
-->
55
<sdf version="1.6">
66
<world name="shapes">
@@ -62,27 +62,27 @@
6262
<include>
6363
<name>Double pendulum</name>
6464
<pose>-3 0 0 0 0 0</pose>
65-
<uri>https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/Double pendulum with base</uri>
65+
<uri>https://fuel.gazebosim.org/1.0/OpenRobotics/models/Double pendulum with base</uri>
6666
</include>
6767

6868
<!-- Included model with meshes -->
6969
<include>
7070
<pose>3 -1 0 0 0 0</pose>
71-
<uri>https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/Backpack</uri>
71+
<uri>https://fuel.gazebosim.org/1.0/OpenRobotics/models/Backpack</uri>
7272
</include>
7373

7474
<!-- Included model with meshes using relative paths -->
7575
<include>
7676
<name>Gazebo (relative paths)</name>
7777
<pose>2 5 0 0 0 0</pose>
78-
<uri>https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/Gazebo - relative paths</uri>
78+
<uri>https://fuel.gazebosim.org/1.0/OpenRobotics/models/Gazebo - relative paths</uri>
7979
</include>
8080

8181
<!-- Included actor with meshes using relative paths -->
8282
<include>
8383
<name>Actor Test</name>
8484
<pose>0 0 0 0 0 0</pose>
85-
<uri>https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/actor - relative paths</uri>
85+
<uri>https://fuel.gazebosim.org/1.0/OpenRobotics/models/actor - relative paths</uri>
8686
</include>
8787

8888
<!-- Model with meshes -->
@@ -93,14 +93,14 @@
9393
<collision name="collision">
9494
<geometry>
9595
<mesh>
96-
<uri>https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/Radio/4/files/meshes/Radio.dae</uri>
96+
<uri>https://fuel.gazebosim.org/1.0/OpenRobotics/models/Radio/4/files/meshes/Radio.dae</uri>
9797
</mesh>
9898
</geometry>
9999
</collision>
100100
<visual name="visual">
101101
<geometry>
102102
<mesh>
103-
<uri>https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/Radio/4/files/meshes/Radio.dae</uri>
103+
<uri>https://fuel.gazebosim.org/1.0/OpenRobotics/models/Radio/4/files/meshes/Radio.dae</uri>
104104
</mesh>
105105
</geometry>
106106
</visual>

‎examples/worlds/fuel_textured_mesh.sdf

+2-2
Original file line numberDiff line numberDiff line change
@@ -202,15 +202,15 @@
202202
<static>true</static>
203203
<name>Rescue Randy</name>
204204
<pose>0 0 0 0 0 1.57</pose>
205-
<uri>https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/Rescue Randy</uri>
205+
<uri>https://fuel.gazebosim.org/1.0/OpenRobotics/models/Rescue Randy</uri>
206206
</include>
207207

208208
<!-- Tube Light -->
209209
<include>
210210
<static>true</static>
211211
<name>Tube Light</name>
212212
<pose>1.5 0 3 0 0.78 0</pose>
213-
<uri>https://fuel.ignitionrobotics.org/1.0/openrobotics/models/Tube Light</uri>
213+
<uri>https://fuel.gazebosim.org/1.0/openrobotics/models/Tube Light</uri>
214214
</include>
215215

216216
<light type="spot" name="tube_light">

‎examples/worlds/gpu_lidar_sensor.sdf

+1-1
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@
169169
<include>
170170
<pose>0 0 0 0 0 1.57</pose>
171171
<uri>
172-
https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/Playground
172+
https://fuel.gazebosim.org/1.0/OpenRobotics/models/Playground
173173
</uri>
174174
</include>
175175

‎examples/worlds/import_mesh.sdf

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
<static>true</static>
7676
<name>Electrical Box</name>
7777
<pose>0 0 0 0 0 0</pose>
78-
<uri>https://fuel.ignitionrobotics.org/1.0/openrobotics/models/Electrical Box</uri>
78+
<uri>https://fuel.gazebosim.org/1.0/openrobotics/models/Electrical Box</uri>
7979
</include>
8080

8181
</world>

‎examples/worlds/log_record_resources.sdf

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<static>false</static>
5656
<name>staging_area</name>
5757
<pose>0 0 0 0 0 0</pose>
58-
<uri>https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/X2 Config 1</uri>
58+
<uri>https://fuel.gazebosim.org/1.0/OpenRobotics/models/X2 Config 1</uri>
5959
</include>
6060

6161
<model name="ground_plane">

‎examples/worlds/multicopter_velocity_control.sdf

+2-2
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ You can use the velocity controller and command linear velocity and yaw angular
102102

103103
<include>
104104
<uri>
105-
https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/X3 UAV/4
105+
https://fuel.gazebosim.org/1.0/OpenRobotics/models/X3 UAV/4
106106
</uri>
107107
<plugin
108108
filename="ignition-gazebo-multicopter-motor-model-system"
@@ -232,7 +232,7 @@ You can use the velocity controller and command linear velocity and yaw angular
232232
<include>
233233
<pose>0 3 1 0 0 0</pose>
234234
<uri>
235-
https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/X4 UAV Config 1
235+
https://fuel.gazebosim.org/1.0/OpenRobotics/models/X4 UAV Config 1
236236
</uri>
237237

238238
<plugin filename="ignition-gazebo-multicopter-motor-model-system"

‎examples/worlds/plot_3d.sdf

+1-1
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@
193193

194194
<include>
195195
<name>Double_pendulum</name>
196-
<uri>https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/Double pendulum with base</uri>
196+
<uri>https://fuel.gazebosim.org/1.0/OpenRobotics/models/Double pendulum with base</uri>
197197
</include>
198198

199199
</world>

‎examples/worlds/quadcopter.sdf

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878

7979
<include>
8080
<uri>
81-
https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/X3 UAV/4
81+
https://fuel.gazebosim.org/1.0/OpenRobotics/models/X3 UAV/4
8282
</uri>
8383
<plugin
8484
filename="ignition-gazebo-multicopter-motor-model-system"

‎examples/worlds/sensors_demo.sdf

+1-1
Original file line numberDiff line numberDiff line change
@@ -522,7 +522,7 @@
522522
<include>
523523
<pose>0 1 3 0.0 0.0 1.57</pose>
524524
<uri>
525-
https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/Construction Cone
525+
https://fuel.gazebosim.org/1.0/OpenRobotics/models/Construction Cone
526526
</uri>
527527
</include>
528528

‎examples/worlds/tracked_vehicle_simple.sdf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1719,7 +1719,7 @@
17191719
<include>
17201720
<name>pallet</name>
17211721
<pose>2 -2 0.1 0 0 0</pose>
1722-
<uri>https://fuel.ignitionrobotics.org/1.0/openrobotics/models/Euro pallet</uri>
1722+
<uri>https://fuel.gazebosim.org/1.0/openrobotics/models/Euro pallet</uri>
17231723
</include>
17241724

17251725
<gui fullscreen='0'>

0 commit comments

Comments
 (0)