Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-08-13 10:57:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into tridify_ifcgeom_dll

Browse Source 
# Conflicts:
#	cmake/CMakeLists.txt
This commit is contained in:
Thomas Krijnen
2016-08-08 10:56:06 +02:00
parent 0f857283e8 16e8fff9ca
commit f1099fc3b1
35 changed files with 1349 additions and 1095 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcgeom/IfcGeomFunctions.cpp
+2 -3
View File
@@ -1373,7 +1373,6 @@ bool IfcGeom::Kernel::convert_layerset(const IfcSchema::IfcProduct* product, std
const IfcSchema::IfcMaterialLayerSet* layerset = usage->ForLayerSet();
const bool positive = usage->DirectionSense() == IfcSchema::IfcDirectionSenseEnum::IfcDirectionSense_POSITIVE;
double offset = usage->OffsetFromReferenceLine() * getValue(GV_LENGTH_UNIT);
const int axis = usage->LayerSetDirection();
IfcSchema::IfcMaterialLayer::list::ptr material_layers = layerset->MaterialLayers();
@@ -1730,7 +1729,7 @@ bool IfcGeom::Kernel::fold_layers(const IfcSchema::IfcWall* wall, const IfcRepre
bool found_intersection = false;
boost::optional<gp_Pnt> point_outside_param_range;
double param;
//double param;
const Handle_Geom_Surface& surface = *jt;
@@ -1741,7 +1740,7 @@ bool IfcGeom::Kernel::fold_layers(const IfcSchema::IfcWall* wall, const IfcRepre
intersections.Parameters(1, u, v, w);
if (w < axis_u1 || w > axis_u2) {
point_outside_param_range = p;
param = w;
//param = w;
} else {
// Found an intersection. Layer end point is covered by connecting wall
found_intersection = true;