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

Make anti-aliasing level configurable

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11148 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2012-04-25 15:44:17 +00:00
parent b3f6177306
commit b400320745
6 changed files with 59 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
data/gui/custom_video_settings.stkgui
View File

@ -23,26 +23,25 @@
<spacer height="5" width="10" /> <spacer height="5" width="10" />
<div layout="horizontal-row" width="100%" height="fit"> <div layout="horizontal-row" width="100%" height="fit">
<label text="Animated Characters" I18N="Video settings"/> <label text="Animated Characters" I18N="Video settings" width="40%"/>
<spacer width="10" height="10"/> <spacer width="10" height="10"/>
<gauge id="steering_animations" min_value="0" max_value="2" proportion="1" /> <gauge id="steering_animations" min_value="0" max_value="2" width="50%" />
</div> </div>
<spacer height="5" width="10" /> <spacer height="5" width="10" />
<div layout="horizontal-row" width="100%" height="fit"> <div layout="horizontal-row" width="100%" height="fit">
<label text="Texture filtering" I18N="Video settings"/> <label text="Texture filtering" I18N="Video settings" width="40%"/>
<spacer width="10" height="10"/> <spacer width="10" height="10"/>
<gauge id="filtering" min_value="0" max_value="5" width="50%" /> <gauge id="filtering" min_value="0" max_value="5" width="50%" />
</div> </div>
<spacer height="5" width="10" /> <spacer height="5" width="10" />
<!-- TODO: allow selection anti-aliasing quality -->
<div layout="horizontal-row" width="100%" height="fit"> <div layout="horizontal-row" width="100%" height="fit">
<checkbox id="antialiasing"/> <label text="Anti-aliasing (requires restart)" I18N="Video settings" width="40%" />
<spacer width="10" height="10"/> <spacer width="10" height="10"/>
<label text="Anti-aliasing (requires restart)" I18N="Video settings"/> <gauge id="antialiasing" min_value="0" max_value="3" width="50%"/>
</div> </div>
<spacer height="5" width="10" /> <spacer height="5" width="10" />

2
data/gui/options_video.stkgui
View File

@ -24,7 +24,7 @@
<spacer width="20" height="20"/> <spacer width="20" height="20"/>
<div layout="vertical-row" proportion="1" height="fit" id="inner_box"> <div layout="vertical-row" proportion="1" height="fit" id="inner_box">
<gauge id="gfx_level" min_value="1" max_value="7" width="300" align="center" /> <gauge id="gfx_level" min_value="1" max_value="8" width="300" align="center" />
<spacer height="5" width="10"/> <spacer height="5" width="10"/>
<button id="custom" text="Custom settings..." I18N="In the video settings" align="center"/> <button id="custom" text="Custom settings..." I18N="In the video settings" align="center"/>
</div> </div>

8
src/config/user_config.hpp
View File

@ -494,10 +494,10 @@ namespace UserConfigParams
&m_graphics_quality, &m_graphics_quality,
"Whether trilinear filtering is allowed to be " "Whether trilinear filtering is allowed to be "
"used (true or false)") ); "used (true or false)") );
PARAM_PREFIX BoolUserConfigParam m_fullscreen_antialiasing PARAM_PREFIX IntUserConfigParam m_antialiasing
PARAM_DEFAULT( BoolUserConfigParam(false, PARAM_DEFAULT( IntUserConfigParam(0,
"fullscreen_antialiasing", &m_graphics_quality, "antialiasing", &m_graphics_quality,
"Whether fullscreen antialiasing is enabled") ); "Whether antialiasing is enabled (0 = disabled, 1 = 2x, 2 = 4x, 3 = 8x") );
PARAM_PREFIX BoolUserConfigParam m_vsync PARAM_PREFIX BoolUserConfigParam m_vsync
PARAM_DEFAULT( BoolUserConfigParam(false, "vsync", PARAM_DEFAULT( BoolUserConfigParam(false, "vsync",
&m_graphics_quality, &m_graphics_quality,

17
src/graphics/irr_driver.cpp
View File

@ -252,8 +252,23 @@ void IrrDriver::initDevice()
params.WindowSize = params.WindowSize =
core::dimension2du(UserConfigParams::m_width, core::dimension2du(UserConfigParams::m_width,
UserConfigParams::m_height); UserConfigParams::m_height);
if (UserConfigParams::m_fullscreen_antialiasing) switch ((int)UserConfigParams::m_antialiasing)
{
case 0:
break;
case 1:
params.AntiAlias = 2;
break;
case 2:
params.AntiAlias = 4; params.AntiAlias = 4;
break;
case 3:
params.AntiAlias = 8;
break;
default:
fprintf(stderr, "[IrrDriver] WARNING: Invalid value for anti-alias setting : %i\n",
(int)UserConfigParams::m_antialiasing);
}
m_device = createDeviceEx(params); m_device = createDeviceEx(params);

12
src/states_screens/dialogs/custom_video_settings.cpp
View File

@ -76,7 +76,13 @@ void CustomVideoSettingsialog::beforeAddingWidgets()
filtering->setValue( value ); filtering->setValue( value );
getWidget<CheckBoxWidget>("antialiasing")->setState( UserConfigParams::m_fullscreen_antialiasing ); SpinnerWidget* antialias = getWidget<SpinnerWidget>("antialiasing");
antialias->addLabel( _("Disabled") ); // 0
antialias->addLabel( L"x2" ); // 1
antialias->addLabel( L"x4" ); // 2
antialias->addLabel( L"x8" ); // 3
antialias->setValue( UserConfigParams::m_antialiasing );
getWidget<CheckBoxWidget>("postprocessing")->setState( UserConfigParams::m_postprocess_enabled ); getWidget<CheckBoxWidget>("postprocessing")->setState( UserConfigParams::m_postprocess_enabled );
getWidget<CheckBoxWidget>("pixelshaders")->setState( UserConfigParams::m_pixel_shaders ); getWidget<CheckBoxWidget>("pixelshaders")->setState( UserConfigParams::m_pixel_shaders );
} }
@ -91,8 +97,8 @@ GUIEngine::EventPropagation CustomVideoSettingsialog::processEvent(const std::st
getWidget<CheckBoxWidget>("anim_gfx")->getState(); getWidget<CheckBoxWidget>("anim_gfx")->getState();
UserConfigParams::m_weather_effects = UserConfigParams::m_weather_effects =
getWidget<CheckBoxWidget>("weather_gfx")->getState(); getWidget<CheckBoxWidget>("weather_gfx")->getState();
UserConfigParams::m_fullscreen_antialiasing = UserConfigParams::m_antialiasing =
getWidget<CheckBoxWidget>("antialiasing")->getState(); getWidget<SpinnerWidget>("antialiasing")->getValue();
UserConfigParams::m_postprocess_enabled = UserConfigParams::m_postprocess_enabled =
getWidget<CheckBoxWidget>("postprocessing")->getState(); getWidget<CheckBoxWidget>("postprocessing")->getState();
UserConfigParams::m_show_steering_animations = UserConfigParams::m_show_steering_animations =

33
src/states_screens/options_screen_video.cpp
View File

@ -45,15 +45,15 @@ using namespace GUIEngine;
DEFINE_SCREEN_SINGLETON( OptionsScreenVideo ); DEFINE_SCREEN_SINGLETON( OptionsScreenVideo );
// Look-up table for GFX levels // Look-up table for GFX levels
const bool GFX [] = {false, true, true, true, true, true, true}; const bool GFX [] = {false, true, true, true, true, true, true, true};
const int GFX_ANIM_KARTS[] = {0, 0, 1, 2, 2, 2, 2}; const int GFX_ANIM_KARTS[] = {0, 0, 1, 2, 2, 2, 2, 2};
const bool GFX_WEATHER [] = {false, false, false, false, true, true, true}; const bool GFX_WEATHER [] = {false, false, false, false, true, true, true, true};
const bool GFX_ANTIALIAS [] = {false, false, false, false, false, true, true}; const int GFX_ANTIALIAS [] = {0, 0, 0, 0, 0, 2, 2, 3};
const bool GFX_POSTPROCESSING[] = const bool GFX_POSTPROCESSING[] =
{false, false, false, false, false, false, true}; {false, false, false, false, false, false, true, true};
const bool GFX_PIXEL_SHADERS[] = const bool GFX_PIXEL_SHADERS[] =
{false, false, false, false, true, true, true}; {false, false, false, false, true, true, true, true};
const int GFX_LEVEL_AMOUNT = 7; const int GFX_LEVEL_AMOUNT = 8;
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@ -316,7 +316,7 @@ void OptionsScreenVideo::updateGfxSlider()
if (UserConfigParams::m_show_steering_animations == GFX_ANIM_KARTS[l]&& if (UserConfigParams::m_show_steering_animations == GFX_ANIM_KARTS[l]&&
UserConfigParams::m_graphical_effects == GFX[l] && UserConfigParams::m_graphical_effects == GFX[l] &&
UserConfigParams::m_weather_effects == GFX_WEATHER[l] && UserConfigParams::m_weather_effects == GFX_WEATHER[l] &&
UserConfigParams::m_fullscreen_antialiasing == GFX_ANTIALIAS[l] && UserConfigParams::m_antialiasing == GFX_ANTIALIAS[l] &&
UserConfigParams::m_postprocess_enabled == GFX_POSTPROCESSING[l] && UserConfigParams::m_postprocess_enabled == GFX_POSTPROCESSING[l] &&
UserConfigParams::m_pixel_shaders == GFX_PIXEL_SHADERS[l]) UserConfigParams::m_pixel_shaders == GFX_PIXEL_SHADERS[l])
{ {
@ -357,6 +357,19 @@ void OptionsScreenVideo::updateTooltip()
//I18N: if no kart animations are enabled //I18N: if no kart animations are enabled
core::stringw none = _LTR("None"); core::stringw none = _LTR("None");
core::stringw antialias_label;
switch ((int)UserConfigParams::m_antialiasing)
{
case 0:
antialias_label = disabled; break;
case 1:
antialias_label = L"x2"; break;
case 2:
antialias_label = L"x4"; break;
case 3:
antialias_label = L"x8"; break;
}
//I18N: in graphical options //I18N: in graphical options
tooltip = _("Animated Scenery : %s", tooltip = _("Animated Scenery : %s",
UserConfigParams::m_graphical_effects ? enabled : disabled); UserConfigParams::m_graphical_effects ? enabled : disabled);
@ -370,7 +383,7 @@ void OptionsScreenVideo::updateTooltip()
: (UserConfigParams::m_show_steering_animations == 1 ? me : none)); : (UserConfigParams::m_show_steering_animations == 1 ? me : none));
//I18N: in graphical options //I18N: in graphical options
tooltip = tooltip + L"\n" + _("Anti-aliasing (requires restart) : %s", tooltip = tooltip + L"\n" + _("Anti-aliasing (requires restart) : %s",
UserConfigParams::m_fullscreen_antialiasing ? enabled : disabled); antialias_label);
//I18N: in graphical options //I18N: in graphical options
tooltip = tooltip + L"\n" + _("Pixel shaders : %s", tooltip = tooltip + L"\n" + _("Pixel shaders : %s",
UserConfigParams::m_pixel_shaders ? enabled : disabled); UserConfigParams::m_pixel_shaders ? enabled : disabled);
@ -448,7 +461,7 @@ void OptionsScreenVideo::eventCallback(Widget* widget, const std::string& name,
UserConfigParams::m_show_steering_animations = GFX_ANIM_KARTS[level-1]; UserConfigParams::m_show_steering_animations = GFX_ANIM_KARTS[level-1];
UserConfigParams::m_graphical_effects = GFX[level-1]; UserConfigParams::m_graphical_effects = GFX[level-1];
UserConfigParams::m_weather_effects = GFX_WEATHER[level-1]; UserConfigParams::m_weather_effects = GFX_WEATHER[level-1];
UserConfigParams::m_fullscreen_antialiasing = GFX_ANTIALIAS[level-1]; UserConfigParams::m_antialiasing = GFX_ANTIALIAS[level-1];
UserConfigParams::m_postprocess_enabled = GFX_POSTPROCESSING[level-1]; UserConfigParams::m_postprocess_enabled = GFX_POSTPROCESSING[level-1];
UserConfigParams::m_pixel_shaders = GFX_PIXEL_SHADERS[level-1]; UserConfigParams::m_pixel_shaders = GFX_PIXEL_SHADERS[level-1];