update viewer

GoLez28 · Mar 28, 2023 · 1ee6cf8 · 1ee6cf8
1 parent 06fb525
commit 1ee6cf8
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/TrackingSmoothing/viewer/lib/tagTrackingViewer.jar b/TrackingSmoothing/viewer/lib/tagTrackingViewer.jar
diff --git a/TrackingSmoothing/viewer/source/tagTrackingViewer.java b/TrackingSmoothing/viewer/source/tagTrackingViewer.java
@@ -1,4 +1,4 @@
-/* autogenerated by Processing revision 1283 on 2023-02-26 */
+/* autogenerated by Processing revision 1283 on 2023-03-28 */
 import processing.core.*;
 import processing.data.*;
 import processing.event.*;
@@ -125,9 +125,11 @@ public 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);
@@ -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
@@ -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