Styles + bugfixes (fix points order in loops) (#3)

Author: ExternPointer

CMakeLists.txt

@@ -35,7 +35,7 @@ set( HEADERS
         include/ifcpp/Geometry/GeometryGenerator.h
         include/ifcpp/Geometry/CAdapter.h
         include/ifcpp/Geometry/GeometryConverter.h
-        include/ifcpp/Geometry/PrimitivesConverter.h
+        include/ifcpp/Geometry/PrimitiveTypesConverter.h
         include/ifcpp/Geometry/VectorAdapter.h
         include/ifcpp/Geometry/Parameters.h
         include/ifcpp/Geometry/CurveConverter.h
@@ -44,6 +44,8 @@ set( HEADERS
         include/ifcpp/Geometry/SolidConverter.h
         include/ifcpp/Geometry/SplineConverter.h
         include/ifcpp/Geometry/Extruder.h
+        include/ifcpp/Geometry/Helpers.h
+        include/ifcpp/Geometry/StyleConverter.h
         ${IFC_HEADERS} )
 
 

include/ifcpp/Geometry/CAdapter.h

@@ -7,25 +7,30 @@
 
 #include "ifcpp/Geometry/CVector.h"
 #include "ifcpp/Geometry/Matrix.h"
+#include "ifcpp/Geometry/StyleConverter.h"
 
 
 namespace ifcpp {
 
 template<typename TAdapter>
 concept CAdapter = CVector<typename TAdapter::TVector> &&
     requires( TAdapter adapter, std::vector<typename TAdapter::TVector>& vertices, std::vector<int> indices,
-              std::shared_ptr<IFC4X3::IfcObjectDefinition> ifcObjectDifinition, std::vector<typename TAdapter::TPolygon> polygons,
-              std::vector<typename TAdapter::TPolyline> polylines, Matrix<typename TAdapter::TVector> matrix, std::vector<typename TAdapter::TVector> loop,
-              std::vector<typename TAdapter::TPolygon> operand1, std::vector<typename TAdapter::TPolygon> operand2 ) {
+              std::shared_ptr<IFC4X3::IfcObjectDefinition> ifcObjectDifinition, std::vector<typename TAdapter::TTriangle> triangles,
+              std::vector<typename TAdapter::TMesh> meshes, std::vector<typename TAdapter::TPolyline> polylines, Matrix<typename TAdapter::TVector> matrix,
+              std::vector<typename TAdapter::TVector> loop, std::vector<typename TAdapter::TMesh> operand1, std::vector<typename TAdapter::TMesh> operand2,
+              std::vector<std::shared_ptr<Style>> styles ) {
         { adapter.CreatePolyline( vertices ) } -> std::same_as<typename TAdapter::TPolyline>;
-        { adapter.CreatePolygon( vertices, indices ) } -> std::same_as<typename TAdapter::TPolygon>;
-        { adapter.CreateEntity( ifcObjectDifinition, polygons, polylines ) } -> std::same_as<typename TAdapter::TEntity>;
-        { adapter.Transform( &polygons, matrix ) } -> std::same_as<void>;
+        { adapter.CreateTriangle( vertices, indices ) } -> std::same_as<typename TAdapter::TTriangle>;
+        { adapter.CreateMesh( triangles ) } -> std::same_as<typename TAdapter::TMesh>;
+        { adapter.CreateEntity( ifcObjectDifinition, meshes, polylines ) } -> std::same_as<typename TAdapter::TEntity>;
+        { adapter.Transform( &meshes, matrix ) } -> std::same_as<void>;
         { adapter.Transform( &polylines, matrix ) } -> std::same_as<void>;
+        { adapter.AddStyles( &meshes, styles ) } -> std::same_as<void>;
+        { adapter.AddStyles( &polylines, styles ) } -> std::same_as<void>;
         { adapter.Triangulate( loop ) } -> std::same_as<std::vector<int>>;
-        { adapter.ComputeUnion( operand1, operand2 ) } -> std::same_as<std::vector<typename TAdapter::TPolygon>>;
-        { adapter.ComputeIntersection( operand1, operand2 ) } -> std::same_as<std::vector<typename TAdapter::TPolygon>>;
-        { adapter.ComputeDifference( operand1, operand2 ) } -> std::same_as<std::vector<typename TAdapter::TPolygon>>;
+        { adapter.ComputeUnion( operand1, operand2 ) } -> std::same_as<std::vector<typename TAdapter::TMesh>>;
+        { adapter.ComputeIntersection( operand1, operand2 ) } -> std::same_as<std::vector<typename TAdapter::TMesh>>;
+        { adapter.ComputeDifference( operand1, operand2 ) } -> std::same_as<std::vector<typename TAdapter::TMesh>>;
     };
 
 }

include/ifcpp/Geometry/CurveConverter.h

@@ -4,7 +4,7 @@
 #include "ifcpp/Geometry/GeomUtils.h"
 #include "ifcpp/Geometry/Matrix.h"
 #include "ifcpp/Geometry/Parameters.h"
-#include "ifcpp/Geometry/PrimitivesConverter.h"
+#include "ifcpp/Geometry/PrimitiveTypesConverter.h"
 #include "ifcpp/Geometry/SplineConverter.h"
 #include "ifcpp/Geometry/VectorAdapter.h"
 
@@ -44,13 +44,13 @@ class CurveConverter {
     using AVector = VectorAdapter<TVector>;
     using TMatrix = Matrix<TVector>;
 
-    std::shared_ptr<PrimitivesConverter<TVector>> m_primitivesConverter;
+    std::shared_ptr<PrimitiveTypesConverter<TVector>> m_primitivesConverter;
     std::shared_ptr<GeomUtils<TVector>> m_geomUtils;
     std::shared_ptr<SplineConverter<TVector>> m_splineConverter;
     std::shared_ptr<Parameters> m_parameters;
 
 public:
-    CurveConverter( const std::shared_ptr<PrimitivesConverter<TVector>>& primitivesConverter, const std::shared_ptr<GeomUtils<TVector>>& geomUtils,
+    CurveConverter( const std::shared_ptr<PrimitiveTypesConverter<TVector>>& primitivesConverter, const std::shared_ptr<GeomUtils<TVector>>& geomUtils,
                     const std::shared_ptr<SplineConverter<TVector>> splineConverter, const std::shared_ptr<Parameters>& parameters )
         : m_primitivesConverter( primitivesConverter )
         , m_geomUtils( geomUtils )

include/ifcpp/Geometry/Extruder.h

@@ -30,7 +30,7 @@ class Extruder {
         if( profile.empty() ) {
             return {};
         }
-        // TODO: It is not important to simplify profile here
+        // TODO: It is not important to simplify profile heres
         if( asClosed ) {
             profile = this->m_geomUtils->SimplifyLoop( profile );
             profile.push_back( profile[ 0 ] );
@@ -40,7 +40,7 @@ class Extruder {
         std::vector<TLoop> result;
 
         // TODO: Rework
-        if( AVector::Dot( extrusion, this->m_geomUtils->ComputePlaneNormal( profile ) ) < 0 ) {
+        if( AVector::Dot( extrusion, this->m_geomUtils->ComputePolygonNormal( profile ) ) < 0 ) {
             for( auto& point: profile ) {
                 point = point + extrusion;
             }