added getEngine() to AppComponent

Author: codeanticode

core/src/processing/a2d/PGraphicsAndroid2D.java

@@ -473,7 +473,6 @@ public void breakShape() {
   @Override
   public void endShape(int mode) {
     if (shape == POINTS && stroke && vertexCount > 0) {
-//      Matrix m = canvas.getMatrix();
       Matrix m = getMatrixImp();
       if (strokeWeight == 1 && m.isIdentity()) {
         if (screenPoint == null) {
@@ -519,15 +518,13 @@ public void endShape(int mode) {
 
   @Override
   protected void clipImpl(float x1, float y1, float x2, float y2) {
-//    canvas.save(Canvas.CLIP_SAVE_FLAG);
     canvas.clipRect(x1, y1, x2, y2);
   }
 
 
   @Override
   public void noClip() {
     canvas.clipRect(0, 0, width, height, Region.Op.REPLACE);
-//    canvas.restore();
   }
 
 

core/src/processing/android/AppComponent.java

@@ -38,6 +38,7 @@ abstract public interface AppComponent extends PConstants {
   public int getKind();
   public void setSketch(PApplet sketch);
   public PApplet getSketch();
+  public ServiceEngine getEngine();
 
   public void startActivity(Intent intent);
 

core/src/processing/android/PFragment.java

@@ -117,6 +117,10 @@ public PApplet getSketch() {
     return sketch;
   }
 
+  public ServiceEngine getEngine() {
+    return null;
+  }
+
   public void dispose() {
   }
 

core/src/processing/android/PWallpaper.java

@@ -99,7 +99,7 @@ public PApplet getSketch() {
   }
 
 
-  public Engine getEngine() {
+  public ServiceEngine getEngine() {
     return engine;
   }
 

core/src/processing/android/PWatchFaceCanvas.java

@@ -110,7 +110,7 @@ public PApplet getSketch() {
   }
 
 
-  public Engine getEngine() {
+  public ServiceEngine getEngine() {
     return engine;
   }
 

core/src/processing/android/PWatchFaceGLES.java

@@ -108,7 +108,7 @@ public PApplet getSketch() {
   }
 
 
-  public Engine getEngine() {
+  public ServiceEngine getEngine() {
     return engine;
   }
 

core/src/processing/core/PApplet.java

@@ -41,7 +41,6 @@
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.service.wallpaper.WallpaperService;
 import android.support.annotation.LayoutRes;
 import android.support.v4.content.ContextCompat;
 import android.view.LayoutInflater;
@@ -52,6 +51,7 @@
 import android.view.inputmethod.InputMethodManager;
 import processing.a2d.PGraphicsAndroid2D;
 import processing.android.AppComponent;
+import processing.android.ServiceEngine;
 import processing.data.*;
 import processing.event.*;
 import processing.opengl.*;
@@ -61,7 +61,7 @@ public class PApplet extends Object implements PConstants {
   /**
    * The surface this sketch draws to.
    */
-  public PSurface surface;
+  protected PSurface surface;
 
   /**
    * The view group containing the surface view of the PApplet.
@@ -453,12 +453,17 @@ public PSurface getSurface() {
   }
 
 
+  public Context getContext() {
+    return surface.getContext();
+  }
+
+
   public Activity getActivity() {
     return surface.getActivity();
   }
 
 
-  public WallpaperService.Engine getEngine() {
+  public ServiceEngine getEngine() {
     return surface.getEngine();
   }
 

core/src/processing/core/PSurface.java

@@ -36,8 +36,8 @@
 import android.view.SurfaceView;
 import android.view.View;
 import android.view.ViewGroup;
-import android.service.wallpaper.WallpaperService.Engine;
 import processing.android.AppComponent;
+import processing.android.ServiceEngine;
 
 /*
  * Holds the surface view associated with the sketch, and the rendering thread
@@ -47,7 +47,7 @@ public interface PSurface {
   public AppComponent getComponent();
   public Context getContext();
   public Activity getActivity();
-  public Engine getEngine();
+  public ServiceEngine getEngine();
 
   public void dispose();
 

core/src/processing/core/PSurfaceNone.java

@@ -49,6 +49,7 @@
 import processing.android.PWallpaper;
 import processing.android.PWatchFaceCanvas;
 import processing.android.PWatchFaceGLES;
+import processing.android.ServiceEngine;
 
 /**
  * Base surface for Android2D and OpenGL renderers. It includes the standard rendering loop.
@@ -99,17 +100,8 @@ public Activity getActivity() {
 
 
   @Override
-  public Engine getEngine() {
-    if (component.getKind() == AppComponent.WALLPAPER) {
-      return ((PWallpaper)component).getEngine();
-    } else if (component.getKind() == AppComponent.WATCHFACE) {
-      if (component instanceof PWatchFaceCanvas) {
-        return ((PWatchFaceCanvas)component).getEngine();
-      } else if (component instanceof PWatchFaceGLES) {
-        return ((PWatchFaceGLES)component).getEngine();
-      }
-    }
-    return null;
+  public ServiceEngine getEngine() {
+    return component.getEngine();
   }
 
 

libraries/cardboard/src/processing/cardboard/PCardboard.java

@@ -27,6 +27,7 @@
 
 import android.util.DisplayMetrics;
 import processing.android.AppComponent;
+import processing.android.ServiceEngine;
 import processing.core.PApplet;
 
 // http://pastebin.com/6wPgFYhq
@@ -86,6 +87,10 @@ public PApplet getSketch() {
     return sketch;
   }
 
+  public ServiceEngine getEngine() {
+    return null;
+  }
+
   public void init(PApplet sketch) {
     setSketch(sketch);
     if (sketch != null) {