Merge branch 'master' into bsp-fix-attempt

ACG/GL/DrawMesh.hh

@@ -385,22 +385,22 @@ private:
    * @param _hh corresponding halfedge handle of this vertex
    * @param _fh corresponding face handle of this vertex
    */
-  void readVertex(size_t                              _vertex,
-                  const typename Mesh::VertexHandle   _vh,
-                  const typename Mesh::HalfedgeHandle _hh,
-                  const typename Mesh::FaceHandle     _fh);
+  void readVertex(size_t                               _vertex,
+                  const typename Mesh::VertexHandle&   _vh,
+                  const typename Mesh::HalfedgeHandle& _hh,
+                  const typename Mesh::FaceHandle&     _fh);
 
   /** \brief return a vertex color from mesh
    *
    * @param _vh mesh vertex handle
    */
-  unsigned int getVertexColor(const typename Mesh::VertexHandle   _vh);
+  unsigned int getVertexColor(const typename Mesh::VertexHandle&   _vh);
 
   /** \brief return a face color from mesh
    *
    * @param _fh mesh face handle
    */
-  unsigned int getFaceColor(const typename Mesh::FaceHandle   _fh);
+  unsigned int getFaceColor(const typename Mesh::FaceHandle&   _fh);
 
   /** \brief  eventually update vertex and index buffers
    *

ACG/GL/DrawMeshT.cc

@@ -753,9 +753,9 @@ DrawMeshT<Mesh>::rebuild()
 template <class Mesh>
 void
 DrawMeshT<Mesh>::readVertex(size_t _vertex,
-                            const typename Mesh::VertexHandle _vh,
-                            const typename Mesh::HalfedgeHandle _hh,
-                            const typename Mesh::FaceHandle _fh)
+                            const typename Mesh::VertexHandle&   _vh,
+                            const typename Mesh::HalfedgeHandle& _hh,
+                            const typename Mesh::FaceHandle&     _fh)
 {
   static const typename Mesh::HalfedgeHandle invalidHEH(-1);
   static const typename Mesh::FaceHandle     invalidFH(-1);
@@ -831,7 +831,7 @@ DrawMeshT<Mesh>::readVertex(size_t _vertex,
 
 template <class Mesh>
 unsigned int
-DrawMeshT<Mesh>::getVertexColor(const typename Mesh::VertexHandle _vh)
+DrawMeshT<Mesh>::getVertexColor(const typename Mesh::VertexHandle& _vh)
 {
   static const typename Mesh::VertexHandle     invalidVH(-1);
 
@@ -853,7 +853,7 @@ DrawMeshT<Mesh>::getVertexColor(const typename Mesh::VertexHandle _vh)
 
 template <class Mesh>
 unsigned int
-DrawMeshT<Mesh>::getFaceColor(const typename Mesh::FaceHandle _fh)
+DrawMeshT<Mesh>::getFaceColor(const typename Mesh::FaceHandle& _fh)
 {
   static const typename Mesh::FaceHandle     invalidFH(-1);
 

MeshTools/MeshFunctions.cc

@@ -160,8 +160,8 @@ void smooth_boundary(MeshT& _mesh,
 
 template < typename MeshT >
 bool neighbour(const MeshT& _mesh , 
-                         const typename MeshT::FaceHandle _fh1 , 
-                         const typename MeshT::FaceHandle _fh2 )
+               const typename MeshT::FaceHandle& _fh1 ,
+               const typename MeshT::FaceHandle& _fh2 )
 {
   for ( typename MeshT::FaceFaceIter ff_it(_mesh,_fh1) ; ff_it ; ++ff_it)
      if (*ff_it == _fh2)
@@ -213,7 +213,7 @@ calc_area( const MeshT& _mesh)
 
 template < typename MeshT >
 double 
-calc_angle_around( const MeshT& _mesh , const typename MeshT::VertexHandle _vh) 
+calc_angle_around( const MeshT& _mesh , const typename MeshT::VertexHandle& _vh)
 {
     double angle = 0.0;
     

MeshTools/MeshFunctions.hh

@@ -120,8 +120,8 @@ void smooth_boundary(MeshT& _mesh ,
 */
 template < typename MeshT >
 bool neighbour(const MeshT& _mesh , 
-                         const typename MeshT::FaceHandle _fh1 , 
-                         const typename MeshT::FaceHandle _fh2 );
+               const typename MeshT::FaceHandle& _fh1 ,
+               const typename MeshT::FaceHandle& _fh2 );
 
 /**
    Checks if plane cuts the face
@@ -153,7 +153,7 @@ calc_area( const MeshT& _mesh);
     */
 template < typename MeshT >
 double 
-calc_angle_around( const MeshT& _mesh , const typename MeshT::VertexHandle _vh);
+calc_angle_around( const MeshT& _mesh , const typename MeshT::VertexHandle& _vh);
 
 /**
  * Transform geometry of the mesh using the specified

OpenMesh @ 14305523

-Subproject commit 0c6b4831d6aa9d0ab8508db8bb5a494cfff8d794
+Subproject commit 1430552372e3e4e312a81b10371b07812ee603b7