v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Ifc: fix normalization of base mesh normal for opening generation.

pull/19/head
Alexander Gessler 2013-01-25 03:48:06 +01:00
parent bbe8763d9e
commit bbd10cd748
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
code/IFCGeometry.cpp
View File

@ -1926,7 +1926,8 @@ bool GenerateOpenings(std::vector<TempOpening>& openings,
return false; return false;
} }
const IfcVector3& nor = IfcVector3(m.c1, m.c2, m.c3); IfcVector3 nor = IfcVector3(m.c1, m.c2, m.c3);
nor.Normalize();
// Obtain inverse transform for getting back to world space later on // Obtain inverse transform for getting back to world space later on
const IfcMatrix4& minv = IfcMatrix4(m).Inverse(); const IfcMatrix4& minv = IfcMatrix4(m).Inverse();
@ -1975,7 +1976,7 @@ bool GenerateOpenings(std::vector<TempOpening>& openings,
(profile_verts[vi_total+1] - profile_verts[vi_total])).Normalize(); (profile_verts[vi_total+1] - profile_verts[vi_total])).Normalize();
const IfcFloat abs_dot_face_nor = abs(nor * face_nor); const IfcFloat abs_dot_face_nor = abs(nor * face_nor);
if (abs_dot_face_nor < 0.5) { if (abs_dot_face_nor < 0.9) {
vi_total += profile_vertcnts[f]; vi_total += profile_vertcnts[f];
continue; continue;
} }
@ -2030,7 +2031,7 @@ bool GenerateOpenings(std::vector<TempOpening>& openings,
// TODO: This epsilon may be too large // TODO: This epsilon may be too large
const IfcFloat epsilon = fabs(dmax-dmin) * 0.001; const IfcFloat epsilon = fabs(dmax-dmin) * 0.0001;
if (check_intersection && (0 < dmin-epsilon || 0 > dmax+epsilon)) { if (check_intersection && (0 < dmin-epsilon || 0 > dmax+epsilon)) {
continue; continue;
} }