diff --git a/vis/src/comps.hpp b/vis/src/comps.hpp index 838a70a..d294d55 100644 --- a/vis/src/comps.hpp +++ b/vis/src/comps.hpp @@ -24,6 +24,7 @@ namespace vis { vec3 color; std::vector> exclude {{0, 1, 2}}; + std::vector> include = combinations(generators(group), 3); }; struct VBOs { @@ -53,9 +54,7 @@ namespace vis { // todo generate all, then mask using glMultiDraw. const size_t N = 4; - auto gens = generators(group.group); - auto combos = combinations(gens, N - 1); - auto inds = merge(hull(group.group, combos, group.exclude)); + auto inds = merge(hull(group.group, group.include, group.exclude)); vbos.ibo.put(inds.begin(), inds.end()); } diff --git a/vis/src/main.cpp b/vis/src/main.cpp index 8d0cebf..d65867b 100644 --- a/vis/src/main.cpp +++ b/vis/src/main.cpp @@ -130,7 +130,8 @@ void run(const std::string &config_file, GLFWwindow* window) { tc::schlafli({5, 3, 3, 2}), vec5{0.80, 0.09, 0.09, 0.09, 0.04}, vec3{0.90, 0.90, 0.90}, - std::vector>{{0, 1, 2}} + std::vector>{{0, 1, 2}, + {0, 3, 4}, {1, 3, 4}, {2, 3, 4}} ); registry.emplace(entity); }