Export alignment curve metadata

ThatOpen · Nov 27, 2023 · dcc2253 · dcc2253
1 parent 7bacdf3
commit dcc2253
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 5 deletions.
diff --git a/src/wasm/geometry/IfcGeometryLoader.cpp b/src/wasm/geometry/IfcGeometryLoader.cpp
@@ -483,6 +483,8 @@ namespace webifc::geometry
       _loader.MoveToArgumentOffset(expressID, 7);
       double GravityCenterLineHeight = _loader.GetDoubleArgument();
 
+      std::string str(type);
+
       switch (Horizontal_alignment_type.at(type))
       {
       default:
@@ -502,6 +504,9 @@ namespace webifc::geometry
         curve.Add(EndPoint);
 
         alignmentCurve = curve;
+        alignmentCurve.userData.push_back("TYPE: " + str);
+        alignmentCurve.userData.push_back("LENGHT: " + std::to_string(SegmentLength));
+        alignmentCurve.userData.push_back("DIRECTION: " + std::to_string(ifcStartDirection));
 
         break;
       }
@@ -521,6 +526,8 @@ namespace webifc::geometry
         }
 
         alignmentCurve = curve;
+        alignmentCurve.userData.push_back("TYPE: " + str);
+        alignmentCurve.userData.push_back("RADIUS: " + std::to_string(StartRadiusOfCurvature));
 
         break;
       }
@@ -622,6 +629,10 @@ namespace webifc::geometry
         }
 
         alignmentCurve = curve;
+        alignmentCurve.userData.push_back("TYPE: " + str);
+        alignmentCurve.userData.push_back("START RADIUS: " + std::to_string(StartRadiusOfCurvature));
+        alignmentCurve.userData.push_back("END RADIUS: " + std::to_string(EndRadiusOfCurvature));
+        alignmentCurve.userData.push_back("A: " + std::to_string(A));
 
         break;
       }
@@ -678,6 +689,8 @@ namespace webifc::geometry
 
       IfcProfile profile;
 
+      std::string str(type);
+
       switch (Vertical_alignment_type.at(type))
       {
       default:
@@ -696,7 +709,9 @@ namespace webifc::geometry
         curve.Add(jPoint);
 
         alignmentCurve = curve;
-
+        alignmentCurve.userData.push_back("TYPE: " + str);
+        alignmentCurve.userData.push_back("START HEIGHT: " + std::to_string(StartHeight));
+        alignmentCurve.userData.push_back("START GRADIENT: " + std::to_string(StartGradient));
         break;
       }
       case 2: // ARC
@@ -727,6 +742,10 @@ namespace webifc::geometry
         }
 
         alignmentCurve = curve;
+        alignmentCurve.userData.push_back("TYPE: " + str);
+        alignmentCurve.userData.push_back("RADIUS: " + std::to_string(RadiusOfCurvature));
+        alignmentCurve.userData.push_back("START GRADIENT: " + std::to_string(StartGradient));
+        alignmentCurve.userData.push_back("END GRADIENT: " + std::to_string(EndGradient));
 
         break;
       }
@@ -756,6 +775,11 @@ namespace webifc::geometry
         }
 
         alignmentCurve = curve;
+        alignmentCurve.userData.push_back("TYPE: " + str);
+        alignmentCurve.userData.push_back("LENGHT: " + std::to_string(HorizontalLength));
+        alignmentCurve.userData.push_back("START GRADIENT: " + std::to_string(StartGradient));
+        alignmentCurve.userData.push_back("END GRADIENT: " + std::to_string(EndGradient));
+        alignmentCurve.userData.push_back("R: " + std::to_string(R));
 
         break;
       }

diff --git a/src/wasm/geometry/representation/IfcCurve.h b/src/wasm/geometry/representation/IfcCurve.h
@@ -15,14 +15,15 @@ namespace webifc::geometry {
 	{
 		std::vector<glm::dvec3> points;
 		std::vector<uint16_t> indices;
+		std::vector<std::string> userData;
 		void Add(glm::dvec3 pt);
 		void Add(glm::dvec2 pt);
 		glm::dvec2 Get2d(size_t i) const;
 		glm::dvec3 Get3d(size_t i) const;
 		void Invert();
 		bool IsCCW() const;
 		glm::dmat4 getPlacementAtDistance(double length);
-
+		
 		private:
 			static constexpr double EPS_TINY = 1e-9;
 	};

diff --git a/src/wasm/web-ifc-api.cpp b/src/wasm/web-ifc-api.cpp
@@ -1069,7 +1069,8 @@ EMSCRIPTEN_BINDINGS(my_module) {
     emscripten::register_vector<webifc::geometry::IfcCurve>("IfcCurveVector");
 
     emscripten::value_object<webifc::geometry::IfcCurve>("IfcCurve")
-        .field("points", &webifc::geometry::IfcCurve::points);
+        .field("points", &webifc::geometry::IfcCurve::points)
+        .field("userData", &webifc::geometry::IfcCurve::userData);
 
     emscripten::register_vector<glm::vec<2, glm::f64>>("vector2doubleVector");
 

diff --git a/src/web-ifc-api.ts b/src/web-ifc-api.ts
@@ -816,7 +816,12 @@ export class IfcAPI {
               const newPoint = { x: pt.x, y: pt.y };
               ptList.push(newPoint);
             }
-            const newCurve = { points: ptList };
+            const dtList = [];
+            for (let p = 0; p < curve.userData.size(); p++) {
+                const dt = curve.userData.get(p);
+                dtList.push(dt);
+            }
+            const newCurve = { points: ptList, data: dtList };
             horList.push(newCurve);
           }
           const verList = [];
@@ -828,7 +833,12 @@ export class IfcAPI {
               const newPoint = { x: pt.x, y: pt.y };
               ptList.push(newPoint);
             }
-            const newCurve = { points: ptList };
+            const dtList = [];
+            for (let p = 0; p < curve.userData.size(); p++) {
+                const dt = curve.userData.get(p);
+                dtList.push(dt);
+            }
+            const newCurve = { points: ptList, data: dtList };
             verList.push(newCurve);
           }