extra scene tweaks

This commit is contained in:
2020-03-15 14:24:13 -04:00
parent 30966308ca
commit acdc19bbb9
2 changed files with 19 additions and 4 deletions

View File

@@ -61,6 +61,19 @@ public:
(*this)++; (*this)++;
return res; return res;
} }
auto operator--(int) {
std::next_permutation(bits.begin(), bits.end());
set_curr();
--at;
return *this;
}
auto operator--() &{
auto res = *this;
(*this)--;
return res;
}
}; };
template<class T> template<class T>

View File

@@ -156,19 +156,21 @@ void run(GLFWwindow *window) {
.stage(sh.slice) .stage(sh.slice)
.stage(sh.solid); .stage(sh.solid);
auto group = tc::schlafli({3, 4, 3, 2}); auto group = tc::schlafli({5, 3, 3, 2});
const auto combos = Combos<int>({0, 1, 2, 3, 4}, 3); const auto combos = Combos<int>({0, 1, 2, 3, 4}, 3);
const auto coord = (vec5) {1.0, 0.1, 0.1, 0.1, 0.025};
auto slices = { auto slices = {
Slice<4>::build( Slice<4>::build(
group, group,
(vec5) {1.0, 0.1, 0.1, 0.1, 0.025} * 0.8, coord * 0.3,
{0.9f, 0.9f, 0.9f, 1.0f}, {0.9f, 0.3f, 0.3f, 1.0f},
combos.begin(), combos.end()), combos.begin(), combos.end()),
Slice<4>::build( Slice<4>::build(
group, group,
(vec5) {1.0, 0.1, 0.1, 0.1, 0.025}, coord,
{0.3f, 0.3f, 0.3f, 1.0f}, {0.3f, 0.3f, 0.3f, 1.0f},
combos.begin()++, combos.end()), combos.begin()++, combos.end()),
}; };