Skip to content

Commit

Permalink
3 to 6 20221013 (gazebosim#1762)
Browse files Browse the repository at this point in the history
* 🎈 3.14.0~pre1 (gazebosim#1650)

Signed-off-by: Louise Poubel <[email protected]>

* Remove redundant namespace references (gazebosim#1635)

Signed-off-by: methylDragon <[email protected]>

* 🎈 3.14.0 (gazebosim#1657)

Signed-off-by: Louise Poubel <[email protected]>

Signed-off-by: Louise Poubel <[email protected]>

* readd namespaces for Q_ARGS (gazebosim#1670)

* Remove actors from screen when they are supposed to (gazebosim#1699)

# 🦟 Bug fix

Supercedes gazebosim#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 <[email protected]>

* Update examples to use gazebosim.org

Signed-off-by: Nate Koenig <[email protected]>

* Citadel: Removed warnings (gazebosim#1753)

Signed-off-by: ahcorde <[email protected]>

* Added collection name to About Dialog (gazebosim#1756)

Signed-off-by: ahcorde <[email protected]>

* Convert ignitionrobotics to gazebosim in tests directory (gazebosim#1757)

* Convert ignitionrobotics to gaazebosim in tests directory

Signed-off-by: Nate Koenig <[email protected]>

* fix gz-gazebo

Signed-off-by: Nate Koenig <[email protected]>

Signed-off-by: Nate Koenig <[email protected]>
Co-authored-by: Nate Koenig <[email protected]>

* Convert ignitionrobotics to gazebosim in sources and includes (gazebosim#1758)

Signed-off-by: Nate Koenig <[email protected]>

Signed-off-by: Nate Koenig <[email protected]>
Co-authored-by: Nate Koenig <[email protected]>

* Convert ignitionrobotics to gazebosim in tutorials (gazebosim#1759)

Signed-off-by: Nate Koenig <[email protected]>

Signed-off-by: Nate Koenig <[email protected]>
Co-authored-by: Nate Koenig <[email protected]>

* Final update of ignitionrobotics to gazebosim for citadel (gazebosim#1760)

Signed-off-by: Nate Koenig <[email protected]>

Signed-off-by: Nate Koenig <[email protected]>
Co-authored-by: Nate Koenig <[email protected]>

* remove PlotIcon (gazebosim#1658)

Signed-off-by: youhy <[email protected]>

Signed-off-by: youhy <[email protected]>

* Fix UNIT_ign_TEST

Signed-off-by: Nate Koenig <[email protected]>

Signed-off-by: Louise Poubel <[email protected]>
Signed-off-by: methylDragon <[email protected]>
Signed-off-by: Arjo Chakravarty <[email protected]>
Signed-off-by: Nate Koenig <[email protected]>
Signed-off-by: ahcorde <[email protected]>
Signed-off-by: youhy <[email protected]>
Co-authored-by: Louise Poubel <[email protected]>
Co-authored-by: methylDragon <[email protected]>
Co-authored-by: Jenn Nguyen <[email protected]>
Co-authored-by: Arjo Chakravarty <[email protected]>
Co-authored-by: Nate Koenig <[email protected]>
Co-authored-by: Alejandro Hernández Cordero <[email protected]>
Co-authored-by: AzulRadio <[email protected]>
  • Loading branch information
8 people authored Nov 3, 2022
1 parent 132555a commit 61df2c3
Show file tree
Hide file tree
Showing 191 changed files with 1,949 additions and 1,860 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ configure_file(${CMAKE_SOURCE_DIR}/tools/desktop/ignition-gazebo.svg.in ${CMAKE_

# disable doxygen on macOS due to issues with doxygen 1.9.0
# there is an unreleased fix; revert this when 1.9.1 is released
# https://github.com/ignitionrobotics/ign-gazebo/issues/520
# https://github.com/gazebosim/gz-sim/issues/520
if (NOT APPLE)
ign_create_docs(
API_MAINPAGE_MD "${CMAKE_BINARY_DIR}/api.md"
Expand Down
2 changes: 1 addition & 1 deletion CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ further defined and clarified by project maintainers.
## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting the project team at [https://ignitionrobotics.org/support](https://ignitionrobotics.org/support). All
reported by contacting the project team at [https://gazebosim.org/support](https://gazebosim.org/support). All
complaints will be reviewed and investigated and will result in a response that
is deemed necessary and appropriate to the circumstances. The project team is
obligated to maintain confidentiality with regard to the reporter of an incident.
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
See the [Ignition Robotics contributing guide](https://ignitionrobotics.org/docs/all/contributing).
See [Gazebo's contribution guide](https://gazebosim.org/docs/all/contributing).
549 changes: 301 additions & 248 deletions Changelog.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion NEWS
Original file line number Diff line number Diff line change
@@ -1 +1 @@
http://ignitionrobotics.org
http://gazebosim.org
2 changes: 1 addition & 1 deletion docker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ section below for usage information about

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

**Requirements**
Expand Down
6 changes: 3 additions & 3 deletions docker/scripts/build_ign.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!/bin/bash
# Command line parameters:
# 1 - github organization name. For example ignitionrobotics or osrf.
# 2 - the name of the ignition repository. For example ign-math.
# 3 - the name of the branch. For example ign-math6
# 1 - github organization name. For example gazebosim or osrf.
# 2 - the name of the ignition repository. For example gz-sim.
# 3 - the name of the branch. For example gz-math7

set -o errexit
set -o verbose
Expand Down
8 changes: 4 additions & 4 deletions docker/scripts/upload_json_benchmark.sh
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#!/bin/bash
# Command line parameters:
# 1 - github organization name. For example ignitionrobotics or osrf.
# 2 - the name of the ignition repository. For example ign-math.
# 3 - the name of the branch. For example ign-math6
# 1 - github organization name. For example gazebosim or osrf.
# 2 - the name of the ignition repository. For example gz-math.
# 3 - the name of the branch. For example gz-math7

set -o errexit
set -o verbose

# todo(nkoenig) Update the database to handle templated names.
# todo(nkoenig) Use application tokens instead of jwt, which can expire.
curl -k -X POST -d @$1 https://api.ignitionrobotics.org/1.0/benchmarks/gazebo --header 'authorization: Bearer '$AUTH0_JWT_TOKEN
curl -k -X POST -d @$1 https://api.gazebosim.org/1.0/benchmarks/gazebo --header 'authorization: Bearer '$AUTH0_JWT_TOKEN
4 changes: 2 additions & 2 deletions examples/standalone/joy_to_twist/README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Joy to Twist

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

## Build
Expand Down
2 changes: 1 addition & 1 deletion examples/standalone/joystick/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Joystick

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

The mapping of joystick buttons to fields in the message is the same as [this](http://wiki.ros.org/joy).
Expand Down
6 changes: 3 additions & 3 deletions examples/worlds/actor.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -67,16 +67,16 @@
<name>demo_actor</name>
<!-- override actor's pose, which has 1m in Z -->
<pose>0 0 0 0 0 0</pose>
<uri>https://fuel.ignitionrobotics.org/1.0/Mingfei/models/actor</uri>
<uri>https://fuel.gazebosim.org/1.0/Mingfei/models/actor</uri>
</include>

<actor name="actor_talking">
<skin>
<filename>https://fuel.ignitionrobotics.org/1.0/Mingfei/models/actor/tip/files/meshes/talk_b.dae</filename>
<filename>https://fuel.gazebosim.org/1.0/Mingfei/models/actor/tip/files/meshes/talk_b.dae</filename>
<scale>1.0</scale>
</skin>
<animation name="talk_b">
<filename>https://fuel.ignitionrobotics.org/1.0/Mingfei/models/actor/tip/files/meshes/talk_b.dae</filename>
<filename>https://fuel.gazebosim.org/1.0/Mingfei/models/actor/tip/files/meshes/talk_b.dae</filename>
<scale>0.055</scale>
<interpolate_x>true</interpolate_x>
</animation>
Expand Down
4 changes: 2 additions & 2 deletions examples/worlds/actors_population.sdf.erb
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,11 @@

<actor name="actor_<%= j*column + i %>">
<skin>
<filename>https://fuel.ignitionrobotics.org/1.0/Mingfei/models/actor/tip/files/meshes/talk_b.dae</filename>
<filename>https://fuel.gazebosim.org/1.0/Mingfei/models/actor/tip/files/meshes/talk_b.dae</filename>
<scale>1.0</scale>
</skin>
<animation name="talk_b">
<filename>https://fuel.ignitionrobotics.org/1.0/Mingfei/models/actor/tip/files/meshes/talk_b.dae</filename>
<filename>https://fuel.gazebosim.org/1.0/Mingfei/models/actor/tip/files/meshes/talk_b.dae</filename>
<scale>0.055</scale>
<interpolate_x>true</interpolate_x>
</animation>
Expand Down
2 changes: 1 addition & 1 deletion examples/worlds/breadcrumbs.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@
<pose>-2 0 0 0 0 0</pose>
<include>
<uri>
https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/X2 Config 1
https://fuel.gazebosim.org/1.0/OpenRobotics/models/X2 Config 1
</uri>
</include>
</model>
Expand Down
2 changes: 1 addition & 1 deletion examples/worlds/camera_sensor.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@
<include>
<pose>0 1 3 0.0 0.0 1.57</pose>
<uri>
https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/Construction Cone
https://fuel.gazebosim.org/1.0/OpenRobotics/models/Construction Cone
</uri>
</include>

Expand Down
2 changes: 1 addition & 1 deletion examples/worlds/depth_camera_sensor.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@
<include>
<pose>0 1 3 0.0 0.0 1.57</pose>
<uri>
https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/Construction Barrel
https://fuel.gazebosim.org/1.0/OpenRobotics/models/Construction Barrel
</uri>
</include>

Expand Down
2 changes: 1 addition & 1 deletion examples/worlds/elevator.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
</model>

<include>
<uri>https://fuel.ignitionrobotics.org/1.0/nlamprian/models/Elevator</uri>
<uri>https://fuel.gazebosim.org/1.0/nlamprian/models/Elevator</uri>
</include>

</world>
Expand Down
14 changes: 7 additions & 7 deletions examples/worlds/fuel.sdf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<!--
Demo of models being downloaded from http://app.ignitionrobotics.org/
Demo of models being downloaded from http://app.gazebosim.org/
-->
<sdf version="1.6">
<world name="shapes">
Expand Down Expand Up @@ -62,27 +62,27 @@
<include>
<name>Double pendulum</name>
<pose>-3 0 0 0 0 0</pose>
<uri>https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/Double pendulum with base</uri>
<uri>https://fuel.gazebosim.org/1.0/OpenRobotics/models/Double pendulum with base</uri>
</include>

<!-- Included model with meshes -->
<include>
<pose>3 -1 0 0 0 0</pose>
<uri>https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/Backpack</uri>
<uri>https://fuel.gazebosim.org/1.0/OpenRobotics/models/Backpack</uri>
</include>

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

<!-- Included actor with meshes using relative paths -->
<include>
<name>Actor Test</name>
<pose>0 0 0 0 0 0</pose>
<uri>https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/actor - relative paths</uri>
<uri>https://fuel.gazebosim.org/1.0/OpenRobotics/models/actor - relative paths</uri>
</include>

<!-- Model with meshes -->
Expand All @@ -93,14 +93,14 @@
<collision name="collision">
<geometry>
<mesh>
<uri>https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/Radio/4/files/meshes/Radio.dae</uri>
<uri>https://fuel.gazebosim.org/1.0/OpenRobotics/models/Radio/4/files/meshes/Radio.dae</uri>
</mesh>
</geometry>
</collision>
<visual name="visual">
<geometry>
<mesh>
<uri>https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/Radio/4/files/meshes/Radio.dae</uri>
<uri>https://fuel.gazebosim.org/1.0/OpenRobotics/models/Radio/4/files/meshes/Radio.dae</uri>
</mesh>
</geometry>
</visual>
Expand Down
4 changes: 2 additions & 2 deletions examples/worlds/fuel_textured_mesh.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -202,15 +202,15 @@
<static>true</static>
<name>Rescue Randy</name>
<pose>0 0 0 0 0 1.57</pose>
<uri>https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/Rescue Randy</uri>
<uri>https://fuel.gazebosim.org/1.0/OpenRobotics/models/Rescue Randy</uri>
</include>

<!-- Tube Light -->
<include>
<static>true</static>
<name>Tube Light</name>
<pose>1.5 0 3 0 0.78 0</pose>
<uri>https://fuel.ignitionrobotics.org/1.0/openrobotics/models/Tube Light</uri>
<uri>https://fuel.gazebosim.org/1.0/openrobotics/models/Tube Light</uri>
</include>

<light type="spot" name="tube_light">
Expand Down
2 changes: 1 addition & 1 deletion examples/worlds/gpu_lidar_sensor.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@
<include>
<pose>0 0 0 0 0 1.57</pose>
<uri>
https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/Playground
https://fuel.gazebosim.org/1.0/OpenRobotics/models/Playground
</uri>
</include>

Expand Down
2 changes: 1 addition & 1 deletion examples/worlds/import_mesh.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
<static>true</static>
<name>Electrical Box</name>
<pose>0 0 0 0 0 0</pose>
<uri>https://fuel.ignitionrobotics.org/1.0/openrobotics/models/Electrical Box</uri>
<uri>https://fuel.gazebosim.org/1.0/openrobotics/models/Electrical Box</uri>
</include>

</world>
Expand Down
2 changes: 1 addition & 1 deletion examples/worlds/log_record_resources.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
<static>false</static>
<name>staging_area</name>
<pose>0 0 0 0 0 0</pose>
<uri>https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/X2 Config 1</uri>
<uri>https://fuel.gazebosim.org/1.0/OpenRobotics/models/X2 Config 1</uri>
</include>

<model name="ground_plane">
Expand Down
4 changes: 2 additions & 2 deletions examples/worlds/multicopter_velocity_control.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ You can use the velocity controller and command linear velocity and yaw angular

<include>
<uri>
https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/X3 UAV/4
https://fuel.gazebosim.org/1.0/OpenRobotics/models/X3 UAV/4
</uri>
<plugin
filename="ignition-gazebo-multicopter-motor-model-system"
Expand Down Expand Up @@ -232,7 +232,7 @@ You can use the velocity controller and command linear velocity and yaw angular
<include>
<pose>0 3 1 0 0 0</pose>
<uri>
https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/X4 UAV Config 1
https://fuel.gazebosim.org/1.0/OpenRobotics/models/X4 UAV Config 1
</uri>

<plugin filename="ignition-gazebo-multicopter-motor-model-system"
Expand Down
2 changes: 1 addition & 1 deletion examples/worlds/plot_3d.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@

<include>
<name>Double_pendulum</name>
<uri>https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/Double pendulum with base</uri>
<uri>https://fuel.gazebosim.org/1.0/OpenRobotics/models/Double pendulum with base</uri>
</include>

</world>
Expand Down
2 changes: 1 addition & 1 deletion examples/worlds/quadcopter.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@

<include>
<uri>
https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/X3 UAV/4
https://fuel.gazebosim.org/1.0/OpenRobotics/models/X3 UAV/4
</uri>
<plugin
filename="ignition-gazebo-multicopter-motor-model-system"
Expand Down
2 changes: 1 addition & 1 deletion examples/worlds/sensors_demo.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,7 @@
<include>
<pose>0 1 3 0.0 0.0 1.57</pose>
<uri>
https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/Construction Cone
https://fuel.gazebosim.org/1.0/OpenRobotics/models/Construction Cone
</uri>
</include>

Expand Down
2 changes: 1 addition & 1 deletion examples/worlds/tracked_vehicle_simple.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -1719,7 +1719,7 @@
<include>
<name>pallet</name>
<pose>2 -2 0.1 0 0 0</pose>
<uri>https://fuel.ignitionrobotics.org/1.0/openrobotics/models/Euro pallet</uri>
<uri>https://fuel.gazebosim.org/1.0/openrobotics/models/Euro pallet</uri>
</include>

<gui fullscreen='0'>
Expand Down
Loading

0 comments on commit 61df2c3

Please sign in to comment.