Skip to content
Snippets Groups Projects
Commit f8edb06f authored by bobarna's avatar bobarna
Browse files

asd

parent 0d00f209
No related branches found
No related tags found
No related merge requests found
...@@ -64,7 +64,7 @@ const char *const fragmentSource = R"( ...@@ -64,7 +64,7 @@ const char *const fragmentSource = R"(
// //
const int BASE_CIRCLE_SEGMENTS = 100; const int BASE_CIRCLE_SEGMENTS = 100;
const int SIRIUS_CIRCLE_SEGMENTS = 300; const int SIRIUS_CIRCLE_SEGMENTS = 10;
constexpr float degToRad(float d) { return d * M_PI / 180.0; } constexpr float degToRad(float d) { return d * M_PI / 180.0; }
...@@ -231,8 +231,8 @@ class Triangulated : public Drawable { ...@@ -231,8 +231,8 @@ class Triangulated : public Drawable {
bool checkPotDiag(std::vector<vec2>::iterator currVertex) { bool checkPotDiag(std::vector<vec2>::iterator currVertex) {
vec2 currPotDiag1 = *getNextVertex(currVertex); vec2 currPotDiag1 = *getNextVertex(currVertex);
vec2 currPotDiag2 = *getPreviousVertex(currVertex); vec2 currPotDiag2 = *getPreviousVertex(currVertex);
for (auto currEdgeStart = getNextVertex(getNextVertex(currVertex)); for (auto currEdgeStart = getNextVertex(currVertex);
currEdgeStart != getPreviousVertex(getPreviousVertex(currVertex)); currEdgeStart != getPreviousVertex(currVertex);
currEdgeStart = getNextVertex(currEdgeStart) currEdgeStart = getNextVertex(currEdgeStart)
) )
if (intersectEachOther(*currEdgeStart, *getNextVertex(currEdgeStart), if (intersectEachOther(*currEdgeStart, *getNextVertex(currEdgeStart),
...@@ -252,7 +252,7 @@ class Triangulated : public Drawable { ...@@ -252,7 +252,7 @@ class Triangulated : public Drawable {
for (auto currEdgeStart = remainingVertices.begin(); for (auto currEdgeStart = remainingVertices.begin();
currEdgeStart != remainingVertices.end(); currEdgeStart != remainingVertices.end();
currEdgeStart = getNextVertex(currEdgeStart) currEdgeStart++
) )
if (intersectEachOther(*currEdgeStart, *getNextVertex(currEdgeStart), if (intersectEachOther(*currEdgeStart, *getNextVertex(currEdgeStart),
middle, infinity)) middle, infinity))
...@@ -266,6 +266,7 @@ public: ...@@ -266,6 +266,7 @@ public:
explicit Triangulated(std::vector<vec2> points) : remainingVertices(std::move(points)) { explicit Triangulated(std::vector<vec2> points) : remainingVertices(std::move(points)) {
vertices.reserve(remainingVertices.size() * 3); vertices.reserve(remainingVertices.size() * 3);
triangulate(); triangulate();
init();
}; };
void triangulate() { void triangulate() {
...@@ -283,7 +284,6 @@ public: ...@@ -283,7 +284,6 @@ public:
vertices.push_back(*currVertex); vertices.push_back(*currVertex);
vertices.push_back(*getNextVertex(currVertex)); vertices.push_back(*getNextVertex(currVertex));
vertices.push_back(*getPreviousVertex(currVertex)); vertices.push_back(*getPreviousVertex(currVertex));
init();
} }
void draw() override { void draw() override {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment