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

Make FBO setting configurable in GUI

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8649 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2011-05-21 01:35:45 +00:00
parent c5ddfb1d6d
commit 80ce6be8f7
9 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/gui/options_audio.stkgui
View File

@ -1,6 +1,6 @@
<stkgui> <stkgui>
<div x="2%" y="2%" width="96%" height="96%" layout="vertical-row" > <div x="2%" y="2%" width="96%" height="97%" layout="vertical-row" >
<header text_align="center" width="80%" align="center" text="SuperTuxKart Options"/> <header text_align="center" width="80%" align="center" text="SuperTuxKart Options"/>
<spacer height="15" width="10"/> <spacer height="15" width="10"/>

2
data/gui/options_device.stkgui
View File

@ -1,6 +1,6 @@
<stkgui> <stkgui>
<div x="2%" y="2%" width="96%" height="96%" layout="vertical-row" > <div x="2%" y="2%" width="96%" height="97%" layout="vertical-row" >
<header text_align="center" width="80%" align="center" text="SuperTuxKart Options"/> <header text_align="center" width="80%" align="center" text="SuperTuxKart Options"/>
<spacer height="15" width="10"/> <spacer height="15" width="10"/>

2
data/gui/options_input.stkgui
View File

@ -1,6 +1,6 @@
<stkgui> <stkgui>
<div x="2%" y="2%" width="96%" height="96%" layout="vertical-row" > <div x="2%" y="2%" width="96%" height="97%" layout="vertical-row" >
<header text_align="center" width="80%" align="center" text="SuperTuxKart Options"/> <header text_align="center" width="80%" align="center" text="SuperTuxKart Options"/>
<spacer height="15" width="10"/> <spacer height="15" width="10"/>

2
data/gui/options_players.stkgui
View File

@ -1,6 +1,6 @@
<stkgui> <stkgui>
<div x="2%" y="2%" width="96%" height="96%" layout="vertical-row" > <div x="2%" y="2%" width="96%" height="97%" layout="vertical-row" >
<header text_align="center" width="80%" align="center" text="SuperTuxKart Options"/> <header text_align="center" width="80%" align="center" text="SuperTuxKart Options"/>
<spacer height="15" width="10"/> <spacer height="15" width="10"/>

2
data/gui/options_ui.stkgui
View File

@ -1,6 +1,6 @@
<stkgui> <stkgui>
<div x="2%" y="2%" width="96%" height="96%" layout="vertical-row" > <div x="2%" y="2%" width="96%" height="97%" layout="vertical-row" >
<header text_align="center" width="80%" align="center" text="SuperTuxKart Options"/> <header text_align="center" width="80%" align="center" text="SuperTuxKart Options"/>
<spacer height="15" width="10"/> <spacer height="15" width="10"/>

17
data/gui/options_video.stkgui
View File

@ -1,6 +1,6 @@
<stkgui> <stkgui>
<div x="2%" y="2%" width="96%" height="96%" layout="vertical-row" > <div x="2%" y="2%" width="96%" height="97%" layout="vertical-row" >
<header text_align="center" width="80%" align="center" text="SuperTuxKart Options"/> <header text_align="center" width="80%" align="center" text="SuperTuxKart Options"/>
<spacer height="15" width="10"/> <spacer height="15" width="10"/>
@ -20,12 +20,12 @@
<!-- ************ GRAPHICAL EFFECTS SETTINGS ************ --> <!-- ************ GRAPHICAL EFFECTS SETTINGS ************ -->
<div width="75%" height="50" layout="horizontal-row" > <div width="75%" height="50" layout="horizontal-row" >
<label I18N="In the graphics settings" text="Graphical Effects Settings"/> <label I18N="In the graphics settings" text="Graphical Effects Level" align="center"/>
<spacer width="20" height="20"/> <spacer width="20" height="20"/>
<gauge id="gfx_level" min_value="1" max_value="5" width="300" /> <gauge id="gfx_level" min_value="1" max_value="5" width="300" />
</div> </div>
<spacer height="15" width="10"/> <spacer height="10" width="10"/>
<!-- ************ VSYNC ************ --> <!-- ************ VSYNC ************ -->
<div width="75%" height="fit" layout="horizontal-row" > <div width="75%" height="fit" layout="horizontal-row" >
@ -34,7 +34,16 @@
<label height="100%" I18N="In the video settings" text="Vertical Sync (requires restart)"/> <label height="100%" I18N="In the video settings" text="Vertical Sync (requires restart)"/>
</div> </div>
<spacer width="20" height="25"/> <spacer height="5" width="10"/>
<!-- ************ FBO ************ -->
<div width="75%" height="fit" layout="horizontal-row" >
<checkbox id="fbos"/>
<spacer width="20" height="100%" />
<label height="100%" I18N="In the video settings" text="Use Frame Buffer Objects (requires restart)"/>
</div>
<spacer height="10" width="10"/>
<!-- ************ RESOLUTION CHOICE ************ --> <!-- ************ RESOLUTION CHOICE ************ -->
<spacer height="10" width="10"/> <spacer height="10" width="10"/>

BIN
data/gui/skins/ocean/tooltip.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
data/gui/skins/peach/tooltip.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

11
src/states_screens/options_screen_video.cpp
View File

@ -92,6 +92,11 @@ void OptionsScreenVideo::init()
assert( vsync != NULL ); assert( vsync != NULL );
vsync->setState( UserConfigParams::m_vsync ); vsync->setState( UserConfigParams::m_vsync );
GUIEngine::CheckBoxWidget* fbos = this->getWidget<GUIEngine::CheckBoxWidget>("fbos");
assert( fbos != NULL );
fbos->setState( UserConfigParams::m_fbo );
// ---- video modes // ---- video modes
DynamicRibbonWidget* res = this->getWidget<DynamicRibbonWidget>("resolutions"); DynamicRibbonWidget* res = this->getWidget<DynamicRibbonWidget>("resolutions");
assert( res != NULL ); assert( res != NULL );
@ -346,6 +351,12 @@ void OptionsScreenVideo::eventCallback(Widget* widget, const std::string& name,
assert( vsync != NULL ); assert( vsync != NULL );
UserConfigParams::m_vsync = vsync->getState(); UserConfigParams::m_vsync = vsync->getState();
} }
else if (name == "fbos")
{
GUIEngine::CheckBoxWidget* fbos = this->getWidget<GUIEngine::CheckBoxWidget>("fbos");
assert( fbos != NULL );
UserConfigParams::m_fbo = fbos->getState();
}
} // eventCallback } // eventCallback