propane 2.6.3-java → 2.6.4-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5e175ffb6251f6ebd08d7da7c1f58325815d89cc841b673312917d1f236e408
-  data.tar.gz: a6c5b01f29d2480816ff0a1e34c2b27fdef8df51159909e31feceda3d0f7ec0b
+  metadata.gz: d7f3de4bd8418392ef49868c1b9d4bd2e168244755252d6394fb189993839b2a
+  data.tar.gz: 9f80f038be43becd118acf8eddc35a5bec22d6e5a17cfcf63d2c6d0815db154d
 SHA512:
-  metadata.gz: 785f838e0407abef9ab1c362677c41c02dab982e4f00360c84481511468149a198a68e010f12203c3b79a650ca1350bd548c8729003632f13029efdb538af4b7
-  data.tar.gz: 1d29953379ad1a762c50e63345ac1431e96cd2db51346e6c0c56246ff3b9590bba4e9e8d13a94970b3541f0639b38005dc15e90f41bc3f631522b03de159b368
+  metadata.gz: 4bd4abb66d417dcc612ddf4a90bb99bf55a21ddd68bac3c548706254128bb077b667e6e89c4ef1c11e83041cf4b0019259539af402a371ddf9802b282f214272
+  data.tar.gz: 2d9ed609a98abf21129dbeb9cc1d1e69e707e1fbb86343daf02d2a4e345d4f3573b4d4aa5187074b89edb4f402b52be3b4c7afc958031899c8ebde17be0f3a5f

data/.travis.yml

@@ -3,7 +3,7 @@ sudo: false
 dist: trusty
 
 rvm:
-  - jruby-9.1.12.0
+  - jruby-9.1.16.0
 jdk:
   - oraclejdk8
 os:

data/CHANGELOG.md

@@ -1,4 +1,6 @@
-**v2.6.3** Bump recommended upgrade to jruby-9.1.15.0, possibly the last in 9.1 series?
+**v2.6.4** Vec2D and Vec3D now support `copy` constructor where the original can be a duck-type. Further the only requirement is that the duck-type responds to `:x`, and `:y` by returning a `float` or `fixnum` thus Vec2D can be promoted to Vec3D (where `z = 0`), or more usually some other Vector or Point class can be used as the original. A VectorUtils library has been implemented, see examples for usage.
+
+**v2.6.3** Bump recommended upgrade to jruby-9.1.16.0, possibly the last in 9.1 series?
 
 **v2.6.2** Features example sketches using the PixelFlow library by Thomas Diewald
 

data/README.md

@@ -13,7 +13,7 @@ adjust above for your OS/distro setup.
 ## Requirements
 
 - jdk8+
-- jruby-9.1.15.0
+- jruby-9.1.16.0
 - mvn-3.5.0+
 - core.jar processing-3.3.6 (_build only_)
 
@@ -28,7 +28,7 @@ rake javadoc
 ## Installation
 ```bash
 jgem install propane # from rubygems
-jgem install propane-2.6.0-java.gem # for local install
+jgem install propane-2.6.4-java.gem # for local install
 ```
 
 ## Usage

data/lib/propane/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Propane
-  VERSION = '2.6.3'.freeze
+  VERSION = '2.6.4'.freeze
 end

data/library/vector_utils/vector_utils.rb

@@ -0,0 +1,69 @@
+PHI ||= (1 + Math.sqrt(5)) / 2 # golden ratio
+GA = PHI * 2 * Math::PI # golden angle
+
+# Useful Vector Utiliies
+module VectorUtil
+  def self.rotate_vec2d(vectors: [], angle: 0)
+    vectors.map { |vector| vector.rotate(angle) }
+  end
+
+  def self.vogel_layout(number:, node_size:)
+    (0..number).map do |i|
+      r = Math.sqrt(i)
+      theta = i * ((2 * Math::PI) / (PHI * PHI))
+      x = Math.cos(theta) * r * node_size
+      y = Math.sin(theta) * r * node_size
+      Vec2D.new(x, y)
+    end
+  end
+
+  def self.fibonacci_sphere(number:, radius:)
+    (0..number).map do |i|
+      lon = GA * i
+      lon /= 2 * Math::PI
+      lon -= lon.floor
+      lon *= 2 * Math::PI
+      lon -= 2 * Math::PI if lon > Math::PI
+      lat = Math.asin(-1 + 2 * i / number.to_f)
+      x = radius * Math.cos(lat) * Math.cos(lon)
+      y = radius * Math.cos(lat) * Math.sin(lon)
+      z = radius * Math.sin(lat)
+      Vec3D.new(x, y, z)
+    end
+  end
+
+  def self.spiral_layout(number:, radius:, resolution:, spacing:, inc:)
+    n = 0
+    angle = nil
+    (0..number).map do
+      angle = n * resolution
+      n += inc
+      radius -= angle * spacing
+      x = Math.cos(angle) * radius
+      y = Math.sin(angle) * radius
+      Vec2D.new(x, y)
+    end
+  end
+
+  def self.cartesian_to_polar(vec:)
+    res = Vec3D.new(vec.mag, 0, 0)
+    return Vec3D.new unless res.x > 0
+    res.y = -Math.atan2(vec.z, vec.x)
+    res.z = Math.asin(vec.y / res.x)
+    res
+  end
+
+  def self.to_cartesian(lat:, long:, radius:)
+    latitude = lat
+    longitude = long
+    x = radius * Math.cos(latitude) * Math.cos(longitude)
+    y = radius * Math.cos(latitude) * Math.sin(longitude)
+    z = radius * Math.sin(latitude)
+    Vec3D.new(x, y, z)
+  end
+
+  def self.polar_to_cartesian(vec:)
+    return Vec3D.new if vec.mag <= 0
+    Vec3D.new(Math.asin(vec.y / vec.mag), vec.mag, -Math.atan2(vec.z, vec.x))
+  end
+end

data/pom.rb

@@ -1,7 +1,7 @@
 require 'fileutils'
 project 'rp5extras', 'https://github.com/monkstone/propane' do
   model_version '4.0.0'
-  id 'propane:propane', '2.6.3'
+  id 'propane:propane', '2.6.4'
   packaging 'jar'
   description 'rp5extras for propane'
   organization 'ruby-processing', 'https://ruby-processing.github.io'
@@ -32,7 +32,7 @@ project 'rp5extras', 'https://github.com/monkstone/propane' do
     'jogl.version' => '2.3.2'
     )
 
-  pom 'org.jruby:jruby:9.1.15.0'
+  pom 'org.jruby:jruby:9.1.16.0'
   jar 'org.processing:core:3.3.6'
   jar 'org.processing:video:3.0.2'
   jar('org.jogamp.jogl:jogl-all:${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>2.6.3</version>
+  <version>2.6.4</version>
   <name>rp5extras</name>
   <description>rp5extras for propane</description>
   <url>https://github.com/monkstone/propane</url>
@@ -58,7 +58,7 @@ DO NOT MODIFIY - GENERATED CODE
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby</artifactId>
-      <version>9.1.15.0</version>
+      <version>9.1.16.0</version>
       <type>pom</type>
     </dependency>
     <dependency>

data/propane.gemspec

@@ -10,9 +10,7 @@ Gem::Specification.new do |gem|
   gem.email         = ['mamba2928@yahoo.co.uk']
   gem.licenses     = %w(GPL-3.0 LGPL-2.0)
   gem.description  = <<-EOS
-  A batteries included version of processing in ruby, for MacOS and linux64. The
-  current release features several PixelFlow glsl library examples, including a
-  few shadertoy demos as sketches.
+  A batteries included version of processing in ruby, for MacOS and linux64.
   EOS
   gem.summary       = %q{ruby wrapper for processing-3.3.6 on MacOS and linux64 bit only for opengl}
   gem.homepage      = 'https://ruby-processing.github.io/propane/'
@@ -27,9 +25,10 @@ Gem::Specification.new do |gem|
   gem.files << 'lib/jogl-all-2.3.2-natives-macosx-universal.jar'
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.add_development_dependency 'rake', '~> 12'
+  gem.add_development_dependency 'rake', '~> 12.3'
   gem.add_development_dependency 'minitest', '~> 5.10'
   gem.add_runtime_dependency 'arcball', '~> 1.0', '>= 1.0.0'
   gem.require_paths = ['lib']
   gem.platform      = 'java'
+  gem.requirements << 'java runtime >= 1.8.0_151+'
 end

data/src/monkstone/vecmath/vec2/Vec2.java

@@ -1,20 +1,20 @@
 package monkstone.vecmath.vec2;
 
-/* 
+/*
 * Copyright (c) 2015-17 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
@@ -88,11 +88,17 @@ public class Vec2 extends RubyObject {
     }
 
     void init(ThreadContext context, IRubyObject[] args) {
-        if (Arity.checkArgumentCount(context.runtime, args, Arity.OPTIONAL.getValue(), 2) == 2) {
-            jx = (args[0] instanceof RubyFloat)
-                    ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
-            jy = (args[1] instanceof RubyFloat)
-                    ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
+        int count = Arity.checkArgumentCount(context.runtime, args, Arity.OPTIONAL.getValue(), 2);
+        if (count == 2) {
+            jx = (args[0] instanceof RubyFloat) ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
+            jy = (args[1] instanceof RubyFloat) ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
+        }   // allow ruby ducktyping in constructor
+        if (count == 1) {
+            if (!(args[0].respondsTo("x"))) {throw context.runtime.newTypeError(args[0].getType() + " doesn't respond_to :x & :y");}
+            jx = ((args[0].callMethod(context, "x")) instanceof RubyFloat)
+                    ? ((RubyFloat) args[0].callMethod(context, "x")).getValue() : ((RubyFixnum) args[0].callMethod(context, "x")).getDoubleValue();
+            jy = ((args[0].callMethod(context, "y")) instanceof RubyFloat)
+                    ? ((RubyFloat) args[0].callMethod(context, "y")).getValue() : ((RubyFixnum) args[0].callMethod(context, "y")).getDoubleValue();
         }
     }
 
@@ -153,9 +159,11 @@ public class Vec2 extends RubyObject {
         Ruby runtime = context.runtime;
         if (key instanceof RubySymbol) {
             if (key == RubySymbol.newSymbol(runtime, "x")) {
-                return runtime.newFloat(jx);
+                jx = (value instanceof RubyFloat)
+                        ? ((RubyFloat) value).getValue() : ((RubyFixnum) value).getDoubleValue();
             } else if (key == RubySymbol.newSymbol(runtime, "y")) {
-                return runtime.newFloat(jy);
+                jy = (value instanceof RubyFloat)
+                        ? ((RubyFloat) value).getValue() : ((RubyFixnum) value).getDoubleValue();
             }
         } else {
             throw runtime.newIndexError("invalid key");

data/src/monkstone/vecmath/vec3/Vec3.java

@@ -92,6 +92,19 @@ public final class Vec3 extends RubyObject {
         if (count == 3) {
             jz = (args[2] instanceof RubyFloat)
                     ? ((RubyFloat) args[2]).getValue() : ((RubyFixnum) args[2]).getDoubleValue();
+        } // allow ruby ducktyping in constructor
+        if (count == 1) {
+            if (!(args[0].respondsTo("x"))) {
+                throw context.runtime.newTypeError(args[0].getType() + " doesn't respond_to :x & :y");
+            }
+            jx = ((args[0].callMethod(context, "x")) instanceof RubyFloat)
+                    ? ((RubyFloat) args[0].callMethod(context, "x")).getValue() : ((RubyFixnum) args[0].callMethod(context, "x")).getDoubleValue();
+            jy = ((args[0].callMethod(context, "y")) instanceof RubyFloat)
+                    ? ((RubyFloat) args[0].callMethod(context, "y")).getValue() : ((RubyFixnum) args[0].callMethod(context, "y")).getDoubleValue();
+            if (!(args[0].respondsTo("z"))) {
+                return;
+            } // allow promotion from 2D to 3D, sets jz = 0
+            jz = ((args[0].callMethod(context, "z")) instanceof RubyFloat) ? ((RubyFloat) args[0].callMethod(context, "z")).getValue() : ((RubyFixnum) args[0].callMethod(context, "z")).getDoubleValue();
         }
     }
 
@@ -112,7 +125,6 @@ public final class Vec3 extends RubyObject {
      * @return y IRubyObject
      */
     @JRubyMethod(name = "y")
-
     public IRubyObject getY(ThreadContext context) {
         return context.runtime.newFloat(jy);
     }
@@ -123,7 +135,8 @@ public final class Vec3 extends RubyObject {
      * @return z IRubyObject
      */
     @JRubyMethod(name = "z")
-    public IRubyObject getZ(ThreadContext context) {
+    public IRubyObject getZ(ThreadContext context
+    ) {
         return context.runtime.newFloat(jz);
     }
 
@@ -134,7 +147,6 @@ public final class Vec3 extends RubyObject {
      * @return x IRubyObject
      */
     @JRubyMethod(name = "x=")
-
     public IRubyObject setX(ThreadContext context, IRubyObject other) {
         if (other instanceof RubyFloat) {
             jx = ((RubyFloat) other).getValue();
@@ -151,7 +163,6 @@ public final class Vec3 extends RubyObject {
      * @return y IRubyObject
      */
     @JRubyMethod(name = "y=")
-
     public IRubyObject setY(ThreadContext context, IRubyObject other) {
         if (other instanceof RubyFloat) {
             jy = ((RubyFloat) other).getValue();
@@ -184,7 +195,6 @@ public final class Vec3 extends RubyObject {
      * @return value float
      */
     @JRubyMethod(name = "[]", required = 1)
-
     public IRubyObject aref(ThreadContext context, IRubyObject key) {
         Ruby runtime = context.runtime;
         if (key instanceof RubySymbol) {
@@ -209,7 +219,6 @@ public final class Vec3 extends RubyObject {
      * @return value float
      */
     @JRubyMethod(name = "[]=")
-
     public IRubyObject aset(ThreadContext context, IRubyObject key, IRubyObject value) {
         Ruby runtime = context.runtime;
         if (key instanceof RubySymbol) {
@@ -337,7 +346,6 @@ public final class Vec3 extends RubyObject {
      * @return new Vec3 object (ruby)
      */
     @JRubyMethod(name = "-")
-
     public IRubyObject op_sub(ThreadContext context, IRubyObject other) {
         Ruby runtime = context.runtime;
         Vec3 b = null;
@@ -359,7 +367,6 @@ public final class Vec3 extends RubyObject {
      * @return new Vec3 object (ruby)
      */
     @JRubyMethod(name = "*", required = 1)
-
     public IRubyObject op_mul(ThreadContext context, IRubyObject scalar) {
         Ruby runtime = context.runtime;
         double multi = (scalar instanceof RubyFloat)
@@ -377,7 +384,6 @@ public final class Vec3 extends RubyObject {
      * @return new Vec3 object (ruby)
      */
     @JRubyMethod(name = "/", required = 1)
-
     public IRubyObject op_div(ThreadContext context, IRubyObject scalar) {
         Ruby runtime = context.runtime;
         double divisor = (scalar instanceof RubyFloat)
@@ -397,7 +403,6 @@ public final class Vec3 extends RubyObject {
      * @return magnitude squared IRubyObject
      */
     @JRubyMethod(name = "mag_squared")
-
     public IRubyObject mag_squared(ThreadContext context) {
         return context.runtime.newFloat(jx * jx + jy * jy + jz * jz);
     }
@@ -408,7 +413,6 @@ public final class Vec3 extends RubyObject {
      * @return magnitude IRubyObject
      */
     @JRubyMethod(name = "mag")
-
     public IRubyObject mag(ThreadContext context) {
         return context.runtime.newFloat(Math.sqrt(jx * jx + jy * jy + jz * jz));
     }
@@ -423,7 +427,6 @@ public final class Vec3 extends RubyObject {
      * @return magnitude IRubyObject
      */
     @JRubyMethod(name = "set_mag")
-
     public IRubyObject set_mag(ThreadContext context, IRubyObject scalar, Block block) {
         if (block.isGiven()) {
             if (!(boolean) block.yield(context, scalar).toJava(Boolean.class)) {
@@ -447,7 +450,6 @@ public final class Vec3 extends RubyObject {
      * @return this as a ruby object
      */
     @JRubyMethod(name = "normalize!")
-
     public IRubyObject normalize_bang(ThreadContext context) {
         if (Math.abs(jx) < EPSILON && Math.abs(jy) < EPSILON && Math.abs(jz) < EPSILON) {
             return this;
@@ -465,7 +467,6 @@ public final class Vec3 extends RubyObject {
      * @return new normalized Vec3D object (ruby)
      */
     @JRubyMethod(name = "normalize")
-
     public IRubyObject normalize(ThreadContext context) {
         Ruby runtime = context.runtime;
         double mag = Math.sqrt(jx * jx + jy * jy + jz * jz);
@@ -489,7 +490,6 @@ public final class Vec3 extends RubyObject {
      * @return new random Vec3D object (ruby)
      */
     @JRubyMethod(name = "random", meta = true)
-
     public static IRubyObject random_direction(ThreadContext context, IRubyObject klazz) {
         Ruby runtime = context.runtime;
         double angle = Math.random() * Math.PI * 2;
@@ -510,7 +510,6 @@ public final class Vec3 extends RubyObject {
      * @return angle IRubyObject in radians
      */
     @JRubyMethod(name = "angle_between")
-
     public IRubyObject angleBetween(ThreadContext context, IRubyObject other) {
         Ruby runtime = context.runtime;
         Vec3 vec = (Vec3) other.toJava(Vec3.class);
@@ -542,7 +541,6 @@ public final class Vec3 extends RubyObject {
      * @return IRubyObject copy
      */
     @JRubyMethod(name = {"copy", "dup"})
-
     public IRubyObject copy(ThreadContext context) {
         Ruby runtime = context.runtime;
         return Vec3.rbNew(context, this.getMetaClass(), new IRubyObject[]{
@@ -557,7 +555,6 @@ public final class Vec3 extends RubyObject {
      * @return IRubyObject array of float
      */
     @JRubyMethod(name = "to_a")
-
     public IRubyObject toArray(ThreadContext context) {
         Ruby runtime = context.runtime;
         return RubyArray.newArray(context.runtime, new IRubyObject[]{
@@ -573,7 +570,6 @@ public final class Vec3 extends RubyObject {
      * @param object IRubyObject vertex renderer
      */
     @JRubyMethod(name = "to_vertex")
-
     public void toVertex(ThreadContext context, IRubyObject object) {
         JRender renderer = (JRender) object.toJava(JRender.class);
         renderer.vertex(jx, jy, jz);
@@ -586,7 +582,6 @@ public final class Vec3 extends RubyObject {
      * @param object IRubyObject vertex renderer
      */
     @JRubyMethod(name = "to_curve_vertex")
-
     public void toCurveVertex(ThreadContext context, IRubyObject object) {
         JRender renderer = (JRender) object.toJava(JRender.class);
         renderer.curveVertex(jx, jy, jz);
@@ -599,7 +594,6 @@ public final class Vec3 extends RubyObject {
      * @param args IRubyObject[]
      */
     @JRubyMethod(name = "to_vertex_uv", rest = true)
-
     public void toVertexUV(ThreadContext context, IRubyObject[] args) {
         int count = Arity.checkArgumentCount(context.runtime, args, Arity.OPTIONAL.getValue(), 3);
         double u = 0;
@@ -626,7 +620,6 @@ public final class Vec3 extends RubyObject {
      * @param object IRubyObject vertex renderer
      */
     @JRubyMethod(name = "to_normal")
-
     public void toNormal(ThreadContext context, IRubyObject object) {
         JRender renderer = (JRender) object.toJava(JRender.class);
         renderer.normal(jx, jy, jz);
@@ -639,7 +632,6 @@ public final class Vec3 extends RubyObject {
      * @return IRubyObject to_s
      */
     @JRubyMethod(name = {"to_s", "inspect"})
-
     public IRubyObject to_s(ThreadContext context) {
         return context.runtime.newString(String.format("Vec3D(x = %4.4f, y = %4.4f, z = %4.4f)", jx, jy, jz));
     }
@@ -688,7 +680,6 @@ public final class Vec3 extends RubyObject {
      * @return result IRubyObject as boolean
      */
     @JRubyMethod(name = "eql?", required = 1)
-
     public IRubyObject eql_p(ThreadContext context, IRubyObject other) {
         Ruby runtime = context.runtime;
         if (other == this) {
@@ -713,7 +704,6 @@ public final class Vec3 extends RubyObject {
      * @return result IRubyObject as boolean
      */
     @JRubyMethod(name = "==", required = 1)
-
     @Override
     public IRubyObject op_equal(ThreadContext context, IRubyObject other) {
         Ruby runtime = context.runtime;

data/test/vecmath_spec_test.rb

@@ -9,7 +9,14 @@ Dir.chdir(File.dirname(__FILE__))
 
 class VecmathTest < Minitest::Test
 
-
+  # duck for Vec2D constructor
+  Point = Struct.new(:x, :y)
+  # duck for Vec3D constructor
+  Point3 = Struct.new(:x, :y, :z)
+  # non-duck to test fail
+  Pointless = Struct.new(:a, :b)
+  # non-duck to test fail
+  Pointless3 = Struct.new(:a, :b, :c)
   def setup
 
   end
@@ -17,7 +24,7 @@ class VecmathTest < Minitest::Test
   def test_equals
     x, y = 1.0000001, 1.01
     a = Vec2D.new(x, y)
-    assert_equal(a.to_a, [x, y], 'Failed to return Vec2D as and Array')
+    assert_equal(a.to_a, [x, y], 'Failed to return Vec2D as an Array')
   end
 
   def test_not_equals
@@ -33,6 +40,25 @@ class VecmathTest < Minitest::Test
     assert_equal(a.to_a, b.to_a, 'Failed deep copy')
   end
 
+  def test_constructor_float
+    val = Point.new(1.0, 8.0) # duck type
+    expected = Vec2D.new(val)
+    assert_equal(expected, Vec2D.new(1.0, 8.0), 'Failed duck type constructor floats')
+  end
+
+  def test_constructor_fixnum
+    val = Point.new(1, 8) # duck type fixnum
+    expected = Vec2D.new(val)
+    assert_equal(expected, Vec2D.new(1.0, 8.0), 'Failed duck type constructor fixnum')
+  end
+
+  def test_failed_duck_type
+    val = Pointless.new(1.0, 8.0) # non duck type
+    assert_raises TypeError do
+      Vec2D.new(val)
+    end
+  end
+
   def test_copy_not_equals
     x, y = 1.0000001, 1.01
     a = Vec2D.new(x, y)
@@ -124,7 +150,7 @@ class VecmathTest < Minitest::Test
   def test_dist
     a = Vec2D.new(3, 5)
     b = Vec2D.new(6, 7)
-    assert_in_epsilon(a.dist(b), Math.sqrt(3.0**2 + 2**2), 'Failed to return distance between two vectors')
+    assert_in_epsilon(a.dist(b), Math.sqrt(3.0**2 + 2**2), 0.001, 'Failed to return distance between two vectors')
   end
 
   def test_lerp
@@ -209,7 +235,7 @@ class VecmathTest < Minitest::Test
     x = 10
     b = Vec2D.new
     b[:x] = x
-    assert_equal(a, Vec2D.new(-10, 20), 'Failed to hash assign')
+    assert_equal(b, Vec2D.new(x, 0), 'Failed to hash assign')
   end
 
   def test_inspect
@@ -253,26 +279,45 @@ class VecmathTest < Minitest::Test
     assert((a - b).cross(b - c).zero?, 'Failed collinearity test using 2D vector cross product')
   end
 
-  def test_equals
+  def test_equals3
     x, y, z = 1.0000001, 1.01, 0.0
     a = Vec3D.new(x, y)
-    assert_equal(a.to_a, [x, y, z], 'Failed to return Vec3D as and Array')
+    assert_equal(a.to_a, [x, y, z], 'Failed to return Vec3D as an Array')
   end
 
-  def test_not_equals
+  def test_constructor_float3
+    val = Point3.new(1.0, 8.0, 7.0) # duck type
+    expected = Vec3D.new(val)
+    assert_equal(expected, Vec3D.new(1.0, 8.0, 7.0), 'Failed duck type constructor floats')
+  end
+
+  def test_constructor_fixnum3
+    val = Point3.new(1, 8, 7) # duck type fixnum
+    expected = Vec3D.new(val)
+    assert_equal(expected, Vec3D.new(1.0, 8.0, 7.0), 'Failed duck type constructor fixnum')
+  end
+
+  def test_failed_duck_type3
+    val = Pointless3.new(1.0, 8.0, 7.0) # non duck type
+    assert_raises TypeError do
+      Vec3D.new(val)
+    end
+  end
+
+  def test_not_equals3
     a = Vec3D.new(3, 5, 1)
     b = Vec3D.new(6, 7, 1)
     refute_equal(a, b, 'Failed equals false')
   end
 
-  def test_copy_equals
+  def test_copy_equals3
     x, y, z = 1.0000001, 1.01, 1
     a = Vec3D.new(x, y, z)
     b = a.copy
     assert_equal(a.to_a, b.to_a, 'Failed deep copy')
   end
 
-  def test_copy_not_equals
+  def test_copy_not_equals3
     x, y, z = 1.0000001, 1.01, 6.0
     a = Vec3D.new(x, y, z)
     b = a.copy
@@ -280,27 +325,27 @@ class VecmathTest < Minitest::Test
     refute_equal(a.to_a, b.to_a, 'Failed deep copy')
   end
 
-  def test_equals_when_close
+  def test_equals_when_close3
     a = Vec3D.new(3.0000000, 5.00000, 2)
     b = Vec3D.new(3.0000000, 5.000001, 2)
     assert_equal(a, b, 'Failed to return equal when v. close')
   end
 
-  def test_sum
+  def test_sum3
     a = Vec3D.new(3, 5, 1)
     b = Vec3D.new(6, 7, 1)
     c = Vec3D.new(9, 12, 2)
     assert_equal(a + b, c, 'Failed to sum vectors')
   end
 
-  def test_subtract
+  def test_subtract3
     a = Vec3D.new(3, 5, 0)
     b = Vec3D.new(6, 7, 1)
     c = Vec3D.new(-3, -2, -1)
     assert_equal(a - b, c, 'Failed to subtract vectors')
   end
 
-  def test_multiply
+  def test_multiply3
     a = Vec3D.new(3, 5, 1)
     b = 2
     c = a * b
@@ -308,7 +353,7 @@ class VecmathTest < Minitest::Test
     assert_equal(c, d, 'Failed to multiply vector by scalar')
   end
 
-  def test_divide
+  def test_divide3
     a = Vec3D.new(3, 5, 4)
     b = 2
     c = Vec3D.new(1.5, 2.5, 2)
@@ -316,112 +361,112 @@ class VecmathTest < Minitest::Test
     assert_equal(c, d, 'Failed to divide vector by scalar')
   end
 
-  def test_random
+  def test_random3
     a = Vec3D.random
     assert a.kind_of? Vec3D
     assert_in_epsilon(a.mag, 1.0)
   end
 
-  def test_assign_value
+  def test_assign_value3
     a = Vec3D.new(3, 5)
     a.x=23
     assert_equal(a.x, 23, 'Failed to assign x value')
   end
 
-  def test_mag
+  def test_mag3
     a = Vec3D.new(-3, -4)
     assert_equal(a.mag, 5, 'Failed to return magnitude of vector')
   end
 
-  def test_mag_variant
+  def test_mag_variant3
     a = Vec3D.new(3.0, 2)
     b = Math.sqrt(3.0**2 + 2**2)
     assert_in_epsilon(a.mag, b, 0.001, 'Failed to return magnitude of vector')
   end
 
-  def test_mag_zero_one
+  def test_mag_zero_one3
     a = Vec3D.new(-1, 0)
     assert_equal(a.mag, 1, 'Failed to return magnitude of vector')
   end
 
-  def test_dist
+  def test_dist3
     a = Vec3D.new(3, 5, 2)
     b = Vec3D.new(6, 7, 1)
     message = 'Failed to return distance between two vectors'
     assert_equal(a.dist(b), Math.sqrt(3.0**2 + 2**2 + 1), message)
   end
 
-  def test_dist_squared
+  def test_dist_squared3
     a = Vec3D.new(3, 5, 2)
     b = Vec3D.new(6, 7, 1)
     message = 'Failed to return distance squared between two vectors'
     assert_equal(a.dist_squared(b), 3.0**2 + 2**2 + 1, message)
   end
 
-  def test_dot
+  def test_dot3
     a = Vec3D.new(10, 20, 0)
     b = Vec3D.new(60, 80, 0)
     assert_in_epsilon(a.dot(b), 2200.0, 0.001, 'Failed to dot product')
   end
 
-  def test_self_dot
+  def test_self_dot3
     a = Vec3D.new(10, 20, 4)
     assert_in_epsilon(a.dot(a), 516.0, 0.001, 'Failed to self dot product')
   end
 
-  def test_cross
+  def test_cross3
     a = Vec3D.new(3, 5, 2)
     b = Vec3D.new(6, 7, 1)
     c = Vec3D.new(-9.0, 9.0, -9.0)
     assert_equal(a.cross(b), c, 'Failed cross product')
   end
 
-  def test_set_mag
+  def test_set_mag3
     a = Vec3D.new(1, 1)
     assert_equal(a.set_mag(Math.sqrt(32)), Vec3D.new(4, 4), 'Failed to set_mag vector')
   end
 
-  def test_set_mag_block
+  def test_set_mag_block3
     a = Vec3D.new(1, 1)
     assert_equal(a.set_mag(Math.sqrt(32)) { true }, Vec3D.new(4, 4), 'Failed to set_mag_block true vector')
   end
 
-  def test_set_mag_block_false
+  def test_set_mag_block_false3
     a = Vec3D.new(1, 1)
     assert_equal(a.set_mag(Math.sqrt(32)) { false }, Vec3D.new(1, 1), 'Failed to set_mag_block true vector')
   end
 
-  def test_plus_assign
+  def test_plus_assign3
     a = Vec3D.new(3, 5)
     b = Vec3D.new(6, 7)
     a += b
     assert_equal(a, Vec3D.new(9, 12), 'Failed to += assign')
   end
 
-  def test_normalize
+  def test_normalize3
     a = Vec3D.new(3, 5)
     b = a.normalize
     assert_in_epsilon(b.mag, 1, 0.001, 'Failed to return a normalized vector')
   end
 
-  def test_normalize!
+  def test_normalize3!
     a = Vec3D.new(3, 5)
     a.normalize!
     assert_in_epsilon(a.mag, 1, 0.001, 'Failed to return a normalized! vector')
   end
 
-  def test_inspect
+  def test_inspect3
     a = Vec3D.new(3, 2.000000000000001, 1)
     assert_equal(a.inspect, 'Vec3D(x = 3.0000, y = 2.0000, z = 1.0000)')
   end
 
-  def test_array_reduce
+  def test_array_reduce3
     array = [Vec3D.new(1, 2), Vec3D.new(10, 2), Vec3D.new(1, 2)]
     sum = array.reduce(Vec3D.new) { |c, d| c + d }
     assert_equal(sum, Vec3D.new(12, 6))
   end
 
-  def test_array_zip
+  def test_array_zip3
     one = [Vec3D.new(1, 2), Vec3D.new(10, 2), Vec3D.new(1, 2)]
     two = [Vec3D.new(1, 2), Vec3D.new(10, 2), Vec3D.new(1, 2)]
     zipped = one.zip(two).flatten
@@ -429,30 +474,30 @@ class VecmathTest < Minitest::Test
     assert_equal(zipped, expected)
   end
 
-  def test_eql?
+  def test_eql3?
     a = Vec3D.new(3.0, 5.0, 0)
     b = Vec3D.new(3.0, 5.0, 0)
     assert(a.eql?(b))
   end
 
-  def test_not_eql?
+  def test_not_eql3?
     a = Vec3D.new(3.0, 5.0, 0)
     b = Vec3D.new(3.0, 5.000001, 0)
     refute(a.eql?(b))
   end
 
-  def test_equal?
+  def test_equal3?
     a = Vec3D.new(3.0, 5.0, 0)
     assert(a.equal?(a))
   end
 
-  def test_not_equal?
+  def test_not_equal3?
     a = Vec3D.new(3.0, 5.0, 0)
     b = Vec3D.new(3.0, 5.0, 0)
     refute(a.equal?(b))
   end
 
-  def test_hash_key
+  def test_hash_key3
     x, y, z = 10, 20, 50
     b = Vec3D.new(x, y, z)
     assert_equal(b[:x], x, 'Failed hash key access')
@@ -460,7 +505,7 @@ class VecmathTest < Minitest::Test
     assert_equal(b[:z], z, 'Failed hash key access')
   end
 
-  def test_hash_set
+  def test_hash_set3
     x = 10
     b = Vec3D.new
     b[:x] = x

data/vendors/Rakefile

@@ -10,7 +10,7 @@ SOUND_VERSION = 'v1.3.2' # version 1.3.2
 GLVIDEO = 'processing-glvideo.zip'
 VIDEO = 'video-2.zip'
 VIDEO_VERSION = '2' # version 1.0.1
-EXAMPLES = '1.8'.freeze
+EXAMPLES = '1.9'.freeze
 HOME_DIR = ENV['HOME']
 MAC_OR_LINUX = /linux|mac|darwin/ =~ RbConfig::CONFIG['host_os']
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: propane
 version: !ruby/object:Gem::Version
-  version: 2.6.3
+  version: 2.6.4
 platform: java
 authors:
 - monkstone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-09 00:00:00.000000000 Z
+date: 2018-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -58,10 +58,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
-description: |2
-    A batteries included version of processing in ruby, for MacOS and linux64. The
-    current release features several PixelFlow glsl library examples, including a
-    few shadertoy demos as sketches.
+description: "  A batteries included version of processing in ruby, for MacOS and
+  linux64.\n"
 email:
 - mamba2928@yahoo.co.uk
 executables:
@@ -113,6 +111,7 @@ files:
 - library/library_proxy/library_proxy.rb
 - library/simplex_noise/simplex_noise.rb
 - library/slider/slider.rb
+- library/vector_utils/vector_utils.rb
 - library/video_event/video_event.rb
 - pom.rb
 - pom.xml
@@ -173,9 +172,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-requirements: []
+requirements:
+- java runtime >= 1.8.0_151+
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: ruby wrapper for processing-3.3.6 on MacOS and linux64 bit only for opengl