diff --git a/sirius.cpp b/sirius.cpp index 80e0e48420577442862c8acfc940959a6c9f37b5..00088493bae48c908afb09a5783173bcec6e9b09 100644 --- a/sirius.cpp +++ b/sirius.cpp @@ -232,10 +232,10 @@ class Triangulated : public Drawable { vec2 currPotDiag1 = *getNextVertex(currVertex); vec2 currPotDiag2 = *getPreviousVertex(currVertex); for ( - auto currEdgeStart = getPreviousVertex(getPreviousVertex(currVertex)); - currEdgeStart != getNextVertex(getNextVertex(currVertex)); - currEdgeStart = getPreviousVertex(currEdgeStart) - ) + auto currEdgeStart = getPreviousVertex(getPreviousVertex(currVertex)); + currEdgeStart != getNextVertex(getNextVertex(currVertex)); + currEdgeStart = getPreviousVertex(currEdgeStart) + ) if (intersectEachOther(vec2(currEdgeStart->x, currEdgeStart->y), vec2(getNextVertex(currEdgeStart)->x, getNextVertex(currEdgeStart)->y), currPotDiag1, currPotDiag2)) { @@ -255,7 +255,7 @@ class Triangulated : public Drawable { for (auto currEdgeStart = remainingVertices.begin(); currEdgeStart != remainingVertices.end(); currEdgeStart = getNextVertex(currEdgeStart) - ) + ) if (intersectEachOther(currEdgeStart->x, *getNextVertex(currEdgeStart), middle, infinity)) numberOfIntersections++; @@ -304,16 +304,15 @@ public: void addPoint(vec2 p) { n++; - points.emplace_back(p); + points.push_back(p); if (n > 3) printf("Can't add 4th point to a triangle!\n"); printf("%d\n", n); if (n == 2) generateLineSegment(points[0], points[1]); if (n == 3) { generateLineSegment(points[2], points[0]); generateLineSegment(points[1], points[2]); - triangulated.emplace_back(Triangulated(vertices)); + triangulated.emplace_back(vertices); } - } void generateLineSegment(Point p1, Point p2) { @@ -348,10 +347,10 @@ public: float curr = angle2; for (int i = 0; i < SIRIUS_CIRCLE_SEGMENTS; i++) { - vertices.emplace_back(vec2( - c.r * cos(curr) + c.c.x, - c.r * sin(curr) + c.c.y - )); + vertices.emplace_back( + c.r * cos(curr) + c.c.x, + c.r * sin(curr) + c.c.y + ); curr += step; } } @@ -385,7 +384,8 @@ public: SiriusTriangleManager() = default; void addPoint(vec2 p) { - if (currPoints == 0) triangles.emplace_back(SiriusTriangle()); + if (currPoints == 0) + triangles.emplace_back(); triangles[currTriangle].addPoint(p); currPoints++; @@ -406,10 +406,10 @@ void onInitialization() { glViewport(0, 0, windowWidth, windowHeight); printf("%d", intersectEachOther( - vec2(0, 0), - vec2(100, 0), - vec2(2, 2), - vec2(2, -4) + vec2(0, 0), + vec2(100, 0), + vec2(2, 2), + vec2(2, -4) )); baseCircle.init();