Skip to content

Conversation

@azeey
Copy link
Contributor

@azeey azeey commented Aug 12, 2025

➡️ Forward port

Port ign-gazebo6 ➡️ gz-sim8

Notable changes:

Branch comparison: gz-sim8...ign-gazebo6

Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)

arjo129 and others added 30 commits October 8, 2021 14:43
Signed-off-by: Arjo Chakravarty <[email protected]>
Signed-off-by: Arjo Chakravarty <[email protected]>
Signed-off-by: Arjo Chakravarty <[email protected]>
…cs/ign-gazebo into arjo/fix/detachable_joint
Signed-off-by: Michael Carroll <[email protected]>
CMake checks if rendering is available to enable some tests, so the
rendering environment needs to be set before CMake runs.

---------

Signed-off-by: Addisu Z. Taddese <[email protected]>
Signed-off-by: Addisu Z. Taddese <[email protected]>
Merge ign-gazebo3 ➡️  ign-gazebo6
Signed-off-by: Michael Carroll <[email protected]>
Signed-off-by: Michael Carroll <[email protected]>
* Disable failing testFixture_TEST for MacOS

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

* Add comment with issue

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

* Update issue comment

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

---------

Signed-off-by: Crola1702 <[email protected]>
n particular if a user despawns an entity, the associated plugin gets removed. This should prevent issues like gazebosim#2165. TBH I'm not sure if this is the right way forward as a system should technically be able to access any entity in a traditional ECS.

The PR has now been reworked and greatly simplified. All we do is stop all worker threads if an entity is removed and then recreate remaining threads.

Signed-off-by: Arjo Chakravarty <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Arjo Chakravarty <[email protected]>
Signed-off-by: Arjo Chakravarty <[email protected]>
- Add better logging
- Filter by models only
- Check child link immediately

Signed-off-by: Arjo Chakravarty <[email protected]>
Signed-off-by: Arjo Chakravarty <[email protected]>
Signed-off-by: Arjo Chakravarty <[email protected]>
Signed-off-by: Arjo Chakravarty <[email protected]>
Signed-off-by: Arjo Chakravarty <[email protected]>
…joint

Fix an issue where an incorrect child model is selected in the DetachableJoint system if multiple models with the given `child_model` name are present. The updated logic resolves this scenario by selecting the first model that 
- is a child of the parent model and 
- also has a link with the given `child_link` name.

---------

Signed-off-by: Arjo Chakravarty <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
Co-authored-by: Louise Poubel <[email protected]>
shameekganguly and others added 13 commits August 13, 2024 21:27
Signed-off-by: Ian Chen <[email protected]>
(cherry picked from commit 57599fb)

Co-authored-by: Ian Chen <[email protected]>
…ary. (backport gazebosim#2596) (gazebosim#2684)

* Improve load times by skipping serialization of entities when unecessary. (gazebosim#2596)

* A hack to greatly improve load times

I was investigating
gazebosim/gazebo_test_cases#1576 , in my
investigation it came to my notice that `sdf::Element` takes forever to
destroy (We should open a ticket somewhere about this). If we are
skipping serialization we might as well not create and destroy an
SDF Element. This hack greatly speeds up the load time for gazebo.

Signed-off-by: Arjo Chakravarty <[email protected]>
Co-authored-by: Arjo Chakravarty <[email protected]>
Co-authored-by: Arjo Chakravarty <[email protected]>
Signed-off-by: Jose Luis Rivero <[email protected]>
Signed-off-by: Jose Luis Rivero <[email protected]>
Signed-off-by: Tatsuro Sakaguchi <[email protected]>
Co-authored-by: Alejandro Hernández Cordero <[email protected]>
(cherry picked from commit dd3e241)
* Bump version to 6.17.0

---------
Signed-off-by: Jose Luis Rivero <[email protected]>
Co-authored-by: Ian Chen <[email protected]>
gazebosim#2732) (gazebosim#2735)

Signed-off-by: Josh Newans <[email protected]>
(cherry picked from commit 06e16bc)

Co-authored-by: Josh Newans <[email protected]>
…gazebosim#2742)

- Reduces serialization warnings on `sdf::Model` so it only occurs when
  the `relative_to` attribute is set. This was the intended behavior
  originally, but there was a bug in the code.
- Eliminate `sdf::World` warnings by specializing the `DefaultSerializer` for `sdf::World`.

---------

Signed-off-by: Addisu Z. Taddese <[email protected]>
(cherry picked from commit 1739bdb)
Signed-off-by: Addisu Z. Taddese <[email protected]>
Signed-off-by: Erling Rennemo Jellum

(cherry picked from commit 13bf5be)

Signed-off-by: Erling Rennemo Jellum
Signed-off-by: erlingrj <[email protected]>
Signed-off-by: erling <[email protected]>
Signed-off-by: Addisu Z. Taddese <[email protected]>
Co-authored-by: erling <[email protected]>
Co-authored-by: Addisu Z. Taddese <[email protected]>
Co-authored-by: Ian Chen <[email protected]>
Signed-off-by: Addisu Z. Taddese <[email protected]>
(cherry picked from commit 6a2df65)
Signed-off-by: Addisu Z. Taddese <[email protected]>
Copy link
Contributor

@arjo129 arjo129 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There seem to be some style related issues introduced by myself. I have a patch (see #3028 ) but am not sure if I should directly push the patch onto this branch or open a pr fixing the style issue in fortress prior to merging it.

@github-project-automation github-project-automation bot moved this from Inbox to In review in Core development Aug 12, 2025
@azeey azeey merged commit b2fc6de into gazebosim:gz-sim8 Aug 12, 2025
8 of 10 checks passed
@github-project-automation github-project-automation bot moved this from In review to Done in Core development Aug 12, 2025
@iche033
Copy link
Contributor

iche033 commented Aug 12, 2025

The change in shader_param.sdf was added in #2498, but I'm not sure whether it should be forward ported because that PR itself was a backport. cc @iche033

Looks like the change is to use the older version of model on fuel that still uses ignition::gazebo::systems::ShaderParam. The latest version of the model uses gz::sim::systems::ShaderParam so we shouldn't need to merge forward.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

🎵 harmonic Gazebo Harmonic

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.