picrate 2.4.0-java → 2.5.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 648440446709f65ab3078f0a76525114d496e740b9e6584869bfd7c975017096
-  data.tar.gz: d31bd972a3e7b362319bffbbd0a5374c9e0112a76be8cae66037217561353065
+  metadata.gz: b3f8a1c6f427e8d6496ffa52f10da57bc8763f8dd92d52074652409658684fba
+  data.tar.gz: b0e3cf6d3c457bea3fdda0642d10c0a443528752b13e1ac2dd767f2bb3c0798a
 SHA512:
-  metadata.gz: 5baa9ec19140c192d992773b1f37618d67332ac5917ee0f14e6198612c380b4997908ce32ff8f2f81cabf9fd48b739bb40a2e4eccc3f7172388541599c7e4fb6
-  data.tar.gz: 828d1c8aa7e31cfd47c0f4a73307cbc7e962e1e1f8860e256d2e4591ab8933391841c8a3df9b22e3de1f0cf80d7d6c67fdc3234433e21c1c4f8de98b6f6db468
+  metadata.gz: 1de09c1115c514a845a63b00d777784550c2d1a1c20662ed59974727460652927ab7706d7380433cea31fd1f7d67c7b31f494bd566b990c9e94152120766b543
+  data.tar.gz: 290f982b1b70b41e58de89182b2603f96c6276f1381d19f10b5d3827aebea20f81af3c609cb07fda2a662a21b02dae5ce72dbd18b9adda12970bf0eca87865c8

data/.mvn/wrapper/maven-wrapper.properties

@@ -1,2 +1,2 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.3/apache-maven-3.8.3-bin.zip
 wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+v2.5.1 Update to JRuby-9.3.1.0, under the hood changes in how we access java fields, no using `field` in place of `declared_field`, possible since JRuby-9.3.0.0 required since JRuby-9.3.1.0.
+
+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.
 
 v2.3.0 Abandon Processing Value Noise in favour of OpenSimplex2, with choosable options. Added pdf library using iText5.
@@ -36,7 +44,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.0-java.gem
+jgem install picrate-2.5.1-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.1.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.1.0/jruby-dist-9.3.1.0-bin.tar.gz"
 [bash]:https://gist.github.com/monkstone/6ae9840d7b7008c177b4a9f589d14ec6

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

@@ -1,11 +1,11 @@
 ---
 layout: post
-title:  "Getting Started Buster"
+title:  "Getting Started RaspbianOS"
 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/docs/_posts/2020-05-11-getting_started_manjaro.md

@@ -5,19 +5,28 @@ date:   2020-05-11 07:34:13
 categories: PiCrate update
 permalink: /getting_manjaro/
 ---
-If Manjaro does not come with a pre-installed java, then the first step is to install a `jdk` the distro version (jdk14) should work. 
+If Manjaro does not come with a pre-installed java, then the first step is to install a `jdk` the distro version (jdk16) should work.
 
 ```bash
-sudo pacman -S jdk-openjdk # current distro version jdk14
+sudo pacman -S jre-openjdk # current distro version jdk16
 ```
 You can also use pacman to install jruby
 ```bash
-sudo pacman -S jruby # current version jruby-9.2.14.0
+sudo pacman -S jruby # current version jruby-9.3.0.0
 ```
 It is probably a good idea to create a local gem store (rather needing to use sudo to install gems)
+```bash
+sudo pacman -S vim # all you need if your happy with vim
+```
+Vim is not installed by default
+```bash
+sudo pacman -S geany # if you prefer a GUI
+```
+Geany is not installed by default
+
 
 ```bash
-mkdir -p ~/.gem/ruby/2.5.0 # current MRI version supported by jruby
+mkdir -p ~/.gem/ruby/2.6.0 # current MRI version supported by jruby
 ```
 Now set your `GEM_HOME`, `GEM_PATH` and amend your `PATH` as follows:-
 

data/docs/about.md

@@ -4,7 +4,7 @@ title: About
 permalink: /about/
 ---
 ![picrate.png]({{ site.github.url }}/assets/android-chrome-192x192.png)
-PiCrate is both a `library` and an `app` that allows you to create [processing][processing] sketches in ruby on the [RaspberryPI][PI] (or 64 bit linux). PiCrate is available as a gem (from [rubygems][rubygems]), it requires [JRuby][jruby] to both install and run. It does not depend on a vanilla processing install ( _cf_ JRubyArt).Tested on raspbian Buster on RaspberryPI3B+ and RaspberryPI4, also works on Manajaro distro (64bit) on RapsberryPI4.
+PiCrate is both a `library` and an `app` that allows you to create [processing][processing] sketches in ruby on the [RaspberryPI][PI] (or 64 bit linux). PiCrate is available as a gem (from [rubygems][rubygems]), it requires [JRuby][jruby] to both install and run. It does not depend on a vanilla processing install.Tested on RaspbianOS on RaspberryPI3B+ and RaspberryPI4, also works on Manajaro distro (64bit) on RaspberryPI4.
 
 #### Executable ####
 

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
+      attr_reader :surface, :width, :height, :mode
       def load_libraries(*args)
         library_loader ||= LibraryLoader.new
         library_loader.load_library(*args)
@@ -135,7 +135,7 @@ module Processing
       w, h, mode = *args
       @width ||= w
       @height ||= h
-      @render_mode ||= mode
+      @mode ||= mode
       import_opengl if /opengl/ =~ mode
       super(*args)
     end
@@ -159,12 +159,6 @@ module Processing
       end
     end
 
-    def proxy_java_fields
-      fields = %w[sketchPath key frameRate mousePressed keyPressed]
-      methods = fields.map { |field| java_class.declared_field(field) }
-      @declared_fields = Hash[fields.zip(methods)]
-    end
-
     # When certain special methods get added to the sketch, we need to let
     # Processing call them by their expected Java names.
     def method_added(method_name) #:nodoc:

data/lib/picrate/helper_methods.rb

@@ -117,14 +117,14 @@ module Processing
     # some methods. Add to this list as needed.
     def proxy_java_fields
       fields = %w[key frameRate mousePressed keyPressed]
-      methods = fields.map { |field| java_class.declared_field(field) }
-      @declared_fields = Hash[fields.zip(methods)]
+      methods = fields.map { |field| java_class.field(field) }
+      @jfields = Hash[fields.zip(methods)]
     end
 
     # Fix java conversion problems getting the last key
     # If it's ASCII, return the character, otherwise the integer
     def key
-      int = @declared_fields['key'].value(java_self)
+      int = @jfields['key'].value(java_self)
       int < 256 ? int.chr : int
     end
 
@@ -161,19 +161,19 @@ module Processing
 
     # frame_rate needs to support reading and writing
     def frame_rate(fps = nil)
-      return @declared_fields['frameRate'].value(java_self) unless fps
+      return @jfields['frameRate'].value(java_self) unless fps
 
       super(fps)
     end
 
     # Is the mouse pressed for this frame?
     def mouse_pressed?
-      @declared_fields['mousePressed'].value(java_self)
+      @jfields['mousePressed'].value(java_self)
     end
 
     # Is a key pressed for this frame?
     def key_pressed?
-      @declared_fields['keyPressed'].value(java_self)
+      @jfields['keyPressed'].value(java_self)
     end
 
     private

data/lib/picrate/native_folder.rb

@@ -8,7 +8,7 @@ class NativeFolder
   ARM64 = '-aarch64'.freeze
 
   def initialize
-    @os = java.lang.System.get_property('os.name')
+    @os = java.lang.System.get_property('os.name').downcase
     @bit = java.lang.System.get_property('os.arch')
   end
 

data/lib/picrate/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PiCrate
-  VERSION = '2.4.0'
+  VERSION = '2.5.1'
 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.0', '>= 1.0.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.0'
+  id 'ruby-processing:picrate:2.5.1'
   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.1.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.16.0'
+  jar 'org.jruby:jruby-base:${jruby.version}'
   jar 'org.jogamp.jogl:jogl-all:${jogl.version}'
   jar 'org.jogamp.gluegen:gluegen-rt-main:${jogl.version}'
   jar 'org.processing:video:3.0.2'
@@ -82,11 +83,10 @@ end
 build do
   resource do
     directory '${source.directory}/main/java'
-    includes '**/**/*.glsl', '**/*.jnilib'
     excludes '**/**/*.java'
   end
   resource do
     directory '${source.directory}/main/resources'
-    includes '**/*.png', '*.txt'
+    includes '**/*.png', '**/*.txt', '**/*.glsl'
   end
 end

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.0</version>
+  <version>2.5.1</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.1.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.16.0</version>
-      <type>pom</type>
+      <artifactId>jruby-base</artifactId>
+      <version>${jruby.version}</version>
     </dependency>
     <dependency>
       <groupId>org.jogamp.jogl</groupId>
@@ -111,10 +111,6 @@ DO NOT MODIFY - GENERATED CODE
     <resources>
       <resource>
         <directory>${source.directory}/main/java</directory>
-        <includes>
-          <include>**/**/*.glsl</include>
-          <include>**/*.jnilib</include>
-        </includes>
         <excludes>
           <exclude>**/**/*.java</exclude>
         </excludes>
@@ -123,7 +119,8 @@ DO NOT MODIFY - GENERATED CODE
         <directory>${source.directory}/main/resources</directory>
         <includes>
           <include>**/*.png</include>
-          <include>*.txt</include>
+          <include>**/*.txt</include>
+          <include>**/*.glsl</include>
         </includes>
       </resource>
     </resources>

data/src/main/java/monkstone/FastNoiseModuleJava.java

@@ -49,21 +49,21 @@ public class FastNoiseModuleJava {
         double four;
         switch (args.length) {
             case 2:
-                two = (args[1] instanceof RubyFloat) ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
-                one = (args[0] instanceof RubyFloat) ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
+                two = args[1] instanceof RubyFloat ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
+                one = args[0] instanceof RubyFloat ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
                 result = ng.noise2_XBeforeY(one, two);
                 break;
             case 3:
-                three = (args[2] instanceof RubyFloat) ? ((RubyFloat) args[2]).getValue() : ((RubyFixnum) args[2]).getDoubleValue();
-                two = (args[1] instanceof RubyFloat) ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
-                one = (args[0] instanceof RubyFloat) ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
+                three = args[2] instanceof RubyFloat ? ((RubyFloat) args[2]).getValue() : ((RubyFixnum) args[2]).getDoubleValue();
+                two = args[1] instanceof RubyFloat ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
+                one = args[0] instanceof RubyFloat ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
                 result = ng.noise3_XYBeforeZ(one, two, three);
                 break;
             case 4:
-                four = (args[3] instanceof RubyFloat) ? ((RubyFloat) args[3]).getValue() : ((RubyFixnum) args[3]).getDoubleValue();
-                three = (args[2] instanceof RubyFloat) ? ((RubyFloat) args[2]).getValue() : ((RubyFixnum) args[2]).getDoubleValue();
-                two = (args[1] instanceof RubyFloat) ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
-                one = (args[0] instanceof RubyFloat) ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
+                four = args[3] instanceof RubyFloat ? ((RubyFloat) args[3]).getValue() : ((RubyFixnum) args[3]).getDoubleValue();
+                three = args[2] instanceof RubyFloat ? ((RubyFloat) args[2]).getValue() : ((RubyFixnum) args[2]).getDoubleValue();
+                two = args[1] instanceof RubyFloat ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
+                one = args[0] instanceof RubyFloat ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
                 result = ng.noise4_XYBeforeZW(one, two, three, four);
                 break;
             default:
@@ -88,25 +88,25 @@ public class FastNoiseModuleJava {
         double four;
         switch (args.length) {
             case 1:
-                one = (args[0] instanceof RubyFloat) ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
+                one = args[0] instanceof RubyFloat ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
                 result = ng.noise2(one, 0);
                 break;
             case 2:
-                two = (args[1] instanceof RubyFloat) ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
-                one = (args[0] instanceof RubyFloat) ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
+                two = args[1] instanceof RubyFloat ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
+                one = args[0] instanceof RubyFloat ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
                 result = ng.noise2(one, two);
                 break;
             case 3:
-                three = (args[2] instanceof RubyFloat) ? ((RubyFloat) args[2]).getValue() : ((RubyFixnum) args[2]).getDoubleValue();
-                two = (args[1] instanceof RubyFloat) ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
-                one = (args[0] instanceof RubyFloat) ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
+                three = args[2] instanceof RubyFloat ? ((RubyFloat) args[2]).getValue() : ((RubyFixnum) args[2]).getDoubleValue();
+                two = args[1] instanceof RubyFloat ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
+                one = args[0] instanceof RubyFloat ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
                 result = ng.noise3_Classic(one, two, three);
                 break;
             case 4:
-                four = (args[3] instanceof RubyFloat) ? ((RubyFloat) args[3]).getValue() : ((RubyFixnum) args[3]).getDoubleValue();
-                three = (args[2] instanceof RubyFloat) ? ((RubyFloat) args[2]).getValue() : ((RubyFixnum) args[2]).getDoubleValue();
-                two = (args[1] instanceof RubyFloat) ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
-                one = (args[0] instanceof RubyFloat) ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
+                four = args[3] instanceof RubyFloat ? ((RubyFloat) args[3]).getValue() : ((RubyFixnum) args[3]).getDoubleValue();
+                three = args[2] instanceof RubyFloat ? ((RubyFloat) args[2]).getValue() : ((RubyFixnum) args[2]).getDoubleValue();
+                two = args[1] instanceof RubyFloat ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
+                one = args[0] instanceof RubyFloat ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
                 result = ng.noise4_Classic(one, two, three, four);
                 break;
             default:

data/src/main/java/monkstone/SmoothNoiseModuleJava.java

@@ -49,21 +49,21 @@ public class SmoothNoiseModuleJava {
         double four;
         switch (args.length) {
             case 2:
-                two = (args[1] instanceof RubyFloat) ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
-                one = (args[0] instanceof RubyFloat) ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
+                two = args[1] instanceof RubyFloat ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
+                one = args[0] instanceof RubyFloat ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
                 result = ng.noise2_XBeforeY(one, two);
                 break;
             case 3:
-                three = (args[2] instanceof RubyFloat) ? ((RubyFloat) args[2]).getValue() : ((RubyFixnum) args[2]).getDoubleValue();
-                two = (args[1] instanceof RubyFloat) ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
-                one = (args[0] instanceof RubyFloat) ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
+                three = args[2] instanceof RubyFloat ? ((RubyFloat) args[2]).getValue() : ((RubyFixnum) args[2]).getDoubleValue();
+                two = args[1] instanceof RubyFloat ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
+                one = args[0] instanceof RubyFloat ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
                 result = ng.noise3_XYBeforeZ(one, two, three);
                 break;
             case 4:
-                four = (args[3] instanceof RubyFloat) ? ((RubyFloat) args[3]).getValue() : ((RubyFixnum) args[3]).getDoubleValue();
-                three = (args[2] instanceof RubyFloat) ? ((RubyFloat) args[2]).getValue() : ((RubyFixnum) args[2]).getDoubleValue();
-                two = (args[1] instanceof RubyFloat) ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
-                one = (args[0] instanceof RubyFloat) ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
+                four = args[3] instanceof RubyFloat ? ((RubyFloat) args[3]).getValue() : ((RubyFixnum) args[3]).getDoubleValue();
+                three = args[2] instanceof RubyFloat ? ((RubyFloat) args[2]).getValue() : ((RubyFixnum) args[2]).getDoubleValue();
+                two = args[1] instanceof RubyFloat ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
+                one = args[0] instanceof RubyFloat ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
                 result = ng.noise4_XYBeforeZW(one, two, three, four);
                 break;
             default:
@@ -88,25 +88,25 @@ public class SmoothNoiseModuleJava {
         double four;
         switch (args.length) {
             case 1:
-                one = (args[0] instanceof RubyFloat) ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
+                one = args[0] instanceof RubyFloat ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
                 result = ng.noise2(one, 0);
                 break;
             case 2:
-                two = (args[1] instanceof RubyFloat) ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
-                one = (args[0] instanceof RubyFloat) ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
+                two = args[1] instanceof RubyFloat ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
+                one = args[0] instanceof RubyFloat ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
                 result = ng.noise2(one, two);
                 break;
             case 3:
-                three = (args[2] instanceof RubyFloat) ? ((RubyFloat) args[2]).getValue() : ((RubyFixnum) args[2]).getDoubleValue();
-                two = (args[1] instanceof RubyFloat) ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
-                one = (args[0] instanceof RubyFloat) ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
+                three = args[2] instanceof RubyFloat ? ((RubyFloat) args[2]).getValue() : ((RubyFixnum) args[2]).getDoubleValue();
+                two = args[1] instanceof RubyFloat ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
+                one = args[0] instanceof RubyFloat ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
                 result = ng.noise3_Classic(one, two, three);
                 break;
             case 4:
-                four = (args[3] instanceof RubyFloat) ? ((RubyFloat) args[3]).getValue() : ((RubyFixnum) args[3]).getDoubleValue();
-                three = (args[2] instanceof RubyFloat) ? ((RubyFloat) args[2]).getValue() : ((RubyFixnum) args[2]).getDoubleValue();
-                two = (args[1] instanceof RubyFloat) ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
-                one = (args[0] instanceof RubyFloat) ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
+                four = args[3] instanceof RubyFloat ? ((RubyFloat) args[3]).getValue() : ((RubyFixnum) args[3]).getDoubleValue();
+                three = args[2] instanceof RubyFloat ? ((RubyFloat) args[2]).getValue() : ((RubyFixnum) args[2]).getDoubleValue();
+                two = args[1] instanceof RubyFloat ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
+                one = args[0] instanceof RubyFloat ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
                 result = ng.noise4_Classic(one, two, three, four);
                 break;
             default: