project clean_up

Author: SyamSundarKirubakaran

mode/libraries/ar/examples/Cube/AndroidManifest.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:versionCode="1" android:versionName="1.0" package="">
+    <uses-sdk android:minSdkVersion="24" android:targetSdkVersion="26"/>
+    <uses-permission android:name="android.permission.CAMERA"/>
+    <uses-feature android:name="android.hardware.camera.ar" android:required="true"/>
+    <uses-feature android:glEsVersion="0x00020000" android:required="true"/>
+    <application android:allowBackup="false" android:icon="@drawable/icon" android:label="" android:theme="@style/ArActivityTheme" android:usesCleartextTraffic="false" tools:ignore="GoogleAppIndexingWarning">
+        <activity android:configChanges="orientation|screenSize" android:exported="true" android:name=".MainActivity" android:screenOrientation="locked" android:theme="@style/Theme.AppCompat.NoActionBar">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+        <meta-data android:name="com.google.ar.core" android:value="required"/>
+    </application>
+</manifest>

mode/libraries/ar/examples/Cube/Cube.pde

@@ -0,0 +1,13 @@
+import processing.ar.*;
+import processing.ar.render.*;
+PShape cube;
+public void setup() {
+    fullScreen(AR);
+    cube = createShape(BOX, 0.25f);
+}
+public void draw() {
+    lights();
+    background(0);
+    PPlane.setPlaneColor(0x00BCD4FF);
+    shape(cube);
+}

mode/libraries/ar/examples/Cube/code/sketch.properties

@@ -0,0 +1 @@
+component=ar

mode/libraries/ar/examples/Cube/sketch.properties

@@ -0,0 +1,2 @@
+mode=Android
+mode.id=processing.mode.android.AndroidMode

mode/libraries/ar/examples/Sphere/Sphere.pde

@@ -3,7 +3,7 @@ import processing.ar.render.*;
 PShape sphere;
 public void setup() {
     fullScreen(AR);
-    sphere = createShape(SPHERE, 400);
+    sphere = createShape(SPHERE, 0.25f);
 }
 public void draw() {
     lights();

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

@@ -13,37 +13,29 @@
 
 public class PGraphicsAR extends PGraphics3D {
 
-    PMatrix3D modelViewMatrix;
-    PMatrix3D projectionMatrix;
-    PMatrix3D projModelMatrix;
-
     public PGraphicsAR() {
     }
 
     @Override
     protected PGL createPGL(PGraphicsOpenGL pGraphicsOpenGL) {
-        PGraphicsAR.showWarning("Graphics: Creation");
         return new PGLES(pGraphicsOpenGL);
     }
 
     @Override
     public void beginDraw() {
         super.beginDraw();
         updateInferences();
-        PGraphicsAR.showWarning("Graphics: BeginDraw()");
     }
 
     @Override
     protected void backgroundImpl() {
         if (session != null) {
             PSurfaceAR.performRendering();
         }
-        PGraphicsAR.showWarning("Graphics: background()");
     }
 
     @Override
     public void surfaceChanged() {
-        PGraphicsAR.showWarning("Graphics: surfaceChanged()");
     }
 
     public void updateInferences(){
@@ -52,15 +44,10 @@ public void updateInferences(){
 
     protected void setAR() {
         if (PSurfaceAR.projmtx != null && PSurfaceAR.viewmtx != null && PSurfaceAR.anchorMatrix != null) {
-//        if(PSurfaceAR.viewmtx != null) {
             float[] prj = PSurfaceAR.projmtx;
             float[] view = PSurfaceAR.viewmtx;
             float[] anchor = PSurfaceAR.anchorMatrix;
 
-            PApplet.println("Applying AR transformations");
-
-            // ARCore are column-major, so the following indexing is correct:
-
             // Fist, set all matrices to identity
             resetProjection();
             resetMatrix();
@@ -83,78 +70,6 @@ protected void setAR() {
                         anchor[2], anchor[6], anchor[10], anchor[14],
                         anchor[3], anchor[7], anchor[11], anchor[15]);
 
-
-
-
-            /*
-            // Testing row-major order, just in case...
-            applyProjection(prj[0], prj[1], prj[2], prj[3],
-                            prj[4], prj[5], prj[6], prj[7],
-                            prj[8], prj[9], prj[10], prj[11],
-                            prj[12], prj[13], prj[14], prj[15]);
-            applyMatrix(view[0], view[1], view[2], view[3],
-                        view[4], view[5], view[6], view[7],
-                        view[8], view[9], view[10], view[11],
-                        view[12], view[13], view[14], view[15]);
-            applyMatrix(anchor[0], anchor[1], anchor[2], anchor[3],
-                        anchor[4], anchor[5], anchor[6], anchor[7],
-                        anchor[8], anchor[9], anchor[10], anchor[11],
-                        anchor[12], anchor[13], anchor[14], anchor[15]);
-*/
-
-            PApplet.println("Anchor matrix: ", anchor[0], anchor[4], anchor[8], anchor[12],
-                anchor[1], anchor[5], anchor[9], anchor[13],
-                anchor[2], anchor[6], anchor[10], anchor[14],
-                anchor[3], anchor[7], anchor[11], anchor[15]);
-
-
-
-
-            /*
-            modelview.set(PSurfaceAR.viewmtx[0], PSurfaceAR.viewmtx[4], PSurfaceAR.viewmtx[8], PSurfaceAR.viewmtx[12],
-                    PSurfaceAR.viewmtx[1], PSurfaceAR.viewmtx[5], PSurfaceAR.viewmtx[9], PSurfaceAR.viewmtx[13],
-                    PSurfaceAR.viewmtx[2], PSurfaceAR.viewmtx[6], PSurfaceAR.viewmtx[10], PSurfaceAR.viewmtx[14],
-                    PSurfaceAR.viewmtx[3], PSurfaceAR.viewmtx[7], PSurfaceAR.viewmtx[11], PSurfaceAR.viewmtx[15]);
-
-            modelViewMatrix = modelview.get();
-            projModelMatrix = projmodelview.get();
-            projectionMatrix = projection.get();
-
-            float tx = -defCameraX + mainPose.tx();
-            float ty = -defCameraY + mainPose.ty();
-            float tz = -defCameraZ + mainPose.tz();
-            modelview.translate(tx, ty, tz);
-
-            camera.set(modelViewMatrix);
-            updateProjmodelview();
-*/
-
-
-           /*
-           virtualObject.updateModelMatrix(anchorMatrix, scaleFactor);
-           updateModelMatrix(float[] modelMatrix, float scaleFactor)
-
-        float[] scaleMatrix = new float[16];
-        Matrix.setIdentityM(scaleMatrix, 0);
-        scaleMatrix[0] = scaleFactor;
-        scaleMatrix[5] = scaleFactor;
-        scaleMatrix[10] = scaleFactor;
-        Matrix.multiplyMM(this.modelMatrix, 0, modelMatrix, 0, scaleMatrix, 0);
-
-            */
-
-/*
-            virtualObject.draw(viewmtx, projmtx, lightIntensity);
-            draw(float[] cameraView, float[] cameraPerspective, float lightIntensity)
-        Matrix.multiplyMM(modelViewMatrix, 0, cameraView, 0, modelMatrix, 0);
-        Matrix.multiplyMM(modelViewProjectionMatrix, 0, cameraPerspective, 0, modelViewMatrix, 0);
-
-
-  */
-
         }
-//        PGraphicsAR.showWarning("Graphics: ARCamera()");
-//        PGraphicsAR.showWarning("MV === "+modelViewMatrix+"\nPMM === "+projModelMatrix+"\nPM === "+projectionMatrix+"\n");
-//        PGraphicsAR.showWarning("+++ "+PSurfaceAR.viewmtx);
     }
 }

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

@@ -9,7 +9,6 @@ public class PGraphicsARView extends PGraphicsAR {
     @Override
     public PSurface createSurface(AppComponent appComponent, SurfaceHolder surfaceHolder, boolean b) {
         if (b) pgl.resetFBOLayer();
-        PGraphics.showWarning("Reached - 1");
         return new PSurfaceAR(this, appComponent, surfaceHolder);
     }
 }

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

@@ -87,33 +87,28 @@ public PSurfaceAR(PGraphics graphics, AppComponent appComponent, SurfaceHolder s
 
         displayRotationHelper = new RotationHandler(activity);
         surfaceView = new SurfaceViewAR(activity);
-        PGraphics.showWarning("Reached - 2");
 
         progressdialog.setMessage("Searching for Surfaces");
         progressdialog.show();
     }
 
     @Override
     public Context getContext() {
-        PGraphics.showWarning("Reached - 5");
         return activity;
     }
 
     @Override
     public void finish() {
-        PGraphics.showWarning("Reached - 6");
         sketch.getActivity().finish();
     }
 
     @Override
     public AssetManager getAssets() {
-        PGraphics.showWarning("Reached - 7");
         return sketch.getContext().getAssets();
     }
 
     @Override
     public void startActivity(Intent intent) {
-        PGraphics.showWarning("Reached - 8");
         sketch.getContext().startActivity(intent);
     }
 
@@ -132,41 +127,34 @@ public void initView(int sketchWidth, int sketchHeight) {
         window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
 
         window.setContentView(surfaceView);
-        PGraphics.showWarning("Reached - 9");
     }
 
     @Override
     public String getName() {
-        PGraphics.showWarning("Reached - 10");
         return sketch.getActivity().getComponentName().getPackageName();
     }
 
     @Override
     public void setOrientation(int which) {
-        PGraphics.showWarning("Reached - 11");
     }
 
     @Override
     public File getFilesDir() {
-        PGraphics.showWarning("Reached - 12");
         return sketch.getActivity().getFilesDir();
     }
 
     @Override
     public InputStream openFileInput(String filename) {
-        PGraphics.showWarning("Reached - 13");
         return null;
     }
 
     @Override
     public File getFileStreamPath(String path) {
-        PGraphics.showWarning("Reached - 14");
         return sketch.getActivity().getFileStreamPath(path);
     }
 
     @Override
     public void dispose() {
-        PGraphics.showWarning("Reached - 15");
     }
 
 
@@ -175,7 +163,6 @@ public SurfaceViewAR(Context context) {
             super(context);
             sketch.setup();
             sketch.draw();
-            PGraphics.showWarning("Reached - 4");
 
             final ActivityManager activityManager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
             final ConfigurationInfo configurationInfo = activityManager.getDeviceConfigurationInfo();
@@ -200,7 +187,6 @@ public SurfaceViewAR(Context context) {
         @Override
         public boolean onTouchEvent(MotionEvent event) {
             queuedTaps.offer(event);
-            PGraphics.showWarning("Reached - onTouchEvent()");
             return sketch.surfaceTouchEvent(event);
         }
 
@@ -226,13 +212,11 @@ public AndroidARRenderer getARRenderer() {
 
     protected class AndroidARRenderer implements GLSurfaceView.Renderer {
         public AndroidARRenderer() {
-            PGraphics.showWarning("Reached - 3");
         }
 
         @Override
         public void onSurfaceCreated(GL10 gl, EGLConfig config) {
             pgl.getGL(null);
-            PGraphics.showWarning("Reached - 16");
             GLES20.glClearColor(0.1f, 0.1f, 0.1f, 1.0f);
             backgroundRenderer.createOnGlThread(activity);
             if(OBJ_NAME != null && OBJ_TEX != null) {
@@ -245,17 +229,14 @@ public void onSurfaceCreated(GL10 gl, EGLConfig config) {
             }
             try {
                 planeRenderer.createOnGlThread(activity, PLANE_TEXTURE);
-                PGraphics.showWarning("Reached - 22"+" ===== "+PLANE_TEXTURE);
             } catch (IOException e) {
                 PGraphics.showWarning("Failed to read plane texture");
-                PGraphics.showWarning("Reached - 23");
             }
             pointCloud.createOnGlThread(activity);
         }
 
         @Override
         public void onSurfaceChanged(GL10 gl, int width, int height) {
-            PGraphics.showWarning("Reached - 20");
             displayRotationHelper.onSurfaceChanged(width, height);
             GLES20.glViewport(0, 0, width, height);
 
@@ -268,7 +249,6 @@ public void onSurfaceChanged(GL10 gl, int width, int height) {
 
         @Override
         public void onDrawFrame(GL10 gl) {
-            PGraphics.showWarning("Reached - 21");
             GLES20.glClear(GLES20.GL_COLOR_BUFFER_BIT | GLES20.GL_DEPTH_BUFFER_BIT);
 
             if (session == null) {
@@ -327,9 +307,6 @@ public static void performRendering(){
             viewmtx = new float[16];
             camera.getViewMatrix(viewmtx, 0);
             lightIntensity = frame.getLightEstimate().getPixelIntensity();
-//                for(int i=0;i<16;i++){
-//                    PGraphics.showWarning(i+") Proj value: "+projmtx[i]+"\n"+i+") View mat: "+viewmtx[i]+"\n");
-//                }
             PointCloud foundPointCloud = frame.acquirePointCloud();
             pointCloud.update(foundPointCloud);
             pointCloud.draw(viewmtx, projmtx);
@@ -352,22 +329,17 @@ public static void performRendering(){
                     virtualObject.draw(viewmtx, projmtx, lightIntensity);
                 }
             }
-
-            PGraphics.showWarning("Reached - 24");
         } catch (Throwable t) {
             PGraphics.showWarning("Exception on the OpenGL thread");
-            PGraphics.showWarning("Reached - 25");
         }
     }
 
     @Override
     public void startThread() {
-        PGraphics.showWarning("Reached - 17");
     }
 
     @Override
     public void pauseThread() {
-        PGraphics.showWarning("Reached - 18");
         if (session != null) {
             displayRotationHelper.onPause();
             surfaceView.onPause();
@@ -377,7 +349,6 @@ public void pauseThread() {
 
     @Override
     public void resumeThread() {
-        PGraphics.showWarning("Reached - 19");
         if (session == null) {
             String message = null;
             String exception = null;

mode/libraries/ar/src/processing/ar/render/PObject.java

@@ -253,12 +253,10 @@ private static void normalizeVec3(float[] v) {
     public void load(String obj_name,String obj_texture){
         OBJ_NAME = obj_name;
         OBJ_TEX = obj_texture;
-        PGraphics.showWarning("Object LOAD reached ========= "+OBJ_NAME+" ======== "+OBJ_TEX);
     }
 
     public void place(){
         PLACED = true;
-        PGraphics.showWarning("Object place() command received");
     }
 
 }

mode/libraries/ar/src/processing/ar/render/PPlane.java

@@ -314,10 +314,7 @@ public int compare(SortablePlane a, SortablePlane b) {
                 planeIndexMap.put(plane, planeIndex);
             }
 
-//            setPlaneColor(0xFFFFFFFF);
-
             colorRgbaToFloat(planeColor, colorValue);
-            PGraphics.showWarning("Value assigned Max effort");
             GLES20.glUniform4fv(lineColorUniform, 1, planeColor, 0);
             GLES20.glUniform4fv(dotColorUniform, 1, planeColor, 0);
 
@@ -350,12 +347,10 @@ private static void colorRgbaToFloat(float[] planeColor, int colorRgba) {
 
     public static void setPlaneColor(int color){
         colorValue = color;
-        PGraphics.showWarning("Value assigned");
     }
 
     public static void setPlaneTexture(String planeTexture){
         PLANE_TEXTURE = planeTexture;
-        PGraphics.showWarning("Texture assigned ======= "+PLANE_TEXTURE);
     }
 
 }