picrate 0.9.0-java → 1.0.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 680ef5f5fe41c9808066576455031746276898a79aadf199a46a24d6daf813c6
-  data.tar.gz: fa9ece7f5dc8d370e401f2cd8dcf76556ffbc465d3b08fbec67a4634a3a35d49
+  metadata.gz: 99548788c7788ff8a0550737e02a19010d26d570109b8fbaf043eb8add67e9a3
+  data.tar.gz: 1a96e8972d111cca1ed267c0f95759365356c882884589d7c334bdc0db004a95
 SHA512:
-  metadata.gz: e6fb430247715c5011aca32954b3d8dee2b7163de49f599ddf607328f1a5b289ab5a4437aed3ac847cf0e5c3332a528fb15f1060319e6fdd4f49fd4fc67c869d
-  data.tar.gz: 1179878370c0d2a6537814304ed237bd54ff35aec3c5d9d0b201cee3b332229e81760a14f32c3673d6a8ee0ec7dff2bae419ea50acb6d1d4de515aa1d4ed91f4
+  metadata.gz: 666d79345ce22d918b93c63fdbc7bb0d798cdd53066fc1e463a99b89c234516f372a435892699fa1ecae5d79b886348428cc6bbc7f9767d393988da0ac33717c
+  data.tar.gz: 0bd3cde4c9bea8bb121a72fe2b0364a9651e1be2d4a5a69f421803a1720fc5c79d5b131ed323d6eac2d59a86eb45eb4d7a37d570f95393eafd849efb68a4c59d

data/.mvn/extensions.xml

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

data/README.md

@@ -13,12 +13,12 @@ jgem install picrate
 
 Clone this repo:-
 
-Requires maven, openjdk11 (to build, uses `release` flag), and a jdk8 and jruby to install.
+Requires maven, openjdk11+ (to build, uses `release` flag), and a jdk8 and jruby to install.
 
 ```bash
 cd PiCrate
 rake # assumes an installed version of vanilla processing
-jgem install picrate-0.8.0-java.gem
+jgem install picrate-0.9.0-java.gem
 ```
 To create a template sketch:-
 ```bash

data/Rakefile

@@ -8,9 +8,9 @@ task default: %i[init compile install test gem]
 desc 'Copy Jars'
 task :init do
   # for Archlinux etc
-  processing_root = File.dirname(`readlink -f $(which processing)`)
+  # processing_root = File.dirname(`readlink -f $(which processing)`)
   # alternative for debian linux etc
-  # processing_root = File.join(HOME_DIR, 'processing-3.5.3')
+  processing_root = File.join(HOME_DIR, 'processing-3.5.3')
   jar_dir = File.join(processing_root, 'core', 'library')
   opengl = Dir.entries(jar_dir).grep(/amd64|armv6hf/).select { |jar| jar =~ /linux/ }
   opengl.concat %w[jogl-all.jar gluegen-rt.jar]
@@ -31,21 +31,21 @@ end
 
 desc 'Document'
 task :javadoc do
-  system 'mvn javadoc:javadoc'
+  system './mvnw javadoc:javadoc'
 end
 
 desc 'Compile'
 task :compile do
-  system 'mvn package'
+  system './mvnw package'
 end
 
 desc 'Test'
 task :test do
-  system 'jruby test/helper_methods_test.rb'
-  system 'jruby test/respond_to_test.rb' # Skip this test on Travis etc
-  system 'jruby test/math_tool_test.rb'
-  system 'jruby test/deglut_spec_test.rb'
-  system 'jruby test/vecmath_spec_test.rb'
+  system 'jruby --dev test/helper_methods_test.rb'
+  system 'jruby --dev test/respond_to_test.rb' # Skip this test on Travis etc
+  system 'jruby --dev test/math_tool_test.rb'
+  system 'jruby --dev test/deglut_spec_test.rb'
+  system 'jruby --dev test/vecmath_spec_test.rb'
 end
 
 desc 'clean'

data/docs/_config.yml

@@ -17,7 +17,7 @@ twitter_username: monkstoneT
 github_username:  monkstone
 # Build settings
 markdown: kramdown
-gems:
+plugins:
   - jekyll-sitemap
   - jekyll-feed
   - jekyll-seo-tag

data/docs/_posts/2018-06-26-auto_install_picrate.md

@@ -6,15 +6,15 @@ categories: PiCrate update
 permalink: /install_picrate/
 ---
 
-For a semi-automated setup and install, download and extract [this gist](https://gist.github.com/monkstone/c7d7741f800eb2327253635ee283c7eb). To keep your system clean put the file in a folder say
+For a semi-automated setup and install, download and extract [this gist](https://gist.github.com/monkstone/e9df8ea776aed58ce1c4de8e12982aad). To keep your system clean put the file in a folder say
 `~/install_picrate`
 
 ```bash
-cd ~/install_picrate
-rake # to run default task
+cd ~/picrate_install
+bash picrate_install.sh # to run default task
 ```
 #### What the script does ###
-1. Downloads JRuby (checks against sha256)
+1. Downloads JRuby
 2. Installs JRuby to `/opt`
 3. Uses `update-alternatives` to configure `jruby`, `jgem` and `jirb`
 4. The script checks for `GEM_HOME`, if undefined it modifies `~/.profile` to define `GEM_HOME` and puts gem binaries on your path, at logon.

data/docs/index.html

@@ -1,10 +1,6 @@
 ---
 layout: default
 ---
-<head>
-<link rel="icon" href="{{"assets/favicon.ico" | prepend: site.baseurl | prepend: site.url }}" type="image/x-icon" />
-</head>
-
 <section role="banner">
   <object type="image/svg+xml"  width="200" data="assets/picrate.svg">
     Your browser does not support SVG

data/lib/picrate.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'java'
 unless defined? PICRATE_ROOT
   $LOAD_PATH << File.dirname(__dir__)

data/lib/picrate/app.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: false
 require_relative 'helper_methods'
 require_relative 'library_loader'
-require 'jruby'
 # A wrapper module for the processing App
 module Processing
   include_package 'processing.core' # imports the processing jar.

data/lib/picrate/runner.rb

@@ -15,12 +15,12 @@ module Processing
     def self.execute
       runner = new
       runner.parse_options(ARGV)
-      runner.execute!
+      runner.execute
     end
 
     # Dispatch central.
-    def execute!
-      show_help if options.empty?
+    def execute
+      parse_options('-h') if options.empty?
       show_version if options[:version]
       create if options[:create]
       install(filename) if options[:install]
@@ -52,7 +52,7 @@ module Processing
 
         # This displays the help screen, all programs are
         # assumed to have this option.
-        opts.on('-h', '--help', 'Display this screen') do
+        opts.on_tail('-h', '--help', 'Display this screen') do
           puts opts
           exit
         end
@@ -76,11 +76,18 @@ module Processing
       puts template.result(binding)
     end
 
-    def install(library)
+    def install(library = nil)
+      library ||= 'new'
       choice = library.downcase
-      valid = Regexp.union('samples', 'sound', 'video', 'glvideo')
-      return warn format('No installer for %s', choice) unless valid =~ choice
-      system "cd #{PICRATE_ROOT}/vendors && rake download_and_copy_#{choice}"
+      case choice
+      when /samples|sound|video/
+        system "cd #{PICRATE_ROOT}/vendors && rake download_and_copy_#{choice}"
+      when /new/
+        # install samples and config geany
+        system "cd #{PICRATE_ROOT}/vendors && rake"
+      else
+        warn format('No installer for %s', library)
+      end
     end
   end # class Runner
 end # module Processing

data/lib/picrate/version.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module PiCrate
-  VERSION = '0.9.0'
+  VERSION = '1.0.0'
 end

data/library/color_group/color_group.rb

@@ -17,7 +17,7 @@ class ColorGroup
     @colors = ColorUtil.shuffle(colors)
   end
 
-  def ruby_code
+  def ruby_string
     ColorUtil.rubyString(colors)
   end
 

data/library/video_event/video_event.rb

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

data/pom.rb

@@ -1,7 +1,7 @@
 project 'picrate', 'http://maven.apache.org' do
 
   model_version '4.0.0'
-  id 'ruby-processing:picrate:0.9.0'
+  id 'ruby-processing:picrate:1.0.0'
   packaging 'jar'
 
   description 'An integrated processing-core (somewhat hacked), with additional java code for a jruby version of processing.'
@@ -31,7 +31,7 @@ project 'picrate', 'http://maven.apache.org' do
     'polyglot.dump.pom' => 'pom.xml'
   )
 
-  pom 'org.jruby:jruby:9.2.7.0'
+  pom 'org.jruby:jruby:9.2.8.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'
@@ -40,7 +40,7 @@ end
 overrides do
   plugin :resources, '2.7'
   plugin :dependency, '2.8'
-  plugin( :compiler, '3.8.0', 'release' => '8' )
+  plugin( :compiler, '3.8.1', 'release' => '8' )
   plugin(
     :javadoc,
     '2.10.4',

data/pom.xml

@@ -11,7 +11,7 @@ DO NOT MODIFIY - GENERATED CODE
   <modelVersion>4.0.0</modelVersion>
   <groupId>ruby-processing</groupId>
   <artifactId>picrate</artifactId>
-  <version>0.9.0</version>
+  <version>1.0.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>
@@ -76,7 +76,7 @@ DO NOT MODIFIY - GENERATED CODE
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby</artifactId>
-      <version>9.2.7.0</version>
+      <version>9.2.8.0</version>
       <type>pom</type>
     </dependency>
     <dependency>
@@ -127,7 +127,7 @@ DO NOT MODIFIY - GENERATED CODE
         </plugin>
         <plugin>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.8.0</version>
+          <version>3.8.1</version>
           <configuration>
             <release>8</release>
           </configuration>

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

@@ -1,13 +1,14 @@
 /**
- * The purpose of this tool is to allow picrate users to use an alternative
- * to processing.org map, lerp and norm methods in their sketches
- * Copyright (c) 2018-19 Martin Prout. This tool is free software; you can
- * redistribute it and/or modify it under the terms of the GNU Lesser General
- * Public License as published by the Free Software Foundation; either version
- * 2.1 of the License, or (at your option) any later version.
- *
- * Obtain a copy of the license at http://www.gnu.org/licenses/gpl-3.0-standalone.html
- */
+* The purpose of this tool is to allow JRubyArt users to use an alternative
+* to processing.org map, lerp and norm methods in their sketches and to implement
+* JRubyArt convenenience method grid(width, height, stepW, stepH) { |x, y| do stuff }
+* Copyright (c) 2015-19 Martin Prout. This tool is free software; you can
+* redistribute it and/or modify it under the terms of the GNU Lesser General
+* Public License as published by the Free Software Foundation; either version
+* 2.1 of the License, or (at your option) any later version.
+*
+* Obtain a copy of the license at http://www.gnu.org/licenses/lgpl-2.1.html
+*/
 package monkstone;
 
 import org.jruby.Ruby;
@@ -22,216 +23,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];
+    }
+    if (amount >= 1.0) {
+      return args[1];
     }
+    return context.runtime.newFloat((1 - amount) * start + (stop * amount));
+  }
 
-    /**
-     * 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);
+  /**
+  * 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);
+  }
+
+  /**
+  * 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);
     }
-     // start2 + (stop2 - start2) * ((value - start1) / (stop1 - start1));
-    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);
+    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 picrate 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;
+  }
 }