refining AR API with Tracker and Trackable classes

Author: codeanticode

mode/libraries/ar/src/processing/ar/PAR.java

@@ -1,7 +1,5 @@
 package processing.ar;
 
-import com.google.ar.core.Plane;
-
 public interface PAR {
   static final int UNKNOWN       = -1;
 
@@ -15,6 +13,4 @@ public interface PAR {
   static final int TRACKING  = 2;
   static final int PAUSED    = 3;
   static final int STOPPED   = 4;
-
-
 }

mode/libraries/ar/src/processing/ar/PGraphicsAR.java

@@ -22,16 +22,12 @@
 
 package processing.ar;
 
-import android.view.MotionEvent;
 import android.view.SurfaceHolder;
 
 import com.google.ar.core.Anchor;
-import com.google.ar.core.Camera;
-import com.google.ar.core.Frame;
 import com.google.ar.core.HitResult;
 import com.google.ar.core.Plane;
 import com.google.ar.core.Pose;
-import com.google.ar.core.Session;
 import com.google.ar.core.Trackable;
 import com.google.ar.core.TrackingState;
 
@@ -45,7 +41,6 @@
 import processing.core.PGraphics;
 import processing.core.PMatrix3D;
 import processing.core.PSurface;
-import processing.event.TouchEvent;
 import processing.opengl.PGL;
 import processing.opengl.PGLES;
 import processing.opengl.PGraphics3D;
@@ -63,9 +58,11 @@ public class PGraphicsAR extends PGraphics3D {
   protected float[] anchorMatrix = new float[16];
   protected float[] colorCorrection = new float[4];
 
+  protected ArrayList<Tracker> trackers = new ArrayList<Tracker>();
   protected ArrayList<Plane> trackPlanes = new ArrayList<Plane>();
   protected HashMap<Plane, float[]> trackMatrices = new HashMap<Plane, float[]>();
   protected HashMap<Plane, Integer> trackIds = new HashMap<Plane, Integer>();
+  protected HashMap<Integer, Integer> trackIdx = new HashMap<Integer, Integer>();
 
   protected ArrayList<Plane> newPlanes = new ArrayList<Plane>();
   protected ArrayList<Plane> updatedPlanes = new ArrayList<Plane>();
@@ -96,6 +93,10 @@ public PGraphicsAR() {
   }
 
 
+  static processing.ar.Trackable[] getTrackables() {
+    return null;
+  }
+
   @Override
   public PSurface createSurface(AppComponent appComponent, SurfaceHolder surfaceHolder, boolean reset) {
     if (reset) pgl.resetFBOLayer();
@@ -189,6 +190,15 @@ protected void updateView() {
   }
 
 
+  public void addTracker(Tracker tracker) {
+    trackers.add(tracker);
+  }
+
+
+  public void removeTracker(Tracker tracker) {
+    trackers.remove(tracker);
+  }
+
   @Override
   public int trackableCount() {
     return trackPlanes.size();
@@ -201,6 +211,11 @@ public int trackableId(int i) {
   }
 
 
+  public int trackableIndex(int id) {
+    return trackIdx.get(id);
+  }
+
+
   @Override
   public int trackableType(int i) {
     Plane plane = trackPlanes.get(i);
@@ -425,13 +440,18 @@ protected void updateTrackables() {
       updatedPlanes.add(plane);
     }
 
-    // Remove stopped and subsummed trackables
+    // Remove stopped and subsummed trackables, and update indices.
     for (int i = trackPlanes.size() - 1; i >= 0; i--) {
       Plane plane = trackPlanes.get(i);
       if (plane.getTrackingState() == TrackingState.STOPPED || plane.getSubsumedBy() != null) {
         trackPlanes.remove(i);
         trackMatrices.remove(plane);
-        trackIds.remove(plane);
+        int pid = trackIds.remove(plane);
+        trackIdx.remove(pid);
+        for (Tracker t: trackers) t.remove(pid);
+      } else {
+        int pid = trackIds.get(plane);
+        trackIdx.put(pid, i);
       }
     }
   }

mode/libraries/ar/src/processing/ar/Trackable.java

@@ -0,0 +1,52 @@
+package processing.ar;
+
+import processing.core.PMatrix3D;
+
+public class Trackable {
+  private PGraphicsAR g;
+  private int id;
+  private PMatrix3D m;
+
+  public Trackable(PGraphicsAR g, int id) {
+    this.g = g;
+    this.id = id;
+  }
+
+  public String id() {
+    return String.valueOf(id);
+  }
+
+  public int status() {
+    int idx = g.trackableIndex(id);
+    return g.trackableStatus(idx);
+  }
+
+  public int type() {
+    int idx = g.trackableIndex(id);
+    return g.trackableType(idx);
+  }
+
+  public PMatrix3D matrix() {
+    int idx = g.trackableIndex(id);
+    m = g.getTrackableMatrix(idx, m);
+    return m;
+  }
+
+  public void pushTransform() {
+    g.push();
+    transform();
+  }
+
+  public void transform() {
+    g.applyMatrix(matrix());
+  }
+
+  public void popTransform() {
+    g.pop();
+  }
+
+  boolean selected(int mx, int my) {
+    int idx = g.trackableIndex(id);
+    return g.trackableSelected(idx, mx, my);
+  }
+}

mode/libraries/ar/src/processing/ar/Tracker.java

@@ -0,0 +1,64 @@
+package processing.ar;
+
+import java.util.HashMap;
+import java.util.Set;
+
+import processing.core.PApplet;
+
+public class Tracker implements PAR {
+  private PApplet p;
+  private PGraphicsAR g;
+
+  private HashMap<String, Trackable> trackables = new HashMap<String, Trackable>();
+
+  public Tracker(PApplet parent) {
+    this.p = parent;
+    this.g = (PGraphicsAR) p.g;
+  }
+
+  public void start() {
+    cleanup();
+    g.addTracker(this);
+  }
+
+  public void stop() {
+    g.removeTracker(this);
+  }
+
+  public int count() {
+    return g.trackableCount();
+  }
+
+  public Trackable get(int idx) {
+    int id = g.trackableId(idx);
+    String sid = String.valueOf(id);
+    if (!trackables.containsKey(sid)) {
+      Trackable t = new Trackable(g, id);
+      trackables.put(sid, t);
+    }
+    return get(sid);
+  }
+
+  public Trackable get(String id) {
+    return trackables.get(id);
+  }
+
+  protected void cleanup() {
+    // Remove any inactive trackables left over in the tracker.
+    Set<String> ids = trackables.keySet();
+    for (String id: ids) {
+      Trackable t = trackables.get(id);
+      if (t.status() == STOPPED || t.status() == UNKNOWN) trackables.remove(id);
+    }
+  }
+
+  protected void remove(int idx) {
+    int id = g.trackableId(idx);
+    String sid = String.valueOf(id);
+    remove(sid);
+  }
+
+  protected void remove(String id) {
+    trackables.remove(id);
+  }
+}

mode/mode.properties

@@ -4,7 +4,7 @@ url = http://android.processing.org
 sentence = Create projects with Processing for Android devices
 paragraph = This version of the Android Mode is for Processing 3.1+
 imports=processing.mode.java.JavaMode
-version = 274
-prettyVersion = 4.1.0-beta3
+version = 275
+prettyVersion = 4.1.0-beta4
 minRevision = 249
 maxRevision = 0