Fragments -> Issue #89

Author: QuimMoya

src/cpp/test/web-ifc-test.cpp

@@ -486,7 +486,10 @@ int main()
     // std::string content = ReadFile("C:/Users/qmoya/Desktop/MODELS/bc-78.ifc");
     // std::string content = ReadFile("C:/Users/qmoya/Desktop/MODELS/83.ifc");
     // std::string content = ReadFile("C:/Users/qmoya/Desktop/MODELS/1506.ifc");
-    std::string content = ReadFile("C:/Users/qmoya/Desktop/MODELS/TAR_E1A_LA_RVT_0001.ifc");
+    // std::string content = ReadFile("C:/Users/qmoya/Desktop/MODELS/TAR_E1A_LA_RVT_0001.ifc");
+
+    // std::string content = ReadFile("C:/Users/qmoya/Desktop/MODELS/1604.ifc");
+    std::string content = ReadFile("C:/Users/qmoya/Desktop/MODELS/fragments_89.ifc");
 
     struct LoaderSettings
     {
@@ -532,7 +535,11 @@ int main()
 
     start = ms();
 
-    SpecificLoadTest(loader, geometryLoader, 543139); // 
+    // SpecificLoadTest(loader, geometryLoader, 2099); //1604
+
+    SpecificLoadTest(loader, geometryLoader, 164); //1604
+
+    // SpecificLoadTest(loader, geometryLoader, 543139); // 
     // SpecificLoadTest(loader, geometryLoader, 350038); // 
     // SpecificLoadTest(loader, geometryLoader, 252); // 1506
     // SpecificLoadTest(loader, geometryLoader, 407); // 1450

src/cpp/web-ifc/geometry/IfcGeometryLoader.cpp

@@ -2011,7 +2011,8 @@ namespace webifc::geometry
               auto pts = ReadIfcCartesianPointList3D(ptsRef);
               for (auto &pt : sg.indexs)
               {
-                curve.Add(pts[pt - 1]);
+                // Fragments -> Issue #89 -> requires not to skip overlapped points, this is why "removeCoincident" is set to false
+                curve.Add(pts[pt - 1], false);
               }
             }
             if (sg.type == "IFCARCINDEX")
@@ -2020,7 +2021,8 @@ namespace webifc::geometry
               IfcCurve arc = Build3DArc3Pt(pts[sg.indexs[0] - 1], pts[sg.indexs[1] - 1], pts[sg.indexs[2] - 1], _circleSegments, EPS_MINISCULE);
               for (auto &pt : arc.points)
               {
-                curve.Add(pt);
+                // Fragments -> Issue #89 -> requires not to skip overlapped points, this is why "removeCoincident" is set to false
+                curve.Add(pt, false);
               }
               curve.arcSegments.push_back(curve.points.size() - 1 - arc.points.size());
               curve.arcSegments.push_back(curve.points.size() - 1);
@@ -3088,8 +3090,9 @@ namespace webifc::geometry
       _loader.MoveToArgumentOffset(expressID, 0);
       profile.type = _loader.GetStringArgument();
       _loader.MoveToArgumentOffset(expressID, 2);
+      uint32_t curveID = _loader.GetRefArgument();
       // ISSUE 765 requires dimension 3, not sure how to solve it without a stopgap
-      profile.curve = GetCurve(_loader.GetRefArgument(), 2);
+      profile.curve = GetCurve(curveID, 2);
       profile.isConvex = IsCurveConvex(profile.curve);
 
       return profile;

src/cpp/web-ifc/geometry/operations/bim-geometry/curve.cpp

@@ -7,10 +7,11 @@
 
 namespace bimGeometry
 {
-
-	void Curve::Add(glm::dvec3 pt)
+    // Fragments -> Issue #89 -> requires "removeCoincident" switch
+	void Curve::Add(glm::dvec3 pt, bool removeCoincident)
 	{
-		if (points.empty())
+
+		if (points.empty() || !removeCoincident)
 			points.push_back(pt);
 		else if (!equals(pt, points.back(), EPS_TINY_CURVE))
 			points.push_back(pt);

src/cpp/web-ifc/geometry/operations/bim-geometry/curve.h

@@ -11,7 +11,7 @@ namespace bimGeometry {
 
         void Invert();
 		bool IsCCW() const;
-        void Add(glm::dvec3 pt);
+        void Add(glm::dvec3 pt, bool removeCoincident = true);
 		void Add(glm::dvec2 pt);
     };
 }