This commit is contained in:
2019-09-16 02:04:59 -04:00
parent d60ec16cad
commit 29097afd13
2 changed files with 10 additions and 10 deletions

View File

@@ -52,9 +52,9 @@ public:
u_view = glGetUniformLocation(program, "view");
u_color = glGetUniformLocation(program, "color");
const Mults &mults = schlafli({16, 2, 16});
const Mults &mults = schlafli({3, 3, 5});
// const glm::vec4 ident = center(mults);
const glm::vec4 ident = identity(mults, {1, 1, 1, 1});
const glm::vec4 ident = identity(mults, {10, 1, 1, 1});
std::cout << "Dimension: " << mults.num_gens << std::endl;
std::cout << "Generation times: " << std::endl;
@@ -166,7 +166,7 @@ public:
glBindVertexArray(vert_vao);
glUniform4f(u_color, 1, 0, 0, 1);
glDrawArrays(GL_POINTS, 0, vert_data.size());
// glDrawArrays(GL_POINTS, 0, vert_data.size());
glBindVertexArray(edge_vao);
glUniform4f(u_color, 1, 0, 0, 1);

View File

@@ -66,6 +66,7 @@ std::vector<int> edges(const Mults &mults) {
Table *t_vert = solve(gens, {}, mults);
for (const auto &subgens : combinations(N, 1)) {
if (subgens[0] == 0) continue;
Table *t_edge = solve(subgens, {}, mults);
std::vector<int> edge = t_vert->apply_each(t_edge->words());
@@ -91,14 +92,13 @@ std::vector<int> faces(const Mults &mults) {
// for each *kind* of face
for (const auto &sg_face : combinations(N, 2)) {
if (sg_face[0] == 0 and sg_face[1] == 1) continue;
// if (sg_face[0] == 0 and sg_face[1] == 2) continue;
if (sg_face[0] == 0 and sg_face[1] == 3) continue;
if (sg_face[0] == 0 and sg_face[1] == 3) continue; // checker
if (sg_face[0] == 0 and sg_face[1] == 2) continue; // checker
// if (sg_face[0] == 1 and sg_face[1] == 2) continue; // checker
// if (sg_face[0] == 1 and sg_face[1] == 3) continue; // checker
if (sg_face[0] == 1 and sg_face[1] == 2) continue;
// if (sg_face[0] == 1 and sg_face[1] == 3) continue;
if (sg_face[0] == 2 and sg_face[1] == 3) continue;
if (sg_face[0] == 0 and sg_face[1] == 1) continue; // flat
// if (sg_face[0] == 2 and sg_face[1] == 3) continue; // vertical
Table *cs_face = solve(gens, sg_face, mults);