picrate 2.4.2-java → 2.5.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ab492711c3332d165604d48dd5a816b774d1a3d8c3149ad03e06e5ecfefd091
-  data.tar.gz: 581eed24cf663f8752a035a10213240c20e182c3fce6a76f30e79d0df7051dc7
+  metadata.gz: 1f42aa12e08e8589abee2166195d85e4a9c5797130f702c777935b2ed37053b2
+  data.tar.gz: 789b7c482d4dd2ba8dd602f0eceba29e9f80e9ebeef8786a822da365a31e51cc
 SHA512:
-  metadata.gz: fe19f9cf14758e36a72c98cdd00baa4bab8e9db666f4c624b5ef593bf6621169d34c33f6513c337faa4bea24a8041d1d8c9681205c2ce6d3fd8dc9bd0d3bdbea
-  data.tar.gz: f63af7d23c1c38a2ed7050e8682f5336f6a607dc1094d6c67276c66661272e61c70bf0a86c0e3133eb9e6198cf407b560769dc41de811b71a611662150efee2a
+  metadata.gz: f4fe171cfa023990fca7e853a28968b959abd0effcd234c458a07a4f2159f0c0f21806ddbbf193c1466dd7a1b2ee87ddacf6cd4bb3f4fd778d58e9db10a69ae0
+  data.tar.gz: fafaa739cf2efb9626e90459e3cd1c698c182bd1b0e79cd0757140c877698a5d84e44647d1fd3d38e3641c9d20fa576a502588cad596b8ff9a16e42ef577afda

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+v2.5.0 Update to JRuby-9.3.0.0.
+
+v2.4.2 Update to JRuby-9.2.19, getting ready for JRuby-9.3+.
+
 v2.4.1 patch library loader, add PGS library examples.
 
 v2.4.0 Refactor noise to two modules, FastNoise (default) & SmoothNoise, with terrain noise `:tnoise` option.
@@ -38,7 +42,7 @@ v0.8.0 Refactor processing code to jdk8 syntax, include lambda, switch on string
 
 v0.7.1 Oops fix `GfxRender` had not been merged
 
-v0.7.0 Refactor sketch_writer to load params from ~/.picrate/sketch.yml. `AppRender => GfxRender` because we only need `PGraphics` in renderer.
+v0.7.0 Refactor sketch_writer to load params from ~/.picrate/sketch.yml. `GfxRender => GfxRender` because we only need `PGraphics` in renderer.
 
 v0.6.0 Re-branding with new 'pick'/'eight' svg for PiCrate
 

data/Gemfile

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 source 'https://rubygems.org'
-ruby '2.5.7', engine: 'jruby', engine_version: '9.2.11.0'
+ruby '2.6.8', engine: 'jruby', engine_version: '9.3.0.0'
 gemspec

data/README.md

@@ -1,7 +1,7 @@
 __C6H3N3O7__ [![Gem Version](https://badge.fury.io/rb/picrate.svg)](https://badge.fury.io/rb/picrate)![Travis CI](https://travis-ci.org/ruby-processing/PiCrate.svg)
 
 # PiCrate
-New version for `Buster` on raspberryPI 3B+ works with jdk11 (reflective access warnings fixed for jdk11). Since version 2.0.1 also works on 64 bit Manjaro distro on RaspberryPI4. Create processing sketches in ruby on raspberry-pi and linux (this project is a parallel development of [propane][propane] targetting the raspberry-pi, but will initially be developed on a regular linux box). The aim is to produce a gem installable app that can be run with jruby, with minimal dependencies. Drop the `C` and you get pirate, or and an `e` and get `PiCreate`, a happy coincidence?
+Version for `Raspberry Pi OS` on raspberryPI 3B+ works with jdk11 (reflective access warnings fixed for jdk11). That also works on 64 bit `ManjaroArm` distro on RaspberryPI4. Create processing sketches in ruby on raspberry-pi and linux (this project is a parallel development of [propane][propane] targetting the raspberry-pi, but will initially be developed on a regular linux box). The aim is to produce a gem installable app that can be run with jruby, with minimal dependencies. Drop the `C` and you get pirate, or and an `e` and get `PiCreate`, a happy coincidence?
 
 
 ### To install from rubygems ###
@@ -19,7 +19,7 @@ Requires java to build (and [jogl-2.4.0-rc jars][jogl_jars]), but uses a maven w
 ```bash
 cd PiCrate # or whatever you call it
 rake # assumes an installed version of vanilla processing
-jgem install picrate-2.4.1-java.gem
+jgem install picrate-2.5.0-java.gem
 
 ```
 To create a template sketch:-

data/Rakefile

@@ -9,7 +9,7 @@ task default: %i[init compile install test gem]
 # Currently depends on local jogl-2.4.0 jars on path ~/jogl24
 desc 'Copy Jars'
 task :init do
-  jogl24 = File.join(HOME_DIR, 'jogl-2.4-rc2021011')
+  jogl24 = File.join(HOME_DIR, 'jogl24')
   opengl = Dir.entries(jogl24).grep(/amd64|armv6hf|aarch64/).select { |jar| jar =~ /linux/ }
   opengl.concat %w[jogl-all.jar gluegen-rt.jar]
   opengl.each do |gl|

data/docs/.gitignore

@@ -3,4 +3,5 @@
 _site
 .sass-cache
 .jekyll-metadata
+.jekyll-cache
 Gemfile.lock

data/docs/_classes/{app_render → gfx_render}/app_render.md

@@ -1,17 +1,17 @@
 ---
 layout: post
-title:  "AppRender and ShapeRender"
-keywords: to_vertex, Vec3D, Vec2D, AppRender, ShapeRender
+title:  "GfxRender and ShapeRender"
+keywords: to_vertex, Vec3D, Vec2D, GfxRender, ShapeRender
 ---
-Vec2D and Vec3D classes can be efficiently rendered as both PApplet vertices, and PShape vertices using AppRender and ShapeRender utility classes. To use the AppRender renderer you should create a single instance in the processing setup see below example:-
+Vec2D and Vec3D classes can be efficiently rendered as both PApplet vertices, and PShape vertices using GfxRender and ShapeRender utility classes. To use the GfxRender renderer you should create a single instance in the processing setup see below example:-
 
-### AppRender
+### GfxRender
 
 ```ruby
 attr_reader :renderer
 ...
 def setup
-  @renderer = AppRender.new(self)
+  @renderer = GfxRender.new(self)
 end
 ...
 ```

data/docs/_methods/{noise_mode.md → noise_modes.md}

@@ -1,11 +1,12 @@
 ---
 layout: post
-title:  "noise_mode"
+title:  "Noise Modes"
 ---
 
 ### Name ###
 
-`noise_mode` _NB: not currently available in vanilla processing_.
+There are two noise modes available in PiCrate, both base on KdotJPG java noise.
+The default noise uses the FastNoise module, the SmoothNoise module can be used using the module name as a prefix see example below.
 
 ### Examples ###
 
@@ -25,24 +26,12 @@ class TestNoise < Processing::App
     noise_scale = 0.01
     background(0)
     grid(width, height, 10, 10) do |x, y|
-      arrow(x, y, noise(x * noise_scale, y * noise_scale, z * noise_scale) * TWO_PI * 2)
+      arrow(x, y, SmoothNoise.noise(x * noise_scale, y * noise_scale, z * noise_scale) * TWO_PI * 2)
+      # arrow(x, y, noise(x * noise_scale, y * noise_scale, z * noise_scale) * TWO_PI * 2)
     end
     @z += 1
   end
 
-  def mouse_pressed
-    mode = NoiseMode::OPEN_SMOOTH # Smooth classic OpenSimplex2
-    noise_mode mode
-    sketch_title mode.description
-  end
-
-  def mouse_released
-    mode = NoiseMode::DEFAULT # Fast classic OpenSimplex2
-    noise_mode(mode)
-    sketch_title mode.description
-  end
-
-
   def arrow(x, y, ang)
     push_matrix()
     translate(x, y)
@@ -68,15 +57,14 @@ TestNoise.new
 ### Description	###
 
 Currently supports four implementations of noise:-
-1. DEFAULT # fast classic OpenSimplex2
-2. OPEN_SMOOTH # smoother class OpenSimplex2F
-3. FAST_TERRAIN # more suited to terrain
-4. SMOOTH_TERRAIN # as above but smoother
+1. Default is classic OpenSimplex2
+2. SmoothNoise use smoother class OpenSimplex2F
+3. Use tnoise instead of noise for a noise mode more suited to terrain
 
 ### Syntax ###
 
 ```ruby
-noise_mode(mode) # default is NoiseMode::DEFAULT, a fast classic OpenSimplex2
+SmoothNoise.noise(...) # no prefix for fast classic OpenSimplex2
 ```
 
 ### Related ###

data/docs/_posts/2018-05-06-install_jruby.md

@@ -14,7 +14,7 @@ Get the latest version from [http://jruby.org/download][download]
 
 ```bash
 cd /opt
-sudo tar xzvf /pathToDownload/jruby-bin-9.2.14.0.tar.gz
+sudo tar xzvf /pathToDownload/jruby-bin-9.3.0.0.tar.gz
 ```
 
 Then use the excellent `update-alternatives` tool to provide symbolic links to `jruby`, `jgem`, `jirb` and `rake` especially if you haven't installed `mri` ruby.
@@ -31,16 +31,16 @@ You should prefer to install gems locally (no need for sudo). To do that it is c
 ```bash
 alias jpry="jruby -e \"require 'pry'; binding.pry\""
 # export JAVA_HOME="/opt/jdk1.8.0_151" # if using oracle java openjdk-8 is fine though
-export GEM_HOME="$HOME/.gem/ruby/2.5.0"
-export GEM_PATH="$HOME/tux/.gem/ruby/2.5.0"
+export GEM_HOME="$HOME/.gem/ruby/2.6.0"
+export GEM_PATH="$HOME/tux/.gem/ruby/2.6.0"
 export PATH="${PATH}:${GEM_PATH}/bin"
 ```
 
 ### Automated install using bash ###
 
-The [picrate2_install.sh][bash] script currently installs jruby-9.2.14.0 and picrate-2.2.0.
+The [picrate2_install.sh][bash] script currently installs jruby-9.3.0.0 and picrate-2.5.0.
 
 If you know better please post on wiki
 
-[download]:"https://repo1.maven.org/maven2/org/jruby/jruby-dist/9.2.14.0/jruby-dist-9.2.14.0-bin.tar.gz"
+[download]:"https://repo1.maven.org/maven2/org/jruby/jruby-dist/9.3.0.0/jruby-dist-9.3.0.0-bin.tar.gz"
 [bash]:https://gist.github.com/monkstone/6ae9840d7b7008c177b4a9f589d14ec6

data/docs/_posts/2019-11-11-getting_started_buster.md

@@ -5,7 +5,7 @@ date:   2019-11-11 07:34:13
 categories: PiCrate update
 permalink: /getting_buster/
 ---
-Raspbian Buster usually comes with a pre-installed jdk11. Before installing JRuby it is worth setting the `JAVA_HOME` environmental variable (needed to supress reflection warnings).
+RaspberryPI OS usually comes with a pre-installed jdk11. Before installing JRuby it might be worth setting the `JAVA_HOME` environmental variable (_to supress reflection warnings_).
 
   __Otherwise follow these instructions in order as needed:-__
 

data/lib/picrate/app.rb

@@ -84,7 +84,7 @@ module Processing
     class << self
       # Handy getters and setters on the class go here:
       attr_accessor :sketch_class, :library_loader, :arguments, :options
-      attr_reader :surface, :width, :height, :renderer
+      attr_reader :surface, :width, :height, :mode
       def load_libraries(*args)
         library_loader ||= LibraryLoader.new
         library_loader.load_library(*args)
@@ -132,11 +132,11 @@ module Processing
     end
 
     def size(*args)
-      w, h, renderer = *args
+      w, h, mode = *args
       @width ||= w
       @height ||= h
-      @renderer ||= renderer
-      import_opengl if /opengl/ =~ renderer
+      @mode ||= mode
+      import_opengl if /opengl/ =~ mode
       super(*args)
     end
 

data/lib/picrate/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PiCrate
-  VERSION = '2.4.2'
+  VERSION = '2.5.0'
 end

data/picrate.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.add_development_dependency 'minitest', '~> 5.14'
   gem.add_runtime_dependency 'rake', '~> 13.0'
-  gem.add_runtime_dependency 'arcball', '~> 1.1', '>= 1.1.1'
+  gem.add_runtime_dependency 'arcball', '~> 1.2'
   gem.require_paths = ['lib']
   gem.platform      = 'java'
   gem.requirements << 'java runtime == 11+'

data/pom.rb

@@ -2,7 +2,7 @@
 
 project 'picrate', 'http://maven.apache.org' do
   model_version '4.0.0'
-  id 'ruby-processing:picrate:2.4.2'
+  id 'ruby-processing:picrate:2.5.0'
   packaging 'jar'
 
   description 'An integrated processing-core (somewhat hacked), with additional java code for a jruby version of processing.'
@@ -24,6 +24,7 @@ project 'picrate', 'http://maven.apache.org' do
   issue_management 'https://github.com/ruby-processing/PiCrate/issues', 'Github'
   # Need to update to jogl 2.4.1 as soon as available, then make a dependency
   properties('jogl.version' => '2.3.2',
+             'jruby.version' => '9.3.0.0',
              'batik.version' => '1.14',
              'itextpdf.version' => '5.5.13.2',
              'jruby.api' => 'http://jruby.org/apidocs/',
@@ -33,7 +34,7 @@ project 'picrate', 'http://maven.apache.org' do
              'project.build.sourceEncoding' => 'UTF-8',
              'polyglot.dump.pom' => 'pom.xml')
 
-  pom 'org.jruby:jruby:9.2.19.0'
+  jar 'org.jruby:jruby-base:9.3.0.0'
   jar 'org.jogamp.jogl:jogl-all:${jogl.version}'
   jar 'org.jogamp.gluegen:gluegen-rt-main:${jogl.version}'
   jar 'org.processing:video:3.0.2'

data/pom.xml

@@ -11,7 +11,7 @@ DO NOT MODIFY - GENERATED CODE
   <modelVersion>4.0.0</modelVersion>
   <groupId>ruby-processing</groupId>
   <artifactId>picrate</artifactId>
-  <version>2.4.2</version>
+  <version>2.5.0</version>
   <name>picrate</name>
   <description>An integrated processing-core (somewhat hacked), with additional java code for a jruby version of processing.</description>
   <url>http://maven.apache.org</url>
@@ -68,6 +68,7 @@ DO NOT MODIFY - GENERATED CODE
     <itextpdf.version>5.5.13.2</itextpdf.version>
     <jogl.version>2.3.2</jogl.version>
     <jruby.api>http://jruby.org/apidocs/</jruby.api>
+    <jruby.version>9.3.0.0</jruby.version>
     <picrate.basedir>${project.basedir}</picrate.basedir>
     <polyglot.dump.pom>pom.xml</polyglot.dump.pom>
     <processing.api>http://processing.github.io/processing-javadocs/core/</processing.api>
@@ -77,9 +78,8 @@ DO NOT MODIFY - GENERATED CODE
   <dependencies>
     <dependency>
       <groupId>org.jruby</groupId>
-      <artifactId>jruby</artifactId>
-      <version>9.2.19.0</version>
-      <type>pom</type>
+      <artifactId>jruby-base</artifactId>
+      <version>9.3.0.0</version>
     </dependency>
     <dependency>
       <groupId>org.jogamp.jogl</groupId>

data/src/main/java/monkstone/vecmath/GfxRender.java

@@ -3,20 +3,19 @@ package monkstone.vecmath;
 import processing.core.PGraphics;
 
 /**
- *
  *
  * @author Martin Prout
  */
 public class GfxRender implements JRender {
 
-    final PGraphics g;
+    final PGraphics graphics;
 
     /**
      *
-     * @param gfx PGraphics
+     * @param graphics PGraphics
      */
-    public GfxRender(final PGraphics gfx) {
-        this.g = gfx;
+    public GfxRender(final PGraphics graphics) {
+        this.graphics = graphics;
     }
 
     /**
@@ -26,7 +25,7 @@ public class GfxRender implements JRender {
      */
     @Override
     public void vertex(double x, double y) {
-        g.vertex((float) x, (float) y);
+        graphics.vertex((float) x, (float) y);
     }
 
     /**
@@ -36,7 +35,7 @@ public class GfxRender implements JRender {
      */
     @Override
     public void curveVertex(double x, double y) {
-        g.curveVertex((float) x, (float) y);
+        graphics.curveVertex((float) x, (float) y);
     }
 
     /**
@@ -47,7 +46,7 @@ public class GfxRender implements JRender {
      */
     @Override
     public void vertex(double x, double y, double z) {
-        g.vertex((float) x, (float) y, (float) z);
+        graphics.vertex((float) x, (float) y, (float) z);
     }
 
     /**
@@ -58,7 +57,7 @@ public class GfxRender implements JRender {
      */
     @Override
     public void normal(double x, double y, double z) {
-        g.normal((float) x, (float) y, (float) z);
+        graphics.normal((float) x, (float) y, (float) z);
     }
 
     /**
@@ -71,7 +70,7 @@ public class GfxRender implements JRender {
      */
     @Override
     public void vertex(double x, double y, double z, double u, double v) {
-        g.vertex((float) x, (float) y, (float) z, (float) u, (float) v);
+        graphics.vertex((float) x, (float) y, (float) z, (float) u, (float) v);
     }
 
     /**
@@ -82,6 +81,6 @@ public class GfxRender implements JRender {
      */
     @Override
     public void curveVertex(double x, double y, double z) {
-        g.curveVertex((float) x, (float) y, (float) z);
+        graphics.curveVertex((float) x, (float) y, (float) z);
     }
 }

data/src/main/java/monkstone/vecmath/JRender.java

@@ -1,7 +1,6 @@
 package monkstone.vecmath;
 
 /**
- *
  *
  * @author Martin Prout
  */
@@ -12,14 +11,14 @@ public interface JRender {
      * @param x double
      * @param y double
      */
-    public void vertex(double x, double y);
+    void vertex(double x, double y);
 
     /**
      *
      * @param x double
      * @param y double
      */
-    public void curveVertex(double x, double y);
+    void curveVertex(double x, double y);
 
     /**
      *
@@ -27,7 +26,7 @@ public interface JRender {
      * @param y double
      * @param z double
      */
-    public void vertex(double x, double y, double z);
+    void vertex(double x, double y, double z);
 
     /**
      *
@@ -37,7 +36,7 @@ public interface JRender {
      * @param u double
      * @param v double
      */
-    public void vertex(double x, double y, double z, double u, double v);
+    void vertex(double x, double y, double z, double u, double v);
 
     /**
      *
@@ -45,7 +44,7 @@ public interface JRender {
      * @param y double
      * @param z double
      */
-    public void curveVertex(double x, double y, double z);
+    void curveVertex(double x, double y, double z);
 
     /**
      *
@@ -53,5 +52,6 @@ public interface JRender {
      * @param y double
      * @param z double
      */
-    public void normal(double x, double y, double z);
+    void normal(double x, double y, double z);
 }
+

data/src/main/java/monkstone/vecmath/ShapeRender.java

@@ -3,7 +3,6 @@ package monkstone.vecmath;
 import processing.core.PShape;
 
 /**
- *
  *
  * @author Martin Prout
  */
@@ -29,7 +28,7 @@ public class ShapeRender implements JRender {
     public void vertex(double x, double y) {
         shape.vertex((float) x, (float) y);
     }
-    
+
     /**
      *
      * @param x double
@@ -37,7 +36,7 @@ public class ShapeRender implements JRender {
      */
     @Override
     public void curveVertex(double x, double y) {
-        shape.curveVertex((float) x, (float) y);
+        throw new UnsupportedOperationException("Not implemented for this renderer");
     }
 
     /**
@@ -74,7 +73,7 @@ public class ShapeRender implements JRender {
     public void vertex(double x, double y, double z, double u, double v) {
         shape.vertex((float) x, (float) y, (float) z, (float) u, (float) v);
     }
-    
+
     /**
      *
      * @param x double