Add new profile types

Author: QuimMoya

src/cpp/wasm/web-ifc-wasm.cpp

@@ -23,7 +23,7 @@
 #include "../web-ifc/geometry/operations/bim-geometry/alignment.h"
 #include "../web-ifc/geometry/operations/bim-geometry/utils.h"
 #include "../web-ifc/geometry/operations/bim-geometry/boolean.h"
-#include "../web-ifc/geometry/operations/bim-geometry/ProfileI.h"
+#include "../web-ifc/geometry/operations/bim-geometry/Profile.h"
 
 namespace webifc::parsing { 
     void p21encode(std::string_view input, std::ostringstream &output);
@@ -844,9 +844,9 @@ bimGeometry::Boolean CreateBoolean()
     return bimGeometry::Boolean();
 }
 
-bimGeometry::ProfileI CreateProfileI()
+bimGeometry::Profile CreateProfile()
 {
-    return bimGeometry::ProfileI();
+    return bimGeometry::Profile();
 }
 
 EMSCRIPTEN_BINDINGS(my_module) {
@@ -1043,10 +1043,10 @@ EMSCRIPTEN_BINDINGS(my_module) {
         .function("clear", &bimGeometry::Boolean::clear)
         ;
 
-    emscripten::class_<bimGeometry::ProfileI>("ProfileI")
+    emscripten::class_<bimGeometry::Profile>("Profile")
         .constructor<>()
-        .function("GetBuffers", &bimGeometry::ProfileI::GetBuffers)
-        .function("SetValues", &bimGeometry::ProfileI::SetValues)
+        .function("GetBuffers", &bimGeometry::Profile::GetBuffers)
+        .function("SetValues", &bimGeometry::Profile::SetValues)
         ;
 
     emscripten::function("CreateAABB", &CreateAABB);
@@ -1060,7 +1060,7 @@ EMSCRIPTEN_BINDINGS(my_module) {
     emscripten::function("CreateArc", &CreateArc);
     emscripten::function("CreateAlignment", &CreateAlignment);
     emscripten::function("CreateBooleanOperator", &CreateBoolean);
-    emscripten::function("CreateProfileI", &CreateProfileI);
+    emscripten::function("CreateProfile", &CreateProfile);
     emscripten::function("LoadAllGeometry", &LoadAllGeometry);
     emscripten::function("GetAllCrossSections", &GetAllCrossSections);
     emscripten::function("GetAllAlignments", &GetAllAlignments);

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

@@ -0,0 +1,64 @@
+#include <vector>
+#include <algorithm>
+#include <glm/glm.hpp>
+#include "profile.h"
+#include "utils.h"
+#include "epsilons.h"
+
+namespace bimGeometry
+{
+    void Profile::SetValues(uint16_t _pType, double _width, double _depth, double _webThickness, double _flangeThickness, bool _hasFillet, double _filletRadius, double _radius, double _slope, std::vector<double> _placement) {
+        pType = _pType;
+        width = _width;
+        depth = _depth;
+        thickness = _webThickness;
+        flangeThickness = _flangeThickness;
+        hasFillet = _hasFillet;
+        filletRadius = _filletRadius;
+        radius = _radius;
+        slope = _slope;
+        placement = _placement;
+    }
+
+    Buffers Profile::GetBuffers()
+    {
+        Buffers buffers;
+        glm::dmat4 _placement = glm::dmat4(glm::dvec4(placement[0],placement[1],placement[2], 1),
+                                            glm::dvec4(placement[3],placement[4],placement[5], 1),
+                                            glm::dvec4(placement[6],placement[7],placement[8], 1),
+                                            glm::dvec4(placement[9],placement[10],placement[11], 1));
+
+        if(pType == 0)
+        {
+            profile = bimGeometry::GetIShapedCurve(width, depth, thickness, flangeThickness, hasFillet, filletRadius, _placement);
+        }
+        if(pType == 1)
+        {
+            profile = bimGeometry::GetCShapedCurve(width, depth, thickness, flangeThickness, hasFillet, filletRadius, _placement);
+        }
+        if(pType == 2)
+        {
+            profile = bimGeometry::GetZShapedCurve(width, depth, thickness, flangeThickness, hasFillet, filletRadius, _placement);
+        }
+        if(pType == 3)
+        {
+            profile = bimGeometry::GetTShapedCurve(width, depth, thickness, hasFillet, filletRadius, radius, slope, _placement);
+        }
+        if(pType == 4)
+        {
+            profile = bimGeometry::GetLShapedCurve(width, depth, thickness, hasFillet, filletRadius, radius, slope, _placement);
+        }
+        if(pType == 5)
+        {
+            profile = bimGeometry::GetUShapedCurve(width, depth, thickness, flangeThickness, filletRadius, radius, slope, _placement);
+        }
+
+
+        for (int r = 0; r <  profile.points.size(); r++)
+        {
+            buffers.AddPoint( profile.points[r]);
+        }
+
+        return buffers;
+    }
+}

src/cpp/web-ifc/geometry/operations/bim-geometry/profileI.h renamed to src/cpp/web-ifc/geometry/operations/bim-geometry/profile.h

@@ -7,18 +7,21 @@
 #pragma once
 
 namespace bimGeometry {
-	struct ProfileI
+	struct Profile
 	{
+        uint16_t pType;
         double width;
         double depth; 
-        double webThickness; 
+        double thickness; 
         double flangeThickness; 
         bool hasFillet;
         double filletRadius; 
+        double radius;
+        double slope; 
         std::vector<double> placement;
         Curve profile;
 
-        void SetValues(double width, double depth, double webThickness, double flangeThickness, bool hasFillet, double filletRadius, std::vector<double> placement);
+        void SetValues(uint16_t _pType, double _width, double _depth, double _webThickness, double _flangeThickness, bool _hasFillet, double _filletRadius, double _radius, double _slope, std::vector<double> _placement);
         Buffers GetBuffers();
     };
 }

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

@@ -252,15 +252,18 @@ export interface BooleanOperator {
     clear(): void;
 }
 
-export interface ProfileI {
+export interface ProfileSection {
     GetBuffers(): Buffers;
     SetValues(    
+        pType: number,
         width: number,
         depth: number,
         webThickness: number,
         flangeThickness: number,
         hasFillet: boolean,
         filletRadius: number,
+        radius: number,
+        slope: number,
         placement: Array<number>): void;
 }
 
@@ -597,9 +600,9 @@ export class IfcAPI {
         return this.wasmModule.CreateBooleanOperator();
     }
 
-    CreateProfileI()
+    CreateProfile()
     {
-        return this.wasmModule.CreateProfileI();
+        return this.wasmModule.CreateProfile();
     }
 
     /**