Renaming as AR non-core library

Author: codeanticode

core/src/processing/core/PConstants.java

@@ -52,7 +52,7 @@ public interface PConstants {
   static final String STEREO = "processing.vr.PGraphicsVRStereo";
   static final String MONO = "processing.vr.PGraphicsVRMono";
   static final String VR = STEREO;
-  static final String AR = "processing.ar.PGraphicsAR";
+  static final String AR = "processing.ar.ARGraphics";
   static final String ARCORE = AR;
 
   // The PDF and DXF renderers are not available for Android.

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

@@ -7,55 +7,53 @@
 
 public class Sketch extends PApplet {
   float angle;
-  Anchor selAnchor;
-  ArrayList<Anchor> regAnchors;
-  ArrayList<Anchor> delAnchors;
+  ARAnchor touchAnchor;
+  ArrayList<ARAnchor> trackAnchors;
 
-  Tracker tracker;
+  ARTracker tracker;
 
   public void settings() {
     fullScreen(AR);
   }
 
   public void setup() {
-    tracker = new Tracker(this);
+    tracker = new ARTracker(this);
     tracker.start();
-    regAnchors = new ArrayList<Anchor>();
-    delAnchors = new ArrayList<Anchor>();
+    trackAnchors = new ArrayList<ARAnchor>();
   }
 
   public void draw() {
     // The AR Core session, frame and camera can be accessed through Processing's surface object
     // to obtain the full information about the AR scene:
-//    PSurfaceAR surface = (PSurfaceAR) getSurface();
+//    ARSurface surface = (ARSurface) getSurface();
 //    surface.camera.getPose();
 //    surface.frame.getLightEstimate();
 
     lights();
 
     if (mousePressed) {
       // Create new anchor at the current touch point
-      if (selAnchor != null) selAnchor.dispose();
-      Trackable hit = tracker.get(mouseX, mouseY);
-      if (hit != null) selAnchor = new Anchor(hit);
-      else selAnchor = null;
+      if (touchAnchor != null) touchAnchor.dispose();
+      ARTrackable hit = tracker.get(mouseX, mouseY);
+      if (hit != null) touchAnchor = new ARAnchor(hit);
+      else touchAnchor = null;
     }
 
     // Draw objects attached to each anchor
-    for (Anchor anchor : regAnchors) {
+    for (ARAnchor anchor : trackAnchors) {
       if (anchor.isTracking()) drawBox(anchor, 255, 255, 255);
 
       // It is very important to dispose anchors once they are no longer tracked.
       if (anchor.isStopped()) anchor.dispose();
     }
-    if (selAnchor != null) drawBox(selAnchor, 255, 0, 0);
+    if (touchAnchor != null) drawBox(touchAnchor, 255, 0, 0);
 
     // Conveniency function in the tracker object to remove disposed anchors from a list
-    tracker.clearAnchors(regAnchors);
+    tracker.clearAnchors(trackAnchors);
 
     // Draw trackable planes
     for (int i = 0; i < tracker.count(); i++) {
-      Trackable trackable = tracker.get(i);
+      ARTrackable trackable = tracker.get(i);
       if (!trackable.isTracking()) continue;
 
       pushMatrix();
@@ -79,16 +77,16 @@ public void draw() {
     angle += 0.1;
   }
 
-  public void drawBox(Anchor anchor, int r, int g, int b) {
+  public void drawBox(ARAnchor anchor, int r, int g, int b) {
     anchor.attach();
     fill(r, g, b);
     rotateY(angle);
     box(0.15f);
     anchor.detach();
   }
 
-  public void trackableEvent(Trackable t) {
-    if (regAnchors.size() < 10) {
+  public void trackableEvent(ARTrackable t) {
+    if (trackAnchors.size() < 10) {
       float x0 = 0, y0 = 0;
       if (t.isWallPlane()) {
         // The new trackable is a wall, so adding the anchor 0.3 meters to its side
@@ -100,7 +98,7 @@ public void trackableEvent(Trackable t) {
         // The new trackable is a floor plane, so adding the anchor 0.3 meters below it
         y0 = -0.3f;
       }
-      regAnchors.add(new Anchor(t, x0, y0, 0));
+      trackAnchors.add(new ARAnchor(t, x0, y0, 0));
     }
   }
 }

mode/libraries/ar/src/processing/ar/Anchor.java renamed to mode/libraries/ar/src/processing/ar/ARAnchor.java

@@ -24,21 +24,21 @@
 
 import processing.core.PMatrix3D;
 
-public class Anchor {
-  protected PGraphicsAR g;
+public class ARAnchor {
+  protected ARGraphics g;
   private boolean disposed = false;
 
   private int id;
   private PMatrix3D m;
 
-  public Anchor(Trackable trackable, float x, float y, float z) {
+  public ARAnchor(ARTrackable 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(Trackable trackable) {
+  public ARAnchor(ARTrackable trackable) {
     this.g = trackable.g;
     id = g.createAnchor(trackable.hit);
     trackable.hit = null;
@@ -70,15 +70,15 @@ public void detach() {
   }
 
   public boolean isTracking() {
-    return g.anchorStatus(id) == PGraphicsAR.TRACKING;
+    return g.anchorStatus(id) == ARGraphics.TRACKING;
   }
 
   public boolean isPaused() {
-    return g.anchorStatus(id) == PGraphicsAR.PAUSED;
+    return g.anchorStatus(id) == ARGraphics.PAUSED;
   }
 
   public boolean isStopped() {
-    return g.anchorStatus(id) == PGraphicsAR.STOPPED;
+    return g.anchorStatus(id) == ARGraphics.STOPPED;
   }
 
   public boolean isDisposed() {

mode/libraries/ar/src/processing/ar/PGraphicsAR.java renamed to mode/libraries/ar/src/processing/ar/ARGraphics.java

@@ -47,7 +47,7 @@
 import processing.opengl.PGraphicsOpenGL;
 import processing.opengl.PShader;
 
-public class PGraphicsAR extends PGraphics3D {
+public class ARGraphics extends PGraphics3D {
   static protected final int UNKNOWN       = -1;
 
   static protected final int PLANE_FLOOR   = 0;
@@ -60,7 +60,7 @@ public class PGraphicsAR extends PGraphics3D {
   static protected final int STOPPED   = 2;
 
   // Convenience reference to the AR surface. It is the same object one gets from PApplet.getSurface().
-  protected PSurfaceAR surfar;
+  protected ARSurface surfar;
 
   protected BackgroundRenderer backgroundRenderer;
 
@@ -69,7 +69,7 @@ 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<ARTracker> trackers = new ArrayList<ARTracker>();
   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>();
@@ -98,18 +98,18 @@ public class PGraphicsAR extends PGraphics3D {
   protected PShader arLightShader;
   protected PShader arTexlightShader;
 
-  public PGraphicsAR() {
+  public ARGraphics() {
   }
 
 
-  static processing.ar.Trackable[] getTrackables() {
+  static ARTrackable[] getTrackables() {
     return null;
   }
 
   @Override
   public PSurface createSurface(AppComponent appComponent, SurfaceHolder surfaceHolder, boolean reset) {
     if (reset) pgl.resetFBOLayer();
-    surfar = new PSurfaceAR(this, appComponent, surfaceHolder);
+    surfar = new ARSurface(this, appComponent, surfaceHolder);
     return surfar;
   }
 
@@ -199,12 +199,12 @@ protected void updateView() {
   }
 
 
-  public void addTracker(Tracker tracker) {
+  public void addTracker(ARTracker tracker) {
     trackers.add(tracker);
   }
 
 
-  public void removeTracker(Tracker tracker) {
+  public void removeTracker(ARTracker tracker) {
     trackers.remove(tracker);
   }
 
@@ -303,6 +303,17 @@ public float[] getTrackablePolygon(int i, float[] points) {
   }
 
 
+  public float getTrackableExtentX(int i) {
+    Plane plane = trackPlanes.get(i);
+    return plane.getExtentX();
+  }
+
+
+  public float getTrackableExtentZ(int i) {
+    Plane plane = trackPlanes.get(i);
+    return plane.getExtentZ();
+  }
+
   public PMatrix3D getTrackableMatrix(int i) {
     return getTrackableMatrix(i, null);
   }
@@ -454,7 +465,7 @@ protected void updateTrackables() {
         trackMatrices.remove(plane);
         int pid = trackIds.remove(plane);
         trackIdx.remove(pid);
-        for (Tracker t: trackers) t.remove(pid);
+        for (ARTracker t: trackers) t.remove(pid);
       }
     }
 
@@ -464,7 +475,7 @@ protected void updateTrackables() {
       int pid = trackIds.get(plane);
       trackIdx.put(pid, i);
       if (newPlanes.contains(plane)) {
-        for (Tracker t: trackers) t.create(i);
+        for (ARTracker t: trackers) t.create(i);
       }
     }
   }

mode/libraries/ar/src/processing/ar/PSurfaceAR.java renamed to mode/libraries/ar/src/processing/ar/ARSurface.java

@@ -49,7 +49,7 @@
 import java.io.File;
 import java.io.InputStream;
 
-public class PSurfaceAR extends PSurfaceGLES {
+public class ARSurface extends PSurfaceGLES {
   private static String T_ALERT_MESSAGE = "ALERT";
   private static String C_NOT_SUPPORTED = "ARCore SDK required to run this app type";
   private static String T_PROMPT_MESSAGE = "PROMPT";
@@ -66,18 +66,18 @@ public class PSurfaceAR extends PSurfaceGLES {
 
   protected GLSurfaceView surfaceView;
   protected AndroidARRenderer renderer;
-  protected PGraphicsAR par;
+  protected ARGraphics par;
 
   protected RotationHandler displayRotationHelper;
 
-  public PSurfaceAR(PGraphics graphics, AppComponent appComponent, SurfaceHolder surfaceHolder) {
+  public ARSurface(PGraphics graphics, AppComponent appComponent, SurfaceHolder surfaceHolder) {
     super(graphics, appComponent, surfaceHolder);
     this.sketch = graphics.parent;
     this.graphics = graphics;
     this.component = appComponent;
     this.pgl = (PGLES) ((PGraphicsOpenGL) graphics).pgl;
 
-    par = (PGraphicsAR) graphics;
+    par = (ARGraphics) graphics;
 
     displayRotationHelper = new RotationHandler(activity);
     surfaceView = new SurfaceViewAR(activity);

mode/libraries/ar/src/processing/ar/Trackable.java renamed to mode/libraries/ar/src/processing/ar/ARTrackable.java

@@ -26,15 +26,15 @@
 
 import com.google.ar.core.HitResult;
 
-public class Trackable {
-  protected PGraphicsAR g;
+public class ARTrackable {
+  protected ARGraphics g;
   protected HitResult hit;
 
   private int id;
   private PMatrix3D m;
   private float[] points;
 
-  public Trackable(PGraphicsAR g, int id) {
+  public ARTrackable(ARGraphics g, int id) {
     this.g = g;
     this.id = id;
   }
@@ -59,6 +59,24 @@ 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 boolean isSelected(int mx, int my) {
     int idx = g.trackableIndex(id);
     return g.trackableSelected(idx, mx, my);
@@ -71,17 +89,17 @@ public boolean isNew() {
 
   public boolean isTracking() {
     int idx = g.trackableIndex(id);
-    return g.trackableStatus(idx) == PGraphicsAR.TRACKING;
+    return g.trackableStatus(idx) == ARGraphics.TRACKING;
   }
 
   public boolean isPaused() {
     int idx = g.trackableIndex(id);
-    return g.trackableStatus(idx) == PGraphicsAR.PAUSED;
+    return g.trackableStatus(idx) == ARGraphics.PAUSED;
   }
 
   public boolean isStopped() {
     int idx = g.trackableIndex(id);
-    return g.trackableStatus(idx) == PGraphicsAR.STOPPED;
+    return g.trackableStatus(idx) == ARGraphics.STOPPED;
   }
 
   public boolean isPlane() {
@@ -94,16 +112,16 @@ public boolean isPointCloud() {
 
   public boolean isFloorPlane() {
     int idx = g.trackableIndex(id);
-    return g.trackableType(idx) == PGraphicsAR.PLANE_FLOOR;
+    return g.trackableType(idx) == ARGraphics.PLANE_FLOOR;
   }
 
   public boolean isCeilingPlane() {
     int idx = g.trackableIndex(id);
-    return g.trackableType(idx) == PGraphicsAR.PLANE_CEILING;
+    return g.trackableType(idx) == ARGraphics.PLANE_CEILING;
   }
 
   public boolean isWallPlane() {
     int idx = g.trackableIndex(id);
-    return g.trackableType(idx) == PGraphicsAR.PLANE_WALL;
+    return g.trackableType(idx) == ARGraphics.PLANE_WALL;
   }
 }