propane 3.4.0-java → 3.4.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a17549b4cc5bcc10bb764cca572641ea1cc26e03f3634e6ca6765566d74e31a
-  data.tar.gz: 365bcb651c4a64e0218c35c21ee08b7e62c7dd55523d4fc6d1a4552bd8bbc636
+  metadata.gz: f88b5c1c3e6afb699ccabb96cd98d9b60aa9d8ec0614d59a601a3e8df074946b
+  data.tar.gz: 6943a2c007f56b01faf2ce1e3636f407d53dbf80c36458c27598e4365da46b48
 SHA512:
-  metadata.gz: 6cfc69cad0fe6d1d3a2e663ae267bb8057c4552702133554febb911aec0495cfbe231801489419e2b1d85ce1d4e55e87c2e66d69d3606d1d864a5fc074fa84c5
-  data.tar.gz: 298859b0bf5f3ac80796b85d306fb0f1f20b99c28857c469a0bd7ae896abb81d96d74b4a8c3105a7ccd26345ca4569659d695c22322bcfa07b90c880147e138b
+  metadata.gz: 0162ff22dcdda3764363e5fc2c1c07c9619a3f97e209837faa125a8d4fd6412e6077cd3ba3a436efbd33db7371a68adcbb166e46d324846aecff155ef4690c44
+  data.tar.gz: c4fad0d7f20ca7b4b9fb5f840caf63da4d8f9f21805029e46fa024ce6c2b5d8cb7263df9ddba95932d2825d9510bd6bbd47884a478ce55aa135bcee2df4ab06d

data/.mvn/extensions.xml

@@ -3,7 +3,6 @@
   <extension>
     <groupId>io.takari.polyglot</groupId>
     <artifactId>polyglot-ruby</artifactId>
-    <version>0.4.0</version>
+    <version>0.4.4</version>
   </extension>
 </extensions>
-

data/.travis.yml

@@ -1,8 +1,8 @@
 language: java
-dist: trusty
+dist: bionic
 
 rvm:
-  - jruby-9.2.7.0
+  - jruby-9.2.9.0
 jdk:
   - openjdk11
 os:

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+**v3.4.1** Update to JRuby-9.2.9.0
+
 **v3.4.0** Experimental refactoring of ThinkDifferent, and some other processing classes
 
 **v3.3.1** Reflection makes refactoring a nightmare DesktopHandler => ThinkDifferent

data/README.md

@@ -1,6 +1,6 @@
-# Propane ![Travis CI](https://travis-ci.org/ruby-processing/propane.svg)
+# Propane [![Gem Version](https://badge.fury.io/rb/propane.svg)](https://badge.fury.io/rb/propane) ![Travis CI](https://travis-ci.org/ruby-processing/propane.svg)
 
-This version is intended to work with openjdk11+, @sampottinger is currently working on [vanilla processing][vanilla] which will enable JRubyArt to catch up. Unfortunately there is a cockup in debian distributions, and it is currently safer to use the Oracle version on debian (Archlinux openjdk version is fine).
+This version is intended to work with openjdk11+, @sampottinger is currently working on [vanilla processing][vanilla] which will enable JRubyArt to catch up.
 
 A slim layer to communicate with Processing from JRuby, features maven build. We have created a configuration free version of ruby processing, for processing-4.0+, where we include a modified processing core (`public runPropane()` to replace `protected runSketch()`. These jars are small enough to include in a gem distribution, and hence we do not require configuration. This has created a scriptable version, ie files get run direct from jruby. Currently JavaFX is unsupported again @sampottinger is currently working on [vanilla processing][vanilla] to use OpenJFX. It would be nice make use of java modules, but I think we should let jruby project do that first (unless processing.org beat them to it).
 
@@ -8,9 +8,12 @@ adjust above for your OS/distro setup.
 
 ## Requirements
 
-- `jdk-11.0.2+`
-- `jruby-9.2.7.0`
-- `mvn-3.5.4+`
+There may be a linker issue with P2D or P3D sketches with stock openjdk with some linux distros, in which case you might find [Adopt open jdk binaries][adopt] will work for you.
+
+- `jdk-11.0.3+`
+- `jruby-9.2.9.0`
+
+Currently you can ignore `illegal reflective access` warnings, see [here how to suppress them][warning].
 
 ## Building and testing
 
@@ -24,10 +27,10 @@ rake javadoc
 
 ```bash
 jgem install propane # from rubygems
-jgem install propane-3.3.0-java.gem # local install
+jgem install propane-3.4.1-java.gem # local install
 # Alternative
 jruby -S gem install propane # from rubygems
-jruby -S gem install propane-3.3.0-java.gem # local install
+jruby -S gem install propane-3.4.1-java.gem # local install
 ```
 
 ## Check Install
@@ -95,6 +98,8 @@ propane --install samples
 ```
  please move existing `propane_samples` if you wish to keep them. The current release features several PixelFlow glsl library examples, including a few shadertoy demos as sketches.
 
+[adopt]: https://adoptopenjdk.net/
 [building]:http://ruby-processing.github.io/building/building/
 [gh-pages]:https://ruby-processing.github.io/propane/
 [vanilla]:https://github.com/processing/processing/pull/5753
+[warning]: https://monkstone.github.io/jruby_art/update/2019/09/10/Reflective_Access.html

data/Rakefile

@@ -28,12 +28,12 @@ end
 
 desc 'Document'
 task :javadoc do
-  sh 'mvn javadoc:javadoc'
+	sh './mvnw javadoc:javadoc'
 end
 
 desc 'Compile'
 task :compile do
-  sh 'mvn package'
+	sh './mvnw package'
 end
 
 desc 'JRuby-Complete'

data/lib/propane.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 require 'java'
 unless defined? PROPANE_ROOT
-  $LOAD_PATH << File.expand_path(File.dirname(__FILE__))
-  PROPANE_ROOT = File.absolute_path(File.dirname(__dir__))
+  $LOAD_PATH << File.dirname(__dir__)
+  PROPANE_ROOT = File.dirname(__dir__)
 end
 Dir["#{PROPANE_ROOT}/lib/*.jar"].each do |jar|
   require jar

data/lib/propane/app.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: false
+
 require_relative 'helper_methods'
 require_relative 'library_loader'
 
@@ -8,7 +9,7 @@ module Propane
   # Load vecmath, fastmath and mathtool modules
   Java::Monkstone::PropaneLibrary.load(JRuby.runtime)
   SKETCH_ROOT = File.absolute_path('.')
-
+  # import custom Vecmath renderers
   module Render
     java_import 'monkstone.vecmath.GfxRender'
     java_import 'monkstone.vecmath.ShapeRender'
@@ -49,13 +50,15 @@ module Propane
 
   # All sketches extend this class
   class App < PApplet
-    include Math, MathTool, HelperMethods, Render
+    include HelperMethods
+    include Math
+    include MathTool
+    include Render
     # Alias some methods for familiarity for Shoes coders.
     alias oval ellipse
     alias stroke_width stroke_weight
     alias rgb color
     alias gray color
-    field_reader :surface
 
     def sketch_class
       self.class.sketch_class
@@ -75,8 +78,8 @@ module Propane
     #
     class << self
       # Handy getters and setters on the class go here:
-      attr_accessor :sketch_class, :library_loader, :title, :arguments, :options
-
+      attr_accessor :sketch_class, :library_loader, :arguments, :options
+      attr_reader :surface
       def load_libraries(*args)
         library_loader ||= LibraryLoader.new
         library_loader.load_library(*args)
@@ -99,6 +102,7 @@ module Propane
       # Processing call them by their expected Java names.
       def method_added(method_name) #:nodoc:
         return unless METHODS_TO_ALIAS.key?(method_name)
+
         alias_method METHODS_TO_ALIAS[method_name], method_name
       end
     end
@@ -112,12 +116,14 @@ module Propane
       proxy_java_fields
       raise TypeError unless options.is_a? Hash
       raise TypeError unless arguments.is_a? Array
+
       # Set up the sketch.
       super()
       post_initialize(options)
       Propane.app = self
       @arguments = arguments
       @options   = options
+      @surface   = get_surface
       run_propane
     end
 
@@ -130,8 +136,7 @@ module Propane
       super(*args)
     end
 
-    def post_initialize(_args)
-    end
+    def post_initialize(_args); end
 
     def sketch_title(title)
       surface.set_title(title)
@@ -164,6 +169,7 @@ module Propane
     # Processing call them by their expected Java names.
     def method_added(method_name) #:nodoc:
       return unless METHODS_TO_ALIAS.key?(method_name)
+
       alias_method METHODS_TO_ALIAS[method_name], method_name
     end
   end
@@ -181,7 +187,10 @@ module Propane
 
     def method_missing(name, *args, &block)
       return Propane.app.send(name, *args) if Propane.app.respond_to? name
+
       super
     end
-  end # Processing::Proxy
-end # Propane
+  end
+  # end Processing::Proxy
+end
+# end Propane

data/lib/propane/helper_methods.rb

@@ -56,7 +56,7 @@ module Propane
     end
 
     def web_to_color_array(web)
-      Java::Monkstone::ColorUtil.webArray(web)
+      Java::Monkstone::ColorUtil.webArray(web.to_java(:string))
     end
 
     def int_to_ruby_colors(hex)

data/lib/propane/runner.rb

@@ -40,7 +40,7 @@ module Propane
         end
 
         options[:install] = false
-        message = '<Samples><GLVideo><Video><Sound> Install samples or library'
+        message = '<Samples><Video><Sound> Install samples or library'
         opts.on('-i', '--install', message) do
           options[:install] = true
         end

data/lib/propane/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Propane
-  VERSION = '3.4.0'
+  VERSION = '3.4.1'
 end

data/library/color_group/color_group.rb

@@ -0,0 +1,26 @@
+java_import Java::Monkstone::ColorUtil
+
+# class wraps a java color array, supports shuffle!, last and ruby_string
+# as well as ability to initialize with an array of "web" color string
+class ColorGroup
+  attr_reader :colors
+  def initialize(p5cols)
+    @colors = p5cols
+  end
+
+  def self.from_web_array(web)
+    ColorGroup.new(ColorUtil.web_array(web.to_java(:string)))
+  end
+
+  def shuffle!
+    @colors = ColorUtil.shuffle(colors)
+  end
+
+  def ruby_string
+    ColorUtil.rubyString(colors)
+  end
+
+  def last
+    colors[0]
+  end
+end

data/library/dxf/dxf.rb

@@ -0,0 +1,4 @@
+# @TODO usage
+class Propane::App
+  java_import Java::ProcessingDxf::RawDXF
+end

data/library/net/net.rb

@@ -0,0 +1,5 @@
+# @TODO usage
+class Propane::App
+  java_import Java::ProcessingNet::Client
+  java_import Java::ProcessingNet::Server
+end

data/library/video_event/video_event.rb

@@ -1,3 +1,4 @@
 class Propane::App
-  include Java::MonkstoneVideoevent::VideoInterface
+  include Java::MonkstoneVideoevent::CaptureEvent
+  include Java::MonkstoneVideoevent::MovieEvent
 end

data/pom.rb

@@ -1,7 +1,7 @@
 project 'propane', 'https://github.com/monkstone/propane' do
 
   model_version '4.0.0'
-  id 'propane:propane:3.4.0'
+  id 'propane:propane:3.4.1'
   packaging 'jar'
 
   description 'An integrated processing-core (somewhat hacked), with additional java code for a jruby version of processing.'
@@ -45,8 +45,8 @@ project 'propane', 'https://github.com/monkstone/propane' do
       'jogl.version' => '2.3.2',
       'jruby.api' => 'http://jruby.org/apidocs/' )
 
-      pom 'org.jruby:jruby:9.2.8.0'
-      jar 'org.processing:video:3.2.3'
+      pom 'org.jruby:jruby:9.2.9.0'
+      jar 'org.processing:video:3.3.7'
       jar 'org.jogamp.jogl:jogl-all:${jogl.version}'
       jar 'org.jogamp.gluegen:gluegen-rt-main:${jogl.version}'
 

data/pom.xml

@@ -11,7 +11,7 @@ DO NOT MODIFIY - GENERATED CODE
   <modelVersion>4.0.0</modelVersion>
   <groupId>propane</groupId>
   <artifactId>propane</artifactId>
-  <version>3.4.0</version>
+  <version>3.4.1</version>
   <name>propane</name>
   <description>An integrated processing-core (somewhat hacked), with additional java code for a jruby version of processing.</description>
   <url>https://github.com/monkstone/propane</url>
@@ -74,13 +74,13 @@ DO NOT MODIFIY - GENERATED CODE
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby</artifactId>
-      <version>9.2.8.0</version>
+      <version>9.2.9.0</version>
       <type>pom</type>
     </dependency>
     <dependency>
       <groupId>org.processing</groupId>
       <artifactId>video</artifactId>
-      <version>3.2.3</version>
+      <version>3.3.7</version>
     </dependency>
     <dependency>
       <groupId>org.jogamp.jogl</groupId>

data/propane.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
   gem.summary       = %q{ruby implementation of processing-4.0 on MacOS, linux and windows (64bit only)}
   gem.homepage      = 'https://ruby-processing.github.io/propane/'
   gem.files         = `git ls-files`.split($/)
-  gem.files << 'lib/propane-3.4.0.jar'
+  gem.files << 'lib/propane-3.4.1.jar'
   gem.files << 'lib/gluegen-rt.jar'
   gem.files << 'lib/jogl-all.jar'
   gem.files << 'lib/gluegen-rt-natives-linux-amd64.jar'

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

@@ -19,8 +19,9 @@
 */ 
 package japplemenubar;
 
-import java.io.*;
-
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
 import processing.core.PApplet;
 
 
@@ -58,7 +59,6 @@ public class JAppleMenuBar {
 	    }
 	  } catch (IOException e) {
 	    sadness("Unknown error, here's the stack trace.");
-	    e.printStackTrace();
 	  }
 	}
 	

data/src/main/java/monkstone/ColorUtil.java

@@ -13,6 +13,9 @@
  */
 package monkstone;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
 /**
  *
  * @author Martin Prout
@@ -102,6 +105,17 @@ public class ColorUtil {
         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

data/src/main/java/monkstone/MathToolModule.java

@@ -22,216 +22,265 @@ import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 
 /**
- *
- * @author Martin Prout
- */
+*
+* @author Martin Prout
+*/
 @JRubyModule(name = "MathTool")
 public class MathToolModule {
 
-    /**
-     *
-     * @param runtime Ruby
-     */
-    public static void createMathToolModule(Ruby runtime) {
-        RubyModule mtModule = runtime.defineModule("MathTool");
-        mtModule.defineAnnotatedMethods(MathToolModule.class);
-    }
+  /**
+  *
+  * @param runtime Ruby
+  */
+  public static void createMathToolModule(Ruby runtime) {
+    RubyModule mtModule = runtime.defineModule("MathTool");
+    mtModule.defineAnnotatedMethods(MathToolModule.class);
+  }
 
-    /**
-     *
-     * @param context ThreadContext
-     * @param recv IRubyObject
-     * @param args array of RubyRange (must be be numeric)
-     * @return mapped value RubyFloat
-     */
-    @JRubyMethod(name = "map1d", rest = true, module = true)
-    public static IRubyObject mapOneD(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
-        double value = (args[0] instanceof RubyFloat)
-                ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
-        RubyRange r1 = (RubyRange) args[1];
-        RubyRange r2 = (RubyRange) args[2];
-        double first1 = (r1.first(context) instanceof RubyFloat)
-                ? ((RubyFloat) r1.first(context)).getValue() : ((RubyFixnum) r1.first(context)).getDoubleValue();
-        double first2 = (r2.first(context) instanceof RubyFloat)
-                ? ((RubyFloat) r2.first(context)).getValue() : ((RubyFixnum) r2.first(context)).getDoubleValue();
-        double last1 = (r1.last(context) instanceof RubyFloat)
-                ? ((RubyFloat) r1.last(context)).getValue() : ((RubyFixnum) r1.last(context)).getDoubleValue();
-        double last2 = (r2.last(context) instanceof RubyFloat)
-                ? ((RubyFloat) r2.last(context)).getValue() : ((RubyFixnum) r2.last(context)).getDoubleValue();
-        return mapMt(context, value, first1, last1, first2, last2);
-    }
+  /**
+  *
+  * @param context ThreadContext
+  * @param recv IRubyObject
+  * @param args array of RubyRange (must be be numeric)
+  * @return mapped value RubyFloat
+  */
+  @JRubyMethod(name = "map1d", rest = true, module = true)
+  public static IRubyObject mapOneD(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
+    double value = (args[0] instanceof RubyFloat)
+    ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
+    RubyRange r1 = (RubyRange) args[1];
+    RubyRange r2 = (RubyRange) args[2];
+    double first1 = (r1.first(context) instanceof RubyFloat)
+    ? ((RubyFloat) r1.first(context)).getValue() : ((RubyFixnum) r1.first(context)).getDoubleValue();
+    double first2 = (r2.first(context) instanceof RubyFloat)
+    ? ((RubyFloat) r2.first(context)).getValue() : ((RubyFixnum) r2.first(context)).getDoubleValue();
+    double last1 = (r1.last(context) instanceof RubyFloat)
+    ? ((RubyFloat) r1.last(context)).getValue() : ((RubyFixnum) r1.last(context)).getDoubleValue();
+    double last2 = (r2.last(context) instanceof RubyFloat)
+    ? ((RubyFloat) r2.last(context)).getValue() : ((RubyFixnum) r2.last(context)).getDoubleValue();
+    return mapMt(context, value, first1, last1, first2, last2);
+  }
 
-    /**
-     *
-     * @param context ThreadContext
-     * @param recv IRubyObject
-     * @param args array of RubyRange (must be be numeric)
-     * @return mapped value RubyFloat
-     */
-    @JRubyMethod(name = "constrained_map", rest = true, module = true)
-    public static IRubyObject constrainedMap(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
-        double value = (args[0] instanceof RubyFloat) ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
-        RubyRange r1 = (RubyRange) args[1];
-        RubyRange r2 = (RubyRange) args[2];
-        double first1 = (r1.first(context) instanceof RubyFloat)
-                ? ((RubyFloat) r1.first(context)).getValue() : ((RubyFixnum) r1.first(context)).getDoubleValue();
-        double first2 = (r2.first(context) instanceof RubyFloat)
-                ? ((RubyFloat) r2.first(context)).getValue() : ((RubyFixnum) r2.first(context)).getDoubleValue();
-        double last1 = (r1.last(context) instanceof RubyFloat)
-                ? ((RubyFloat) r1.last(context)).getValue() : ((RubyFixnum) r1.last(context)).getDoubleValue();
-        double last2 = (r2.last(context) instanceof RubyFloat)
-                ? ((RubyFloat) r2.last(context)).getValue() : ((RubyFixnum) r2.last(context)).getDoubleValue();
-        double max = Math.max(first1, last1);
-        double min = Math.min(first1, last1);
-        if (value < min) {
-            return mapMt(context, min, first1, last1, first2, last2);
-        }
-        if (value > max) {
-            return mapMt(context, max, first1, last1, first2, last2);
-        }
-        return mapMt(context, value, first1, last1, first2, last2);
+  /**
+  *
+  * @param context ThreadContext
+  * @param recv IRubyObject
+  * @param args array of RubyRange (must be be numeric)
+  * @return mapped value RubyFloat
+  */
+  @JRubyMethod(name = "constrained_map", rest = true, module = true)
+  public static IRubyObject constrainedMap(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
+    double value = (args[0] instanceof RubyFloat) ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
+    RubyRange r1 = (RubyRange) args[1];
+    RubyRange r2 = (RubyRange) args[2];
+    double first1 = (r1.first(context) instanceof RubyFloat)
+    ? ((RubyFloat) r1.first(context)).getValue() : ((RubyFixnum) r1.first(context)).getDoubleValue();
+    double first2 = (r2.first(context) instanceof RubyFloat)
+    ? ((RubyFloat) r2.first(context)).getValue() : ((RubyFixnum) r2.first(context)).getDoubleValue();
+    double last1 = (r1.last(context) instanceof RubyFloat)
+    ? ((RubyFloat) r1.last(context)).getValue() : ((RubyFixnum) r1.last(context)).getDoubleValue();
+    double last2 = (r2.last(context) instanceof RubyFloat)
+    ? ((RubyFloat) r2.last(context)).getValue() : ((RubyFixnum) r2.last(context)).getDoubleValue();
+    double max = Math.max(first1, last1);
+    double min = Math.min(first1, last1);
+    if (value < min) {
+      return mapMt(context, min, first1, last1, first2, last2);
     }
-
-    /**
-     *
-     * @param context ThreadContext
-     * @param recv self IRubyObject
-     * @param args floats as in processing map function
-     * @return mapped value RubyFloat
-     */
-    @JRubyMethod(name = "p5map", rest = true, module = true)
-    public static IRubyObject mapProcessing(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
-        double value = (args[0] instanceof RubyFloat) ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
-        double first1 = (args[1] instanceof RubyFloat) ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
-        double first2 = (args[3] instanceof RubyFloat) ? ((RubyFloat) args[3]).getValue() : ((RubyFixnum) args[3]).getDoubleValue();
-        double last1 = (args[2] instanceof RubyFloat) ? ((RubyFloat) args[2]).getValue() : ((RubyFixnum) args[2]).getDoubleValue();
-        double last2 = (args[4] instanceof RubyFloat) ? ((RubyFloat) args[4]).getValue() : ((RubyFixnum) args[4]).getDoubleValue();
-        return mapMt(context, value, first1, last1, first2, last2);
+    if (value > max) {
+      return mapMt(context, max, first1, last1, first2, last2);
     }
+    return mapMt(context, value, first1, last1, first2, last2);
+  }
 
-    /**
-     * A more correct version than processing.org version
-     *
-     * @param context ThreadContext
-     * @param recv self IRubyObject
-     * @param args args[2] should be between 0 and 1.0 if not returns start or
-     * stop
-     * @return lerped value RubyFloat
-     */
-    @JRubyMethod(name = "lerp", rest = true, module = true)
-    public static IRubyObject lerpP(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
-        double start = (args[0] instanceof RubyFloat) ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
-        double stop = (args[1] instanceof RubyFloat) ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
-        double amount = (args[2] instanceof RubyFloat) ? ((RubyFloat) args[2]).getValue() : ((RubyFixnum) args[2]).getDoubleValue();
-        if (amount <= 0) {
-            return args[0];
-        }
-        if (amount >= 1.0) {
-            return args[1];
-        }
-        return context.runtime.newFloat((1 - amount) * start + (stop * amount));
-    }
+  /**
+  *
+  * @param context ThreadContext
+  * @param recv self IRubyObject
+  * @param args floats as in processing map function
+  * @return mapped value RubyFloat
+  */
+  @JRubyMethod(name = "p5map", rest = true, module = true)
+  public static IRubyObject mapProcessing(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
+    double value = (args[0] instanceof RubyFloat) ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
+    double first1 = (args[1] instanceof RubyFloat) ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
+    double first2 = (args[3] instanceof RubyFloat) ? ((RubyFloat) args[3]).getValue() : ((RubyFixnum) args[3]).getDoubleValue();
+    double last1 = (args[2] instanceof RubyFloat) ? ((RubyFloat) args[2]).getValue() : ((RubyFixnum) args[2]).getDoubleValue();
+    double last2 = (args[4] instanceof RubyFloat) ? ((RubyFloat) args[4]).getValue() : ((RubyFixnum) args[4]).getDoubleValue();
+    return mapMt(context, value, first1, last1, first2, last2);
+  }
 
-    /**
-     * Identical to p5map(value, low, high, 0, 1). Numbers outside of the range
-     * are not clamped to 0 and 1, because out-of-range values are often
-     * intentional and useful.
-     *
-     * @param context ThreadContext
-     * @param recv IRubyObject
-     * @param args array of args must be be numeric
-     * @return mapped value RubyFloat
-     */
-    @JRubyMethod(name = "norm", rest = true, module = true)
-    public static IRubyObject normP(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
-        double value = (args[0] instanceof RubyFloat) ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
-        double start = (args[1] instanceof RubyFloat) ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
-        double stop = (args[2] instanceof RubyFloat) ? ((RubyFloat) args[2]).getValue() : ((RubyFixnum) args[2]).getDoubleValue();
-        return mapMt(context, value, start, stop, 0, 1.0);
+  /**
+  * A more correct version than processing.org version
+  *
+  * @param context ThreadContext
+  * @param recv self IRubyObject
+  * @param args args[2] should be between 0 and 1.0 if not returns start or
+  * stop
+  * @return lerped value RubyFloat
+  */
+  @JRubyMethod(name = "lerp", rest = true, module = true)
+  public static IRubyObject lerpP(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
+    double start = (args[0] instanceof RubyFloat) ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
+    double stop = (args[1] instanceof RubyFloat) ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
+    double amount = (args[2] instanceof RubyFloat) ? ((RubyFloat) args[2]).getValue() : ((RubyFixnum) args[2]).getDoubleValue();
+    if (amount <= 0) {
+      return args[0];
     }
-
-    /**
-     * Identical to p5map(value, low, high, 0, 1) but 'clamped'. Numbers outside
-     * of the range are clamped to 0 and 1,
-     *
-     * @param context ThreadContext
-     * @param recv IRubyObject
-     * @param args array of args must be be numeric
-     * @return mapped value RubyFloat
-     */
-    @JRubyMethod(name = "norm_strict", rest = true, module = true)
-    public static IRubyObject norm_strict(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
-        Ruby ruby = context.runtime;
-        double value = (args[0] instanceof RubyFloat) ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
-        double start = (args[1] instanceof RubyFloat) ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
-        double stop = (args[2] instanceof RubyFloat) ? ((RubyFloat) args[2]).getValue() : ((RubyFixnum) args[2]).getDoubleValue();
-        double max = Math.max(start, stop);
-        double min = Math.min(start, stop);
-        if (value < min) {
-            return mapMt(context, min, start, stop, 0, 1.0);
-        }
-        if (value > max) {
-            return mapMt(context, max, start, stop, 0, 1.0);
-        }
-        return mapMt(context, value, start, stop, 0, 1.0);
+    if (amount >= 1.0) {
+      return args[1];
     }
-    // start2 + (stop2 - start2) * ((value - start1) / (stop1 - start1));
+    return context.runtime.newFloat((1 - amount) * start + (stop * amount));
+  }
+
+  /**
+  * Identical to p5map(value, low, high, 0, 1). Numbers outside of the range
+  * are not clamped to 0 and 1, because out-of-range values are often
+  * intentional and useful.
+  *
+  * @param context ThreadContext
+  * @param recv IRubyObject
+  * @param args array of args must be be numeric
+  * @return mapped value RubyFloat
+  */
+  @JRubyMethod(name = "norm", rest = true, module = true)
+  public static IRubyObject normP(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
+    double value = (args[0] instanceof RubyFloat) ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
+    double start = (args[1] instanceof RubyFloat) ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
+    double stop = (args[2] instanceof RubyFloat) ? ((RubyFloat) args[2]).getValue() : ((RubyFixnum) args[2]).getDoubleValue();
+    return mapMt(context, value, start, stop, 0, 1.0);
+  }
 
-    static final RubyFloat mapMt(ThreadContext context, double value, double first1, double last1, double first2, double last2) {
-        double result = first2 + (last2 - first2) * ((value - first1) / (last1 - first1));
-        return context.runtime.newFloat(result);
+  /**
+  * Identical to p5map(value, low, high, 0, 1) but 'clamped'. Numbers outside
+  * of the range are clamped to 0 and 1,
+  *
+  * @param context ThreadContext
+  * @param recv IRubyObject
+  * @param args array of args must be be numeric
+  * @return mapped value RubyFloat
+  */
+  @JRubyMethod(name = "norm_strict", rest = true, module = true)
+  public static IRubyObject norm_strict(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
+
+    double value = (args[0] instanceof RubyFloat) ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
+    double start = (args[1] instanceof RubyFloat) ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
+    double stop = (args[2] instanceof RubyFloat) ? ((RubyFloat) args[2]).getValue() : ((RubyFixnum) args[2]).getDoubleValue();
+    double max = Math.max(start, stop);
+    double min = Math.min(start, stop);
+    if (value < min) {
+      return mapMt(context, min, start, stop, 0, 1.0);
+    }
+    if (value > max) {
+      return mapMt(context, max, start, stop, 0, 1.0);
     }
+    return mapMt(context, value, start, stop, 0, 1.0);
+  }
+  // start2 + (stop2 - start2) * ((value - start1) / (stop1 - start1));
+  static final RubyFloat mapMt(ThreadContext context, double value, double first1, double last1, double first2, double last2) {
+    Ruby ruby = context.runtime;
+    double result = first2 + (last2 - first2) * ((value - first1) / (last1 - first1));
+    return ruby.newFloat(result);
+  }
 
-    /**
-     * Provides processing constrain method as a ruby module method
-     *
-     * @param context ThreadContext
-     * @param recv IRubyObject
-     * @param args array of args must be be numeric
-     * @return original or limit values
-     */
-    @JRubyMethod(name = "constrain", rest = true, module = true)
-    public static IRubyObject constrainValue(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
-        RubyFloat value = args[0].convertToFloat();
-        RubyFloat start = args[1].convertToFloat();
-        RubyFloat stop = args[2].convertToFloat();
-        if (value.op_ge(context, start).isTrue() && value.op_le(context, stop).isTrue()) {
-            return args[0];
-        } else if (value.op_ge(context, start).isTrue()) {
-            return args[2];
-        } else {
-            return args[1];
-        }
+  /**
+  * Provides processing constrain method as a ruby module method
+  *
+  * @param context ThreadContext
+  * @param recv IRubyObject
+  * @param args array of args must be be numeric
+  * @return original or limit values
+  */
+  @JRubyMethod(name = "constrain", rest = true, module = true)
+  public static IRubyObject constrainValue(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
+    RubyFloat value = args[0].convertToFloat();
+    RubyFloat start = args[1].convertToFloat();
+    RubyFloat stop = args[2].convertToFloat();
+    if (value.op_ge(context, start).isTrue() && value.op_le(context, stop).isTrue()) {
+      return args[0];
+    } else if (value.op_ge(context, start).isTrue()) {
+      return args[2];
+    } else {
+      return args[1];
     }
+  }
 
-    /**
-     * Provides propane grid method as a ruby module method
-     *
-     * @param context ThreadContext
-     * @param recv IRubyObject
-     * @param args array of args should be Fixnum
-     * @param block { |x, y| `do something` }
-     * @return nil
-     */
-    @JRubyMethod(name = "grid", rest = true, module = true)
-    public static IRubyObject createGrid(ThreadContext context, IRubyObject recv, IRubyObject[] args, Block block) {
-        int row = (int) args[0].toJava(Integer.class);
-        int column = (int) args[1].toJava(Integer.class);
-        int rowStep = 1;
-        int colStep = 1;
-        if (args.length == 4) {
-            rowStep = (int) args[2].toJava(Integer.class);
-            colStep = (int) args[3].toJava(Integer.class);
-        }
-        if (block.isGiven()) {
-            int tempRow = row / rowStep;
-            for (int z = 0; z < (tempRow * (column / colStep)); z++) {
-                int x = z % tempRow;
-                int y = z / tempRow;
-                block.yieldSpecific(context, context.runtime.newFixnum(x * rowStep), context.runtime.newFixnum(y * colStep));
-            }
+  /**
+  * Provides JRubyArt grid method as a ruby module method behaves like:-
+  * def grid(dx, dy, sx = 1, sy = 1)
+  *   (0...dx).step(sx) do |x|
+  *     (0...dy).step(sy) do |y|
+  *       yield(x, y)
+  *     end
+  *   end
+  * end
+  * @param context ThreadContext
+  * @param recv IRubyObject
+  * @param args array of args should be Fixnum
+  * @param block { |x, y| `do something` }
+  * @return nil
+  */
+  @JRubyMethod(name = "grid", rest = true, module = true)
+  public static IRubyObject createGrid(ThreadContext context, IRubyObject recv, IRubyObject[] args, Block block) {
+    Ruby ruby = context.runtime;
+    int row = (int) args[0].toJava(Integer.class);
+    int column =  (int) args[1].toJava(Integer.class);
+    int rowStep = 1;
+    int colStep = 1;
+    if (args.length == 4){
+      rowStep = (int) args[2].toJava(Integer.class);
+      colStep = (int) args[3].toJava(Integer.class);
+    }
+    if (block.isGiven()) {
+      int tempRow = row / rowStep;
+      int tempColumn = column /colStep;
+      for (int z = 0; z < (tempRow * tempColumn); z++){
+        int y = z % tempColumn;
+        int x = z / tempColumn;
+        block.yieldSpecific(context, ruby.newFixnum(x * rowStep), ruby.newFixnum(y * colStep));
+      }
+    }
+    return context.nil;
+  }
+  /**
+  * Provides JRubyArt mesh_grid method as a ruby module method
+  * def grid(dx, dy, dz, sx = 1, sy = 1, sz = 1)
+  *   (0...dx).step(sx) do |x|
+  *     (0...dy).step(sy) do |y|
+  *       (0...dz).step(sy) do |z|
+  *         yield(x, y, z)
+  *       end
+  *     end
+  *   end
+  * end
+  *
+  * @param context ThreadContext
+  * @param recv IRubyObject
+  * @param args array of args should be Fixnum
+  * @param block { |x, y, z| `do something` }
+  * @return nil
+  */
+  @JRubyMethod(name = "mesh_grid", rest = true, module = true)
+  public static IRubyObject createGrid3D(ThreadContext context, IRubyObject recv, IRubyObject[] args, Block block) {
+    Ruby ruby = context.runtime;
+    int xDim = (int) args[0].toJava(Integer.class);
+    int yDim =  (int) args[1].toJava(Integer.class);
+    int zDim =  (int) args[2].toJava(Integer.class);
+    int xStep = (args.length > 3) ? (int) args[3].toJava(Integer.class) : 1;
+    int yStep = (args.length > 4) ? (int) args[4].toJava(Integer.class) : 1;
+    int zStep = (args.length == 6) ? (int) args[5].toJava(Integer.class) : 1;
+    int dimX = xDim / xStep;
+    int dimY = yDim / yStep;
+    int dimZ = zDim / zStep;
+    if (block.isGiven()) {
+      int count = dimX * dimY * dimZ;
+      for (int x = 0; x < xDim; x += xStep){
+        for (int j = 0; j < (dimZ * dimY); j++){
+          int z = j % dimZ;
+          int y = j / dimZ;
+          block.yieldSpecific(context, ruby.newFixnum(x), ruby.newFixnum(y * yStep), ruby.newFixnum(z * zStep));
         }
-        return context.nil;
-
+      }
     }
+    return context.nil;
+  }
 }