removed PAR interface

Author: codeanticode

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

@@ -1,8 +1,30 @@
+/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
+
+/*
+  Part of the Processing project - http://processing.org
+
+  Copyright (c) 2019 The Processing Foundation
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation, version 2.1.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General
+  Public License along with this library; if not, write to the
+  Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+  Boston, MA  02111-1307  USA
+*/
+
 package processing.ar;
 
 import processing.core.PMatrix3D;
 
-public class Anchor implements PAR {
+public class Anchor {
   protected PGraphicsAR g;
   private boolean disposed = false;
 
@@ -48,15 +70,15 @@ public void detach() {
   }
 
   public boolean isTracking() {
-    return g.anchorStatus(id) == TRACKING;
+    return g.anchorStatus(id) == PGraphicsAR.TRACKING;
   }
 
   public boolean isPaused() {
-    return g.anchorStatus(id) == PAUSED;
+    return g.anchorStatus(id) == PGraphicsAR.PAUSED;
   }
 
   public boolean isStopped() {
-    return g.anchorStatus(id) == STOPPED;
+    return g.anchorStatus(id) == PGraphicsAR.STOPPED;
   }
 
   public boolean isDisposed() {

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

@@ -48,6 +48,17 @@
 import processing.opengl.PShader;
 
 public class PGraphicsAR extends PGraphics3D {
+  static protected final int UNKNOWN       = -1;
+
+  static protected final int PLANE_FLOOR   = 0;
+  static protected final int PLANE_CEILING = 1;
+  static protected final int PLANE_WALL    = 2;
+  static protected final int POINT         = 3;
+
+  static protected final int TRACKING  = 0;
+  static protected final int PAUSED    = 1;
+  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;
 
@@ -216,25 +227,25 @@ public int trackableIndex(int id) {
   public int trackableType(int i) {
     Plane plane = trackPlanes.get(i);
     if (plane.getType() == Plane.Type.HORIZONTAL_UPWARD_FACING) {
-      return PAR.PLANE_FLOOR;
+      return PLANE_FLOOR;
     } else if (plane.getType() == Plane.Type.HORIZONTAL_DOWNWARD_FACING) {
-      return PAR.PLANE_CEILING;
+      return PLANE_CEILING;
     } else if (plane.getType() == Plane.Type.VERTICAL) {
-      return PAR.PLANE_WALL;
+      return PLANE_WALL;
     }
-    return PAR.UNKNOWN;
+    return UNKNOWN;
   }
 
   public int trackableStatus(int i) {
     Plane plane = trackPlanes.get(i);
      if (plane.getTrackingState() == TrackingState.PAUSED) {
-      return PAR.PAUSED;
+      return PAUSED;
     } else if (plane.getTrackingState() == TrackingState.TRACKING) {
-      return PAR.TRACKING;
+      return TRACKING;
     } else if (plane.getTrackingState() == TrackingState.STOPPED) {
-      return PAR.STOPPED;
+      return STOPPED;
     }
-    return PAR.UNKNOWN;
+    return UNKNOWN;
   }
 
   public boolean trackableNew(int i) {
@@ -361,13 +372,13 @@ public int anchorCount() {
   public int anchorStatus(int id) {
     Anchor anchor = anchors.get(id);
     if (anchor.getTrackingState() == TrackingState.PAUSED) {
-      return PAR.PAUSED;
+      return PAUSED;
     } else if (anchor.getTrackingState() == TrackingState.TRACKING) {
-      return PAR.TRACKING;
+      return TRACKING;
     } else if (anchor.getTrackingState() == TrackingState.STOPPED) {
-      return PAR.STOPPED;
+      return STOPPED;
     }
-    return PAR.UNKNOWN;
+    return UNKNOWN;
   }
 
 

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

@@ -1,10 +1,32 @@
+/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
+
+/*
+  Part of the Processing project - http://processing.org
+
+  Copyright (c) 2019 The Processing Foundation
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation, version 2.1.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General
+  Public License along with this library; if not, write to the
+  Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+  Boston, MA  02111-1307  USA
+*/
+
 package processing.ar;
 
 import processing.core.PMatrix3D;
 
 import com.google.ar.core.HitResult;
 
-public class Trackable implements PAR {
+public class Trackable {
   protected PGraphicsAR g;
   protected HitResult hit;
 
@@ -49,17 +71,17 @@ public boolean isNew() {
 
   public boolean isTracking() {
     int idx = g.trackableIndex(id);
-    return g.trackableStatus(idx) == TRACKING;
+    return g.trackableStatus(idx) == PGraphicsAR.TRACKING;
   }
 
   public boolean isPaused() {
     int idx = g.trackableIndex(id);
-    return g.trackableStatus(idx) == PAUSED;
+    return g.trackableStatus(idx) == PGraphicsAR.PAUSED;
   }
 
   public boolean isStopped() {
     int idx = g.trackableIndex(id);
-    return g.trackableStatus(idx) == STOPPED;
+    return g.trackableStatus(idx) == PGraphicsAR.STOPPED;
   }
 
   public boolean isPlane() {
@@ -72,16 +94,16 @@ public boolean isPointCloud() {
 
   public boolean isFloorPlane() {
     int idx = g.trackableIndex(id);
-    return g.trackableType(idx) == PLANE_FLOOR;
+    return g.trackableType(idx) == PGraphicsAR.PLANE_FLOOR;
   }
 
   public boolean isCeilingPlane() {
     int idx = g.trackableIndex(id);
-    return g.trackableType(idx) == PLANE_CEILING;
+    return g.trackableType(idx) == PGraphicsAR.PLANE_CEILING;
   }
 
   public boolean isWallPlane() {
     int idx = g.trackableIndex(id);
-    return g.trackableType(idx) == PLANE_WALL;
+    return g.trackableType(idx) == PGraphicsAR.PLANE_WALL;
   }
 }

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

@@ -1,3 +1,25 @@
+/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
+
+/*
+  Part of the Processing project - http://processing.org
+
+  Copyright (c) 2019 The Processing Foundation
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation, version 2.1.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General
+  Public License along with this library; if not, write to the
+  Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+  Boston, MA  02111-1307  USA
+*/
+
 package processing.ar;
 
 import com.google.ar.core.HitResult;
@@ -10,7 +32,7 @@
 
 import processing.core.PApplet;
 
-public class Tracker implements PAR {
+public class Tracker {
   protected PApplet p;
   protected PGraphicsAR g;