Commit 05ee86a0 authored by Jan Möbius's avatar Jan Möbius
Browse files

Merge branch 'master' into bsp-fix-attempt

parents 59fb6ef8 721d6f0c
Pipeline #3344 passed with stage
in 65 minutes and 22 seconds
...@@ -386,21 +386,21 @@ private: ...@@ -386,21 +386,21 @@ private:
* @param _fh corresponding face handle of this vertex * @param _fh corresponding face handle of this vertex
*/ */
void readVertex(size_t _vertex, void readVertex(size_t _vertex,
const typename Mesh::VertexHandle _vh, const typename Mesh::VertexHandle& _vh,
const typename Mesh::HalfedgeHandle _hh, const typename Mesh::HalfedgeHandle& _hh,
const typename Mesh::FaceHandle _fh); const typename Mesh::FaceHandle& _fh);
/** \brief return a vertex color from mesh /** \brief return a vertex color from mesh
* *
* @param _vh mesh vertex handle * @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 /** \brief return a face color from mesh
* *
* @param _fh mesh face handle * @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 /** \brief eventually update vertex and index buffers
* *
......
...@@ -753,9 +753,9 @@ DrawMeshT<Mesh>::rebuild() ...@@ -753,9 +753,9 @@ DrawMeshT<Mesh>::rebuild()
template <class Mesh> template <class Mesh>
void void
DrawMeshT<Mesh>::readVertex(size_t _vertex, DrawMeshT<Mesh>::readVertex(size_t _vertex,
const typename Mesh::VertexHandle _vh, const typename Mesh::VertexHandle& _vh,
const typename Mesh::HalfedgeHandle _hh, const typename Mesh::HalfedgeHandle& _hh,
const typename Mesh::FaceHandle _fh) const typename Mesh::FaceHandle& _fh)
{ {
static const typename Mesh::HalfedgeHandle invalidHEH(-1); static const typename Mesh::HalfedgeHandle invalidHEH(-1);
static const typename Mesh::FaceHandle invalidFH(-1); static const typename Mesh::FaceHandle invalidFH(-1);
...@@ -831,7 +831,7 @@ DrawMeshT<Mesh>::readVertex(size_t _vertex, ...@@ -831,7 +831,7 @@ DrawMeshT<Mesh>::readVertex(size_t _vertex,
template <class Mesh> template <class Mesh>
unsigned int 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); static const typename Mesh::VertexHandle invalidVH(-1);
...@@ -853,7 +853,7 @@ DrawMeshT<Mesh>::getVertexColor(const typename Mesh::VertexHandle _vh) ...@@ -853,7 +853,7 @@ DrawMeshT<Mesh>::getVertexColor(const typename Mesh::VertexHandle _vh)
template <class Mesh> template <class Mesh>
unsigned int 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); static const typename Mesh::FaceHandle invalidFH(-1);
......
...@@ -160,8 +160,8 @@ void smooth_boundary(MeshT& _mesh, ...@@ -160,8 +160,8 @@ void smooth_boundary(MeshT& _mesh,
template < typename MeshT > template < typename MeshT >
bool neighbour(const MeshT& _mesh , bool neighbour(const MeshT& _mesh ,
const typename MeshT::FaceHandle _fh1 , const typename MeshT::FaceHandle& _fh1 ,
const typename MeshT::FaceHandle _fh2 ) const typename MeshT::FaceHandle& _fh2 )
{ {
for ( typename MeshT::FaceFaceIter ff_it(_mesh,_fh1) ; ff_it ; ++ff_it) for ( typename MeshT::FaceFaceIter ff_it(_mesh,_fh1) ; ff_it ; ++ff_it)
if (*ff_it == _fh2) if (*ff_it == _fh2)
...@@ -213,7 +213,7 @@ calc_area( const MeshT& _mesh) ...@@ -213,7 +213,7 @@ calc_area( const MeshT& _mesh)
template < typename MeshT > template < typename MeshT >
double 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; double angle = 0.0;
......
...@@ -120,8 +120,8 @@ void smooth_boundary(MeshT& _mesh , ...@@ -120,8 +120,8 @@ void smooth_boundary(MeshT& _mesh ,
*/ */
template < typename MeshT > template < typename MeshT >
bool neighbour(const MeshT& _mesh , bool neighbour(const MeshT& _mesh ,
const typename MeshT::FaceHandle _fh1 , const typename MeshT::FaceHandle& _fh1 ,
const typename MeshT::FaceHandle _fh2 ); const typename MeshT::FaceHandle& _fh2 );
/** /**
Checks if plane cuts the face Checks if plane cuts the face
...@@ -153,7 +153,7 @@ calc_area( const MeshT& _mesh); ...@@ -153,7 +153,7 @@ calc_area( const MeshT& _mesh);
*/ */
template < typename MeshT > template < typename MeshT >
double 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 * Transform geometry of the mesh using the specified
......
OpenMesh @ 14305523
Subproject commit 0c6b4831d6aa9d0ab8508db8bb5a494cfff8d794 Subproject commit 1430552372e3e4e312a81b10371b07812ee603b7
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment