Skip to content

Commit

Permalink
Merge pull request #673 from wxwisiasdf/lower-gsblur
Browse files Browse the repository at this point in the history
Lower gaussian blur steps
  • Loading branch information
schombert authored Nov 12, 2023
2 parents 20b28ae + c6f0f4e commit 732af10
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/gamestate/system_state.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1784,7 +1784,7 @@ void state::load_user_settings() {
user_settings.master_volume = std::clamp(user_settings.master_volume, 0.0f, 1.0f);
if(user_settings.antialias_level > 16)
user_settings.antialias_level = 0;
user_settings.gaussianblur_level = std::clamp(user_settings.gaussianblur_level, 1.0f, 2.0f);
user_settings.gaussianblur_level = std::clamp(user_settings.gaussianblur_level, 1.0f, 1.5f);
}
}

Expand Down
8 changes: 4 additions & 4 deletions src/gui/gui_main_menu.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -198,21 +198,21 @@ void antialiasing_display::on_update(sys::state& state) noexcept {

void gaussianblur_left::button_action(sys::state& state) noexcept {
if(state.user_settings.gaussianblur_level > 1.f) {
state.user_settings.gaussianblur_level -= 0.125f;
state.user_settings.gaussianblur_level -= 0.03125f;
send(state, parent, notify_setting_update{});
}
}
void gaussianblur_left::on_update(sys::state& state) noexcept {
disabled = (state.user_settings.gaussianblur_level == 1.f) || (state.user_settings.antialias_level == 0);
}
void gaussianblur_right::button_action(sys::state& state) noexcept {
if(state.user_settings.gaussianblur_level < 2.f) {
state.user_settings.gaussianblur_level += 0.125f;
if(state.user_settings.gaussianblur_level < 1.5f) {
state.user_settings.gaussianblur_level += 0.03125f;
send(state, parent, notify_setting_update{});
}
}
void gaussianblur_right::on_update(sys::state& state) noexcept {
disabled = (state.user_settings.gaussianblur_level >= 2.f) || (state.user_settings.antialias_level == 0);
disabled = (state.user_settings.gaussianblur_level >= 1.5f) || (state.user_settings.antialias_level == 0);
}
void gaussianblur_display::on_update(sys::state& state) noexcept {
set_text(state, "x" + text::format_float(state.user_settings.gaussianblur_level));
Expand Down

0 comments on commit 732af10

Please sign in to comment.