some initial fixes

codeanticode · codeanticode · commit bd380309c29e · 2019-01-04T18:36:51.000+09:00
diff --git a/core/src/processing/core/PConstants.java b/core/src/processing/core/PConstants.java
@@ -50,7 +50,7 @@ public interface PConstants {
   static final String OPENGL = P3D;
   static final String STEREO = "processing.vr.PGraphicsVRStereo";
   static final String MONO = "processing.vr.PGraphicsVRMono";
-  static final String ARCORE = "processing.ar.PGraphicsARView";
+  static final String ARCORE = "processing.ar.PGraphicsAR";
 
   // The PDF and DXF renderers are not available for Android.
 
diff --git a/mode/libraries/ar/src/processing/ar/PGraphicsAR.java b/mode/libraries/ar/src/processing/ar/PGraphicsAR.java
@@ -1,5 +1,8 @@
 package processing.ar;
 
+import android.view.SurfaceHolder;
+
+import processing.android.AppComponent;
 import processing.core.PApplet;
 import processing.core.PMatrix3D;
 import processing.core.PSurface;
@@ -16,6 +19,12 @@ public class PGraphicsAR extends PGraphics3D {
     public PGraphicsAR() {
     }
 
+    @Override
+    public PSurface createSurface(AppComponent appComponent, SurfaceHolder surfaceHolder, boolean b) {
+        if (b) pgl.resetFBOLayer();
+        return new PSurfaceAR(this, appComponent, surfaceHolder);
+    }
+
     @Override
     protected PGL createPGL(PGraphicsOpenGL pGraphicsOpenGL) {
         return new PGLES(pGraphicsOpenGL);
diff --git a/mode/libraries/ar/src/processing/ar/PGraphicsARView.java b/mode/libraries/ar/src/processing/ar/PGraphicsARView.java
diff --git a/mode/libraries/ar/src/processing/ar/PSurfaceAR.java b/mode/libraries/ar/src/processing/ar/PSurfaceAR.java
@@ -88,8 +88,8 @@ public PSurfaceAR(PGraphics graphics, AppComponent appComponent, SurfaceHolder s
         displayRotationHelper = new RotationHandler(activity);
         surfaceView = new SurfaceViewAR(activity);
 
-        progressdialog.setMessage("Searching for Surfaces");
-        progressdialog.show();
+//        progressdialog.setMessage("Searching for Surfaces");
+//        progressdialog.show();
     }
 
     @Override
@@ -161,8 +161,8 @@ public void dispose() {
     public class SurfaceViewAR extends GLSurfaceView {
         public SurfaceViewAR(Context context) {
             super(context);
-            sketch.setup();
-            sketch.draw();
+//            sketch.setup();
+//            sketch.draw();
 
             final ActivityManager activityManager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
             final ConfigurationInfo configurationInfo = activityManager.getDeviceConfigurationInfo();
@@ -256,15 +256,15 @@ public void onDrawFrame(GL10 gl) {
             }
             performRendering();
 
-            if (progressdialog != null) {
-                for (Plane plane : session.getAllTrackables(Plane.class)) {
-                    if (plane.getType() == com.google.ar.core.Plane.Type.HORIZONTAL_UPWARD_FACING
-                            && plane.getTrackingState() == TrackingState.TRACKING) {
-                        progressdialog.dismiss();
-                        break;
-                    }
-                }
-            }
+//            if (progressdialog != null) {
+//                for (Plane plane : session.getAllTrackables(Plane.class)) {
+//                    if (plane.getType() == com.google.ar.core.Plane.Type.HORIZONTAL_UPWARD_FACING
+//                            && plane.getTrackingState() == TrackingState.TRACKING) {
+//                        progressdialog.dismiss();
+//                        break;
+//                    }
+//                }
+//            }
 
             sketch.calculate();
             sketch.handleDraw();
@@ -349,6 +349,11 @@ public void pauseThread() {
 
     @Override
     public void resumeThread() {
+      if (!sketch.hasPermission("android.permission.CAMERA")) {
+//        sketch.requestPermission("android.permission.CAMERA");
+        return;
+      }
+
         if (session == null) {
             String message = null;
             String exception = null;
@@ -361,6 +366,8 @@ public void resumeThread() {
                         break;
                 }
 
+
+
 //                if (!sketch.hasPermission("android.permission.CAMERA")) {
 //                  sketch.requestPermission("android.permission.CAMERA");
 //                  return;
diff --git a/studio/apps/arscene/src/main/java/arscene/Sketch.java b/studio/apps/arscene/src/main/java/arscene/Sketch.java
@@ -15,9 +15,9 @@ public void settings() {
 
   public void setup() {
     // I think this should go here but not 100% sure
-//    if (!hasPermission("android.permission.CAMERA")) {
-//      requestPermission("android.permission.CAMERA");
-//    }
+    if (!hasPermission("android.permission.CAMERA")) {
+      requestPermission("android.permission.CAMERA");
+    }
 //    sphere = createShape(SPHERE, 400);
 
     //Initialisation of AR Object
