refactor/cleanup

Author: codeanticode

mode/libraries/ar/src/assets/shaders/obj_fragment.glsl

@@ -25,75 +25,111 @@
 import android.view.SurfaceHolder;
 
 import processing.android.AppComponent;
-import processing.core.PApplet;
-import processing.core.PMatrix3D;
+import processing.core.PGraphics;
 import processing.core.PSurface;
 import processing.opengl.PGL;
 import processing.opengl.PGLES;
 import processing.opengl.PGraphics3D;
 import processing.opengl.PGraphicsOpenGL;
 
-import static processing.ar.PSurfaceAR.mainPose;
-import static processing.ar.PSurfaceAR.session;
-
 public class PGraphicsAR extends PGraphics3D {
+  // Convenience reference to the AR surface. It is the same object one gets from PApplet.getSurface().
+  protected PSurfaceAR surfar;
+
 
   public PGraphicsAR() {
   }
 
+
   @Override
-  public PSurface createSurface(AppComponent appComponent, SurfaceHolder surfaceHolder, boolean b) {
-    if (b) pgl.resetFBOLayer();
-    return new PSurfaceAR(this, appComponent, surfaceHolder);
+  public PSurface createSurface(AppComponent appComponent, SurfaceHolder surfaceHolder, boolean reset) {
+    if (reset) pgl.resetFBOLayer();
+    surfar = new PSurfaceAR(this, appComponent, surfaceHolder);
+    return surfar;
   }
 
+
   @Override
   protected PGL createPGL(PGraphicsOpenGL pGraphicsOpenGL) {
     return new PGLES(pGraphicsOpenGL);
   }
 
+
   @Override
   public void beginDraw() {
     super.beginDraw();
-    updateInferences();
+    updateView();
   }
 
+
   @Override
   protected void backgroundImpl() {
-    if (session != null) {
-      PSurfaceAR.performRendering();
-    }
+    surfar.performRendering();
+  }
+
+
+  @Override
+  public void camera(float eyeX, float eyeY, float eyeZ,
+                     float centerX, float centerY, float centerZ,
+                     float upX, float upY, float upZ) {
+    PGraphics.showWarning("The camera cannot be set in AR");
   }
 
+
   @Override
-  public void surfaceChanged() {
+  public void perspective(float fov, float aspect, float zNear, float zFar) {
+    PGraphics.showWarning("Perspective cannot be set in AR");
   }
 
-  public void updateInferences() {
-    setAR();
+
+  @Override
+  protected void defaultCamera() {
+    // do nothing
   }
 
-  protected void setAR() {
-    if (PSurfaceAR.projmtx != null && PSurfaceAR.viewmtx != null && PSurfaceAR.anchorMatrix != null) {
-      float[] prj = PSurfaceAR.projmtx;
-      float[] view = PSurfaceAR.viewmtx;
-      float[] anchor = PSurfaceAR.anchorMatrix;
+
+  @Override
+  protected void defaultPerspective() {
+    // do nothing
+  }
+
+
+  @Override
+  protected void saveState() {
+  }
+
+
+  @Override
+  protected void restoreState() {
+  }
+
+
+  @Override
+  protected void restoreSurface() {
+  }
+
+
+  protected void updateView() {
+    if (surfar.projmtx != null && surfar.viewmtx != null && surfar.anchorMatrix != null) {
+      float[] prj = surfar.projmtx;
+      float[] view = surfar.viewmtx;
+      float[] anchor = surfar.anchorMatrix;
 
       // Fist, set all matrices to identity
       resetProjection();
       resetMatrix();
 
       // Apply the projection matrix
       applyProjection(prj[0], prj[4], prj[8], prj[12],
-          prj[1], prj[5], prj[9], prj[13],
-          prj[2], prj[6], prj[10], prj[14],
-          prj[3], prj[7], prj[11], prj[15]);
+                      prj[1], prj[5], prj[9], prj[13],
+                      prj[2], prj[6], prj[10], prj[14],
+                      prj[3], prj[7], prj[11], prj[15]);
 
       // make modelview = view
       applyMatrix(view[0], view[4], view[8], view[12],
-          view[1], view[5], view[9], view[13],
-          view[2], view[6], view[10], view[14],
-          view[3], view[7], view[11], view[15]);
+                  view[1], view[5], view[9], view[13],
+                  view[2], view[6], view[10], view[14],
+                  view[3], view[7], view[11], view[15]);
 
       // now, modelview = view * anchor
       applyMatrix(anchor[0], anchor[4], anchor[8], anchor[12],

mode/libraries/ar/src/assets/shaders/obj_vertex.glsl

@@ -22,7 +22,6 @@
 
 package processing.ar;
 
-import android.Manifest;
 import android.app.Activity;
 import android.app.ActivityManager;
 import android.app.AlertDialog;
@@ -31,7 +30,6 @@
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.ConfigurationInfo;
-import android.content.pm.PackageManager;
 import android.content.res.AssetManager;
 import android.opengl.GLES20;
 import android.opengl.GLSurfaceView;
@@ -42,7 +40,6 @@
 
 import processing.android.AppComponent;
 import processing.ar.render.*;
-import processing.core.PApplet;
 import processing.core.PGraphics;
 import processing.opengl.PGLES;
 import processing.opengl.PGraphicsOpenGL;
@@ -58,35 +55,6 @@
 import java.util.concurrent.ArrayBlockingQueue;
 
 public class PSurfaceAR extends PSurfaceGLES {
-
-  private GLSurfaceView surfaceView;
-  protected AndroidARRenderer renderer;
-  protected PGraphicsAR par;
-
-  public static float[] anchorMatrix = new float[16];
-  public static float[] quaternionMatrix = new float[16];
-  public static ArrayBlockingQueue<MotionEvent> queuedTaps = new ArrayBlockingQueue<>(16);
-  public static ArrayList<Anchor> anchors = new ArrayList<>();
-
-  public static float[] projmtx;
-  public static float[] viewmtx;
-
-  public static float lightIntensity;
-
-  public static Session session;
-  public static Pose mainPose;
-  public static RotationHandler displayRotationHelper;
-
-  public static String PLANE_TEXTURE = "grid.png";
-  public static String OBJ_NAME = null;
-  public static String OBJ_TEX = null;
-  public static boolean PLACED = false;
-
-  public static PBackground backgroundRenderer = new PBackground();
-  public static PPlane planeRenderer = new PPlane();
-  public static PPointCloud pointCloud = new PPointCloud();
-  public static PObject virtualObject = new PObject();
-
   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";
@@ -95,11 +63,29 @@ public class PSurfaceAR extends PSurfaceGLES {
   private static String C_EXCEPT_UPDATE_SDK = "Please update ARCore";
   private static String C_EXCEPT_UPDATE_APP = "Please update this app";
   private static String C_DEVICE = "This device does not support AR";
-  private static final int CAMERA_PERMISSION_CODE = 0;
-  private static final String CAMERA_PERMISSION = Manifest.permission.CAMERA;
 
-  ProgressDialog progressdialog = new ProgressDialog(activity);
+  protected GLSurfaceView surfaceView;
+  protected AndroidARRenderer renderer;
+  protected PGraphicsAR par;
+
+  protected static float[] anchorMatrix = new float[16];
+  protected static ArrayBlockingQueue<MotionEvent> queuedTaps = new ArrayBlockingQueue<>(16);
+  protected static ArrayList<Anchor> anchors = new ArrayList<>();
 
+  protected float[] projmtx;
+  protected float[] viewmtx;
+
+  protected float lightIntensity;
+
+  protected Session session;
+  protected Pose mainPose;
+  protected RotationHandler displayRotationHelper;
+
+  protected PBackground backgroundRenderer = new PBackground();
+  protected PPlane planeRenderer = new PPlane();
+  protected PPointCloud pointCloud = new PPointCloud();
+
+  protected ProgressDialog progressdialog = new ProgressDialog(activity);
 
   public PSurfaceAR(PGraphics graphics, AppComponent appComponent, SurfaceHolder surfaceHolder) {
     super(graphics, appComponent, surfaceHolder);
@@ -186,8 +172,6 @@ public void dispose() {
   public class SurfaceViewAR extends GLSurfaceView {
     public SurfaceViewAR(Context context) {
       super(context);
-//            sketch.setup();
-//            sketch.draw();
 
       final ActivityManager activityManager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
       final ConfigurationInfo configurationInfo = activityManager.getDeviceConfigurationInfo();
@@ -244,16 +228,8 @@ public void onSurfaceCreated(GL10 gl, EGLConfig config) {
       pgl.getGL(null);
       GLES20.glClearColor(0.1f, 0.1f, 0.1f, 1.0f);
       backgroundRenderer.createOnGlThread(activity);
-      if (OBJ_NAME != null && OBJ_TEX != null) {
-        try {
-          virtualObject.createOnGlThread(activity, OBJ_NAME, OBJ_TEX);
-          virtualObject.setMaterialProperties(0.0f, 3.5f, 1.0f, 6.0f);
-        } catch (IOException e) {
-          PGraphics.showWarning("Failed to read obj file");
-        }
-      }
       try {
-        planeRenderer.createOnGlThread(activity, PLANE_TEXTURE);
+        planeRenderer.createOnGlThread(activity);
       } catch (IOException e) {
         PGraphics.showWarning("Failed to read plane texture");
       }
@@ -274,12 +250,7 @@ public void onSurfaceChanged(GL10 gl, int width, int height) {
 
     @Override
     public void onDrawFrame(GL10 gl) {
-      GLES20.glClear(GLES20.GL_COLOR_BUFFER_BIT | GLES20.GL_DEPTH_BUFFER_BIT);
-
-      if (session == null) {
-        return;
-      }
-      performRendering();
+      if (session == null) return;
 
       if (progressdialog != null) {
         for (Plane plane : session.getAllTrackables(Plane.class)) {
@@ -296,7 +267,9 @@ public void onDrawFrame(GL10 gl) {
     }
   }
 
-  public static void performRendering() {
+  public void performRendering() {
+    if (session == null) return;
+
     displayRotationHelper.updateSessionIfNeeded(session);
 
     try {
@@ -348,11 +321,6 @@ public static void performRendering() {
           continue;
         }
         anchor.getPose().toMatrix(anchorMatrix, 0);
-
-        if ((OBJ_NAME != null && OBJ_TEX != null) && PLACED) {
-          virtualObject.updateModelMatrix(anchorMatrix, scaleFactor);
-          virtualObject.draw(viewmtx, projmtx, lightIntensity);
-        }
       }
     } catch (Throwable t) {
       PGraphics.showWarning("Exception on the OpenGL thread");