From 061b900bb385900ac53ab29cdfdf741fc3837fd1 Mon Sep 17 00:00:00 2001 From: milang Date: Tue, 15 Oct 2019 18:43:53 +0200 Subject: [PATCH] testing view options --- 1v13D.g1a | Bin 25484 -> 27052 bytes INIT/CasioRAM.mem | Bin 53544 -> 53544 bytes build-fx/map | 809 +++++++++++++++++++++-------------------- build-fx/src/1v13D.bin | Bin 24972 -> 26540 bytes build-fx/src/main.o | Bin 3156 -> 3388 bytes project.cfg | 2 +- src/main.c | 88 ++--- 7 files changed, 443 insertions(+), 456 deletions(-) diff --git a/1v13D.g1a b/1v13D.g1a index f7ade8353171737b9e3a9ef0d56a32b6a6cd1ccf..bb2183c4745cebf5b31711d70a25cd14cecac6a7 100644 GIT binary patch delta 8797 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 delta 7343 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 diff --git a/INIT/CasioRAM.mem b/INIT/CasioRAM.mem index f8cf80a0243357a989239de84a6ec2634a279859..252466eaf3edf0bc9f3a622f714acedc032852ae 100644 GIT binary patch delta 1642 zcmV-w29^1!q64U+1F(!l5mSKO8dsIjZ?*P2e4yhdX(f}LL|p-cllw%-0k5;fMbJ6{ zC9{=)lLY}5vnhsy0s$?vt%xTF0gtoQk3$e-*Kj$VWfR|+Z41v7}qO%mG4(*Ah{k+9zb9?I>%v@Wr6)1A40Y4pWoX8C;&@BxTefFKVdeA|wGy zRguyUNP@uxdq*B&cBtzvVWs9xdHGb#qM~=`1 z9orRJo!lyBtKAPTj!G5Sv(2IB4S$bK0LPqI9nz7LC~2&2EA+8( zJo`rk!;XSM3(i>@-=JnC=&y4y^}1jqo>&y_lTYw{ghHeIxp5pH+H4^DryImkQ5OG= zQWfoscQEbRs3+FPohlEE7-5`V1H_3*4D)K!Y5t?0+Z0igE@{yXQGUD0q_Ke$KR_T6 zN?rEQ6@RN5GH|dfa-+TZ3%0<=Re6_gTa289Vy5W?sk45bc)Y^~keATeow~&zLoZk@ z>L4#_uAF39o8A#rl!DGffy8?$X0guJA$pAj2up|25JiE$0A*|-Xm;~8ZIs#yVxZs} zSE2j-KdR>QFnkIIMTgiOUXs<`pxxppWVrt+m}t8MLW9l;aMJ-EZ<*vHZ>sMwvGM%H zVa+v4Di=UkDH1b$Y8Ym5112l(qTyVe(GpjQ&JTKs_^o}j_%)%TiD+$Itc{;y2Sk9+ z3Q4o{IeNa~OrfiGRgu&iUgE!a#WA$i49JB-AKjB0u_AxHegnmbOAgYPR2ko5A^Ws( zGVZBlC*hu37}S$`4$pw$1-X38@3d)d?Vt@g*2Q|Y+J!(W%!xKuv3xs4qGu>RuTm8` zm|X%Yg-8#%PYcByLLJ%rR1xp#Y4VBKdOy=pcF2uy0mPfa9p9J%CE=`SEcLQpJNHIq z#*0i4(v^Q$8{42|F6pRpIqIWd-=9_#){sdF$%Q;V0KRWC>#J%Y>ZBFkl~EAGghC6* zw|6f6zIY+xv27?&SQgq{Lj%Q1QVj5SeK`XhoZ1!`gue;#FIhz?M7M)bRWJqcE8C^nH;7u%ez0{FLcF|$ku$C_Pq+VfDE z=@MgBV^uWB{%vVS;&K?KT=OcB+XTOQ!0W-IfqZ7AlW zVBVQj7t@SM3c!adCH=B@!0I(9y!-gwE2sMw&V<$w%eHY`e?7fsA?2uV(~wmf+@C@P z$%;=f3Q2^+A6%K%5L50bWv1ghe!cKEONh+@M7r7>$;Ivm0QWlz()2QYxJx%cs?H2k zmL(|;Pa|fj%q?=WWhY@j+89-m(ho|7;P$_O40Gh`FKnUa4}zZ2rL4Qm=2y5jOS&yN oWT)aRL9_=KlR&mT3mTyJr^~JKE1tPAvxv4Z1Olk8v%0!&7Q)CB-2eap delta 1642 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 delta 7303 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 E0rGECQ2+n{ diff --git a/build-fx/src/main.o b/build-fx/src/main.o index bf415ecb792e806f4fad27d7d8c658242bc4e06b..590559b6b356c4d44b399dc63b3a0871a4cd308b 100644 GIT binary patch literal 3388 zcmbtWeN0WnwbdmA+Rf>sQ*>$~F=K z=K>V7H6du?G#KY%;s+Xy(ZoOe!>E6l*e+0pVab;8;lJ92#E8LjU*CoDvP~CHa^Ly= z&N=tobMCwEwyz#*s%O#|SQQ3J5vLfqGssymN)b9x1J~s3)E*T&ogR9^88Bsii}~+z zdtPhe=Cpib>iLCp4V>5;JHaPvIZ+pD6cT)55f;*ey@W^W`NZw|h1_{Cabhl?miNqH^5zG~Ji%`ogFtNj3i5}C`p<0fAEqdr(vk7Z)vfb)Pb4gywMw8)TcTz;{Cs-%%~3`94L=9#eP(JhWIrgk+Vx|eRqUSwlC=9w|| z98=3xFGq`U2Vmlp^K9B6%t9XvE5MNR{cqCuh=98f^O+odU{V$RWvPqbmt(R}H_`aW zj|Z}@p2hC?X(1|*J=3T(TW5L85b0U7HS#t3Pis{1Gt)0y!fhkbvr-JFDX@gej%m1a z?++fmdP-B!F%WIP^O9w#ZFsib#1-y{w=V+Eo|N{o3HP$~zGbLFtt*b2Tl?FFrHE#p z6>?5;B(4eLTJKk=HAT^5mavIrE{I&hwbL}*`1QMREffirsP<=t(_+t&vlgvOzTb&W z-D<2L6#gJ?oHj=HO}qmtHJdnl5+{Tt|dHqM2^?h9nk8I zpK2@7?$?*=%hpn*qSbpi9aer%b+GI1XmUYAn!=B!H9?ZT#-#WR1%E=pHzFrP5^``+ zvXcrx<^>AAOTo(({9ux^lbDFCSF7+hD|owtI~3fb;2{MMEBM=(0F;oq;|4GP|(;OqCxZF73`cCcElfnW#ks3ge7^D=S= zT{3bwdw55{N!+|MBpJz6u)18TJ=HXY(KAXph+1-NM?z;e1-tH1?ey}7VvqU9x))LLYnIBL~ls&W5QG`nd7k8 z1)O5Fy1gMR!Q5C~2AIg@5<-F}nIq)H^%V(uXTayOVYvaH9~X6C-K1J6`>GFHaC`Zn z%WJLh;kF{mrG_FF_T_M1sD z_FGIb_DgGHv0qvPi#bSWxIJ>d3e-eMK8u8sk91UIJ#udoO@CwXT`&d6sgO7#4LC@g+y`?5OPwSR zS!i4xa)M1sy9zb)En*c8GMD(&I8Ngr`O0vhWZ*Zl_8Wwl_~@XukvKdbX)OrI{Y!F^ id|5K4dxvzxEKcu0K!xNYvKdE8T;?)zD{;so#r*>#bZf}~ literal 3156 zcmbtWZERCj7=G{WCUkekL8sKQ(GCSFEbYD=;UlBn_?QT6uucpTFJ12~>+DzB+c|Iv z+eEU_k+HZSG5pvMH2y&54?;8=gNZTx@JCBR3-S?2#-?U}v}93PGT(FWJ!?5=4Dn6Q zInVRH&-~G+jec|@;F#94%Q;haTF@Zd8ktrRwx3Y$sLd*ZcCf2D8As~sAXee zLxZKqvP#-yIimJQu_r#MQ>9Wj4wybqZ4UVPr)XDj{{PeHw79KG#OFv;ca!Z_AS6p9 zEypxHI-c+oA6v(M!hXj7sr|D32YbpsHTrGK$}Og3#|@8DnBkHgH*uVVu}fzzU3WJN zb#rGX?nC0xG?lcv&95#uc;Luzw+vn$>{ zoM=!rf~m|EN5!y7IP~FQg<-ao~N&rza9PMHU5M_LD~JpP14wBSx# zWaFNNowj9C+iQ!gHREM%{g~OPW;SDHqn_!!>r^wHnCWCP8%Snb|GtMLEBz{F)Z$zl zh(3j9{@9UeMnYGnV+i2t#ZYuA!R3D^X4j?ZFRb0 zCsvY;cx!lb-ZZ#|QftUtS04ZdEnzuzHv2gb^iW+&e7%B!ae zCb?v}6K~YT@4%2OBPh9C5@Pa@^6>w9#VSv8VkN%LZGut?Eey@hrS~`7r-mt_1JU zLX7y4=P_|~WerJwmZ|yzhCjpb#mGrhtymkD>J)Td#_-h)uV(lrjq_)*5Sh=(#P>1$ z0K+>N-o@}^3?E_mCk+3Z;R%M{V)(BN|DEA~JH)OAKGf@bwIDe2fR&zM#zm zq9{gV9g??}Ah#sxC=m1O$m{Eoyip$sOTKQ^Nm4=d%AzM0RYCzV><;>{Qa}!P!bd=q zJbu|7QF&BWRG}jGD6xnv2IY6fh|klhIzt^@vPThpL7yhlIp&DrkT0l2b5)1Y+bu`1 zP_CC~y>5?;(s0P{m%HVlRx1#aV*Zd=6UK$(LZfuSA+2b)4;Mlgr_U?-qG7)q*B=c> zaCR?C6dwmD zpm-3#Oz|*)h2qly6%>yFtkkeAdL*E@JHQrIBHGwV5xJRQ!w>2PTSqhswn&H&qO7*n zQHrDNciV^Vl zH8>I@_3Blmb@@1uxyc(#M*4ez-wW(4akc%Xso2vU8>2^qd diff --git a/project.cfg b/project.cfg index c39ed9c..7c065a4 100644 --- a/project.cfg +++ b/project.cfg @@ -16,7 +16,7 @@ ICON_CG_SEL = assets-cg/icon-cg-sel.png # Additional compiler flags CFLAGS = -std=c11 -Os # Additional linker flags -LDFLAGS = -llog -lfxengine -lgint-fx -lprof +LDFLAGS = -lfxengine -llog-fx -lgint-fx -lprof # FxEngine font # FONT.FxEngine.png = charset:print grid.size:3x5 grid.padding:1 proportional:true diff --git a/src/main.c b/src/main.c index e9c6ef1..605d74f 100644 --- a/src/main.c +++ b/src/main.c @@ -57,13 +57,10 @@ int main(void) int main(void) { - fe_custom_panic(); - //init_controls(); + ll_set_state(1); + ll_set_panic(); + ll_send("Log Beginning\n"); dclear(C_WHITE); - //render_integer_point point[4]={{{10,0,0},{0,0,0}},{{10,10,0},{0,0,0}},{{10,0,10},{0,0,0}},{{10,10,10},{0,0,0}}}; - //FE_face face={&point[0],&point[1],&point[2],1,2}; - //FE_face face2={&point[3],&point[1],&point[2],0,2}; - uint32_t color[32] = { 0b11111111111111111111111111111111, @@ -99,31 +96,26 @@ int main(void) 0b11111111111111111111111111111111, 0b11111111111111111111111111111111 }; - fe_texture_rich * bmp = fe_texture_new_rich(32, 32, color, 0, 0, 0); - - //fe_texture_debug(bmp); - fe_ivertex v[4]= { { - {300,-100,-100}, + {30,-10,-10}, {0,0,0} }, { - {30,100,100}, + {30,10,10}, {0,0,0} }, { - {300,-100,100}, + {30,-10,10}, {0,0,0} }, { - {300,100,-100}, + {30,10,-10}, {0,0,0} } }; - fe_object object; fe_object_init(&object); fe_object_set_points(&object, &v, 4, 0); @@ -146,16 +138,17 @@ int main(void) 0 } }; + fe_object_set_faces(&object, &triangle, 1, 0); - fe_object_set_faces(&object, &triangle, 2, 0); - bool state=1; - //fe_object_debug(&object); - fe_camera cam = {{0,0,0},{0,0,0},0,0,0}; + + fe_camera cam = {{20,20,0},{20,20,0},0,0,0}; + int fps; while (1) { - label:; + int state=1; + key_event_t event = pollevent(); - if (event.type!=KEYEV_NONE) + while (event.type!=KEYEV_NONE) { //ll_log(str); if (event.key == KEY_LEFT) @@ -193,59 +186,30 @@ int main(void) cam.dv = fe_modulo_2pi(cam.dv); - - - - - if (event.key == KEY_EXIT) - break; + if (event.key == KEY_MENU) + return; if (event.key==KEY_F1 && event.type==KEYEV_DOWN) - state = !state; - goto label; + { + ll_pause(); + } + event=pollevent(); } fe_view_set(&cam); fe_object_display(&object); - char str[1000]; -/* sprintf(str, "S1 %d %d %d", - fe_object_get_vertex(&object, 0)->x, - fe_object_get_vertex(&object, 0)->y, - fe_object_get_vertex(&object, 0)->z); - fe_log(str); - - sprintf(str, "S2 %d %d %d", - fe_object_get_vertex(&object, 1)->x, - fe_object_get_vertex(&object, 1)->y, - fe_object_get_vertex(&object, 1)->z); - fe_log(str); - - sprintf(str, "S3 %d %d %d", - fe_object_get_vertex(&object, 2)->x, - fe_object_get_vertex(&object, 2)->y, - fe_object_get_vertex(&object, 2)->z); -*/ - - sprintf(str, "Camera Settings :\n>> x %d; y %d; z %d\n>> dh %d; dv %d", + char str[300]; + sprintf(str, "\nCamera Settings :\n>> x %d; y %d; z %d;\n>> dh %d; dv %d;\n", cam.pos.x, cam.pos.y, cam.pos.z, (int)(cam.dh*180/pi), (int)(cam.dv*180/pi) ); - ll_log(str); - - - - if (state) - { - fe_display(1); - } - else - { - fe_update(1); - ll_display_log(); - } + ll_send(str); + sprintf(str,"FPS=%d",fps); + dtext(1,1,str,C_BLACK,C_NONE); + fps=fe_display(0); }