From 8300a33fca3c31a36a14aa150aeefc02ac785a77 Mon Sep 17 00:00:00 2001 From: Devine Lu Linvega Date: Sun, 27 Sep 2020 11:13:52 -0700 Subject: [PATCH] cleanup --- nasu.c | 30 +++++++++++++++++++----------- sprite.chr | Bin 4096 -> 8192 bytes 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/nasu.c b/nasu.c index 012aa1a..7f7a58f 100644 --- a/nasu.c +++ b/nasu.c @@ -1,7 +1,7 @@ #include #include -#define HOR 16 +#define HOR 32 #define VER 16 #define PAD 8 #define ZOOM 4 @@ -45,12 +45,16 @@ SDL_Renderer* gRenderer = NULL; SDL_Texture* gTexture = NULL; uint32_t* pixels; +/* helpers */ + int distance(int ax, int ay, int bx, int by) { return (bx - ax) * (bx - ax) + (by - ay) * (by - ay); } +/* chr */ + int rowchr(int x, int y) { @@ -92,6 +96,14 @@ putchr(int x, int y, int color) } } +void +newchr(void) +{ + int i; + for(i = 0; i < SZ; ++i) + chrbuf[i] = 0x00; +} + int jagg(int x, int y) { @@ -163,6 +175,8 @@ line(int ax, int ay, int bx, int by, int color) } } +/* draw */ + void draw(uint32_t* dst) { @@ -201,6 +215,8 @@ update(Brush* b) SDL_SetWindowTitle(gWindow, title); } +/* options */ + int error(char* msg, const char* err) { @@ -208,14 +224,6 @@ error(char* msg, const char* err) return 0; } -void -create(void) -{ - int i; - for(i = 0; i < SZ; ++i) - chrbuf[i] = 0x00; -} - void load(char* path) { @@ -326,7 +334,7 @@ dokey(SDL_Event* event, Brush* b) draw(pixels); break; case SDLK_n: - create(); + newchr(); break; case SDLK_BACKQUOTE: b->mode = 7; @@ -414,7 +422,7 @@ main(int argc, char** argv) if(argc > 1) load(argv[1]); else - create(); + newchr(); draw(pixels); update(&brush); diff --git a/sprite.chr b/sprite.chr index 070d886b90c9f27320abf5b051f4b56f5aeee039..cb1aa465befd0d319204899ad0fbe4aa0c53a539 100644 GIT binary patch delta 3852 zcmb_fU2GiH6~4Q(+1Wblok>E%kgRtmaZ*!+@K%N}j>mh)O&~=@F+3pJ3dxHDP9G9j zFv>3RcakRyP&$UlO+Doy6Vm$eI7++ax5B5QKDgQP=B@M!85x zOPgiAP|(X}tcju+_Q(`z>Hj?80zld1JSY z9AdG{)*bUk*&128-cDzgB68%y_eTK69Se++(j5+vEq^acG|nuJ;ZIo-06gNgL@=wg zHsrq=BUw0%=A->@BM>7IBM|EtfkoX!0FI(SV+3LyBM|Etfmp`~*lE^;B1T|QHxamv zM2x^48VJNl#0bRtHUcdqVgy<`M!;ZAC_K+a%@Go7;`m)%D@rL*6z0M(@F}B`O4(qE zg%_UCE2cL;|8W>PorK|nBuVP%toxnoR?5`2EW_}9KF4*r zqGWi4jH%-Cb$w&LMKss*1K;INdJp{Pn}z5y2+k-)-ULQadkXf!XJ`gh=(*xnBuLQKar2L=YWL(@{JsACBv z0>Seb2LVLZYgYnBb0D;x53nlueQ4s#<`?yd=hx(3plT zQW1cw#3w*4FHBEQbG>(AVS#fDBu`{n<3ci#ke1Fsr?_BV=VI8^g~LO?(qNyjrqU~;}TP2xgQa9^pLcdIG2A5neMzLTKFDq<@4a%-( zm28$wCYQa06Q)C~lxurZi{|0IsdH*FNfN720(b{kKF7RSu8ej`DlvCfE#14s*9j;z z{+U(0OIS%6hfUaaubfEaTL9X18}()!(WkO;qk=EVfq`dx(uQGktZgIm&sZ4godYM}m!U?3klVf;1hZI$ z9SAvbG2D(r5iu?hO*5~}hZp#jT7wGj@1W`$p3XBm!{Hh_#mke`s35HQvSd~F^C5eAl?zppy;k3YO}FF^*81Od5v_3Dyg za||$=Lf8;ama$*#05bsf$q#sHo<*PO?fYcj4@l?JgHLx&t#2URh+2x3N|R#Z5S#i1 z6ZYVi}|;q{cmCjHXk?&h&F-!iztfd6^PBQJV z5`^u$s#OHEbyszaMd$t2p@@Iq_~Ps_!)Bo>7W3I2QM{Mh+@&EpotIx9PwznhsEeZEN#|f2XYrT3d}oQ7O+8b8(LVyg{kBO@cjB$GGx?c0Y32~;s0Vxtvp3?8eDe*CAe z|9*yz(}#Qdw$$JdEM9Rn?y;A-UvQ6#RXWB!dVWd3E$yQ`Ad=3Z?blH+xI|F_5+W(w zK9rjD;g$N7091DqOf268rmA^GFka+@d9cp$ONE2X zkoH2MfQwWEJv2W5yis$>TKdpKXqAUS5wBo1{${sxzDEoi3}_%66j;J1$? zl8oqS${Xr}!0wcgGFdrcJ6SB|Fr$Ym-4>Z%HNw26W5! z{owdN9A8(=KaRgR>_qQjn^8QmE zejcaa*#kqyDh7y}B*nm+01);1>3u(!(WUD)8>fYX2k$xX#+#pA9vwaJ9)CZyKF}s!!Rm0kt5OJ|6^SucGS0|_UwFSKC+W<^G zcu+a;=KiVkm5Kv<&odMc_T-Qc69)TL*MyCP+lMHIe8;+}i{}NYbND$UUvR$c7@P@_ zv)aFBaAsB$C?%va>HDIH2bJvthn$wI8m=d21Xblk^eK9AL`2=w>%lG%L;~SD@Sl|s zQlV2SxOr%|cIng?$B&mtT`4|@7ETg?0?u*hsdQQdG7>sH@Rum_JVvFOWupexeGlxi zoL3iro)wuz1Ql2jAxxZq>DB&zwOQ7f1FfvvTx7Jf3uU1)3LctN&YYQa>UGlr116HG zR3;bz`$j|mX)Tau`bS_sYlu9H?;QU@v zf)on5WJ*rTDbg0LXG;w%bjB$Lh$S`jcd9}d;umyxobG3zfnM+})%+uo#$T99nU6Wh z;Gs0vKpXJM&_#%x!FiU{h=>yWwu5(2mk=Qb5Sjw~Ase3G1gXB<{Ed*|_f~IuKE$Km72d>*HM~@!+sCfJT