propane 3.11.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

@@ -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

@@ -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");
     }

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/test/vecmath_spec_test.rb

@@ -277,17 +277,28 @@ class VecmathTest < Minitest::Test
   end
 
   def test_cross_area # NB: the sign might be negative
+    a = Vec2D.new(200, 0)
+    b = Vec2D.new(0, 200)
+    out, err = capture_subprocess_io do
+      # Expected result is an area, twice that of the triangle created by the vectors
+      a.cross(b)
+    end
+    assert_match %r%WARNING%, err
+  end
+
+  def test_wedge_area # NB: the sign might be negative
     a = Vec2D.new(200, 0)
     b = Vec2D.new(0, 200)
     # Expected result is an area, twice that of the triangle created by the vectors
-    assert_equal(a.cross(b).abs, 40_000.0, 'Failed area test using 2D vector cross product')
+    assert_equal(a ^ b, 40_000.0, 'Failed area test using 2D vector cross product')
   end
 
   def test_cross_non_zero # Could be used to calculate area of triangle
     a = Vec2D.new(40, 40)
     b = Vec2D.new(40, 140)
     c = Vec2D.new(140, 40)
-    assert_equal((a - b).cross(b - c).abs / 2, 5_000.0, 'Failed area calculation using 2D vector cross product')
+    assert_equal(-5_000.0, (a - b) ^ (b - c) / 2, 'Failed area calculation using 2D vector cross product')
+
   end
 
   def test_cross_zero # where a, b, c are collinear area == 0
@@ -295,7 +306,7 @@ class VecmathTest < Minitest::Test
     b = Vec2D.new(100, 100)
     c = Vec2D.new(200, 200)
     # see http://mathworld.wolfram.com/Collinear.html for details
-    assert((a - b).cross(b - c).zero?, 'Failed collinearity test using 2D vector cross product')
+    assert(((a - b) ^ (b - c)).zero?, 'Failed collinearity test using 2D vector cross product')
   end
 
   def test_equals3

data/vendors/Rakefile

@@ -11,7 +11,7 @@ PROCESSING_GITHUB = 'https://github.com/processing'
 PROPANE_EXAMPLES = 'https://github.com/ruby-processing/propane-examples'
 VIDEO = 'video.zip'
 DOWNLOAD = 'releases/download/latest'
-EXAMPLES = '3.4'
+EXAMPLES = '3.5'
 HOME_DIR = ENV['HOME']
 LIBRARY = File.join(HOME_DIR, '.propane', 'libraries')
 MAC_OR_LINUX = /linux|mac|darwin/.match?(RbConfig::CONFIG['host_os'])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: propane
 version: !ruby/object:Gem::Version
-  version: 3.11.0
+  version: 4.0.0
 platform: java
 authors:
 - monkstone
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-16 00:00:00.000000000 Z
+date: 2022-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -35,7 +35,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.14'
+        version: '5.15'
   name: minitest
   prerelease: false
   type: :development
@@ -43,7 +43,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.14'
+        version: '5.15'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -105,7 +105,7 @@ files:
 - lib/jogl-all-natives-macosx-universal.jar
 - lib/jogl-all-natives-windows-amd64.jar
 - lib/jogl-all.jar
-- lib/propane-3.11.0.jar
+- lib/propane-4.0.0.jar
 - lib/propane.rb
 - lib/propane/app.rb
 - lib/propane/creators/sketch_class.rb
@@ -154,6 +154,7 @@ files:
 - src/main/java/monkstone/fastmath/Deglut.java
 - src/main/java/monkstone/fastmath/package-info.java
 - src/main/java/monkstone/filechooser/Chooser.java
+- src/main/java/monkstone/noise/LICENSE
 - src/main/java/monkstone/noise/OpenSimplex2F.java
 - src/main/java/monkstone/noise/OpenSimplex2S.java
 - src/main/java/monkstone/slider/CustomHorizontalSlider.java
@@ -299,12 +300,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
-- java runtime >= 11.0.11+
+- java runtime >= 17.0.1+
 rubygems_version: 3.2.29
 signing_key:
 specification_version: 4
-summary: ruby implementation of processing-4.0 on MacOS, linux and windows (64bit
-  only)
+summary: ruby implementation of processing-4.0 on linux and windows (64bit only),
+  might work MacOS, needs testing
 test_files:
 - test/create_test.rb
 - test/deglut_spec_test.rb