Added camera tracking #226

ahcorde · 2021-05-26T20:58:17Z

Signed-off-by: ahcorde [email protected]

🎉 New feature

Summary

This PR is part of the consolidation between the scene3d in ign-gui and ign-gazebo.

This plugin allows to follow and moveto the camera. This requires to change a small detail in ign-gui scene3D when we create the camera, instead of using the method createCamera(void) we should use createCamera(string). Then we will be able to fetch the camera from this plugin.

Related PRs:

Checklist

Signed all commits for DCO
Added tests
Added example and/or tutorial
Updated documentation (as needed)
Updated migration guide (as needed)
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

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

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

ahcorde · 2021-06-10T07:44:34Z

TODO

* Add sky tag to the new Scene3D Signed-off-by: ahcorde <[email protected]> * Update docs Signed-off-by: ahcorde <[email protected]>

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

chapulina

I know this is still WIP, but I'll leave a note to myself that this PR doesn't compile by itself:

/home/chapulina/dev_bionic/ws_fortress/src/ign-gui/src/plugins/camera_controller_manager/CameraControllerManager.cc:434:63: error: 'KeyReleaseToScene' in namespace 'ignition::gui::events' does not name a type
     events::KeyReleaseToScene *keyEvent = static_cast<events::KeyReleaseToScene*>(_event);

src/plugins/camera_controller_manager/CameraControllerManager.cc

src/plugins/camera_controller_manager/CameraControllerManager.hh

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

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

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

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

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

chapulina

Works for me! I pushed some changes in 5fc8a01:

Added to scene.config
Added manual testing instructions to scene_provider

I think this would be a good opportunity to add tests, what do you think? 😇

src/plugins/camera_tracking/CameraTracking.hh

src/plugins/camera_tracking/CameraTracking.cc

codecov · 2021-07-01T02:29:00Z

Codecov Report

Merging #226 (9c4df01) into main (1190ed0) will increase coverage by 3.66%.
The diff coverage is 55.15%.

❗ Current head 9c4df01 differs from pull request most recent head 3a5ae75. Consider uploading reports for the commit 3a5ae75 to get more accurate results

@@            Coverage Diff             @@
##             main     #226      +/-   ##
==========================================
+ Coverage   61.57%   65.24%   +3.66%     
==========================================
  Files          21       27       +6     
  Lines        2803     3979    +1176     
==========================================
+ Hits         1726     2596     +870     
- Misses       1077     1383     +306

Impacted Files	Coverage Δ
include/ignition/gui/GuiEvents.hh	`100.00% <ø> (ø)`
src/Conversions.cc	`100.00% <ø> (ø)`
src/plugins/image_display/ImageDisplay.cc	`30.32% <0.00%> (+7.05%)`	⬆️
src/Plugin.cc	`57.44% <17.64%> (-2.83%)`	⬇️
src/plugins/screenshot/Screenshot.cc	`33.33% <33.33%> (ø)`
src/plugins/minimal_scene/MinimalScene.cc	`52.15% <52.15%> (ø)`
...s/transport_scene_manager/TransportSceneManager.cc	`52.29% <52.29%> (ø)`
src/plugins/camera_tracking/CameraTracking.cc	`68.45% <68.45%> (ø)`
src/plugins/scene3d/Scene3D.cc	`48.63% <71.51%> (+35.85%)`	⬆️
src/Application.cc	`84.89% <100.00%> (+0.20%)`	⬆️
... and 10 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 6f50c9c...3a5ae75. Read the comment docs.

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

…ller_manager

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

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

chapulina · 2021-07-02T02:41:58Z

I added a test and some other final tweaks in 3a5ae75. I think this is ready! Update: almost ready!

chapulina · 2021-07-02T02:55:06Z

src/plugins/camera_tracking/CameraTracking.cc

+/////////////////////////////////////////////////
+void CameraTrackingPrivate::Initialize()
+{
+  // Attach to the first camera we find


We have to sort this out to make sure we're not attaching to a plugin, see #231 (comment)

Let's get this in as is for now and handle choosing the camera in a future PR, added an item here: #137 (comment)

scpeters · 2021-07-07T20:25:16Z

CMakeLists.txt

@@ -44,7 +44,7 @@ set(IGN_MATH_VER ${ignition-math6_VERSION_MAJOR})

 #--------------------------------------
 # Find ignition-common
-ign_find_package(ignition-common4 REQUIRED VERSION 4.1)
+ign_find_package(ignition-common4 REQUIRED COMPONENTS profiler VERSION 4.1)


a nightly build failure is a good reminder to update the Debian metadata with this new dependency

https://build.osrfoundation.org/job/ign-gui6-debbuilder/190/

CMake Error at /usr/share/cmake/ignition-cmake2/cmake2/IgnConfigureBuild.cmake:59 (message): -- Missing dependency [ignition-common4] (Components: profiler)

We should add these to the buildfarmer's dashboard 😏

I will be learning about that soon

we can start by adding them to our Jenkins views: gazebo-tooling/release-tools#491

chapulina and others added 6 commits May 7, 2021 18:13

Split transport scene manager into a plugin outside Scene3D

3a05520

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

tweaks

a603923

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

Add scene provider example

0223961

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

Example to populate the scene using transport

b53bb5e

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

sceneFromFirstRenderEngine

dc3c7eb

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

Added camera_controller_manager

ca619ad

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

ahcorde requested a review from chapulina as a code owner May 26, 2021 20:58

ahcorde marked this pull request as draft May 26, 2021 20:58

ahcorde mentioned this pull request May 26, 2021

New scene manager GUI plugin that works with ign-gui's MinimalScene gazebosim/gz-sim#813

Merged

18 tasks

Fixed texture Id (#229)

a1627f8

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

Add sky tag to the new Scene3D (#230)

42e071f

* Add sky tag to the new Scene3D Signed-off-by: ahcorde <[email protected]> * Update docs Signed-off-by: ahcorde <[email protected]>

chapulina added the 🏯 fortress Ignition Fortress label Jun 17, 2021

chapulina added 2 commits June 17, 2021 16:40

Improve example

591d48c

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

Create a new plugin and deprecate old one

af9c530

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

ahcorde mentioned this pull request Jun 18, 2021

Consolidate Scene3D with ign-gazebo's GzScene3D #137

Closed

chapulina added 4 commits June 18, 2021 17:16

Add tests

c50f517

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

Add tutorial

0c4e312

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

Merge branch 'main' into chapulina/6/new_scene

f19621c

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

codecheck

6d3690d

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

chapulina reviewed Jun 23, 2021

View reviewed changes

src/plugins/camera_controller_manager/CameraControllerManager.cc Outdated Show resolved Hide resolved

src/plugins/camera_controller_manager/CameraControllerManager.hh Outdated Show resolved Hide resolved

chapulina and others added 7 commits June 24, 2021 15:40

Merge branch 'main' into chapulina/6/new_scene

f9e9a52

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

Merge branch 'main' into chapulina/6/new_scene

7e3be22

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

Update plugins with forward merge, improve pose example

1896080

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

PR feedback

8a3f62f

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

PR feedback

42f29c0

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

Merge branch 'main' into chapulina/6/new_scene

dea2fd4

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

Merge branch 'main' into chapulina/6/new_scene

081410e

ahcorde requested a review from jennuine as a code owner June 28, 2021 16:15

ahcorde changed the title ~~Added camera_controller_manager~~ Added camera tracking Jun 28, 2021

make linters happy

65fb234

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

ahcorde requested a review from chapulina June 29, 2021 08:04

chapulina added 4 commits June 30, 2021 14:21

Merge branch 'main' into chapulina/6/new_scene

c0ebe09

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

ign-utils impl

cdb85dc

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

Merge branch 'chapulina/6/new_scene' into ahcorde/camera_controller_m…

25d0d1c

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

Add to scene.config and to examples

5fc8a01

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

chapulina approved these changes Jul 1, 2021

View reviewed changes

src/plugins/camera_tracking/CameraTracking.hh Outdated Show resolved Hide resolved

src/plugins/camera_tracking/CameraTracking.cc Outdated Show resolved Hide resolved

Added feedback and other tweaks

1a75774

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

ahcorde requested a review from chapulina July 1, 2021 11:02

Base automatically changed from chapulina/6/new_scene to main July 1, 2021 18:23

Merge remote-tracking branch 'origin/main' into ahcorde/camera_contro…

ce06dda

…ller_manager

ahcorde mentioned this pull request Jul 1, 2021

Split transport scene manager into a plugin outside Scene3D #221

Merged

8 tasks

ahcorde and others added 2 commits July 1, 2021 20:35

Restored Scene3d example config file

cb656ee

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

Add test, some cleanup

3a5ae75

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

chapulina mentioned this pull request Jul 2, 2021

Added Interactive view control plugin #231

Merged

8 tasks

chapulina suggested changes Jul 2, 2021

View reviewed changes

chapulina approved these changes Jul 6, 2021

View reviewed changes

chapulina merged commit bbad5be into main Jul 6, 2021

chapulina deleted the ahcorde/camera_controller_manager branch July 6, 2021 22:29

scpeters reviewed Jul 7, 2021

View reviewed changes

caguero mentioned this pull request Jul 16, 2021

👩‍🌾 New warnings introduced on Windows #255

Closed

chapulina mentioned this pull request Jul 29, 2021

Add profiler dependency gazebo-release/gz-gui6-release#2

Merged

chapulina mentioned this pull request Oct 1, 2021

Make camera tracking configurable from startup #298

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added camera tracking #226

Added camera tracking #226

ahcorde commented May 26, 2021 •

edited

Loading

ahcorde commented Jun 10, 2021 •

edited

Loading

chapulina left a comment

chapulina left a comment

codecov bot commented Jul 1, 2021 •

edited

Loading

chapulina commented Jul 2, 2021 •

edited

Loading

chapulina Jul 2, 2021

chapulina Jul 6, 2021

scpeters Jul 7, 2021

chapulina Jul 7, 2021

scpeters Jul 7, 2021

scpeters Jul 16, 2021

Added camera tracking #226

Added camera tracking #226

Conversation

ahcorde commented May 26, 2021 • edited Loading

🎉 New feature

Summary

Checklist

ahcorde commented Jun 10, 2021 • edited Loading

chapulina left a comment

Choose a reason for hiding this comment

chapulina left a comment

Choose a reason for hiding this comment

codecov bot commented Jul 1, 2021 • edited Loading

Codecov Report

chapulina commented Jul 2, 2021 • edited Loading

chapulina Jul 2, 2021

Choose a reason for hiding this comment

chapulina Jul 6, 2021

Choose a reason for hiding this comment

scpeters Jul 7, 2021

Choose a reason for hiding this comment

chapulina Jul 7, 2021

Choose a reason for hiding this comment

scpeters Jul 7, 2021

Choose a reason for hiding this comment

scpeters Jul 16, 2021

Choose a reason for hiding this comment

ahcorde commented May 26, 2021 •

edited

Loading

ahcorde commented Jun 10, 2021 •

edited

Loading

codecov bot commented Jul 1, 2021 •

edited

Loading

chapulina commented Jul 2, 2021 •

edited

Loading