aded Anchor class and removed AR API from PApplet

Author: codeanticode

core/src/processing/core/PApplet.java

@@ -9352,83 +9352,6 @@ public void printProjection() {
   }
 
 
-  //////////////////////////////////////////////////////////////
-
-  // TENTATIVE AR API
-
-
-  public int trackableCount() {
-    return g.trackableCount();
-  }
-
-  public int trackableId(int i) {
-    return g.trackableId(i);
-  }
-
-  public int trackableType(int i) {
-    return g.trackableType(i);
-  }
-
-  public int trackableStatus(int i) {
-    return g.trackableStatus(i);
-  }
-
-  public boolean trackableSelected(int i, int mx, int my) {
-    return g.trackableSelected(i, mx, my);
-  }
-
-  public float[] getTrackablePolygon(int i) {
-    return g.getTrackablePolygon(i);
-  }
-
-  public float[] getTrackablePolygon(int i, float[] points) {
-    return g.getTrackablePolygon(i, points);
-  }
-
-  public PMatrix3D getTrackableMatrix(int i) {
-    return g.getTrackableMatrix(i);
-  }
-
-  public PMatrix3D getTrackableMatrix(int i, PMatrix3D target) {
-    return g.getTrackableMatrix(i, target);
-  }
-
-  public int anchorCount() {
-    return g.anchorCount();
-  }
-
-  public int anchorId(int i) {
-    return g.anchorId(i);
-  }
-
-  public int anchorStatus(int i) {
-    return g.anchorStatus(i);
-  }
-
-  public int createAnchor(int i, float x, float y, float z) {
-    return g.createAnchor(i, x, y, z);
-  }
-
-  public int createAnchor(int mx, int my) {
-    return g.createAnchor(mx, my);
-  }
-
-  public void deleteAnchor(int i) {
-    g.deleteAnchor(i);
-  }
-
-  public PMatrix3D getAnchorMatrix(int i) {
-    return g.getAnchorMatrix(i);
-  }
-
-  public PMatrix3D getAnchorMatrix(int i, PMatrix3D target) {
-    return g.getAnchorMatrix(i, target);
-  }
-
-  public void anchor(int i) {
-    g.anchor(i);
-  }
-
   // ***********************************************************************************************
 
 

core/src/processing/core/PGraphics.java

@@ -4229,105 +4229,6 @@ public void eye() {
   }
 
 
-  //////////////////////////////////////////////////////////////
-
-  // TENTATIVE AR API
-
-  public int trackableCount() {
-    showMissingWarning("trackableCount");
-    return 0;
-  }
-
-  public int trackableId(int i) {
-    showMissingWarning("trackableId");
-    return 0;
-  }
-
-  public int trackableType(int i) {
-    showMissingWarning("trackableType");
-    return 0;
-  }
-
-  public int trackableStatus(int i) {
-    showMissingWarning("trackableStatus");
-    return 0;
-  }
-
-  public boolean trackableSelected(int i, int mx, int my) {
-    showMissingWarning("trackableSelected");
-    return false;
-  }
-
-  public float[] getTrackablePolygon(int i) {
-    showMissingWarning("getTrackablePolygon");
-    return null;
-  }
-
-
-  public float[] getTrackablePolygon(int i, float[] points) {
-    showMissingWarning("getTrackablePolygon");
-    return null;
-  }
-
-  public PMatrix3D getTrackableMatrix(int i) {
-    showMissingWarning("getTrackableMatrix");
-    return null;
-  }
-
-
-  public PMatrix3D getTrackableMatrix(int i, PMatrix3D target) {
-    showMissingWarning("getTrackableMatrix");
-    return null;
-  }
-
-
-  public int anchorCount() {
-    showMissingWarning("anchorCount");
-    return 0;
-  }
-
-  public int anchorId(int i) {
-    showMissingWarning("anchorId");
-    return 0;
-  }
-
-  public int anchorStatus(int i) {
-    showMissingWarning("anchorStatus");
-    return 0;
-  }
-
-  public int createAnchor(int i, float x, float y, float z) {
-    showMissingWarning("createAnchor");
-    return 0;
-  }
-
-  public int createAnchor(int mx, int my) {
-    showMissingWarning("createAnchor");
-    return 0;
-  }
-
-  public void deleteAnchor(int i) {
-    showMissingWarning("deleteAnchor");
-  }
-
-
-  public PMatrix3D getAnchorMatrix(int i) {
-    showMissingWarning("getAnchorMatrix");
-    return null;
-  }
-
-
-  public PMatrix3D getAnchorMatrix(int i, PMatrix3D target) {
-    showMissingWarning("getAnchorMatrix");
-    return null;
-  }
-
-
-  public void anchor(int i) {
-    showMethodWarning("anchor");
-  }
-
-
   //////////////////////////////////////////////////////////////
 
   // PROJECTION

mode/libraries/ar/examples/Cubes/Cubes.pde

@@ -1,14 +1,18 @@
 import processing.ar.*;
 
-float[] points;
-PMatrix3D mat;
 float angle;
-int oldSelAnchor;
-int selAnchor;
+Anchor selAnchor;
+ArrayList<Anchor> regAnchors;
+
+Tracker tracker;
 
 void setup() {
   fullScreen(AR);
   mat = new PMatrix3D();
+
+  tracker = new Tracker(this);
+  tracker.start();
+  regAnchors = new ArrayList<Anchor>();
 }
 
 void draw() {
@@ -25,58 +29,58 @@ void draw() {
 
   if (mousePressed) {
     // Create new anchor at the current touch point
-    oldSelAnchor = selAnchor;
-    selAnchor = createAnchor(mouseX, mouseY);
+    if (selAnchor != null) selAnchor.dispose();
+    selAnchor = new Anchor(tracker, mouseX, mouseY);
   }
 
   // Draw objects attached to each anchor
-  for (int i = 0; i < anchorCount(); i++) {
-    int id = anchorId(i);
-    if (oldSelAnchor == id) {
-      deleteAnchor(i);
-      continue;
-    }
+  for (Anchor anchor: regAnchors) {
 
-    int status = anchorStatus(i);
+    int status = anchor.status(i);
     if (status ==  PAR.PAUSED || status == PAR.STOPPED) {
-      if (status == PAR.STOPPED) deleteAnchor(i);
+      if (status == PAR.STOPPED) anchor.dispose();
       continue;
     }
 
-    pushMatrix();
-    anchor(i);
-
-    if (selAnchor == id) {
-      fill(255, 0, 0);
-    } else {
-      fill(255);
-    }
+    anchor.attach();
+    fill(255);
+    rotateY(angle);
+    box(0.15);
+    anchor.detach();
+  }
 
+  if (selAnchor != null) {
+    selAnchor.attach();
+    fill(255, 0, 0);
     rotateY(angle);
     box(0.15);
-    popMatrix();
+    selAnchor.detach();
   }
+  
 
   // Draw trackable planes
-  for (int i = 0; i < trackableCount(); i++) {
-    int status = trackableStatus(i);
+  for (int i = 0; i < tracker.count(); i++) {
+    Trackable trackable = tracker.get(i);
+
+    int status = trackable.status();
     if (status ==  PAR.PAUSED || status == PAR.STOPPED) continue;
 
-    if (status == PAR.CREATED && trackableCount() < 10) {
+    if (status == PAR.CREATED && regAnchor.size() < 10) {
       // Add new anchor associated to this trackable, 0.3 meters above it
-      if (trackableType(i) == PAR.PLANE_WALL) {
-        createAnchor(i, 0.3, 0, 0);
+      Anchor anchor;
+      if (trackable.type() == PAR.PLANE_WALL) {
+        anchor = new Anchor(trackable, 0.3, 0, 0);
       } else {
-        createAnchor(i, 0, 0.3, 0);
+        anchor = new Anchor(trackable, 0, 0.3, 0);
       }
+      regAnchors.add(anchor);
     }
 
-    points = getTrackablePolygon(i, points);
-
-    getTrackableMatrix(i, mat);
+    float[] points = trackable.getPolygon();
+    
     pushMatrix();
-    applyMatrix(mat);
-    if (mousePressed && trackableSelected(i, mouseX, mouseY)) {
+    trackable.transform();
+    if (mousePressed && trackable.selected(mouseX, mouseY)) {
       fill(255, 0, 0, 100);
     } else {
       fill(255, 100);
@@ -93,4 +97,4 @@ void draw() {
   }
 
   angle += 0.1;    
-}
+}

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

@@ -0,0 +1,47 @@
+package processing.ar;
+
+import processing.core.PMatrix3D;
+
+public class Anchor implements PAR {
+  protected PGraphicsAR g;
+
+  private int id;
+  private PMatrix3D m;
+
+  public Anchor(Trackable trackable, float x, float y, float z) {
+    this.g = trackable.g;
+
+    int idx = g.trackableIndex(Integer.parseInt(trackable.id()));
+    id = g.createAnchor(idx, x, y, z);
+  }
+
+  public Anchor(Tracker tracker, int mx, int my) {
+    this.g = tracker.g;
+    id = g.createAnchor(mx, my);
+  }
+
+  public void dispose() {
+    g.deleteAnchor(id);
+  }
+
+  public String id() {
+    return String.valueOf(id);
+  }
+
+  public int status() {
+    return g.anchorStatus(id);
+  }
+
+  public PMatrix3D matrix() {
+    return m;
+  }
+
+  public void attach() {
+    g.pushMatrix();
+    g.applyMatrix(matrix());
+  }
+
+  public void detach() {
+    g.popMatrix();
+  }
+}