From f8a2cce2022634a512475c92eb51e316ff556111 Mon Sep 17 00:00:00 2001
From: Thomas Krijnen <t.krijnen@gmail.com>
Date: Sun, 1 Sep 2024 15:14:22 +0200
Subject: [PATCH] Use polygon_from_points() and handle Position for CSG Pyramid
 #5241

---
 src/ifcgeom/mapping/IfcRectangularPyramid.cpp | 59 +++++++------------
 1 file changed, 21 insertions(+), 38 deletions(-)

diff --git a/src/ifcgeom/mapping/IfcRectangularPyramid.cpp b/src/ifcgeom/mapping/IfcRectangularPyramid.cpp
index 70ff3e9a9d..ab22069991 100644
--- a/src/ifcgeom/mapping/IfcRectangularPyramid.cpp
+++ b/src/ifcgeom/mapping/IfcRectangularPyramid.cpp
@@ -21,6 +21,8 @@
 #define mapping POSTFIX_SCHEMA(mapping)
 using namespace ifcopenshell::geometry;
 
+#include "../profile_helper.h"
+
 taxonomy::ptr mapping::map_impl(const IfcSchema::IfcRectangularPyramid* inst) {
 	const double dx = inst->XLength() * length_unit_;
 	const double dy = inst->YLength() * length_unit_;
@@ -33,96 +35,77 @@ taxonomy::ptr mapping::map_impl(const IfcSchema::IfcRectangularPyramid* inst) {
 	// Base
 	{
 		auto face = taxonomy::make<taxonomy::face>();
-		auto loop = taxonomy::make<taxonomy::loop>();
-		face->children.push_back(loop);
-		loop->external = true;
 		shell->children.push_back(face);
 
-		std::array<taxonomy::point3::ptr, 4> points{
+		std::vector<taxonomy::point3::ptr> points{
 			taxonomy::make<taxonomy::point3>(0, 0, 0),
-			taxonomy::make<taxonomy::point3>(dx, 0, 0),
+			taxonomy::make<taxonomy::point3>(0, dy, 0),
 			taxonomy::make<taxonomy::point3>(dx, dy, 0),
-			taxonomy::make<taxonomy::point3>(0, dy, 0)
+			taxonomy::make<taxonomy::point3>(dx, 0, 0),
 		};
 
-		loop->children.push_back(taxonomy::make<taxonomy::edge>(points[0], points[1]));
-		loop->children.push_back(taxonomy::make<taxonomy::edge>(points[1], points[2]));
-		loop->children.push_back(taxonomy::make<taxonomy::edge>(points[2], points[3]));
-		loop->children.push_back(taxonomy::make<taxonomy::edge>(points[3], points[0]));
+		points.push_back(points.front());
+		face->children.push_back(polygon_from_points(points));
 	}
 
 	// Lateral faces
 	{
 		auto face = taxonomy::make<taxonomy::face>();
-		auto loop = taxonomy::make<taxonomy::loop>();
-		face->children.push_back(loop);
-		loop->external = true;
 		shell->children.push_back(face);
 
-		std::array<taxonomy::point3::ptr, 3> points{
+		std::vector<taxonomy::point3::ptr> points{
 			taxonomy::make<taxonomy::point3>(0, 0, 0),
 			taxonomy::make<taxonomy::point3>(0, dy, 0),
 			taxonomy::make<taxonomy::point3>(0.5*dx, 0.5*dy, dz)
 		};
 
-		loop->children.push_back(taxonomy::make<taxonomy::edge>(points[0], points[1]));
-		loop->children.push_back(taxonomy::make<taxonomy::edge>(points[1], points[2]));
-		loop->children.push_back(taxonomy::make<taxonomy::edge>(points[2], points[0]));
+		points.push_back(points.front());
+		face->children.push_back(polygon_from_points(points));
 	}
 
 	{
 		auto face = taxonomy::make<taxonomy::face>();
-		auto loop = taxonomy::make<taxonomy::loop>();
-		face->children.push_back(loop);
-		loop->external = true;
 		shell->children.push_back(face);
 
-		std::array<taxonomy::point3::ptr, 3> points{
+		std::vector<taxonomy::point3::ptr> points{
 			taxonomy::make<taxonomy::point3>(0, dy, 0),
 			taxonomy::make<taxonomy::point3>(dx, dy, 0),
 			taxonomy::make<taxonomy::point3>(0.5*dx, 0.5*dy, dz)
 		};
 
-		loop->children.push_back(taxonomy::make<taxonomy::edge>(points[0], points[1]));
-		loop->children.push_back(taxonomy::make<taxonomy::edge>(points[1], points[2]));
-		loop->children.push_back(taxonomy::make<taxonomy::edge>(points[2], points[0]));
+		points.push_back(points.front());
+		face->children.push_back(polygon_from_points(points));
 	}
 
 	{
 		auto face = taxonomy::make<taxonomy::face>();
-		auto loop = taxonomy::make<taxonomy::loop>();
-		face->children.push_back(loop);
-		loop->external = true;
 		shell->children.push_back(face);
 
-		std::array<taxonomy::point3::ptr, 3> points{
+		std::vector<taxonomy::point3::ptr> points{
 			taxonomy::make<taxonomy::point3>(dx, dy, 0),
 			taxonomy::make<taxonomy::point3>(dx, 0, 0),
 			taxonomy::make<taxonomy::point3>(0.5*dx, 0.5*dy, dz)
 		};
 
-		loop->children.push_back(taxonomy::make<taxonomy::edge>(points[0], points[1]));
-		loop->children.push_back(taxonomy::make<taxonomy::edge>(points[1], points[2]));
-		loop->children.push_back(taxonomy::make<taxonomy::edge>(points[2], points[0]));
+		points.push_back(points.front());
+		face->children.push_back(polygon_from_points(points));
 	}
 
 	{
 		auto face = taxonomy::make<taxonomy::face>();
-		auto loop = taxonomy::make<taxonomy::loop>();
-		face->children.push_back(loop);
-		loop->external = true;
 		shell->children.push_back(face);
 
-		std::array<taxonomy::point3::ptr, 3> points{
+		std::vector<taxonomy::point3::ptr> points{
 			taxonomy::make<taxonomy::point3>(dx, 0, 0),
 			taxonomy::make<taxonomy::point3>(0, 0, 0),
 			taxonomy::make<taxonomy::point3>(0.5*dx, 0.5*dy, dz)
 		};
 
-		loop->children.push_back(taxonomy::make<taxonomy::edge>(points[0], points[1]));
-		loop->children.push_back(taxonomy::make<taxonomy::edge>(points[1], points[2]));
-		loop->children.push_back(taxonomy::make<taxonomy::edge>(points[2], points[0]));
+		points.push_back(points.front());
+		face->children.push_back(polygon_from_points(points));
 	}
 
+	solid->matrix = taxonomy::cast<taxonomy::matrix4>(map(inst->Position()));
+
 	return solid;
 }