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

Write a float

Browse Source 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@724 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
Jan Möbius
2012-10-01 07:11:39 +00:00
parent 073cfd74d3
commit 9875b209c6
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/OpenMesh/Core/Geometry/NormalConeT.cc
View File

@@ -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)
// axes point in opposite directions // axes point in opposite directions
else else
angle_ = 2*M_PI; angle_ = 2.0 * M_PI;
} }
} }

2
src/OpenMesh/Core/Geometry/NormalConeT.hh
View File

@@ -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: