From 583f12e587f90aeb2e0a9fd6f8a6f88d2cb5ae20 Mon Sep 17 00:00:00 2001 From: util1 Date: Mon, 22 Jul 2019 19:57:24 +0200 Subject: [PATCH] add fps contreol --- 1v13D.g1a | Bin 18596 -> 20216 bytes INIT/CasioRAM.mem | Bin 53792 -> 53792 bytes assets-fx/img/fps.png | Bin 0 -> 204 bytes build-fx/assets/img/fps.png.o | Bin 0 -> 696 bytes build-fx/map | 463 +++++++++++++++++--------------- build-fx/src/FxEngine/1v13D.bin | Bin 18084 -> 19704 bytes build-fx/src/FxEngine/1v13D.elf | Bin 28452 -> 30644 bytes build-fx/src/controls.d | 9 +- build-fx/src/controls.o | Bin 760 -> 972 bytes build-fx/src/main.o | Bin 1080 -> 1056 bytes src/controls.c | 4 +- src/controls.h | 2 +- src/main.c | 2 +- 13 files changed, 264 insertions(+), 216 deletions(-) create mode 100644 assets-fx/img/fps.png create mode 100644 build-fx/assets/img/fps.png.o diff --git a/1v13D.g1a b/1v13D.g1a index f0c2cab8a0e48c5d2842c1d7ade9644bcb4dcc49..a9888a80a5985f4be2f7fb6f6075b0eeea1c95b6 100644 GIT binary patch delta 2974 zcmai0dr*_v6~8wR$O9yR5YWh%1PuufznjE_C=tITDClZ|fDgu<**qYC;tr2hsiplW zt1OOY06&M>hwbdF%#O9r;7*(!|7dsY>R8s=DXHu(?Ko3dp53uiyHKtZA zq{M@W4Ce8av>fB4HgsP&fa9!sL`sK44dU0tiDLjKLffSX5$knsRF;En+_LO9$p9l8 z<)NeQ$hzy?nEYPu_U2ns%~EwqK?Wj4B}}Gf36bp?49H-75om75Kccc>?tX$+P;@c$ zIN?2P=m8J{WJ4rThKLH*vq6oBT(aY5@9^zi9*sxfZmcQJvIf93A0;^%K4hSaFjgU= ze*|H*bBd&O0&9TFPs-xi-WY32y2ys*gELyY9 zbu)tXBCcWm55UdT`b*VbALJpqH<4YqkmOIzHc+O?1;=)cfl8i0bV^v{kk2AEp**_W zqzJ!cbBEUlGvX@dhjCbV4uyr$_@m)$InC?2PL(ooJdC4qKFHAZOsc|PTZ?wUp>$l~RzaH~4lspCKkq0#KuSLVks zqi$m^4{f@dZfHWJOv0PKyqZvk&WZ)Oo4Jad+fvw|ycMibrLV&Gxn_N~W)NY7%C#e6 zcA54Csy-Jn^7?tG=JR6e2e}*i?94&15P?POe`-UI^|^q5h*RYj^X%2!-vbMgyf3lz z4Oqx|MDoTtMM0JzUmYR^Q0h6ZdUFw8;QBUSjpGlgYlLIyQ@fnkq3$F60(;Onoat!< zHHXa62|egfFn(f#eEImF%tO+VZi&TyT_QHpHlhO(8N|1Z~GTiJLx`c`ZBoA+XWbcs3p7W zh2d6J%t`N@=Mrl#*S)@YY_Vza=;D#Z#ziD=Skz>k0|+12iaq%}p#QP+q46O&5xN(nZmd7VL%(Xw*6Mq)hpV4##?;CBgi;A5WVL!v zTQ6So2}E(m(^j9FSX>H_zP!SY!dEG+Z=Pyw&8J%GCaLuL2b87y2{lLkk&)A%y1OeE z4=$TjTK$1%!MLiw?_b(2asSi9$qxv1EqLfe%{<-RP(=?ky66wTrpmRIZ?c!_+=2P( zA6rym>+y&~enRB_+XRa|UG?*nE>}wBoV2^YnG{oLl%6uU=cz33E0&%Hq9Qw3i| zoEyCJEoRPdwZX>NNTyjF0XL>k6}`-W!b1Q?rp=$G;B}` zJ$_}nx2Q$L7?esTGo0{Q5+lJ`CfokEoDyZ`E)@kv14{TN7|HH znj93`JIw9g+q3BCn`JO6%D43RLUSnK9A7x%-;>z4KUcc#_F3$`Y;4y_t)Za6k>>N8 zdXS-)xra%1aQh5 z70itL4!1I9e^6#R?=jCTHLIDX8L>ys94kyPO3VoZ8@AP-!(PA97HBI}(WaA;$t5av zmpv>iwNvi8d8(hPrH)hG4mp*>s>^jRZ(F!DJNawVbb{{oyWnY{*zwAxjo^Y!7pfdmpMMUuV29#dfv?RgoQoK(y?HIzYi_|LJt+7J`BGVv z#FXI4{tahL8Gs=;u zG3Zia2UFWM^xIYu{Qs_1r0yD;XcqZ=9-U6>6$ZXxj-60Dj`>>E24BubgS$loe3L=_ z3X*FMgH@rs&3Ra9%#`tW;c4`)w{h)O^rGarW8dVO?YWSgXEq- zwim9lVt9qEfl#~orvky=ja-IxkBoVWi0yq)-Q=47Z5X;`)#9kS_$DG?{iyIj9B=Ko z!#ytC$pvkRE5r9~-2&!mNWYa4an0L*4UeU*_#l4B^%ZMnr8oJ96+Qqi_V;I+N$DL# z(!rf_EGmX?EO?CJ@=d=Fvg(*==`UhD1*RoW_4lVyq-g_-}gsmG9KE zhzH1@`c8wWUf=b9^ymM#UL6Y{w!jjx7#1l(3Y3A=p&#w&jAzRrH$W?mWI=k>Z?6nj zIWHp{D^|xV9ir7EvT1Z>hzNBl+UMmf?d3l29U%r03w#7vE}(c~fjV1;`};FO=Sws2 FzW`HLa#a8T delta 1392 zcmY)uU1*zC^xQ8=*CfqPA0N{ZF3roX$AOe|ig+5MBg=6`p0zkTD2R9&Bfecy~;X3EHl*k-fr#4BeLunlzL zfWzC>R$UT6m#nr*(cmcnbrKLD0e_tY+@A)lTL$zF0je3mfgqqESq95a8G9d!tmY!C z>IJ~ihvHq`X`LxU;j|FYlc+br3x>nY%6AO6YZu6+AVZg~!{!8EH{R;q+w0X$j^l8pEW!S#WEB<)+~*&3(P9}&fxOUyk*L6E=)XfgoW;{+>!#_EBu zKapoqMw1cvnpt)9s$|*?mcgJbnP8rHQoEv5)+D!Dnw4IacUv41jg?WvG9UAPnYWBP zL&n%n-n?!O8Sld{=6l+o&0CtE%$v+>8!_HzqejrbN^no>wY{y`(rhv*z48e3^r4j+ zDihOFc_zBeyhb-p=UG7sd8A&~NqiK@-#dF}*n2TQJawj_@g~cMFC6_%d}W7pax!38?!mMZVPf`!jJ|s-##fw4G!1(!7OgFS$I^xts>YA?17F_H?vRO9UA) z(fNMGzZ|n1qjY8A;A*|ANM_$l)914h^N0GG;=anWhi}N{ODoE8!SyvfW#}CPYkdI45++7sqE??+UC0g(Lfsjah?lAorT{j2l zndWmn4#l$~(mgbe2+tkyvl(9FU9FNYM$PbR-gCo&B+Z7J?kXl=gB}<)7wM(p5t`Aj z#6R{?tLMokD(&)0PV=KC=$W?35j^%iwaxPL__^XLitJ0b6hn9$@EFn@Rk7^*Oi{uc zJm?=a_;Y}LGo(uL`Tw!vq2I~OQhh857~YVNo<{>={#L+LCB-i<5qqLS-VDqt{+yUl zgIcXz9X>aBo3>=~_$ju=Gsm5V&{-*_6_2D+O??=O1J={M4VjXd{zYgDsiJz?{)XF-)S^Xfyw=G61K&wQMWW1-|blDhXW zQjf|7Qh?nWSC!Cjwe~xFpp%(IVF7-#`$TmLf7^;>jVR!#AW|zVJPo=w9)&jfNF0k) z)B?VP=zHx+P_aTB1d%r&n3_t|lw45-Lv~K^5QWQTtfm#KU+`s;-vat|>pA+jb1vg zsjm;usm^!X5<&oS(m4Zqx?g8~8B zv#p3@1_Cavvl5R|0e`Y|m8eJuiN9SMtFmGxzsYYf+0=YHlkH)-JdI!mO_HGj+QE=kE8Tax%0R*&=sNth!$eBBl>Z{7_h zVk0|Roirv#h%q&Evua?0zGp{nv4DD$)WU&?$G3Ei%J7q-<^7(&02ZCh3PY&L1!Tb1 z7-`e%D~ihgJ_4`ZlVp)+4I2`lQ5N5FD&(PJKl_u|kzEAIG2*YYIg;fKH3LhO-4Yprr$U z?k;J>=rMk`0zrh!4@{BP7~7ulDQ2teE^VmiBVgSbgi4q)`=j?ddb#{EceLp(2rG_& zCxE2mhQ$F+i^w){Wtbn3I~~D@(hyae-ycGSa+1;5e>2XD-W*w$(-W@gy&*3o$gnsv z3rLN^1V@_P5z?1OWTEUTceL?6c)P}vcclG)Gk_7zlS>ZJ30o`6@<9o{b1?3yWGCaC zSsKun85GTe^$EIt`}(hKpzSK|>Ox(i+6O>q$qaLsGCKyW<0fgX?o;cgWgz~$ zcs23*JPJ&KLLc9gQ532ZYUC~GI}f;hHpGJ~4at@>PT(OY=A&#G9^iL6_`O2)^}0I>1e6lpIa0#sCa)5#(+in!GALJpawk#wrLd7pIjNmfI|+*bvE?7 z-f$77YbfrKB-7iR!2)T*`I#)>zZF4D1GA-J91n} zz9jf1L4cGB93f8EX96W%Y8dk|e790(fN|M8Q)=N!UIj6hsd6rJw0%Vr<=7?y{(QOH4yUY?zh&Fk%lPNyJ!}VO~=Ck delta 1456 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 H+s^(2lr>*t diff --git a/build-fx/src/FxEngine/1v13D.elf b/build-fx/src/FxEngine/1v13D.elf index a51d5fe5c7882565be337a5c775c46b820f7f46d..60a0a7def3a851da019f40719dbe23c5217f6c52 100755 GIT binary patch delta 8455 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 BU3dTh delta 6309 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 diff --git a/build-fx/src/controls.d b/build-fx/src/controls.d index 8b51e36..90c6b2b 100644 --- a/build-fx/src/controls.d +++ b/build-fx/src/controls.d @@ -1,3 +1,10 @@ -build-fx/src/controls.o: src/controls.c src/controls.h +build-fx/src/controls.o: src/controls.c src/controls.h \ + src/FxEngine/FxEngine.h src/FxEngine/coord.h src/FxEngine/zbuffer.h src/controls.h: + +src/FxEngine/FxEngine.h: + +src/FxEngine/coord.h: + +src/FxEngine/zbuffer.h: diff --git a/build-fx/src/controls.o b/build-fx/src/controls.o index 00c264741024660d32d232e0e5651f8b6983be0d..53cee7e032680e0bc418a7cd6d899e7250f4247b 100644 GIT binary patch delta 340 zcmeytdWL<15))I(L=^>_i(F65{gs|DT;p`)uK#m^(}A0T^C64AP#W_^_UFt`tsJ?Z z1l6moB)L3hQ{|t<0m8YC;qY1j!((VO-xT^h|kPT zk54NoW{7uljZaT40kPvVGK)*{iz*r7Q%X`RN+w$}%4jh#*f20~fvg4r2L=Xi7~6$` zfd|I+U|`^#?9bT1=rj2OqcZCQpi+;?KNyu68zv@*3+e#596-zr#2^3?oE*(0z}PT3 lhe@4v3Q*|5Xv9X4d2bOiE%*8bGEM5W@i2DgaW=JJkRH delta 120 zcmX@Z{)2Ub5)oW@gSq{wVtT90O1(S1_mDm{m0GW1^r!XstF@^w{RzM5` Hj35R86$PD(-2O_A-1UDha^2*1QC;?KL#RWNumGNl> z#S9=|!oa}E2xc)bSTHbf!Pqto4BRlb0|NsOjP1g}zzbu0Y*t{hX9U`rz^u%8VsZ-sbF4uYDs)rL2-OWW^qY=Q6&QyxG*qqGD4UP9t;dzFt!f^12>Evz`(!*V}~#> z@WR*;3=FIgwq9{%Zb@PigI;k-(PmjDEk>Y&JeZXkA56|+R%e_uc?yu+FnJHNI_m_W VU4D~aFe{5{09oNsn?V%VBmiPGJ`?}| diff --git a/src/controls.c b/src/controls.c index 87268c3..1e78345 100644 --- a/src/controls.c +++ b/src/controls.c @@ -1,6 +1,7 @@ #include "controls.h" #include #include +#include "FxEngine/FxEngine.h" void init_controls() @@ -12,5 +13,6 @@ void init_controls() static bool fps_visibility; void display_fps() { - + dimage(0,55,&img_fps); + dtext(82, 58, FE_get_fps_history(), C_BLACK, C_NONE); } \ No newline at end of file diff --git a/src/controls.h b/src/controls.h index e7e019e..d383768 100644 --- a/src/controls.h +++ b/src/controls.h @@ -3,7 +3,7 @@ #include extern font_t font_FxEngine; - +extern image_t img_fps; void init_controls(); void display_fps(); diff --git a/src/main.c b/src/main.c index 31d0df9..df17e90 100644 --- a/src/main.c +++ b/src/main.c @@ -13,7 +13,7 @@ int main(void) while (1) { FE_new_frame(); - dtext(1, 1, FE_get_fps_history(), C_BLACK, C_NONE); + display_fps(); } getkey(); return 1;