Merge remote-tracking branch 'origin/master'

Author: imilka

core/src/processing/core/PApplet.java

@@ -425,6 +425,7 @@ static public class RendererChangeException extends RuntimeException { }
 
 
   /** Called with the activity is first created. */
+  @SuppressWarnings("unchecked")
   @Override
   public void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
@@ -467,11 +468,32 @@ public void onCreate(Bundle savedInstanceState) {
     int sw = sketchWidth();
     int sh = sketchHeight();
 
-    if (sketchRenderer().equals(JAVA2D)) {
-      surfaceView = new SketchSurfaceView(this, sw, sh);
-    } else if (sketchRenderer().equals(P2D) || sketchRenderer().equals(P3D)) {
-      surfaceView = new SketchSurfaceViewGL(this, sw, sh, sketchRenderer().equals(P3D));
+    // Get renderer name and class
+    String rendererName = sketchRenderer();
+    Class<?> rendererClass = null;
+    try {
+      rendererClass = Class.forName(rendererName);
+    } catch (ClassNotFoundException exception) {
+      String message = String.format(
+        "Error: Could not resolve renderer class name: %s", rendererName);
+      throw new RuntimeException(message, exception);
+    }
+
+    if (rendererName.equals(JAVA2D)) {
+      // JAVA2D renderer
+      surfaceView = new SketchSurfaceView(this, sw, sh,
+        (Class<? extends PGraphicsAndroid2D>) rendererClass);
+    } else if (PGraphicsOpenGL.class.isAssignableFrom(rendererClass)) {
+      // P2D, P3D, and any other PGraphicsOpenGL-based renderer
+      surfaceView = new SketchSurfaceViewGL(this, sw, sh,
+        (Class<? extends PGraphicsOpenGL>) rendererClass);
+    } else {
+      // Anything else
+      String message = String.format(
+        "Error: Unsupported renderer class: %s", rendererName);
+      throw new RuntimeException(message);
     }
+
 //    g = ((SketchSurfaceView) surfaceView).getGraphics();
 
 //    surfaceView.setLayoutParams(new LayoutParams(sketchWidth(), sketchHeight()));
@@ -677,13 +699,15 @@ public SurfaceView getSurfaceView() {
   // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 
 
-  public class SketchSurfaceView extends SurfaceView
-  implements /*SketchSurfaceView,*/ SurfaceHolder.Callback {
+  public class SketchSurfaceView extends SurfaceView implements
+    SurfaceHolder.Callback {
+
     PGraphicsAndroid2D g2;
     SurfaceHolder surfaceHolder;
 
 
-    public SketchSurfaceView(Context context, int wide, int high) {
+    public SketchSurfaceView(Context context, int wide, int high,
+                             Class<? extends PGraphicsAndroid2D> clazz) {
       super(context);
 
 //      println("surface holder");
@@ -694,7 +718,20 @@ public SketchSurfaceView(Context context, int wide, int high) {
       surfaceHolder.setType(SurfaceHolder.SURFACE_TYPE_GPU);
 
 //      println("creating graphics");
-      g2 = new PGraphicsAndroid2D();
+      if (clazz.equals(PGraphicsAndroid2D.class)) {
+        g2 = new PGraphicsAndroid2D();
+      } else {
+        try {
+          Constructor<? extends PGraphicsAndroid2D> constructor =
+            clazz.getConstructor();
+          g2 = constructor.newInstance();
+        } catch (Exception exception) {
+          throw new RuntimeException(
+            "Error: Failed to initialize custom Android2D renderer",
+            exception);
+        }
+      }
+
       // Set semi-arbitrary size; will be set properly when surfaceChanged() called
       g2.setSize(wide, high);
 //      newGraphics.setSize(getWidth(), getHeight());
@@ -779,12 +816,13 @@ public boolean onKeyUp(int code, android.view.KeyEvent event) {
   // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 
 
-  public class SketchSurfaceViewGL extends GLSurfaceView /*implements SketchSurfaceView*/ {
+  public class SketchSurfaceViewGL extends GLSurfaceView {
     PGraphicsOpenGL g3;
     SurfaceHolder surfaceHolder;
 
 
-    public SketchSurfaceViewGL(Context context, int wide, int high, boolean is3D) {
+    public SketchSurfaceViewGL(Context context, int wide, int high,
+                               Class<? extends PGraphicsOpenGL> clazz) {
       super(context);
 
       // Check if the system supports OpenGL ES 2.0.
@@ -805,11 +843,24 @@ public SketchSurfaceViewGL(Context context, int wide, int high, boolean is3D) {
       // null. This is required because PApplet.onResume events (which call
       // this.onResume() and thus require a valid renderer) are triggered
       // before surfaceChanged() is ever called.
-      if (is3D) {
-        g3 = new PGraphics3D();
-      } else {
+
+      if (clazz.equals(PGraphics2D.class)) { // P2D
         g3 = new PGraphics2D();
+      } else if (clazz.equals(PGraphics3D.class)) { // P3D
+        g3 = new PGraphics3D();
+      } else { // something that extends P2D, P3D, or PGraphicsOpenGL
+        try {
+          Constructor<? extends PGraphicsOpenGL> constructor =
+            clazz.getConstructor();
+          g3 = constructor.newInstance();
+        } catch (Exception exception) {
+          throw new RuntimeException(
+            "Error: Failed to initialize custom OpenGL renderer",
+            exception);
+        }
       }
+
+      //set it up
       g3.setParent(PApplet.this);
       g3.setPrimary(true);
       // Set semi-arbitrary size; will be set properly when surfaceChanged() called
@@ -818,8 +869,9 @@ public SketchSurfaceViewGL(Context context, int wide, int high, boolean is3D) {
       // Tells the default EGLContextFactory and EGLConfigChooser to create an GLES2 context.
       setEGLContextClientVersion(2);
 
-      if (PGLES.ENABLE_MULTISAMPLING) {
-        setEGLConfigChooser(((PGLES)g3.pgl).getConfigChooser());
+      int quality = sketchQuality();
+      if (1 < quality) {
+        setEGLConfigChooser(((PGLES)g3.pgl).getConfigChooser(quality));
       }
 
       // The renderer can be set only once.

core/src/processing/core/PGraphicsAndroid2D.java

@@ -26,6 +26,8 @@
 import java.util.zip.GZIPInputStream;
 
 import processing.data.XML;
+import android.app.ActivityManager;
+import android.app.ActivityManager.MemoryInfo;
 import android.graphics.*;
 import android.graphics.Bitmap.Config;
 import android.graphics.Paint.Style;
@@ -135,6 +137,7 @@ public void setSize(int iwidth, int iheight) {  // ignore
 
   @Override
   protected void allocate() {
+    if (bitmap != null) bitmap.recycle();
     bitmap = Bitmap.createBitmap(width, height, Config.ARGB_8888);
     canvas = new Canvas(bitmap);
 //    image = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB);
@@ -996,6 +999,10 @@ public void noSmooth() {
   protected void imageImpl(PImage src,
                            float x1, float y1, float x2, float y2,
                            int u1, int v1, int u2, int v2) {
+    if (src.bitmap != null && src.bitmap.isRecycled()) {
+      // Let's make sure it is recreated
+      src.bitmap = null;
+    }
 
     if (src.bitmap == null && src.format == ALPHA) {
       // create an alpha bitmap for this feller
@@ -1019,15 +1026,19 @@ protected void imageImpl(PImage src,
     if (src.bitmap == null ||
         src.width != src.bitmap.getWidth() ||
         src.height != src.bitmap.getHeight()) {
+      if (src.bitmap != null) src.bitmap.recycle();
       src.bitmap = Bitmap.createBitmap(src.width, src.height, Config.ARGB_8888);
       src.modified = true;
     }
     if (src.modified) {
       //System.out.println("mutable, recycled = " + who.bitmap.isMutable() + ", " + who.bitmap.isRecycled());
       if (!src.bitmap.isMutable()) {
+        src.bitmap.recycle();
         src.bitmap = Bitmap.createBitmap(src.width, src.height, Config.ARGB_8888);
       }
-      src.bitmap.setPixels(src.pixels, 0, src.width, 0, 0, src.width, src.height);
+      if (src.pixels != null) {
+        src.bitmap.setPixels(src.pixels, 0, src.width, 0, 0, src.width, src.height);
+      }
       src.modified = false;
     }
 
@@ -1043,6 +1054,17 @@ protected void imageImpl(PImage src,
     //canvas.drawBitmap(who.bitmap, imageImplSrcRect, imageImplDstRect, fillPaint);
     //      System.out.println("drawing lower, tint = " + tint + " " + PApplet.hex(tintPaint.getColor()));
     canvas.drawBitmap(src.bitmap, imageImplSrcRect, imageImplDstRect, tint ? tintPaint : null);
+
+    // If the OS things the memory is low, then recycles bitmaps automatically...
+    // but I don't think it is particularly efficient, as the bitmaps are stored
+    // in native heap for Android 10 and older.
+    MemoryInfo mi = new MemoryInfo();
+    ActivityManager activityManager = (ActivityManager) parent.getApplicationContext().getSystemService(android.content.Context.ACTIVITY_SERVICE);
+    activityManager.getMemoryInfo(mi);
+    if (mi.lowMemory) {
+      src.bitmap.recycle();
+      src.bitmap = null;
+    }
   }
 
 
@@ -1996,11 +2018,13 @@ public void set(int x, int y, PImage src) {
     } else {  // src.bitmap != null
       if (src.width != src.bitmap.getWidth() ||
           src.height != src.bitmap.getHeight()) {
+        src.bitmap.recycle();
         src.bitmap = Bitmap.createBitmap(src.width, src.height, Config.ARGB_8888);
         src.modified = true;
       }
       if (src.modified) {
         if (!src.bitmap.isMutable()) {
+          src.bitmap.recycle();
           src.bitmap = Bitmap.createBitmap(src.width, src.height, Config.ARGB_8888);
         }
         src.bitmap.setPixels(src.pixels, 0, src.width, 0, 0, src.width, src.height);

core/src/processing/opengl/LightFrag.glsl

@@ -0,0 +1,31 @@
+/*
+  Part of the Processing project - http://processing.org
+
+  Copyright (c) 2011-13 Ben Fry and Casey Reas
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License version 2.1 as published by the Free Software Foundation.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General
+  Public License along with this library; if not, write to the
+  Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+  Boston, MA  02111-1307  USA
+ */
+
+#ifdef GL_ES
+precision mediump float;
+precision mediump int;
+#endif
+
+varying vec4 vertColor;
+varying vec4 backVertColor;
+
+void main() {
+  gl_FragColor = gl_FrontFacing ? vertColor : backVertColor;
+}

core/src/processing/opengl/LightVert.glsl

@@ -43,6 +43,7 @@ attribute vec4 emissive;
 attribute float shininess;
 
 varying vec4 vertColor;
+varying vec4 backVertColor;
 
 const float zero_float = 0.0;
 const float one_float = 1.0;
@@ -82,17 +83,17 @@ void main() {
 
   // Normal vector in eye coordinates
   vec3 ecNormal = normalize(normalMatrix * normal);
-  
-  if (dot(-one_float * ecVertex, ecNormal) < zero_float) {
-    // If normal is away from camera, choose its opposite.
-    // If we add backface culling, this will be backfacing  
-    ecNormal *= -one_float;
-  }
+  vec3 ecNormalInv = ecNormal * -one_float;
 
   // Light calculations
   vec3 totalAmbient = vec3(0, 0, 0);
-  vec3 totalDiffuse = vec3(0, 0, 0);
-  vec3 totalSpecular = vec3(0, 0, 0);
+  
+  vec3 totalFrontDiffuse = vec3(0, 0, 0);
+  vec3 totalFrontSpecular = vec3(0, 0, 0);
+  
+  vec3 totalBackDiffuse = vec3(0, 0, 0);
+  vec3 totalBackSpecular = vec3(0, 0, 0);
+  
   for (int i = 0; i < 8; i++) {
     if (lightCount == i) break;
 
@@ -118,24 +119,33 @@ void main() {
                                  : one_float;
 
     if (any(greaterThan(lightAmbient[i], zero_vec3))) {
-      totalAmbient  += lightAmbient[i] * falloff;
+      totalAmbient       += lightAmbient[i] * falloff;
     }
 
     if (any(greaterThan(lightDiffuse[i], zero_vec3))) {
-      totalDiffuse  += lightDiffuse[i] * falloff * spotf * 
-                       lambertFactor(lightDir, ecNormal);
+      totalFrontDiffuse  += lightDiffuse[i] * falloff * spotf * 
+                            lambertFactor(lightDir, ecNormal);
+      totalBackDiffuse   += lightDiffuse[i] * falloff * spotf * 
+                            lambertFactor(lightDir, ecNormalInv);
     }
 
     if (any(greaterThan(lightSpecular[i], zero_vec3))) {
-      totalSpecular += lightSpecular[i] * falloff * spotf * 
-                       blinnPhongFactor(lightDir, ecVertex, ecNormal, shininess);
+      totalFrontSpecular += lightSpecular[i] * falloff * spotf * 
+                            blinnPhongFactor(lightDir, ecVertex, ecNormal, shininess);
+      totalBackSpecular  += lightSpecular[i] * falloff * spotf * 
+                            blinnPhongFactor(lightDir, ecVertex, ecNormalInv, shininess);
     }     
   }    
 
   // Calculating final color as result of all lights (plus emissive term).
   // Transparency is determined exclusively by the diffuse component.
-  vertColor = vec4(totalAmbient, 0) * ambient + 
-              vec4(totalDiffuse, 1) * color + 
-              vec4(totalSpecular, 0) * specular + 
-              vec4(emissive.rgb, 0);              
+  vertColor =     vec4(totalAmbient, 0) * ambient + 
+                  vec4(totalFrontDiffuse, 1) * color + 
+                  vec4(totalFrontSpecular, 0) * specular + 
+                  vec4(emissive.rgb, 0);
+              
+  backVertColor = vec4(totalAmbient, 0) * ambient + 
+                  vec4(totalBackDiffuse, 1) * color + 
+                  vec4(totalBackSpecular, 0) * specular + 
+                  vec4(emissive.rgb, 0);
 }

core/src/processing/opengl/PGL.java

@@ -800,7 +800,6 @@ protected boolean contextIsCurrent(int other) {
 
 
   protected void enableTexturing(int target) {
-    enable(target);
     if (target == TEXTURE_2D) {
       texturingTargets[0] = true;
     } else if (target == TEXTURE_RECTANGLE) {
@@ -810,7 +809,6 @@ protected void enableTexturing(int target) {
 
 
   protected void disableTexturing(int target) {
-    disable(target);
     if (target == TEXTURE_2D) {
       texturingTargets[0] = false;
     } else if (target == TEXTURE_RECTANGLE) {