Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Track and Follow options in gui EntityContextMenu #2402

Merged
merged 8 commits into from
May 22, 2024

Conversation

bperseghetti
Copy link
Collaborator

@bperseghetti bperseghetti commented May 10, 2024

馃帀 New feature

Summary

I would like to thank NXP for their support in enabling this work.

Depends on:

This adds a new /gui/track topic using the CameraTrack message to control multiple types of tracking and associated pgain(s), target(s) and offset(s). Furthermore it publishes a tracking camera status CameraTrack message on /gui/currently_tracked

This also adds an 3 unique follow modes and a tracking mode all able to be set from either the /gui/track topic or more ideally from the user gui.

The 3 follow modes are in a submenu under the right click top level menu Follow Options > and are:

  • Follow - Traditional follow mode where camera follows and tracks the same target.
    follow

  • Free Look - Enables a user to follow a target while still using an input device (IE mouse) to look around.
    follow_free_look

  • Look At - Only enabled after already selecting a primary object to follow, this allows a user to track a unique secondary target while following the primary target.
    follow_look_at

The other right click top level menu item added is Track, where the gui camera can be moved anywhere in the simulator but will always track the selected object.
track

These all respect using the escape key to stop any form of tracking.

Test it

Use these changes for collection-harmonic.yaml:

repositories:
  gz-gui:
    type: git
    url: https://github.com/rudislabs/gz-gui.git
    version: pr-track-follow
  gz-msgs:
    type: git
    url: https://github.com/rudislabs/gz-msgs.git
    version: pr-track-follow
  gz-sim:
    type: git
    url: https://github.com/rudislabs/gz-sim.git
    version: pr-track-follow

Checklist

  • Signed all commits for DCO
  • Added tests
  • Added example and/or tutorial
  • Updated documentation (as needed)
  • Updated migration guide (as needed)
  • Consider updating Python bindings (if the library has them)
  • codecheck passed (See contributing)
  • All tests passed (See test coverage)
  • While waiting for a review on your PR, please help review another open pull request to support the maintainers

Note to maintainers: Remember to use Squash-Merge and edit the commit message to match the pull request summary while retaining Signed-off-by messages.

Signed-off-by: Benjamin Perseghetti <bperseghetti@rudislabs.com>
Signed-off-by: Benjamin Perseghetti <bperseghetti@rudislabs.com>
Signed-off-by: Benjamin Perseghetti <bperseghetti@rudislabs.com>
Signed-off-by: Benjamin Perseghetti <bperseghetti@rudislabs.com>
Signed-off-by: Benjamin Perseghetti <bperseghetti@rudislabs.com>
src/gui/plugins/modules/EntityContextMenu.cc Show resolved Hide resolved
src/gui/plugins/modules/EntityContextMenu.cc Show resolved Hide resolved
src/gui/plugins/modules/EntityContextMenu.cc Outdated Show resolved Hide resolved
src/gui/plugins/modules/EntityContextMenu.cc Outdated Show resolved Hide resolved
src/gui/plugins/modules/EntityContextMenu.cc Outdated Show resolved Hide resolved
src/gui/plugins/modules/EntityContextMenu.cc Outdated Show resolved Hide resolved
src/gui/plugins/modules/EntityContextMenu.hh Outdated Show resolved Hide resolved
Co-authored-by: Alejandro Hern谩ndez Cordero <ahcorde@gmail.com>
Signed-off-by: Benjamin Perseghetti <bperseghetti@rudislabs.com>
Signed-off-by: Benjamin Perseghetti <bperseghetti@rudislabs.com>
src/gui/plugins/modules/EntityContextMenu.cc Outdated Show resolved Hide resolved
Co-authored-by: Jenn Nguyen <jenn.nguyen02@gmail.com>
Signed-off-by: Benjamin Perseghetti <bperseghetti@rudislabs.com>
@ahcorde ahcorde added the needs upstream release Blocked by a release of an upstream library label May 20, 2024
@j-rivero
Copy link
Contributor

@osrf-jenkins run tests

1 similar comment
@bperseghetti
Copy link
Collaborator Author

@osrf-jenkins run tests

@bperseghetti bperseghetti dismissed ahcorde鈥檚 stale review May 22, 2024 18:52

Dismissed review as all requested changes were made.

@ahcorde ahcorde merged commit 7c95f5a into gazebosim:gz-sim8 May 22, 2024
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
馃幍 harmonic Gazebo Harmonic needs upstream release Blocked by a release of an upstream library
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

None yet

5 participants