Mercurial > ldforge2 / file diff

--- a/src/circularprimitive.h	Wed Jun 22 16:13:15 2022 +0300
+++ b/src/circularprimitive.h	Wed Jun 22 16:53:35 2022 +0300
@@ -11,7 +11,7 @@
 	const auto xform = [&circ](const glm::vec2& p, float y){
 		return glm::vec3{circ.transformation * glm::vec4{p.x, y, p.y, 1}};
 	};
-	const glm::vec3 origin = xform({0, 0}, 0);
+	const glm::vec3 primitiveOrigin = xform({0, 0}, 0);
 	const bool invertedMatrix = (glm::determinant(circ.transformation) < 0) != circ.inverted;
 	switch(circ.type) {
 	case CircularPrimitive::Circle:
@@ -23,7 +23,7 @@
 	case CircularPrimitive::Disc:
 		ldraw::circle(circ.fraction.segments, circ.fraction.divisions, [&]
 		(const glm::vec2&, const glm::vec2& p1, const glm::vec2& p2){
-			fn(triangle(origin, xform(p1, 0), xform(p2, 0)));
+			fn(triangle(primitiveOrigin, xform(p1, 0), xform(p2, 0)));
 		});
 		break;
 	case CircularPrimitive::Cylinder: