parse smooth(level) in the pre-processor and construct sketchQuality

method

Author: codeanticode

core/src/processing/core/PApplet.java

@@ -818,8 +818,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/opengl/PGLES.java

@@ -71,15 +71,18 @@ public class PGLES extends PGL {
     MAX_CAPS_JOINS_LENGTH = 1000;
   }
 
-  public static final boolean ENABLE_MULTISAMPLING = false;
-
   // Some EGL constants needed to initialize a GLES2 context.
   protected static final int EGL_CONTEXT_CLIENT_VERSION = 0x3098;
   protected static final int EGL_OPENGL_ES2_BIT         = 0x0004;
 
   // Coverage multisampling identifiers for nVidia Tegra2
   protected static final int EGL_COVERAGE_BUFFERS_NV    = 0x30E0;
   protected static final int EGL_COVERAGE_SAMPLES_NV    = 0x30E1;
+  protected static final int GL_COVERAGE_BUFFER_BIT_NV  = 0x8000;
+
+  protected static boolean usingMultisampling = false;
+  protected static boolean usingCoverageMultisampling = false;
+  protected static int multisampleCount = 1;
 
   ///////////////////////////////////////////////////////////
 
@@ -174,15 +177,15 @@ public AndroidContextFactory getContextFactory() {
   }
 
 
-  public AndroidConfigChooser getConfigChooser() {
-    configChooser = new AndroidConfigChooser(5, 6, 5, 4, 16, 1);
+  public AndroidConfigChooser getConfigChooser(int samples) {
+    configChooser = new AndroidConfigChooser(5, 6, 5, 4, 16, 1, samples);
     return configChooser;
   }
 
 
   public AndroidConfigChooser getConfigChooser(int r, int g, int b, int a,
-                                               int d, int s) {
-    configChooser = new AndroidConfigChooser(r, g, b, a, d, s);
+                                               int d, int s, int samples) {
+    configChooser = new AndroidConfigChooser(r, g, b, a, d, s, samples);
     return configChooser;
   }
 
@@ -259,6 +262,26 @@ protected class AndroidConfigChooser implements EGLConfigChooser {
     public int stencilBits;
     public int[] tempValue = new int[1];
 
+    public int numSamples;
+
+    /*
+    The GLES2 extensions supported are:
+      GL_OES_rgb8_rgba8 GL_OES_depth24 GL_OES_vertex_half_float
+      GL_OES_texture_float GL_OES_texture_half_float
+      GL_OES_element_index_uint GL_OES_mapbuffer
+      GL_OES_fragment_precision_high GL_OES_compressed_ETC1_RGB8_texture
+      GL_OES_EGL_image GL_OES_required_internalformat GL_OES_depth_texture
+      GL_OES_get_program_binary GL_OES_packed_depth_stencil
+      GL_OES_standard_derivatives GL_OES_vertex_array_object GL_OES_egl_sync
+      GL_EXT_multi_draw_arrays GL_EXT_texture_format_BGRA8888
+      GL_EXT_discard_framebuffer GL_EXT_shader_texture_lod
+      GL_IMG_shader_binary GL_IMG_texture_compression_pvrtc
+      GL_IMG_texture_stream2 GL_IMG_texture_npot
+      GL_IMG_texture_format_BGRA8888 GL_IMG_read_format
+      GL_IMG_program_binary GL_IMG_multisampled_render_to_texture
+      */
+
+    /*
     // The attributes we want in the frame buffer configuration for Processing.
     // For more details on other attributes, see:
     // http://www.khronos.org/opengles/documentation/opengles1_0/html/eglChooseConfig.html
@@ -307,23 +330,57 @@ protected class AndroidConfigChooser implements EGLConfigChooser {
       EGL10.EGL_SAMPLE_BUFFERS, 1,
       EGL10.EGL_SAMPLES, 2,
       EGL10.EGL_NONE };
+    */
+
+    protected int[] attribsNoMSAA = {
+      EGL10.EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
+      EGL10.EGL_SAMPLE_BUFFERS, 0,
+      EGL10.EGL_NONE };
 
-    public AndroidConfigChooser(int r, int g, int b, int a, int d, int s) {
-      redTarget = r;
-      greenTarget = g;
-      blueTarget = b;
-      alphaTarget = a;
-      depthTarget = d;
-      stencilTarget = s;
+    public AndroidConfigChooser(int rbits, int gbits, int bbits, int abits,
+                                int dbits, int sbits, int samples) {
+      redTarget = rbits;
+      greenTarget = gbits;
+      blueTarget = bbits;
+      alphaTarget = abits;
+      depthTarget = dbits;
+      stencilTarget = sbits;
+      numSamples = samples;
     }
 
     public EGLConfig chooseConfig(EGL10 egl, EGLDisplay display) {
-      EGLConfig[] configs = chooseConfigWithAttribs(egl, display, configAttribsGL_MSAA);
-      if (configs == null) {
-        chooseConfigWithAttribs(egl, display, configAttribsGL_CovMSAA);
+      EGLConfig[] configs = null;
+      if (1 < numSamples) {
+        int[] attribs = new int[] {
+          EGL10.EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
+          EGL10.EGL_SAMPLE_BUFFERS, 1,
+          EGL10.EGL_SAMPLES, numSamples,
+          EGL10.EGL_NONE };
+        configs = chooseConfigWithAttribs(egl, display, attribs);
         if (configs == null) {
-          chooseConfigWithAttribs(egl, display, configAttribsGL_NoMSAA);
+          // No normal multisampling config was found. Try to create a
+          // coverage multisampling configuration, for the nVidia Tegra2.
+          // See the EGL_NV_coverage_sample documentation.
+          int[] attribsCov = {
+            EGL10.EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
+            EGL_COVERAGE_BUFFERS_NV, 1,
+            EGL_COVERAGE_SAMPLES_NV, numSamples,
+            EGL10.EGL_NONE };
+          configs = chooseConfigWithAttribs(egl, display, attribsCov);
+          if (configs == null) {
+            configs = chooseConfigWithAttribs(egl, display, attribsNoMSAA);
+          } else {
+            usingMultisampling = true;
+            usingCoverageMultisampling = true;
+            multisampleCount = numSamples;
+          }
+        } else {
+          usingMultisampling = true;
+          usingCoverageMultisampling = false;
+          multisampleCount = numSamples;
         }
+      } else {
+        configs = chooseConfigWithAttribs(egl, display, attribsNoMSAA);
       }
 
       if (configs == null) {
@@ -1619,6 +1676,9 @@ public void stencilMaskSeparate(int face, int mask) {
 
   @Override
   public void clear(int buf) {
+    if (usingMultisampling && usingCoverageMultisampling) {
+      buf |= GL_COVERAGE_BUFFER_BIT_NV;
+    }
     GLES20.glClear(buf);
   }
 

core/src/processing/opengl/PGraphicsOpenGL.java

@@ -3376,7 +3376,7 @@ public void smooth() {
 
   @Override
   public void smooth(int level) {
-    if (smoothDisabled) return;
+    if (smoothDisabled || PGL.MAX_SAMPLES == -1) return;
 
     smooth = true;
 

src/processing/mode/android/AndroidBuild.java

@@ -140,6 +140,7 @@ public File createProject() throws IOException, SketchException {
 //    }
     // On Android, this init will throw a SketchException if there's a problem with size()
     preproc.initSketchSize(sketch.getMainProgram());
+    preproc.initSketchSmooth(sketch.getMainProgram());
     sketchClassName = preprocess(srcFolder, manifest.getPackageName(), preproc, false);
     if (sketchClassName != null) {
       File tempManifest = new File(tmpFolder, "AndroidManifest.xml");

src/processing/mode/android/AndroidPreprocessor.java

@@ -27,6 +27,7 @@
 import java.util.List;
 
 import processing.app.*;
+import processing.core.PApplet;
 import processing.mode.java.preproc.PdePreprocessor;
 import processing.mode.java.preproc.PreprocessorResult;
 import antlr.RecognitionException;
@@ -36,7 +37,13 @@
 public class AndroidPreprocessor extends PdePreprocessor {
   Sketch sketch;
   String packageName;
+  
+  protected String smoothStatement;
+  protected String sketchQuality; 
 
+  
+  public static final String SMOOTH_REGEX =
+      "(?:^|\\s|;)smooth\\s*\\(\\s*([^\\s,]+)\\s*\\)\\s*\\;";
 
   public AndroidPreprocessor(final Sketch sketch,
                              final String packageName) throws IOException {
@@ -59,6 +66,48 @@ public String[] initSketchSize(String code) throws SketchException {
     sketchRenderer = info[3];
     return info;
   }
+  
+  
+  public String[] initSketchSmooth(String code) throws SketchException {
+    String[] info = parseSketchSmooth(code, true);
+    if (info == null) {
+      System.err.println("More about the size() command on Android can be");
+      System.err.println("found here: http://wiki.processing.org/w/Android");
+      throw new SketchException("Could not parse the size() command.");
+    }
+    smoothStatement = info[0];
+    sketchQuality = info[1];    
+    return info;
+  }
+    
+  
+  static public String[] parseSketchSmooth(String code, boolean fussy) {
+    String[] matches = PApplet.match(scrubComments(code), SMOOTH_REGEX);
+
+    if (matches != null) {
+      boolean badSmooth = false;
+      
+      if (PApplet.parseInt(matches[1], -1) == -1) {
+        badSmooth = true;
+      }
+
+      if (badSmooth && fussy) {
+        // found a reference to smooth, but it didn't seem to contain numbers
+        final String message =
+          "The smooth level of this applet could not automatically\n" +
+          "be determined from your code. Use only a numeric\n" +
+          "value (not variables) for the smooth() command.\n" +
+          "See the smooth() reference for an explanation.";
+        Base.showWarning("Could not find smooth level", message, null);
+//        new Exception().printStackTrace(System.out);
+        return null;
+      }
+      
+      return matches;
+    }
+    return new String[] { null, null };  // not an error, just empty
+  }
+  
 
   /*
   protected boolean parseSketchSize() {
@@ -172,6 +221,10 @@ protected void writeFooter(PrintWriter out, String className) {
         out.println(indent + "public String sketchRenderer() { return " + sketchRenderer + "; }");
       }
 
+      if (sketchQuality != null) {
+        out.println(indent + "public int sketchQuality() { return " + sketchQuality + "; }");
+      }
+      
       // close off the class definition
       out.println("}");
     }