From 80ce6be8f7dc40b896a0d7f7f372963a3cd499a9 Mon Sep 17 00:00:00 2001 From: auria Date: Sat, 21 May 2011 01:35:45 +0000 Subject: [PATCH] Make FBO setting configurable in GUI git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8649 178a84e3-b1eb-0310-8ba1-8eac791a3b58 --- data/gui/options_audio.stkgui | 2 +- data/gui/options_device.stkgui | 2 +- data/gui/options_input.stkgui | 2 +- data/gui/options_players.stkgui | 2 +- data/gui/options_ui.stkgui | 2 +- data/gui/options_video.stkgui | 17 +++++++++++++---- data/gui/skins/ocean/tooltip.png | Bin 1761 -> 1743 bytes data/gui/skins/peach/tooltip.png | Bin 1761 -> 1743 bytes src/states_screens/options_screen_video.cpp | 11 +++++++++++ 9 files changed, 29 insertions(+), 9 deletions(-) diff --git a/data/gui/options_audio.stkgui b/data/gui/options_audio.stkgui index 3d86e6891..00762d1d6 100644 --- a/data/gui/options_audio.stkgui +++ b/data/gui/options_audio.stkgui @@ -1,6 +1,6 @@ -
+
diff --git a/data/gui/options_device.stkgui b/data/gui/options_device.stkgui index ec643116e..0064e30b7 100644 --- a/data/gui/options_device.stkgui +++ b/data/gui/options_device.stkgui @@ -1,6 +1,6 @@ -
+
diff --git a/data/gui/options_input.stkgui b/data/gui/options_input.stkgui index 0d5f61f05..ed35f8373 100644 --- a/data/gui/options_input.stkgui +++ b/data/gui/options_input.stkgui @@ -1,6 +1,6 @@ -
+
diff --git a/data/gui/options_players.stkgui b/data/gui/options_players.stkgui index 60359e3d4..5d3977e3e 100644 --- a/data/gui/options_players.stkgui +++ b/data/gui/options_players.stkgui @@ -1,6 +1,6 @@ -
+
diff --git a/data/gui/options_ui.stkgui b/data/gui/options_ui.stkgui index a9750ce84..c38089513 100644 --- a/data/gui/options_ui.stkgui +++ b/data/gui/options_ui.stkgui @@ -1,6 +1,6 @@ -
+
diff --git a/data/gui/options_video.stkgui b/data/gui/options_video.stkgui index 949ad7a18..e436f562a 100644 --- a/data/gui/options_video.stkgui +++ b/data/gui/options_video.stkgui @@ -1,6 +1,6 @@ -
+
@@ -20,12 +20,12 @@
-
- +
@@ -34,7 +34,16 @@
- + + + +
+ + +
+ + diff --git a/data/gui/skins/ocean/tooltip.png b/data/gui/skins/ocean/tooltip.png index 3bd1df969c769cff045e0fe39fe92016211ee49b..95ddbdb12b898700ff5ceb242da677a74242aee7 100644 GIT binary patch delta 1667 zcmV-}27LM94bKgbUw;J^0T&kQpEY3s00vJ#BOMzW2S?Glb;gPk&CnLSKFT#~aScqzEbi z1OQ?ETtbAHneKgbV*i=Xzqlj-90A~s8}+VM%Nzwz-MV#i=itEum9eogVOCVBRFDLs zvc~-F0)RN@&}u!BhYugp#f!gp@84gp0_beqsL!@q<|du|@Sytgn~TQ*=);HhG+&%M zv_&Zetu>e#M1Khh{J3V0TO=Eub1=rhT8nFcUU+c+!j(+`%*P)b{FaoWH?5VaBS+>Q zy!6uHEuBsWjYb2Di;Jk$YB0utnX?Jk%0)zQ&OvL9cDs$Su`x_fPor9`;_B7&56+$Y zbBj`Rn}~2?Vtlh4eeLyX9LKnP`7)Rp#uyl5GRM~{1AmAJT5D*n;he+Xy?YTw5zhYn zQ)hl*nY0L^ef#&3QVQ3uT>~?t-EL!H{to`WzYMJvjInD{_59wqZQYFViS4M>YPfOZ z2Il7Guy6mq>My_iDjEPyPEJ8b%? zO(Ixpb0_Zm0!i(O0Ad9JL6F!nGaxQyYcJBn;<*3>Y$JaHxw-Oq?!?nW&U{))MZLp5 zieb(t6A;8X00IuhNC-LCoEsYVqjL_Bgn5ahuHUwRdj^!H3qPrr7BxUtpkgAaI{;5id*aTpv)z0Ou^MHGhDl z^**JbF>%&yPkZ}%i9QPDh0PEzL;C`e)1Vxe)?whNC7g-Sc%TH{A#DNIlG-^bg z>kujU@{pKwlbZ{_)6~ry4dk~YJZs6q=LkKjYXI)o(aV?lB5p7uPrnjZk^5b`XGX{ zE=j}UTm`&r|G5 ze&Up;x^uR#-7HoPYh7Q*7^cbaxGjiSBElf_*%tA~?Z*)_N}0+4(Cv1!=6@iHB5WF| zV0L!)lrbjg@?4Gq;f9il6R{NOb%b6aCGGBp!81E=ivlBya|QT;0|!3cG*UqnMVX)7 zZa32aSz2164I4IO0oeZh4Di==?B4ytsTK5NO3S3S$iF z^-EnMKr_?5yLT6+8jbp+9XqB+>h(H|F^HlFl}aTmdu#QF5noa}oeqpKn4O(Pqfvi! z_wK@oQgoZ%fA_FD{r&ml0Q8|lFSjQqrbl+}+==yg-MV!P^Ye{I7kn<%YXHo#cMg9` z0C+O-)_5JfW@xAxndiBidAI=E?_Ye8?W4>5&cYy!^ N002ovPDHLkV1o6KC3FA) delta 1686 zcmV;H25I@v4dD%tUw;D?4<94&E2H2500v=6L_t(&-rZSEh#W-}{@$zVnMvFb+}*?_ zk*v$Q`PoIt?;$Y(uQ};O#H(n)py2;iy!wX+QT)Ms@S>+cPJzVa5F>#hhEt%>YHaq8FjDfWlvp-%ueg5Lr0|1uZc;(PZQi`6n zR!$r{Hhp@}o}X1{N0=QLEKpi~%!e3$B+zL~zbQYmHW`h2i00OiWCmTCL*R zwezRXo%`{)QuH|y;j__^&GC~@Jv|f0F|J&>0%nFW27ktw%<=Wg03w3c8d_^O=dgG0 zUPMuZZ@>Ba>ioiTq(v~kZ~wlkQVO%PvtVYlS}iQh|BgRyFGFhuW9+(AJ-_#@TQ*~4 zbQ@~58gAUUf$8aK?AyO@=FFM1Z4ID0Hnsy=YpkrSz*?I*-)J=Y(kslda4>t!&mN}% z@!SqFjDILh&+v2i@5#wY0Kh|IJFv2{0s1%A}})mz!-yt#g+e=^Ayaz z&Jz)c`lspj>({ZcxB_EL`W!|SMF~qn$GlV4x}3Ag0}@ej&IOf$A=3TqoDYoa(T(K( zwd36&_8^;{8ip(YA;u zHsynh)Xq+m2-e!%iTl1lQhOqRSV2G#BzDXUh)dbpjr5>+E&u`B$e%!NtvsGP@$`^0 zpH@>*@3497uv4{XXc(<_BK9E!?lWs za?b#iIajO@{vl;$Fv(v^gU-1!rj!cG+*)zT?79N10w=q+MZBMnSpfRc`hF^d{VIu0 zYNUm=wx=HmsTh{XPz!uu@~4x(UqrITV}Gr9$UOgYW~~JgWvA}{74agILw|Mnu(Aj- zF$923)m6knDcyZwdN#&dh_!Gc&{}6AB$7OMP~6Yn0Z#}g4hkw~Tg3Z`dlrBmbp^nz z(g#~W07_PeQc-d})G)D01&Mnai!fb06N+ghNgaZJw$Na> zbvD=Qg9y&LBn^ve74WkC=Tg952qQ(DyzC^=?e+v^(JYpmtThel@V|)@0Eo+i)?-_O z7fX1L2IOmg;*_VlbGE15ELIL{T~Egtrpe&AEr?hm!XWh67V*2SyL*{Y%70V_fKI2A zH3v}?VbcQ@OifL}7!!1PF2{gyL&?I4Sc-HzLa&gLc6Wo|nVq*qfsw_v0{q~?gI6{^ zP(c($nV+3bC)0rT($Z3O!-fr60Jc3m3H){)yLa!zD*CZ51~agEQw7@|o`g~gaU8=K zgQcY<0BCC>%+>3cY3tUlQ-4E4LufXesMTs1pV*B!j{nvh)qnAo_utu*w~L|(N-17^Hro+JRYp%#s`+VR^W*tKnJ^p}~(W*!+C8EJ_KYpt1xGyt`Jejx1#04pK} zfNi(iSYBSPUaepK_4ixzj}l?FR*l}d+lp^xU%0>Y{4x6UtM8t1;_mOC$BECr_}t^C gKK}BY0Fb``!vkhy6%QPmlK=n!07*qoM6N<$f`H;ev;Y7A diff --git a/data/gui/skins/peach/tooltip.png b/data/gui/skins/peach/tooltip.png index 3bd1df969c769cff045e0fe39fe92016211ee49b..95ddbdb12b898700ff5ceb242da677a74242aee7 100644 GIT binary patch delta 1667 zcmV-}27LM94bKgbUw;J^0T&kQpEY3s00vJ#BOMzW2S?Glb;gPk&CnLSKFT#~aScqzEbi z1OQ?ETtbAHneKgbV*i=Xzqlj-90A~s8}+VM%Nzwz-MV#i=itEum9eogVOCVBRFDLs zvc~-F0)RN@&}u!BhYugp#f!gp@84gp0_beqsL!@q<|du|@Sytgn~TQ*=);HhG+&%M zv_&Zetu>e#M1Khh{J3V0TO=Eub1=rhT8nFcUU+c+!j(+`%*P)b{FaoWH?5VaBS+>Q zy!6uHEuBsWjYb2Di;Jk$YB0utnX?Jk%0)zQ&OvL9cDs$Su`x_fPor9`;_B7&56+$Y zbBj`Rn}~2?Vtlh4eeLyX9LKnP`7)Rp#uyl5GRM~{1AmAJT5D*n;he+Xy?YTw5zhYn zQ)hl*nY0L^ef#&3QVQ3uT>~?t-EL!H{to`WzYMJvjInD{_59wqZQYFViS4M>YPfOZ z2Il7Guy6mq>My_iDjEPyPEJ8b%? zO(Ixpb0_Zm0!i(O0Ad9JL6F!nGaxQyYcJBn;<*3>Y$JaHxw-Oq?!?nW&U{))MZLp5 zieb(t6A;8X00IuhNC-LCoEsYVqjL_Bgn5ahuHUwRdj^!H3qPrr7BxUtpkgAaI{;5id*aTpv)z0Ou^MHGhDl z^**JbF>%&yPkZ}%i9QPDh0PEzL;C`e)1Vxe)?whNC7g-Sc%TH{A#DNIlG-^bg z>kujU@{pKwlbZ{_)6~ry4dk~YJZs6q=LkKjYXI)o(aV?lB5p7uPrnjZk^5b`XGX{ zE=j}UTm`&r|G5 ze&Up;x^uR#-7HoPYh7Q*7^cbaxGjiSBElf_*%tA~?Z*)_N}0+4(Cv1!=6@iHB5WF| zV0L!)lrbjg@?4Gq;f9il6R{NOb%b6aCGGBp!81E=ivlBya|QT;0|!3cG*UqnMVX)7 zZa32aSz2164I4IO0oeZh4Di==?B4ytsTK5NO3S3S$iF z^-EnMKr_?5yLT6+8jbp+9XqB+>h(H|F^HlFl}aTmdu#QF5noa}oeqpKn4O(Pqfvi! z_wK@oQgoZ%fA_FD{r&ml0Q8|lFSjQqrbl+}+==yg-MV!P^Ye{I7kn<%YXHo#cMg9` z0C+O-)_5JfW@xAxndiBidAI=E?_Ye8?W4>5&cYy!^ N002ovPDHLkV1o6KC3FA) delta 1686 zcmV;H25I@v4dD%tUw;D?4<94&E2H2500v=6L_t(&-rZSEh#W-}{@$zVnMvFb+}*?_ zk*v$Q`PoIt?;$Y(uQ};O#H(n)py2;iy!wX+QT)Ms@S>+cPJzVa5F>#hhEt%>YHaq8FjDfWlvp-%ueg5Lr0|1uZc;(PZQi`6n zR!$r{Hhp@}o}X1{N0=QLEKpi~%!e3$B+zL~zbQYmHW`h2i00OiWCmTCL*R zwezRXo%`{)QuH|y;j__^&GC~@Jv|f0F|J&>0%nFW27ktw%<=Wg03w3c8d_^O=dgG0 zUPMuZZ@>Ba>ioiTq(v~kZ~wlkQVO%PvtVYlS}iQh|BgRyFGFhuW9+(AJ-_#@TQ*~4 zbQ@~58gAUUf$8aK?AyO@=FFM1Z4ID0Hnsy=YpkrSz*?I*-)J=Y(kslda4>t!&mN}% z@!SqFjDILh&+v2i@5#wY0Kh|IJFv2{0s1%A}})mz!-yt#g+e=^Ayaz z&Jz)c`lspj>({ZcxB_EL`W!|SMF~qn$GlV4x}3Ag0}@ej&IOf$A=3TqoDYoa(T(K( zwd36&_8^;{8ip(YA;u zHsynh)Xq+m2-e!%iTl1lQhOqRSV2G#BzDXUh)dbpjr5>+E&u`B$e%!NtvsGP@$`^0 zpH@>*@3497uv4{XXc(<_BK9E!?lWs za?b#iIajO@{vl;$Fv(v^gU-1!rj!cG+*)zT?79N10w=q+MZBMnSpfRc`hF^d{VIu0 zYNUm=wx=HmsTh{XPz!uu@~4x(UqrITV}Gr9$UOgYW~~JgWvA}{74agILw|Mnu(Aj- zF$923)m6knDcyZwdN#&dh_!Gc&{}6AB$7OMP~6Yn0Z#}g4hkw~Tg3Z`dlrBmbp^nz z(g#~W07_PeQc-d})G)D01&Mnai!fb06N+ghNgaZJw$Na> zbvD=Qg9y&LBn^ve74WkC=Tg952qQ(DyzC^=?e+v^(JYpmtThel@V|)@0Eo+i)?-_O z7fX1L2IOmg;*_VlbGE15ELIL{T~Egtrpe&AEr?hm!XWh67V*2SyL*{Y%70V_fKI2A zH3v}?VbcQ@OifL}7!!1PF2{gyL&?I4Sc-HzLa&gLc6Wo|nVq*qfsw_v0{q~?gI6{^ zP(c($nV+3bC)0rT($Z3O!-fr60Jc3m3H){)yLa!zD*CZ51~agEQw7@|o`g~gaU8=K zgQcY<0BCC>%+>3cY3tUlQ-4E4LufXesMTs1pV*B!j{nvh)qnAo_utu*w~L|(N-17^Hro+JRYp%#s`+VR^W*tKnJ^p}~(W*!+C8EJ_KYpt1xGyt`Jejx1#04pK} zfNi(iSYBSPUaepK_4ixzj}l?FR*l}d+lp^xU%0>Y{4x6UtM8t1;_mOC$BECr_}t^C gKK}BY0Fb``!vkhy6%QPmlK=n!07*qoM6N<$f`H;ev;Y7A diff --git a/src/states_screens/options_screen_video.cpp b/src/states_screens/options_screen_video.cpp index 607eee61f..9a66a98c5 100644 --- a/src/states_screens/options_screen_video.cpp +++ b/src/states_screens/options_screen_video.cpp @@ -92,6 +92,11 @@ void OptionsScreenVideo::init() assert( vsync != NULL ); vsync->setState( UserConfigParams::m_vsync ); + GUIEngine::CheckBoxWidget* fbos = this->getWidget("fbos"); + assert( fbos != NULL ); + fbos->setState( UserConfigParams::m_fbo ); + + // ---- video modes DynamicRibbonWidget* res = this->getWidget("resolutions"); assert( res != NULL ); @@ -346,6 +351,12 @@ void OptionsScreenVideo::eventCallback(Widget* widget, const std::string& name, assert( vsync != NULL ); UserConfigParams::m_vsync = vsync->getState(); } + else if (name == "fbos") + { + GUIEngine::CheckBoxWidget* fbos = this->getWidget("fbos"); + assert( fbos != NULL ); + UserConfigParams::m_fbo = fbos->getState(); + } } // eventCallback