put pulsing back

This commit is contained in:
2020-01-28 19:17:48 -05:00
parent 40ccdabeb2
commit b7eda9e75c

View File

@@ -114,11 +114,11 @@ int main(int argc, char *argv[]) {
std::vector<unsigned> counts; std::vector<unsigned> counts;
auto combos = Combos(g_gens, 3); auto combos = Combos(g_gens, 3);
std::vector<std::vector<int>> chosen = { // std::vector<std::vector<int>> chosen = {
{1, 2, 3}, // {1, 2, 3},
{0, 2, 3}, // {0, 2, 3},
}; // };
// chosen = std::vector<std::vector<int>>(combos.begin(), combos.end()); auto chosen = combos;
for (auto sg_gens : chosen) { for (auto sg_gens : chosen) {
auto s = gg.tile(g_gens, sg_gens, gg.triangulate(sg_gens)); auto s = gg.tile(g_gens, sg_gens, gg.triangulate(sg_gens));
@@ -170,10 +170,8 @@ int main(int argc, char *argv[]) {
for (int i = 0; i < vaos.size(); ++i) { for (int i = 0; i < vaos.size(); ++i) {
auto c = glm::mix( auto c = glm::mix(
glm::vec3(1,0,0), glm::vec3(.3, .2, .5),
glm::vec3(.2,.2,.3), glm::vec3(.9, .9, .95),
// glm::vec3(.3, .2, .5),
// glm::vec3(.9, .9, .95),
(float) (i) / (vaos.size() - 1.f) (float) (i) / (vaos.size() - 1.f)
); );