code cleanup, added example

Author: codeanticode

mode/libraries/ar/examples/Images/Images.pde

@@ -0,0 +1,35 @@
+import processing.ar.*;
+
+ARTracker tracker;
+ARAnchor anchor;
+PShape earth;
+
+void setup() {
+  fullScreen(AR);
+
+  tracker = new ARTracker(this);
+  
+  PImage earthImg = loadImage("earth.jpg");
+  tracker.start();  
+  tracker.addImage("earth", earthImg);
+  
+  earth = createShape(SPHERE, 0.5);
+}
+
+void draw() {
+  lights();
+  
+  if (mousePressed) {
+    // Create new anchor at the current touch point
+    if (anchor != null) anchor.dispose();
+    ARTrackable hit = tracker.get(mouseX, mouseY);
+    if (hit != null && hit.isImage() && hit.getName().equals("earth")) anchor = new ARAnchor(hit);
+    else anchor = null;
+  }
+
+  if (anchor != null) {
+    anchor.attach();
+    shape(earth);
+    anchor.detach();
+  }
+}

mode/libraries/ar/examples/Images/code/sketch.properties

@@ -0,0 +1 @@
+component=ar

mode/libraries/ar/examples/Images/data/earth.jpg

@@ -102,6 +102,7 @@ public class ARGraphics extends PGraphics3D {
   protected PShader arLightShader;
   protected PShader arTexlightShader;
 
+
   public ARGraphics() {
   }
 
@@ -236,6 +237,16 @@ public int trackableIndex(int id) {
   }
 
 
+  public String trackableName(int i) {
+    Trackable track = trackObjects.get(i);
+    if (track instanceof AugmentedImage) {
+      AugmentedImage img = ((AugmentedImage)track);
+      return img.getName();
+    }
+    return null;
+  }
+
+
   public int trackableType(int i) {
     Trackable track = trackObjects.get(i);
     if (track instanceof Plane) {
@@ -558,13 +569,12 @@ protected void updateMatrices() {
   protected void updateTrackables() {
     Collection<Plane> planes = surfar.frame.getUpdatedTrackables(Plane.class);
     for (Plane plane: planes) {
-      addNewObject(plane);
+      addNewPlane(plane);
     }
 
-
     Collection<AugmentedImage> images = surfar.frame.getUpdatedTrackables(AugmentedImage.class);
     for (AugmentedImage image: images) {
-      addNewObject(image);
+      addNewImage(image);
     }
 
     // Remove stopped and subsummed trackables
@@ -593,23 +603,34 @@ protected void updateTrackables() {
     }
   }
 
-  protected void addNewObject(Trackable track) {
-    boolean isPlane = track instanceof Plane;
-    if (isPlane && ((Plane)track).getSubsumedBy() != null) return;
-    float[] mat;
-    if (trackMatrices.containsKey(track)) {
-      mat = trackMatrices.get(track);
+
+  protected void addNewPlane(Plane plane) {
+    if (plane.getSubsumedBy() != null) return;
+    float[] mat = addNewMatrix(plane);
+    Pose pose = plane.getCenterPose();
+    if (pose != null) pose.toMatrix(mat, 0);
+  }
+
+
+  protected void addNewImage(AugmentedImage image) {
+    float[] mat = addNewMatrix(image);
+    Pose pose = image.getCenterPose();
+    if (pose != null) pose.toMatrix(mat, 0);    
+  }
+
+
+  protected float[] addNewMatrix(Trackable obj) {
+    float[] mat;    
+    if (trackMatrices.containsKey(obj)) {
+      mat = trackMatrices.get(obj);
     } else {
       mat = new float[16];
-      trackMatrices.put(track, mat);
-      trackObjects.add(track);
-      trackIds.put(track, ++lastTrackableId);
-      newObjects.add(track);
+      trackMatrices.put(obj, mat);
+      trackObjects.add(obj);
+      trackIds.put(obj, ++lastTrackableId);
+      newObjects.add(obj);      
     }
-    if (isPlane) {
-      Pose pose = ((Plane)track).getCenterPose();
-      pose.toMatrix(mat, 0);
-    }    
+    return mat;
   }
 
 

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

@@ -30,15 +30,17 @@ public class ARTrackable {
   protected ARGraphics g;
   protected HitResult hit;
 
+  private String name;
   private int id;
   private PMatrix3D m;
   private float[] points;
 
-  public ARTrackable(ARGraphics g, int id) {
+  public ARTrackable(ARGraphics g, int id, String name) {
     this.g = g;
     this.id = id;
+    this.name = name;
   }
-
+  
   public String id() {
     return String.valueOf(id);
   }
@@ -48,7 +50,7 @@ public PMatrix3D matrix() {
     m = g.getTrackableMatrix(idx, m);
     return m;
   }
-
+  
   public void transform() {
     g.applyMatrix(matrix());
   }
@@ -59,23 +61,23 @@ public float[] getPolygon() {
     return points;
   }
 
-
   public float lengthX() {
     int idx = g.trackableIndex(id);
     return g.getTrackableExtentX(idx);
   }
 
-
   public float lengthY() {
     return 0;
   }
 
-
   public float lengthZ() {
     int idx = g.trackableIndex(id);
     return g.getTrackableExtentZ(idx);
   }
 
+  public String getName() {
+    return name;
+  }  
 
   public boolean isSelected(int mx, int my) {
     int idx = g.trackableIndex(id);

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

@@ -41,7 +41,7 @@
 public class ARTracker {
   protected PApplet p;
   protected ARGraphics g;
-  protected AugmentedImageDatabase imgDB;
+  protected AugmentedImageDatabase db;
 
   private HashMap<String, ARTrackable> trackables = new HashMap<String, ARTrackable>();
   private ArrayList<ARAnchor> toRemove = new ArrayList<ARAnchor>();
@@ -50,20 +50,22 @@ public class ARTracker {
 
   public ARTracker(PApplet parent) {
     this.p = parent;
-    this.g = (ARGraphics) p.g;
+    this.g = (ARGraphics)p.g;
     setEventHandler();
-    ARGraphics arg = (ARGraphics)parent.g;
-    this.imgDB = new AugmentedImageDatabase(arg.surfar.session); //A new Database has been created.
   }
 
   public void addImage(String name, PImage img) {
+    if (db == null) {
+      // Creating a new database of augmented images.
+      db = new AugmentedImageDatabase(g.surfar.session); 
+    }    
+
     Bitmap bitmap = (Bitmap)img.getNative();
-    
-    imgDB.addImage(name, bitmap); // User-provided or auto-generated name here, physical size argument seems optional
+    db.addImage(name, bitmap);
 
-    // Re-set the session config with the updated image database
+    // Reset the session config with the updated image database
     Config config = new Config(session);
-    config.setAugmentedImageDatabase(imgDB);
+    config.setAugmentedImageDatabase(db);
     session.configure(config);
   }
 
@@ -82,9 +84,10 @@ public int count() {
 
   public ARTrackable get(int idx) {
     int id = g.trackableId(idx);
+    String name = g.trackableName(idx);
     String sid = String.valueOf(id);
     if (!trackables.containsKey(sid)) {
-      ARTrackable t = new ARTrackable(g, id);
+      ARTrackable t = new ARTrackable(g, id, name);
       trackables.put(sid, t);
     }
     return get(sid);
@@ -149,7 +152,6 @@ protected void remove(String id) {
     trackables.remove(id);
   }
 
-
   protected void setEventHandler() {
     try {
       trackableEventMethod = p.getClass().getMethod("trackableEvent", ARTrackable.class);