diff --git a/sirius.cpp b/sirius.cpp index 756eec73c52e2233b54537735ed107667a8f7599..8eaa7b59d597eb0dd115bce14d6da4a981ed8dd2 100644 --- a/sirius.cpp +++ b/sirius.cpp @@ -199,13 +199,13 @@ public: }; inline float cross(vec2 a, vec2 b) { - return a.x * b.y - a.y * b.x; + return a.x * b.y - a.y * b.x; } inline bool onDifferentSides(vec2 p1, vec2 p2, vec2 q1, vec2 q2) { - vec2 v = p2-p1; + vec2 v = p2 - p1; vec2 r = p1; - return cross(v, p1 - r) * cross(v, p2 - r) < 0; + return cross(v, p1 - r) * cross(v, p2 - r) < 0; } inline bool intersectEachOther(vec2 p1, vec2 p2, vec2 q1, vec2 q2) { @@ -242,12 +242,13 @@ public: //check if current potential diagonal is fully outside the polygon vec2 infinity(250, 250); - vec2 middle((currPotDiag1 + currPotDiag2)/2); + vec2 middle((currPotDiag1 + currPotDiag2) / 2); int numberOfIntersections = 0; - for(auto currEdgeStart = remainingVertices.begin(); currEdgeStart != remainingVertices.begin(); currEdgeStart = getPreviousVertex(currEdgeStart)) - if(intersectEachOther(currEdgeStart->x, *getNextVertex(currEdgeStart), infinity, middle)) + for (auto currEdgeStart = remainingVertices.begin(); + currEdgeStart != remainingVertices.begin(); currEdgeStart = getPreviousVertex(currEdgeStart)) + if (intersectEachOther(currEdgeStart->x, *getNextVertex(currEdgeStart), infinity, middle)) numberOfIntersections++; - if(numberOfIntersections%2 == 0) + if (numberOfIntersections % 2 == 0) break; // the potential diagonal is fully outside, it's not an ear. //it's an ear! @@ -276,7 +277,7 @@ public: void draw() override { init(); glBindVertexArray(vao); // Draw call - setColor(vec3(0,1,0)); + setColor(vec3(0, 1, 0)); glDrawArrays(GL_TRIANGLES, 0, vertices.size()); } }; @@ -346,7 +347,7 @@ public: void draw() override { //filling out the triangulated area - if(n == 3) + if (n == 3) triangulated[0].draw(); @@ -394,11 +395,11 @@ 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(); siriusTriangleManager.addPoint(vec2(-0.6, 0.4));