Merge pull request #883 from lrineau/Three-Scene_group_can_draw-GF

Change the semantic of the Scene_group_item

Polyhedron/demo/Polyhedron/Scene.cpp

@@ -311,26 +311,28 @@ Scene::keyPressEvent(QKeyEvent* e){
     return res;
 }
 
-void
-Scene::draw()
-{
-    draw_aux(false, 0);
-}
 void
 Scene::draw(CGAL::Three::Viewer_interface* viewer)
 {
     draw_aux(false, viewer);
 }
 void
-Scene::drawWithNames()
-{
-    draw_aux(true, 0);
-}
-void
 Scene::drawWithNames(CGAL::Three::Viewer_interface* viewer)
 {
     draw_aux(true, viewer);
 }
+
+bool item_should_be_skipped_in_draw(Scene_item* item) {
+  if(!item->visible()) return true;
+  if(item->has_group == 0) return false;
+  Scene_group_item* group = item->parentGroup();
+  while(group != 0) {
+    if(!group->visible()) return false;
+    group = group->parentGroup();
+  }
+  return true;
+}
+
 void 
 Scene::draw_aux(bool with_names, CGAL::Three::Viewer_interface* viewer)
 {
@@ -343,6 +345,7 @@ Scene::draw_aux(bool with_names, CGAL::Three::Viewer_interface* viewer)
     for(int index = 0; index < m_entries.size(); ++index)
     {
         CGAL::Three::Scene_item& item = *m_entries[index];
+        if(!with_names && item_should_be_skipped_in_draw(&item)) continue;
         if(item.visible())
         {
             if(item.renderingMode() == Flat || item.renderingMode() == FlatPlusEdges || item.renderingMode() == Gouraud)
@@ -393,6 +396,7 @@ Scene::draw_aux(bool with_names, CGAL::Three::Viewer_interface* viewer)
     for(int index = 0; index < m_entries.size(); ++index)
     {
         CGAL::Three::Scene_item& item = *m_entries[index];
+        if(!with_names && item_should_be_skipped_in_draw(&item)) continue;
         if(item.visible())
         {
             if((item.renderingMode() == Wireframe || item.renderingMode() == PointsPlusNormals )
@@ -465,6 +469,7 @@ Scene::draw_aux(bool with_names, CGAL::Three::Viewer_interface* viewer)
     for(int index = 0; index < m_entries.size(); ++index)
     {
         CGAL::Three::Scene_item& item = *m_entries[index];
+        if(!with_names && item_should_be_skipped_in_draw(&item)) continue;
         if(item.visible())
         {
             if(item.renderingMode() == Points && with_names) {
@@ -502,11 +507,11 @@ Scene::draw_aux(bool with_names, CGAL::Three::Viewer_interface* viewer)
         // Splatting
         if(!with_names && ms_splatting->isSupported())
         {
-
             ms_splatting->beginVisibilityPass();
             for(int index = 0; index < m_entries.size(); ++index)
             {
                 CGAL::Three::Scene_item& item = *m_entries[index];
+                if(!with_names && item_should_be_skipped_in_draw(&item)) continue;
                 if(item.visible() && item.renderingMode() == Splatting)
                 {
 
@@ -1124,7 +1129,7 @@ void Scene::changeGroup(Scene_item *item, CGAL::Three::Scene_group_item *target_
   }
  //add the item to the target group
  target_group->addChild(item);
- item->has_group = target_group->has_group +1;
+ item->moveToGroup(target_group);
 }
 
 float Scene::get_bbox_length() const

Polyhedron/demo/Polyhedron/Scene.h

@@ -110,12 +110,8 @@ public:
    * of OpenGL code that needs a context.
    */
   void initializeGL();
-  /*! Is called by Viewer::draw(). Is deprecated and does nothing.*/
-  void draw();
   /*! Sets the screen coordinates of the currently picked point.*/
   void setPickedPixel(const QPoint &p) {picked_pixel = p;}
-  /*! Is deprecated and does nothing.*/
-  void drawWithNames();
   /*! Is called by Viewer::draw(Viewer_interface*). Calls draw_aux(false, viewer).
    * @see draw_aux(bool with_names, Viewer_interface).*/
   void draw(CGAL::Three::Viewer_interface*);

Polyhedron/demo/Polyhedron/Scene_group_item.cpp

@@ -1,5 +1,5 @@
-
 #include <CGAL/Three/Scene_group_item.h>
+#include <CGAL/Three/Viewer_interface.h>
 #include <QDebug>
 
 using namespace CGAL::Three;
@@ -116,3 +116,55 @@ void Scene_group_item::moveUp(int i)
 {
     children.move(i, i-1);
 }
+
+void Scene_group_item::draw(CGAL::Three::Viewer_interface* viewer) const {
+  if(viewer->inDrawWithNames()) return;
+  Q_FOREACH(Scene_item* child, children) {
+    if(!child->visible()) continue;
+    switch(child->renderingMode()) {
+    case Flat:
+    case FlatPlusEdges:
+    case Gouraud:
+      child->draw(viewer); break;
+    default: break;
+    }
+  }
+}
+
+void Scene_group_item::draw_edges(CGAL::Three::Viewer_interface* viewer) const
+{
+  if(viewer->inDrawWithNames()) return;
+  Q_FOREACH(Scene_item* child, children) {
+    if(!child->visible()) continue;
+    switch(child->renderingMode()) {
+    case FlatPlusEdges:
+    case Wireframe:
+    case PointsPlusNormals:
+      child->draw_edges(viewer); break;
+    default: break;
+    }
+  }
+}
+
+void Scene_group_item::draw_points(CGAL::Three::Viewer_interface* viewer) const
+{
+  if(viewer->inDrawWithNames()) return;
+  Q_FOREACH(Scene_item* child, children) {
+    if(!child->visible()) continue;
+    switch(child->renderingMode()) {
+    case Points:
+    case PointsPlusNormals:
+      child->draw_points(viewer); break;
+    default: break;
+    }
+  }
+}
+
+void Scene_group_item::draw_splats(CGAL::Three::Viewer_interface* viewer) const
+{
+  if(viewer->inDrawWithNames()) return;
+  Q_FOREACH(Scene_item* child, children) {
+    if(child->visible() && child->renderingMode() == Splatting)
+      child->draw_splats(viewer);
+  }
+}

Polyhedron/demo/Polyhedron/Scene_item.cpp

@@ -1,4 +1,5 @@
 #include <CGAL/Three/Scene_item.h>
+#include <CGAL/Three/Scene_group_item.h>
 #include <CGAL/Three/Scene_interface.h>
 #include <QMenu>
 #include <iostream>
@@ -6,6 +7,37 @@
 #include <CGAL/Three/Viewer_interface.h>
 const QColor CGAL::Three::Scene_item::defaultColor = QColor(100, 100, 255);
 
+CGAL::Three::Scene_item::Scene_item(int buffers_size, int vaos_size)
+  : name_("unamed"),
+    color_(defaultColor),
+    visible_(true),
+    are_buffers_filled(false),
+    rendering_mode(FlatPlusEdges),
+    defaultContextMenu(0),
+    buffersSize(buffers_size),
+    vaosSize(vaos_size),
+    vaos(vaos_size)
+{
+  is_bbox_computed = false;
+  is_monochrome = true;
+  for(int i=0; i<vaosSize; i++)
+  {
+    addVaos(i);
+    vaos[i]->create();
+  }
+
+  buffers.reserve(buffersSize);
+  for(int i=0; i<buffersSize; i++)
+  {
+    QOpenGLBuffer n_buf;
+    buffers.push_back(n_buf);
+    buffers[i].create();
+  }
+  nb_isolated_vertices = 0;
+  has_group = 0;
+  parent_group = 0;
+}
+
 CGAL::Three::Scene_item::~Scene_item() {
   delete defaultContextMenu;
   for(int i=0; i<buffersSize; i++)
@@ -101,6 +133,19 @@ QMenu* CGAL::Three::Scene_item::contextMenu()
     return defaultContextMenu;
 }
 
+CGAL::Three::Scene_group_item* CGAL::Three::Scene_item::parentGroup() const {
+  return parent_group;
+}
+
+void CGAL::Three::Scene_item::
+moveToGroup(CGAL::Three::Scene_group_item* group) {
+  parent_group = group;
+  if(group)
+    has_group = group->has_group + 1;
+  else
+    has_group = 0;
+}
+
 void CGAL::Three::Scene_item::invalidateOpenGLBuffers() {}
 
 void CGAL::Three::Scene_item::selection_changed(bool) {}

Polyhedron/demo/Polyhedron/Viewer.cpp

@@ -16,6 +16,7 @@ public:
   bool twosides;
   bool macro_mode;
   bool inFastDrawing;
+  bool inDrawWithNames;
   
   void draw_aux(bool with_names, Viewer*);
 
@@ -31,6 +32,7 @@ Viewer::Viewer(QWidget* parent, bool antialiasing)
   d->twosides = false;
   d->macro_mode = false;
   d->inFastDrawing = true;
+  d->inDrawWithNames = false;
   d->shader_programs.resize(NB_OF_PROGRAMS);
   setShortcut(EXIT_VIEWER, 0);
   setShortcut(DRAW_AXIS, 0);
@@ -328,6 +330,7 @@ void Viewer_impl::draw_aux(bool with_names, Viewer* viewer)
     viewer->glHint(GL_LINE_SMOOTH_HINT, GL_FASTEST);
     viewer->glBlendFunc(GL_ONE, GL_ZERO);
   }
+  inDrawWithNames = with_names;
   if(with_names)
     scene->drawWithNames(viewer);
   else
@@ -336,6 +339,10 @@ void Viewer_impl::draw_aux(bool with_names, Viewer* viewer)
   viewer->glPolygonMode(GL_FRONT_AND_BACK,GL_FILL);
 }
 
+bool Viewer::inDrawWithNames() const {
+  return d->inDrawWithNames;
+}
+
 void Viewer::drawWithNames()
 {
   QGLViewer::draw();

Polyhedron/demo/Polyhedron/Viewer.h

@@ -60,6 +60,8 @@ public:
   bool antiAliasing() const;
   //! @returns the fastDrawing state.
   bool inFastDrawing() const;
+  //! Implementation of `Viewer_interface::inDrawWithNames()`
+  bool inDrawWithNames() const;
   //! Implementation of `Viewer_interface::attrib_buffers()`
   void attrib_buffers(int program_name) const;
   //! Implementation of `Viewer_interface::getShaderProgram()`

Three/include/CGAL/Three/Scene_draw_interface.h

@@ -34,12 +34,10 @@ class Scene_draw_interface {
 public:
   virtual ~Scene_draw_interface(){}
   virtual void initializeGL() = 0;
-  virtual void draw() = 0;
+  virtual void draw(CGAL::Three::Viewer_interface*) = 0;
-  virtual void draw(CGAL::Three::Viewer_interface*) { draw(); };
+  virtual void drawWithNames(CGAL::Three::Viewer_interface*) = 0;
-  virtual void drawWithNames() = 0;
  /*! Sets the screen coordinates of the currently picked point.*/
   virtual void setPickedPixel(const QPoint &e) = 0;
-  virtual void drawWithNames(CGAL::Three::Viewer_interface*) { drawWithNames(); }
   virtual bool keyPressEvent(QKeyEvent* e) = 0;
   virtual float get_bbox_length() const = 0;
 };

Three/include/CGAL/Three/Scene_group_item.h

@@ -62,6 +62,15 @@ public :
     bool supportsRenderingMode(RenderingMode m) const;
     //!Prints the number of children.
     QString toolTip() const;
+
+    /// Draw functions
+    ///@{
+    virtual void draw(CGAL::Three::Viewer_interface*) const;
+    virtual void draw_edges(CGAL::Three::Viewer_interface*) const;
+    virtual void draw_points(CGAL::Three::Viewer_interface*) const;
+    virtual void draw_splats(CGAL::Three::Viewer_interface*) const;
+    ///@}
+
     //!Adds a Scene_item* to the list of children.
     //!@see getChildren. @see removeChild.
     void addChild(Scene_item* new_item);

Three/include/CGAL/Three/Scene_item.h

@@ -43,6 +43,7 @@ class QKeyEvent;
 namespace CGAL {
 namespace Three {
 
+class Scene_group_item;
 class Viewer_interface;
 //! This class represents an object in the OpenGL scene
 class SCENE_ITEM_EXPORT Scene_item : public QObject {
@@ -78,72 +79,12 @@ public:
   //! The default color of a scene_item.
   static const QColor defaultColor; // defined in Scene_item.cpp
 
-  //!The default Constructor.
-  /*!
-   * Initializes the number of VBOs to 20 and VAOs to 10 and creates them.
-   */
-  Scene_item()
-    : name_("unamed"),
-      color_(defaultColor),
-      visible_(true),
-      are_buffers_filled(false),
-      rendering_mode(FlatPlusEdges),
-      defaultContextMenu(0),
-      buffersSize(20),
-      vaosSize(10),
-      vaos(10)
-  {
-      is_bbox_computed = false;
-      is_monochrome = true;
-      for(int i=0; i<vaosSize; i++)
-      {
-          addVaos(i);
-          vaos[i]->create();
-      }
-
-      buffers.reserve(buffersSize);
-      for(int i=0; i<buffersSize; i++)
-      {
-          QOpenGLBuffer n_buf;
-          buffers.push_back(n_buf);
-          buffers[i].create();
-      }
-      nb_isolated_vertices = 0;
-      has_group = 0;
-  }
   //!The Constructor.
   /*!
    * Initializes the number of VBOs and VAOs and creates them.
    */
-  Scene_item(int buffers_size, int vaos_size)
+  Scene_item(int buffers_size = 20, int vaos_size = 10);
-    : name_("unamed"),
-      color_(defaultColor),
-      visible_(true),
-      are_buffers_filled(false),
-      rendering_mode(FlatPlusEdges),
-      defaultContextMenu(0),
-      buffersSize(buffers_size),
-      vaosSize(vaos_size),
-      vaos(vaos_size)
-  {
-      is_bbox_computed = false;
-      is_monochrome = true;
-      for(int i=0; i<vaosSize; i++)
-      {
-          addVaos(i);
-          vaos[i]->create();
-      }
 
-      buffers.reserve(buffersSize);
-      for(int i=0; i<buffersSize; i++)
-      {
-          QOpenGLBuffer n_buf;
-          buffers.push_back(n_buf);
-          buffers[i].create();
-      }
-      nb_isolated_vertices = 0;
-      has_group = 0;
-  }
   //! Setter for the number of isolated vertices.
   void setNbIsolatedvertices(std::size_t nb) { nb_isolated_vertices = nb;}
   //! Getter for the number of isolated vertices.
@@ -243,6 +184,9 @@ public:
   //!Handles key press events.
   virtual bool keyPressEvent(QKeyEvent*){return false;}
 
+  //!The parent group, or 0 if the item is not in a group.
+  Scene_group_item* parentGroup() const;
+
   //!Contains the header for the table in the statistics dialog
   /*!
    * A header data is composed of 2 columns : the Categories and the titles.
@@ -308,6 +252,10 @@ public Q_SLOTS:
   virtual void setName(QString n) { name_ = n; }
   //!Setter for the visibility of the item.
   virtual void setVisible(bool b);
+  //!Set the parent group. If `group==0`, then the item has no parent.
+  //!This function is called by `Scene::changeGroup` and should not be
+  //!called manually.
+  virtual void moveToGroup(Scene_group_item* group);
   //!Setter for the rendering mode of the item.
   //!@see RenderingMode
   virtual void setRenderingMode(RenderingMode m) { 
@@ -380,6 +328,8 @@ protected:
   QColor color_;
   //!The visibility of the item.
   bool visible_;
+  //!The parent group, or 0 if the item is not in a group.
+  Scene_group_item* parent_group;
   //!Specifies if the item is currently selected.
   bool is_selected;
   //! Specifies if the item is monochrome and uses uniform attribute for its color

Three/include/CGAL/Three/Viewer_interface.h

@@ -80,6 +80,8 @@ public:
   static QString dumpFrame(const qglviewer::Frame&);
   //! @returns the fastDrawing state.
   virtual bool inFastDrawing() const = 0;
+  //! @returns if the viewer is in `drawWithNames()`
+  virtual bool inDrawWithNames() const = 0;
 
   /*! Passes all the uniform data to the shaders.
    * According to program_name, this data may change.