From 64bc8e9d4fcf9554e4111a7ffa1512e8659ddaa6 Mon Sep 17 00:00:00 2001
From: Ken Arroyo Ohori <g.a.k.arroyoohori@tudelft.nl>
Date: Mon, 6 Mar 2017 10:52:57 -0600
Subject: [PATCH] Circular profiles, added missing transformation for
 rectangles

---
 src/ifcgeom/kernels/cgal/CgalEntityMapping.h  |  1 +
 src/ifcgeom/kernels/cgal/CgalIfcGeomFaces.cpp | 41 +++++++++++++++++--
 2 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/src/ifcgeom/kernels/cgal/CgalEntityMapping.h b/src/ifcgeom/kernels/cgal/CgalEntityMapping.h
index afbb9db9f5..e35dad0f01 100644
--- a/src/ifcgeom/kernels/cgal/CgalEntityMapping.h
+++ b/src/ifcgeom/kernels/cgal/CgalEntityMapping.h
@@ -47,6 +47,7 @@ SHAPE(IfcRightCircularCylinder);
 SHAPE(IfcRightCircularCone);
 
 FACE(IfcArbitraryClosedProfileDef);
+FACE(IfcCircleProfileDef);
 FACE(IfcFace);
 FACE(IfcRectangleProfileDef);
 
diff --git a/src/ifcgeom/kernels/cgal/CgalIfcGeomFaces.cpp b/src/ifcgeom/kernels/cgal/CgalIfcGeomFaces.cpp
index 7c4e64337f..05de331234 100644
--- a/src/ifcgeom/kernels/cgal/CgalIfcGeomFaces.cpp
+++ b/src/ifcgeom/kernels/cgal/CgalIfcGeomFaces.cpp
@@ -24,9 +24,6 @@ bool IfcGeom::CgalKernel::convert(const IfcSchema::IfcRectangleProfileDef* l, cg
 #ifdef USE_IFC4
   has_position = l->hasPosition();
 #endif
-  if (has_position) {
-    IfcGeom::CgalKernel::convert(l->Position(), trsf2d);
-  }
   
   face = cgal_face_t();
   face.outer.push_back(Kernel::Point_3(-x, -y, 0.0));
@@ -34,6 +31,44 @@ bool IfcGeom::CgalKernel::convert(const IfcSchema::IfcRectangleProfileDef* l, cg
   face.outer.push_back(Kernel::Point_3( x,  y, 0.0));
   face.outer.push_back(Kernel::Point_3(-x,  y, 0.0));
   
+  if (has_position) {
+    IfcGeom::CgalKernel::convert(l->Position(), trsf2d);
+    for (auto &vertex: face.outer) {
+      vertex = vertex.transform(trsf2d);
+    }
+  }
+  
+  return true;
+}
+
+bool IfcGeom::CgalKernel::convert(const IfcSchema::IfcCircleProfileDef* l, cgal_face_t& face) {
+  const double r = l->Radius() * getValue(GV_LENGTH_UNIT);
+  if ( r == 0.0f ) {
+    Logger::Message(Logger::LOG_NOTICE,"Skipping zero sized profile:",l->entity);
+    return false;
+  }
+  
+  cgal_placement_t trsf2d;
+  bool has_position = true;
+#ifdef USE_IFC4
+  has_position = l->hasPosition();
+#endif
+  
+  const int segments = 12;
+  
+  face = cgal_face_t();
+  for (int current_segment = 0; current_segment < segments; ++current_segment) {
+    double current_angle = current_segment*2.0*3.141592653589793/((double)segments);
+    face.outer.push_back(Kernel::Point_3(r*cos(current_angle), r*sin(current_angle), 0));
+  }
+  
+  if (has_position) {
+    IfcGeom::CgalKernel::convert(l->Position(), trsf2d);
+    for (auto &vertex: face.outer) {
+      vertex = vertex.transform(trsf2d);
+    }
+  }
+
   return true;
 }