From 20dfdcc36eed5ccc82646f3bbc7de4ff0dd08d0e Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Fri, 15 Dec 2017 09:20:40 -0500 Subject: [PATCH] mode7: more planning changes --- gr-sim/Makefile | 12 ++++++++++-- gr-sim/fade.c | 34 ++++++++++++++++++++++++++++++++++ gr-sim/starfield.c | 5 ++++- tfv/demo.png | Bin 0 -> 566 bytes tfv/sprites.png | Bin 1965 -> 2238 bytes 5 files changed, 48 insertions(+), 3 deletions(-) create mode 100644 gr-sim/fade.c create mode 100644 tfv/demo.png diff --git a/gr-sim/Makefile b/gr-sim/Makefile index 5c93bd86..8525cc97 100644 --- a/gr-sim/Makefile +++ b/gr-sim/Makefile @@ -5,9 +5,17 @@ LFLAGS = -lm SDL_LIBS= `sdl-config --libs` SDL_INCLUDE= `sdl-config --cflags` -all: fixed_point rainbow sparkle starfield kaleido tfv mode7_demo text tfv_multiply +all: fade fixed_point rainbow sparkle starfield kaleido \ + tfv mode7_demo text tfv_multiply +#### + +fade: fade.o gr-sim.o tfv_backgrounds.o tfv_utils.o + $(CC) $(LFLAGS) $(SDL_LIBS) -o fade fade.o gr-sim.o tfv_backgrounds.o tfv_utils.o + +fade.o: fade.c + $(CC) $(CFLAGS) -c fade.c #### @@ -156,6 +164,6 @@ gr-sim.o: gr-sim.c gr-sim.h apple2_font.h clean: rm -f *~ *.o gr-sim rainbow sparkle starfield kaleido \ - tfv text mode7_demo fixed_point tfv_multiply + tfv text mode7_demo fade fixed_point tfv_multiply diff --git a/gr-sim/fade.c b/gr-sim/fade.c new file mode 100644 index 00000000..ad09a48e --- /dev/null +++ b/gr-sim/fade.c @@ -0,0 +1,34 @@ +#include +#include +#include +#include + +#include "gr-sim.h" +#include "tfv_utils.h" +#include "tfv_zp.h" +#include "tfv_backgrounds.h" + + +int main(int argc, char **argv) { + + int result; + + grsim_init(); + gr(); + + clear_bottom(PAGE0); + clear_bottom(PAGE1); + clear_bottom(PAGE2); + + grsim_unrle(title_rle,0xc00); + + gr_copy_to_current(0xc00); + page_flip(); + gr_copy_to_current(0xc00); + page_flip(); + + repeat_until_keypressed(); + + return result; +} + diff --git a/gr-sim/starfield.c b/gr-sim/starfield.c index 76d35710..bc05a6de 100644 --- a/gr-sim/starfield.c +++ b/gr-sim/starfield.c @@ -35,8 +35,11 @@ int main(int argc, char **argv) { while(1) { gr(); - color_equals(15); + for(i=0;ioSYQT{m{ezU~&WhYCN5to&TWF6!kpN-Hmep(EtDc0001;kA{E% z0004EOGiWihy@);00009a7bBm000XU000XU0RWnu7ytkO2XskIMF-&w4+T0TlRjsY z0004rNklym>Y3Yg7;Tlgjvp*5zOUlsE_8l0vV z$mz;!psckEJgP~-X8+?@7J7mEIO0w%wC7oJ1cuM!k!OGIfGgglZq$xJ;|rkAzqdzT z-*hrtlz#>3#JK^ESFGjMqi+hJwTw}VK3SIAAdVlZkXpp8Yp*d35ty6ucc37*&0hKW z#9E$i9|uTr0O#5I@Vg1t<8 literal 0 HcmV?d00001 diff --git a/tfv/sprites.png b/tfv/sprites.png index ab8ce20213a501102b3df6ef46712a8ac421c9a8..809819e1929ecd393cf0042583af8e46f45df137 100644 GIT binary patch delta 2172 zcmWlbc|6n!AIHDHxlA*L>0uqYCWhQcS!5lc`q#YyxpxE2lxB_6d z5KtU;E4dfDOs?&;Bq4qdwlFTEr#$nkZ`4ShWbnk0Yyw!%o3O>;b*F~7t@b{(2em7so4W{dJ z0}+h@M(FmThCkXxSrzD1MH@&ebS9XL4n&Br`N|u0%f>nuH0xH~Ym!Ih3NT{h zLm$_#PWVY;9(nA=1YvC2*aRwfxA*X^ zu%f&h=Q~3no$M;Y1|41MLm<(}mSz$J_H=Q8&MvIX_EJ%HN=;!X(v;t(_QaORklK$> zH|{&dINn=E!jea)SMhPvBcD83oo_93 zVL49*HAiVR7G4_PO<8HPdZy5PdOy?Z!Tbgrx{wM9HYjL5H?)sPDBgH^+7Ic!tAS7j zD>t|s9P*Im572g4G=N4*Ym@^E`Yy){R{n14e_4yJGpM+Iji_e3@z^kZRt$2zO(=J; z;9Y?Y(OY=oqecNn%!P9ol(#|1?9A~XJpzNI{7e70#5%q120XgLe;>YTn|nbOH->{^ ze!d?-hyU+7AW=AS43)Sn*sDc^OpX&cS1l+o2J!MP$SJF7w=zXE3viyO{pW}iakTsK zm%((YNFn)I2EurXDs6*?yeoZ;d5K*KW%Wt41ma9L&;%h%Ie>=SEI#nt&@n)0x=~`a zwM+uzu6iZuVyCK;J>(tElMlk{ar2n_E!F6NE@v%ZQAvDQ>~+q$)=^-ASD3@w}2G{ zZ5Xp}+Te5571&LshF+$~Z z?@0phYzh2akcwxSyKt<>EI7S4sYIk=_^CzFjqaY0Kh?H_pK#kNPqa4}Dd15O6i;qw zX)Y?dNb}snylIg)Spv|HTYpnzgScy2ZZP#SDxO5!0B__4T~Y+(RMv6i)z{LUe_^D~ zG(b#<-PDK*zKNqLZ|QnxT2_>LNzEK4hcj>S+;A#~g|5EsEK9YDNI<*8-;fcH!M;+3V98-|^ta1<5*uY) z6Ffx|ImqB~e%-{?G&-V!pr@6Ucr||(CPx3y%Se@n5 zqX(hXj9xX4@f3gCH#QuUO+lc5*A_423~TPylBaBH$907lzCv-(bT+#4gxQt8l7x*> zYHz`(z!&R#*MtVKWXbaZjFaeq3MtJIdE73-xO3hbYADSPP^e66p8i;ePTaOih*Cgz z)NK0DR{R?f2C?2Dz5pf@sYbE?<093g0g+RfQZmH2(m&IYT{eY6F`;E^F{>*0<%<_{zhSuJIS~8p2QC(oE$7^sinv zR}yr!l3yFm-^iw9XK;28?pI9g7kww<)^gN$*i7u5iB=JLk{jZU&%fZPY}6k>j$^L2 z9a|Mh53095rRS!+$%qtCirRZLj7l&Lq+ z%JT~ynMOTZ&8XPn!}CVRDVIK`2SW~-Ycx{(Ryx8cl`pQYC=VBRC~woHIWg%L!~+6q z3ZCY{w8=ndN0|QgkElBgZTP*^nJbk1EZ4__dvbELlP-y5W=*jd!Ie*yJ<6jImPw2? zZT3+P<(gj$#-uvQZWNOonk*^)PmxduUF9zS3@TH6iAvX1=}kqMZei{W`+RJFv_`oF z7m1Bgbx$?tWt^J8@@B-A8d==U0JHU0EL#5EbveWJtuUkbfZamz41HAVwg6iY*?(@b z%S|+{Vn`y%`nUg(QT02MRwK>t>LOxS^=wGlKD4DWN2xcxUtJ!iB=~j>h^tV_rPhD# tYk3#eY5=NjE#}3M!ooK63K8emxha)%H!DG1c;x@T!hWBl%>!#z+`qCTssjK3 delta 1899 zcmV-x2bB1}5v>m)iBL{Q4GJ0x0000DNk~Le000310001h1Oos702Z67Iguehk!>A+ z4h1;{OvXcN000LNNklBhJv?J0XGgkEB{E-}raP}S6s1WXXEp{Lf}R)ijUD30O; z1nI|gzIJvc?MkzfvfB?mqn#IPo%h>+_ujmDGb{j)MKWcjG;uUv1!>9jPIgf}F?l&P zfSEn5F}3x?RR)s+K%tqdF!Sly4@ezLng}zl>+YrLfJxi7FQ*AGQN(gIMF2&|Qj)*l zbw^E*HO<8sx4X5pT;&P?*LMX@;k}umvskVWxVC4PY19=IV1HWx9JEP;{_k~vPj-f~ z?|A^|I`=@W#sR*2NdQojAXlM-1~|a&bL%|-WIZSVxs`IjFSR?z_l#j15=+rw?#eyfXOS?>dPC1Ko&qw>`pBz2dD$A zBmvq(kiT@rvR3EU&Q--M*k$$~3xM9012_T%!FqS2D(b*4wLdI?-J#J`$XD5q0N??j zK@b3aD&Z)lF-e|&b)I;@`d~x=er@l6@2}YZGy+)G-rxYY48wS32!KX^p;e)6tR`_U z5HawRa99sCK%oVfW|15Km3(j-js^g(G=UZ;Tq0zn004!<*~3y40B!1Y*4c#sj3BeI zji=5&Q|SqS;`8V2msvo#Rdq5 zz!?-k^E*$4MgTC5)1OVws?`&fG)?ffg2-YEXHsk<0MQJGHE0%05~F52RZ;qCK3Qh0bqXs;sGYi16c6@xEd1x5Ep3V-#WRFSwI2k zEa+Z|s0X-g4xfa8PrrlC7J$n=@7}+BfY0`3esCOe9TkAs^~eKUTOJ%BR6+m@4*+%m z5a(Z89y|oY0?;IXqyQW1BLrwa29fo^%~PHL)mKL((EuB3pVn$$;!3c2Q#3C?Rj?p( z8I^s*U;xlC+5qa<1=oN7`VmQi5dcJ<6ZQhQj+zDZhy$?Z1*pCn514_G5qgB}*HzIy(GXyNRXzlv=Y;JJzzFvsQ`!OQ z^>6>6TN71uPXquS7H6S6K-f895&w8%d9%PmogNT-BUN-yfT+*f9}zVsKwAiW`%wUG zqKfW`s(;!)w^#U>=Y+*#s0UCF0MR{>5NL|4+?5MK#5rNH81pbe72Oj7z{W9zB02rL z&k5TyKu%PD(Y#<)qv~BfUJ3-x2?r?RZ2)(v`hp~YEsm&c&jDZ%0Iz$(Ay^`HSjj0d z0l21vK?u}=S3}!BC>#dhfjG=yi;*I|7zF`rHtDRM`#7;chX9x+@&K~t;i#75V1JY; zYdru=vIfz`NPpTy=lgn6>*{^_0c6UVSBd#B07SNbw5afB>`Xp6A$d#EqN=LjlYyZ zX1+>uAOb*lZMGa^^?7?1_Ae+Jw`@jypSP-QAt>jofaU<}k%FRA02g@xL|u{sunk)h zAX5f^dGDCED+v`g4G|J`0JUKM5QIKV4*){YYZ_t#C<+mFLH``!{gx>e0w4k4HKkk~ z&I9aZJXL@ykOvrKG1BM^jGBcZ03r#)MStsjymd@7cv%fR(33B|_RgDM{nQLC#eD$4 z#W-(lFaQIDmv%4^fHF`o6L;6%>n;V1Wi0=HGf`sB`;kj_QSK#;$5$L0n%~bV7w*rw zH;!M_`Iv-r3eAFFv$HG5w(b3sEt8K)_@;mYYew$=-1pYUH;zL-R+0`u;n?;SaB2S} z;$t)EB%HtxZsA8S@-c~bDV0*-MIUwBCbEBuk0+9z5>qad8Xvck1}NZ09KscZ_}EN; zyeJ&B78Vv(aL2&LM$!P&-?YwvBP+kv`M8rbKn5FLz=jPzmjBZpP*0?s1M1vXs0dq}rgry(CJNdsh8$ZKV{@M_4$#iRk03lDeP>C?C$U}GtHfaDsIh!7;# zkc1~;f(=P1K%xza8Um1PLo(G}h{g>*$+#gIHzcWhAoUzbeHJ9ykc4j(6KqJrH;M^1 lB>%+YDlnF@jOE`be*