propane 3.10.0-java → 3.11.0-java

data/test/test_helper.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'jruby'
 gem 'minitest'
 require 'minitest/pride'
 require 'minitest/autorun'

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.3'
+EXAMPLES = '3.4'
 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.10.0
+  version: 3.11.0
 platform: java
 authors:
 - monkstone
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-05 00:00:00.000000000 Z
+date: 2021-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -18,7 +18,7 @@ dependencies:
         version: '0.10'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.5
+        version: 0.10.7
   name: jruby-openssl
   prerelease: false
   type: :development
@@ -29,7 +29,7 @@ dependencies:
         version: '0.10'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.5
+        version: 0.10.7
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -63,10 +63,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '1.2'
   name: arcball
   prerelease: false
   type: :runtime
@@ -74,10 +71,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '1.2'
 description: "  A batteries included version of processing in ruby targetting jdk11+.\n"
 email:
 - mamba2928@yahoo.co.uk
@@ -107,131 +101,11 @@ files:
 - lib/gluegen-rt-natives-macosx-universal.jar
 - lib/gluegen-rt-natives-windows-amd64.jar
 - lib/gluegen-rt.jar
-- lib/java/japplemenubar/JAppleMenuBar.java
-- lib/java/japplemenubar/libjAppleMenuBar.jnilib
-- lib/java/monkstone/ColorUtil.java
-- lib/java/monkstone/MathToolModule.java
-- lib/java/monkstone/PropaneLibrary.java
-- lib/java/monkstone/core/LibraryProxy.java
-- lib/java/monkstone/fastmath/DegLutTables.java
-- lib/java/monkstone/fastmath/Deglut.java
-- lib/java/monkstone/fastmath/package-info.java
-- lib/java/monkstone/filechooser/Chooser.java
-- lib/java/monkstone/noise/FastTerrain.java
-- lib/java/monkstone/noise/Noise.java
-- lib/java/monkstone/noise/NoiseGenerator.java
-- lib/java/monkstone/noise/NoiseMode.java
-- lib/java/monkstone/noise/OpenSimplex2F.java
-- lib/java/monkstone/noise/OpenSimplex2S.java
-- lib/java/monkstone/noise/SmoothTerrain.java
-- lib/java/monkstone/slider/CustomHorizontalSlider.java
-- lib/java/monkstone/slider/CustomVerticalSlider.java
-- lib/java/monkstone/slider/SimpleHorizontalSlider.java
-- lib/java/monkstone/slider/SimpleSlider.java
-- lib/java/monkstone/slider/SimpleVerticalSlider.java
-- lib/java/monkstone/slider/Slider.java
-- lib/java/monkstone/slider/SliderBar.java
-- lib/java/monkstone/slider/SliderGroup.java
-- lib/java/monkstone/slider/WheelHandler.java
-- lib/java/monkstone/vecmath/GfxRender.java
-- lib/java/monkstone/vecmath/JRender.java
-- lib/java/monkstone/vecmath/ShapeRender.java
-- lib/java/monkstone/vecmath/package-info.java
-- lib/java/monkstone/vecmath/vec2/Vec2.java
-- lib/java/monkstone/vecmath/vec2/package-info.java
-- lib/java/monkstone/vecmath/vec3/Vec3.java
-- lib/java/monkstone/vecmath/vec3/package-info.java
-- lib/java/monkstone/videoevent/CaptureEvent.java
-- lib/java/monkstone/videoevent/MovieEvent.java
-- lib/java/monkstone/videoevent/package-info.java
-- lib/java/processing/awt/PGraphicsJava2D.java
-- lib/java/processing/awt/PImageAWT.java
-- lib/java/processing/awt/PShapeJava2D.java
-- lib/java/processing/awt/PSurfaceAWT.java
-- lib/java/processing/awt/ShimAWT.java
-- lib/java/processing/core/PApplet.java
-- lib/java/processing/core/PConstants.java
-- lib/java/processing/core/PFont.java
-- lib/java/processing/core/PGraphics.java
-- lib/java/processing/core/PImage.java
-- lib/java/processing/core/PMatrix.java
-- lib/java/processing/core/PMatrix2D.java
-- lib/java/processing/core/PMatrix3D.java
-- lib/java/processing/core/PShape.java
-- lib/java/processing/core/PShapeOBJ.java
-- lib/java/processing/core/PShapeSVG.java
-- lib/java/processing/core/PStyle.java
-- lib/java/processing/core/PSurface.java
-- lib/java/processing/core/PSurfaceNone.java
-- lib/java/processing/core/PVector.java
-- lib/java/processing/core/ThinkDifferent.java
-- lib/java/processing/data/DoubleDict.java
-- lib/java/processing/data/DoubleList.java
-- lib/java/processing/data/FloatDict.java
-- lib/java/processing/data/FloatList.java
-- lib/java/processing/data/IntDict.java
-- lib/java/processing/data/IntList.java
-- lib/java/processing/data/JSONArray.java
-- lib/java/processing/data/JSONObject.java
-- lib/java/processing/data/JSONTokener.java
-- lib/java/processing/data/LongDict.java
-- lib/java/processing/data/LongList.java
-- lib/java/processing/data/Sort.java
-- lib/java/processing/data/StringDict.java
-- lib/java/processing/data/StringList.java
-- lib/java/processing/data/Table.java
-- lib/java/processing/data/TableRow.java
-- lib/java/processing/data/XML.java
-- lib/java/processing/dxf/RawDXF.java
-- lib/java/processing/event/Event.java
-- lib/java/processing/event/KeyEvent.java
-- lib/java/processing/event/MouseEvent.java
-- lib/java/processing/event/TouchEvent.java
-- lib/java/processing/javafx/PGraphicsFX2D.java
-- lib/java/processing/javafx/PSurfaceFX.java
-- lib/java/processing/net/Client.java
-- lib/java/processing/net/Server.java
-- lib/java/processing/opengl/FontTexture.java
-- lib/java/processing/opengl/FrameBuffer.java
-- lib/java/processing/opengl/LinePath.java
-- lib/java/processing/opengl/LineStroker.java
-- lib/java/processing/opengl/PGL.java
-- lib/java/processing/opengl/PGraphics2D.java
-- lib/java/processing/opengl/PGraphics3D.java
-- lib/java/processing/opengl/PGraphicsOpenGL.java
-- lib/java/processing/opengl/PJOGL.java
-- lib/java/processing/opengl/PShader.java
-- lib/java/processing/opengl/PShapeOpenGL.java
-- lib/java/processing/opengl/PSurfaceJOGL.java
-- lib/java/processing/opengl/Texture.java
-- lib/java/processing/opengl/VertexBuffer.java
-- lib/java/processing/opengl/cursors/arrow.png
-- lib/java/processing/opengl/cursors/cross.png
-- lib/java/processing/opengl/cursors/hand.png
-- lib/java/processing/opengl/cursors/license.txt
-- lib/java/processing/opengl/cursors/move.png
-- lib/java/processing/opengl/cursors/text.png
-- lib/java/processing/opengl/cursors/wait.png
-- lib/java/processing/opengl/shaders/ColorFrag.glsl
-- lib/java/processing/opengl/shaders/ColorVert.glsl
-- lib/java/processing/opengl/shaders/LightFrag.glsl
-- lib/java/processing/opengl/shaders/LightVert.glsl
-- lib/java/processing/opengl/shaders/LineFrag.glsl
-- lib/java/processing/opengl/shaders/LineVert.glsl
-- lib/java/processing/opengl/shaders/MaskFrag.glsl
-- lib/java/processing/opengl/shaders/PointFrag.glsl
-- lib/java/processing/opengl/shaders/PointVert.glsl
-- lib/java/processing/opengl/shaders/TexFrag.glsl
-- lib/java/processing/opengl/shaders/TexLightFrag.glsl
-- lib/java/processing/opengl/shaders/TexLightVert.glsl
-- lib/java/processing/opengl/shaders/TexVert.glsl
-- lib/java/processing/pdf/PGraphicsPDF.java
-- lib/java/processing/svg/PGraphicsSVG.java
 - lib/jogl-all-natives-linux-amd64.jar
 - lib/jogl-all-natives-macosx-universal.jar
 - lib/jogl-all-natives-windows-amd64.jar
 - lib/jogl-all.jar
-- lib/propane-3.10.0.jar
+- lib/propane-3.11.0.jar
 - lib/propane.rb
 - lib/propane/app.rb
 - lib/propane/creators/sketch_class.rb
@@ -363,28 +237,15 @@ files:
 - src/main/java/processing/opengl/PSurfaceJOGL.java
 - src/main/java/processing/opengl/Texture.java
 - src/main/java/processing/opengl/VertexBuffer.java
-- src/main/java/processing/opengl/cursors/arrow.png
-- src/main/java/processing/opengl/cursors/cross.png
-- src/main/java/processing/opengl/cursors/hand.png
-- src/main/java/processing/opengl/cursors/license.txt
-- src/main/java/processing/opengl/cursors/move.png
-- src/main/java/processing/opengl/cursors/text.png
-- src/main/java/processing/opengl/cursors/wait.png
-- src/main/java/processing/opengl/shaders/ColorFrag.glsl
-- src/main/java/processing/opengl/shaders/ColorVert.glsl
-- src/main/java/processing/opengl/shaders/LightFrag.glsl
-- src/main/java/processing/opengl/shaders/LightVert.glsl
-- src/main/java/processing/opengl/shaders/LineFrag.glsl
-- src/main/java/processing/opengl/shaders/LineVert.glsl
-- src/main/java/processing/opengl/shaders/MaskFrag.glsl
-- src/main/java/processing/opengl/shaders/PointFrag.glsl
-- src/main/java/processing/opengl/shaders/PointVert.glsl
-- src/main/java/processing/opengl/shaders/TexFrag.glsl
-- src/main/java/processing/opengl/shaders/TexLightFrag.glsl
-- src/main/java/processing/opengl/shaders/TexLightVert.glsl
-- src/main/java/processing/opengl/shaders/TexVert.glsl
 - src/main/java/processing/pdf/PGraphicsPDF.java
 - src/main/java/processing/svg/PGraphicsSVG.java
+- src/main/resources/cursors/arrow.png
+- src/main/resources/cursors/cross.png
+- src/main/resources/cursors/hand.png
+- src/main/resources/cursors/license.txt
+- src/main/resources/cursors/move.png
+- src/main/resources/cursors/text.png
+- src/main/resources/cursors/wait.png
 - src/main/resources/icon/icon-1024.png
 - src/main/resources/icon/icon-128.png
 - src/main/resources/icon/icon-16.png
@@ -394,6 +255,19 @@ files:
 - src/main/resources/icon/icon-512.png
 - src/main/resources/icon/icon-64.png
 - src/main/resources/license.txt
+- src/main/resources/shaders/ColorFrag.glsl
+- src/main/resources/shaders/ColorVert.glsl
+- src/main/resources/shaders/LightFrag.glsl
+- src/main/resources/shaders/LightVert.glsl
+- src/main/resources/shaders/LineFrag.glsl
+- src/main/resources/shaders/LineVert.glsl
+- src/main/resources/shaders/MaskFrag.glsl
+- src/main/resources/shaders/PointFrag.glsl
+- src/main/resources/shaders/PointVert.glsl
+- src/main/resources/shaders/TexFrag.glsl
+- src/main/resources/shaders/TexLightFrag.glsl
+- src/main/resources/shaders/TexLightVert.glsl
+- src/main/resources/shaders/TexVert.glsl
 - test/create_test.rb
 - test/deglut_spec_test.rb
 - test/helper_methods_test.rb
@@ -425,8 +299,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
-- java runtime >= 11.0.2+
-rubygems_version: 3.1.6
+- java runtime >= 11.0.11+
+rubygems_version: 3.2.29
 signing_key:
 specification_version: 4
 summary: ruby implementation of processing-4.0 on MacOS, linux and windows (64bit

data/lib/java/japplemenubar/JAppleMenuBar.java

@@ -1,88 +0,0 @@
-/*
-  Part of the Processing project - http://processing.org
-
-  Copyright (c) 2011-12 hansi raber, released under LGPL under agreement
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation, version 2.1.
-
-  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
-*/ 
-package japplemenubar;
-
-import java.io.*;
-
-import processing.core.PApplet;
-
-
-/**
- * Starting point for the application. General initialization should be done 
- * inside the ApplicationController's init() method. If certain kinds of 
- * non-Swing initialization takes too long, it should happen in a new Thread 
- * and off the Swing event dispatch thread (EDT).
- * 
- * @author hansi
- */
-public class JAppleMenuBar {
-  static JAppleMenuBar instance;
-  static final String FILENAME = "libjAppleMenuBar.jnilib";
-  
-	static {
-	  try {
-	    File temp = File.createTempFile("processing", "menubar");
-	    temp.delete();  // remove the file itself
-	    temp.mkdirs();  // create a directory out of it
-	    temp.deleteOnExit();
-
-	    File jnilibFile = new File(temp, FILENAME);
-	    InputStream input = JAppleMenuBar.class.getResourceAsStream(FILENAME);
-	    if (input != null) {
-	      if (PApplet.saveStream(jnilibFile, input)) {
-	        System.load(jnilibFile.getAbsolutePath());
-	        instance = new JAppleMenuBar();
-
-	      } else {
-	        sadness("Problem saving " + FILENAME + " for full screen use.");
-	      }
-	    } else {
-        sadness("Could not load " + FILENAME + " from core.jar");
-	    }
-	  } catch (IOException e) {
-	    sadness("Unknown error, here's the stack trace.");
-	    e.printStackTrace();
-	  }
-	}
-	
-	
-	static void sadness(String msg) {
-	  System.err.println("Full screen mode disabled. " + msg);
-	}
-
-	
-//	static public void show() {
-//	  instance.setVisible(true);
-//	}
-
-	
-	static public void hide() {
-	  instance.setVisible(false, false);
-	}
-
-	
-	public native void setVisible(boolean visibility, boolean kioskMode); 
-
-	
-//  public void setVisible(boolean visibility) {
-//    // Keep original API in-tact.  Default kiosk-mode to off.
-//    setVisible(visibility, false);
-//  }
-}

data/lib/java/monkstone/ColorUtil.java

@@ -1,127 +0,0 @@
-/**
- * This utility allows JRubyArt users to use the processing.org color method
- * in their sketches. Includes a method to efficiently convert an array of web
- * strings to an array of color int, and another to convert an array of color
- * int to a string that can be used in ruby code (to generate web color array).
- * Copyright (c) 2015-20 Martin Prout.
- * This utility is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or (at
- * your option) any later version.
- *
- * Obtain a copy of the license at http://www.gnu.org/licenses/lgpl-2.1.html
- */
-package monkstone;
-
-import java.util.Random;
-/**
- *
- * @author Martin Prout
- */
-public class ColorUtil {
-
-    /**
-     * Returns hex long as a positive int unless greater than Integer.MAX_VALUE
-     * else return the complement as a negative integer or something like that
-     *
-     * @param hexlong long
-     * @return rgb int
-     */
-    static final int hexLong(long hexlong) {
-        long SPLIT = Integer.MAX_VALUE + 1;
-        if (hexlong < SPLIT) {
-            return (int) hexlong;
-        } else {
-            return (int) (hexlong - SPLIT * 2L);
-        }
-    }
-
-    /**
-     * @param hexstring String
-     * @return rgb int
-     */
-    static public int colorString(String hexstring) {
-        return java.awt.Color.decode(hexstring).getRGB();
-    }
-
-    /**
-     *
-     * @param web Array of web (hex) String
-     * @return array of color int according to java
-     */
-    static public int[] webArray(String[] web) {
-        int[] result = new int[web.length];
-        for (int i = 0; i < web.length; i++) {
-            result[i] = java.awt.Color.decode(web[i]).getRGB();
-        }
-        return result;
-    }
-
-    /**
-     * Return a ruby string of the form "%w(a b c)" where a, b, c are raw web
-     * strings. This string can be used in ruby code.
-     *
-     * @param hex int array
-     * @return String for use in ruby
-     */
-    static public String rubyString(int[] hex) {
-        StringBuilder result = new StringBuilder("%w(");
-        for (int i = 0; i < hex.length; i++) {
-            result.append(String.format("#%06X", (0xFFFFFF & hex[i])));
-            if (i < hex.length - 1) {
-                result.append(' ');
-            }
-        }
-        result.append(")\n");
-        return result.toString();
-    }
-
-    /**
-     *
-     * @param hex double
-     * @return hex float
-     */
-    static public float colorLong(double hex) {
-        return (float) hex;
-    }
-
-    /**
-     *
-     * @param hexlong long
-     * @return hexlong int
-     */
-    static public int colorLong(long hexlong) {
-        return hexLong(hexlong);
-    }
-
-    /**
-     *
-     * @param hex double
-     * @return hex float
-     */
-    static public float colorDouble(double hex) {
-        return (float) hex;
-    }
-
-    static public int[] shuffle(int[] cols) {
-    Random rgen = new Random();  // Random number generator
-    for (int i = 0; i < cols.length; i++) {
-        int randomPosition = rgen.nextInt(cols.length);
-        int temp = cols[i];
-        cols[i] = cols[randomPosition];
-        cols[randomPosition] = temp;
-    }
-    return cols;
-}
-
-    /**
-     *
-     * @param hue
-     * @param sat
-     * @param brightness
-     * @return
-     */
-    static public int hsbToRgB(double hue, double sat, double brightness) {
-        return java.awt.Color.HSBtoRGB((float) hue, (float) sat, (float) brightness);
-    }
-}