From 0be3ee69ba172b25e67f7d52d7a3e93f59f31c57 Mon Sep 17 00:00:00 2001 From: Scott Duensing Date: Sun, 10 May 2020 16:51:12 -0500 Subject: [PATCH] Updated tools to use IMG instead of STA. --- imgconvert/main.c | 30 ++++++++++++++--------------- joeylib/src/font.sta | Bin 32036 -> 0 bytes joeylib/src/font.xcf | 3 +++ joeylib/src/kanga.sta | Bin 32036 -> 0 bytes joeylib/src/kanga.xcf | 3 +++ scripts/{xcf2sta.sh => xcf2img.sh} | 2 +- 6 files changed, 22 insertions(+), 16 deletions(-) delete mode 100644 joeylib/src/font.sta create mode 100644 joeylib/src/font.xcf delete mode 100644 joeylib/src/kanga.sta create mode 100644 joeylib/src/kanga.xcf rename scripts/{xcf2sta.sh => xcf2img.sh} (98%) diff --git a/imgconvert/main.c b/imgconvert/main.c index 0a37ba6..0543e6e 100644 --- a/imgconvert/main.c +++ b/imgconvert/main.c @@ -27,21 +27,21 @@ void convertColor(char *filename, char *basename, bool showIt) { colors = image->format->palette->ncolors; c = image->format->palette->colors; - jlStaT *sta = NULL; - jlStaCreate(sta); + jlImgT *img = NULL; + jlImgCreate(img); for (int x=0; xpalette[x].r = c[x].r / 16; - sta->palette[x].g = c[x].g / 16; - sta->palette[x].b = c[x].b / 16; - //printf("Palette %03d = R%03d G%03d B%03d\n", x, sta->palette[x].r, sta->palette[x].g, sta->palette[x].b); + img->palette[x].r = c[x].r / 16; + img->palette[x].g = c[x].g / 16; + img->palette[x].b = c[x].b / 16; + //printf("Palette %03d = R%03d G%03d B%03d\n", x, img->palette[x].r, img->palette[x].g, img->palette[x].b); } if (colors < 16) { for (int x=colors; x<16; x++) { - sta->palette[x].r = 0; - sta->palette[x].g = 0; - sta->palette[x].b = 0; + img->palette[x].r = 0; + img->palette[x].g = 0; + img->palette[x].b = 0; //printf("Palette %03d = R000 G000 B000 (added)\n", x); } } @@ -51,22 +51,22 @@ void convertColor(char *filename, char *basename, bool showIt) { for (int x=0; xw; x+=2) { //printf("%02X %02X ", getPixel(image, x, y), getPixel(image, x + 1, y)); // These are backwards - no idea why yet. - sta->pixels[p].r = (unsigned char)getPixel(image, x, y); - sta->pixels[p++].l = (unsigned char)getPixel(image, x + 1, y); + img->pixels[p].r = (unsigned char)getPixel(image, x, y); + img->pixels[p++].l = (unsigned char)getPixel(image, x + 1, y); } } - jlStaSave(sta, basename); + jlImgSave(img, basename); SDL_FreeSurface(image); if (showIt) { - jlStaDisplay(sta); + jlImgDisplay(img); jlDisplayPresent(); jlKeyWaitForAny(); } - jlStaFree(sta); + jlImgFree(img); } @@ -193,7 +193,7 @@ int main(int argc, char *argv[]) { return 1; } - jlUtilStartup("STA/STN Converter"); + jlUtilStartup("IMG/STN Converter"); int imageFlags = IMG_INIT_JPG | IMG_INIT_PNG | IMG_INIT_TIF; int imageResult = IMG_Init(imageFlags); diff --git a/joeylib/src/font.sta b/joeylib/src/font.sta deleted file mode 100644 index f488f74c7c15036fd5426f616ca4dfa148d90bc9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32036 zcmeH~v2q+o3`93!a>;&^|G-tYV*Q$9ecdIB&;1&}%-)GC(JDFXC2waIXf%3yW{<_c z{{G`Qj@$9i@lC_+_UG-}?aSNOx9@L{w=d_{^ZWTY1vrlLuHX8p`EfrUk4hXGnSOME zQ@!zBb3PufpRu@xKsj9}oZ!1&SkF(Tsav%MU-Xe1tq7xc>-QY|z8+vF@A*MJCC@*r zgd|sUx<=YIn)$SCaAP03DzevA-d&!Hz3;H%6+N3(2H?f;Oy5a+$@pvHsvk@-@U+;f zPmzg2llHrMDlKW;tlhk-?UA^Si2XBAn>Ordv?j)duh4D^zV>p~WUby~Xua@)qe7P% zeD?`)Ti>SNLTh4atxq)s)TgRh>*SftMRxq_Qfm?(RLxE8`IIp_C;GuVS4D;G`HHs^ zCHXCk@7=}mJ#Uc9J$KK;%BH70TQFj)m$B981YsY@N`!vb)g?eYWj*r4o?ub4L zbi7guxTkjq0_sr+hPn5)-Z68m#-E&AwSKZ>!G59E9-^K1&OhbA#P_;peS<4R)#%Qd zf`@BHQSoY3@Yn9{QX3_od+#55EB(#3y0`Y))Ezw*s#YawmZ7^j{blIC0rg07X1&ks zwnJ7Tf;w`haY{+&d+(K&7t(k2X%rRLJgJN?9+g8NO^vk+O;pP zuR?K_R6Qy`{#7M8i%@du;~jt1)?5OaPg243`53NhG(2FPp@-{!)K_PZ^%`=~k0-?2 z3+nNNSf5gJ(gOc{8y^mTxs8tEcD0*~ZZ|b+*Rg-SqUpuCbj)k5b6>jL(`cT})gvlh zk7mvZaR57S`}Dle$KViK9ar6GS-j?>|Nn5ge<}Eg-Di4|zfDUWfT8t>ZMC`OF9z(0 zPHA1n8fvHfD4eUkFTV8wTi};TulpssALk`kgsx8bUQ@RieQY5+-&gH_MWziqKj*=V zYyM`VnnrUz7@tn2&mA4Tla6_zJfG-7fLcQC*#`j*G-l-IVJz zsU~2UB8V8)i8F!FlU)4$fZ^qp+7;BCav{V>eDslrwsAea=p(An&*ar| zo9RmUq>nS({cMkox>_YQ+rMYF?VmAd(g!+IP5Py1Kh{bw>vcu1ODy_ft=2cB|4pCk zMS;G$Oly76ckqLORZu%Dc+SUVCNiz}u`!oDH7U>fT=$oFb6%K@c1Ca&Fs(+Dd1rKe zb2(kgR&|N8rmfF-$5g_o&wKj7b=9SH2lamZT;A+lu`IeOv2jV~+hy!sT4#a^t5C`Hw9EbyPAP&TV zI1mToKpcnzaUc%FfjAHc;y@gT192b@#DO>v2jV~+hy!sT4#a^t5C`Hw9EbyPAP&TV zI1mToKpcnzaUc%FfjAHc;y@gT192b@#DO>v2jV~+hy!sT4#a^t5C`Hw9EbyPAP&TV RI1mToKpcnzao|%9{0pkhJ)r;q diff --git a/joeylib/src/font.xcf b/joeylib/src/font.xcf new file mode 100644 index 0000000..fd60997 --- /dev/null +++ b/joeylib/src/font.xcf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:749f464714a6bf26132b5dc186488c794d37ed24fd4f11dab2c8090f350abdc8 +size 28884 diff --git a/joeylib/src/kanga.sta b/joeylib/src/kanga.sta deleted file mode 100644 index cef14ce980e438917920a3c14d084788b22ebacf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32036 zcmd6wO;g-P8plNdo62S@BjjwTvJX2rdkP1X@mpncfEdO}TFSY_6Hz zRa|$J!Qy3h7eDirVyMK{nXjA81rkh&okBJhob4(JqV&$$E}g;I?5_u_58<>p07q3ZUq|V``^VtQZoWrJB>8tMJ^nX1n1D5zNGdr>*4l=V`pF zRi#*Z9iW8l$GQ8+096c?cUYcDS@m6SknSXBKOq|Z``lQ2rIghwh>t5(?dI~gL za~ydqxeBP{I|i>+nbLf@hG`|=(dtzfMBQ<2s=}xD#gm??YMfQ=*mb?qf*9ir1->kv zTMO&f?TV!`>nLvE42uf!!TA5AGMu)&)Wd5kly2*wjJb6OR@3 z__nIJ+d3W)LJuNSZUTZO0OOJJ>4TvbQo6A9PGn$`EwxL}8&+m!W@dp+J4f8SAYwk9 z2#=CRp3YWc3TnaNHZ^?FyArpqh?_U=MC^_dT+eZsESNQF4=N?;*RC4}Mx%KR0ecS> zCoc)!J2@mRKCEh`0zJlaT_Z5A$dbHLy|7IIK_qWP8+}Ux2FkWj!|O4WE=XCSkB1?h zT$WzXpx`$NE+A9LZZciuig9Ul%RyX_%FoMEz1DW}a>VDA6&?&z5Kx6Ssy?6t&%4s9R&K6q7!fO}^8N`o0zHVeCr#Grf=IR;&r^A~kSAzyaD>fz zSz+mQL*9z52*Z5Wgh&V|K8JkmG@5<-a)*G8MZUu5iCV4a!m@c$mt@t`W>k@C!GOwe zWtsVm`7A|1p0e_=u4HHny3AqCCqkj*+w~dHP6P9`Sru(&So1vWWIkPG(uWn` z!ZvOFRq9k$`EtF<+*TqWR~dJ1W(zBfm0!56rzM}h8(CmS9(&voPCbik$oGN0k9;f&tFsXj>6Cg&^`rG9A_UjAMl=sD>2Tu_>yMuHy9kDG5{ zs|it&mcWT&1Up(tMtL~U*zhUWf&(+(TPTxE^F{~`R;wUiYl{y(U@hQZ zh?ZqKtQO=TML5v2UG-X!t2E5X=Nu_e2z)JYfPt?gB4{b*?j$Jas3_qILe>}*sEdnSdOn+1_Dmfj4-o&78}5;8nHq?iDBk!Q#g*& zC|tYqJ@ds5RMv2?(TIFJ$qrv^>JO+6Sb%y>@pNujG6bIvKLI{4z&HRU9XOJfk*$NU zesN8{;;UganOb`)1%&s#>lmPcZ(e;Hk?cVt$j6jDU(wZk+WeqyfVn>$fohlnX9U>7 zCd?yf6NpvE5_SR%>vtV1z;ur_aNTRfSARYFk`IV47sQ4LZ?#%A%{M9!@hbY3&&^&x z*S)1`dZ75QS(_qsW+19iYQY#(RADoa&$=A}+6o`@l$jy6eTu!n_z0u2Ov@V>r;P}m zYF`-uv(+!fN4uVsW&vP6oh2q*?0ko!Lec{Au3YZOXJ8wAvSNW#-S{OUnjcJWBN%~U_;dxvZOyP|8iUqV$ScORyOR>U(L zN)AW(D8fmN0JS}0_HrZ#Fc$duB|Cvm{*gF6eO$-{i zwe=a`MVo6;^i1POzO?&B58#~a`QVZlrm*fyrha>nU2@%-=xgMQeu$!9(tOu+25vy1 zc{s-{X00Dw^TN_O=*=cfz88>PaNYMK(l7d9M|UK8{E~1F&6j!m;!Ow8z>6kc8~I?I zbuEIp2I(JP8+>&i&q+R>TjF!DCiwJWO^62_e6Fwc`?c_8ELY&;Ny*U*-o`v;XRDv& zE8krgpLFsKxPOSYNWV`GWQ;^pyGb0^aZ@Mco3_PQSP#yNZ#wx(px@>uM2?>i_G0-e zgpuq$Fg)Ai^UjN>N%tlD0|UGRvE@l+=EIj|t(3&mV=_K~d|%ko&wVQHFHCgmS9l+4 zjedo=dsXA9$G4>U2@o0haIBkYd|~@@=bB4T;=uueqW`*ME#%vnHGCl~%g5hj^h5WJ z2CV7#=v*+8DLRSpN|Ku=+_z&Ye~K$Ry7tNUt@9F zg@-2i@VJT-<@fN2(cs+jcpp9;vC+P@x!PQk533p-6L+GG%J{p|G7rX!H)fmjcu0RX zq3jaytUSN5&D568-%ar0_z(0GtIz!Brr+%QmmlMily~6hS@LDu|H?lysfm#w!S@0o zfbY>olMc2IE*=zoW5P!2hkP4&O4jzr`jy4ptqGH)NL7v1(|9nlo@oEeAB&?k17i52 z30@0);Ez{DefW~eM|kcSKMtD*+U@<{+Iw+0l=>mx_jpp)^Bb(+4G|1|V_>lPd80;F zya|Bue7fWVJT?E<sjQ4)`_2cdUFk!BsW|+yOo-)4Q6_sofove8AZ<> zt(1+|mrXu$5Bb#IquKXfj2vVV{@iZrcT_#KuItArUAJDCJsi2mk5@lC=M?jnHsFewBxYZHgIt3L3yZeKLN=pJ3h z1|MmL-4f0Wc=SUcCGh0q(mSewsd=qT9-w-$gRqhW=pF|L$NyWA0#fr@bB{D1YUsY# z3tz|qWmJ@CA3+J0b|}knEVBgX=>Bb2V-c@%f<0ParJdw}fY_dE*9Fe8=~{ z`*I3_UT<0(JL?9)`-ccakp?zP$2kZ*M9J5`D4^};m5vcRu;(5#fB|!rGYDvbH1@OR zy(l6HSI_~bbW9Jt2O7)Q(;15LndW@@Zz0v%zL%6O-(yVOZNl%z69!hH$ix?&v>J7WL>H!`K-&w zv86DGV!+&~(rI*D6Dm3^VKgs)j%r1+BK|DvgehKi|jqmu8Bam%i7| zK|a}s_&`y+O(ELkQQMNze1EwJ$C7tyX^$9ud^suSLKRf!`hvDTA(kw6ZTfDhfx-I9 zg1>N)SaHLmUvSbNoC7ED=}Xw%U_jIcdVJ4UFrDigI`~1^MXMv1#2pg}nm&HQ1cQV_ zl4*U&m$-(_9TKnxd}8h>0S)Ix{qk^LdDkGA9M^qRy75@a7uy}>B;Os0d7Fx*t_=cS zL-`H>0n`M5zT(b(4zW6AapRByv3Fuu-st130 zmcE45{Xwk@ZUpHj_MRk;mSQmzGt1spexLk&T-P=0|qlCIZL`}#va9bKWDx)1CF(>O99izkZ~?&zI7!GuUE)> z%M4gf9>cwy!;9mbOE6TXIsEZF3ufTzif=xtk^p;m-fQK>~9!$R`(QkZ)hqS1z^B%t(s+>F!3&>mj z#-|0OALHmd2gcqdoM}SS2GqQ{kMECbU-%OAzBAksE!j=yJ^(xxZ~;qH;Xm1+)Nc-~ z@SE7inATKIf2|c>?hi;k%Aon~_IN_h#WY`^^}tF7=Bq)RQ91p!1~N#{$MvZLmx&L9 zbbsllXkds9Y}m<7sjR+Q10R|oG;_a=5LhM{siFyj0ruGtU$r9tt{oU)pYp*k>aYP$ zDdPTGud@N-uiW)z8kPpwr|}sly0C%!w0nalg@H6gnEvI1$(X+80|6hwZv^(Ga}d-> TGZ<;D^)H_@^h&1xauMYJfUm`> diff --git a/joeylib/src/kanga.xcf b/joeylib/src/kanga.xcf new file mode 100644 index 0000000..a15fd9d --- /dev/null +++ b/joeylib/src/kanga.xcf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0c11bb1f9ad52e9d62b2212433dc7d54fb06d5b1e48804f41441db4ee2cbda91 +size 9359 diff --git a/scripts/xcf2sta.sh b/scripts/xcf2img.sh similarity index 98% rename from scripts/xcf2sta.sh rename to scripts/xcf2img.sh index 0330b70..b48dd1d 100755 --- a/scripts/xcf2sta.sh +++ b/scripts/xcf2img.sh @@ -49,7 +49,7 @@ fi # Call custom converter ${JOEY}/utils/imgconvert "${FILENAME}-DoNtEvErDoThIs-1.png" "${FILENAME}-DoNtEvErDoThIs-2.png" "${NAME}" -mv "data/${NAME}.sta" . +mv "data/${NAME}.img" . # Remove data folder if we created one if [[ "${HASDATA}" -eq "0" ]]; then