Fixes for group, selection system changed.

Author: maxGimeno

Polyhedron/demo/Polyhedron/Scene.cpp

@@ -486,6 +486,10 @@ void Scene::renderScene(const QList<Scene_interface::Item_id> &items,
     {
       if( group || item.renderingMode() == Flat || item.renderingMode() == FlatPlusEdges || item.renderingMode() == Gouraud)
       {
+        if(with_names) {
+          viewer->glClearDepth(1.0);
+          viewer->glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+        }
         if(item.renderingMode() == Gouraud)
           viewer->glShadeModel(GL_SMOOTH);
         else
@@ -504,6 +508,8 @@ void Scene::renderScene(const QList<Scene_interface::Item_id> &items,
           picked_item_IDs[depth] = index;
         }
       }
+      if(group)
+        group->renderChildren(viewer, picked_item_IDs, picked_pixel, with_names, pass, writing_depth, fbo);
     }
   }
 }

Polyhedron/demo/Polyhedron/Scene_group_item.cpp

@@ -122,18 +122,51 @@ void Scene_group_item::moveUp(int i)
     children.move(i, i-1);
 }
 
-void Scene_group_item::draw(CGAL::Three::Viewer_interface* viewer, int pass , bool is_writing, QOpenGLFramebufferObject *fbo)
+void Scene_group_item::draw(CGAL::Three::Viewer_interface* , int , bool , QOpenGLFramebufferObject *)
 {
   if(!isInit())
     initGL();
+}
+
+void Scene_group_item::renderChildren(Viewer_interface *viewer,
+                            QMap<float, int>& picked_item_IDs,
+                            const QPoint& picked_pixel,
+                            bool with_names,
+                            int pass,
+                            bool is_writing,
+                            QOpenGLFramebufferObject *fbo)
+{
+
   Q_FOREACH(Scene_interface::Item_id id, children){
+    if(with_names) {
+      viewer->glClearDepth(1.0);
+      viewer->glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+    }
+    if(id == scene->mainSelectionIndex()|| scene->selectionIndices().contains(id))
+    {
+      getChild(id)->selection_changed(true);
+    }
+    else
+    {
+      getChild(id)->selection_changed(false);
+    }
     if(getChild(id)->visible() &&
        (getChild(id)->renderingMode() == Flat ||
         getChild(id)->renderingMode() == FlatPlusEdges ||
         getChild(id)->renderingMode() == Gouraud))
     {
       getChild(id)->draw(viewer, pass, is_writing, fbo);
     }
+    if(with_names) {
+      //    read depth buffer at pick location;
+      float depth = 1.0;
+      viewer->glReadPixels(picked_pixel.x(),viewer->camera()->screenHeight()-1-picked_pixel.y(),1,1,GL_DEPTH_COMPONENT, GL_FLOAT, &depth);
+      if (depth != 1.0)
+      {
+        //add object to list of picked objects;
+        picked_item_IDs[depth] = id;
+      }
+    }
   }
 }
 
@@ -142,6 +175,15 @@ void Scene_group_item::drawEdges(CGAL::Three::Viewer_interface* viewer)
   if(!isInit())
     initGL();
   Q_FOREACH(Scene_interface::Item_id id, children){
+    if(id == scene->mainSelectionIndex()|| scene->selectionIndices().contains(id))
+    {
+      getChild(id)->selection_changed(true);
+    }
+    else
+
+    {
+      getChild(id)->selection_changed(false);
+    }
     if(getChild(id)->visible() &&
        (getChild(id)->renderingMode() == FlatPlusEdges
         || getChild(id)->renderingMode() == Wireframe
@@ -157,6 +199,15 @@ void Scene_group_item::drawPoints(CGAL::Three::Viewer_interface* viewer)
   if(!isInit())
     initGL();
   Q_FOREACH(Scene_interface::Item_id id, children){
+    if(id == scene->mainSelectionIndex()|| scene->selectionIndices().contains(id))
+    {
+      getChild(id)->selection_changed(true);
+    }
+    else
+
+    {
+      getChild(id)->selection_changed(false);
+    }
     if(getChild(id)->visible())
     {
 

Polyhedron/demo/Polyhedron/Scene_item.cpp

@@ -18,6 +18,7 @@ struct D{
     visible_(true),
     parent_group(0),
     is_selected(false),
+    was_selected(false),
     rendering_mode(FlatPlusEdges),
     defaultContextMenu(NULL),
     is_locked(false),
@@ -28,18 +29,20 @@ struct D{
 
   int has_group;
 
-  //!The name of the item.
+  //The name of the item.
   QString name_;
-  //!The color of the item.
+  //The color of the item.
   QColor color_;
-  //!The visibility of the item.
+  //The visibility of the item.
   bool visible_;
-  //!The parent group, or 0 if the item is not in a group.
+  //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.
+  //Specifies if the item is currently selected.
   bool is_selected;
+  //Last selection state
+  bool was_selected;
   RenderingMode rendering_mode;
-  //!The default context menu.
+  //The default context menu.
   QMenu* defaultContextMenu;
   //when this is true, all the operations and options of this item are disabled.
   //Used in multithreading context.
@@ -54,6 +57,15 @@ const QColor Scene_item::defaultColor()
   return QColor(100, 100, 255);
 }
 
+QColor Scene_item::selectionColor()
+{
+  QColor c = color();
+  return (QColor::fromHsv(
+            c.hue()<270 && c.hue() > 90 ? 0
+                                        : 180,
+            255, 255));
+}
+
 namespace CT = CGAL::Three;
 CGAL::Three::Scene_item::Scene_item()
   : d(new D(this)){}
@@ -160,7 +172,22 @@ moveToGroup(CGAL::Three::Scene_group_item* group) {
 
 void CGAL::Three::Scene_item::invalidate(Gl_data_names) {}
 
-void CGAL::Three::Scene_item::selection_changed(bool) {}
+void CGAL::Three::Scene_item::selection_changed(bool b)
+{
+  if(b && !d->was_selected)
+  {
+    setSelected(true);
+    d->was_selected = true;
+    redraw();
+    QTimer::singleShot(500, [this]{setSelected(false); redraw();});
+  }
+  else{
+    if(!b)
+      setSelected(false);
+    d->was_selected = b;
+  }
+
+}
 void CGAL::Three::Scene_item::setVisible(bool b)
 {
   d->visible_ = b;

Polyhedron/demo/Polyhedron/Scene_surface_mesh_item.cpp

@@ -679,7 +679,7 @@ void Scene_surface_mesh_item::draw(CGAL::Three::Viewer_interface *viewer,
     getTriangleContainer(0)->setNear(near);
     getTriangleContainer(0)->setFar(far);
     getTriangleContainer(0)->setDepthWriting(writing_depth);
-    getTriangleContainer(0)->setColor(color());
+    getTriangleContainer(0)->setColor(isSelected() ? selectionColor() : color());
     getTriangleContainer(0)->setSelected(isSelected());
     getTriangleContainer(0)->setAlpha(alpha());
     getTriangleContainer(0)->draw( viewer, !d->has_vcolors, fbo);
@@ -692,7 +692,7 @@ void Scene_surface_mesh_item::draw(CGAL::Three::Viewer_interface *viewer,
     getTriangleContainer(1)->setNear(near);
     getTriangleContainer(1)->setFar(far);
     getTriangleContainer(1)->setDepthWriting(writing_depth);
-    getTriangleContainer(1)->setColor(color());
+    getTriangleContainer(1)->setColor(isSelected() ? selectionColor() : color());
     getTriangleContainer(1)->setSelected(isSelected());
     getTriangleContainer(1)->setAlpha(alpha());
     getTriangleContainer(1)->draw( viewer, !d->has_fcolors, fbo);
@@ -735,14 +735,6 @@ void Scene_surface_mesh_item::drawPoints(CGAL::Three::Viewer_interface *viewer)
   //TODO
 }
 
-void
-Scene_surface_mesh_item::selection_changed(bool p_is_selected)
-{
-  if(p_is_selected != isSelected())
-  {
-    setSelected(p_is_selected);
-  }
-}
 
 bool
 Scene_surface_mesh_item::supportsRenderingMode(RenderingMode m) const

Polyhedron/demo/Polyhedron/Scene_surface_mesh_item.h

@@ -141,7 +141,6 @@ class SCENE_SURFACE_MESH_ITEM_EXPORT Scene_surface_mesh_item
 
 public Q_SLOTS:
   void itemAboutToBeDestroyed(Scene_item *) Q_DECL_OVERRIDE;
-  virtual void selection_changed(bool) Q_DECL_OVERRIDE;
   void select(double orig_x,
               double orig_y,
               double orig_z,

Polyhedron/demo/Polyhedron/Viewer.cpp

@@ -414,7 +414,7 @@ void Viewer::initializeGL()
       "   vec4 diffuse = max(abs(dot(N,L)),0.0) * light_diff*color; \n"
       "   vec4 specular = pow(max(dot(R,V), 0.0), spec_power) * light_spec; \n"
 
-      "gl_FragColor = color*light_amb + diffuse + specular; \n"
+      "gl_FragColor = vec4(vec3(color*light_amb + diffuse + specular).xyz, 1.0f); \n"
       "} \n"
       "\n"
       };
@@ -1106,43 +1106,43 @@ void Viewer::drawVisualHints()
       d->rendering_program.bind();
       qglviewer::Camera::Type camera_type = camera()->type();
       camera()->setType(qglviewer::Camera::ORTHOGRAPHIC);
-        QMatrix4x4 mvpMatrix;
-        QMatrix4x4 mvMatrix;
-        for(int i=0; i < 16; i++)
-        {
-            mvMatrix.data()[i] = camera()->orientation().inverse().matrix()[i];
-        }
-        mvpMatrix.ortho(-1,1,-1,1,-1,1);
-        mvpMatrix = mvpMatrix*mvMatrix;
-        camera()->setType(camera_type);
-
-        d->rendering_program.setUniformValue("light_pos", d->lighting.position);
-        d->rendering_program.setUniformValue("mvp_matrix", mvpMatrix);
-        d->rendering_program.setUniformValue("mv_matrix", mvMatrix);
-        d->rendering_program.setUniformValue("light_diff", d->lighting.diffuse);
-        d->rendering_program.setUniformValue("light_spec", d->lighting.specular);
-        d->rendering_program.setUniformValue("light_amb", d->lighting.ambient);
-        d->rendering_program.setUniformValue("spec_power", d->lighting.shininess);
-
-        d->vao[0].bind();
-        int viewport[4];
-        int scissor[4];
-
-        // The viewport and the scissor are changed to fit the upper right
-        // corner. Original values are saved.
-        glGetIntegerv(GL_VIEWPORT, viewport);
-        glGetIntegerv(GL_SCISSOR_BOX, scissor);
-
-        // Axis viewport size, in pixels
-        const int size = 100;
-        glViewport(width()*devicePixelRatio()-size, height()*devicePixelRatio()-size, size, size);
-        glScissor (width()*devicePixelRatio()-size, height()*devicePixelRatio()-size, size, size);
-        glDrawArrays(GL_TRIANGLES, 0, static_cast<GLsizei>(d->v_Axis.size() / 3));
-        // The viewport and the scissor are restored.
-        glScissor(scissor[0],scissor[1],scissor[2],scissor[3]);
-        glViewport(viewport[0],viewport[1],viewport[2],viewport[3]);
-        d->vao[0].release();
-        d->rendering_program.release();
+      QMatrix4x4 mvpMatrix;
+      QMatrix4x4 mvMatrix;
+      for(int i=0; i < 16; i++)
+      {
+        mvMatrix.data()[i] = camera()->orientation().inverse().matrix()[i];
+      }
+      mvpMatrix.ortho(-1,1,-1,1,-1,1);
+      mvpMatrix = mvpMatrix*mvMatrix;
+      camera()->setType(camera_type);
+
+      d->rendering_program.setUniformValue("light_pos", d->lighting.position);
+      d->rendering_program.setUniformValue("mvp_matrix", mvpMatrix);
+      d->rendering_program.setUniformValue("mv_matrix", mvMatrix);
+      d->rendering_program.setUniformValue("light_diff", d->lighting.diffuse);
+      d->rendering_program.setUniformValue("light_spec", d->lighting.specular);
+      d->rendering_program.setUniformValue("light_amb", d->lighting.ambient);
+      d->rendering_program.setUniformValue("spec_power", d->lighting.shininess);
+
+      d->vao[0].bind();
+      int viewport[4];
+      int scissor[4];
+
+      // The viewport and the scissor are changed to fit the upper right
+      // corner. Original values are saved.
+      glGetIntegerv(GL_VIEWPORT, viewport);
+      glGetIntegerv(GL_SCISSOR_BOX, scissor);
+
+      // Axis viewport size, in pixels
+      const int size = 100;
+      glViewport(width()*devicePixelRatio()-size, height()*devicePixelRatio()-size, size, size);
+      glScissor (width()*devicePixelRatio()-size, height()*devicePixelRatio()-size, size, size);
+      glDrawArrays(GL_TRIANGLES, 0, static_cast<GLsizei>(d->v_Axis.size() / 3));
+      // The viewport and the scissor are restored.
+      glScissor(scissor[0],scissor[1],scissor[2],scissor[3]);
+      glViewport(viewport[0],viewport[1],viewport[2],viewport[3]);
+      d->vao[0].release();
+      d->rendering_program.release();
     }
 
     if(d->distance_is_displayed)

Polyhedron/demo/Polyhedron/resources/shader_with_light.f

@@ -63,7 +63,7 @@
     highp vec4 specular = pow(max(dot(R,V), 0.0), spec_power) * light_spec;
     vec4 ret_color = vec4((my_color*light_amb).xyz + diffuse.xyz + specular.xyz,1);
     if(is_selected)
-      gl_FragColor = vec4(ret_color.r+70.0/255.0, ret_color.g+70.0/255.0, ret_color.b+70.0/255.0, alpha);
+      gl_FragColor = color;
     else
       gl_FragColor = vec4(ret_color.xyz, alpha);
   }

Three/include/CGAL/Three/Scene_group_item.h

@@ -131,6 +131,27 @@ public :
     //! @see #RenderingMode
     virtual void draw(CGAL::Three::Viewer_interface*, int pass,
                       bool is_writing, QOpenGLFramebufferObject*fbo);
+
+    //!
+    //! \brief renderChildren deals with the rendering, selecting and picking of
+    //! the group's children.
+    //!
+    //! \param picked_item_IDs the depth-index map
+    //! \param picked_pixel the screen point that has been picked.
+    //! \param with_names should be `true` if a picking is being performed.
+    //! \param pass the dept peeling pass.
+    //! \param is_writing means that the color of the faces will be drawn in a grayscale
+    //! according to the depth of the fragment in the shader. It is used by the transparency.
+    //! \param fbo contains the texture used by the Depth Peeling algorithm.
+    //!  Should be NULL if pass <= 0;
+    //!
+    virtual void renderChildren(Viewer_interface *,
+              QMap<float, int>& picked_item_IDs, const QPoint &picked_pixel,
+              bool with_names,
+              int pass,
+              bool is_writing,
+              QOpenGLFramebufferObject *fbo);
+
     //!\brief draws all the children
     //!
     //! Calls `Scene_item::drawEdges()`for each child if its current

Three/include/CGAL/Three/Scene_item.h

@@ -82,6 +82,10 @@ class SCENE_ITEM_EXPORT Scene_item : public QObject{
   //!
   //! This color is the one that will be displayed if none is specified after its creation.
   static const QColor defaultColor();
+  //!
+  //! \brief selectionColor is the color used for selected item.
+  //!
+  QColor selectionColor();
   Scene_item();
 
   virtual ~Scene_item();