aboutsummaryrefslogtreecommitdiff
path: root/src/main.cc
diff options
context:
space:
mode:
authorAdrian Kummerlaender2019-04-28 20:41:07 +0200
committerAdrian Kummerlaender2019-04-28 20:41:07 +0200
commitd290dcd50821308a08aed4b1bcd6087e16b0c1ed (patch)
tree0cf975057e20031f9a5f1d7ec513fc624ca15443 /src/main.cc
parentecaf665a05bdfcd10937152c378cfaec7cdf1836 (diff)
downloadcompustream-d290dcd50821308a08aed4b1bcd6087e16b0c1ed.tar
compustream-d290dcd50821308a08aed4b1bcd6087e16b0c1ed.tar.gz
compustream-d290dcd50821308a08aed4b1bcd6087e16b0c1ed.tar.bz2
compustream-d290dcd50821308a08aed4b1bcd6087e16b0c1ed.tar.lz
compustream-d290dcd50821308a08aed4b1bcd6087e16b0c1ed.tar.xz
compustream-d290dcd50821308a08aed4b1bcd6087e16b0c1ed.tar.zst
compustream-d290dcd50821308a08aed4b1bcd6087e16b0c1ed.zip
More consistent restrictions of display values
Diffstat (limited to 'src/main.cc')
-rw-r--r--src/main.cc16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/main.cc b/src/main.cc
index a98ca44..8e9fa9a 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -176,7 +176,7 @@ int render() {
palette_factor += 1;
}
if ( palette_factor_decr.wasClicked() ) {
- palette_factor -= 1;
+ palette_factor = std::max(1, palette_factor-1);
}
if ( window_size_changed ) {
@@ -209,7 +209,7 @@ int render() {
{
auto guard = collide_shader->use();
- collide_shader->setUniform("show_fluid_quality", display_mode == DisplayMode::QUALITY);
+ collide_shader->setUniform("show_quality", display_mode == DisplayMode::QUALITY);
collide_shader->setUniform("iT", iT);
iT += 1;
@@ -262,18 +262,18 @@ int render() {
switch ( display_mode ) {
case DisplayMode::VELOCITY:
- scene_shader->setUniform("show_fluid_quality", false);
- scene_shader->setUniform("show_curl", false);
+ scene_shader->setUniform("show_quality", false);
+ scene_shader->setUniform("show_curl", false);
fluid->draw();
break;
case DisplayMode::QUALITY:
- scene_shader->setUniform("show_fluid_quality", true);
- scene_shader->setUniform("show_curl", false);
+ scene_shader->setUniform("show_quality", true);
+ scene_shader->setUniform("show_curl", false);
fluid->draw();
break;
case DisplayMode::CURL:
- scene_shader->setUniform("show_fluid_quality", false);
- scene_shader->setUniform("show_curl", true);
+ scene_shader->setUniform("show_quality", false);
+ scene_shader->setUniform("show_curl", true);
extra->draw();
break;
}