ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add light scattering to the graphical options and disable it on graphics 3

Browse Source
This commit is contained in:
Alayan 2019-01-08 01:18:46 +01:00
parent ec91f9d8db
commit bec1c319f6
4 changed files with 35 additions and 12 deletions

12
data/gui/dialogs/custom_video_settings.stkgui

@ -115,6 +115,18 @@
<spacer height="4" width="10" />
<div layout="horizontal-row" width="100%" proportion="1">
<spacer width="70" height="10"/>
<div layout="horizontal-row" proportion="1" height="fit">
<checkbox id="lightscattering"/>
<spacer width="10" height="10"/>
<label text="Light Scattering" I18N="Video settings"/>
</div>
</div>
<spacer height="4" width="10" />
<div layout="horizontal-row" width="100%" proportion="1">
<div layout="horizontal-row" proportion="1" height="fit">
<checkbox id="animated_characters"/>

5
src/states_screens/dialogs/custom_video_settings.cpp

@ -95,6 +95,7 @@ void CustomVideoSettingsDialog::beforeAddingWidgets()
getWidget<CheckBoxWidget>("glow")->setState(UserConfigParams::m_glow);
getWidget<CheckBoxWidget>("ssao")->setState(UserConfigParams::m_ssao);
getWidget<CheckBoxWidget>("bloom")->setState(UserConfigParams::m_bloom);
getWidget<CheckBoxWidget>("lightscattering")->setState(UserConfigParams::m_light_scatter);
if (CVS->isEXTTextureCompressionS3TCUsable())
{
getWidget<CheckBoxWidget>("texture_compression")->setState(UserConfigParams::m_texture_compression);
@ -152,6 +153,9 @@ GUIEngine::EventPropagation CustomVideoSettingsDialog::processEvent(const std::s
UserConfigParams::m_bloom =
advanced_pipeline && getWidget<CheckBoxWidget>("bloom")->getState();
UserConfigParams::m_light_scatter =
advanced_pipeline && getWidget<CheckBoxWidget>("lightscattering")->getState();
UserConfigParams::m_texture_compression =
getWidget<CheckBoxWidget>("texture_compression")->getState();
@ -197,6 +201,7 @@ void CustomVideoSettingsDialog::updateActivation()
getWidget<CheckBoxWidget>("ibl")->setActive(light);
getWidget<CheckBoxWidget>("glow")->setActive(light);
getWidget<CheckBoxWidget>("bloom")->setActive(light);
getWidget<CheckBoxWidget>("lightscattering")->setActive(light);
#endif
} // updateActivation

29
src/states_screens/options/options_screen_video.cpp

@ -53,48 +53,48 @@ void OptionsScreenVideo::initPresets()
({
false /* light */, 0 /* shadow */, false /* bloom */, false /* motionblur */,
false /* lightshaft */, false /* glow */, false /* mlaa */, false /* ssao */,
false /* animatedCharacters */, 1 /* particles */, 0 /* image_quality */,
false /* depth of field */, true /* degraded IBL */
false /* light scatter */, false /* animatedCharacters */, 1 /* particles */,
0 /* image_quality */, false /* depth of field */, true /* degraded IBL */
});
m_presets.push_back
({
false /* light */, 0 /* shadow */, false /* bloom */, false /* motionblur */,
false /* lightshaft */, false /* glow */, false /* mlaa */, false /* ssao */,
true /* animatedCharacters */, 2 /* particles */, 0 /* image_quality */,
false /* depth of field */, true /* degraded IBL */
false /* light scatter */, true /* animatedCharacters */, 2 /* particles */,
0 /* image_quality */, false /* depth of field */, true /* degraded IBL */
});
m_presets.push_back
({
true /* light */, 0 /* shadow */, false /* bloom */, false /* motionblur */,
false /* lightshaft */, false /* glow */, false /* mlaa */, false /* ssao */,
true /* animatedCharacters */, 2 /* particles */, 1 /* image_quality */,
false /* depth of field */, true /* degraded IBL */
false /* light scatter */, true /* animatedCharacters */, 2 /* particles */,
1 /* image_quality */, false /* depth of field */, true /* degraded IBL */
});
m_presets.push_back
({
true /* light */, 0 /* shadow */, false /* bloom */, true /* motionblur */,
true /* lightshaft */, true /* glow */, true /* mlaa */, false /* ssao */,
true /* animatedCharacters */, 2 /* particles */, 1 /* image_quality */,
false /* depth of field */, false /* degraded IBL */
true /* light scatter */, true /* animatedCharacters */, 2 /* particles */,
1 /* image_quality */, false /* depth of field */, false /* degraded IBL */
});
m_presets.push_back
({
true /* light */, 512 /* shadow */, true /* bloom */, true /* motionblur */,
true /* lightshaft */, true /* glow */, true /* mlaa */, false /* ssao */,
true /* animatedCharacters */, 2 /* particles */, 2 /* image_quality */,
true /* depth of field */, false /* degraded IBL */
true /* light scatter */, true /* animatedCharacters */, 2 /* particles */,
2 /* image_quality */, true /* depth of field */, false /* degraded IBL */
});
m_presets.push_back
({
true /* light */, 1024 /* shadow */, true /* bloom */, true /* motionblur */,
true /* lightshaft */, true /* glow */, true /* mlaa */, true /* ssao */,
true /* animatedCharacters */, 2 /* particles */, 2 /* image_quality */,
true /* depth of field */, false /* degraded IBL */
true /* light scatter */, true /* animatedCharacters */, 2 /* particles */,
2 /* image_quality */, true /* depth of field */, false /* degraded IBL */
});
} // initPresets
@ -412,6 +412,7 @@ void OptionsScreenVideo::updateGfxSlider()
m_presets[l].motionblur == UserConfigParams::m_motionblur &&
m_presets[l].shadows == UserConfigParams::m_shadows_resolution &&
m_presets[l].ssao == UserConfigParams::m_ssao &&
m_presets[l].light_scatter == UserConfigParams::m_light_scatter &&
m_presets[l].dof == UserConfigParams::m_dof &&
m_presets[l].degraded_ibl == UserConfigParams::m_degraded_IBL)
{
@ -472,6 +473,9 @@ void OptionsScreenVideo::updateTooltip()
tooltip = tooltip + L"\n" + _("Dynamic lights: %s",
UserConfigParams::m_dynamic_lights ? enabled : disabled);
//I18N: in graphical options
tooltip = tooltip + L"\n" + _("Light scattering: %s",
UserConfigParams::m_light_scatter ? enabled : disabled);
//I18N: in graphical options
tooltip = tooltip + L"\n" + _("Motion blur: %s",
UserConfigParams::m_motionblur ? enabled : disabled);
//I18N: in graphical options
@ -587,6 +591,7 @@ void OptionsScreenVideo::eventCallback(Widget* widget, const std::string& name,
UserConfigParams::m_motionblur = m_presets[level].motionblur;
UserConfigParams::m_shadows_resolution = m_presets[level].shadows;
UserConfigParams::m_ssao = m_presets[level].ssao;
UserConfigParams::m_light_scatter = m_presets[level].light_scatter;
UserConfigParams::m_dof = m_presets[level].dof;
UserConfigParams::m_degraded_IBL = m_presets[level].degraded_ibl;

1
src/states_screens/options/options_screen_video.hpp

@ -35,6 +35,7 @@ struct GFXPreset
bool glow;
bool mlaa;
bool ssao;
bool light_scatter;
bool animatedCharacters;
int particles;
int image_quality;