From 9f326fb812e62fe10c8f5a302b44087563458a59 Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Tue, 10 Nov 2015 23:39:34 -0800 Subject: [PATCH] slightly less shitty ui. --- desktop/resources/ui/button.9.png | Bin 0 -> 1353 bytes desktop/resources/ui/button.9.pxi | Bin 0 -> 526584 bytes desktop/resources/ui/button.pressed.9.png | Bin 0 -> 1315 bytes desktop/resources/ui/slider.9.png | Bin 1258 -> 1206 bytes desktop/resources/ui/ui.atlas | 30 ++++++++--- desktop/resources/ui/ui.json | 15 +++++- desktop/resources/ui/ui.png | Bin 592 -> 985 bytes desktop/resources/uiskin.json | 2 +- desktop/src-common/advent/screens/title.clj | 56 ++++++++------------ 9 files changed, 61 insertions(+), 42 deletions(-) create mode 100644 desktop/resources/ui/button.9.png create mode 100644 desktop/resources/ui/button.9.pxi create mode 100644 desktop/resources/ui/button.pressed.9.png diff --git a/desktop/resources/ui/button.9.png b/desktop/resources/ui/button.9.png new file mode 100644 index 0000000000000000000000000000000000000000..58f31b33afd2a58a074bfdce09be41fef1d62f6f GIT binary patch literal 1353 zcmV-P1-AN$P)4Tx062|}Ro!pfR1`mnZ(O7nKcKOW4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW z$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj_Ok5(v`JGz71bo9J#^YYXp{DWs&KBa zQ@dTpxRI}aIp=pi@6k0t$5)!;m`NF6-tt{FpOKHBn3g+MAqmexC-gw4rh87hTrL7G z#)U`L!(So6-Zux@>;H3gR;i~0B%VTSS3P|m@o9jRsXML@Al^p#@G0Lx-0?i(9WEw_ zSYddU<1E8793KxjQ|c&UmW!mTC>k>?{om1c9S zUx<6_jj_!T&^M{wWM#>IBbOSf*xP<^F{$j$aOQ5Y{cT zROCL1M7^NKKL z&(yA}mSw#iM0^;IB{ZO5!wl{^Sg-*ysE~&Yz8!E;Qv(A`lu*=Clo*MpVGd>OdF6n^ zam1Jntk;<}MrqIC5$=Q>n{*R}?8oOIDUw5En2dl--Xw34!z7E+5pr-OgyQ-soSab)C%saskMla`aQLVzg0+MZf20tJU&K{hZoBrUc+U4e9&3o zw|KmGEe4#xz17wBu{f`SS_4i66?j31EjY7n{zGfhONK~c+td!TS#B}JoR}5UAd7p& z5phTyXSkK0xCeD3xaYP^o&J~#Xp9xFb0C;HHml5fA<%h1eR|qw7wxF+oNL9T1Aits?sKNIwvGaN)^WO$I^cUV)HzL_| z1K?{9p!>B*)`xfEv!4N6IG{J&h49W#Bz^(#YWw%`e_a{8n{G9m5AeR~_yl0%<7V@p zu(HE~_yOWMyoBc< zet=kDVqsSQ>Bk_0(p)jEPn3%=vQb%vJXst=LHs;7zxR%`CEIPxX1)iZSF~ z3_iDtv9KYnHAL)Mu~B^&#*#oQ#xjL+&b4CdUj~Ks6dbM_#F0b*dc-7411JnpY|n|U#}lQV|);qogvgHiZ@klZT9!pa*iEu%SCRGt+* zmzFa9X@$=SNh=zpKySHK%$#>@SMyQL8c)}!s>7{fEDZWh@lW8sms==ZtuqFx00000 LNkvXXu0mjfvBr}q literal 0 HcmV?d00001 diff --git a/desktop/resources/ui/button.9.pxi b/desktop/resources/ui/button.9.pxi new file mode 100644 index 0000000000000000000000000000000000000000..610cd2f51132eae5f713b37e45ae760325fce8bb GIT binary patch literal 526584 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 literal 0 HcmV?d00001 diff --git a/desktop/resources/ui/button.pressed.9.png b/desktop/resources/ui/button.pressed.9.png new file mode 100644 index 0000000000000000000000000000000000000000..4aecb2382503dffc66503219536269afc12973dc GIT binary patch literal 1315 zcmV+;1>E|HP)4Tx062|}Ro!pfR1`mnZ(O7nKcKOW4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW z$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj_Ok5(v`JGz71bo9J#^YYXp{DWs&KBa zQ@dTpxRI}aIp=pi@6k0t$5)!;m`NF6-tt{FpOKHBn3g+MAqmexC-gw4rh87hTrL7G z#)U`L!(So6-Zux@>;H3gR;i~0B%VTSS3P|m@o9jRsXML@Al^p#@G0Lx-0?i(9WEw_ zSYddU<1E8793KxjQ|c&UmW!mTC>k>?{om1c9S zUx<6_jj_!T&^M{wWM#>IBbOSf*xP<^F{$j$aOQ5Y{cT zROCL1M7^NKKL z&(yA}mSw#iM0^;IB{ZO5!wl{^Sg-*ysE~&Yz8!E;Qv(A`lu*=Clo*MpVGd>OdF6n^ zam1Jntk;<}MrqIC5$=Q>n{*R}?8oOIDUw5En2dl--Xw34!z7E+5pr-OgyQ-soSab)C%saskMla`aQLVzg0+MZf20tJU&K{hZoBrUc+U4e9&3o zw|KmGEe4#xz17wBu{f`SS_4i66?j31EjY7n{zGfhONK~c+td!TS#B}JoR}5UAd7p& z5phTyXSkK0xCeD3xaYP^o&J~#Xp9xFb0C;HHml5fA<%h1eR|qw7wxF+oNL9T1Aits?sKNIwvGaN)^WO$I^cUV)HzL_| z1K?{9p!>B*)`xfEv!4N6IG{J&h49W#Bz^(#YWw%`e_a{8n{G9m5AeR~_yl0%<7V@p z=h=GkUV4C4Tx062|}Ro!pfR1`mnZ(O7nKcKOW z4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj z_Ok5(v`JGz71bo9J#^YYXp{DWs&KBaQ@dTpxRI}aIp=pi?|;!XK*v{_pO}_ARv`(`K_~P;r>1*Ox?C;-F2;pN*27;R!QM9q+Ux&wbylgT10KeMtdQo=mnqksdx=&F5&oys0TJd`E>GI|#kK((J)n0eU)DVBJ zYq?3pFC)I@_!%aD74f~sTqTWoFF^8{ntPr?L_-if$s_=TxZzG%&qCb(^K zdCoqnhMa4x{ z6hi)zV+ON`xsmg3L#>3I8=9NTb3f!hwJM>{)UK+QWxX9ld>D=;G@xL^4DLEuumLit zkcSMu9e;39Qv(A`lu*=Clo*MpVGd>OdF6n^am1Jntk;<}MrqIC5$=Q>n{*R}?8oOI zDUw5En2dl--Xw34!z7E+5pr%d2c?H4INKjdmEV*< zl@;X+<-BrtTbJ8*N%&OwR`^l)PWWE<8D!y-a9Q|CxFUQbT#TL7ym&1JoWQ-+)%LMCuYy_wP6ZWs zL5D3kvu*xEYtl=GNMYO54zpQqF~pph71JP#d&LoPNE~Olm7ll=btAavwoIM=mAd9q7A z>MqdgAh7QszoH+g!S^k(^Lixn-v&7J7v5PnBH45U;A;<{`?W~chj-$$p8;Grpf}uw z@Xk*pegW`m`}gsGT^YQaZZ(?^@V@H!1YqOiX7iurW^?09^uGph$@~{t0C9K{wF2RW HlTiejPX-Id delta 1089 zcmV-H1it&W3F--uBYy-WX+uL$Nkc;*P;zf(X>4Tx05}naRo`#hR1`jmZ&IWdKOk5~ zhl<6oRa0BJ8yc;~21%2p?MfD<>DVeH9(p*dx19w`~g7O0}n_%Aq@s% zd)fBDv`JHkDym6Hd+5XuAtvnwRpGmKVkc9?T=n|PIo~$m6N9yl%7qB(zDb{1JtYOPA!qk%@Qub75C2T;T?(y%k7cw{!aEIzj}+@(TO5Y zz-|>CeHr)+QOwk9wo4Sh2mAPGw+7tv9PraN1Olr9mwlWPc+tlvJx(D%369Vz>lLjC zyaqhH*k&)cVSir(7|4_1Rc;%)B4&}Zt&(AK&*3kRaknx54=$T^^z2=OSo@r%xnsBw ziQX&rRKAHn*R}K<@Jp~?uenKKe+BrD`qF#?cpp*psgiwk-seYOU#%402HpjG(Qu~= zP5WwfF?$>svC;J<>zK$RIM;P&60@WifbUlLwAf?lk$1u(mFRYq89Q?S8HyrsX^MVnpsf`{W6(5UXREr zZM&7ilpo6ux^|%%%N9z;(dj0Ct!8>>5!%=VyPg-?ke}Vs>~sbgdDuU^Ixpr19NS&g zQew8Fz<)>RL_{M_7A<1csY*MfP@XcB#Jxr~JS8&7goVS)VKE|4(h_Xlc{z{c$ApZs z7riZ_QKdV_uW-M~u~8PF3UX~a6)MwxDE0Ha zPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiSBY#iOF*IB46Cei@XmvNzKBsGIKkN=X z$_Bgm&h5TyYjpf^^Nrn$ZO1mSZpOC4_}H(pE&Od#0y|)Oik6|u@OHupcq1J>TmjQ1 z4eM{2+Oeah>iL1tBPPK=$Ue-{x#7^N{-XY=Zm3_V7u4T7YJ?d(rX+nTeJlMa zeSar?Fa1o4bXmG0{UlwLzL72kIlJ$@pC#CPuU}yk-HKgk)oY(MCsR(!d*m18l>EH> zvOF8G6uDm>lc(gp@azfp%?$k=y%=-~vuaJXdoA$<7&H$h2Au}i##F_Gt8^Aw+nR HlN|(^L;V`B diff --git a/desktop/resources/ui/ui.atlas b/desktop/resources/ui/ui.atlas index 7ca89cbe..39b72533 100644 --- a/desktop/resources/ui/ui.atlas +++ b/desktop/resources/ui/ui.atlas @@ -1,12 +1,28 @@ ui.png -size: 128,32 +size: 256,64 format: RGBA8888 filter: Nearest,Nearest repeat: none +button + rotate: false + xy: 2, 2 + size: 52, 40 + split: 24, 24, 12, 24 + orig: 52, 40 + offset: 0, 0 + index: -1 +button.pressed + rotate: false + xy: 56, 2 + size: 52, 40 + split: 24, 24, 16, 20 + orig: 52, 40 + offset: 0, 0 + index: -1 screenshot-image-button rotate: false - xy: 54, 10 + xy: 162, 22 size: 20, 20 split: 8, 8, 8, 8 orig: 20, 20 @@ -14,7 +30,7 @@ screenshot-image-button index: -1 screenshot-image-button-active rotate: false - xy: 32, 10 + xy: 140, 22 size: 20, 20 split: 8, 8, 8, 8 orig: 20, 20 @@ -22,7 +38,7 @@ screenshot-image-button-active index: -1 scroll-slider rotate: false - xy: 76, 10 + xy: 184, 22 size: 20, 20 split: 8, 8, 8, 8 orig: 20, 20 @@ -30,7 +46,7 @@ scroll-slider index: -1 slider rotate: false - xy: 98, 10 + xy: 206, 22 size: 20, 20 split: 8, 8, 8, 8 orig: 20, 20 @@ -38,14 +54,14 @@ slider index: -1 slider-bar rotate: false - xy: 2, 2 + xy: 110, 14 size: 28, 28 orig: 28, 28 offset: 0, 0 index: -1 slider-bar-hover rotate: false - xy: 2, 2 + xy: 110, 14 size: 28, 28 orig: 28, 28 offset: 0, 0 diff --git a/desktop/resources/ui/ui.json b/desktop/resources/ui/ui.json index 46204391..7de992a2 100644 --- a/desktop/resources/ui/ui.json +++ b/desktop/resources/ui/ui.json @@ -1,5 +1,11 @@ { - + com.badlogic.gdx.graphics.g2d.BitmapFont: { default-font: { file: ego/font.fnt } } + com.badlogic.gdx.graphics.Color: { + white: { a: 1, b: 1, g: 1, r: 1 }, + gray: { a: 1, b: 0.5, g: 0.5, r: 0.5}, + pressed: { a: 1.0, b: 0.9, g: 0.9, r: 0.9 }, + yellow: {hex: DFD114FF}, + }, com.badlogic.gdx.scenes.scene2d.ui.Slider$SliderStyle: { default-horizontal: { background: slider, knob: slider-bar } default-horizontal-hover: { background: slider, knob: slider-bar-hover } @@ -12,6 +18,13 @@ com.badlogic.gdx.scenes.scene2d.ui.ScrollPane$ScrollPaneStyle: { com.badlogic.gdx.scenes.scene2d.ui.ImageButton$ImageButtonStyle: { default: { down: screenshot-image-button-active, up: screenshot-image-button, checked: screenshot-image-button-active} active: { down: screenshot-image-button-active, up: screenshot-image-button-active, checked: screenshot-image-button-active} +}, + + +com.badlogic.gdx.scenes.scene2d.ui.TextButton$TextButtonStyle: { + default: { font: default-font, down: button.pressed, up: button, fontColor: white, overFontColor: yellow, unpressedOffsetY: 0, pressedOffsetY: -4, downFontColor: pressed, disabledFontColor: gray} } + + } diff --git a/desktop/resources/ui/ui.png b/desktop/resources/ui/ui.png index c37f108133a693f7a6cd587bc93c346db1bf0f26..1233f6761539c0f260a10543540e40a90f6a21bf 100644 GIT binary patch literal 985 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K595~p3raivQty0<)@*RpWn9b4z~sQd;F|aI{+-tnQ}@6{N`)F;LnWVbEpRy4Ya;b} zwQDwW1A_nqNQ={-y03XFKr9Xhfri;k1*!2;OdpEa7!?>;8i3waV8~`!aPQFns-1xm z3=^|6IRzM)HUu*Kb*kGpFPh<>DF;Z2H>-g5i}~MoZ>*WQU!eP!l`bO_$ULA7OTw>x z*VfMw-@EAVZ1?k8!VNOkGtxglT6FFCC}esyUqE|%i3e7dt`$9Vz2HJ zWMDdRCp_X$UEP{eZ}A41;JL@AJ>m~4`^dhs=q%9G7hDQk4_w`2U!^o{&G*%h-B}(? zopb8gSMF=tmQ(-90^J9*8{|hOj~my&zt&b3Z+PNd z$Dfz-KR5Hs!T(#XMx7OoWz5mp8vfZOoZ+_RV(o_Q-ph+w85J51{eC5yqR5z2|M!}| zAma&3!G>n0h`1R@=AYp>!bH4JsES%(%tVdL6p3hGwVfqV%44QW80dI zuY5giyHl%y|9DzU)B*X~Yp>Ycu@v*Z_WSC`r*k+Q;u$uxe?OA6hC$3?N@ORE}(MIvJJk!jSkbE{E&(k!R~I#o`$f z_cyhBf*C4Rx=bs&8M?NyEaOVJq3<~JQ}F{=$tyxHI258jXh9NA14EVygLbe3gWEC| wMv<;I1`ClZOPw8oiK8HpL57=;fjFS{nf-Z_VRrJnsSY3wp00i_>zopr0Q6RGG5`Po literal 592 zcmV-W0A3w9B7auM`ju%a%y2reC}t91|@bWj9cR601ixpZ{s z(9y*~L^|nUrS^qHk~1cEF^M_*d+<%oy_e?qkqab@xzxwm^{+rFUJw8R7_=mT01yBI zD1Xauo?dzuz_b=yg35b-^Y}tq0DTPv_%FBo_noqZ$Jqr7{O{NjAOHkVq1s_t**^+Q z0P1bbsjjcG!^JtaoR2HPT4I20#Jbp4`{-vywa{2W!nH}E@r zgCNgYMgYfvc`C`Y1-Ik*{w4uhJ`-49J+PL~1bQ7H00eNZ*X>;h(8&V4tZZt8Edb4g z01*)2VSY)YHj!&N!3WMifKtu%i;-Ghs*#zo{ zzUCWl0^ns($S;H31St3P+ujibFt3FGst6#uC5Q-M4xBFt00AI?Vgh(VKmdFc`j;Pt eLV(WxEc_F8Ti#}K%w<^s0000> (utils/get-chapters) (vals) (filter identity) - seq)))) :height 32] + seq)))) :height 56 :pad-bottom 4 :width 250] + + :row + [(make-button "Settings" :key :settings) :height 56 :pad-bottom 4 :width 250] + + + + + + + + :row - [(make-label "Music" label-color) :height 32] - :row - [(make-slider (:music-volume @utils/settings) :key :music-volume-slider) :height 32 :width 305] - :row - [(make-label "FX" label-color) :height 32] - :row - [(make-slider (:sound-volume @utils/settings) :key :sound-volume-slider) :height 32 :width 305] - :row - [(make-button "Fullscreen" :key :toggle-fullscreen) :height 32] - :row - [(make-button "End quest" :key :end-quest) :height 32] + [(make-button "End quest" :key :end-quest) :height 56 :width 250] ]))) (defn chapters-menu [] @@ -216,15 +211,10 @@ (saves/chapter-name chapter) "---") :chapter (chapter chapters)) - (text-button! :set-disabled (nil? (chapter chapters)))) :height 32] + (text-button! :set-disabled (nil? (chapter chapters)))) :height 56 :pad-bottom 4] :row])) - [[(ActorEntity. (Widget.)) :height 32] - :row - [(ActorEntity. (Widget.)) :height 32] - :row - [(ActorEntity. (Widget.)) :height 32] - :row - (make-button "Back" :key :back)])))) + [ + [ (make-button "Back" :key :back) :height 56]])))) (defn get-selected-save [entities [x y]] (first (filter @@ -276,9 +266,9 @@ :row (saves-table entities stage) :row - [delete-button :width 100] - [(make-button "Back" :key :back) :width 100] - [continue-button :width 100]]) + [delete-button :width 100 :height 56] + [(make-button "Back" :key :back) :width 100 :height 56] + [continue-button :width 100 :height 56]]) :save-label save-label :delete-button delete-button :continue-button continue-button)))