propane 3.8.0-java → 4.0.0-java

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

@@ -42,7 +42,7 @@ longpress
 
 W3C touch events
 http://www.w3.org/TR/touch-events/
-http://www.w3.org/TR/2011/WD-touch-events-20110913/
+http://www.w3.org/TR/2011/WD-touch-events-22110913/
 
 Pointer and gesture events (Windows)
 http://msdn.microsoft.com/en-US/library/ie/hh673557.aspx

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

@@ -359,7 +359,7 @@ class FontTexture implements PConstants {
     }
 
 
-    void updateUV() {
+    final void updateUV() {
       width = textures[texIndex].glWidth;
       height = textures[texIndex].glHeight;
 
@@ -370,7 +370,7 @@ class FontTexture implements PConstants {
     }
 
 
-    void updateTex() {
+    final void updateTex() {
       textures[texIndex].setNative(pixels, crop[0] - 1, crop[1] + crop[3] - 1,
                                            crop[2] + 2, -crop[3] + 2);
     }

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

@@ -181,32 +181,32 @@ public class PGraphicsOpenGL extends PGraphics {
   // Shaders
 
   static protected URL defColorShaderVertURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/ColorVert.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/ColorVert.glsl");
   static protected URL defTextureShaderVertURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/TexVert.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/TexVert.glsl");
   static protected URL defLightShaderVertURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/LightVert.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/LightVert.glsl");
   static protected URL defTexlightShaderVertURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/TexLightVert.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/TexLightVert.glsl");
   static protected URL defColorShaderFragURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/ColorFrag.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/ColorFrag.glsl");
   static protected URL defTextureShaderFragURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/TexFrag.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/TexFrag.glsl");
   static protected URL defLightShaderFragURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/LightFrag.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/LightFrag.glsl");
   static protected URL defTexlightShaderFragURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/TexLightFrag.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/TexLightFrag.glsl");
 
   static protected URL defLineShaderVertURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/LineVert.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/LineVert.glsl");
   static protected URL defLineShaderFragURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/LineFrag.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/LineFrag.glsl");
   static protected URL defPointShaderVertURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/PointVert.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/PointVert.glsl");
   static protected URL defPointShaderFragURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/PointFrag.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/PointFrag.glsl");
   static protected URL maskShaderFragURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/MaskFrag.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/MaskFrag.glsl");
 
   protected PShader defColorShader;
   protected PShader defTextureShader;
@@ -3851,12 +3851,10 @@ public class PGraphicsOpenGL extends PGraphics {
     float factor = 1;
 
     if (matrix != null) {
-      if (matrix instanceof PMatrix2D) {
-        PMatrix2D tr = (PMatrix2D)matrix;
+      if (matrix instanceof PMatrix2D tr) {
         float areaScaleFactor = Math.abs(tr.m00 * tr.m11 - tr.m01 * tr.m10);
         factor = (float) Math.sqrt(areaScaleFactor);
-      } else if (matrix instanceof PMatrix3D) {
-        PMatrix3D tr = (PMatrix3D)matrix;
+      } else if (matrix instanceof PMatrix3D tr) {
         float volumeScaleFactor =
           Math.abs(tr.m00 * (tr.m11 * tr.m22 - tr.m12 * tr.m21) +
                    tr.m01 * (tr.m12 * tr.m20 - tr.m10 * tr.m22) +
@@ -10774,26 +10772,26 @@ public class PGraphicsOpenGL extends PGraphics {
     // Matrix transformations
 
     void applyMatrixOnPolyGeometry(PMatrix tr, int first, int last) {
-      if (tr instanceof PMatrix2D) {
-        applyMatrixOnPolyGeometry((PMatrix2D) tr, first, last);
-      } else if (tr instanceof PMatrix3D) {
-        applyMatrixOnPolyGeometry((PMatrix3D) tr, first, last);
+      if (tr instanceof PMatrix2D matrix) {
+        applyMatrixOnPolyGeometry(matrix, first, last);
+      } else if (tr instanceof PMatrix3D matrix) {
+        applyMatrixOnPolyGeometry(matrix, first, last);
       }
     }
 
     void applyMatrixOnLineGeometry(PMatrix tr, int first, int last) {
-      if (tr instanceof PMatrix2D) {
-        applyMatrixOnLineGeometry((PMatrix2D) tr, first, last);
-      } else if (tr instanceof PMatrix3D) {
-        applyMatrixOnLineGeometry((PMatrix3D) tr, first, last);
+      if (tr instanceof PMatrix2D matrix) {
+        applyMatrixOnLineGeometry(matrix, first, last);
+      } else if (tr instanceof PMatrix3D matrix) {
+        applyMatrixOnLineGeometry(matrix, first, last);
       }
     }
 
     void applyMatrixOnPointGeometry(PMatrix tr, int first, int last) {
-      if (tr instanceof PMatrix2D) {
-        applyMatrixOnPointGeometry((PMatrix2D) tr, first, last);
-      } else if (tr instanceof PMatrix3D) {
-        applyMatrixOnPointGeometry((PMatrix3D) tr, first, last);
+      if (tr instanceof PMatrix2D matrix) {
+        applyMatrixOnPointGeometry(matrix, first, last);
+      } else if (tr instanceof PMatrix3D matrix) {
+        applyMatrixOnPointGeometry(matrix, first, last);
       }
     }
 
@@ -13275,8 +13273,7 @@ public class PGraphicsOpenGL extends PGraphics {
 
       @Override
       public void vertex(Object data) {
-        if (data instanceof double[]) {
-          double[] d = (double[]) data;
+        if (data instanceof double[] d) {
           int l = d.length;
           if (l < 25) {
             throw new RuntimeException("TessCallback vertex() data is " +

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

@@ -182,7 +182,7 @@ public class PJOGL extends PGL {
   @Override
   protected PImage screenshot() {
     AWTGLReadBufferUtil util = new AWTGLReadBufferUtil(capabilities.getGLProfile(), false);
-    return new PImageAWT(util.readPixelsToBufferedImage​(gl, true));
+    return new PImageAWT(util.readPixelsToBufferedImage(gl, true));
   }
 
 
@@ -241,8 +241,8 @@ public class PJOGL extends PGL {
     PSurface surf = sketch.getSurface();
     if (surf == null) {
       return graphics.pixelDensity;
-    } else if (surf instanceof PSurfaceJOGL) {
-      return ((PSurfaceJOGL)surf).getPixelScale();
+    } else if (surf instanceof PSurfaceJOGL jogl) {
+      return jogl.getPixelScale();
     } else {
       throw new RuntimeException("Renderer cannot find a JOGL surface");
     }
@@ -637,6 +637,7 @@ public class PJOGL extends PGL {
       setProperty(GLU.GLU_TESS_WINDING_RULE, rule);
     }
 
+    @Override
     public void setProperty(int property, int value) {
       GLU.gluTessProperty(tess, property, value);
     }
@@ -1997,10 +1998,10 @@ public class PJOGL extends PGL {
     } 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);
+      IntBuffer localIntBuf = IntBuffer.allocate(1);
+      localIntBuf.put(buf);
+      localIntBuf.rewind();
+      gl3es3.glDrawBuffers(1, localIntBuf);
     } else {
       throw new RuntimeException(String.format(MISSING_GLFUNC_ERROR, "glDrawBuffer()"));
     }

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

@@ -988,7 +988,7 @@ public class PShader implements PConstants {
 
 
   /**
-   * @return 
+   * @return
    */
   protected boolean compileFragmentShader() {
     pgl.shaderSource(glFragment, PApplet.join(fragmentShaderSource, "\n"));
@@ -1137,11 +1137,6 @@ public class PShader implements PConstants {
     specularLoc = getAttributeLoc("specular");
     emissiveLoc = getAttributeLoc("emissive");
     shininessLoc = getAttributeLoc("shininess");
-
-    directionLoc = getAttributeLoc("direction");
-
-    offsetLoc = getAttributeLoc("offset");
-
     directionLoc = getAttributeLoc("direction");
     offsetLoc = getAttributeLoc("offset");
 

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

@@ -413,9 +413,9 @@ public class PShapeOpenGL extends PShape {
 
   @Override
   public void addChild(PShape who) {
-    if (who instanceof PShapeOpenGL) {
+    if (who instanceof PShapeOpenGL psogl) {
       if (family == GROUP) {
-        PShapeOpenGL c3d = (PShapeOpenGL)who;
+        PShapeOpenGL c3d = psogl;
 
         super.addChild(c3d);
         c3d.updateRoot(root);
@@ -423,9 +423,9 @@ public class PShapeOpenGL extends PShape {
 
         if (c3d.family == GROUP) {
           if (c3d.textures != null) {
-            for (PImage tex: c3d.textures) {
-              addTexture(tex);
-            }
+              c3d.textures.forEach(tex -> {
+                  addTexture(tex);
+              });
           } else {
             untexChild(true);
           }
@@ -454,9 +454,9 @@ public class PShapeOpenGL extends PShape {
 
   @Override
   public void addChild(PShape who, int idx) {
-    if (who instanceof PShapeOpenGL) {
+    if (who instanceof PShapeOpenGL psogl) {
       if (family == GROUP) {
-        PShapeOpenGL c3d = (PShapeOpenGL)who;
+        PShapeOpenGL c3d = psogl;
 
         super.addChild(c3d, idx);
         c3d.updateRoot(root);
@@ -4636,36 +4636,36 @@ public class PShapeOpenGL extends PShape {
 
   @Override
   protected void styles(PGraphics g) {
-    if (g instanceof PGraphicsOpenGL) {
-      if (g.stroke) {
+    if (g instanceof PGraphicsOpenGL pgl) {
+      if (pgl.stroke) {
         setStroke(true);
-        setStroke(g.strokeColor);
-        setStrokeWeight(g.strokeWeight);
-        setStrokeCap(g.strokeCap);
-        setStrokeJoin(g.strokeJoin);
+        setStroke(pgl.strokeColor);
+        setStrokeWeight(pgl.strokeWeight);
+        setStrokeCap(pgl.strokeCap);
+        setStrokeJoin(pgl.strokeJoin);
       } else {
         setStroke(false);
       }
 
-      if (g.fill) {
+      if (pgl.fill) {
         setFill(true);
-        setFill(g.fillColor);
+        setFill(pgl.fillColor);
       } else {
         setFill(false);
       }
 
-      if (g.tint) {
+      if (pgl.tint) {
         setTint(true);
-        setTint(g.tintColor);
+        setTint(pgl.tintColor);
       }
 
-      setAmbient(g.ambientColor);
-      setSpecular(g.specularColor);
-      setEmissive(g.emissiveColor);
-      setShininess(g.shininess);
+      setAmbient(pgl.ambientColor);
+      setSpecular(pgl.specularColor);
+      setEmissive(pgl.emissiveColor);
+      setShininess(pgl.shininess);
 
       if (image != null) {
-        setTextureMode(g.textureMode);
+        setTextureMode(pgl.textureMode);
       }
     } else {
       super.styles(g);
@@ -4689,8 +4689,7 @@ public class PShapeOpenGL extends PShape {
 
   @Override
   public void draw(PGraphics g) {
-    if (g instanceof PGraphicsOpenGL) {
-      PGraphicsOpenGL gl = (PGraphicsOpenGL)g;
+    if (g instanceof PGraphicsOpenGL gl) {
       if (visible) {
         pre(gl);
 

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

@@ -184,10 +184,10 @@ public class PSurfaceJOGL implements PSurface {
       boolean hide = (sketch != null) &&
         (PApplet.platform == PConstants.WINDOWS);
       if (hide) setVisible(false);
-      
+
       ShimAWT.selectFolderImpl(prompt, callbackMethod, file,
         callbackObject, null);
-      
+
       if (hide) setVisible(true);
     });
   }
@@ -273,7 +273,7 @@ public class PSurfaceJOGL implements PSurface {
         case 2:
           try {
             profile = GLProfile.getGL2ES2();
-            
+
             // workaround for https://jogamp.org/bugzilla/show_bug.cgi?id=1347
             if (!profile.isHardwareRasterizer()) {
               GLProfile hardware = GLProfile.getMaxProgrammable(true);
@@ -281,7 +281,7 @@ public class PSurfaceJOGL implements PSurface {
                 profile = hardware;
               }
             }
-            
+
           } catch (GLException ex) {
             profile = GLProfile.getMaxProgrammable(true);
           } break;
@@ -657,7 +657,7 @@ public class PSurfaceJOGL implements PSurface {
           stream = new FileInputStream(filename);
           stream.close();
           return filename;
-        
+
         } catch (IOException e1) { }
 
       } catch (SecurityException se) { }  // online, whups
@@ -1309,7 +1309,7 @@ public class PSurfaceJOGL implements PSurface {
       String name = cursorNames.get(kind);
       if (name != null) {
         ImageIcon icon =
-          new ImageIcon(getClass().getResource("cursors/" + name + ".png"));
+          new ImageIcon(getClass().getResource("/cursors/" + name + ".png"));
         PImage img = new PImageAWT(icon.getImage());
         // Most cursors just use the center as the hotspot...
         int x = img.width / 2;