commit b808e3a08b3d9d0b42d91f9536b971861b34713a
parent c82c66fedda2b4e71c896b522cbdea21cfafbfba
Author: mpizzzle <m@michaelpercival.xyz>
Date: Fri, 23 Oct 2020 00:37:54 +0100
added todo note for later. will do p3 tilings first
Diffstat:
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/penrose.cpp b/penrose.cpp
@@ -15,7 +15,7 @@ static const uint32_t depth = 6;
static const glm::vec4 primary(0.7f, 0.7f, 0.0f, 1.0f);
static const glm::vec4 secondary(0.2f, 0.2f, 0.4f, 1.0f);
-static const glm::vec4 black(0.0f, 0.5f, 0.0f, 1.0f);
+static const glm::vec4 line(0.2f, 0.4f, 2.0f, 1.0f);
static const glm::vec4 background(0.15f, 0.15f, 0.35f, 1.0f);
static const GLfloat phi = 1.0 / ((1.0 + sqrt(5.0)) / 2);
@@ -94,6 +94,9 @@ void split(triangle& parent, std::vector<glm::vec2>& points, std::vector<uint32_
line_indices.push_back(tri->indices[k]);
line_indices.push_back(tri->indices[((k + 1) % 3)]);
}
+ else {
+ //TODO: if we get here and line is on outer edge, we don't want to add the t123/4 indices.
+ }
}
if (tri->t_123) {
@@ -226,7 +229,7 @@ int main() {
glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
- glUniform4fv(paint, 1, &black[0]);
+ glUniform4fv(paint, 1, &line[0]);
glBindVertexArray(VAOs[2]);
glDrawElements(GL_LINES, line_indices.size(), GL_UNSIGNED_INT, 0);
diff --git a/scrot.png b/scrot.png
Binary files differ.