Added Spawn plugin (#983)

Signed-off-by: ahcorde <[email protected]> Signed-off-by: Louise Poubel <[email protected]> Co-authored-by: Louise Poubel <[email protected]>
gazebosim · Sep 8, 2021 · 1fb3207 · 1fb3207
1 parent f48085b
commit 1fb3207
Show file tree

Hide file tree

Showing 8 changed files with 645 additions and 4 deletions.
diff --git a/examples/worlds/minimal_scene.sdf b/examples/worlds/minimal_scene.sdf
@@ -13,14 +13,15 @@ Features:
 * Grid config
 * Select entities
 * Transform controls
+* Spawn entities through GUI
 
 Missing for parity with GzScene3D:
 
-* Spawn entities through GUI
 * Context menu
 * Record video
 * View angles
 * View collisions, wireframe, transparent, CoM, etc
+* Drag and drop from Fuel / meshes
 * ...
 
 -->
@@ -160,6 +161,20 @@ Missing for parity with GzScene3D:
         <topic>/world/buoyancy/stats</topic>
       </plugin>
 
+      <plugin filename="Spawn" name="Spawn Entities">
+        <ignition-gui>
+          <anchors target="Select entities">
+            <line own="right" target="right"/>
+            <line own="top" target="top"/>
+          </anchors>
+          <property key="resizable" type="bool">false</property>
+          <property key="width" type="double">5</property>
+          <property key="height" type="double">5</property>
+          <property key="state" type="string">floating</property>
+          <property key="showTitleBar" type="bool">false</property>
+        </ignition-gui>
+      </plugin>
+
       <!-- Insert simple shapes -->
       <plugin filename="Shapes" name="Shapes">
         <ignition-gui>

diff --git a/src/gui/plugins/CMakeLists.txt b/src/gui/plugins/CMakeLists.txt
@@ -132,6 +132,7 @@ add_subdirectory(scene3d)
 add_subdirectory(select_entities)
 add_subdirectory(scene_manager)
 add_subdirectory(shapes)
+add_subdirectory(spawn)
 add_subdirectory(transform_control)
 add_subdirectory(video_recorder)
 add_subdirectory(view_angle)

diff --git a/src/gui/plugins/select_entities/SelectEntities.cc b/src/gui/plugins/select_entities/SelectEntities.cc
@@ -135,6 +135,9 @@ class ignition::gazebo::gui::SelectEntitiesPrivate
 
   /// \brief is transform control active ?
   public: bool transformControlActive = false;
+
+  /// \brief Is an entity being spawned
+  public: bool isSpawning{false};
 };
 
 using namespace ignition;
@@ -485,11 +488,18 @@ bool SelectEntities::eventFilter(QObject *_obj, QEvent *_event)
     ignition::gui::events::LeftClickOnScene *_e =
       static_cast<ignition::gui::events::LeftClickOnScene*>(_event);
     this->dataPtr->mouseEvent = _e->Mouse();
-    // handle transform control
+
     if (this->dataPtr->mouseEvent.Button() == common::MouseEvent::LEFT &&
-        this->dataPtr->mouseEvent.Type() == common::MouseEvent::PRESS)
+        this->dataPtr->mouseEvent.Type() == common::MouseEvent::RELEASE)
     {
-      this->dataPtr->mouseDirty = true;
+      if (this->dataPtr->isSpawning)
+      {
+        this->dataPtr->isSpawning = false;
+      }
+      else
+      {
+        this->dataPtr->mouseDirty = true;
+      }
     }
   }
   else if (_event->type() == ignition::gui::events::Render::kType)
@@ -545,6 +555,13 @@ bool SelectEntities::eventFilter(QObject *_obj, QEvent *_event)
     this->dataPtr->selectedEntitiesID.clear();
     this->dataPtr->selectedEntities.clear();
   }
+  else if (_event->type() ==
+    ignition::gui::events::SpawnFromDescription::kType ||
+    _event->type() == ignition::gui::events::SpawnFromPath::kType)
+  {
+    this->dataPtr->isSpawning = true;
+    this->dataPtr->mouseDirty = true;
+  }
   else if (_event->type() == ignition::gui::events::KeyReleaseOnScene::kType)
   {
     ignition::gui::events::KeyReleaseOnScene *_e =
@@ -553,6 +570,7 @@ bool SelectEntities::eventFilter(QObject *_obj, QEvent *_event)
     {
       this->dataPtr->mouseDirty = true;
       this->dataPtr->selectionHelper.deselectAll = true;
+      this->dataPtr->isSpawning = false;
     }
   }
 

diff --git a/src/gui/plugins/spawn/CMakeLists.txt b/src/gui/plugins/spawn/CMakeLists.txt
@@ -0,0 +1,8 @@
+gz_add_gui_plugin(Spawn
+  SOURCES
+    Spawn.cc
+  QT_HEADERS
+    Spawn.hh
+  PUBLIC_LINK_LIBS
+    ${PROJECT_LIBRARY_TARGET_NAME}-rendering
+)