ahhhhhhh2

sirius.cpp

@@ -263,9 +263,11 @@ class Triangulated : public Drawable {
     }
 
 public:
-    explicit Triangulated(std::vector<vec2> points) : remainingVertices(points) {
+    Triangulated() = default;
+
+    explicit Triangulated(std::vector<vec2> points) : remainingVertices(std::move(points)) {
         vertices.reserve(remainingVertices.size() * 3);
-        triangulate();
+        //triangulate();
     };
 
     void triangulate() {
@@ -295,23 +297,20 @@ public:
 
 class SiriusTriangle : public Drawable {
     std::vector<Point> points;
-    std::vector<Triangulated> triangulated;
+    Triangulated triangulated;
 
 public:
     int n = 0;
 
-    SiriusTriangle() = default;
-
     void addPoint(vec2 p) {
         n++;
-        points.push_back(p);
+        points.emplace_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(vertices);
+            triangulated = Triangulated(vertices);
         }
     }
 
@@ -358,8 +357,7 @@ public:
     void draw() override {
         //filling out the triangulated area
         if (n == 3)
-            triangulated[0].draw();
-
+            triangulated.draw();
 
         //Time to draw the edges
         if (n == 3) {
@@ -369,7 +367,6 @@ public:
             glDrawArrays(GL_LINE_LOOP, 0, vertices.size());
         }
 
-
         for (auto &point: points)
             point.draw();
     }
@@ -405,17 +402,10 @@ SiriusTriangleManager siriusTriangleManager = SiriusTriangleManager();
 void onInitialization() {
     glViewport(0, 0, windowWidth, windowHeight);
 
-    printf("%d", intersectEachOther(
-            vec2(0, 0),
-            vec2(100, 0),
-            vec2(2, 2),
-            vec2(2, -4)
-    ));
-
     baseCircle.init();
-    siriusTriangleManager.addPoint(vec2(-0.6, 0.4));
     siriusTriangleManager.addPoint(vec2(-0.8, -0.2));
     siriusTriangleManager.addPoint(vec2(-0.2, -0.6));
+    siriusTriangleManager.addPoint(vec2(-0.6, 0.4));
 
     // create program for the GPU
     gpuProgram.create(vertexSource, fragmentSource, "outColor");