From 1ee6cf8ae34c06f7d5bbfe3a5a78150d2b03d7b7 Mon Sep 17 00:00:00 2001 From: GoLez28 <15484340+GoLez28@users.noreply.github.com> Date: Tue, 28 Mar 2023 08:46:24 -0300 Subject: [PATCH] update viewer --- .../viewer/lib/tagTrackingViewer.jar | Bin 4590 -> 4612 bytes .../viewer/source/tagTrackingViewer.java | 10 ++++++---- .../viewer/source/tagTrackingViewer.pde | 8 +++++--- .../viewer/tagTrackingViewer.exe | Bin 70144 -> 70144 bytes 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/TrackingSmoothing/viewer/lib/tagTrackingViewer.jar b/TrackingSmoothing/viewer/lib/tagTrackingViewer.jar index 250276f4851ac03532f579e5a264a6906da3f30d..389b1dfc13dc691d68bdacc8f76d43cfef1efc90 100644 GIT binary patch delta 3774 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 delta 3752 zcmV;Z4p;GnB<>>(P)h>@6aWYa2mtzfT9FNr1NwVfk)dY<1-{{bvkU>00U6Hs7MaTd z001ik002-+0|XQR2nYxO`g>ZFxdJ_Z5Vm201Vix!L3tzsCNU)#2@mTe^N|cpX2zLG z0%%nfvQ|{U`hq?L#ip%qO9oq!uI>ufYSnIQ-L_j>N?W_ycHM1l3sm-h?l&_@N#OTe zjWhS$bI!w|p&%LPSRN0wuMb5!T0&N@6?em_P#lYYN87DL zg4n9|Xxyr5njedWt)zl0nrLsDtuU%y165ba_Z)@%u8qsAu4vM#kG2Prp=d3bZ^p zU%^`^J}DR9iRvm7W00>frk=tYySv(~`0_wo*pjF)K;f1^JS6)x(wXcGiMxlphAwd> ztYml0IsX;FOVJmZxEPnvQ)}Z4(y~BO_$%tBwYWjzydi1f0CwNw#if`h4!exEs~8f_ ztJ>CC?a4VyrnQK{^G&#akmJTe`s(zw@t~IKE~vg}#!UWQ;Kc%5Arcp#CNZ5LX^Bfs zxZ!c5P&N%F#-Y%Ss}#ncG5l_PW~9__p_$RR7fmSfq7lnQ_0@E7#R%T2KLht1+oo$w z6xjx~nivb8K&wm?z{e-h&QFLht2s%L4S`rDHogY@g@AW3)U{>TZLnDc>4z#PHuFh82ZK6lgz?EP+S|kv3vae1+-716w(@FgL*XzDqDHE8F4|-t-)`dba_ne} zZg4JGY$NX!p1Y_)h|>mc7xT9|7p4un$HW&zVQwrMvmGJW`%K&~Zp%rejVJ=&Ii=<@ z(z{K3QGDV|hT7K);>#w!f`_O(7NuXtpE20E%$2<+9>yqthIE7M_L+E8?>5S=-^ADS zZj*Cct!l3urNG7c~8{oK#X~P5L!Os+b&Z!DoZQUJJnc82)gbGPX_hJfu zZsJ}1f>v7BcL%}=ZOyQq@ z?9jyTbeKYsWJ@62Z3*rBCO*LL>72FUXuwA6=+#LH{G(LAtsZ>H{7+vZ+cC4Z@Zf)G zP5Rh>Zo)%u*oZ%ikdG8*{=Z5nE1d^_rIRzxq zX$=NPH@(xt$?S^p;_PinYD##NwDUpLGompo(h;7~bVWQ6>kPFgW-a0iRECM?ltZ50 zk|o1qs|$~EnJOn!+Pb3AWG5e5S0EIT0F5wz&&aI|;mb3XsaO?q+M^N9PzrNKA|FY@ z2sq9uYK*De$|J=;AQ{e>Gnu>rJ;}+&Efa#bIocg>x9URDYl?=2V}?lPD_jzZSn-8n z5kw*GbRl6d8m&aK!IA+Zfl2fsn?5HYNH>T4#~!R#&PjUBORt=f^g24d=eVL*_CmdX zj!my@+j=e1tGr^)Ui==y4zaLEwotd;_^|^7}UD<)v_|-`8iFDg3iPj|kbDMCd&cdQXJxeRtS@DQwIC zh@qLJb(iFi>+BOjcaw34W=vtH1SsFT@6@|PDD!Mmp(NojO1~q8duii;O`SrRj98ZajZKcDeQ;rysMlM()3~AA5Yg>ul(e zEc8`E+K{iO@C|Lo(A<9}ow>L4tEa>wYJJ$BL#K;f+X`^1Cf_?xY{|_J*5teAIWBbe zGZZ@U3!T-My2iV*mMryu7drFjc9JR9N3%DV(wEz`bwZRjFAY922xbf{>&qDERE5s0 zh4-f|?9sWc+fVbEdOwQSZ>$6^K)$e$yO^cX1O@n@sO#5ViI;9Hiv)=@f{(Nr= zPf4=R5F@Jdg#4Lokx=Wfl5h>*(ma;f%h&@hXGxgPGOz#_Vj;g5p$@g28S2o2EBHhg z^LNe?M6i@UKd!{BsK@PSz@4OcfFL7hV913*x_(ur^Ca%8;37A#^XLm8SZzShX)+9@SrZ153`0&9hRryjPy28ao`Vb=_p*=+ zhm(G2)*LQ>Vksbny*f(n;K|%JRyJeECv&PhzYajmJ@C zumm56`y>j~-}&Kzi=QHWSZDkdqmN77Hi;`Bu5_%;k|*>w>NqYJ8NA@P@a^>Y(8(l} zab-ef3eWe|PVv3Cu6ByqR_kwNy`B=`5HUC-6fs4Af!!?mU*rh$CA#s;l<^hq)N)%& z+NlD)gny-u9QM6`qfUeH%h{pj8qOIqOH36tQsoZw^W9)jrWax+a`zfPZv?O7C^Kll zXsu)qr=q=VSPu^wN~UIqk{@K1tRl6XX_1qi*U2ojUw>vC+6#}2Ns|X#wT~tN`xuc& zdC{+bvI+JNkzbmYf32ohB}D!^erPLl94C`oY@`o=?zJEb{)VUWW4BCk80un{fULQoK5&*E&PA9 z@a9h-e8otj%MRdA&Hea5%l?a&y)z^G8flY%e#bo4dbxOMby+oov`d1tYl}mb*+`br zW6}oMR(|{s3@sxuvugwpP*QlH=J$1-i%-?U|Q8Oxl(n#?8ZvUhY=dNTLc z60^6R+EeVz`f)IsobNfF zel=cJ0UTCqaYXfU-OBx4cvanl@2S09pTO(tAil4T;0^UA-c&!qTk05opiVK5FVNHD z1j*sd3np{|Cz;`eY(4h8IFYtX;dAhRF4gicJA5+Lguh0}#j}a>?>l_)@hry;#Qt4# zY|V0P&vNX_a=gJ7XLG!x%dBu5rByb^2Q17s$48u{HHSK%6Y*+YdaKzi*XYuFZ5G#_ z#cih!yMQ0z#BD=wl1?N$=!2|uJ<3t=t}={%KMxe-4Ayqm%*Hypnq(>&&vD(EA#L96Y&qk{gLz| 2) continue; fill(255, 255, 255); if (t.type == 2) - fill(255, 0, 0); + fill(0, 255, 0); else if (t.type == 1) fill(100, 255, 100, 100); + else if (t.type == 3) + fill(255, 0, 0); pushMatrix(); translate(t.pos.x*100, t.pos.y*100, t.pos.z*100); box(10); @@ -205,8 +207,8 @@ public void oscEvent(OscMessage theOscMessage) { } else if (theOscMessage.addrPattern().equals("/VMT/Room/Unity")) { int i = theOscMessage.get(0).intValue() - 1; float x = theOscMessage.get(3).floatValue(); - float y = theOscMessage.get(4).floatValue(); - float z = theOscMessage.get(5).floatValue(); + float y = theOscMessage.get(5).floatValue(); + float z = theOscMessage.get(4).floatValue(); finalt[i] = new Tracker(new PVector(-x, y, z)); } } diff --git a/TrackingSmoothing/viewer/source/tagTrackingViewer.pde b/TrackingSmoothing/viewer/source/tagTrackingViewer.pde index 4436c28..6ed8bbf 100644 --- a/TrackingSmoothing/viewer/source/tagTrackingViewer.pde +++ b/TrackingSmoothing/viewer/source/tagTrackingViewer.pde @@ -105,9 +105,11 @@ void draw() { if (t.tick > 2) continue; fill(255, 255, 255); if (t.type == 2) - fill(255, 0, 0); + fill(0, 255, 0); else if (t.type == 1) fill(100, 255, 100, 100); + else if (t.type == 3) + fill(255, 0, 0); pushMatrix(); translate(t.pos.x*100, t.pos.y*100, t.pos.z*100); box(10); @@ -185,8 +187,8 @@ void oscEvent(OscMessage theOscMessage) { } else if (theOscMessage.addrPattern().equals("/VMT/Room/Unity")) { int i = theOscMessage.get(0).intValue() - 1; float x = theOscMessage.get(3).floatValue(); - float y = theOscMessage.get(4).floatValue(); - float z = theOscMessage.get(5).floatValue(); + float y = theOscMessage.get(5).floatValue(); + float z = theOscMessage.get(4).floatValue(); finalt[i] = new Tracker(new PVector(-x, y, z)); } } diff --git a/TrackingSmoothing/viewer/tagTrackingViewer.exe b/TrackingSmoothing/viewer/tagTrackingViewer.exe index ce073ae7df353bf9ac925170b68637286ed81f4e..143bc63a7651750cc40cb8926b949a2c505b88b8 100644 GIT binary patch delta 333 zcmZoz!qTvWWkLr_)+MEsi9J3{^4B-s(&`0sCv)_vKo|ynIuJ%epNI@dB?A~RGBB_( zFmy0Mcp&k~6R;>)fvn&_Uk=pFeoUiIAgfHkqTmIxf(cj@a4;h|<^UE28psMhU{TaQfP)#yF$b_H&_Gu30gD0; ZWCaQnFddnJtRP^52-rKDGbYSv1OUQ!UMBzm