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

C++11: Fixed VectorT::normalize_cond() implementation.

Browse Source
This commit is contained in:
Hans-Christian Ebke
2015-11-19 14:09:03 +01:00
parent 784adb9744
commit 07fa145057
2 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/OpenMesh/Core/Geometry/Vector11T.hh
View File

@@ -414,10 +414,17 @@ class VectorT {
/** normalize vector, return normalized vector and avoids div by zero /** normalize vector, return normalized vector and avoids div by zero
*/ */
vector_type& normalize_cond() { template<typename S = typename std::result_of<
Scalar n = norm(); decltype(&VectorT::norm)(VectorT)>::type>
if (n != (Scalar)0.0) typename std::enable_if<
{ sizeof(static_cast<S>(0)) >= 0,
vector_type&>::type
normalize_cond() {
static_assert(sizeof(static_cast<decltype(norm())>(0)) >= 0,
"normalize_cond() only works with Scalar types that can "
"be statically casted from 0.");
auto n = norm();
if (n != static_cast<decltype(norm())>(0)) {
*this /= n; *this /= n;
} }
return *this; return *this;

9
src/Unittests/unittests_vector_type.cc
View File

@@ -154,4 +154,13 @@ TEST_F(OpenMeshVectorTest, BasicLinearAlgebra) {
EXPECT_NEAR(14, OpenMesh::Vec3d(-1, -2, -3) | OpenMesh::Vec3d(-1, -2, -3), 1e-6); EXPECT_NEAR(14, OpenMesh::Vec3d(-1, -2, -3) | OpenMesh::Vec3d(-1, -2, -3), 1e-6);
} }
TEST_F(OpenMeshVectorTest, normalized_cond) {
OpenMesh::Vec3d v1(1, -2, 3), v2(0, 0, 0);
EXPECT_EQ(OpenMesh::Vec3d(0, 0, 0), v2.normalize_cond());
const auto r1 = OpenMesh::Vec3d(0.2672612419124244, -0.5345224838248488, 0.8017837257372732) - v1.normalize_cond();
EXPECT_NEAR(r1[0], 0.0, 1e-6);
EXPECT_NEAR(r1[1], 0.0, 1e-6);
EXPECT_NEAR(r1[2], 0.0, 1e-6);
}
} }