Commit 9875b209 authored by Jan Möbius's avatar Jan Möbius
Browse files

Write a float

git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@724 fdac6126-5c0c-442c-9429-916003d36597
parent 073cfd74
...@@ -132,8 +132,8 @@ merge(const NormalConeT& _cone) ...@@ -132,8 +132,8 @@ merge(const NormalConeT& _cone)
// axis by SLERP // axis by SLERP
Scalar axisAngle = 0.5*(minAngle + maxAngle); Scalar axisAngle = 0.5*(minAngle + maxAngle);
center_normal_ = ((center_normal_ * sin(centerAngle-axisAngle) center_normal_ = ((center_normal_ * sin(centerAngle-axisAngle)
+ _cone.center_normal_ * sin(axisAngle)) + _cone.center_normal_ * sin(axisAngle))
/ sin(centerAngle)); / sin(centerAngle));
} }
else else
{ {
...@@ -143,7 +143,7 @@ merge(const NormalConeT& _cone) ...@@ -143,7 +143,7 @@ merge(const NormalConeT& _cone)
// axes point in opposite directions // axes point in opposite directions
else else
angle_ = 2*M_PI; angle_ = 2.0 * M_PI;
} }
} }
......
...@@ -102,7 +102,7 @@ public: ...@@ -102,7 +102,7 @@ public:
const Vec3& center_normal() const { return center_normal_; } const Vec3& center_normal() const { return center_normal_; }
//! returns size of cone (radius in radians) //! returns size of cone (radius in radians)
Scalar angle() const { return angle_; } inline Scalar angle() const { return angle_; }
private: private:
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment