From 0d01589322c7d53a01d48c0892bc4005b65b8a49 Mon Sep 17 00:00:00 2001 From: nathan Date: Sun, 16 Feb 2020 21:54:46 -0800 Subject: [PATCH] started adding tap (debug only for now) Former-commit-id: aef9365c434e1ba1d9146f7cf8c37706b80a96b2 Former-commit-id: 3f0f4f4235ba99d564d88f2bed86757b79b6afac --- draw.c | 16 ++++++++++++++++ draw.o.REMOVED.git-id | 2 +- font.o | Bin 37488 -> 37624 bytes init.o | Bin 47992 -> 48136 bytes input.c | 37 +++++++++++++++++++++++++++++++++++++ input.o.REMOVED.git-id | 2 +- list.o | Bin 47984 -> 48128 bytes monokai.o | Bin 27488 -> 27624 bytes planeObj.o | Bin 44040 -> 44176 bytes status.o.REMOVED.git-id | 2 +- structs.h | 6 ++++++ view1090.REMOVED.git-id | 2 +- view1090.o.REMOVED.git-id | 2 +- 13 files changed, 64 insertions(+), 5 deletions(-) diff --git a/draw.c b/draw.c index 8b2a369..d0cd543 100644 --- a/draw.c +++ b/draw.c @@ -881,6 +881,7 @@ void drawMap() { pxFromLonLat(&dx, &dy, p->lon, p->lat); screenCoords(&x, &y, dx, dy); + if((int)(now - p->seen) > DISPLAY_ACTIVE) { planeColor = grey; } else { @@ -945,6 +946,21 @@ void drawMap() { } p = p->next; } + + + if(appData.touchx && appData.touchy) { + + int radius = (mstime() - appData.touchDownTime); + int alpha = 255 - (int)(0.5 * (mstime() - appData.touchDownTime)); + if(alpha < 0 ) { + alpha = 0; + appData.touchx = 0; + appData.touchy = 0; + } + + circleRGBA(appData.renderer, appData.touchx, appData.touchy, radius, white.r, white.g, white.b, alpha); + + } } // diff --git a/draw.o.REMOVED.git-id b/draw.o.REMOVED.git-id index b9c3d03..8f54ef4 100644 --- a/draw.o.REMOVED.git-id +++ b/draw.o.REMOVED.git-id @@ -1 +1 @@ -4dc33d9f8be5dcade60c5ce4a92e98d0da98849c \ No newline at end of file +1d914216fcda8f2b793acf12bfbfddfb24809c94 \ No newline at end of file diff --git a/font.o b/font.o index 3cc27a7d80e6be75c805c8e17ba0e80fa66a2a7f..9acfc71c0711e9547104cc59564f6831d781a1cf 100644 GIT binary patch delta 6885 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 delta 6797 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 o{)Ph{Tprb!Kb8mm67dC%;e3o`HHU+?@e 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 diff --git a/input.c b/input.c index 8dbcfb7..8ccf87a 100644 --- a/input.c +++ b/input.c @@ -1,6 +1,16 @@ #include "structs.h" #include "view1090.h" +static uint64_t mstime(void) { + struct timeval tv; + uint64_t mst; + + gettimeofday(&tv, NULL); + mst = ((uint64_t)tv.tv_sec)*1000; + mst += tv.tv_usec/1000; + return mst; +} + void getInput() { SDL_Event event; @@ -58,9 +68,36 @@ void getInput() double outLon = dx * (1.0/6371.0) * (180.0f / M_PI) / cos(((appData.centerLat)/2.0f) * M_PI / 180.0f); + //double outLon, outLat; + //latLonFromScreenCoords(&outLat, &outLon, event.tfinger.dx, event.tfinger.dy); appData.centerLon += outLon; appData.centerLat += outLat; + + break; + + + case SDL_FINGERDOWN: + appData.touchDownTime = mstime(); + break; + + case SDL_FINGERUP: + if(mstime() - appData.touchDownTime < 30) { + //latLonFromScreenCoords(&(appData.touchLat), &(appData.touchLon), event.tfinger.x, event.tfinger.y); + // double scale_factor = (appData.screen_width > appData.screen_height) ? appData.screen_width : appData.screen_height; + + // double dx = -1.0 * (0.75*(double)appData.screen_width / (double)appData.screen_height) * appData.screen_width * event.tfinger.x * appData.maxDist / (0.95 * scale_factor * 0.5); + // double dy = 1.0 * appData.screen_height * event.tfinger.y * appData.maxDist / (0.95 * scale_factor * 0.5); + + // appData.touchLat = dy * (1.0/6371.0) * (180.0f / M_PI); + + // appData.touchLon = dx * (1.0/6371.0) * (180.0f / M_PI) / cos(((appData.centerLat)/2.0f) * M_PI / 180.0f); + appData.touchx = appData.screen_width * event.tfinger.x; + appData.touchy = appData.screen_height * event.tfinger.y; + } else { + appData.touchx = 0; + appData.touchy = 0; + } break; } } diff --git a/input.o.REMOVED.git-id b/input.o.REMOVED.git-id index 9dd6b32..360c152 100644 --- a/input.o.REMOVED.git-id +++ b/input.o.REMOVED.git-id @@ -1 +1 @@ -16d52890261f72e78ba71c37bea36a5c18405767 \ No newline at end of file +4014ada04a2708aebb111395550edf352c684f96 \ No newline at end of file diff --git a/list.o b/list.o index 93dc507893cbcb8afeab2e7f05e33f3fdd03ba8e..dfda3c3c13dba943d63673ef1a95f209f42440ba 100644 GIT binary patch delta 8491 zcma)>33OCNy2o#I0wjSD8iJJqBi#vPVY@VBScRk+pb3l8Gt6K>2zjUw2qY1*5lPc5 zYCt5-$CAj}Y!YP40ume~nbGIOapu`N$eS~x5zuy* z)%W|?{@tp3yRYB0to_DPlV-^}+c0oiBzwE5Br-;L&Lnm&?4xNh8m7dk1S@_ScC>Uy z8Foww+C2=rTP4~Fh8-(yn_+jCcA8=LkoGXcwn}@nVfV_w>az?xUfPr3+r-xXhGWnW zbkrL5U}+yP?4ep`O*;m!J|H}LXQ62+h_pn97pskqkhV-*UVa~!__O@`%>j(O(FuJ< z9i#pjrD>6dJ^Cir7jM{OWIHr~v9d!nfN|0uY-k>oc4#mjEpfceWEfz=0&Jc}mMLu- zS(db?CKTkY(h{ArfmsO!g)7K@#3(yS_H!YAa43_dZHqKAQ)K397bD}U!0!WHjm*>! zJvg9+aYim%&dL(XOp}=+%1oD;a>~q*{as6$hpMscvvH~ATH-IHza}oVg3Rr4sf$c^ zE!w7kPh4slNe;w$QkRf@I4-pi<-g3vrjDVF@{oNZF7>gy;Ec?eq?!5}i6_p4 zBguo=On4_*A2*+rh8`Q5*UP49!`G90c)4jTCu4-Etbqsnr+LE5_awv~n)dJO&>Z2# zWGOc5)W0wCeY4n)4EC!CU!y03&4!Qr-_Pc68_+xbKKoDY_JjfHKOA<(>YrTx;DB`5 zWc)zKM?bktOp2p(J@&kN5;#**I!SX76r?1CtXWW19L8hG`?^RLUgXU;NO03ElmYVS4J2iEpB*bqnA{23F`U zi8S&v&3q>#FPAFBE!t>VwVv`EXR?N;{{&-VhwkO)6X-y9;SRKL6G_~i=>B5$PJ)g5i z7?YpNPD5S3&i(@J`MP6CywTtS<12J)%A2ZJ=w{Zm#}$7iq%YOkM95jHi`sq$+^%Ro z0{>E%7~9)$Ur^{bz?O0GYdkh&`oQ?Q+wNX)EYn#MSRXedzD{+V^uCHeXF=gNHtiAqUi^1NEe!mtI&D~u99up zOSsrXi~FIXNe4I5pHux^y4>4`Ht?2kb{y(TT+9O|j>7G7 z7aI)D3NFr4^!pU$I4G`gi8-N%O-=i)LgzpL%f3$ZZwjpfwwj9_{f)M7D)dWmtagbh z6dYq@*D#qqTnE0@I{O&fR=+5&P>6Qzdavep;H~6hA}xHXLT^DsC1)q0y;5hthuf98 zViN6`M-*i#6hEc2Eb!xXCIp_!#o2SL(b)~iTf@bRbWhIfc5mzd3BEO)aj0LTi>K*k z07Zj)2iEWm_5ZX&uYtXaTl(2yY}HWlN9x?Cif9ygt9YN8bSp>1-rI@3$j|^hu7KAhRRn+nWrc(LlEibbQ7&n=yzcEauIJcYOho14R9mf@_<3lD)c0Hy=CG~ zib130(S^y3pdDac$JuB|U#E*Iijgu!Qv}7Ru|f5^OQJX30dFdrJ&?Dav&W!fy^BqN zw)HxD7=r7!vTE>d;NlRCYiy5uTmKg{Ae~HfwnEdP1L<|T@fRv|16ViWc|=QIpwMOD z+?dNM!M~AXgtlySvAw{a=IlujPnY%SPMbr#e67V~&PMmXO~;=;8o?%mds8k;gN999 z7_VITc>t-(Y*h1B4GZf8ia3am5$bLkjL!fxG&c=X$GiOgUwQTOf zSTAUMj*I?uES^^i{0xH6<+3f{-oix$Z3%xCArG&3N^R3c3+YEw zedavjMzD?d2@;*8(AWWx1Vh<)a03pK&aFokQ3-f~GauB!R~W<9+g*702e#{M7qA_i z<$%~x#+HF^2Nyl4vtKAR{2AJizDo2Ph0cW_*7H}0-l?+|7_(D8|9a8h4GlXvT-_OE z&7fE_2X!4fc5?e}@@6SCj&|WG;Mm2jGZZ=koV&RAJKg7xDD+z>-lb#ve!MP%z^+_2 z5*)QIv4?iU1B$*Ce6^fif%;lqw3Ft%qL~K4S`09vuPL-1>~&mZ(*nJ%&@14s)7c-u zTep?PgY^X$KJVtdaEXitF0i~#Fid|acw{!@h>2IpRmZwonlb@n@`#_Rt;%U)fK zq}fQP)6nesKw$egzR!q#WlRSj+8t28&t>UkhkxuFiZ1*9T&&K!zYM|c{qjY`dEhJd z3^@EcwECl9i9d~<1)pC&RJ8fIsHTZsOb3nG5FRIf&i)M12X(QGf?=1UsQ~vujxU+{ z2VD#wYz}f^?kpcF$|~qU`Wh|AErq@d)@8 z3iqTZhgTH;Vmg7}Q2ZxlwV2*j{DWvPA1eNHH275*W(&2V z#nFyzuEQw`-M)(doVhZJe-k~xO$X}{F6JmSp5pE?a30~FVuh}tDX3EX<7udy6@M1J zU)3u96BKbr6n_yt_S2~|@b1*?qyV_26c}SMCS@Y9qdfazdh<1>hVBpTQN`axQ&yw+ z%V>)6Defp2Cl$Jo_Wu^}VOy^&^b)OVK=C)xP~TVl<}LXd1hKZ83O!8Yve20zL(E|e zHFUL;-yG>wTGS!nevylj3JucB-$d{tovzTxNTcF8(13KILT}LnRsnP%Em7$EG$&rL z9>dpag+4{2*a=Rg`xTl?`In#=X|qB{(JOK*_>s0NbPD|<2+;g)0Q+&CU9C{F@7ooB9-YSf6@Mi8kAwF(7flMiMzeMi z8j${0p*>TLj=lvQ$GImEMrG(_8BlvK%rEw-O%~!uri)-d$;De?Wo57A-$*iD1~<|V6ncv2$KXB5v!iVxsU~ZdTRi=&rzM2> zWsB#jw@@d$qLe*HWxLt6P%>wR4m7QA zm|sfYB7HLXWh-)YSMej$@G!p|mzP=}XZT^)X{(r|Xac0khPKmO6cJ@uI(&^h5JdWd zQr0FVm=1yc3>PO9T12z~+-G>F|CSVj&Asp^H!rH=l0rp8(IAI4k5+duG$3^=w2o*g zbRgZW&?`hQfwh5)_Y^wXXh{1KoDDqNlKg$UW&}!)`9rrHx$I8|)wzK5<{t5XG^!2Y z$F_V56|__AfB@3nKSGZKYvk;dygJS*ntFQ7X!#L;E97C>*Fx7nfDdi_>!FcDYhxPQ z-}G5yu7%BN%0BxB!{>eL%cEkl^5y98ui0tvibFK1e2H9^ez2`m$` z&u6l$P>t6@XveDuqFXX8J(^)!%Y^7#BaI4*z}GSgf3|K%1Ph>{`982+NW)jO>p=J~2@HiJlJ$71U3v-<^H;!7@F1+Bqk) zckb`b%$=G0X6C(Ad~3OM)l%Kp($Ey{_ltIHf26csN8ztY?=U`1(>iLH(vwoH_+!Y) zQk`VT9X%-DX2_kUqMT~Tw@TS&$epF!*N|_M@?b-@N_nUucg@A-M;dZBDc=u2q#yHZ z9g^5efyO^5Hg(jIk2<2ipy z!Zr*!_i6`C>t@Jz4@47kI8Qnt9rj~SLu6rqVKh|A8F&pbXo07FmOP?V1)hStJB)*W6^{A=# z*I>Z}+f%Z9WK)-tHHXBVDOn|G{-7JX+JiD$$K?GfS&v-@4YFX8Ch{R>b~wK9CKV>i z#*U?Eo&0jn>)_()05@Hr9RzqhFtznTd0Tk`rL8vzxt9p z#s0JI-|z+A?vows{`TzO{@Zm1WjZ>n!BKo+huN8#?WLFq)tRX=X#gC^wDprZPj4FN z9yw4;Qe7_dSe9y9o}4e4q|s9NCey~&Kx$S-ZZ(#}MkO}*hM82K_*eBdRDa(aO0ouy z+J&OlDTyH1Uack?xbrlOr`VmnE>8i1m@FiDC*qnKH?9Lniqkrr_U32ox8xDrha% z*(tEj)mb4p=W_9nKGF&wZ{z2>{UY$9O>YQcz6_#sIXev(=DL^z98YrbRae9O1Etmj zQ1m2c>!IvPU086MWU?^h*YqSCTCjy#w;S3tg(gDVlP(dWQT$S&Yr!*5cU;EkkZG|( zmy=f&ivB(b&vS{0To_DE3QYv-d@j7y=ARWh2b}X=VgY$;u^4TbV>u3?`8xYEM6rbr z(+!rV*qi~jfHMYSfs2iXq6Ioz0zuS_g}n=O@fL1kGF?z=b%3@7Ts%x8vL+Z-X1@o) zUc$xaM6(n+A3P7FzV(hR09XnW8Dq0XLgiwe9fan^F7`RFC57x^C|bhV zc_>>_=srlHSd0f;eBEzjXPBmyD*Em;kPV7{D%eXotAqSfU6^gYrPu@@P|8KJ&FJY% zg=Rn)>ETp^c1bjT&9T%#YpIJZh3us|bHjAZT~N7H7n^$-cFl_YB8V>Kq93&uRp`6G zd|bRjW4WNv1K{xK>?9PS&GFdn4Rb1+@8GB8@_^ zOrbA;XBkgxpJ}ukROqFiuzJ~8wi!+?b75{RyWy@a*{EW=vKE|WE|Edc;Tnb3L#T|i z9?)FoViSNZ=VC%PqyBq}<(uF@I+Ft8f+EAlUa=dW z^Y98Tj?l?0Zn@dRd}u}b5$&gUD|7=`SL*C2I9C?3dmyxuvnkMw8XH`|{C*It3Yj0u zR_WqAJtq%zy1D&L(6Wk)CVF~{71|lvR_SaN*vq+yk`E!prW`!wJnb9>#9Ipe(FUu_ z2eIEn7@Od<4O~%-2108&x8PCtf8}FY8aVwfaf*Ux_N_PjI|f32oxKWCKWB+>!LN%c zWO-b%oCA&u&X$9_LKk1q3je6sT!kRo*kEsk&L+WWv>Z(9u;iGuTz3t{6pMut> zxo9JQMk=%qSl8e-MUhgV&{N<<`WT&{e*T76#LnHdnEED8imgWP*|NjSB7p_6?k6K>mh8_tUh{ ze^qSG)An;l(RU}O&nfyGXx&iA4uSLeLd%co@bdFBSvz1=94=KQS@XzGb6y651Ib_{ zqZHzSA|$hrOi)NE1d&uDDNsl)v>-W#0LtB+k{EgytokDXVP|evGsI7M4vD{kC z#Zj8DgNh~IMuS}B(P|!1s0*A(rxATyp~c`0%AKP!sIxbqIq1T}nQi3mZ^`beV*fow z^fg6qr31=BqcP{w0Yw{K>>b#P`59>2sIywI1MV(&8qeBr#Xbri;FkZr6XwDokxmcS z6vZeX!q~)QqK_!l3$5@K!^_wUa^l1$UHHhk-zk>)P_)S>9-)}|yF&3Iy@`u=DUvQL z^bpuLb1{szyB`#K5vL3+QQi<(7Z)w```lRqe0XZvhGk;<62d9c_#6C^Q=awVb^UwY55HhLg2b>=u~5)rGG>p{+;Rd??!H z66eg7qpi=JizU#q&Bt;ff4hr427&EdY@;ySqgZZ)@OGX316t80G0O<0-zzrL!1|)j zJ_P5BTy&+d{Zz531TWHU6ag0%Isii0LOnz={{Ywy9p})og9|&^=`;tX|L;K24xdP& zy{Sl{Ezq{ZW%@Rbn)8H2?vv+Nh(B=s`-|7{caS(plB`#86zOT?{z*>*@Ji0i4 zsnDI^tmp0sJy;2}Gnu}9M{TAk`Up*24@Lh62w`8xsI?r0E{145x6ALTGR;(IIR#)b zcy@A8N|d3cO`20GhrmwmU$4~dLbs7Eirz&_Sg+_0$YwFUrs#Xq?7X4q&DW0OhTebu zGP8*GjrWxb=9|b_MgOiX*01)ZqBq}7zESiCD54W++cy>lZ`AAPR+t5$SGdTz3F8|r zJtiX|`U>|ypwJ04D+P)^mq!1Dq9578aC(WNe~#8Upy(IUyTtQ`zTfrP+Cbs7O{tJ? zF*@i4!Cl%b;x+7nLfd9exwocXM}0p)b*6azN1o z4YgU(KSTT4A0U9O{Y9ZWXUPhh67-}px&jfR%<7iQnp>;PGUFdN)X&b#W_5$l3 zF0vHbjy@*jfD`Gx3jK%zVjOspdKCHr&B?CHKRj_P-ldT2S)mE8@VeO!!+vy<<)Zfe5=0i;vnsC;WVLGwEc!uz;; zwnDE`9}5-zG};hXDEjZIwY6Y7~87E4~}2m-e5L{V79VaD8LAVnd4QY+MD|P!nw!7Zv?g z+9v<0=&$sSHKTQcqWxTSr_EU|rtH3e0=WkS_j7l@I4b)(Lyt(lqBs7TqG_Y!^s==k zYHb{}VPBJeg5rm=16-8EQQ6lXnus#+AT3wu|IiXX3jw4-qOywYvIPHRs)aDpJ#lrV zSMncJGKHZP=@Eq-#%6oPmegg?C~&pn_@Ez%=wH`YxqWg5HC{- zO{Wd1KZKCx#8DY)4frS1D2O5*Z;KUT@gPT0LUkVk_8J${iJCJ|Ni$yo4y08IttPq; zijYQ#nm%`?LB0vW*SNn$srwtM`+1yR&I}!B+Bb1}Y5GU9|B>{v7dg65@lU4CcH`IV zJwUzFMe{3UCO?FcKC94$L^nWd18?6X zDFhC6#cy%eFc)8vHAA%=)(l$RByb`f*c(-tOj=8H5_rSh>Qm@P5D0T<2q%d~g$y;C z(N01%%-x^FQ8W6a!L>NO19DPqCngxzVF6JvVk**nDC_?J{3Az@7 zjU2zTW9|qlHg$Bx*z^tgwCutzw4<-;5%M*6Z9k+Mjkg(XE!A3Dxh1B6~5 z((&6lhW{traPIXyb|;9#BiOHD`r#3lV~w!&@NoQcdm2>}K{SuRTmN*-XFzT92uno- zK5ibK{C=L%z(lYg8G_$drXLw$d2lAM!tT&;q%YPxjf$EGq`fiRa(E^b;LoRz!qzv2 PCpSclnm>U3H+TF${;jEA diff --git a/monokai.o b/monokai.o index 5981be1df21cc977a57899488dde0b09fa36d183..f4fa05780eb7941f2500af5658025cd8080f9b07 100644 GIT binary patch delta 6304 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 delta 6026 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 diff --git a/planeObj.o b/planeObj.o index 07195dcad575f83c8d2f3ee8786e8fcbb24a4b31..55fc516147375d03774530ddab6d29817fcf4bbf 100644 GIT binary patch delta 10385 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 delta 10217 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 V