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

- Ifc: improve intersection check for openings.

pull/16/merge
Alexander Gessler 2013-01-24 01:09:48 +01:00
parent 650e515dd6
commit b42f279110
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
code/IFCGeometry.cpp
View File

@ -1970,15 +1970,14 @@ bool GenerateOpenings(std::vector<TempOpening>& openings,
for (unsigned int vi = 0, vend = profile_vertcnts[f]; vi < vend; ++vi, ++vi_total) { for (unsigned int vi = 0, vend = profile_vertcnts[f]; vi < vend; ++vi, ++vi_total) {
const IfcVector3& x = profile_verts[vi_total]; const IfcVector3& x = profile_verts[vi_total];
if(check_intersection) {
const IfcFloat vert_d = -(x * nor);
dmin = std::min(dmin, vert_d);
dmax = std::max(dmax, vert_d);
}
const IfcVector3& v = m * x; const IfcVector3& v = m * x;
IfcVector2 vv(v.x, v.y); IfcVector2 vv(v.x, v.y);
if(check_intersection) {
dmin = std::min(dmin, v.z);
dmax = std::max(dmax, v.z);
}
// sanity rounding // sanity rounding
vv = std::max(vv,IfcVector2()); vv = std::max(vv,IfcVector2());
vv = std::min(vv,one_vec); vv = std::min(vv,one_vec);
@ -2245,7 +2244,7 @@ void ProcessExtrudedAreaSolid(const IfcExtrudedAreaSolid& solid, TempMesh& resul
out.push_back(in[next]); out.push_back(in[next]);
if(openings) { if(openings) {
if(GenerateOpenings(*conv.apply_openings,nors,temp, i >= size/2)) { if(GenerateOpenings(*conv.apply_openings,nors,temp,true, true)) {
++sides_with_openings; ++sides_with_openings;
} }
@ -2264,7 +2263,7 @@ void ProcessExtrudedAreaSolid(const IfcExtrudedAreaSolid& solid, TempMesh& resul
curmesh.vertcnt.push_back(size); curmesh.vertcnt.push_back(size);
if(openings && size > 2) { if(openings && size > 2) {
if(GenerateOpenings(*conv.apply_openings,nors,temp, true)) { if(GenerateOpenings(*conv.apply_openings,nors,temp,true, true)) {
++sides_with_v_openings; ++sides_with_v_openings;
} }