From 9875b209c64f18f9ab1d59e56541e60642e79374 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Mon, 1 Oct 2012 07:11:39 +0000 Subject: [PATCH] Write a float git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@724 fdac6126-5c0c-442c-9429-916003d36597 --- src/OpenMesh/Core/Geometry/NormalConeT.cc | 6 +++--- src/OpenMesh/Core/Geometry/NormalConeT.hh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/OpenMesh/Core/Geometry/NormalConeT.cc b/src/OpenMesh/Core/Geometry/NormalConeT.cc index cc1bbc0d..960f7b6e 100644 --- a/src/OpenMesh/Core/Geometry/NormalConeT.cc +++ b/src/OpenMesh/Core/Geometry/NormalConeT.cc @@ -132,8 +132,8 @@ merge(const NormalConeT& _cone) // axis by SLERP Scalar axisAngle = 0.5*(minAngle + maxAngle); center_normal_ = ((center_normal_ * sin(centerAngle-axisAngle) - + _cone.center_normal_ * sin(axisAngle)) - / sin(centerAngle)); + + _cone.center_normal_ * sin(axisAngle)) + / sin(centerAngle)); } else { @@ -143,7 +143,7 @@ merge(const NormalConeT& _cone) // axes point in opposite directions else - angle_ = 2*M_PI; + angle_ = 2.0 * M_PI; } } diff --git a/src/OpenMesh/Core/Geometry/NormalConeT.hh b/src/OpenMesh/Core/Geometry/NormalConeT.hh index ae3dd364..27476f4e 100644 --- a/src/OpenMesh/Core/Geometry/NormalConeT.hh +++ b/src/OpenMesh/Core/Geometry/NormalConeT.hh @@ -102,7 +102,7 @@ public: const Vec3& center_normal() const { return center_normal_; } //! returns size of cone (radius in radians) - Scalar angle() const { return angle_; } + inline Scalar angle() const { return angle_; } private: