From 6cedcb750968799e5b11f35cb6ed5dda06f385b9 Mon Sep 17 00:00:00 2001 From: J-D-K Date: Thu, 28 Jun 2018 19:30:40 -0400 Subject: [PATCH] libpng + pngs for easier graphics changes --- Makefile | 4 +- README.MD | 1 + inc/gfx.h | 8 +-- romfs/img/buttonA.data | Bin 4104 -> 0 bytes romfs/img/buttonA.png | Bin 0 -> 1161 bytes romfs/img/buttonB.data | Bin 4104 -> 0 bytes romfs/img/buttonB.png | Bin 0 -> 1184 bytes romfs/img/buttonX.data | Bin 4104 -> 0 bytes romfs/img/buttonX.png | Bin 0 -> 1265 bytes romfs/img/buttonY.data | Bin 4104 -> 0 bytes romfs/img/buttonY.png | Bin 0 -> 1130 bytes romfs/img/tbox/tBoxCornerBotLeft_drk.data | Bin 4104 -> 0 bytes romfs/img/tbox/tBoxCornerBotLeft_lght.data | Bin 4104 -> 0 bytes romfs/img/tbox/tBoxCornerBotRight_drk.data | Bin 4104 -> 0 bytes romfs/img/tbox/tBoxCornerBotRight_lght.data | Bin 4104 -> 0 bytes romfs/img/tbox/tBoxCornerTopLeft_drk.data | Bin 4104 -> 0 bytes romfs/img/tbox/tBoxCornerTopLeft_lght.data | Bin 4104 -> 0 bytes romfs/img/tbox/tBoxCornerTopRight_drk.data | Bin 4104 -> 0 bytes romfs/img/tbox/tBoxCornerTopRight_lght.data | Bin 4104 -> 0 bytes romfs/img/tbox/tboxCornerBotLeft_drk.png | Bin 0 -> 240 bytes romfs/img/tbox/tboxCornerBotLeft_lght.png | Bin 0 -> 235 bytes romfs/img/tbox/tboxCornerBotRight_drk.png | Bin 0 -> 237 bytes romfs/img/tbox/tboxCornerBotRight_lght.png | Bin 0 -> 237 bytes romfs/img/tbox/tboxCornerTopLeft_drk.png | Bin 0 -> 237 bytes romfs/img/tbox/tboxCornerTopLeft_lght.png | Bin 0 -> 230 bytes romfs/img/tbox/tboxCornerTopRight_drk.png | Bin 0 -> 252 bytes romfs/img/tbox/tboxCornerTopRight_lght.png | Bin 0 -> 245 bytes romfs/img/tbox/tboxHorEdgeBot_drk.data | Bin 136 -> 0 bytes romfs/img/tbox/tboxHorEdgeBot_drk.png | Bin 0 -> 181 bytes romfs/img/tbox/tboxHorEdgeBot_lght.data | Bin 136 -> 0 bytes romfs/img/tbox/tboxHorEdgeBot_lght.png | Bin 0 -> 181 bytes romfs/img/tbox/tboxHorEdgeTop_drk.data | Bin 136 -> 0 bytes romfs/img/tbox/tboxHorEdgeTop_drk.png | Bin 0 -> 180 bytes romfs/img/tbox/tboxHorEdgeTop_lght.data | Bin 136 -> 0 bytes romfs/img/tbox/tboxHorEdgeTop_lght.png | Bin 0 -> 182 bytes romfs/img/tbox/tboxVertEdgeLeft_drk.data | Bin 136 -> 0 bytes romfs/img/tbox/tboxVertEdgeLeft_drk.png | Bin 0 -> 175 bytes romfs/img/tbox/tboxVertEdgeLeft_lght.data | Bin 136 -> 0 bytes romfs/img/tbox/tboxVertEdgeLeft_lght.png | Bin 0 -> 175 bytes romfs/img/tbox/tboxVertEdgeRight_drk.data | Bin 136 -> 0 bytes romfs/img/tbox/tboxVertEdgeRight_drk.png | Bin 0 -> 176 bytes romfs/img/tbox/tboxVertEdgeRight_lght.data | Bin 136 -> 0 bytes romfs/img/tbox/tboxVertEdgeRight_lght.png | Bin 0 -> 177 bytes romfs/img/topbar_drk.data | Bin 280 -> 0 bytes romfs/img/topbar_drk.png | Bin 0 -> 251 bytes romfs/img/topbar_lght.data | Bin 280 -> 0 bytes romfs/img/topbar_lght.png | Bin 0 -> 195 bytes src/gfx.cpp | 61 +++++++++++++++++--- src/ui.cpp | 52 +++++++++-------- 49 files changed, 85 insertions(+), 41 deletions(-) delete mode 100644 romfs/img/buttonA.data create mode 100644 romfs/img/buttonA.png delete mode 100644 romfs/img/buttonB.data create mode 100644 romfs/img/buttonB.png delete mode 100644 romfs/img/buttonX.data create mode 100644 romfs/img/buttonX.png delete mode 100644 romfs/img/buttonY.data create mode 100644 romfs/img/buttonY.png delete mode 100644 romfs/img/tbox/tBoxCornerBotLeft_drk.data delete mode 100644 romfs/img/tbox/tBoxCornerBotLeft_lght.data delete mode 100644 romfs/img/tbox/tBoxCornerBotRight_drk.data delete mode 100644 romfs/img/tbox/tBoxCornerBotRight_lght.data delete mode 100644 romfs/img/tbox/tBoxCornerTopLeft_drk.data delete mode 100644 romfs/img/tbox/tBoxCornerTopLeft_lght.data delete mode 100644 romfs/img/tbox/tBoxCornerTopRight_drk.data delete mode 100644 romfs/img/tbox/tBoxCornerTopRight_lght.data create mode 100644 romfs/img/tbox/tboxCornerBotLeft_drk.png create mode 100644 romfs/img/tbox/tboxCornerBotLeft_lght.png create mode 100644 romfs/img/tbox/tboxCornerBotRight_drk.png create mode 100644 romfs/img/tbox/tboxCornerBotRight_lght.png create mode 100644 romfs/img/tbox/tboxCornerTopLeft_drk.png create mode 100644 romfs/img/tbox/tboxCornerTopLeft_lght.png create mode 100644 romfs/img/tbox/tboxCornerTopRight_drk.png create mode 100644 romfs/img/tbox/tboxCornerTopRight_lght.png delete mode 100644 romfs/img/tbox/tboxHorEdgeBot_drk.data create mode 100644 romfs/img/tbox/tboxHorEdgeBot_drk.png delete mode 100644 romfs/img/tbox/tboxHorEdgeBot_lght.data create mode 100644 romfs/img/tbox/tboxHorEdgeBot_lght.png delete mode 100644 romfs/img/tbox/tboxHorEdgeTop_drk.data create mode 100644 romfs/img/tbox/tboxHorEdgeTop_drk.png delete mode 100644 romfs/img/tbox/tboxHorEdgeTop_lght.data create mode 100644 romfs/img/tbox/tboxHorEdgeTop_lght.png delete mode 100644 romfs/img/tbox/tboxVertEdgeLeft_drk.data create mode 100644 romfs/img/tbox/tboxVertEdgeLeft_drk.png delete mode 100644 romfs/img/tbox/tboxVertEdgeLeft_lght.data create mode 100644 romfs/img/tbox/tboxVertEdgeLeft_lght.png delete mode 100644 romfs/img/tbox/tboxVertEdgeRight_drk.data create mode 100644 romfs/img/tbox/tboxVertEdgeRight_drk.png delete mode 100644 romfs/img/tbox/tboxVertEdgeRight_lght.data create mode 100644 romfs/img/tbox/tboxVertEdgeRight_lght.png delete mode 100644 romfs/img/topbar_drk.data create mode 100644 romfs/img/topbar_drk.png delete mode 100644 romfs/img/topbar_lght.data create mode 100644 romfs/img/topbar_lght.png diff --git a/Makefile b/Makefile index b6bf8ee..ca6b1eb 100644 --- a/Makefile +++ b/Makefile @@ -38,7 +38,7 @@ INCLUDES := inc EXEFS_SRC := exefs_src APP_TITLE := JKSV APP_AUTHOR := JK_ -APP_VERSION := 06/27/2018 +APP_VERSION := 06/28/2018 ROMFS := romfs #--------------------------------------------------------------------------------- @@ -56,7 +56,7 @@ CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11 ASFLAGS := -g $(ARCH) LDFLAGS = -specs=$(DEVKITPRO)/libnx/switch.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map) -LIBS := `freetype-config --libs` +LIBS := `freetype-config --libs` -lpng #--------------------------------------------------------------------------------- # list of directories containing libraries, this must be the top level containing diff --git a/README.MD b/README.MD index 844becc..ba02e05 100644 --- a/README.MD +++ b/README.MD @@ -7,6 +7,7 @@ JKSV for Switch. Mostly to get used to libnx. Reuses a lot of code of JKSM for 3 # Building: 1. Requires [devkitPro](https://devkitpro.org/) devkitA64 2. Requires switch-freetype +3. libpng # Credits and Thanks: * [shared-font](https://github.com/switchbrew/switch-portlibs-examples) example by yellows8 diff --git a/inc/gfx.h b/inc/gfx.h index cbccdb6..bcce80f 100644 --- a/inc/gfx.h +++ b/inc/gfx.h @@ -37,11 +37,9 @@ namespace gfx { public: /* - Loads binary data from path - First 4 bytes are data size - Next 2 are width - Next 2 are height - The rest is raw RGBA8 data + Now uses libpng and png files + Only accepts RGBA8 PNGs + Others will have issues. */ void loadFromFile(const std::string& path); //Frees memory used by data diff --git a/romfs/img/buttonA.data b/romfs/img/buttonA.data deleted file mode 100644 index eff60307a987ba58dc2a46c8fce3d6cdf1434c79..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4104 zcmcJR%}-QU7>5rV?~dRfAYtpy|G*esvd7glHL?+77j0Zj z8l$F#eo$Ik5j#X}F&U~Lilr9ps8p^ZljHLn=G@%5^KoZjI^^Npd+s^!@4WAM&wHHC9cqcU5^-%Vq@N7$7X+V(!o=3CZd@4_V9 zfH4?Z!KY1tx0a>+YfP(;y~pqm+=etr3t#Ox{0`UP3goq;ZELM-z`my#L(X6MC|zmE zM`B#SW$w#pyZ&UgvAAVSBk@ixjj?*jErkUGVDHea?H}OuBPj(8f=XEQ@ zwvuKlQ;xF-;ao0fXD$5&IZ0l7Sv2MQ zU!dInpL`FmIoJn$Pw1R!-<9Wa`+aTGCL8^!ug1MfxP5p=ZQ-n2YK^@Ladu`8ACAh~ z*`A)*c@ev~Yz*hDg&Jz_RH;4Ud3Nc+gPi_SCS!$uOY`$~WZk-2*O05{b7(8>)$IAi z_U$=6{kwnSL=M+6(biV0egfZYwitba*%{H6O=JcM<%-Bl}4fYcA{ORdjUv_!frZ#LSnisXJIX^=`+PqtQ zy}wcr9T&a7+u0fTdat`X7(dh174+XZa3JW9&Ug3n{aZM-lJ~y$KF)vn>Q7AtI^pwn zb>qgMUt{E-(<;>t@%$WojQ-!mK=0GIGk;^-wm>89Vtnh?vikCU0D9qFv^n!h)%sHF z4EN3T^~K2s&*yr3%i5Fg7vMO&v7(*OyEUv8y&he^-Y)xo&c5@IJgl-6ifVaj~D=y*u#j(a=zlUALBpgM-1i$&QYKaW3b-L6;Yxe7B$E zzZIFU@3n&Q;roTLvB2)F_V%*lZtmC-j9W;hf^pL3tlRJ5EF6P+IA5>hi-TkUWRsJ zelo^yryXutM^R2nS9*h>cbMX={5k{pr+12d6XbIn5ciU~7S^eBosWg;gD-#OV?U^l zNbghVf%o8bcm-Z!ENz14UM1VLK108SI+DQGB)aLh(ZN4|7uWck+{?2=`I=g-?H8E! BSls{s diff --git a/romfs/img/buttonA.png b/romfs/img/buttonA.png new file mode 100644 index 0000000000000000000000000000000000000000..7647fd85b0e2b32bc7a697d56e46ef7469399bfe GIT binary patch literal 1161 zcmV;41a|w0P)E1rl#yqCx-w03B&m zSad^gZEa<4bN~PV002XBWnpw>WFU8GbZ8()Nlj2>E@cM*00ZqwL_t(o!?l-9Pa9Vh zhM&3AwcSc7n2$=R7_)JA$caQ?#Re*M0V=FmShR7XG*UO+^;h%{psZR4MJ!mQOR}+| zDyR}vT~sP<1#tvzDFzdRneo^&S==*d{DB8UIMUS}d*kT%8ReJ2=~K62$n2}Q~(E1KvkY?O#&0B=w&AG2w0f_ z>&gTUVI~UCJb*HKx0(POGCKlXYrW0v1pL$yf!`rK2#Vc8ab>iTEby?E zHJS+g4Y&H>7YmYpP|IiXE6NryHUV!gB=9GMKY`y)Az1=S0$RJ+yjLMH>bHdQza56h z4kRrBH{1L6Dw0IImL>vcFk`@CMS!nq?sl^H5@zaLumj;CFiqfCM?dA8Bj8D70xSja zF)UQH6)4Hv4m_GlG48r`BbrKeN?_sK1qznVfTDm0`F!BPgXaJ4-|v*b5`eL<)9d!3 znBELp77lY~Z;wzchFvTI5bEy6E)>`p9E3`x6A~jT1e0f?`DK>I=I05;VgMYiu5z@x zs!8Ovn}5RNll-$X`=*x6e0Ovixk@^p?I9s z_BKi>tleEUhlap)NxgbSBp%19)%bN}1pD>tw)?n(Rfa9)LfpR0wFnGkGAN}}N8#yH z4A;c~3d_qnsdRPGpUDL7BUd=b5LZ>n^+D!$4THXW_v*}l{_J-{CKI@qXwMPwUIp?s zNCqwXXljZ`B60qEbaS(Hc1a|-H8n-)`SS~XZvm&8Kwh1|di4@#zrV%V?<7z7wXdMB z#0spdGOPs!pX%wMXKqgW&vDoo9%kJz>c+2uG26`c<#$cxwkO1q>{*xyc zes@t$@W8$M=2R0gzlI$H;3a$s{BTp(oY4%+csQRw>B2W+l12Fr!lx61?k(AEacLi>X)%2yD%ydVSXFDy{l@2CrT7GTgo#wF6)XX20*WHESRd zmI89gfr!6P^v0PF{EarZ*$t2G!bEil_yPaxSNI=3z7UPmuZe(J=j~Dahm`B%g<<9rEcD9vOa%?s0}hU7Vt(#A#dM8UcZLCd35hLzIQ9tLg%ki zu1A0Ar{@JcvaG(;n5ShXaKkouYC~0oyM-afTJy=v|8$TFu9*G&VR^e(fbb`v`R(8Vd3{F4s!% zMPKvz)--&deC=IX_A%;i^DU0eaeMIo-aYEHLf*XDVut7EXVUQb+bnx4dklTAq|U;8 zYiD2IN;B;HqiOk$=Df?iW4)0d7kA4l<&!-&w$lucjBKu$PwnpBg{y0r>2=II@+~Ls zYWbzt>FELO6>G}A&w0tda|d$k7QCN7;j`b-fA*R$oIQu@C;PeO#9b|K@%b{-y@k-*P?s zJAPnufB!1OpPijbi3fg&aO?PDgVtTS?tpp5;ef z>HE;ohDbhrr}o#bLC&6q?B5SLeLC1Hs_uTdx{u>8EX>KTUpbkWIHBvt`b2hTC*=CdK>nhJ&4?Y{oykX+#{y8fxhx&yjf>tQ}?zu$noQlni|NqZSbyKDc0RM9{Nyr zRazUuOzN%cN}hVrRH*;tUv{34S&Yff=ZkqZ}sJa2A>?Ais{ zu>-E^P}uKTPPwbv5Sf$InHrO8nd%$+iP2i~%lN!?D`elk=v*tuw$J})!T!MiDNT&Y zW^Ausg^}!81FaC12><{9 diff --git a/romfs/img/buttonB.png b/romfs/img/buttonB.png new file mode 100644 index 0000000000000000000000000000000000000000..2a23d9c523fd921491dea9dea77f622797db3aa8 GIT binary patch literal 1184 zcmV;R1Yi4!P)E1}bb%Ngn_J03B&m zSad^gZEa<4bN~PV002XBWnpw>WFU8GbZ8()Nlj2>E@cM*00aa{L_t(o!?l;aPg_?Q z#(%ysv5^r@A}2^rVv!7NwG!pSo|sUoN;p!Lfea-Z@*hwMsZytQ>VMFPE-mfA)+$ve zCMH`^hd^1(5ad9I8X03>+vk3s4#y|HxEOqazS7mTuFt*C^M0K7Ja2>$_WnK76BEo{ zy~>kJP&*yAtgm%EuY6aH-T!E`9y*@uB$%md3|tA!1ELd{oD7|nt&DZd43N?;N3f7 zQ&X%M28*_>JR1ZE67l^$xdCu(tH9Dp(fAL6?QJG+-sG+8GGp5+w2sq{famqs1_6fv z2dx4;$>(VfC9t_kES+Z4vY4?f5Tc)F?fnI<0%U`cFoOT4)2w(NGrF)Gryu@H00)=> zR)P;c64={gUgum01*|GVkq%lROIpw;WY zva|E~s02hl&vGUyP4uM*_EPXt&8kgNI3&{FlqRi$@t7 zOLP17*Gx?h6x_PShVl3@yPk(QZw>gqi)H;yt@blpTaOT8 z`$TZpRbC4L?KU_L;^j+rqrK1+fgi(F|EL6y7oKS<0?8!BpdMKJzs}rX-c1wgbvQbL zOh#cE06mFRxNLB}=QVhvq3)>^g=f!{Ec>X4deV9IG6`rsDFn1yihz`?7K?qEZVbG$ z)Dw>9@>W-Ra8~GaRLBnxq0^!A-~mgg%JNc)N#JcyK#rW};G7_(BG76n@Ph*|O)A+e zPhPw@MV1Fh#Cqy=@hsq=$H9HxZYu({8u&h|4!;>-+dg~A1f(-X){OUbNl yGuQ2sYc|O=8tPPYUCOZ->&YY=uU?Hlp8pGHlB1TdBsm@c0000VI8GUV z#f{fIFuu`olC5yhaVC?KsO-R5$@B*H|pKup$ zLN9c4ugfzo&n{$4ZE&0{_M|%w(tHlmdKclx#P@`PiarWYxo<#qjYY`WN< zZ#>0st1Z8!{Rrf%d@%{u0zvJg1(j zzNVUsK5I*sbeZn%gvn&Gro8-?DJkhQ$z;ZKbtR0hMd$?9b>A;=UD})n)%+_^ACLCk z+FrNrju-E?wpXU1VaS_TRH#S9_5B9-UWH3&r|1dtT{SP?=hj@5&APfllg(z$qHf#4f8W*7xzC$|!gUr?6 z*IjA~zbSifHV%C8kR zm+y-EF=&E4Xg{I`^bS|-3+t=KT{q#?ylP*uR}2OQ#?8{DVVZW$=3TzG!d}>g_Fc|^ ze2*7T12Gt)Bl^+VcG;I1bJ58PucQOAk=}6!zWrzf>w?)bp&?>eaaz zjE$v@=5~Gd*XI2U*W~+`uob>VTcd|M@b5Q#Zu`G_eenL~<`>>s=_NUt_Zq0TTHQA0EwB&d_ZDm(E%5zq_u|DNMlS4o zRA=iP=$#^ezXs*{Q`ih!uobK~t2N(mR889as;*DN_izZ5<2v{Rs$e73MAX`Ry8dfk zEI6y~+a4ut#acd}fP>HopM!du&en(AyOn3!3*_3b6KC$0k!$S!OgvAJ&u`HA0=6;# Nn6>R(Yv7*v;|&bN30wdG diff --git a/romfs/img/buttonX.png b/romfs/img/buttonX.png new file mode 100644 index 0000000000000000000000000000000000000000..49b0f91a8ea0fd6490707b5529915dbbed133749 GIT binary patch literal 1265 zcmVE2qTLS+%*6I03B&m zSad^gZEa<4bN~PV002XBWnpw>WFU8GbZ8()Nlj2>E@cM*00dP@L_t(o!?l-BOcQw& z$3N3QwyZAM#4L;avzR~vBIp{njhp4fQIb6^Cp6ila_~k%VssNo_N*7;!Jrbw3l}bO zOf!XySkYEc@WpFc>}N;#7 z0NZU82=B+nJ^_3vhp(qVZxr(*92%1NC@h6 z4rx)K)y{-#_xq~hJa}4wCk6e71_x*ahCji8Y-_kQ5Es-dqPdRLb{bR4Z?#$_51teO zD7MZ%a`Qt-6(u;;o$qW_1fdpykB>KC7(wpeuP<2b!Gn4XBgpu8gVO-IZ4Br#Wc_*S z<6_J0&b+$X%j?&zl$E(?YMSNk+YA78bzbJ@&m+q^O--|`tYn=8pg^e11@QnFeluJ9 zpedyN{dBr{JOlk$?p16>vQ=Gv2agzkkbl(|T`c)6OI?e1=;hCaa&M+jx;RU9rTNoUy zVP!?b?UuN9ZNVWpV*MPD?eu^iG(i>Nr74`7leu$ejsE^hRMp`2?NwgAk{yB@kt@I>K8snk-v&MctHQs!3ImTV zK{Cc?Gh@%*Pm0gBF`FU^sisIcYG5mS3*7S4UGSs2N0NmmgnB(9aO-rnOS>d+Y!rT( z_=F}TEQI6#G<^?n0@xJ$eiM+R@O`+1ERU1}Q$j!+*!nPj|tu2fdmVu+a_N zGi8)v6R$~eux#06d|V8f%3f$6gYLszP78twfZhRWCu{{_qs~0l;!B{tgkzIX@eKML bU(f#oOCbX9Z2@9100000NkvXXu0mjfvkpAr literal 0 HcmV?d00001 diff --git a/romfs/img/buttonY.data b/romfs/img/buttonY.data deleted file mode 100644 index dd92c24c18685a662b774cd6b02d5e12702adcbb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4104 zcmcJRT~Aa;7{}*IE)1qdKY$;>3oiWtUU-GZyJC!uHYRPOHqj=S6ipgpjHR?q)-)vz z)c_`1jatQ0F;-;(vA!U(KuS${6$Jz%7&YVXe-5*ISkCS_N9mAXW_D)I{O5V*nTIhS z8MBVRL}i2zrcH&JHT94&Q)bSLKtJuf^mQyidvF_a+HMc7-c(#9Wb_gHp7DHa z%~RGMhC#@HH1EUTu-Im&7gpED_C>E*g^x4l8S9V0KM=IDli#wn9eiKMtuxGD6=H3! zs|UNM(H>`Q`M4KkYjOX^)z>`jp>Rx0rJnQjAA32~&nvoTin)+;U)#CXj=viB z*58uZvSj_OeOtY;;rU^^x?}Z{@qlh_tPSl^e6Rbad#+p-V!Qixb7r%rF*HA9OFK%l z>!>YVm5n_cv;FS7(E1iyH_?8^og1ay2g+$7wgExTW4*WX)jU%!2A2VM@?mF+9z>C5(3 zxPz+yb50KAKLM>Fm9yp)(4odU>Sgt*|SaaI-=zR+Z;d7`)E3Bls4S#80jjv_<7x$)3kqrYS<4uVH=s|w>-b+??rE9 z|D76d5AK|$+X9NSMmP@Nz+Tt^AESLD;{EOR;`^caS?Es5&$?Ha;Vek^XZQ{d!I$s} z?84`#BkXqC!8$A^r7J%xm;4So<6j{K$KWs=fX`q%R27J|piZ&2?~4l4M!wK}QvSXK zI$y<>?vymY0>$<&*v{Na?swE#7t;+JyFtEeVck>sGsSs+jm|#!l=g1=_A~bVLQW0) HKBVs*I&Abi diff --git a/romfs/img/buttonY.png b/romfs/img/buttonY.png new file mode 100644 index 0000000000000000000000000000000000000000..468404ccdcf508c555d7fe47bb105c12cb7381c2 GIT binary patch literal 1130 zcmV-w1eN=VP)E2`=oqk;wo603B&m zSad^gZEa<4bN~PV002XBWnpw>WFU8GbZ8()Nlj2>E@cM*00YiRL_t(o!@ZY3Xd71? z$3Hq5ooG=KYBiyD;<~g|7NZPtuqI=Qp^F7=AaM%q6pSIzy<3NnDMPXfj~)_1oW%_! z;K_KfFl0zk)2Pte9Zcg$mMz~|chX7M;odu+WZ8a>t^D9|$9s40`~CfSzxVrvIF76{ z$VZG4W*iv7VSp-N@-HSiYAn!Xkrb<{TZWGOqJYi?CW(-tL6ip21nPhdSmJ4ezvj(O z16fko?@yr21X1RxiOp+(6Bu~I90(kg zSzxM@HTDzulQVqA3J!@D6H86qwxKQs;2J3^2NU=MojzV+lb|ZVgPJ!vsT6=@&=Ok9 zavw9)Nw5q4u!O%)4i1n2W;$D7lL^AiQvr4aaQ)b3Ruw-mJpzBBa|sI*r~ummvv*IT zq_8~~e9C0Yv2wZ&4lubF13DQjpehJ-Fnji^EbfTQv&6FlcYJaA1@4H;qc0z+5Xg8g zSYwd0{DUEUU+wJscsNczndf}uJU0qAcv61SvVQZEn`FPvvTm<4^lFH5vwSoKmoGFT zjJ712MrR8Y8%6G{-T~m@=MRZ#F@G(l#dt9A0D#+n-&O_?`SW)#-lb3PBl9-H^U8Cz2xtN|#zSoJ29pGaIQR9#N%V$$$tUx~d*Y<> zDIC{fWoU&pdyOl7D800Vi09VjR3&)bJv->JjYApC3UyX@W;c9y&hx9 zSW?s85m;rc9-3`=T_N#2-FnL7;$v>bZvk+B{k}T5yv)2hf)E?LVV4A^FpFaL>kao( z94>mNIHyyirV{l*?V&_L!z70-78>fQx6~;4?@HhVuJ4*i^$l_w1`8h~`?-GPdloQ& z2n!lEi#`Fjiv*hS;fKX8n_z(-xb-m0vK5Qz^W!bn(n&h((GG;#5oVs zyN;L9MOd7k$gElofR{w{Zvo#BB`vRGuS80py4fZ8Hn0J_6C^H>Che7FdnK7yq0F9& z<}%Uj2*3^TECC^A`DL$6*V=xc5{2XY1KT3XgW&JP)1<%{Q-_!3%bWpLL;IBw3PnAe$ZF$P}*JPg=s&u_B(rziFp9gI1qOL diff --git a/romfs/img/tbox/tBoxCornerBotLeft_lght.data b/romfs/img/tbox/tBoxCornerBotLeft_lght.data deleted file mode 100644 index 425f9aac3b735ea876eb29070c7334c0e99c45fb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4104 zcmeH|!3_W)2m=|x5!`mD5i<@$do|FD1eFYe72|J?mJ#d~W5H1)gi diff --git a/romfs/img/tbox/tBoxCornerTopLeft_drk.data b/romfs/img/tbox/tBoxCornerTopLeft_drk.data deleted file mode 100644 index 98194f485995fcf92c6859afaa1cd582f2e4db19..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4104 zcmeIxu?@f=3`9|nkk(xm@c!dDxHyR-wXgZI5akE-h$rGb(?64$y|wPXnpM?XOZ{nY zHSf;!UF|uCyYIaF+@HS3z5W32&-=@QW5*x<9PZS_AO2*)vEvVa4tHwe&+G34mN^i2 diff --git a/romfs/img/tbox/tBoxCornerTopLeft_lght.data b/romfs/img/tbox/tBoxCornerTopLeft_lght.data deleted file mode 100644 index f7cecd076eb2bbc38adad8805c63545a039232c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4104 zcmeIxu?+wr3$^I0qapZ%kqQ=a{^f9eCB?VtUlom1ZU F_W~do5O)9o diff --git a/romfs/img/tbox/tBoxCornerTopRight_lght.data b/romfs/img/tbox/tBoxCornerTopRight_lght.data deleted file mode 100644 index 975b2ff4c3c2792e93b36164e12742ca33623c58..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4104 zcmeH_u?+wr3Z36zl0|b4y7(g2e=~Da6PHs}o0{2EYfxEXeTr( diff --git a/romfs/img/tbox/tboxCornerBotLeft_drk.png b/romfs/img/tbox/tboxCornerBotLeft_drk.png new file mode 100644 index 0000000000000000000000000000000000000000..a9710b0999149a230b28f7df4fb889d53c9e4feb GIT binary patch literal 240 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7l!{JxM1({$v_d#0*}aI z1_o|n5N2eUHAey{$X?><>&pI!O@={IT6j}#6i`SuGbEzKIX^cyHLnE7WngeFN=+gTe~DWM4fs>?~S literal 0 HcmV?d00001 diff --git a/romfs/img/tbox/tboxCornerBotLeft_lght.png b/romfs/img/tbox/tboxCornerBotLeft_lght.png new file mode 100644 index 0000000000000000000000000000000000000000..2201bc5961970e8fe29abc36505b5be81032410a GIT binary patch literal 235 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7l!{JxM1({$v_d#0*}aI z1_o|n5N2eUHAey{$X?><>&pI!O@={7>R8MCDxi>TW=KSdbAE1aYF-JD%fR4Vl$uzQ znxasiS(2gP?&%wlqL<1J6!-UZaSVw#{Py}n!2O88{EJGt?s=&SfiIt`O2+>*6F(YeP*Ola~R R9%Ckuou00KF6*2UngHqcM~46a literal 0 HcmV?d00001 diff --git a/romfs/img/tbox/tboxCornerBotRight_drk.png b/romfs/img/tbox/tboxCornerBotRight_drk.png new file mode 100644 index 0000000000000000000000000000000000000000..1b9f48db2757ceecd9e0aea612891241d3b97d65 GIT binary patch literal 237 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7l!{JxM1({$v_d#0*}aI z1_o|n5N2eUHAey{$X?><>&pI!O@={RYrTx6AW%p)GbEzKIX^cyHLnE7WngeFN=+J zckI@#k~5py(tVawK*6Dbfsu)Y1IReAvq7b&dW&&=LLC2vaDL|d77p|KwSV!Sk4w;$ U$~&SEGYw>`r>mdKI;Vst07v{q#Q*>R literal 0 HcmV?d00001 diff --git a/romfs/img/tbox/tboxCornerBotRight_lght.png b/romfs/img/tbox/tboxCornerBotRight_lght.png new file mode 100644 index 0000000000000000000000000000000000000000..79b959f2c8a2b522bad656724ab590217cbe728d GIT binary patch literal 237 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7l!{JxM1({$v_d#0*}aI z1_o|n5N2eUHAey{$X?><>&pI!O@={7gD?2pFQAZYW=KSdbAE1aYF-JD%fR4Vl$uzQ znxasiS(2gP?&%wlqL<1J6c6-taSVw#{Pw~|!2=3BM*}7%YrNmzuKqz_Ns*qgLu1IL zKk06vx_nb-+Q|4dFfcN)a0n<>&pI!O@={|pEF~pI#5V9GbEzKIX^cyHLnE7WngeFN=+c$t~$y z`?P7_bVdFj_qAP}Sib#nL%@@h4+GcB%x^d~Ysse9>whqUjfW8$?0XcuI9GQ(3<>&pI!O@@I@C8N*pCs0T>GbEzKIX^cyHLnE7WngeFN=+WD<6(9p+Ea*7I~f-F^1;{vTjt;lvtdJ@#Os$?Yn8r9fhyu6{1-oD!M< DVIM#X literal 0 HcmV?d00001 diff --git a/romfs/img/tbox/tboxCornerTopRight_drk.png b/romfs/img/tbox/tboxCornerTopRight_drk.png new file mode 100644 index 0000000000000000000000000000000000000000..4fab957dd0390de482f4dfbceaca8100091674c8 GIT binary patch literal 252 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7l!{JxM1({$v_d#0*}aI z1_o|n5N2eUHAey{$X?><>&pI!O@=|2N84LE3n(O;84^+AoS&PUnpXnkGB7w7r6!i7 zrYMwWmSiZnd-?{X=%um)#S=VT977@wzrD0k@PGjavxDVx!7B^?rf)v3;Cjy0hQTDr zb8&mJi_0R7?Dd7`)lROe<2WU46gXq^nguo;?7WJcN6UM~4!mdI)#d3Fur2-o12c~S cf>zopr0Elr)lmGw# literal 0 HcmV?d00001 diff --git a/romfs/img/tbox/tboxCornerTopRight_lght.png b/romfs/img/tbox/tboxCornerTopRight_lght.png new file mode 100644 index 0000000000000000000000000000000000000000..2cf2e1c0210a4d885e825fac3d49a92bf30077aa GIT binary patch literal 245 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7l!{JxM1({$v_d#0*}aI z1_o|n5N2eUHAey{$X?><>&pI!O@={NH(iO_1Slk%84^+AoS&PUnpXnkGB7w7r6!i7 zrYMwWmSiZnd-?{X=%um)#Unjk977@wzrD1P_kaP1OW+ADorC{Gy$u+hZ%kFy_T)Xg zf6}X$e7zm2zJ=wr_qVLN#W3?{;})j86OJ}U0>+b#|8gX}VgI*GA|GrEoH)iP?YCJb T#FT|g1SIC^>gTe~DWM4fEoelD literal 0 HcmV?d00001 diff --git a/romfs/img/tbox/tboxHorEdgeBot_drk.data b/romfs/img/tbox/tboxHorEdgeBot_drk.data deleted file mode 100644 index 655268af9da3a02894798c2ae496b0133fb0c17c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 136 ZcmZo*U|?WmP+-v2)%`zESW;5*KLB=2F(v>2 diff --git a/romfs/img/tbox/tboxHorEdgeBot_drk.png b/romfs/img/tbox/tboxHorEdgeBot_drk.png new file mode 100644 index 0000000000000000000000000000000000000000..1508a37cc0f7510c483f56727c35a6e0c2ff3c3b GIT binary patch literal 181 zcmeAS@N?(olHy`uVBq!ia0vp^j6kfw!3HERKNXS!Qfx`y?k)`fL2$v|<&%LToCO|{ z#S9GG!XV7ZFl&wkP>{XE)7O>#5t|Hy0n4pF|6PDWvY8S|xv6<2KrRD=b5Uwy zNotBhd1gt5g1e`0K#E=}J5XHG)5S4_<9hOit5^S?KXTx}0fQeM=K1#wfaVLbbh1Xx Q-3QX`>FVdQ&MBb@09t-BVE_OC literal 0 HcmV?d00001 diff --git a/romfs/img/tbox/tboxHorEdgeBot_lght.data b/romfs/img/tbox/tboxHorEdgeBot_lght.data deleted file mode 100644 index 6afd113f35489a34edaf52edf1ebc48262a71e68..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 136 acmZo*U|?WmP+)ld`t|>T!Y59g_zwV%6L>iQ diff --git a/romfs/img/tbox/tboxHorEdgeBot_lght.png b/romfs/img/tbox/tboxHorEdgeBot_lght.png new file mode 100644 index 0000000000000000000000000000000000000000..cf44a830753f3a1f61fe2111c035aabf567aab0a GIT binary patch literal 181 zcmeAS@N?(olHy`uVBq!ia0vp^j6kfw!3HERKNXS!Qfx`y?k)`fL2$v|<&%LToCO|{ z#S9GG!XV7ZFl&wkP>{XE)7O>#5t|Hyk)Cm3hyYMXHZvrm#5q4VH#M&W$Yo$~E=o-- zNlj5G&n(GMaQE~LNYP7W2Z~F2x;Tb#Tu-j}`|E4H8XFs1+d=m`d#k52GGwK)O$%GN Qw;!b2)78&qol`;+0CCkXZU6uP literal 0 HcmV?d00001 diff --git a/romfs/img/tbox/tboxHorEdgeTop_drk.data b/romfs/img/tbox/tboxHorEdgeTop_drk.data deleted file mode 100644 index da499430d5137924fe3cbf456886552c6c6f0856..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 136 YcmZo*U|?WmP+*Xhl>D!&t2{XE)7O>#5t|Hyl*wd2<^w<>+02lL66gHf+|;}hAeVu`xhOTU zBsE2$JhLQ2!QIn0AVn{g9Vjm0>Eal|aXop$lqrACt0*ZQI&kE`0fQeL42&}wkN(>B QvmK<_)78&qol`;+0F~k~WdHyG literal 0 HcmV?d00001 diff --git a/romfs/img/tbox/tboxHorEdgeTop_lght.data b/romfs/img/tbox/tboxHorEdgeTop_lght.data deleted file mode 100644 index 46f95ba3f05c9ff104f8435854737593e6a3fc46..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 136 ZcmZo*U|?WmP+&N5;>7>guU`)s1^`<(csT$7 diff --git a/romfs/img/tbox/tboxHorEdgeTop_lght.png b/romfs/img/tbox/tboxHorEdgeTop_lght.png new file mode 100644 index 0000000000000000000000000000000000000000..2c97608ca09451367cbcadadc0163228218c8f21 GIT binary patch literal 182 zcmeAS@N?(olHy`uVBq!ia0vp^j6kfw!3HERKNXS!Qfx`y?k)`fL2$v|<&%LToCO|{ z#S9GG!XV7ZFl&wkP>{XE)7O>#5t|GHx8a7rSK@&}vY8S|xv6<2KrRD=b5Uwy zNotBhd1gt5g1e`0K#E=}J5XH8)5S4_<9f11;iDt?05Fw6h| literal 0 HcmV?d00001 diff --git a/romfs/img/tbox/tboxVertEdgeLeft_drk.data b/romfs/img/tbox/tboxVertEdgeLeft_drk.data deleted file mode 100644 index dd080fbd756900b6f109d910031770a897bc6eaf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 136 YcmZo*U|>*SU}TV#l>D!&t2{XE)7O>#5t|HywBW(OXUBj-vY8S|xv6<2KrRD=b5Uwy zNotBhd1gt5g1e`0K#E=}J5XHM)5S4_<9hOxDO3LFD=8f^2mspN$JkM5Kfws3&(qb< JWt~$(69DV@EffF% literal 0 HcmV?d00001 diff --git a/romfs/img/tbox/tboxVertEdgeLeft_lght.data b/romfs/img/tbox/tboxVertEdgeLeft_lght.data deleted file mode 100644 index bb6b3bccaff3d60579afe2fdb072f461abc3fe6f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 136 ZcmZo*U|>*SU}QLP;>7>guU`)s1^`=icsT$7 diff --git a/romfs/img/tbox/tboxVertEdgeLeft_lght.png b/romfs/img/tbox/tboxVertEdgeLeft_lght.png new file mode 100644 index 0000000000000000000000000000000000000000..af864106a610818e9b58dc453ff877e2bd641348 GIT binary patch literal 175 zcmeAS@N?(olHy`uVBq!ia0vp^3P8-r!3HGvcdbbWQfx`y?k)`fL2$v|<&%LToCO|{ z#S9GG!XV7ZFl&wkP>{XE)7O>#5t|GHk66^U@1KD}vY8S|xv6<2KrRD=b5Uwy zNotBhd1gt5g1e`0K#E=}J5XHM)5S4_<9f19;iDt*SU}VtM)%`zESW;5*KLB=$F(v>2 diff --git a/romfs/img/tbox/tboxVertEdgeRight_drk.png b/romfs/img/tbox/tboxVertEdgeRight_drk.png new file mode 100644 index 0000000000000000000000000000000000000000..31d90c27744c9ed86a6e7406dfc41a20069da474 GIT binary patch literal 176 zcmeAS@N?(olHy`uVBq!ia0vp^3P8-r!3HGvcdbbWQfx`y?k)`fL2$v|<&%LToCO|{ z#S9GG!XV7ZFl&wkP>{XE)7O>#5t|Hyp}`Ki;O^-gkfN8$4ip#hba4#fxSo9F>eavJ4ICbvoo&v;aN-n;k9yA9wIGe2 Lu6{1-oD!M<5*SU}Sjx`t|>T!Y59g_zwV%QFu83 diff --git a/romfs/img/tbox/tboxVertEdgeRight_lght.png b/romfs/img/tbox/tboxVertEdgeRight_lght.png new file mode 100644 index 0000000000000000000000000000000000000000..13a122ba34db47182ce7fc0b0f3bedf171a7df2a GIT binary patch literal 177 zcmeAS@N?(olHy`uVBq!ia0vp^3P8-r!3HGvcdbbWQfx`y?k)`fL2$v|<&%LToCO|{ z#S9GG!XV7ZFl&wkP>{XE)7O>#5t|HyvCfecmRg{YY-UJAiF1B#Zfaf$kjuc}T$Gwv zlA5AWo>`Ki;O^-gkfN8$4ip#lba4#fxSm||_t)3@Hb$oM_xDm67#>ToMY@!36$9z? MboFyt=akR{04--Ob^rhX literal 0 HcmV?d00001 diff --git a/romfs/img/topbar_drk.data b/romfs/img/topbar_drk.data deleted file mode 100644 index 4610c25e4725b8fa023e40cf502bd5cdda4cea0a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 280 zcmbuwxedcG5ClM~1Lp)7D^VBD#Q)c^|2o!pG+cp$!MqNo4)s=RE&LD>h!!I}&jVtz zm~(Dp4vaCGJkWbbZyl{SwDwhNL#=fyrC`e$B^P8qZ3!u{C?aBDG3Uf#UI=E{-7*m)G{4<~^Xm;~d|!V*}ITjsIodF?K|)x>vO^ z>8JQH39$n#w>g*^#d#g8$m literal 0 HcmV?d00001 diff --git a/romfs/img/topbar_lght.data b/romfs/img/topbar_lght.data deleted file mode 100644 index 5a65f7d530a5d68862322157d528e98f91371b46..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 280 zcmZ9`%N4>f3`9|<1B#+*@7+SSvE{#9#4rj34q4puMms$==Qj6rYb~7As#sQ1RhpPn zF|SU$2ThE@JqG*HtsVW+xm!nLTWc&?TYak)mAhJtwV;^tlQVbDRFGLCUjh-{Voi`F aNNh^~BJY?YV!SyHMDpGvgn)hD&mUilO8KGy diff --git a/romfs/img/topbar_lght.png b/romfs/img/topbar_lght.png new file mode 100644 index 0000000000000000000000000000000000000000..2ab020549377c60367e514738dd13fab259ad97c GIT binary patch literal 195 zcmeAS@N?(olHy`uVBq!ia0vp^j6m$d!2~4FKRN;8a29w(7Bet#3xhBt!>lyi-B|#$MIvkH2 z4UTaLs7yJ?C19AarLN?8$P^Jbiyz6;BUpG%O=HTle~Z0-lK8h_R_%?Se@ZtcRerer o|Jujd-*>*>a_v&}`K#;M|Fc?I#qun_2(*pC)78&qol`;+0QNCMo&W#< literal 0 HcmV?d00001 diff --git a/src/gfx.cpp b/src/gfx.cpp index 4124897..6c91bcd 100644 --- a/src/gfx.cpp +++ b/src/gfx.cpp @@ -3,6 +3,8 @@ #include #include #include +#include +#include #include #include FT_FREETYPE_H @@ -256,18 +258,59 @@ namespace gfx void tex::loadFromFile(const std::string& path) { - std::fstream dataIn(path, std::ios::in | std::ios::binary); - if(dataIn.is_open()) + FILE *pngIn = fopen(path.c_str(), "rb"); + if(pngIn != NULL) { - dataIn.read((char *)&sz, sizeof(uint32_t)); - dataIn.read((char *)&width, sizeof(uint16_t)); - dataIn.read((char *)&height, sizeof(uint16_t)); + png_structp png = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); + if(png == 0) + return; - data = new uint32_t[sz / sizeof(uint32_t)]; - if(data != NULL) - dataIn.read((char *)data, sz); + png_infop pngInfo = png_create_info_struct(png); + if(pngInfo == 0) + return; - dataIn.close(); + int jmp = setjmp(png_jmpbuf(png)); + if(jmp) + return; + + png_init_io(png, pngIn); + + png_read_info(png, pngInfo); + + unsigned clrType = png_get_color_type(png, pngInfo); + if(clrType != PNG_COLOR_TYPE_RGBA) + return; + + width = png_get_image_width(png, pngInfo); + height = png_get_image_height(png, pngInfo); + + data = new uint32_t[width * height]; + + png_bytep *rows = new png_bytep[sizeof(png_bytep) * height]; + for(unsigned i = 0; i < height; i++) + rows[i] = new png_byte[png_get_rowbytes(png, pngInfo)]; + + png_read_image(png, rows); + + for(unsigned y = 0, i = 0; y < height; y++) + { + png_bytep row = rows[y]; + for(unsigned x = 0; x < width; x++, i++) + { + png_bytep px = &(row[x * 4]); + + data[i] = px[3] << 24 | px[2] << 16 | px[1] << 8 | px[0]; + } + } + + for(unsigned i = 0; i < height; i++) + delete rows[i]; + + delete[] rows; + + png_destroy_read_struct(&png, &pngInfo, NULL); + + fclose(pngIn); } } diff --git a/src/ui.cpp b/src/ui.cpp index 494c235..9fd769b 100644 --- a/src/ui.cpp +++ b/src/ui.cpp @@ -52,7 +52,9 @@ static int advMenuCtrl = 0, advPrev = 0; namespace ui { - uint32_t clearClr = 0, mnuTxt = 0, txtClr = 0, rectLt = 0, rectSh = 0, tboxClr = 0; + uint32_t clearClr = 0xFFFFFFFF, mnuTxt = 0xFF000000, txtClr = 0xFF000000, \ + rectLt = 0xFFC0C0C0, rectSh = 0, tboxClr = 0xFFC0C0C0; + void init() { ColorSetId gthm; @@ -61,19 +63,19 @@ namespace ui switch(gthm) { case ColorSetId_Light: - titleBar.loadFromFile("romfs:/img/topbar_lght.data"); + titleBar.loadFromFile("romfs:/img/topbar_lght.png"); //Dark corners - cornerTopLeft.loadFromFile("romfs:/img/tbox/tBoxCornerTopLeft_drk.data"); - cornerTopRight.loadFromFile("romfs:/img/tbox/tBoxCornerTopRight_drk.data"); - cornerBottomLeft.loadFromFile("romfs:/img/tbox/tBoxCornerBotLeft_drk.data"); - cornerBottomRight.loadFromFile("romfs:/img/tbox/tBoxCornerBotRight_drk.data"); + cornerTopLeft.loadFromFile("romfs:/img/tbox/tboxCornerTopLeft_drk.png"); + cornerTopRight.loadFromFile("romfs:/img/tbox/tboxCornerTopRight_drk.png"); + cornerBottomLeft.loadFromFile("romfs:/img/tbox/tboxCornerBotLeft_drk.png"); + cornerBottomRight.loadFromFile("romfs:/img/tbox/tboxCornerBotRight_drk.png"); //Dark edges - horEdgeTop.loadFromFile("romfs:/img/tbox/tboxHorEdgeTop_drk.data"); - horEdgeBot.loadFromFile("romfs:/img/tbox/tboxHorEdgeBot_drk.data"); - vertEdgeLeft.loadFromFile("romfs:/img/tbox/tboxVertEdgeLeft_drk.data"); - vertEdgeRight.loadFromFile("romfs:/img/tbox/tboxVertEdgeRight_drk.data"); + horEdgeTop.loadFromFile("romfs:/img/tbox/tboxHorEdgeTop_drk.png"); + horEdgeBot.loadFromFile("romfs:/img/tbox/tboxHorEdgeBot_drk.png"); + vertEdgeLeft.loadFromFile("romfs:/img/tbox/tboxVertEdgeLeft_drk.png"); + vertEdgeRight.loadFromFile("romfs:/img/tbox/tboxVertEdgeRight_drk.png"); clearClr = 0xFFEBEBEB; mnuTxt = 0xFF000000; @@ -83,21 +85,21 @@ namespace ui tboxClr = 0xFF2D2D2D; break; - default: + default: case ColorSetId_Dark: - titleBar.loadFromFile("romfs:/img/topbar_drk.data"); + titleBar.loadFromFile("romfs:/img/topbar_drk.png"); //Light corners - cornerTopLeft.loadFromFile("romfs:/img/tbox/tBoxCornerTopLeft_lght.data"); - cornerTopRight.loadFromFile("romfs:/img/tbox/tBoxCornerTopRight_lght.data"); - cornerBottomLeft.loadFromFile("romfs:/img/tbox/tBoxCornerBotLeft_lght.data"); - cornerBottomRight.loadFromFile("romfs:/img/tbox/tBoxCornerBotRight_lght.data"); + cornerTopLeft.loadFromFile("romfs:/img/tbox/tboxCornerTopLeft_lght.png"); + cornerTopRight.loadFromFile("romfs:/img/tbox/tboxCornerTopRight_lght.png"); + cornerBottomLeft.loadFromFile("romfs:/img/tbox/tboxCornerBotLeft_lght.png"); + cornerBottomRight.loadFromFile("romfs:/img/tbox/tboxCornerBotRight_lght.png"); //light edges - horEdgeTop.loadFromFile("romfs:/img/tbox/tboxHorEdgeTop_lght.data"); - horEdgeBot.loadFromFile("romfs:/img/tbox/tboxHorEdgeBot_lght.data"); - vertEdgeLeft.loadFromFile("romfs:/img/tbox/tboxVertEdgeLeft_lght.data"); - vertEdgeRight.loadFromFile("romfs:/img/tbox/tboxVertEdgeRight_lght.data"); + horEdgeTop.loadFromFile("romfs:/img/tbox/tboxHorEdgeTop_lght.png"); + horEdgeBot.loadFromFile("romfs:/img/tbox/tboxHorEdgeBot_lght.png"); + vertEdgeLeft.loadFromFile("romfs:/img/tbox/tboxVertEdgeLeft_lght.png"); + vertEdgeRight.loadFromFile("romfs:/img/tbox/tboxVertEdgeRight_lght.png"); clearClr = 0xFF2D2D2D; mnuTxt = 0xFFFFFFFF; @@ -108,10 +110,10 @@ namespace ui break; } - buttonA.loadFromFile("romfs:/img/buttonA.data"); - buttonB.loadFromFile("romfs:/img/buttonB.data"); - buttonX.loadFromFile("romfs:/img/buttonX.data"); - buttonY.loadFromFile("romfs:/img/buttonY.data"); + buttonA.loadFromFile("romfs:/img/buttonA.png"); + buttonB.loadFromFile("romfs:/img/buttonB.png"); + buttonX.loadFromFile("romfs:/img/buttonX.png"); + buttonY.loadFromFile("romfs:/img/buttonY.png"); copyMenu.addOpt("Copy From"); copyMenu.addOpt("Delete"); @@ -600,7 +602,7 @@ namespace ui void drawUI() { gfx::clearBufferColor(clearClr); - ui::drawTitleBar("JKSV - 06/27/2018"); + ui::drawTitleBar("JKSV - 06/28/2018"); switch(mstate) {