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

- Ifc: more opening tweaks, half a step back again.

pull/19/head
Alexander Gessler 2013-01-25 08:09:32 +01:00
parent d4bcd3ab69
commit b90882a4cb
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
code/IFCGeometry.cpp
View File

@ -1729,7 +1729,7 @@ size_t CloseWindows(ContourVector& contours,
if (sqdist < best) { if (sqdist < best) {
// avoid self-connections // avoid self-connections
if(best < 1e-5) { if(sqdist < 1e-5) {
continue; continue;
} }
@ -2205,10 +2205,10 @@ void ProcessExtrudedAreaSolid(const IfcExtrudedAreaSolid& solid, TempMesh& resul
IfcVector3 dir; IfcVector3 dir;
ConvertDirection(dir,solid.ExtrudedDirection); ConvertDirection(dir,solid.ExtrudedDirection);
dir *= solid.Depth; dir *= solid.Depth; /*
if(conv.collect_openings) { if(conv.collect_openings && !conv.apply_openings) {
dir *= 1000.0; dir *= 1000.0;
} } */
// Outline: assuming that `meshout.verts` is now a list of vertex points forming // Outline: assuming that `meshout.verts` is now a list of vertex points forming
// the underlying profile, extrude along the given axis, forming new // the underlying profile, extrude along the given axis, forming new
@ -2218,7 +2218,7 @@ void ProcessExtrudedAreaSolid(const IfcExtrudedAreaSolid& solid, TempMesh& resul
const size_t size=in.size(); const size_t size=in.size();
const bool has_area = solid.SweptArea->ProfileType == "AREA" && size>2; const bool has_area = solid.SweptArea->ProfileType == "AREA" && size>2;
if(solid.Depth < 1e-3) { if(solid.Depth < 1e-6) {
if(has_area) { if(has_area) {
meshout = result; meshout = result;
} }
@ -2284,7 +2284,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,true, true)) { if(GenerateOpenings(*conv.apply_openings,nors,temp,false, true)) {
++sides_with_openings; ++sides_with_openings;
} }