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 1/5] 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 2/5] 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 3/5] 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 4/5] 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 5/5] 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 };