Merge pull request #486 from processing/super-fast-P2D

Merging fast-P2D branch into master

Author: codeanticode

core/src/assets/shaders/P2DFrag.glsl

@@ -0,0 +1,14 @@
+#ifdef GL_ES
+precision mediump float;
+precision mediump int;
+#endif
+
+varying vec4 vertColor;
+varying vec2 vertTexCoord;
+varying float vertTexFactor;
+
+uniform sampler2D texture;
+
+void main() {
+  gl_FragColor = mix(vertColor, vertColor * texture2D(texture, vertTexCoord), vertTexFactor);
+}

core/src/assets/shaders/P2DVert.glsl

@@ -0,0 +1,23 @@
+attribute vec3 position;
+attribute vec4 color;
+attribute vec2 texCoord;
+attribute float texFactor;
+
+varying vec4 vertColor;
+varying vec2 vertTexCoord;
+varying float vertTexFactor;
+
+uniform mat4 transform;
+uniform vec2 texScale;
+
+void main() {
+  gl_Position = transform * vec4(position, 1);
+
+  //we avoid affecting the Z component by the transform
+  //because it would mess up our depth testing
+  gl_Position.z = position.z;
+
+  vertColor = color.zyxw;
+  vertTexCoord = texCoord * texScale;
+  vertTexFactor = texFactor;
+}

core/src/processing/a2d/PGraphicsAndroid2D.java

@@ -23,6 +23,11 @@
 
 package processing.a2d;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
 import java.nio.ByteBuffer;
 import java.io.InputStream;
 import java.util.zip.GZIPInputStream;
@@ -44,6 +49,7 @@
 import android.app.Activity;
 import android.app.ActivityManager;
 import android.app.ActivityManager.MemoryInfo;
+import android.content.Context;
 import android.graphics.*;
 import android.graphics.Bitmap.Config;
 import android.graphics.Paint.Style;
@@ -122,8 +128,9 @@ public class PGraphicsAndroid2D extends PGraphics {
   //////////////////////////////////////////////////////////////
 
   /** To save the surface contents before the activity is taken to the background. */
+  private String restoreFilename;
+  private int restoreWidth, restoreHeight;
   private int restoreCount;
-  private ByteBuffer restoreBitmap;
 
   //////////////////////////////////////////////////////////////
 
@@ -184,22 +191,6 @@ public PSurface createSurface(AppComponent component, SurfaceHolder holder, bool
 
   // FRAME
 
-  /*
-  public void requestDraw() {
-	  parent.surfaceView.requestRender();
-  }
-  */
-
-//  public boolean canDraw() {
-//    return true;
-//  }
-
-
-//  @Override
-//  public void requestDraw() {
-//parent.handleDraw();
-//  }
-
   @SuppressLint("NewApi")
   protected Canvas checkCanvas() {
     if ((canvas == null || sized) && (useBitmap || !primaryGraphics)) {
@@ -221,7 +212,6 @@ protected Canvas checkCanvas() {
 
   @Override
   public void beginDraw() {
-
     canvas = checkCanvas();
 
     checkSettings();
@@ -253,6 +243,7 @@ public void endDraw() {
             try {
               holder.unlockCanvasAndPost(screen);
             } catch (IllegalStateException ex) {
+            } catch (IllegalArgumentException ex) {
             }
           }
         }
@@ -2073,10 +2064,32 @@ public void resize(int wide, int high) {
 
   @Override
   protected void saveState() {
-    if (bitmap != null) {
+    Context context = parent.getContext();
+    if (context == null || bitmap == null || parent.getSurface().getComponent().isService()) return;
+    try {
+      // Saving current width and height to avoid restoring the screen after a screen rotation
+      restoreWidth = pixelWidth;
+      restoreHeight = pixelHeight;
+
       int size = bitmap.getHeight() * bitmap.getRowBytes();
-      restoreBitmap = ByteBuffer.allocate(size);
+      ByteBuffer restoreBitmap = ByteBuffer.allocate(size);
       bitmap.copyPixelsToBuffer(restoreBitmap);
+
+      File cacheDir = context.getCacheDir();
+      File cacheFile = File.createTempFile("processing", "pixels", cacheDir);
+      restoreFilename = cacheFile.getAbsolutePath();
+      FileOutputStream stream = new FileOutputStream(cacheFile);
+      ObjectOutputStream dout = new ObjectOutputStream(stream);
+      byte[] array = new byte[size];
+      restoreBitmap.rewind();
+      restoreBitmap.get(array);
+      dout.writeObject(array);
+      dout.flush();
+      stream.getFD().sync();
+      stream.close();
+    } catch (Exception ex) {
+      PGraphics.showWarning("Could not save screen contents to cache");
+      ex.printStackTrace();
     }
   }
 
@@ -2090,17 +2103,35 @@ protected void restoreState() {
   protected void restoreSurface() {
     if (changed) {
       changed = false;
-      if (restoreBitmap != null) {
+      if (restoreFilename != null && restoreWidth == pixelWidth && restoreHeight == pixelHeight) {
         // Set the counter to 1 so the restore bitmap is drawn in the next frame.
         restoreCount = 1;
       }
     } else if (restoreCount > 0) {
       restoreCount--;
       if (restoreCount == 0) {
-        // Draw and dispose bitmap
-        restoreBitmap.rewind();
-        bitmap.copyPixelsFromBuffer(restoreBitmap);
-        restoreBitmap = null;
+        Context context = parent.getContext();
+        if (context == null) return;
+        try {
+          // Load cached bitmap and draw
+          File cacheFile = new File(restoreFilename);
+          FileInputStream inStream = new FileInputStream(cacheFile);
+          ObjectInputStream din = new ObjectInputStream(inStream);
+          byte[] array = (byte[]) din.readObject();
+          ByteBuffer restoreBitmap  = ByteBuffer.wrap(array);
+          if (restoreBitmap.capacity() == bitmap.getHeight() * bitmap.getRowBytes()) {
+            restoreBitmap.rewind();
+            bitmap.copyPixelsFromBuffer(restoreBitmap);
+          }
+          inStream.close();
+          cacheFile.delete();
+          restoreFilename = null;
+          restoreWidth = -1;
+          restoreHeight = -1;
+        } catch (Exception ex) {
+          PGraphics.showWarning("Could not restore screen contents from cache");
+          ex.printStackTrace();
+        }
       }
     }
   }

core/src/processing/a2d/PSurfaceAndroid2D.java

@@ -124,10 +124,7 @@ public void surfaceChanged(SurfaceHolder holder, int format, int iwidth, int ihe
       }
 
       sketch.surfaceChanged();
-      graphics.surfaceChanged();
-
       sketch.setSize(iwidth, iheight);
-      graphics.setSize(sketch.sketchWidth(), sketch.sketchHeight());
     }
 
     @Override

core/src/processing/android/PWallpaper.java

@@ -32,6 +32,7 @@
 import android.graphics.Point;
 import android.graphics.Rect;
 
+
 public class PWallpaper extends WallpaperService implements AppComponent {
   private Point size;
   private DisplayMetrics metrics;
@@ -119,12 +120,16 @@ public Engine onCreateEngine() {
   @Override
   public void onDestroy() {
     super.onDestroy();
-    if (engine != null) engine.onDestroy();
+
+    if (engine != null){
+      //engine.sketch = null;
+      engine.onDestroy();
+    }
   }
 
 
   public class WallpaperEngine extends Engine implements ServiceEngine {
-    private PApplet sketch;
+    PApplet sketch;
     private float xOffset, xOffsetStep;
     private float yOffset, yOffsetStep;
     private int xPixelOffset, yPixelOffset;
@@ -149,9 +154,11 @@ public void onSurfaceCreated(SurfaceHolder surfaceHolder) {
     @Override
     public void onSurfaceChanged(final SurfaceHolder holder, final int format,
                                  final int width, final int height) {
-      if (sketch != null) {
-        sketch.g.setSize(width, height);
-      }
+      // When the surface of a live wallpaper changes (eg: after a screen rotation) the same sketch
+      // continues to run (unlike the case of regular apps, where its re-created) so we need to
+      // force a reset of the renderer so the backing FBOs (in the case of the OpenGL renderers)
+      // get reinitalized with the correct size.
+      sketch.g.reset();
       super.onSurfaceChanged(holder, format, width, height);
     }
 
@@ -205,7 +212,7 @@ public void onSurfaceDestroyed(SurfaceHolder holder) {
       // surface. If you have a rendering thread that directly accesses the
       // surface, you must ensure that thread is no longer touching the Surface
       // before returning from this function.
-      super.onSurfaceDestroyed(holder);
+        super.onSurfaceDestroyed(holder);
     }
 
 

core/src/processing/android/PWatchFaceCanvas.java

@@ -47,7 +47,6 @@ public class PWatchFaceCanvas extends CanvasWatchFaceService implements AppCompo
   private DisplayMetrics metrics;
   private CanvasEngine engine;
 
-
   public void initDimensions() {
     metrics = new DisplayMetrics();
     size = new Point();
@@ -231,10 +230,8 @@ public void onVisibilityChanged(boolean visible) {
     public void onSurfaceChanged(SurfaceHolder holder, int format, int width, int height) {
       super.onSurfaceChanged(holder, format, width, height);
       if (sketch != null) {
-        sketch.displayWidth = width;
-        sketch.displayHeight = height;
-        sketch.g.setSize(sketch.sketchWidth(), sketch.sketchHeight());
         sketch.surfaceChanged();
+        sketch.setSize(width, height);
       }
     }
 

core/src/processing/android/PWatchFaceGLES.java

@@ -191,10 +191,8 @@ public void onGlContextCreated() {
     public void onGlSurfaceCreated(int width, int height) {
       super.onGlSurfaceCreated(width, height);
       if (sketch != null) {
-        sketch.displayWidth = width;
-        sketch.displayHeight = height;
-        sketch.g.setSize(sketch.sketchWidth(), sketch.sketchHeight());
         sketch.surfaceChanged();
+        sketch.setSize(width, height);
       }
     }