From f2d83f797134ff295ab511fd3ba61bfce3b0ecf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Mon, 23 Nov 2015 10:57:20 +0100 Subject: [PATCH 01/13] Added Unittest for vec2i and polymesh --- src/Unittests/unittests_polymesh_vec2i.cc | 88 +++++++++++++++++++++++ 1 file changed, 88 insertions(+) create mode 100644 src/Unittests/unittests_polymesh_vec2i.cc diff --git a/src/Unittests/unittests_polymesh_vec2i.cc b/src/Unittests/unittests_polymesh_vec2i.cc new file mode 100644 index 00000000..bc20d621 --- /dev/null +++ b/src/Unittests/unittests_polymesh_vec2i.cc @@ -0,0 +1,88 @@ +#include +#include + +#include + +struct CustomTraitsVec2i : OpenMesh::DefaultTraits +{ + typedef OpenMesh::Vec2i Point; +}; + + + +typedef OpenMesh::PolyMesh_ArrayKernelT PolyMeshVec2i; + + + +/* + * OpenMesh Poly with Vec2i + */ + +class OpenMeshBasePolyVec2i : public testing::Test { + + protected: + + // This function is called before each test is run + virtual void SetUp() { + + // Do some initial stuff with the member data here... + } + + // This function is called after all tests are through + virtual void TearDown() { + + // Do some final stuff with the member data here... + } + + // This member will be accessible in all tests + PolyMeshVec2i mesh_; +}; + + + +namespace { + +/* + * ==================================================================== + * Define tests below + * ==================================================================== + */ + + +/* + * Checking for feature edges based on angle + */ +TEST_F(OpenMeshBasePolyVec2i, Instance_Vec2i_Mesh) { + + mesh_.clear(); + + // Add some vertices + PolyMeshVec2i::VertexHandle vhandle[4]; + + vhandle[0] = mesh_.add_vertex(PolyMeshVec2i::Point(0, 0)); + vhandle[1] = mesh_.add_vertex(PolyMeshVec2i::Point(0, 1)); + vhandle[2] = mesh_.add_vertex(PolyMeshVec2i::Point(1, 1)); + + // Add face + std::vector face_vhandles; + + face_vhandles.push_back(vhandle[0]); + face_vhandles.push_back(vhandle[1]); + face_vhandles.push_back(vhandle[2]); + mesh_.add_face(face_vhandles); + + // =============================================== + // Setup complete + // =============================================== + + // Check one Request only vertex normals + // Face normals are required for vertex and halfedge normals, so + // that prevent access to non existing properties are in place + + mesh_.request_vertex_normals(); + mesh_.request_halfedge_normals(); + mesh_.request_face_normals(); + +} + +} From 6e71f1bd57bb521035860f2501dfacd6b19b7c98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Mon, 23 Nov 2015 10:57:30 +0100 Subject: [PATCH 02/13] Added Unittest for vec2i and trimesh --- src/Unittests/unittests_trimesh_vec2i.cc | 84 ++++++++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 src/Unittests/unittests_trimesh_vec2i.cc diff --git a/src/Unittests/unittests_trimesh_vec2i.cc b/src/Unittests/unittests_trimesh_vec2i.cc new file mode 100644 index 00000000..66533ce3 --- /dev/null +++ b/src/Unittests/unittests_trimesh_vec2i.cc @@ -0,0 +1,84 @@ +#include +#include + +#include + +struct CustomTraitsVec2i : OpenMesh::DefaultTraits +{ + typedef OpenMesh::Vec2i Point; +}; + + +typedef OpenMesh::TriMesh_ArrayKernelT TriMeshVec2i; + + +/* + * OpenMesh Triangular with Vec2i + */ + +class OpenMeshBaseTriVec2i : public testing::Test { + + protected: + + // This function is called before each test is run + virtual void SetUp() { + + // Do some initial stuff with the member data here... + } + + // This function is called after all tests are through + virtual void TearDown() { + + // Do some final stuff with the member data here... + } + + // This member will be accessible in all tests + TriMeshVec2i mesh_; +}; + + +namespace { + +/* + * ==================================================================== + * Define tests below + * ==================================================================== + */ + +/* + * Checking for feature edges based on angle + */ +TEST_F(OpenMeshBaseTriVec2i, Instance_Vec2i_Mesh) { + + mesh_.clear(); + + // Add some vertices + TriMeshVec2i::VertexHandle vhandle[4]; + + vhandle[0] = mesh_.add_vertex(TriMeshVec2i::Point(0, 0)); + vhandle[1] = mesh_.add_vertex(TriMeshVec2i::Point(0, 1)); + vhandle[2] = mesh_.add_vertex(TriMeshVec2i::Point(1, 1)); + + // Add face + std::vector face_vhandles; + + face_vhandles.push_back(vhandle[0]); + face_vhandles.push_back(vhandle[1]); + face_vhandles.push_back(vhandle[2]); + mesh_.add_face(face_vhandles); + + // =============================================== + // Setup complete + // =============================================== + + // Check one Request only vertex normals + // Face normals are required for vertex and halfedge normals, so + // that prevent access to non existing properties are in place + + mesh_.request_vertex_normals(); + mesh_.request_halfedge_normals(); + mesh_.request_face_normals(); + +} + +} From b31589b15f792671ce432a8d791619538ce6acb2 Mon Sep 17 00:00:00 2001 From: Janis Born Date: Mon, 23 Nov 2015 15:03:57 +0100 Subject: [PATCH 03/13] fall back to dummy implementation for calc_face_normal on meshes with non-3D points --- src/OpenMesh/Core/Mesh/PolyMeshT.cc | 47 +++++++++++++++++++++++++++-- src/OpenMesh/Core/Mesh/PolyMeshT.hh | 7 +++++ 2 files changed, 51 insertions(+), 3 deletions(-) diff --git a/src/OpenMesh/Core/Mesh/PolyMeshT.cc b/src/OpenMesh/Core/Mesh/PolyMeshT.cc index b4f5fb6e..fb628510 100644 --- a/src/OpenMesh/Core/Mesh/PolyMeshT.cc +++ b/src/OpenMesh/Core/Mesh/PolyMeshT.cc @@ -61,6 +61,7 @@ #include #include +#include #include #include #include @@ -97,8 +98,18 @@ uint PolyMeshT::find_feature_edges(Scalar _angle_tresh) template typename PolyMeshT::Normal -PolyMeshT:: -calc_face_normal(FaceHandle _fh) const +PolyMeshT::calc_face_normal(FaceHandle _fh) const +{ + return calc_face_normal_impl(_fh, typename GenProg::IF< + PolyMeshT::Point::size() == 3, + PointIs3DTag, + PointIsNot3DTag + >::Result()); +} + +template +typename PolyMeshT::Normal +PolyMeshT::calc_face_normal_impl(FaceHandle _fh, PointIs3DTag) const { assert(this->halfedge_handle(_fh).is_valid()); ConstFaceVertexIter fv_it(this->cfv_iter(_fh)); @@ -139,8 +150,15 @@ calc_face_normal(FaceHandle _fh) const : Normal(0, 0, 0); } -//----------------------------------------------------------------------------- +template +typename PolyMeshT::Normal +PolyMeshT::calc_face_normal_impl(FaceHandle, PointIsNot3DTag) const +{ + // Dummy fallback implementation + return Normal(0); +} +//----------------------------------------------------------------------------- template typename PolyMeshT::Normal @@ -148,6 +166,21 @@ PolyMeshT:: calc_face_normal(const Point& _p0, const Point& _p1, const Point& _p2) const +{ + return calc_face_normal_impl(_p0, _p1, _p2, typename GenProg::IF< + PolyMeshT::Point::size() == 3, + PointIs3DTag, + PointIsNot3DTag + >::Result()); +} + +template +typename PolyMeshT::Normal +PolyMeshT:: +calc_face_normal_impl(const Point& _p0, + const Point& _p1, + const Point& _p2, + PointIs3DTag) const { #if 1 // The OpenSG ::operator -= () does not support the type Point @@ -174,6 +207,14 @@ calc_face_normal(const Point& _p0, #endif } +template +typename PolyMeshT::Normal +PolyMeshT:: +calc_face_normal_impl(const Point&, const Point&, const Point&, PointIsNot3DTag) const +{ + return Normal(0); +} + //----------------------------------------------------------------------------- template diff --git a/src/OpenMesh/Core/Mesh/PolyMeshT.hh b/src/OpenMesh/Core/Mesh/PolyMeshT.hh index a3180fb5..9ea65535 100644 --- a/src/OpenMesh/Core/Mesh/PolyMeshT.hh +++ b/src/OpenMesh/Core/Mesh/PolyMeshT.hh @@ -520,6 +520,13 @@ public: inline void split(EdgeHandle _eh, VertexHandle _vh) { Kernel::split_edge(_eh, _vh); } +private: + struct PointIs3DTag {}; + struct PointIsNot3DTag {}; + Normal calc_face_normal_impl(FaceHandle, PointIs3DTag) const; + Normal calc_face_normal_impl(FaceHandle, PointIsNot3DTag) const; + Normal calc_face_normal_impl(const Point&, const Point&, const Point&, PointIs3DTag) const; + Normal calc_face_normal_impl(const Point&, const Point&, const Point&, PointIsNot3DTag) const; }; /** From 4c9a6ba5a4e3c8d170453abf24afc2cffe11e1e9 Mon Sep 17 00:00:00 2001 From: Janis Born Date: Mon, 23 Nov 2015 15:33:14 +0100 Subject: [PATCH 04/13] add VectorDimensionsT metaprogram to detect vector dimensions in C++98 --- .../Core/Geometry/VectorDimensionsT.hh | 80 +++++++++++++++++++ src/OpenMesh/Core/Mesh/PolyMeshT.cc | 14 ++-- 2 files changed, 87 insertions(+), 7 deletions(-) create mode 100644 src/OpenMesh/Core/Geometry/VectorDimensionsT.hh diff --git a/src/OpenMesh/Core/Geometry/VectorDimensionsT.hh b/src/OpenMesh/Core/Geometry/VectorDimensionsT.hh new file mode 100644 index 00000000..47f495eb --- /dev/null +++ b/src/OpenMesh/Core/Geometry/VectorDimensionsT.hh @@ -0,0 +1,80 @@ +/* ========================================================================= * + * * + * OpenMesh * + * Copyright (c) 2001-2015, RWTH-Aachen University * + * Department of Computer Graphics and Multimedia * + * All rights reserved. * + * www.openmesh.org * + * * + *---------------------------------------------------------------------------* + * This file is part of OpenMesh. * + *---------------------------------------------------------------------------* + * * + * Redistribution and use in source and binary forms, with or without * + * modification, are permitted provided that the following conditions * + * are met: * + * * + * 1. Redistributions of source code must retain the above copyright notice, * + * this list of conditions and the following disclaimer. * + * * + * 2. Redistributions in binary form must reproduce the above copyright * + * notice, this list of conditions and the following disclaimer in the * + * documentation and/or other materials provided with the distribution. * + * * + * 3. Neither the name of the copyright holder nor the names of its * + * contributors may be used to endorse or promote products derived from * + * this software without specific prior written permission. * + * * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A * + * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER * + * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, * + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, * + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF * + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * + * * + * ========================================================================= */ + +//============================================================================= +// +// CLASS VectorDimensionsT +// +//============================================================================= + +#ifndef DOXYGEN + +#ifndef OPENMESH_VECTOR_DIMENSIONS_HH +#define OPENMESH_VECTOR_DIMENSIONS_HH + +//== INCLUDES ================================================================= + +#include +#include + +//== NAMESPACES =============================================================== + +namespace OpenMesh { + +//== CLASS DEFINITION ========================================================= + +template +struct VectorDimensionsT {}; + +template +struct VectorDimensionsT> { + enum { + value = Dim + }; +}; + +//============================================================================= +} // namespace OpenMesh +//============================================================================= + +#endif // OPENMESH_VECTOR_DIMENSIONS_HH defined +//============================================================================= +#endif // DOXYGEN diff --git a/src/OpenMesh/Core/Mesh/PolyMeshT.cc b/src/OpenMesh/Core/Mesh/PolyMeshT.cc index fb628510..e8509605 100644 --- a/src/OpenMesh/Core/Mesh/PolyMeshT.cc +++ b/src/OpenMesh/Core/Mesh/PolyMeshT.cc @@ -61,6 +61,7 @@ #include #include +#include #include #include #include @@ -101,7 +102,7 @@ typename PolyMeshT::Normal PolyMeshT::calc_face_normal(FaceHandle _fh) const { return calc_face_normal_impl(_fh, typename GenProg::IF< - PolyMeshT::Point::size() == 3, + VectorDimensionsT::Point>::value == 3, PointIs3DTag, PointIsNot3DTag >::Result()); @@ -155,7 +156,7 @@ typename PolyMeshT::Normal PolyMeshT::calc_face_normal_impl(FaceHandle, PointIsNot3DTag) const { // Dummy fallback implementation - return Normal(0); + return Normal(typename Normal::value_type(0)); } //----------------------------------------------------------------------------- @@ -168,7 +169,7 @@ calc_face_normal(const Point& _p0, const Point& _p2) const { return calc_face_normal_impl(_p0, _p1, _p2, typename GenProg::IF< - PolyMeshT::Point::size() == 3, + VectorDimensionsT::Point>::value == 3, PointIs3DTag, PointIsNot3DTag >::Result()); @@ -209,10 +210,9 @@ calc_face_normal_impl(const Point& _p0, template typename PolyMeshT::Normal -PolyMeshT:: -calc_face_normal_impl(const Point&, const Point&, const Point&, PointIsNot3DTag) const +PolyMeshT::calc_face_normal_impl(const Point&, const Point&, const Point&, PointIsNot3DTag) const { - return Normal(0); + return Normal(typename Normal::value_type(0)); } //----------------------------------------------------------------------------- @@ -241,7 +241,7 @@ PolyMeshT:: update_normals() { // Face normals are required to compute the vertex and the halfedge normals - if (Kernel::has_face_normals() ) { + if (Kernel::has_face_normals() ) { update_face_normals(); if (Kernel::has_vertex_normals() ) update_vertex_normals(); From 8488f4ac53b908bad36450b76bfc9449946dd8a0 Mon Sep 17 00:00:00 2001 From: Janis Born Date: Mon, 23 Nov 2015 15:37:14 +0100 Subject: [PATCH 05/13] use C++98-compatible template brackets --- src/OpenMesh/Core/Geometry/VectorDimensionsT.hh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/OpenMesh/Core/Geometry/VectorDimensionsT.hh b/src/OpenMesh/Core/Geometry/VectorDimensionsT.hh index 47f495eb..c9148283 100644 --- a/src/OpenMesh/Core/Geometry/VectorDimensionsT.hh +++ b/src/OpenMesh/Core/Geometry/VectorDimensionsT.hh @@ -65,7 +65,7 @@ template struct VectorDimensionsT {}; template -struct VectorDimensionsT> { +struct VectorDimensionsT< OpenMesh::VectorT > { enum { value = Dim }; From 3723088081ad4848c9845874ad0043326dc3c294 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Mon, 23 Nov 2015 17:00:06 +0100 Subject: [PATCH 06/13] Fixed template >> missing space --- src/Python/Vector.hh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Python/Vector.hh b/src/Python/Vector.hh index 68cfaf94..e3031709 100644 --- a/src/Python/Vector.hh +++ b/src/Python/Vector.hh @@ -67,10 +67,10 @@ struct Factory { } template -void defInitMod(class_> &classVector); +void defInitMod(class_< OpenMesh::VectorT > &classVector); template -void defInitMod(class_> &classVector) { +void defInitMod(class_< OpenMesh::VectorT > &classVector) { classVector .def("__init__", make_constructor(&Factory::vec2_default)) .def("__init__", make_constructor(&Factory::vec2_user_defined)) @@ -80,7 +80,7 @@ void defInitMod(class_> &classVector) { def("dot", &Vector::operator|); } template -void defInitMod(class_> &classVector) { +void defInitMod(class_< OpenMesh::VectorT > &classVector) { classVector .def("__init__", make_constructor(&Factory::vec3_default)) .def("__init__", make_constructor(&Factory::vec3_user_defined)) @@ -93,7 +93,7 @@ void defInitMod(class_> &classVector) { def("dot", &Vector::operator|); } template -void defInitMod(class_> &classVector) { +void defInitMod(class_< OpenMesh::VectorT > &classVector) { classVector .def("__init__", make_constructor(&Factory::vec4_default)) .def("__init__", make_constructor(&Factory::vec4_user_defined)) From f134510f810148af8b69204c422ab5f1b1cc2e1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Mon, 23 Nov 2015 17:04:19 +0100 Subject: [PATCH 07/13] Ignore cproject --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 65b3b7ce..5df3354e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .project +.cproject CMakeLists.txt.user From 4cc30630919d6dbe0a42a6d6bb5fb6fec961e00c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Mon, 23 Nov 2015 18:15:57 +0100 Subject: [PATCH 08/13] Fixed bug preventing from building changelog closes #11 --- Doc/changelog.docu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Doc/changelog.docu b/Doc/changelog.docu index 6dba18c1..763b1e97 100644 --- a/Doc/changelog.docu +++ b/Doc/changelog.docu @@ -1,4 +1,4 @@ -/* \page om_changelog Changelog +/** \page om_changelog Changelog \htmlonly From 1af3b6f58a5b419d32dd429b0aa8b1ec874ae989 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Mon, 23 Nov 2015 18:20:25 +0100 Subject: [PATCH 09/13] Updated changelog for 5.1 (cherry picked from commit cb045d61528d9fe86df34ad7f6813d559b2cf73a) --- Doc/changelog.docu | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Doc/changelog.docu b/Doc/changelog.docu index 763b1e97..61cfcfdb 100644 --- a/Doc/changelog.docu +++ b/Doc/changelog.docu @@ -16,6 +16,16 @@ 5.1 (?/?/?) +General +
    +
  • Fixed bug preventing from building with 2 dimensional vectors (e.g. vec2i)
    • +
+ +Unittests +
    +
  • Added some basic linear algebra tests for VectorT
    • +
  • Added tests for vec2x construction
    • +
From daa256e382932f7b494fa0d42994a0e514bbeba8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Mon, 23 Nov 2015 18:24:18 +0100 Subject: [PATCH 10/13] Updated changelog for 6.0 --- Doc/changelog.docu | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Doc/changelog.docu b/Doc/changelog.docu index 61cfcfdb..027f906e 100644 --- a/Doc/changelog.docu +++ b/Doc/changelog.docu @@ -10,6 +10,19 @@ 6.0 (?/?/?) +VectorT +
    +
  • Full C++11 rewrite of VectorT (Keeping C++98 backward compatibility)
    • +
  • Split VectorT implementation into two files (One c++98 and one c++11)
    • +
+ +Unittests +
    +
  • Added several unittests for VectorT
    • +
  • Added Benchmarks for VectorT
    • +
+ + From 422b3dc62e2656cd2579c71969ce0e108253fa6a Mon Sep 17 00:00:00 2001 From: Hans-Christian Ebke Date: Mon, 23 Nov 2015 20:50:48 +0100 Subject: [PATCH 11/13] Tweaks to HeapT.hh. --- src/OpenMesh/Tools/Utils/HeapT.hh | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/OpenMesh/Tools/Utils/HeapT.hh b/src/OpenMesh/Tools/Utils/HeapT.hh index bef721e4..12c5cfb4 100644 --- a/src/OpenMesh/Tools/Utils/HeapT.hh +++ b/src/OpenMesh/Tools/Utils/HeapT.hh @@ -79,6 +79,7 @@ #include "Config.hh" #include #include +#include //== NAMESPACE ================================================================ @@ -148,13 +149,20 @@ public: HeapT() : HeapVector() {} /// Construct with a given \c HeapIterface. - HeapT(const HeapInterface& _interface) - : HeapVector(), interface_(_interface) + HeapT(HeapInterface _interface) + : HeapVector(), interface_(std::move(_interface)) {} /// Destructor. ~HeapT(){}; + HeapInterface &getInterface() { + return interface_; + } + + const HeapInterface &getInterface() const { + return interface_; + } /// clear the heap void clear() { HeapVector::clear(); } @@ -187,14 +195,14 @@ public: HeapEntry front() const { assert(!empty()); - return entry(0); + return HeapVector::front(); } /// delete the first entry void pop_front() { assert(!empty()); - reset_heap_position(entry(0)); + reset_heap_position(HeapVector::front()); if (size() > 1) { entry(0, entry(size()-1)); @@ -338,9 +346,9 @@ void HeapT:: downheap(size_t _idx) { - HeapEntry h = entry(_idx); + const HeapEntry h = entry(_idx); size_t childIdx; - size_t s = size(); + const size_t s = size(); while(_idx < s) { From 201dee45fb7389333f759a85fcbf9737009045aa Mon Sep 17 00:00:00 2001 From: Hans-Christian Ebke Date: Mon, 23 Nov 2015 21:16:34 +0100 Subject: [PATCH 12/13] HeapT: New optimization should compile in C++98 as well... --- src/OpenMesh/Tools/Utils/HeapT.hh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/OpenMesh/Tools/Utils/HeapT.hh b/src/OpenMesh/Tools/Utils/HeapT.hh index 12c5cfb4..545cfb5e 100644 --- a/src/OpenMesh/Tools/Utils/HeapT.hh +++ b/src/OpenMesh/Tools/Utils/HeapT.hh @@ -79,7 +79,9 @@ #include "Config.hh" #include #include +#if __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__) #include +#endif //== NAMESPACE ================================================================ @@ -148,11 +150,18 @@ public: /// Constructor HeapT() : HeapVector() {} +#if __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__) /// Construct with a given \c HeapIterface. HeapT(HeapInterface _interface) : HeapVector(), interface_(std::move(_interface)) {} - +#else + /// Construct with a given \c HeapIterface. + HeapT(const HeapInterface &_interface) + : HeapVector(), interface_(_interface) + {} +#endif + /// Destructor. ~HeapT(){}; From ec8936bfa6d74274146a44a86b0dccf0b25efa62 Mon Sep 17 00:00:00 2001 From: Hans-Christian Ebke Date: Tue, 24 Nov 2015 01:45:44 +0100 Subject: [PATCH 13/13] Introduce ArrayKernel::clean_keep_reservation(). --- src/OpenMesh/Core/Mesh/ArrayKernel.cc | 10 ++++++++++ src/OpenMesh/Core/Mesh/ArrayKernel.hh | 8 ++++++++ 2 files changed, 18 insertions(+) diff --git a/src/OpenMesh/Core/Mesh/ArrayKernel.cc b/src/OpenMesh/Core/Mesh/ArrayKernel.cc index de857351..00c8d3c5 100644 --- a/src/OpenMesh/Core/Mesh/ArrayKernel.cc +++ b/src/OpenMesh/Core/Mesh/ArrayKernel.cc @@ -177,6 +177,16 @@ void ArrayKernel::garbage_collection(bool _v, bool _e, bool _f) garbage_collection( empty_vh,empty_hh,empty_fh,_v, _e, _f); } +void ArrayKernel::clean_keep_reservation() +{ + vertices_.clear(); + + edges_.clear(); + + faces_.clear(); + +} + void ArrayKernel::clean() { diff --git a/src/OpenMesh/Core/Mesh/ArrayKernel.hh b/src/OpenMesh/Core/Mesh/ArrayKernel.hh index ca64af46..eea18385 100644 --- a/src/OpenMesh/Core/Mesh/ArrayKernel.hh +++ b/src/OpenMesh/Core/Mesh/ArrayKernel.hh @@ -306,6 +306,14 @@ public: */ void clean(); + /** \brief Reset the whole mesh + * + * This will remove all elements from the mesh but keeps the properties. + * In contrast to clean() the memory used for the elements will remain + * allocated. + */ + void clean_keep_reservation(); + // --- number of items --- size_t n_vertices() const { return vertices_.size(); } size_t n_halfedges() const { return 2*edges_.size(); }