Add shapes plugin #107

JShep1 · 2020-04-28T05:59:27Z

This PR makes use of ign-gazebo#95 so that PR will need to be merged before this one (it doesn't have to be, but I thought a separate PR for that functionality would be better for visibility and documentation purposes.

There are a few things I made "prototypes" of that I would like to have looked and discussed for improvement:

The unused entity id generation in UniqueId()
How should the hovered mouse position be stored for best scalability and access for future users of the value
Should the code for creating a model from the sdf string be moved to a separate function?
Is the current location of HandleModelPlacement() good/could there be a better way to handle the mouse events here?

~~There's currently a bug with this addition messing with the button pressing functionalities - I'll take a closer look at this soon~~

Resolves #81

Signed-off-by: John Shepherd <john@openrobotics.org>

JShep1 · 2020-04-28T07:21:58Z

Demo:

Signed-off-by: John Shepherd <john@openrobotics.org>

chapulina

It's working for me!

Should the code for creating a model from the sdf string be moved to a separate function?

+1

I noticed this issue when spawning entities from below the ground. The spawned pose is slightly offset from the preview pose at click time:

src/gui/plugins/scene3d/Scene3D.cc

src/gui/plugins/shapes/Shapes.cc

src/gui/plugins/shapes/Shapes.hh

src/gui/plugins/shapes/Shapes.qml

Signed-off-by: John Shepherd <john@openrobotics.org>

…cs/ign-gazebo into add_shapes_plugin

JShep1 · 2020-05-05T23:17:24Z

I noticed this issue when spawning entities from below the ground. The spawned pose is slightly offset from the preview pose at click time:

Fixed in dd864dd

JShep1 · 2020-05-06T06:54:31Z

Ready for another iteration

include/ignition/gazebo/rendering/SceneManager.hh

src/gui/plugins/scene3d/Scene3D.cc

src/gui/plugins/shapes/Shapes.qml

src/gui/plugins/scene3d/Scene3D.cc

Signed-off-by: John Shepherd <john@openrobotics.org>

codecov · 2020-05-10T23:26:29Z

Codecov Report

❗ No coverage uploaded for pull request base (ign-gazebo2@dd5c72b). Click here to learn what that means.
The diff coverage is n/a.

@@              Coverage Diff               @@
##             ign-gazebo2     #107   +/-   ##
==============================================
  Coverage               ?   62.38%           
==============================================
  Files                  ?      123           
  Lines                  ?     6091           
  Branches               ?        0           
==============================================
  Hits                   ?     3800           
  Misses                 ?     2291           
  Partials               ?        0

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 dd5c72b...5d7f4ac. Read the comment docs.

Signed-off-by: John Shepherd <john@openrobotics.org>

iche033

the new mouse hover events works great

I only have a couple comments left. Otherwise looks good to me.

src/gui/plugins/scene3d/Scene3D.hh

src/gui/plugins/scene3d/Scene3D.cc

Signed-off-by: John Shepherd <john@openrobotics.org>

chapulina

Works great!

Signed-off-by: John Shepherd <john@openrobotics.org>

* Add shapes plugin (#107) Signed-off-by: John Shepherd <john@openrobotics.org> * Add option to suppress warning about missing child model (#132) Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org> * Support multi entity spawn (#146) * Support multi entity spawn Signed-off-by: Nate Koenig <nate@openrobotics.org> * Added more documentation Signed-off-by: Nate Koenig <nate@openrobotics.org> Co-authored-by: Nate Koenig <nate@openrobotics.org> * Bump ign-msgs version to 4.9 (#148) Signed-off-by: Louise Poubel <louise@openrobotics.org> * Revert silly mistake Signed-off-by: Nate Koenig <nate@openrobotics.org> * ign-msgs 5.3 dependency Signed-off-by: Nate Koenig <nate@openrobotics.org> * Bump minor version Signed-off-by: Nate Koenig <nate@openrobotics.org> * Changelog Signed-off-by: Nate Koenig <nate@openrobotics.org> * RawPose Signed-off-by: Nate Koenig <nate@openrobotics.org> Co-authored-by: John <john@openrobotics.org> Co-authored-by: Addisu Taddese <addisu@openrobotics.org> Co-authored-by: Nate Koenig <nate@openrobotics.org> Co-authored-by: Louise Poubel <louise@openrobotics.org>

Signed-off-by: John Shepherd <john@openrobotics.org> Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>

jshep1 and others added 10 commits April 8, 2020 11:16

Add skeleton shapes plugin

52d801a

Merge

844f44f

Connect to scene3d

704a1ca

Add literal sdf string

4e12dcb

Add framework logic for model placement

5fc8100

Signed-off-by: John Shepherd <john@openrobotics.org>

Add hover mouse detection

4c3af71

Signed-off-by: John Shepherd <john@openrobotics.org>

Fix tracking, add uuid generation

250a966

Signed-off-by: John Shepherd <john@openrobotics.org>

Style fixes

c2721a7

Signed-off-by: John Shepherd <john@openrobotics.org>

Add escape exit for shapes

e84f8c9

Signed-off-by: John Shepherd <john@openrobotics.org>

minor revisions

3c5913c

Signed-off-by: John Shepherd <john@openrobotics.org>

Update placement logic, move handle model function

0c4e776

Signed-off-by: John Shepherd <john@openrobotics.org>

JShep1 requested review from chapulina and iche033 April 28, 2020 07:23

chapulina added the 📜 blueprint Ignition Blueprint label Apr 28, 2020

chapulina added this to Inbox in Core development via automation Apr 28, 2020

chapulina moved this from Inbox to In review in Core development Apr 28, 2020

add force focus back

c639e90

Signed-off-by: John Shepherd <john@openrobotics.org>

chapulina suggested changes Apr 28, 2020

View reviewed changes

This was referenced Apr 29, 2020

Insert simple shapes #81

Closed

Insert lights from the GUI #119

Closed

John Shepherd added 4 commits May 5, 2020 11:35

Feedback

207a9b0

Signed-off-by: John Shepherd <john@openrobotics.org>

Merge branch 'ign-gazebo2' into add_shapes_plugin

919196a

more fixes

dd864dd

Signed-off-by: John Shepherd <john@openrobotics.org>

Merge branch 'add_shapes_plugin' of https://github.com/ignitionroboti…

3197375

…cs/ign-gazebo into add_shapes_plugin

JShep1 requested a review from chapulina May 6, 2020 06:54

iche033 requested changes May 8, 2020

View reviewed changes

Add suggested fixes

88456da

Signed-off-by: John Shepherd <john@openrobotics.org>

John Shepherd added 2 commits May 12, 2020 13:32

Fix hover issue

ace7cf6

Signed-off-by: John Shepherd <john@openrobotics.org>

minor fixes

ec2d828

Signed-off-by: John Shepherd <john@openrobotics.org>

JShep1 requested a review from iche033 May 12, 2020 20:39

iche033 reviewed May 12, 2020

View reviewed changes

src/gui/plugins/scene3d/Scene3D.hh Show resolved Hide resolved

src/gui/plugins/scene3d/Scene3D.cc Outdated Show resolved Hide resolved

John Shepherd added 2 commits May 12, 2020 15:30

Only take first model

a0e82b0

Signed-off-by: John Shepherd <john@openrobotics.org>

Add docs

5d7f4ac

Signed-off-by: John Shepherd <john@openrobotics.org>

JShep1 requested a review from iche033 May 13, 2020 17:12

iche033 approved these changes May 13, 2020

View reviewed changes

chapulina approved these changes May 14, 2020

View reviewed changes

JShep1 merged commit 24573da into ign-gazebo2 May 14, 2020

Core development automation moved this from In review to Done May 14, 2020

JShep1 deleted the add_shapes_plugin branch May 14, 2020 17:19

azeey pushed a commit to azeey/gz-sim that referenced this pull request May 20, 2020

Add shapes plugin (gazebosim#107)

f892176

Signed-off-by: John Shepherd <john@openrobotics.org>

osrf-migration mentioned this pull request May 26, 2020

Insert model from the GUI #31

Closed

azeey pushed a commit to azeey/gz-sim that referenced this pull request May 28, 2020

Add shapes plugin (gazebosim#107)

31f46e3

Signed-off-by: John Shepherd <john@openrobotics.org> Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>

j-rivero removed this from Done in Core development May 6, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add shapes plugin #107

Add shapes plugin #107

JShep1 commented Apr 28, 2020 •

edited

Loading

JShep1 commented Apr 28, 2020

chapulina left a comment

JShep1 commented May 5, 2020

JShep1 commented May 6, 2020

codecov bot commented May 10, 2020 •

edited

Loading

iche033 left a comment

chapulina left a comment

Add shapes plugin #107

Add shapes plugin #107

Conversation

JShep1 commented Apr 28, 2020 • edited Loading

JShep1 commented Apr 28, 2020

chapulina left a comment

Choose a reason for hiding this comment

JShep1 commented May 5, 2020

JShep1 commented May 6, 2020

codecov bot commented May 10, 2020 • edited Loading

Codecov Report

iche033 left a comment

Choose a reason for hiding this comment

chapulina left a comment

Choose a reason for hiding this comment

JShep1 commented Apr 28, 2020 •

edited

Loading

codecov bot commented May 10, 2020 •

edited

Loading