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

Fixed issue with wrong normal scalar type when using integer points and float normals.

Browse Source 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@269 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
Mike Kremer
2010-02-08 15:28:25 +00:00
parent ac7bb9f164
commit 88ca0c9b60
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/OpenMesh/Core/Mesh/PolyMeshT.cc
View File

@@ -118,11 +118,11 @@ calc_face_normal(const Point& _p0,
// The OpenSG <Vector>::operator -= () does not support the type Point // The OpenSG <Vector>::operator -= () does not support the type Point
// as rhs. Therefore use vector_cast at this point!!! // as rhs. Therefore use vector_cast at this point!!!
// Note! OpenSG distinguishes between Normal and Point!!! // Note! OpenSG distinguishes between Normal and Point!!!
Normal p1p0(_p0); p1p0 -= vector_cast<Normal>(_p1); Normal p1p0(vector_cast<Normal>(_p0)); p1p0 -= vector_cast<Normal>(_p1);
Normal p1p2(_p2); p1p2 -= vector_cast<Normal>(_p1); Normal p1p2(vector_cast<Normal>(_p2)); p1p2 -= vector_cast<Normal>(_p1);
Normal n = cross(p1p2, p1p0); Normal n = cross(p1p2, p1p0);
Scalar norm = n.length(); typename Normal::value_type norm = n.length();
// The expression ((n *= (1.0/norm)),n) is used because the OpenSG // The expression ((n *= (1.0/norm)),n) is used because the OpenSG
// vector class does not return self after component-wise // vector class does not return self after component-wise
@@ -133,7 +133,7 @@ calc_face_normal(const Point& _p0,
Point p1p2 = _p2; p1p2 -= _p1; Point p1p2 = _p2; p1p2 -= _p1;
Normal n = vector_cast<Normal>(cross(p1p2, p1p0)); Normal n = vector_cast<Normal>(cross(p1p2, p1p0));
Scalar norm = n.length(); typename Normal::value_type norm = n.length();
return (norm != 0.0) ? n *= (1.0/norm) : Normal(0,0,0); return (norm != 0.0) ? n *= (1.0/norm) : Normal(0,0,0);
#endif #endif