From 3b906e51199363e33299a3f9bf3b96b0a3dc8de1 Mon Sep 17 00:00:00 2001 From: Janis Born Date: Wed, 11 Jan 2017 17:26:28 +0100 Subject: [PATCH] use double as default RealType for subdividers --- .../Tools/Subdivider/Uniform/CatmullClarkT.hh | 2 +- .../Tools/Subdivider/Uniform/CompositeLoopT.hh | 2 +- .../Tools/Subdivider/Uniform/CompositeSqrt3T.hh | 2 +- .../Tools/Subdivider/Uniform/LongestEdgeT.hh | 2 +- src/OpenMesh/Tools/Subdivider/Uniform/LoopT.hh | 2 +- .../Subdivider/Uniform/ModifiedButterFlyT.hh | 2 +- ...qrt3InterpolatingSubdividerLabsikGreinerT.hh | 2 +- src/OpenMesh/Tools/Subdivider/Uniform/Sqrt3T.hh | 2 +- .../Tools/Subdivider/Uniform/SubdividerT.hh | 17 ++++++++--------- 9 files changed, 16 insertions(+), 17 deletions(-) diff --git a/src/OpenMesh/Tools/Subdivider/Uniform/CatmullClarkT.hh b/src/OpenMesh/Tools/Subdivider/Uniform/CatmullClarkT.hh index 3ba43902..1afc3687 100644 --- a/src/OpenMesh/Tools/Subdivider/Uniform/CatmullClarkT.hh +++ b/src/OpenMesh/Tools/Subdivider/Uniform/CatmullClarkT.hh @@ -88,7 +88,7 @@ namespace Uniform { // BEGIN_NS_UNIFORM \note Needs a PolyMesh to work on! */ -template +template class CatmullClarkT : public SubdividerT< MeshType, RealType > { public: diff --git a/src/OpenMesh/Tools/Subdivider/Uniform/CompositeLoopT.hh b/src/OpenMesh/Tools/Subdivider/Uniform/CompositeLoopT.hh index b0a68531..ad2f3bf7 100644 --- a/src/OpenMesh/Tools/Subdivider/Uniform/CompositeLoopT.hh +++ b/src/OpenMesh/Tools/Subdivider/Uniform/CompositeLoopT.hh @@ -77,7 +77,7 @@ namespace Uniform { // BEGIN_NS_DECIMATER /** Uniform composite Loop subdivision algorithm */ -template +template class CompositeLoopT : public CompositeT { public: diff --git a/src/OpenMesh/Tools/Subdivider/Uniform/CompositeSqrt3T.hh b/src/OpenMesh/Tools/Subdivider/Uniform/CompositeSqrt3T.hh index aa1f572d..28705938 100644 --- a/src/OpenMesh/Tools/Subdivider/Uniform/CompositeSqrt3T.hh +++ b/src/OpenMesh/Tools/Subdivider/Uniform/CompositeSqrt3T.hh @@ -77,7 +77,7 @@ namespace Uniform { // BEGIN_NS_UNIFORM /** Uniform composite sqrt(3) subdivision algorithm */ -template +template class CompositeSqrt3T : public CompositeT { public: diff --git a/src/OpenMesh/Tools/Subdivider/Uniform/LongestEdgeT.hh b/src/OpenMesh/Tools/Subdivider/Uniform/LongestEdgeT.hh index ab02192b..c689af3f 100644 --- a/src/OpenMesh/Tools/Subdivider/Uniform/LongestEdgeT.hh +++ b/src/OpenMesh/Tools/Subdivider/Uniform/LongestEdgeT.hh @@ -82,7 +82,7 @@ namespace Uniform { // BEGIN_NS_UNIFORM //== CLASS DEFINITION ========================================================= -template +template class CompareLengthFunction { public: diff --git a/src/OpenMesh/Tools/Subdivider/Uniform/LoopT.hh b/src/OpenMesh/Tools/Subdivider/Uniform/LoopT.hh index ea767d5a..7701b000 100644 --- a/src/OpenMesh/Tools/Subdivider/Uniform/LoopT.hh +++ b/src/OpenMesh/Tools/Subdivider/Uniform/LoopT.hh @@ -92,7 +92,7 @@ namespace Uniform { // BEGIN_NS_DECIMATER * M.S. Thesis, Department of Mathematics, University of Utah, August 1987. * */ -template +template class LoopT : public SubdividerT { public: diff --git a/src/OpenMesh/Tools/Subdivider/Uniform/ModifiedButterFlyT.hh b/src/OpenMesh/Tools/Subdivider/Uniform/ModifiedButterFlyT.hh index 425d56f6..5825c9b8 100644 --- a/src/OpenMesh/Tools/Subdivider/Uniform/ModifiedButterFlyT.hh +++ b/src/OpenMesh/Tools/Subdivider/Uniform/ModifiedButterFlyT.hh @@ -95,7 +95,7 @@ namespace Uniform { // BEGIN_NS_UNIFORM * * Clement Courbet - clement.courbet@ecp.fr */ -template +template class ModifiedButterflyT : public SubdividerT { public: diff --git a/src/OpenMesh/Tools/Subdivider/Uniform/Sqrt3InterpolatingSubdividerLabsikGreinerT.hh b/src/OpenMesh/Tools/Subdivider/Uniform/Sqrt3InterpolatingSubdividerLabsikGreinerT.hh index 4266aa81..903b39ba 100644 --- a/src/OpenMesh/Tools/Subdivider/Uniform/Sqrt3InterpolatingSubdividerLabsikGreinerT.hh +++ b/src/OpenMesh/Tools/Subdivider/Uniform/Sqrt3InterpolatingSubdividerLabsikGreinerT.hh @@ -109,7 +109,7 @@ namespace Uniform { // BEGIN_NS_UNIFORM * Clement Courbet - clement.courbet@ecp.fr */ -template +template class InterpolatingSqrt3LGT : public SubdividerT< MeshType, RealType > { public: diff --git a/src/OpenMesh/Tools/Subdivider/Uniform/Sqrt3T.hh b/src/OpenMesh/Tools/Subdivider/Uniform/Sqrt3T.hh index 6ed44f97..77e0e6b0 100644 --- a/src/OpenMesh/Tools/Subdivider/Uniform/Sqrt3T.hh +++ b/src/OpenMesh/Tools/Subdivider/Uniform/Sqrt3T.hh @@ -99,7 +99,7 @@ namespace Uniform { // BEGIN_NS_DECIMATER * * L. Kobbelt, "Sqrt(3) subdivision", Proceedings of SIGGRAPH 2000. */ -template +template class Sqrt3T : public SubdividerT< MeshType, RealType > { public: diff --git a/src/OpenMesh/Tools/Subdivider/Uniform/SubdividerT.hh b/src/OpenMesh/Tools/Subdivider/Uniform/SubdividerT.hh index e1de8506..aa6bc331 100644 --- a/src/OpenMesh/Tools/Subdivider/Uniform/SubdividerT.hh +++ b/src/OpenMesh/Tools/Subdivider/Uniform/SubdividerT.hh @@ -79,18 +79,17 @@ namespace OpenMesh { namespace Subdivider { namespace Uniform { - //== CLASS DEFINITION ========================================================= /** Abstract base class for uniform subdivision algorithms. * * A derived class must overload the following functions: - * -# name() - * -# prepare() - * -# subdivide() - * -# cleanup() + * -# const char* name() const + * -# void prepare(MeshType&) + * -# void subdivide(MeshType&, size_t, bool) + * -# void cleanup(MeshType&) */ -template +template class SubdividerT : private Utils::Noncopyable { public: @@ -104,15 +103,15 @@ public: //@{ /// Constructor to be used with interface 2 /// \see attach(), operator()(size_t), detach() - SubdividerT(void) : attached_(NULL) { } + SubdividerT(void) : attached_(nullptr) { } /// Constructor to be used with interface 1 (calls attach()) /// \see operator()( MeshType&, size_t ) - SubdividerT( MeshType &_m ) : attached_(NULL) { attach(_m); } + SubdividerT( MeshType &_m ) : attached_(nullptr) { attach(_m); } //@} - /// Descructor (calls detach()) + /// Destructor (calls detach()) virtual ~SubdividerT() { detach(); }