propane 0.7.0-java → 0.8.0-java

data/propane.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |gem|
   gem.name          = 'propane'
   gem.version       = Propane::VERSION
   gem.authors       = ['filib', 'monkstone']
-  gem.email         = ['martin_p@lineone.net']
+  gem.email         = ['mamba2928@yahoo.co.uk']
   gem.license       = 'MIT'
   gem.description   = %q{A Standalone Ruby Processing implementation} 
   gem.summary       = %q{A really slim layer between Ruby and Processing-2.2.1.}

data/src/monkstone/MathToolModule.java

@@ -11,6 +11,7 @@
 package monkstone;
 
 import org.jruby.Ruby;
+import org.jruby.RubyFixnum;
 import org.jruby.RubyFloat;
 import org.jruby.RubyModule;
 import org.jruby.RubyRange;
@@ -23,14 +24,13 @@ import org.jruby.runtime.builtin.IRubyObject;
  *
  * @author Martin Prout
  */
-@JRubyModule(name = "MathTool") 
-public class MathToolModule {    
-    
-   /**
-    *
-    * @param runtime Ruby
-    */
-  
+@JRubyModule(name = "MathTool")
+public class MathToolModule {
+
+    /**
+     *
+     * @param runtime Ruby
+     */
     public static void createMathToolModule(Ruby runtime) {
         RubyModule mtModule = runtime.defineModule("MathTool");
         mtModule.defineAnnotatedMethods(MathToolModule.class);
@@ -39,38 +39,47 @@ public class MathToolModule {
     /**
      *
      * @param context ThreadContext
-     * @param recv IRubyObject 
+     * @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 = (Double) args[0].toJava(Double.class);
+        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 = (Double) r1.first(context).toJava(Double.class);
-        double first2 = (Double) r2.first(context).toJava(Double.class);
-        double last1 = (Double) r1.last(context).toJava(Double.class);
-        double last2 = (Double) r2.last(context).toJava(Double.class);
+        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 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 = (Double) args[0].toJava(Double.class);
+        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 = (Double) r1.first(context).toJava(Double.class);
-        double first2 = (Double) r2.first(context).toJava(Double.class);
-        double last1 = (Double) r1.last(context).toJava(Double.class);
-        double last2 = (Double) r2.last(context).toJava(Double.class);
+        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) {
@@ -79,7 +88,7 @@ public class MathToolModule {
         if (value > max) {
             value = max;
         }
-       return mapMt(context, value, first1, last1, first2, last2);
+        return mapMt(context, value, first1, last1, first2, last2);
     }
 
     /**
@@ -91,37 +100,42 @@ public class MathToolModule {
      */
     @JRubyMethod(name = "p5map", rest = true, module = true)
     public static IRubyObject mapProcessing(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
-        double value = (Double) args[0].toJava(Double.class);
-        double first1 = (Double) args[1].toJava(Double.class);
-        double first2 = (Double) args[3].toJava(Double.class);
-        double last1 = (Double) args[2].toJava(Double.class);
-        double last2 = (Double) args[4].toJava(Double.class);
+        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);
     }
 
-
     /**
      * 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
+     * @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 = (Double) args[0].toJava(Double.class);
-        double stop = (Double) args[1].toJava(Double.class);
-        double amount = (Double) args[2].toJava(Double.class);
-        if (amount <= 0) return args[0];
-        if (amount >= 1.0) return args[1];
-        return context.getRuntime().newFloat((1 - amount) * start + (stop * amount));
+        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).
-     * Numbers outside of the range are not clamped to 0 and 1,
-     * because out-of-range values are often intentional and useful.
+     * 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
@@ -129,15 +143,16 @@ public class MathToolModule {
      */
     @JRubyMethod(name = "norm", rest = true, module = true)
     public static IRubyObject normP(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
-        double value = (Double) args[0].toJava(Double.class);
-        double start = (Double) args[1].toJava(Double.class);
-        double stop = (Double) args[2].toJava(Double.class);
+        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,
+     * 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
@@ -146,9 +161,9 @@ public class MathToolModule {
     @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 = (Double) args[0].toJava(Double.class);
-        double start = (Double) args[1].toJava(Double.class);
-        double stop = (Double) args[2].toJava(Double.class);
+        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();
         if (value <= start) {
             return new RubyFloat(ruby, 0);
         } else if (value >= stop) {
@@ -160,11 +175,12 @@ public class MathToolModule {
 
     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.getRuntime().newFloat(result);
+        return context.runtime.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

data/src/monkstone/filechooser/Chooser.java

@@ -0,0 +1,44 @@
+/* 
+ * Copyright (c) 2016 Martin Prout
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * http://creativecommons.org/licenses/LGPL/2.1/
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+package monkstone.filechooser;
+
+import java.io.File;
+
+/**
+ * This interface makes it easier/possible to use the reflection methods
+ * selectInput
+ * def setup
+ *   java_signature 'void selectInput(String, String)'
+ *   selectInput('Select a file to process:', 'fileSelected')
+ * end
+ *
+ * def file_selected(selection)
+ *   if selection.nil?
+ *     puts 'Window was closed or the user hit cancel.'
+ *   else
+ *     puts format('User selected %s', selection.get_absolute_path)
+ *   end
+ * end
+ * @author Martin Prout
+ */
+public interface Chooser {
+    
+    public void file_selected(File selection);
+}

data/test/create_test.rb

@@ -0,0 +1,48 @@
+gem 'minitest'      # don't use bundled minitest
+require 'minitest/autorun'
+require 'minitest/pride'
+
+
+require_relative '../lib/propane/creators/sketch_writer'
+
+CLASS_SKETCH = <<~CODE
+# frozen_string_literal: false
+require 'propane'
+
+class FredSketch < Propane::App
+  def setup
+    size 200, 200, P2D
+  end
+
+  def draw
+
+  end
+end
+
+CODE
+
+class SketchWriterTest < Minitest::Test
+  ParamMethods = Struct.new(:name, :class_name, :sketch_size)
+  
+  def setup
+    @param = ParamMethods.new(
+      'fred_sketch',
+      'FredSketch',
+      'size 200, 200, P2D'
+    )
+  end
+
+  def test_parameter_new
+    param = SketchParameters.new(name: 'fred_sketch', args: %w(200 200 p2d))
+    assert_equal 'size 200, 200, P2D', param.sketch_size
+    assert_equal 'FredSketch', param.class_name
+  end
+
+  def test_class
+    result = CLASS_SKETCH.split(/\n/, -1)
+    class_lines = ClassSketch.new.code(@param)
+    class_lines.each_with_index do |line, i|
+      assert_equal result[i], line
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: propane
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: java
 authors:
 - filib
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-17 00:00:00.000000000 Z
+date: 2016-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arcball
@@ -27,7 +27,7 @@ dependencies:
         version: 0.0.3
 description: A Standalone Ruby Processing implementation
 email:
-- martin_p@lineone.net
+- mamba2928@yahoo.co.uk
 executables:
 - propane
 extensions: []
@@ -45,25 +45,25 @@ files:
 - README.md
 - Rakefile
 - bin/propane
-- examples/complete/Rakefile
-- examples/complete/bw_shader.rb
-- examples/complete/data/Texture01.jpg
-- examples/complete/data/Texture02.jpg
-- examples/complete/data/Univers45.vlw
-- examples/complete/data/bwfrag.glsl
-- examples/complete/data/displaceFrag.glsl
-- examples/complete/data/displaceVert.glsl
-- examples/complete/data/lachoy.jpg
-- examples/complete/data/landscape.glsl
-- examples/complete/data/monjori.glsl
-- examples/complete/data/moon.jpg
-- examples/complete/data/sea.jpg
-- examples/complete/edge_detection.rb
-- examples/complete/glsl_heightmap_noise.rb
-- examples/complete/kinetic_type.rb
-- examples/complete/landscape.rb
-- examples/complete/linear_image.rb
-- examples/complete/monjori.rb
+- examples/data_path/Rakefile
+- examples/data_path/bw_shader.rb
+- examples/data_path/data/Texture01.jpg
+- examples/data_path/data/Texture02.jpg
+- examples/data_path/data/Univers45.vlw
+- examples/data_path/data/bwfrag.glsl
+- examples/data_path/data/displaceFrag.glsl
+- examples/data_path/data/displaceVert.glsl
+- examples/data_path/data/lachoy.jpg
+- examples/data_path/data/landscape.glsl
+- examples/data_path/data/monjori.glsl
+- examples/data_path/data/moon.jpg
+- examples/data_path/data/sea.jpg
+- examples/data_path/edge_detection.rb
+- examples/data_path/glsl_heightmap_noise.rb
+- examples/data_path/kinetic_type.rb
+- examples/data_path/landscape.rb
+- examples/data_path/linear_image.rb
+- examples/data_path/monjori.rb
 - examples/regular/Rakefile
 - examples/regular/arcball_box.rb
 - examples/regular/arcball_constrain.rb
@@ -92,6 +92,8 @@ files:
 - examples/regular/polyhedrons.rb
 - examples/regular/raining.rb
 - examples/regular/ribbon_doodle.rb
+- examples/regular/select_file.rb
+- examples/regular/select_image.rb
 - examples/regular/slider_demo.rb
 - examples/regular/slider_example.rb
 - examples/regular/slider_simple.rb
@@ -110,7 +112,7 @@ files:
 - lib/propane.jar
 - lib/propane.rb
 - lib/propane/app.rb
-- lib/propane/creators/creator.rb
+- lib/propane/creators/sketch_writer.rb
 - lib/propane/helper_methods.rb
 - lib/propane/helpers/numeric.rb
 - lib/propane/helpers/string_extra.rb
@@ -120,6 +122,8 @@ files:
 - lib/propane/version.rb
 - library/boids/boids.rb
 - library/control_panel/control_panel.rb
+- library/file_chooser/chooser.rb
+- library/file_chooser/file_chooser.rb
 - library/slider/slider.rb
 - pom.rb
 - pom.xml
@@ -132,6 +136,7 @@ files:
 - src/monkstone/core/AbstractLibrary.java
 - src/monkstone/fastmath/Deglut.java
 - src/monkstone/fastmath/package-info.java
+- src/monkstone/filechooser/Chooser.java
 - src/monkstone/slider/CustomHorizontalSlider.java
 - src/monkstone/slider/CustomVerticalSlider.java
 - src/monkstone/slider/SimpleHorizontalSlider.java
@@ -149,6 +154,7 @@ files:
 - src/monkstone/vecmath/vec2/package-info.java
 - src/monkstone/vecmath/vec3/Vec3.java
 - src/monkstone/vecmath/vec3/package-info.java
+- test/create_test.rb
 - test/respond_to_test.rb
 - vendors/Rakefile
 homepage: https://github.com/monkstone/propane
@@ -176,4 +182,5 @@ signing_key:
 specification_version: 4
 summary: A really slim layer between Ruby and Processing-2.2.1.
 test_files:
+- test/create_test.rb
 - test/respond_to_test.rb

data/lib/propane/creators/creator.rb

@@ -1,136 +0,0 @@
-# encoding: utf-8
-# frozen_string_literal: false
-
-BASIC = <<-CODE
-# encoding: utf-8
-# frozen_string_literal: false
-require 'propane'
-
-class %s < Propane::App
-  def setup
-    size %s, %s
-  end
-
-  def draw
-
-  end
-end
-
-%s.new title: '%s'
-CODE
-
-MODE = <<-CODE
-# encoding: utf-8
-# frozen_string_literal: false
-require 'propane'
-
-class %s < Propane::App
-  def setup
-    size %s, %s, %s
-  end
-
-  def draw
-
-  end
-end
-
-%s.new title: '%s'
-CODE
-
-INNER = <<-CODE
-# encoding: utf-8
-# frozen_string_literal: false
-class %s
-  include Propane::Proxy
-
-end
-CODE
-
-# processing wrapper module
-module Propane
-  require_relative '../helpers/string_extra'
-  # Write file to disk
-  class SketchWriter
-    attr_reader :file
-    def initialize(path)
-      underscore = StringExtra.new(path).underscore
-      @file = "#{File.dirname(path)}/#{underscore}.rb"
-    end
-
-    def save(template)
-      File.open(file, 'w+') do |f|
-        f.write(template)
-      end
-    end
-  end
-
-  # An abstract class providing common methods for real creators
-  class Creator
-    ALL_DIGITS = /\A\d+\Z/
-
-    def already_exist(path)
-      underscore = StringExtra.new(path).underscore
-      new_file = "#{File.dirname(path)}/#{underscore}.rb"
-      return if !FileTest.exist?(path) && !FileTest.exist?(new_file)
-      puts 'That file already exists!'
-      exit
-    end
-
-    # Show the help/usage message for create.
-    def usage
-      puts <<-USAGE
-
-      Usage: propane --create <sketch_to_generate> <width> <height> <mode>
-      optional mode can be P2D / P3D.
-      Use    --inner to generated a ruby version of 'java' Inner class
-      Examples: propane --create app 800 600
-      propane --create app 800 600 p3d 
-      propane --create inner_class --inner
-
-      USAGE
-    end
-  end
-
-  # This class creates bare sketches, with an optional render mode
-  class BasicSketch < Creator
-    def template_default
-      format(BASIC, @name, @width, @height, @name, @title)
-    end
-
-    def template_mode
-      format(MODE, @name, @width, @height, @mode, @name, @title)
-    end
-    # Create a class wrapped sketch, given a path.
-    def create!(path, args)
-      return usage if /\?/ =~ path || /--help/ =~ path
-      main_file = File.basename(path, '.rb') # allow uneeded extension input
-      # Check to make sure that the main file doesn't exist already
-      already_exist(path)
-      @name = StringExtra.new(main_file).camelize
-      writer = SketchWriter.new(main_file)
-      @title = StringExtra.new(main_file).titleize
-      @width, @height = args[0], args[1]
-      @mode = args[2].upcase unless args[2].nil?
-      template = @mode.nil? ? template_default : template_mode
-      writer.save(template)
-    end
-  end
-
-  # This class creates a pseudo 'java inner class' of the sketch
-  class Inner < Creator
-    def inner_class_template
-      format(INNER, @name)
-    end
-    # Create a pseudo inner class, given a path.
-    def create!(path, _args_)
-      return usage if /\?/ =~ path || /--help/ =~ path
-      main_file = File.basename(path, '.rb') # allow uneeded extension input
-      # Check to make sure that the main file doesn't exist already
-      already_exist(path)
-      @name = main_file.camelize
-      writer = SketchWriter.new(main_file)
-      template = inner_class_template
-      writer.save(template)
-    end
-  end
-end