From 0c22d2d01697721f1f36b18d842cbc29c9c39740 Mon Sep 17 00:00:00 2001 From: Milang Date: Thu, 31 Oct 2019 11:54:06 +0100 Subject: [PATCH] configure gitignore, and temp build with liblog --- .gitignore | 5 +++-- 1v13D.g1a | Bin 26060 -> 26660 bytes Makefile | 17 ++++++++++++++++- src/main.c | 41 ++++++++++++++++++++++++++++++++++++++--- 4 files changed, 57 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index f082bf3..558f874 100755 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ *.bin *.elf *.mak -build-fx/ -*.o +build-fx/* +build-fx/map +build-fx/src/main.o \ No newline at end of file diff --git a/1v13D.g1a b/1v13D.g1a index ebc469b0ddce4da233a079ac319fc089dec4f5c0..7f7e736c6bbd4ad00150947322b0b85efde7920a 100755 GIT binary patch delta 4056 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 delta 3093 zcmZWre@xrQ6~Fu1{_-_;z&OTs2*KuyV;ms(_)Ss|jG=)N8k=A!iwGl*Nl1oP+Oa81 zqZwr=a+;FZ981$EnvfP%Xv-A3FO$&3s;t@{sH2h{B^&LKMpBYS9nw$&X||$x?`(c; zGx~7v*S&l1-MhQ*%?O_PGfw~2tv}oj1+NdOWB-J|r!Ql%>m~1m(+iV|_Z1cumlb`~ zIEK0I8EF|G#sTF3BC?qvT1E(A4Vn2{SLVcSw-lP#yj0zg2 z>ih>nM-~x5D2P`25Yc%NNpC$Dvs1GBSv9JDb9C1iY_vpo(MEMey~h8{ z^z*Nf>FQ(rBLU=f?DNZNn*2uyDdU?)G-sl?CLeq-FXw27p*WePwQK?C=rw~+zs|0B z6299sah1mSc3WJfL&UoTI|k}jrm`TCHVI{Df?b*qqIuZOF9EP5(E-$>LG*XvS9+pc zM0Q{1%=c?qFe^Q4`Z;OVSdIfiUm`8pDk4X3fM1xa9RV7~qZ$CLbF>onqXWh%z%<|< zU>>l{l0l?n324~fqg?=q=V(7*BFeeNW7--OOB(zNQOq{_e`pz6meWv%o?GdoV;L?! z6;fQ*(4~z1$q5ozH7(uw=~h zzHw`zD-9x-HYwc_Ma2-6PLu-#K_f>1Myr{O`mG;p zwPz90o7Y58AwxSY&HZ{)%w|J>7}_ObyN>m7^M$o3o4WZuhqx>~$T!?==%CmI04JT_ zW1#gmn{=tbz3vBm!;*>R<4Z5?{X`FaKsvo_%GRi)>B0k;)1IXo@`>J@8E+Seig{Qw z8>3H1N%~rLEK`;-^Plafq(~G+2f_%s#fT!XYWJOJxi5FBPCg6B-B!eQm52`7UnFLT z4lt2}$=m;@9xpn=B2X8fPtK7;qe2soOEml+FxXigqr8|yctj-%@>SDvCq|j~JS!KXp`s1p-ilI}_{?$@>^WeICz-U8ICSR#4uB>YpaNEFiWal5e5C&I224VcnMP z2qf(77wlJOw|!uAiw`Wm^PB-^6kWY2b6XSl+gzV*9Ku>dwis2gE8y7qw_>-S z*tDrJsA!L%;f>G@J@yL^EbP|)e5d_G->_Tc3}HK$QLG;llJ`UmPSt|NEL^l48-5G# z(b|4(3tmj)?{4?xHYaU3*U*j{d;Q!KoEk$)=9)Dba}Ur#dUv8+wu@cG>=sJsLAG`i zfsKaIU2ropn%=8%@$u+%G}CoDg@=Q}>i`gJkw8aWZQ|DJQauvo68C(H%v-C1Y8KTvL9oaEq_O?wf;`zFqGQ8FXDmCG~6a@e~bd_H&g_ z=uBc5uXSTY&!pujXKywk0)Fn%n`r^%ETdRDv_SjLCMS(+e}MD0&w&=Mjn=q*BI(v8 z7-605L6AovY@l1mX@ky<;jz_S!L!tseweR;?BL2DNUu*ecI6h&taa4ytb_*Y2J`-A%o5D@@%SSni>yZmbG*Y(BB;Xi1W=zT`jXR zYHqK_9_oDK1P4iuz0t;18;9G?(6_z`SPAOs>r67}H?ajQ@@jVNc2D^IXblG2! zdhpfnw$y^o`+6&?_0)&M`d^lH;{fUGg14`0%@KrVm_%g9;0C`=Fd5l3y3THlWM?TN zrn*hu$i6qh56IVlTWJUu&YY2{9Q|+h;i_;rD`)MCblo04QQ3~LA4$oafM;|9(X%IC Up?^GiJRG)A^~t_O1rj#sKd-D&0{{R3 diff --git a/Makefile b/Makefile index 022ab12..4aae6be 100755 --- a/Makefile +++ b/Makefile @@ -38,7 +38,8 @@ target-fx := $(filename).g1a target-cg := $(filename).g3a # Source files -src := $(wildcard src/*.c src/*/*.c src/*/*/*.c src/*/*/*/*.c) +src := $(wildcard src/*.[csS] src/*/*.[csS] src/*/*/*.[csS] \ + src/*/*/*/*.[csS]) assets-fx := $(wildcard assets-fx/*/*) assets-cg := $(wildcard assets-cg/*/*) @@ -88,6 +89,20 @@ build-cg/%.o: %.c @ mkdir -p $(dir $@) sh4eb-elf-gcc -c $< -o $@ $(cf-cg) $(dflags) +# Assembler sources +build-fx/%.o: %.s + @ mkdir -p $(dir $@) + sh3eb-elf-gcc -c $< -o $@ +build-fx/%.o: %.S + @ mkdir -p $(dir $@) + sh3eb-elf-gcc -c $< -o $@ $(sflags) +build-cg/%.o: %.s + @ mkdir -p $(dir $@) + sh4eb-elf-gcc -c $< -o $@ +build-cg/%.o: %.S + @ mkdir -p $(dir $@) + sh4eb-elf-gcc -c $< -o $@ $(sflags) + # Images build-fx/assets/img/%.o: assets-fx/img/% @ mkdir -p $(dir $@) diff --git a/src/main.c b/src/main.c index 7ee9ed6..0aff1ca 100755 --- a/src/main.c +++ b/src/main.c @@ -1,9 +1,39 @@ #include +#include +#include + +#include #include #include #include #include +#include +#include + +int callback(void) +{ + fe_callback_start(); + fe_draw(); + dupdate(); + ll_send("Rendered Image\n"); + key_event_t event = pollevent(); + int state=0; + while (event.type!=KEYEV_NONE) + { + if (event.key == KEY_F1) + state = 1; + event=pollevent(); + } + if (state) + { + timer_pause(1); + ll_pause(); + timer_start(1); + } + fe_callback_end(); + return 0; +} int main(void) { @@ -44,7 +74,7 @@ int main(void) fe_bitmap * bmp = fe_bitmap_new(32, 32, color, 0, 0, 0); fe_vertex v[3]= - { + { {30,-10,-10}, {30,10,10}, {30,-10,10} @@ -56,7 +86,7 @@ int main(void) fe_triangle t[1]= { fe_object_getvx(&obj,0), - fe_object_getvx(&obj,1), + fe_object_getvx(&obj,1), fe_object_getvx(&obj,2), bmp, bmp, 0 @@ -64,8 +94,13 @@ int main(void) fe_object_set_faces(&obj, t, 1, 0); // Add object to list - // Launch game timer + fe_renderlist_add(&obj); + + // Launch game timer at 40 FPS max + timer_setup(1, timer_delay(0, 25 * 1000), 0, callback, 0); + timer_start(1); // Launch 3D renderer + fe_load(); // Free Data return; }