picrate 0.2.0-java → 0.3.0-java

data/src/main/java/processing/event/MouseEvent.java

@@ -1,6 +1,6 @@
 /* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
 
- /*
+/*
   Part of the Processing project - http://processing.org
 
   Copyright (c) 2012 The Processing Foundation
@@ -18,132 +18,132 @@
   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
- */
+*/
+
 package processing.event;
 
 //import processing.core.PConstants;
-public class MouseEvent extends Event {
 
-    static public final int PRESS = 1;
-    static public final int RELEASE = 2;
-    static public final int CLICK = 3;
-    static public final int DRAG = 4;
-    static public final int MOVE = 5;
-    static public final int ENTER = 6;
-    static public final int EXIT = 7;
-    static public final int WHEEL = 8;
-
-    protected int x, y;
-    protected int button;
+
+public class MouseEvent extends Event {
+  static public final int PRESS = 1;
+  static public final int RELEASE = 2;
+  static public final int CLICK = 3;
+  static public final int DRAG = 4;
+  static public final int MOVE = 5;
+  static public final int ENTER = 6;
+  static public final int EXIT = 7;
+  static public final int WHEEL = 8;
+
+  protected int x, y;
+  protected int button;
 //  protected int clickCount;
 //  protected float amount;
-    protected int count;
+  protected int count;
+
 
 //  public MouseEvent(int x, int y) {
 //    this(null,
 //         System.currentTimeMillis(), PRESSED, 0,
 //         x, y, PConstants.LEFT, 1);
 //  }
-    public MouseEvent(Object nativeObject,
-            long millis, int action, int modifiers,
-            int x, int y, int button, int count) {  //float amount) {  //int clickCount) {
-        super(nativeObject, millis, action, modifiers);
-        this.flavor = MOUSE;
-        this.x = x;
-        this.y = y;
-        this.button = button;
-        //this.clickCount = clickCount;
-        //this.amount = amount;
-        this.count = count;
-    }
 
-    public int getX() {
-        return x;
-    }
 
-    public int getY() {
-        return y;
-    }
+  public MouseEvent(Object nativeObject,
+                    long millis, int action, int modifiers,
+                    int x, int y, int button, int count) {  //float amount) {  //int clickCount) {
+    super(nativeObject, millis, action, modifiers);
+    this.flavor = MOUSE;
+    this.x = x;
+    this.y = y;
+    this.button = button;
+    //this.clickCount = clickCount;
+    //this.amount = amount;
+    this.count = count;
+  }
+
+
+  public int getX() {
+    return x;
+  }
+
+
+  public int getY() {
+    return y;
+  }
+
+
+  /** Which button was pressed, either LEFT, CENTER, or RIGHT. */
+  public int getButton() {
+    return button;
+  }
 
-    /**
-     * Which button was pressed, either LEFT, CENTER, or RIGHT.
-     *
-     * @return
-     */
-    public int getButton() {
-        return button;
-    }
 
 //  public void setButton(int button) {
 //    this.button = button;
 //  }
-    /**
-     * Do not use, getCount() is the correct method.
-     *
-     * @return
-     */
-    @Deprecated
-    public int getClickCount() {
-        //return (int) amount; //clickCount;
-        return count;
-    }
 
-    /**
-     * Do not use, getCount() is the correct method.
-     *
-     * @return
-     */
-    @Deprecated
-    public float getAmount() {
-        //return amount;
-        return count;
-    }
 
-    /**
-     * Number of clicks for mouse button events, or the number of steps
-     * (positive or negative depending on direction) for a mouse wheel event.
-     * Wheel events follow Java (see
-     * <a href="http://docs.oracle.com/javase/6/docs/api/java/awt/event/MouseWheelEvent.html#getWheelRotation()">here</a>),
-     * so getAmount() will return "negative values if the mouse wheel was
-     * rotated up or away from the user" and positive values in the other
-     * direction. On Mac OS X, this will be reversed when "natural" scrolling is
-     * enabled in System Preferences &rarr Mouse.
-     *
-     * @return
-     */
-    public int getCount() {
-        return count;
-    }
+  /** Do not use, getCount() is the correct method. */
+  @Deprecated
+  public int getClickCount() {
+    //return (int) amount; //clickCount;
+    return count;
+  }
+
+
+  /** Do not use, getCount() is the correct method. */
+  @Deprecated
+  public float getAmount() {
+    //return amount;
+    return count;
+  }
+
+
+  /**
+   * Number of clicks for mouse button events, or the number of steps (positive
+   * or negative depending on direction) for a mouse wheel event.
+   * Wheel events follow Java (see <a href="http://docs.oracle.com/javase/6/docs/api/java/awt/event/MouseWheelEvent.html#getWheelRotation()">here</a>), so
+   * getAmount() will return "negative values if the mouse wheel was rotated
+   * up or away from the user" and positive values in the other direction.
+   * On Mac OS X, this will be reversed when "natural" scrolling is enabled
+   * in System Preferences &rarr Mouse.
+   */
+  public int getCount() {
+    return count;
+  }
+
 
 //  public void setClickCount(int clickCount) {
 //    this.clickCount = clickCount;
 //  }
-    private String actionString() {
-        switch (action) {
-            default:
-                return "UNKNOWN";
-            case CLICK:
-                return "CLICK";
-            case DRAG:
-                return "DRAG";
-            case ENTER:
-                return "ENTER";
-            case EXIT:
-                return "EXIT";
-            case MOVE:
-                return "MOVE";
-            case PRESS:
-                return "PRESS";
-            case RELEASE:
-                return "RELEASE";
-            case WHEEL:
-                return "WHEEL";
-        }
-    }
 
-    @Override
-    public String toString() {
-        return String.format("<MouseEvent %s@%d,%d count:%d button:%d>",
-                actionString(), x, y, count, button);
+  private String actionString() {
+    switch (action) {
+    default:
+      return "UNKNOWN";
+    case CLICK:
+      return "CLICK";
+    case DRAG:
+      return "DRAG";
+    case ENTER:
+      return "ENTER";
+    case EXIT:
+      return "EXIT";
+    case MOVE:
+      return "MOVE";
+    case PRESS:
+      return "PRESS";
+    case RELEASE:
+      return "RELEASE";
+    case WHEEL:
+      return "WHEEL";
     }
+  }
+
+  @Override
+  public String toString() {
+    return String.format("<MouseEvent %s@%d,%d count:%d button:%d>",
+                         actionString(), x, y, count, button);
+  }
 }

data/src/main/java/processing/opengl/PGL.java

@@ -1287,9 +1287,9 @@ public abstract class PGL {
     PGL ppgl = primaryPGL ? this : graphics.getPrimaryPGL();
 
     if (!ppgl.loadedTex2DShader || ppgl.tex2DShaderContext != ppgl.glContext) {
-      String[] preprocVertSrc = preprocessVertexSource(texVertShaderSource, getGLSLVersion());
+      String[] preprocVertSrc = preprocessVertexSource(texVertShaderSource, getGLSLVersion(), getGLSLVersionSuffix());
       String vertSource = PApplet.join(preprocVertSrc, "\n");
-      String[] preprocFragSrc = preprocessFragmentSource(tex2DFragShaderSource, getGLSLVersion());
+      String[] preprocFragSrc = preprocessFragmentSource(tex2DFragShaderSource, getGLSLVersion(), getGLSLVersionSuffix());
       String fragSource = PApplet.join(preprocFragSrc, "\n");
       ppgl.tex2DVertShader = createShader(VERTEX_SHADER, vertSource);
       ppgl.tex2DFragShader = createShader(FRAGMENT_SHADER, fragSource);
@@ -1419,9 +1419,9 @@ public abstract class PGL {
     PGL ppgl = primaryPGL ? this : graphics.getPrimaryPGL();
 
     if (!ppgl.loadedTexRectShader || ppgl.texRectShaderContext != ppgl.glContext) {
-      String[] preprocVertSrc = preprocessVertexSource(texVertShaderSource, getGLSLVersion());
+      String[] preprocVertSrc = preprocessVertexSource(texVertShaderSource, getGLSLVersion(), getGLSLVersionSuffix());
       String vertSource = PApplet.join(preprocVertSrc, "\n");
-      String[] preprocFragSrc = preprocessFragmentSource(texRectFragShaderSource, getGLSLVersion());
+      String[] preprocFragSrc = preprocessFragmentSource(texRectFragShaderSource, getGLSLVersion(), getGLSLVersionSuffix());
       String fragSource = PApplet.join(preprocFragSrc, "\n");
       ppgl.texRectVertShader = createShader(VERTEX_SHADER, vertSource);
       ppgl.texRectFragShader = createShader(FRAGMENT_SHADER, fragSource);
@@ -1848,6 +1848,7 @@ public abstract class PGL {
 
 
   abstract protected int getGLSLVersion();
+  abstract protected String getGLSLVersionSuffix();
 
 
   protected String[] loadVertexShader(String filename) {
@@ -1880,28 +1881,29 @@ public abstract class PGL {
   }
 
 
-  protected String[] loadVertexShader(String filename, int version) {
+  protected String[] loadVertexShader(String filename, int version, String versionSuffix) {
     return loadVertexShader(filename);
   }
 
 
-  protected String[] loadFragmentShader(String filename, int version) {
+  protected String[] loadFragmentShader(String filename, int version, String versionSuffix) {
     return loadFragmentShader(filename);
   }
 
 
-  protected String[] loadFragmentShader(URL url, int version) {
+  protected String[] loadFragmentShader(URL url, int version, String versionSuffix) {
     return loadFragmentShader(url);
   }
 
 
-  protected String[] loadVertexShader(URL url, int version) {
+  protected String[] loadVertexShader(URL url, int version, String versionSuffix) {
     return loadVertexShader(url);
   }
 
 
   protected static String[] preprocessFragmentSource(String[] fragSrc0,
-                                                     int version) {
+                                                     int version,
+                                                     String versionSuffix) {
     if (containsVersionDirective(fragSrc0)) {
       // The user knows what she or he is doing
       return fragSrc0;
@@ -1915,7 +1917,7 @@ public abstract class PGL {
       int offset = 1;
 
       fragSrc = preprocessShaderSource(fragSrc0, search, replace, offset);
-      fragSrc[0] = "#version " + version;
+      fragSrc[0] = "#version " + version + versionSuffix;
     } else {
       // We need to replace 'texture' uniform by 'texMap' uniform and
       // 'textureXXX()' functions by 'texture()' functions. Order of these
@@ -1932,15 +1934,20 @@ public abstract class PGL {
       int offset = 2;
 
       fragSrc = preprocessShaderSource(fragSrc0, search, replace, offset);
-      fragSrc[0] = "#version " + version;
-      fragSrc[1] = "out vec4 _fragColor;";
+      fragSrc[0] = "#version " + version + versionSuffix;
+      if (" es".equals(versionSuffix)) {
+        fragSrc[1] = "out mediump vec4 _fragColor;";
+      } else {
+        fragSrc[1] = "out vec4 _fragColor;";
+      }
     }
 
     return fragSrc;
   }
 
   protected static String[] preprocessVertexSource(String[] vertSrc0,
-                                                   int version) {
+                                                   int version,
+                                                   String versionSuffix) {
     if (containsVersionDirective(vertSrc0)) {
       // The user knows what she or he is doing
       return vertSrc0;
@@ -1954,7 +1961,7 @@ public abstract class PGL {
       int offset = 1;
 
       vertSrc = preprocessShaderSource(vertSrc0, search, replace, offset);
-      vertSrc[0] = "#version " + version;
+      vertSrc[0] = "#version " + version + versionSuffix;
     } else {
       // We need to replace 'texture' uniform by 'texMap' uniform and
       // 'textureXXX()' functions by 'texture()' functions. Order of these
@@ -1971,7 +1978,7 @@ public abstract class PGL {
       int offset = 1;
 
       vertSrc = preprocessShaderSource(vertSrc0, search, replace, offset);
-      vertSrc[0] = "#version " + version;
+      vertSrc[0] = "#version " + version + versionSuffix;
     }
 
     return vertSrc;
@@ -2225,7 +2232,7 @@ public abstract class PGL {
 
   protected boolean hasAnisoSamplingSupport() {
     int major = getGLVersion()[0];
-    if (major < 3) {
+    if (isES() || major < 3) {
       String ext = getString(EXTENSIONS);
       return -1 < ext.indexOf("_texture_filter_anisotropic");
     } else {

data/src/main/java/processing/opengl/PGraphicsOpenGL.java

@@ -1561,13 +1561,14 @@ public class PGraphicsOpenGL extends PGraphics {
     }
     pgl.depthFunc(PGL.LEQUAL);
 
-    if (OPENGL_RENDERER.equals("VideoCore IV HW")) {
-      // Broadcom's VC IV driver is unhappy with either of these
-      // ignore for now
+    if (pgl.isES()) {
+      // neither GL_MULTISAMPLE nor GL_POLYGON_SMOOTH are part of GLES2 or GLES3
     } else if (smooth < 1) {
       pgl.disable(PGL.MULTISAMPLE);
     } else if (1 <= smooth) {
       pgl.enable(PGL.MULTISAMPLE);
+    }
+    if (!pgl.isES()) {
       pgl.disable(PGL.POLYGON_SMOOTH);
     }
 
@@ -6775,16 +6776,14 @@ public class PGraphicsOpenGL extends PGraphics {
 //        quality = temp;
 //      }
     }
-    if (OPENGL_RENDERER.equals("VideoCore IV HW")) {
-      // Broadcom's VC IV driver is unhappy with either of these
-      // ignore for now
+    if (pgl.isES()) {
+      // neither GL_MULTISAMPLE nor GL_POLYGON_SMOOTH are part of GLES2 or GLES3
     } else if (smooth < 1) {
       pgl.disable(PGL.MULTISAMPLE);
     } else if (1 <= smooth) {
       pgl.enable(PGL.MULTISAMPLE);
     }
-    // work around runtime exceptions in Broadcom's VC IV driver
-    if (false == OPENGL_RENDERER.equals("VideoCore IV HW")) {
+    if (!pgl.isES()) {
       pgl.disable(PGL.POLYGON_SMOOTH);
     }
 
@@ -6895,8 +6894,12 @@ public class PGraphicsOpenGL extends PGraphics {
 
     // overwrite the default shaders with vendor specific versions
     // if needed
-    if (OPENGL_RENDERER.equals("VideoCore IV HW") ||    // Broadcom's binary driver for Raspberry Pi
-      OPENGL_RENDERER.contains("VC4")) {   // Mesa driver for same hardware
+    if (OPENGL_RENDERER.equals("VideoCore IV HW")) {  // Broadcom's binary driver for Raspberry Pi
+        defLightShaderVertURL =
+          PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/LightVert-brcm.glsl");
+        defTexlightShaderVertURL =
+          PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/TexLightVert-brcm.glsl");
+    } else if (OPENGL_RENDERER.contains("VC4")) {     // Mesa driver for same hardware
         defLightShaderVertURL =
           PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/LightVert-vc4.glsl");
         defTexlightShaderVertURL =

data/src/main/java/processing/opengl/PJOGL.java

@@ -509,50 +509,59 @@ public class PJOGL extends PGL {
     return vn.getMajor() * 100 + vn.getMinor();
   }
 
+  protected String getGLSLVersionSuffix() {
+    VersionNumber vn = context.getGLSLVersionNumber();
+    if (context.isGLESProfile() && 1 < vn.getMajor()) {
+      return " es";
+    } else {
+      return "";
+    }
+  }
+
 
   @Override
   protected String[] loadVertexShader(String filename) {
-    return loadVertexShader(filename, getGLSLVersion());
+    return loadVertexShader(filename, getGLSLVersion(), getGLSLVersionSuffix());
   }
 
 
   @Override
   protected String[] loadFragmentShader(String filename) {
-    return loadFragmentShader(filename, getGLSLVersion());
+    return loadFragmentShader(filename, getGLSLVersion(), getGLSLVersionSuffix());
   }
 
 
   @Override
   protected String[] loadVertexShader(URL url) {
-    return loadVertexShader(url, getGLSLVersion());
+    return loadVertexShader(url, getGLSLVersion(), getGLSLVersionSuffix());
   }
 
 
   @Override
   protected String[] loadFragmentShader(URL url) {
-    return loadFragmentShader(url, getGLSLVersion());
+    return loadFragmentShader(url, getGLSLVersion(), getGLSLVersionSuffix());
   }
 
 
   @Override
-  protected String[] loadFragmentShader(String filename, int version) {
+  protected String[] loadFragmentShader(String filename, int version, String versionSuffix) {
     String[] fragSrc0 = sketch.loadStrings(filename);
-    return preprocessFragmentSource(fragSrc0, version);
+    return preprocessFragmentSource(fragSrc0, version, versionSuffix);
   }
 
 
   @Override
-  protected String[] loadVertexShader(String filename, int version) {
+  protected String[] loadVertexShader(String filename, int version, String versionSuffix) {
     String[] vertSrc0 = sketch.loadStrings(filename);
-    return preprocessVertexSource(vertSrc0, version);
+    return preprocessVertexSource(vertSrc0, version, versionSuffix);
   }
 
 
   @Override
-  protected String[] loadFragmentShader(URL url, int version) {
+  protected String[] loadFragmentShader(URL url, int version, String versionSuffix) {
     try {
       String[] fragSrc0 = PApplet.loadStrings(url.openStream());
-      return preprocessFragmentSource(fragSrc0, version);
+      return preprocessFragmentSource(fragSrc0, version, versionSuffix);
     } catch (IOException e) {
       PGraphics.showException("Cannot load fragment shader " + url.getFile());
     }
@@ -561,10 +570,10 @@ public class PJOGL extends PGL {
 
 
   @Override
-  protected String[] loadVertexShader(URL url, int version) {
+  protected String[] loadVertexShader(URL url, int version, String versionSuffix) {
     try {
       String[] vertSrc0 = PApplet.loadStrings(url.openStream());
-      return preprocessVertexSource(vertSrc0, version);
+      return preprocessVertexSource(vertSrc0, version, versionSuffix);
     } catch (IOException e) {
       PGraphics.showException("Cannot load vertex shader " + url.getFile());
     }
@@ -1926,6 +1935,8 @@ public class PJOGL extends PGL {
       gl2x.glBlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
     } else if (gl3 != null) {
       gl3.glBlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
+    } else if (gl3es3 != null) {
+      gl3es3.glBlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
     } else {
       throw new RuntimeException(String.format(MISSING_GLFUNC_ERROR, "glBlitFramebuffer()"));
     }
@@ -1937,6 +1948,8 @@ public class PJOGL extends PGL {
       gl2x.glRenderbufferStorageMultisample(target, samples, format, width, height);
     } else if (gl3 != null) {
       gl3.glRenderbufferStorageMultisample(target, samples, format, width, height);
+    } else if (gl3es3 != null) {
+      gl3es3.glRenderbufferStorageMultisample(target, samples, format, width, height);
     } else {
       throw new RuntimeException(String.format(MISSING_GLFUNC_ERROR, "glRenderbufferStorageMultisample()"));
     }
@@ -1948,6 +1961,8 @@ public class PJOGL extends PGL {
       gl2x.glReadBuffer(buf);
     } else if (gl3 != null) {
       gl3.glReadBuffer(buf);
+    } else if (gl3es3 != null) {
+      gl3es3.glReadBuffer(buf);
     } else {
       throw new RuntimeException(String.format(MISSING_GLFUNC_ERROR, "glReadBuffer()"));
     }
@@ -1959,6 +1974,11 @@ public class PJOGL extends PGL {
       gl2x.glDrawBuffer(buf);
     } else if (gl3 != null) {
       gl3.glDrawBuffer(buf);
+    } else if (gl3es3 != null) {
+      IntBuffer intBuffer = IntBuffer.allocate(1);
+      intBuffer.put(buf);
+      intBuffer.rewind();
+      gl3es3.glDrawBuffers(1, intBuffer);
     } else {
       throw new RuntimeException(String.format(MISSING_GLFUNC_ERROR, "glDrawBuffer()"));
     }