Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into performance_tuning

Browse Source
This commit is contained in:
Hans-Christian Ebke
2016-03-24 12:59:35 +01:00
parent 3868b351ec 7fffd773c8
commit 00101c13e0
17 changed files with 219 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/OpenMesh/Core/Mesh/Handles.hh
View File

@@ -99,7 +99,7 @@ public:
void __decrement() { --idx_; }
void __increment(int amount) { idx_ += amount; }
void __decrement(int amount) { idx_ += amount; }
void __decrement(int amount) { idx_ -= amount; }
private:

6
src/OpenMesh/Core/Mesh/PolyMeshT.cc
View File

@@ -61,9 +61,9 @@
#include <OpenMesh/Core/Mesh/PolyMeshT.hh>
#include <OpenMesh/Core/Geometry/LoopSchemeMaskT.hh>
#include <OpenMesh/Core/Geometry/VectorDimensionsT.hh>
#include <OpenMesh/Core/Utils/GenProg.hh>
#include <OpenMesh/Core/Utils/vector_cast.hh>
#include <OpenMesh/Core/Utils/vector_traits.hh>
#include <OpenMesh/Core/System/omstream.hh>
#include <vector>
@@ -102,7 +102,7 @@ typename PolyMeshT<Kernel>::Normal
PolyMeshT<Kernel>::calc_face_normal(FaceHandle _fh) const
{
return calc_face_normal_impl(_fh, typename GenProg::IF<
VectorDimensionsT<PolyMeshT<Kernel>::Point>::value == 3,
vector_traits<PolyMeshT<Kernel>::Point>::size_ == 3,
PointIs3DTag,
PointIsNot3DTag
>::Result());
@@ -169,7 +169,7 @@ calc_face_normal(const Point& _p0,
const Point& _p2) const
{
return calc_face_normal_impl(_p0, _p1, _p2, typename GenProg::IF<
VectorDimensionsT<PolyMeshT<Kernel>::Point>::value == 3,
vector_traits<PolyMeshT<Kernel>::Point>::size_ == 3,
PointIs3DTag,
PointIsNot3DTag
>::Result());