method bufferedGetStepLine

Author: ifcapps

IfcPlusPlus/src/ifcpp/geometry/ConverterOSG.h

@@ -28,6 +28,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OU
 #include <ifcpp/model/BasicTypes.h>
 #include <ifcpp/model/OpenMPIncludes.h>
 #include <ifcpp/model/StatusCallback.h>
+#include <ifcpp/IFC4X3/EntityFactory.h>
 #include <ifcpp/IFC4X3/include/IfcCurtainWall.h>
 #include <ifcpp/IFC4X3/include/IfcFeatureElementSubtraction.h>
 #include <ifcpp/IFC4X3/include/IfcGloballyUniqueId.h>
@@ -44,6 +45,8 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OU
 #include "IncludeCarveHeaders.h"
 #include "CSG_Adapter.h"
 
+using namespace IFC4X3;
+
 class ConverterOSG : public StatusCallback
 {
 protected:

IfcPlusPlus/src/ifcpp/geometry/GeomDebugDump.h

@@ -407,19 +407,25 @@ namespace GeomDebugDump
 			if( meshset->meshes[0]->faces.size() > 0 )
 			{
 				carve::mesh::Face<3>* f = meshset->meshes[0]->faces[0];
-				const carve::mesh::Vertex<3>* v1 = f->edge->v1();
-				const carve::mesh::Vertex<3>* v2 = f->edge->v2();
-
-				int v1index = findVertexIndexInVector(vec_vertices, v1);
-				if( v1index < 0 )
+				if( f != nullptr )
 				{
-					std::cout << "vertex not found\n";
-				}
+					if( f->edge != nullptr )
+					{
+						const carve::mesh::Vertex<3>* v1 = f->edge->v1();
+						const carve::mesh::Vertex<3>* v2 = f->edge->v2();
 
-				int v2index = findVertexIndexInVector(vec_vertices, v2);
-				if( v2index < 0 )
-				{
-					std::cout << "vertex not found\n";
+						int v1index = findVertexIndexInVector(vec_vertices, v1);
+						if( v1index < 0 )
+						{
+							std::cout << "vertex not found\n";
+						}
+
+						int v2index = findVertexIndexInVector(vec_vertices, v2);
+						if( v2index < 0 )
+						{
+							std::cout << "vertex not found\n";
+						}
+					}
 				}
 			}
 		}
@@ -944,12 +950,37 @@ namespace GeomDebugDump
 
 		for( auto mesh : meshset->meshes )
 		{
+			bool pointersOk = true;
+			for( auto f : mesh->faces )
+			{
+				if( f == nullptr )
+				{
+					pointersOk = false;
+					break;
+				}
+				if( f->edge == nullptr )
+				{
+					pointersOk = false;
+					break;
+				}
+			}
+
+			if( !pointersOk )
+			{
+				continue;
+			}
+			
 			mesh->cacheEdges();
+			
 			std::vector<carve::mesh::Edge<3>* > openEdges = mesh->open_edges;
 			numOpenEdges += openEdges.size();
 			for( size_t ii = 0; ii < openEdges.size(); ++ii )
 			{
 				auto e = openEdges[ii];
+				if( e->vert == nullptr )
+				{
+					continue;
+				}
 				auto p1 = e->v1()->v;
 				auto p2 = e->v2()->v;
 

IfcPlusPlus/src/ifcpp/geometry/GeomUtils.h

@@ -1085,28 +1085,28 @@ namespace GeomUtils
 		return false;
 	}
 
-	inline bool isMatrixIdentity( const carve::math::Matrix& mat )
+	inline bool isMatrixIdentity( const carve::math::Matrix& mat, double eps = 0.00001 )
 	{
-		if( std::abs( mat._11 - 1.0 ) > 0.00001 )  return false;
-		if( std::abs( mat._22 - 1.0 ) > 0.00001 )  return false;
-		if( std::abs( mat._33 - 1.0 ) > 0.00001 )  return false;
-		if( std::abs( mat._44 - 1.0 ) > 0.00001 )  return false;
+		if( std::abs( mat._11 - 1.0 ) > eps )  return false;
+		if( std::abs( mat._22 - 1.0 ) > eps )  return false;
+		if( std::abs( mat._33 - 1.0 ) > eps )  return false;
+		if( std::abs( mat._44 - 1.0 ) > eps )  return false;
 
-		if( std::abs( mat._12 ) > 0.00001 )  return false;
-		if( std::abs( mat._13 ) > 0.00001 )  return false;
-		if( std::abs( mat._14 ) > 0.00001 )  return false;
+		if( std::abs( mat._12 ) > eps )  return false;
+		if( std::abs( mat._13 ) > eps )  return false;
+		if( std::abs( mat._14 ) > eps )  return false;
 
-		if( std::abs( mat._21 ) > 0.00001 )  return false;
-		if( std::abs( mat._23 ) > 0.00001 )  return false;
-		if( std::abs( mat._24 ) > 0.00001 )  return false;
+		if( std::abs( mat._21 ) > eps )  return false;
+		if( std::abs( mat._23 ) > eps )  return false;
+		if( std::abs( mat._24 ) > eps )  return false;
 
-		if( std::abs( mat._31 ) > 0.00001 )  return false;
-		if( std::abs( mat._32 ) > 0.00001 )  return false;
-		if( std::abs( mat._34 ) > 0.00001 )  return false;
+		if( std::abs( mat._31 ) > eps )  return false;
+		if( std::abs( mat._32 ) > eps )  return false;
+		if( std::abs( mat._34 ) > eps )  return false;
 
-		if( std::abs( mat._41 ) > 0.00001 )  return false;
-		if( std::abs( mat._42 ) > 0.00001 )  return false;
-		if( std::abs( mat._43 ) > 0.00001 )  return false;
+		if( std::abs( mat._41 ) > eps )  return false;
+		if( std::abs( mat._42 ) > eps )  return false;
+		if( std::abs( mat._43 ) > eps )  return false;
 		return true;
 	}
 	inline bool isMatrixEqual(const carve::math::Matrix& mat1, const carve::math::Matrix& mat2, double maxDelta = 0.00001)

IfcPlusPlus/src/ifcpp/geometry/MeshOpsDebug.h

@@ -136,6 +136,15 @@ inline void dumpMeshset(const shared_ptr<carve::mesh::MeshSet<3> >& meshset, con
 	{
 		return;
 	}
+
+	bool checkForDegenerateEdges = false;
+	MeshSetInfo info;
+	MeshUtils::checkMeshSetPointers(meshset, checkForDegenerateEdges, info);
+	if( !info.allPointersValid )
+	{
+		return;
+	}
+	
 	vec3 offset = carve::geom::VECTOR(0, GeomDebugDump::dump_y_pos_geom, 0);
 	shared_ptr<carve::mesh::MeshSet<3> > meshset_copy(meshset->clone());
 	double eps = EPS_M8;

IfcPlusPlus/src/ifcpp/geometry/PointConverter.h

@@ -413,14 +413,14 @@ class PointConverter : public StatusCallback
 			x2=x3;
 		}
 
-		if( resultAngle < 0 )
+		if( resultAngle < -2.0*M_PI )
 		{
-			resultAngle += 2.0 * M_PI;
+			resultAngle = -2.0 * M_PI;
 		}
 
 		if( resultAngle > 2.0*M_PI )
 		{
-			resultAngle -= 2.0 * M_PI;
+			resultAngle = 2.0 * M_PI;
 		}
 		return resultAngle;
 	}