picrate 2.4.1-java → 2.5.2-java

data/test/noise_test.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require_relative 'test_helper'
+
+Java::Monkstone::PicrateLibrary.new.load(JRuby.runtime, false)
+
+# include Processing::HelperMethods
+
+Dir.chdir(File.dirname(__FILE__))
+# Test processing map functions
+class ProcessingNoiseTest < Minitest::Test
+  include NoiseModule
+  def test_noise1d
+    x = 0.5
+    assert_in_delta(noise(x), 0.5, 0.00001)
+  end
+end

data/test/test_helper.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 gem 'minitest'
-require 'java'
+require 'jruby'
 require_relative '../lib/picrate'
 require 'minitest/pride'
 require 'minitest/autorun'

data/test/vecmath_spec_test.rb

@@ -270,14 +270,14 @@ class VecmathTest < Minitest::Test
     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).abs, 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(((a - b) ^ (b - c)).abs / 2, 5_000.0, 'Failed area calculation using 2D vector cross product')
   end
 
   def test_cross_zero # where a, b, c are collinear area == 0
@@ -285,7 +285,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

@@ -8,7 +8,7 @@ SOUND = 'sound.zip'
 PROCESSING_GITHUB = 'https://github.com/processing'
 VIDEO = 'video.zip'
 DOWNLOAD = 'releases/download/latest'
-EXAMPLES = '0.5.8'
+EXAMPLES = '0.5.9'
 HOME_DIR = ENV['HOME']
 LIBRARY = File.join(HOME_DIR, '.picrate', 'libraries')
 PROJECT_DIR = File.join(HOME_DIR, 'projects')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: picrate
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.5.2
 platform: java
 authors:
 - monkstone
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-14 00:00:00.000000000 Z
+date: 2021-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -43,10 +43,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '1.2'
   name: arcball
   prerelease: false
   type: :runtime
@@ -54,10 +51,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '1.2'
 description: |
   A batteries included version of processing in ruby, for raspberrypi and
   linux. Install samples to configures geany ide.
@@ -82,10 +76,10 @@ files:
 - docs/.gitignore
 - docs/_classes/aabb/aabb.md
 - docs/_classes/app/app.md
-- docs/_classes/app_render/app_render.md
 - docs/_classes/arc_ball/arc_ball.md
 - docs/_classes/chooser/chooser.md
 - docs/_classes/deglut/deglut.md
+- docs/_classes/gfx_render/app_render.md
 - docs/_classes/library_proxy/library_proxy.md
 - docs/_classes/vec2d/vec2d.md
 - docs/_classes/vec3d/vec3d.md
@@ -130,7 +124,7 @@ files:
 - docs/_methods/map1d.md
 - docs/_methods/methods_summary.md
 - docs/_methods/mouse_pressed.md
-- docs/_methods/noise_mode.md
+- docs/_methods/noise_modes.md
 - docs/_methods/post_initialize.md
 - docs/_methods/processing_api.md
 - docs/_methods/settings.md
@@ -191,7 +185,7 @@ files:
 - lib/jogl-all-natives-linux-amd64.jar
 - lib/jogl-all-natives-linux-armv6hf.jar
 - lib/jogl-all.jar
-- lib/picrate-2.4.1.jar
+- lib/picrate-2.5.2.jar
 - lib/picrate.rb
 - lib/picrate/app.rb
 - lib/picrate/creators/parameters.rb
@@ -227,14 +221,11 @@ files:
 - picrate.gemspec
 - pom.rb
 - pom.xml
-- src/main/java/japplemenubar/JAppleMenuBar.java
-- src/main/java/japplemenubar/libjAppleMenuBar.jnilib
 - src/main/java/monkstone/ColorUtil.java
 - src/main/java/monkstone/FastNoiseModuleJava.java
 - src/main/java/monkstone/MathToolModule.java
 - src/main/java/monkstone/PicrateLibrary.java
 - src/main/java/monkstone/SmoothNoiseModuleJava.java
-- src/main/java/monkstone/complex/JComplex.java
 - src/main/java/monkstone/core/LibraryProxy.java
 - src/main/java/monkstone/fastmath/DegLutTables.java
 - src/main/java/monkstone/fastmath/Deglut.java
@@ -251,15 +242,11 @@ files:
 - src/main/java/monkstone/slider/SliderBar.java
 - src/main/java/monkstone/slider/SliderGroup.java
 - src/main/java/monkstone/slider/WheelHandler.java
-- src/main/java/monkstone/vecmath/AppRender.java
 - src/main/java/monkstone/vecmath/GfxRender.java
 - src/main/java/monkstone/vecmath/JRender.java
 - src/main/java/monkstone/vecmath/ShapeRender.java
-- src/main/java/monkstone/vecmath/package-info.java
 - src/main/java/monkstone/vecmath/vec2/Vec2.java
-- src/main/java/monkstone/vecmath/vec2/package-info.java
 - src/main/java/monkstone/vecmath/vec3/Vec3.java
-- src/main/java/monkstone/vecmath/vec3/package-info.java
 - src/main/java/monkstone/videoevent/CaptureEvent.java
 - src/main/java/monkstone/videoevent/MovieEvent.java
 - src/main/java/monkstone/videoevent/package-info.java
@@ -318,28 +305,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-128.png
 - src/main/resources/icon/icon-16.png
 - src/main/resources/icon/icon-256.png
@@ -348,10 +322,24 @@ 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/color_group_test.rb
 - test/deglut_spec_test.rb
 - test/helper_methods_test.rb
 - test/math_tool_test.rb
+- test/noise_test.rb
 - test/respond_to_test.rb
 - test/sketches/key_event.rb
 - test/sketches/library/my_library/my_library.rb
@@ -381,7 +369,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - java runtime == 11+
-rubygems_version: 3.1.6
+rubygems_version: 3.2.29
 signing_key:
 specification_version: 4
 summary: ruby implementation of processing-3 on raspberrypi and linux64
@@ -390,6 +378,7 @@ test_files:
 - test/deglut_spec_test.rb
 - test/helper_methods_test.rb
 - test/math_tool_test.rb
+- test/noise_test.rb
 - test/respond_to_test.rb
 - test/sketches/key_event.rb
 - test/sketches/library/my_library/my_library.rb

data/src/main/java/japplemenubar/JAppleMenuBar.java

@@ -1,96 +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);
-	}
-
-    /**
-     *
-     * @param visibility
-     * @param kioskMode
-     */
-    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/src/main/java/monkstone/complex/JComplex.java

@@ -1,252 +0,0 @@
-package monkstone.complex;
-
-import java.util.Objects;
-
-/**
- * The purpose of this class is to to make Complex operations more efficient
- * than JRuby RubyComplex, by having a simpler interface, only modest
- * improvements were obtained (but this is better than nothing on RaspberryPI).
- */
-public final class JComplex {
-
-    private final double re;   // the real part
-    private final double im;   // the imaginary part
-    private final static JComplex ZERO = new JComplex(0, 0);
-    private final static JComplex NAN = new JComplex(Double.NaN, Double.NaN);
-
-    /**
-     * create a new object with the given real and imaginary parts
-     *
-     * @param real
-     * @param imag
-     */
-    public JComplex(double real, double imag) {
-        re = real;
-        im = imag;
-    }
-
-    /**
-     * @return a string representation of the invoking Complex object
-     */
-    @Override
-    public String toString() {
-        return "JComplex(" + re + ", " + im + "i)";
-    }
-
-    /**
-     *
-     * @return abs/modulus/magnitude
-     */
-    public final double abs() {
-        return Math.hypot(re, im);
-    }
-
-    /**
-     *
-     * @return square of abs/modulus/magnitude
-     */
-    public final double abs2() {
-        return re * re + im * im;
-    }
-
-    /**
-     *
-     * @return angle/phase/argument, normalized to be between -pi and pi
-     */
-    public final double phase() {
-        return Math.atan2(im, re);
-    }
-
-    /**
-     *
-     * @param b
-     * @return a new Complex object whose value is (this + b)
-     */
-    public final JComplex add(JComplex b) {
-        JComplex a = this;             // invoking object
-        double real = a.re + b.re;
-        double imag = a.im + b.im;
-        return new JComplex(real, imag);
-    }
-
-    /**
-     *
-     * @param scalar
-     * @return a new Complex object whose value is (this + scalar)
-     */
-    public final JComplex add(double scalar) {
-        return new JComplex(re + scalar, im);
-    }
-
-    public final boolean zero() {
-        return this.equals(ZERO);
-    }
-
-    /**
-     *
-     * @param b
-     * @return a new Complex object whose value is (this - b)
-     */
-    public final JComplex sub(JComplex b) {
-        JComplex a = this;
-        double real = a.re - b.re;
-        double imag = a.im - b.im;
-        return new JComplex(real, imag);
-    }
-
-    /**
-     *
-     * @param scalar
-     * @return a new Complex object whose value is (this - scalar)
-     */
-    public final JComplex sub(double scalar) {
-        return new JComplex(re - scalar, im);
-    }
-
-    /**
-     *
-     * @param b
-     * @return a new Complex object whose value is (this * b)
-     */
-    public final JComplex mul(JComplex b) {
-        JComplex a = this;
-        double real = a.re * b.re - a.im * b.im;
-        double imag = a.re * b.im + a.im * b.re;
-        return new JComplex(real, imag);
-    }
-
-    /**
-     * Also known as scale
-     *
-     * @param b
-     * @return a new Complex object whose value is (this * b)
-     */
-    public final JComplex mul(double b) {
-        return new JComplex(re * b, im * b);
-    }
-
-    /**
-     *
-     * @return a new Complex object whose value is the conjugate of this
-     */
-    public final JComplex conjugate() {
-        return new JComplex(re, -im);
-    }
-
-    /**
-     *
-     * @return a new Complex object whose value is the reciprocal of this
-     */
-    private JComplex reciprocal() {
-        double scale = re * re + im * im; // self dot product
-        return new JComplex(re / scale, -im / scale);
-    }
-
-    /**
-     *
-     * @param other
-     * @return this^other
-     */
-    public final JComplex pow(JComplex other) {
-        if (this.zero()) {
-            if (other.zero()) {
-                return ZERO;
-            }
-            return NAN;
-        }
-        return (this).log().mul(other).exp();
-    }
-
-    /**
-     *
-     * @param scalar
-     * @return this^scalar
-     */
-    public final JComplex pow(double scalar) {
-        if (this.zero()) {
-            if (scalar == 0) {
-                return ZERO;
-            }
-            return NAN;
-        }
-        return (this).log().mul(scalar).exp();
-    }
-
-    /**
-     *
-     * @return log
-     */
-    private JComplex log() {
-        return new JComplex(Math.log(abs()), Math.atan2(im, re));
-    }
-
-    /**
-     *
-     * @return real part
-     */
-    public final double re() {
-        return re;
-    }
-
-    /**
-     *
-     * @return imaginary part
-     */
-    public final double im() {
-        return im;
-    }
-
-    /**
-     *
-     * @param b
-     * @return a / b
-     */
-    public final JComplex div(JComplex b) {
-        JComplex a = this;
-        return a.mul(b.reciprocal());
-    }
-
-    /**
-     *
-     * @param b
-     * @return a / b
-     */
-    public final JComplex div(double b) {
-        if (b == 0) {
-            return NAN;
-        }
-        return new JComplex(re / b, im / b);
-    }
-
-    /**
-     *
-     * @return a new Complex object whose value is the complex exponential of
-     * this
-     */
-    public final JComplex exp() {
-        return new JComplex(Math.exp(re) * Math.cos(im), Math.exp(re) * Math.sin(im));
-    }
-
-    @Override
-    public final int hashCode() {
-        return Objects.hash(re, im);
-    }
-
-    @Override
-    public final boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final JComplex other = (JComplex) obj;
-        if (Double.doubleToLongBits(this.re) != Double.doubleToLongBits(other.re)) {
-            return false;
-        }
-        return Double.doubleToLongBits(this.im) == Double.doubleToLongBits(other.im);
-    }
-}