Mercurial > ldforge2 / file diff

--- a/src/layers/edittools.cpp	Tue Apr 11 22:51:47 2023 +0300
+++ b/src/layers/edittools.cpp	Wed Apr 12 01:53:42 2023 +0300
@@ -117,9 +117,9 @@
 		else if (const Colored<Quadrilateral>* quad = std::get_if<Colored<Quadrilateral>>(&newElement)) {
 			result.push_back({quad->element.p1, quad->element.p2, quad->element.p3, quad->element.p4});
 		}
-		else if (const Colored<CircularPrimitive>* circ = std::get_if<Colored<CircularPrimitive>>(&newElement)) {
+		else if (const Colored<circular_primitive>* circ = std::get_if<Colored<circular_primitive>>(&newElement)) {
 			// rasterize the circle down to polygons, and append them to the result.
-			rasterize(circ->element, [&](const PlainPolygonElement& poly, const ColorIndex color){
+			circular_element_to_polygons(circ->element, [&](const PlainPolygonElement& poly, const ColorIndex color){
 				AppendToModel append{elementFromPolygonAndColor(poly, color)};
 				const auto& subpoints = polygonsToBeInserted(append);
 				std::copy(subpoints.begin(), subpoints.end(), std::back_inserter(result));
@@ -335,8 +335,8 @@
 			glm::vec4{glm::cross(glm::vec3{-this->gridMatrix[2]}, x), 0},
 			glm::vec4{this->inputPolygon[0], 1},
 		};
-		Colored<CircularPrimitive> circ{
-			CircularPrimitive{
+		Colored<circular_primitive> circ{
+			circular_primitive{
 				.type = this->circleToolOptions.type,
 				.fraction = this->circleToolOptions.fraction,
 				.transformation = transform,