more selection tweaks

Author: codeanticode

core/src/processing/core/PApplet.java

@@ -9373,8 +9373,8 @@ public int trackableStatus(int i) {
     return g.trackableStatus(i);
   }
 
-  public boolean trackableSelected(int i) {
-    return g.trackableSelected(i);
+  public boolean trackableSelected(int i, int mx, int my) {
+    return g.trackableSelected(i, mx, my);
   }
 
   public float[] getTrackablePolygon(int i) {

core/src/processing/core/PGraphics.java

@@ -4253,7 +4253,7 @@ public int trackableStatus(int i) {
     return 0;
   }
 
-  public boolean trackableSelected(int i) {
+  public boolean trackableSelected(int i, int mx, int my) {
     showMissingWarning("trackableSelected");
     return false;
   }

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

@@ -46,7 +46,7 @@ public void draw() {
       getTrackableMatrix(i, mat);
       pushMatrix();
       applyMatrix(mat);
-      if (trackableSelected(i)) {
+      if (trackableSelected(i, mouseX, mouseY)) {
         fill(255, 0, 0, 100);
       } else {
         fill(255, 100);
@@ -74,6 +74,7 @@ public void draw() {
         deleteAnchor(i);
         continue;
       }
+
       int status = anchorStatus(i);
       if (status ==  PAR.PAUSED || status == PAR.STOPPED) {
         if (status == PAR.PAUSED) System.out.println("-------------> PAUSED ANCHOR " + i);

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

@@ -39,7 +39,6 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
-import java.util.concurrent.ArrayBlockingQueue;
 
 import processing.android.AppComponent;
 import processing.core.PGraphics;
@@ -62,7 +61,6 @@ public class PGraphicsAR extends PGraphics3D {
   protected float[] anchorMatrix = new float[16];
 
   protected ArrayList<Plane> trackPlanes = new ArrayList<Plane>();
-  protected ArrayList<Plane> selectedPlanes = new ArrayList<Plane>();
   protected HashMap<Plane, float[]> trackMatrices = new HashMap<Plane, float[]>();
 
   protected ArrayList<Plane> newPlanes = new ArrayList<Plane>();
@@ -217,8 +215,18 @@ public int trackableStatus(int i) {
 
 
   @Override
-  public boolean trackableSelected(int i) {
-    return selectedPlanes.contains(trackPlanes.get(i));
+  public boolean trackableSelected(int i, int mx, int my) {
+    Plane planei = trackPlanes.get(i);
+    for (HitResult hit : surfar.frame.hitTest(mx, my)) {
+      Trackable trackable = hit.getTrackable();
+      if (trackable instanceof Plane) {
+        Plane plane = (Plane)trackable;
+        if (planei == plane && plane.isPoseInPolygon(hit.getHitPose())) {
+          return true;
+        }
+      }
+    }
+    return false;
   }
 
 
@@ -372,20 +380,18 @@ protected void createBackgroundRenderer() {
     backgroundRenderer = new BackgroundRenderer(surfar.getActivity());
   }
 
-  protected void setCameraTexture(Session session) {
-    session.setCameraTextureName(backgroundRenderer.getTextureId());
+  protected void setCameraTexture() {
+    surfar.session.setCameraTextureName(backgroundRenderer.getTextureId());
   }
 
-  protected void updateMatrices(Camera camera) {
-    camera.getProjectionMatrix(projMatrix, 0, 0.1f, 100.0f);
-    camera.getViewMatrix(viewMatrix, 0);
+  protected void updateMatrices() {
+    surfar.camera.getProjectionMatrix(projMatrix, 0, 0.1f, 100.0f);
+    surfar.camera.getViewMatrix(viewMatrix, 0);
   }
 
 
-  protected void updateTrackables(Frame frame, ArrayBlockingQueue<MotionEvent> taps) {
-
-    Collection<Plane> planes = frame.getUpdatedTrackables(Plane.class);
-
+  protected void updateTrackables() {
+    Collection<Plane> planes = surfar.frame.getUpdatedTrackables(Plane.class);
     for (Plane plane: planes) {
       if (plane.getSubsumedBy() != null) continue;
       float[] mat;
@@ -412,27 +418,12 @@ protected void updateTrackables(Frame frame, ArrayBlockingQueue<MotionEvent> tap
         System.out.println("-------------> REMOVED TRACKING PLANE " + plane.hashCode());
       }
     }
-
-    // Determine selected planes using the touches array
-    TouchEvent.Pointer[] touches = parent.touches;
-    for (int i = 0; i < touches.length; i++) {
-      for (HitResult hit : frame.hitTest(touches[i].x, touches[i].y)) {
-        Trackable trackable = hit.getTrackable();
-        if (trackable instanceof Plane) {
-          Plane plane = (Plane)trackable;
-          if (trackPlanes.contains(plane) && plane.isPoseInPolygon(hit.getHitPose())) {
-            selectedPlanes.add(plane);
-          }
-        }
-      }
-    }
   }
 
 
   protected void cleanup() {
     updatedPlanes.clear();
     newPlanes.clear();
-    selectedPlanes.clear();
 
     for (Anchor anchor: delAnchors) {
       anchor.detach();

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

@@ -48,10 +48,6 @@
 
 import java.io.File;
 import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.concurrent.ArrayBlockingQueue;
 
 public class PSurfaceAR extends PSurfaceGLES {
   private static String T_ALERT_MESSAGE = "ALERT";
@@ -72,7 +68,6 @@ public class PSurfaceAR extends PSurfaceGLES {
   protected AndroidARRenderer renderer;
   protected PGraphicsAR par;
 
-  protected ArrayBlockingQueue<MotionEvent> queuedTaps = new ArrayBlockingQueue<>(16);
   protected RotationHandler displayRotationHelper;
 
   public PSurfaceAR(PGraphics graphics, AppComponent appComponent, SurfaceHolder surfaceHolder) {
@@ -232,12 +227,12 @@ public void onDrawFrame(GL10 gl) {
       displayRotationHelper.updateSessionIfNeeded(session);
       try {
 
-        par.setCameraTexture(session);
+        par.setCameraTexture();
         frame = session.update();
         camera = frame.getCamera();
 
-        if (camera.getTrackingState() == TrackingState.TRACKING) par.updateTrackables(frame, queuedTaps);
-        par.updateMatrices(camera);
+        if (camera.getTrackingState() == TrackingState.TRACKING) par.updateTrackables();
+        par.updateMatrices();
 
         sketch.calculate();
         sketch.handleDraw();