Added clearAnchors to Tracker

Author: codeanticode

debug/apps/arscene/src/main/java/arscene/Sketch.java

@@ -9,6 +9,7 @@ public class Sketch extends PApplet {
   float angle;
   Anchor selAnchor;
   ArrayList<Anchor> regAnchors;
+  ArrayList<Anchor> delAnchors;
 
   Tracker tracker;
 
@@ -20,6 +21,7 @@ public void setup() {
     tracker = new Tracker(this);
     tracker.start();
     regAnchors = new ArrayList<Anchor>();
+    delAnchors = new ArrayList<Anchor>();
   }
 
   public void draw() {
@@ -44,11 +46,7 @@ public void draw() {
       if (anchor.isTracking()) drawBox(anchor, 255, 255, 255);
       if (anchor.isStopped()) anchor.dispose();
     }
-
-//    for (int i =  : regAnchors){
-//      if (status == PAR.STOPPED) anchor.dispose();
-//    }
-
+    tracker.clearAnchors(regAnchors);
 
     if (selAnchor != null) {
       drawBox(selAnchor, 255, 0, 0);

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

@@ -22,8 +22,10 @@ public Anchor(Tracker tracker, int mx, int my) {
   }
 
   public void dispose() {
-    g.deleteAnchor(id);
-    disposed = true;
+    if (!disposed) {
+      g.deleteAnchor(id);
+      disposed = true;
+    }
   }
 
   public String id() {

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

@@ -39,11 +39,6 @@ public boolean isSelected(int mx, int my) {
     return g.trackableSelected(idx, mx, my);
   }
 
-//  public int status() {
-//    int idx = g.trackableIndex(id);
-//    return g.trackableStatus(idx);
-//  }
-
   public boolean isNew() {
     int idx = g.trackableIndex(id);
     return g.trackableNew(idx);
@@ -64,11 +59,6 @@ public boolean isStopped() {
     return g.trackableStatus(idx) == STOPPED;
   }
 
-//  public int type() {
-//    int idx = g.trackableIndex(id);
-//    return g.trackableType(idx);
-//  }
-
   public boolean isPlane() {
     return true;
   }

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

@@ -1,6 +1,8 @@
 package processing.ar;
 
 import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.Set;
 
@@ -10,9 +12,9 @@ public class Tracker implements PAR {
   protected PApplet p;
   protected PGraphicsAR g;
 
-  private Method trackableEventMethod;
-
   private HashMap<String, Trackable> trackables = new HashMap<String, Trackable>();
+  private ArrayList<Anchor> toRemove = new ArrayList<Anchor>();
+  private Method trackableEventMethod;
 
   public Tracker(PApplet parent) {
     this.p = parent;
@@ -60,6 +62,17 @@ protected void create(int idx) {
     }
   }
 
+  public void clearAnchors(Collection<Anchor> anchors) {
+    for (Anchor anchor : anchors) {
+      if (anchor.isStopped() || anchor.isDisposed()) {
+        anchor.dispose();
+        toRemove.add(anchor);
+      }
+    }
+    anchors.removeAll(toRemove);
+    toRemove.clear();
+  }
+
   protected void cleanup() {
     // Remove any inactive trackables left over in the tracker.
     Set<String> ids = trackables.keySet();