propane 2.1.0-java → 2.1.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 833e28f17c9ccee6633b4b72e047cb3bb19dac95
-  data.tar.gz: 0bf06a5796ced532ad970af689ac9f734aa569dd
+  metadata.gz: 96c47e1ea96be925869f7a77d1a6753c24bc9b3b
+  data.tar.gz: 3485ff56e4408d1eda441481122c28ea7ddf5cfa
 SHA512:
-  metadata.gz: a7807f527d2946ec41416819b30e3838ffa27164183080fed34ff13f42dfd9cf69702d48de50614f1764c3bf902fa3a96bdddec6db76bd4b0535b8cda8ccdc24
-  data.tar.gz: 41804e15ab02a6fc37dac4fa34c353c7bbfa836c7ad169cf2e525d009a327f3dc6077a9e63f4423d21ac471bb3e668b373a83e84a5dc060a7202b20da317aa03
+  metadata.gz: b1ddb3cdc5dbbb9023512732f5fbcd4c9453483ebd90ea002c72c995bba5043a6843dfa4938db4d224e49736fcb48649842a55ec7ec4cd842c4c29b3c73dc31d
+  data.tar.gz: 446e7701836640a03f992541e83bfe7d7265c0485d28fc8372fbdb28d184882700df0b7a537a40672011dd0d869b8950032ccce491e0a70db848ea8128e018b1

data/.travis.yml

@@ -1,21 +1,10 @@
 language: ruby
 sudo: false
-addons:
-  apt:
-    packages:
-      -oracle-java8-installer
-      -xvfb 
-      -libxrender1 
-      -libxtst6 
-      -libxi6 
 
 rvm: 
-  - jruby-9.1.2.0
+  - jruby-9.1.6.0
 jdk:
   - oraclejdk8
 os:
   - linux
-env:
-  - Xvfb :1 -screen 0 1024x768x24
-  - export DISPLAY=":1"
 

data/CHANGELOG.md

@@ -1,4 +1,6 @@
-**v2.1.0** Add missing method to ColorUtil.java, `include HelperMethods, PConstants, Math, MathTool` in `Propane::Proxy`, it is just simpler that way. Mixin Renderer for AppRender and ShapeRender. Changes to `Propane::Proxy` are significant enough to warrant versioning bump, samples making use of new code will not be runable by earlier versions. 
+**v2.1.1** Update to core processing-3.2.4 and JRuby-9.1.7.0 
+
+**v2.1.0** Add missing method to ColorUtil.java, `include HelperMethods, PConstants, Math, MathTool` in `Propane::Proxy`, it is just simpler that way. Mixin Renderer for AppRender and ShapeRender. Changes to `Propane::Proxy` are significant enough to warrant versioning bump, samples making use of new code will not be runable by earlier versions.
 
 **v2.0.6** Update to core processing-3.2.3
 

data/README.md

@@ -1,14 +1,14 @@
 # Propane
 [![Gem Version](https://badge.fury.io/rb/propane.svg)](https://badge.fury.io/rb/propane)
 
-A slim layer to communicate with Processing from JRuby, features a polyglot maven build. We have created a configuration free version of ruby processing, for processing-3.2.3, where we include processing core (from a local maven repository and opengl etc from maven central). 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, but you could use jruby-complete if you used the propane script (avoids need to give the absolute data path for the data folder, but would also be needed for a watch mode). NB: currently we only include linux64 and macOS opengl binaries, please fork this repository to include binaries for your OS if not included. See guide to [building ruby-processing projects][building].
+A slim layer to communicate with Processing from JRuby, features a polyglot maven build. We have created a configuration free version of ruby processing, for processing-3.2.4, where we include processing core (from a local maven repository and opengl etc from maven central). 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, but you could use jruby-complete if you used the propane script (avoids need to give the absolute data path for the data folder, but would also be needed for a watch mode). NB: for linux64 and macOS opengl binaries use latest relaease. See guide to [building ruby-processing projects][building].
 
 ## Requirements
 
-- jdk8+ since version 0.6.0
-- jruby-9.1.5.0+
+- jdk8+
+- jruby-9.1.7.0+
 - mvn-3.3.1+ (development only)
-- core.jar processing-3.2.3 (development only until processing.org is available at maven central)
+- core.jar processing-3.2.4 (development only until processing.org is available at maven central)
 
 ## Building and testing
 
@@ -20,8 +20,8 @@ rake javadoc
 
 ## Installation
 ```bash
-jgem install propane-{version}-java.gem # local install
-jgem install propane # from rubygems.org
+jgem install propane # from rubygems 
+jgem install propane-2.1.1-java.gem # for local install
 ```
 
 ## Usage

data/Rakefile

@@ -50,6 +50,7 @@ task :test do
   sh 'jruby test/create_test.rb'
   sh 'jruby test/math_tool_test.rb'
   sh 'jruby test/deglut_spec_test.rb'
+  sh 'jruby test/vecmath_spec_test.rb'
 end
 
 desc 'clean'

data/lib/propane/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Propane
-  VERSION = '2.1.0'.freeze
+  VERSION = '2.1.1'.freeze
 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.1.0'
+  id 'propane:propane', '2.1.1'
   packaging 'jar'
   description 'rp5extras for propane'
   organization 'ruby-processing', 'https://ruby-processing.github.io'
@@ -32,8 +32,8 @@ project 'rp5extras', 'https://github.com/monkstone/propane' do
     'jogl.version' => '2.3.2'
     )
 
-  pom 'org.jruby:jruby:9.1.5.0'
-  jar 'org.processing:core:3.2.3'
+  pom 'org.jruby:jruby:9.1.7.0'
+  jar 'org.processing:core:3.2.4'
   jar 'org.processing:video:3.0.2'
   jar('org.jogamp.jogl:jogl-all:${jogl.version}')
   jar('org.jogamp.gluegen:gluegen-rt-main:${jogl.version}')
@@ -44,7 +44,7 @@ project 'rp5extras', 'https://github.com/monkstone/propane' do
       execute_goals( id: 'default-cli',
         artifactItems: [ { groupId:  'org.processing',
           artifactId:  'core',
-          version:  '3.2.3',
+          version:  '3.2.4',
           type:  'jar',
           outputDirectory: '${propane.basedir}/lib'
         },
@@ -63,7 +63,7 @@ project 'rp5extras', 'https://github.com/monkstone/propane' do
         { groupId:  'org.jogamp.jogl',
           artifactId:  'jogl-all',
           version:  '${jogl.version}',
-          classifier: 'natives-linux-amd64',
+          classifier: 'natives-linux-armv6hf',
           type:  'jar',
           outputDirectory: '${propane.basedir}/lib'
         },
@@ -71,21 +71,7 @@ project 'rp5extras', 'https://github.com/monkstone/propane' do
           artifactId:  'gluegen-rt',
           version:  '${jogl.version}',
           type:  'jar',
-          classifier: 'natives-linux-amd64',
-          outputDirectory: '${propane.basedir}/lib'
-        },
-        { groupId:  'org.jogamp.jogl',
-          artifactId:  'jogl-all',
-          version:  '${jogl.version}',
-          classifier: 'natives-macosx-universal',
-          type:  'jar',
-          outputDirectory: '${propane.basedir}/lib'
-        },
-        { groupId:  'org.jogamp.gluegen',
-          artifactId:  'gluegen-rt',
-          version:  '${jogl.version}',
-          type:  'jar',
-          classifier: 'natives-macosx-universal',
+          classifier: 'natives-linux-armv6hf',
           outputDirectory: '${propane.basedir}/lib'
         }
         ]

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.1.0</version>
+  <version>2.1.1</version>
   <name>rp5extras</name>
   <description>rp5extras for propane</description>
   <url>https://github.com/monkstone/propane</url>
@@ -58,13 +58,13 @@ DO NOT MODIFIY - GENERATED CODE
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby</artifactId>
-      <version>9.1.5.0</version>
+      <version>9.1.7.0</version>
       <type>pom</type>
     </dependency>
     <dependency>
       <groupId>org.processing</groupId>
       <artifactId>core</artifactId>
-      <version>3.2.3</version>
+      <version>3.2.4</version>
     </dependency>
     <dependency>
       <groupId>org.processing</groupId>
@@ -103,7 +103,7 @@ DO NOT MODIFIY - GENERATED CODE
                   <artifactItem>
                     <groupId>org.processing</groupId>
                     <artifactId>core</artifactId>
-                    <version>3.2.3</version>
+                    <version>3.2.4</version>
                     <type>jar</type>
                     <outputDirectory>${propane.basedir}/lib</outputDirectory>
                   </artifactItem>
@@ -125,7 +125,7 @@ DO NOT MODIFIY - GENERATED CODE
                     <groupId>org.jogamp.jogl</groupId>
                     <artifactId>jogl-all</artifactId>
                     <version>${jogl.version}</version>
-                    <classifier>natives-linux-amd64</classifier>
+                    <classifier>natives-linux-armv6hf</classifier>
                     <type>jar</type>
                     <outputDirectory>${propane.basedir}/lib</outputDirectory>
                   </artifactItem>
@@ -134,23 +134,7 @@ DO NOT MODIFIY - GENERATED CODE
                     <artifactId>gluegen-rt</artifactId>
                     <version>${jogl.version}</version>
                     <type>jar</type>
-                    <classifier>natives-linux-amd64</classifier>
-                    <outputDirectory>${propane.basedir}/lib</outputDirectory>
-                  </artifactItem>
-                  <artifactItem>
-                    <groupId>org.jogamp.jogl</groupId>
-                    <artifactId>jogl-all</artifactId>
-                    <version>${jogl.version}</version>
-                    <classifier>natives-macosx-universal</classifier>
-                    <type>jar</type>
-                    <outputDirectory>${propane.basedir}/lib</outputDirectory>
-                  </artifactItem>
-                  <artifactItem>
-                    <groupId>org.jogamp.gluegen</groupId>
-                    <artifactId>gluegen-rt</artifactId>
-                    <version>${jogl.version}</version>
-                    <type>jar</type>
-                    <classifier>natives-macosx-universal</classifier>
+                    <classifier>natives-linux-armv6hf</classifier>
                     <outputDirectory>${propane.basedir}/lib</outputDirectory>
                   </artifactItem>
                 </artifactItems>

data/propane.gemspec

@@ -9,18 +9,16 @@ Gem::Specification.new do |gem|
   gem.authors       = ['monkstone']
   gem.email         = ['mamba2928@yahoo.co.uk']
   gem.licenses     = %w(GPL-3.0 LGPL-2.0)
-  gem.description   = %q{A batteries included version of processing in ruby, macOS and linux} 
-  gem.summary       = %q{A jruby wrapper for processing-3.2.3}
+  gem.description   = %q{A batteries included version of processing in ruby, MacOS and linux64} 
+  gem.summary       = %q{ruby wrapper for processing-3.2.4 on MacOS and linux64 bit only for opengl}
   gem.homepage      = 'https://ruby-processing.github.io/propane/'
   gem.files         = `git ls-files`.split($/)
   gem.files << 'lib/propane.jar'
-  gem.files << 'lib/core-3.2.3.jar'
+  gem.files << 'lib/core-3.2.4.jar'
   gem.files << 'lib/gluegen-rt-2.3.2.jar'
   gem.files << 'lib/jogl-all-2.3.2.jar'
-  gem.files << 'lib/gluegen-rt-2.3.2-natives-linux-amd64.jar'
-  gem.files << 'lib/gluegen-rt-2.3.2-natives-macosx-universal.jar'
-  gem.files << 'lib/jogl-all-2.3.2-natives-linux-amd64.jar'
-  gem.files << 'lib/jogl-all-2.3.2-natives-macosx-universal.jar'
+  gem.files << 'lib/gluegen-rt-2.3.2-natives-linux-armv6hf.jar'
+  gem.files << 'lib/jogl-all-2.3.2-natives-linux-armv6hf.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_runtime_dependency 'arcball', '~> 0.0.3'  

data/test/test_create.rb

@@ -0,0 +1,91 @@
+# frozen_string_literal: true
+require_relative 'test_helper'
+
+
+require_relative '../lib/propane/creators/sketch_class'
+
+CLASS_SKETCH = <<~CODE
+# frozen_string_literal: false
+require 'propane'
+
+class FredSketch < Propane::App
+  def settings
+    size 200, 200
+  end
+
+  def setup
+    sketch_title 'Fred Sketch'
+  end
+
+  def draw
+
+  end
+end
+
+FredSketch.new
+
+CODE
+
+BARE_SKETCH = <<~CODE
+def settings
+  size 200, 200, P2D
+end
+
+def setup
+  sketch_title 'Fred Sketch'
+end
+
+def draw
+
+end
+
+CODE
+
+class SketchClassTest < Minitest::Test
+
+  def setup
+    @basic = SketchClass.new(name: 'fred_sketch', width: 200, height: 200)
+    @sketch = SketchClass.new(name: 'fred_sketch', width: 200, height: 200, mode: 'p2d')
+  end
+
+  def test_class
+    result = CLASS_SKETCH.split(/\n/, -1)
+    class_lines = @sketch.lines
+    class_lines.each_with_index do |line, i|
+      assert_equal result[i], line
+    end
+  end
+
+  def test_indent
+    assert_equal '  indent', @sketch.indent('indent')
+  end
+
+  def test_size
+    assert_equal '    size 200, 200, P2D', @sketch.size
+    assert_equal '    size 200, 200', @basic.size
+  end
+
+  def test_sketch_title
+    assert_equal "    sketch_title 'Fred Sketch'", @sketch.sketch_title
+  end
+
+  def test_class
+    assert_equal "FredSketch", @sketch.sketch_class
+  end
+
+  def test_class_new
+    assert_equal "FredSketch.new", @sketch.sketch_new
+  end
+
+  def test_method_lines
+    result = CLASS_SKETCH.split(/\n/, -1)
+    @basic.method_lines('settings', @basic.size).each_with_index do |line, i|
+      assert_equal result[i + 4], line
+    end
+  end
+
+
+  def test_sketch_class
+    assert_equal "class FredSketch < Propane::App", @basic.class_sketch
+  end
+end

data/test/test_deglut_spec.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+require_relative 'test_helper'
+
+Java::Monkstone::PropaneLibrary.load(JRuby.runtime)
+
+Dir.chdir(File.dirname(__FILE__))
+
+class DeglutTest < Minitest::Test
+  attr_reader :to_radian
+
+  def setup
+    @to_radian = Math::PI / 180
+  end
+
+  def test_cos_sin
+    (-720..720).step(1) do |deg|
+      sine = DegLut.sin(deg)
+      deg_sin = Math.sin(deg * to_radian)
+      assert_in_delta(sine, deg_sin, delta = 0.000001)
+      cosine = DegLut.cos(deg)
+      deg_cos = Math.cos(deg * to_radian)
+      assert_in_delta(cosine, deg_cos, delta = 0.000001)
+    end
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+gem 'minitest' # don't use bundled minitest
+require 'minitest/autorun'
+require 'minitest/pride'
+require_relative '../lib/propane'

data/test/test_math_tool.rb

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+require_relative 'test_helper'
+
+Java::Monkstone::PropaneLibrary.new.load(JRuby.runtime, false)
+
+Dir.chdir(File.dirname(__FILE__))
+
+class MathToolTest < Minitest::Test
+ include MathTool
+ def test_map1d
+    x = [0, 5, 7.5, 10]
+    range1 = (0..10)
+    range2 = (100..1)
+    range3 = (0..10)
+    range4 = (5..105)
+    assert_in_delta(map1d(x[0], range1, range2), 100, delta = 0.00001, msg = 'map to first')
+    assert_in_delta(map1d(x[1], range1, range2), 50.5, delta = 0.00001, msg = 'map to reversed intermediate')
+    assert_in_delta(map1d(x[2], range3, range4), 80.0, delta = 0.00001, msg = 'map to intermediate')
+    assert_in_delta(map1d(x[3], range1, range2), 1, delta = 0.00001, msg = 'map to last')
+  end
+
+  def test_p5map # as map1d except not using range input
+    x = [0, 5, 7.5, 10]
+    range1 = (0..10)
+    range2 = (100..1)
+    range3 = (0..10)
+    range4 = (5..105)
+    assert_in_delta(p5map(x[0], range1.first, range1.last, range2.first, range2.last), 100, delta = 0.00001)
+    assert_in_delta(p5map(x[1], range1.first, range1.last, range2.first, range2.last), 50.5, delta = 0.00001)
+    assert_in_delta(p5map(x[2], range3.first, range3.last, range4.first, range4.last), 80.0, delta = 0.00001)
+    assert_in_delta(p5map(x[3], range1.first, range1.last, range2.first, range2.last), 1, delta = 0.00001)
+  end
+
+  def test_norm
+    x = [10, 140, 210]
+    start0, last0 = 30, 200
+    start_int, last_int = 0, 200
+    assert_in_delta(norm(x[0], start0, last0), -0.11764705882352941, delta = 0.00001, msg = 'unclamped map')
+    assert_in_delta(norm(x[1], start_int, last_int), 0.7, delta = 0.00001, msg = 'map to intermediate')
+    assert_in_delta(norm(x[2], start_int, last_int), 1.05, delta = 0.00001, msg = 'unclamped map')
+  end
+
+  def test_norm_strict
+    x = [10, 140, 210]
+    assert_in_delta(norm_strict(x[2], x[0], x[1]), 1.0, delta = 0.00001, msg = 'clamped map to 0..1.0')
+    assert_in_delta(norm_strict(x[2], x[1], x[0]), 0.0, delta = 0.00001, msg = 'clamped map to 0..1.0')
+    assert_in_delta(norm_strict(x[1], x[0], x[2]), 0.65, delta = 0.00001, msg = 'clamped map to 0..1.0')
+  end
+
+  def test_lerp # behaviour is deliberately different to processing which is unclamped
+    x = [0.5, 0.8, 2.0]
+    start0, last0 = 300, 200
+    start_int, last_int = 0, 200
+    assert_in_delta(lerp(start0, last0, x[0]), 250, delta = 0.00001, msg = 'produces a intermediate value of a reversed range')
+    assert_in_delta(lerp(start_int, last_int, x[1]), 160, delta = 0.00001, msg = 'lerps to an intermediate value')
+    assert_in_delta(lerp(start_int, last_int, x[2]), 200, delta = 0.00001, msg = 'lerps to the last value of a range')
+  end
+
+  def test_constrain
+    x_int = [15, 2_500, -2_500]
+    start_int, last_int = 0, 200
+    assert_in_delta(constrain(x_int[0], start_int, last_int), 15, delta = 0.00001)
+    assert_in_delta(constrain(x_int[1], start_int, last_int), 200, delta = 0.00001)
+    assert_in_delta(constrain(x_int[2], start_int, last_int), 0, delta = 0.00001)
+    xf = [15.0, 2_500.0, -2_500.0]
+    startf, lastf = 0, 200.0
+    assert_in_delta(constrain(xf[0], startf, lastf), 15.0, delta = 0.00001, msg = 'constrain to 0..200')
+    assert_in_delta(constrain(xf[1], startf, lastf), 200.0, delta = 0.00001, msg = 'constrain to 0..200')
+    assert_in_delta(constrain(xf[2], startf, lastf), 0.0, delta = 0.00001, msg = 'constrain to 0..200')
+  end
+end

data/test/test_respond_to.rb

@@ -0,0 +1,213 @@
+# frozen_string_literal: true
+require_relative 'test_helper'
+
+METHODS = %i(
+  alpha
+  ambient
+  ambient_light
+  apply_matrix
+  arc
+  background
+  begin_camera
+  begin_contour
+  begin_raw
+  begin_record
+  begin_shape
+  bezier
+  bezier_detail
+  bezier_point
+  bezier_tangent
+  bezier_vertex
+  blend
+  blend_mode
+  blue
+  box
+  brightness
+  camera
+  color
+  color_mode
+  copy
+  create_font
+  create_graphics
+  create_image
+  create_input
+  create_output
+  create_reader
+  create_shape
+  create_writer
+  cursor
+  curve
+  curve_detail
+  curve_point
+  curve_tangent
+  curve_tightness
+  curve_vertex
+  directional_light
+  ellipse
+  ellipse_mode
+  emissive
+  end_camera
+  end_contour
+  end_raw
+  end_record
+  end_shape
+  fill
+  filter
+  focused
+  frame_count
+  frame_rate
+  frame_rate
+  frustum
+  get
+  green
+  height
+  hue
+  image
+  image_mode
+  key
+  key_code
+  key_pressed
+  key_pressed?
+  key_released
+  key_typed
+  lerp_color
+  light_falloff
+  light_specular
+  lights
+  line
+  load_bytes
+  load_font
+  load_image
+  load_pixels
+  load_shader
+  load_shape
+  load_strings
+  load_table
+  load_xml
+  model_x
+  model_y
+  model_z
+  mouse_button
+  mouse_clicked
+  mouse_dragged
+  mouse_moved
+  mouse_pressed
+  mouse_pressed?
+  mouse_released
+  mouse_x
+  mouse_y
+  no_cursor
+  no_fill
+  no_lights
+  no_smooth
+  no_stroke
+  no_tint
+  noise
+  noise_detail
+  noise_seed
+  normal
+  ortho
+  perspective
+  pixels
+  pmouse_x
+  pmouse_y
+  point
+  point_light
+  pop_matrix
+  print_camera
+  print_matrix
+  print_projection
+  push_matrix
+  quad
+  quadratic_vertex
+  random
+  random_seed
+  rect
+  rect_mode
+  red
+  request_image
+  reset_matrix
+  reset_shader
+  rotate
+  rotate_x
+  rotate_y
+  rotate_z
+  saturation
+  save
+  save_bytes
+  save_frame
+  save_stream
+  save_strings
+  scale
+  screen_x
+  screen_y
+  screen_z
+  select_folder
+  select_input
+  select_output
+  set
+  shader
+  shape
+  shape_mode
+  shear_x
+  shear_y
+  shininess
+  sketch_title
+  size
+  smooth
+  specular
+  sphere
+  sphere_detail
+  spot_light
+  stroke
+  stroke_cap
+  stroke_join
+  stroke_weight
+  text_align
+  text_ascent
+  text_descent
+  text_font
+  text_leading
+  text_mode
+  text_size
+  text_width
+  texture
+  texture_mode
+  texture_wrap
+  tint
+  translate
+  triangle
+  update_pixels
+  vertex
+  width
+)
+
+class TestSketch < Propane::App
+  def settings
+    size 100, 100
+  end
+
+  def setup
+    sketch_title 'Sketch Test'
+  end
+
+  def draw
+    exit if frame_count > 30
+  end
+end
+
+class SpecTest < Minitest::Test
+  def setup
+    @processing_sketch = TestSketch.new
+  end
+
+  def test_respond
+    METHODS.each do |method_string|
+      assert_respond_to @processing_sketch, method_string
+    end
+  end
+
+  def tear_down
+    @processing_sketch = nil?
+  end
+end

data/test/vecmath_spec_test.rb

@@ -0,0 +1,472 @@
+gem 'minitest' # don't use bundled minitest
+require 'java'
+require 'minitest/autorun'
+require 'minitest/pride'
+
+require_relative '../lib/propane'
+
+Java::Monkstone::PropaneLibrary.load(JRuby.runtime)
+
+
+Dir.chdir(File.dirname(__FILE__))
+
+class VecmathTest < Minitest::Test
+
+
+  def setup
+
+  end
+
+  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')
+  end
+
+  def test_not_equals
+    a = Vec2D.new(3, 5)
+    b = Vec2D.new(6, 7)
+    refute_equal(a, b, 'Failed equals false')
+  end
+
+  def test_copy_equals
+    x, y = 1.0000001, 1.01
+    a = Vec2D.new(x, y)
+    b = a.copy
+    assert_equal(a.to_a, b.to_a, 'Failed deep copy')
+  end
+
+  def test_copy_not_equals
+    x, y = 1.0000001, 1.01
+    a = Vec2D.new(x, y)
+    b = a.copy
+    b *= 0
+    refute_equal(a.to_a, b.to_a, 'Failed deep copy')
+  end
+
+  def test_equals_when_close
+    a = Vec2D.new(3.0000000, 5.00000)
+    b = Vec2D.new(3.0000000, 5.000001)
+    assert_equal(a, b, 'Failed to return equal when v. close')
+  end
+
+  def test_sum
+    a = Vec2D.new(3, 5)
+    b = Vec2D.new(6, 7)
+    c = Vec2D.new(9, 12)
+    assert_equal(a + b, c, 'Failed to sum vectors')
+  end
+
+  def test_subtract
+    a = Vec2D.new(3, 5)
+    b = Vec2D.new(6, 7)
+    c = Vec2D.new(-3, -2)
+    assert_equal(a - b, c, 'Failed to subtract vectors')
+  end
+
+  def test_multiply
+    a = Vec2D.new(3, 5)
+    b = 2
+    c = a * b
+    d = Vec2D.new(6, 10)
+    assert_equal(c, d, 'Failed to multiply vector by scalar')
+  end
+
+  def test_divide
+    a = Vec2D.new(3, 5)
+    b = 2
+    c = Vec2D.new(1.5, 2.5)
+    d = a / b
+    assert_equal(c, d, 'Failed to divide vector by scalar')
+  end
+
+  def test_dot
+    a = Vec2D.new(3, 5)
+    b = Vec2D.new(6, 7)
+    assert_in_epsilon(a.dot(b), 53, 0.001, 'Failed to dot product')
+  end
+
+  def test_self_dot
+    a = Vec2D.new(3, 5)
+    assert_in_epsilon(a.dot(a), 34, 0.001, 'Failed self dot product')
+  end
+
+  def test_from_angle
+    a = Vec2D.from_angle(Math::PI * 0.75)
+    assert_equal(a, Vec2D.new(-1 * Math.sqrt(0.5), Math.sqrt(0.5)), 'Failed to create vector from angle')
+  end
+
+  def test_random
+    a = Vec2D.random
+    assert a.kind_of? Vec2D
+    assert_in_epsilon(a.mag, 1.0)
+  end
+
+  def test_assign_value
+    a = Vec2D.new(3, 5)
+    a.x = 23
+    assert_equal(a.x, 23, 'Failed to assign x value')
+  end
+
+  def test_mag
+    a = Vec2D.new(-3, -4)
+    assert_in_epsilon(a.mag, 5, 0.001,'Failed to return magnitude of vector')
+  end
+
+  def test_mag_variant
+    a = Vec2D.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
+    a = Vec2D.new(-1, 0)
+    assert_in_epsilon(a.mag, 1, 0.001, 'Failed to return magnitude of vector')
+  end
+
+  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')
+  end
+
+  def test_lerp
+    a = Vec2D.new(1, 1)
+    b = Vec2D.new(3, 3)
+    assert_equal(a.lerp(b, 0.5), Vec2D.new(2, 2), 'Failed to return lerp between two vectors')
+  end
+
+  def test_lerp_unclamped
+    a = Vec2D.new(1, 1)
+    b = Vec2D.new(3, 3)
+    assert_equal(a.lerp(b, 5), Vec2D.new(11, 11), 'Failed to return lerp between two vectors')
+  end
+
+    def test_lerp!
+    a = Vec2D.new(1, 1)
+    b = Vec2D.new(3, 3)
+    a.lerp!(b, 0.5)
+    assert_equal(a, Vec2D.new(2, 2), 'Failed to return lerp! between two vectors')
+  end
+
+  def test_lerp_unclamped!
+    a = Vec2D.new(1, 1)
+    b = Vec2D.new(3, 3)
+    a.lerp!(b, 5)
+    assert_equal(a, Vec2D.new(11, 11), 'Failed to return lerp! between two vectors')
+  end
+
+  def test_set_mag
+    a = Vec2D.new(1, 1)
+    assert_equal(a.set_mag(Math.sqrt(32)), Vec2D.new(4, 4), 'Failed to set_mag vector')
+  end
+
+  def test_set_mag_block
+    a = Vec2D.new(1, 1)
+    assert_equal(a.set_mag(Math.sqrt(32)) { true }, Vec2D.new(4, 4), 'Failed to set_mag_block true vector')
+  end
+
+  def test_set_mag_block_false
+    a = Vec2D.new(1, 1)
+    assert_equal(a.set_mag(Math.sqrt(32)) { false }, Vec2D.new(1, 1), 'Failed to set_mag_block true vector')
+  end
+
+  def test_plus_assign
+    a = Vec2D.new(3, 5)
+    b = Vec2D.new(6, 7)
+    a += b
+    assert_equal(a, Vec2D.new(9, 12), 'Failed to += assign')
+  end
+
+  def test_normalize
+    a = Vec2D.new(3, 5)
+    b = a.normalize
+    assert_in_epsilon(b.mag, 1, 0.001, 'Failed to return a normalized vector')
+  end
+
+  def test_normalize!
+    a = Vec2D.new(3, 5)
+    a.normalize!
+    assert_in_epsilon(a.mag, 1, 0.001, 'Failed to return a normalized! vector')
+  end
+
+  def test_heading
+    a = Vec2D.new(1, 1)
+    assert_in_epsilon(a.heading, Math::PI / 4.0, 0.001, 'Failed to return heading in radians')
+  end
+
+  def test_rotate
+    x, y = 20, 10
+    b = Vec2D.new(x, y)
+    a = b.rotate(Math::PI / 2)
+    assert_equal(a, Vec2D.new(-10, 20), 'Failed to rotate vector by scalar radians')
+  end
+
+  def test_hash_index
+    x, y = 10, 20
+    b = Vec2D.new(x, y)
+    assert_equal(b[:x], x, 'Failed to hash index')
+  end
+
+  def test_hash_set
+    x = 10
+    b = Vec2D.new
+    b[:x] = x
+    assert_equal(a, Vec2D.new(-10, 20), 'Failed to hash assign')
+  end
+
+  def test_inspect
+    a = Vec2D.new(3, 2.000000000000001)
+    assert_equal(a.inspect, 'Vec2D(x = 3.0000, y = 2.0000)')
+  end
+
+  def test_array_reduce
+    array = [Vec2D.new(1, 2), Vec2D.new(10, 2), Vec2D.new(1, 2)]
+    sum = array.reduce(Vec2D.new) { |c, d| c + d }
+    assert_equal(sum, Vec2D.new(12, 6))
+  end
+
+  def test_array_zip
+    one = [Vec2D.new(1, 2), Vec2D.new(10, 2), Vec2D.new(1, 2)]
+    two = [Vec2D.new(1, 2), Vec2D.new(10, 2), Vec2D.new(1, 2)]
+    zipped = one.zip(two).flatten
+    expected = [Vec2D.new(1, 2), Vec2D.new(1, 2), Vec2D.new(10, 2), Vec2D.new(10, 2), Vec2D.new(1, 2), Vec2D.new(1, 2)]
+    assert_equal(zipped, expected)
+  end
+
+  def test_cross_area # NB: the sign might be negative
+    a = Vec2D.new(200, 0)
+    b = Vec2D.new(0, 200)
+    # Expected result is an area, twice that of the triangle created by the vectors
+    assert_equal((a).cross(b).abs, 40_000.0, 'Failed area test using 2D vector cross product')
+  end
+
+  def test_cross_non_zero # Could be used to calculate area of triangle
+    a = Vec2D.new(40, 40)
+    b = Vec2D.new(40, 140)
+    c = Vec2D.new(140, 40)
+    assert_equal((a - b).cross(b - c).abs / 2, 5_000.0, 'Failed area calculation using 2D vector cross product')
+  end
+
+  def test_cross_zero # where a, b, c are collinear area == 0
+    a = Vec2D.new(0, 0)
+    b = Vec2D.new(100, 100)
+    c = Vec2D.new(200, 200)
+    # see http://mathworld.wolfram.com/Collinear.html for details
+    assert((a - b).cross(b - c).zero?, 'Failed collinearity test using 2D vector cross product')
+  end
+
+  def test_equals
+    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')
+  end
+
+  def test_not_equals
+    a = Vec3D.new(3, 5, 1)
+    b = Vec3D.new(6, 7, 1)
+    refute_equal(a, b, 'Failed equals false')
+  end
+
+  def test_copy_equals
+    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
+    x, y, z = 1.0000001, 1.01, 6.0
+    a = Vec3D.new(x, y, z)
+    b = a.copy
+    b *= 0
+    refute_equal(a.to_a, b.to_a, 'Failed deep copy')
+  end
+
+  def test_equals_when_close
+    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
+    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
+    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
+    a = Vec3D.new(3, 5, 1)
+    b = 2
+    c = a * b
+    d = Vec3D.new(6, 10, 2)
+    assert_equal(c, d, 'Failed to multiply vector by scalar')
+  end
+
+  def test_divide
+    a = Vec3D.new(3, 5, 4)
+    b = 2
+    c = Vec3D.new(1.5, 2.5, 2)
+    d = a / b
+    assert_equal(c, d, 'Failed to divide vector by scalar')
+  end
+
+  def test_random
+    a = Vec3D.random
+    assert a.kind_of? Vec3D
+    assert_in_epsilon(a.mag, 1.0)
+  end
+
+  def test_assign_value
+    a = Vec3D.new(3, 5)
+    a.x=23
+    assert_equal(a.x, 23, 'Failed to assign x value')
+  end
+
+  def test_mag
+    a = Vec3D.new(-3, -4)
+    assert_equal(a.mag, 5, 'Failed to return magnitude of vector')
+  end
+
+  def test_mag_variant
+    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
+    a = Vec3D.new(-1, 0)
+    assert_equal(a.mag, 1, 'Failed to return magnitude of vector')
+  end
+
+  def test_dist
+    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
+    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
+    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
+    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
+    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
+    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
+    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
+    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
+    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
+    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!
+    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
+    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
+    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
+    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
+    expected = [Vec3D.new(1, 2), Vec3D.new(1, 2), Vec3D.new(10, 2), Vec3D.new(10, 2), Vec3D.new(1, 2), Vec3D.new(1, 2)]
+    assert_equal(zipped, expected)
+  end
+
+  def test_eql?
+    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?
+    a = Vec3D.new(3.0, 5.0, 0)
+    b = Vec3D.new(3.0, 5.000001, 0)
+    refute(a.eql?(b))
+  end
+
+  def test_equal?
+    a = Vec3D.new(3.0, 5.0, 0)
+    assert(a.equal?(a))
+  end
+
+  def test_not_equal?
+    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
+    x, y, z = 10, 20, 50
+    b = Vec3D.new(x, y, z)
+    assert_equal(b[:x], x, 'Failed hash key access')
+    assert_equal(b[:y], y, 'Failed hash key access')
+    assert_equal(b[:z], z, 'Failed hash key access')
+  end
+
+  def test_hash_set
+    x = 10
+    b = Vec3D.new
+    b[:x] = x
+    assert_equal(b, Vec3D.new(x, 0, 0), 'Failed to hash assign')
+  end
+end

data/vendors/Rakefile

@@ -9,7 +9,7 @@ SOUND = 'sound.zip'.freeze
 SOUND_VERSION = 'v1.3.2' # version 1.3.2
 VIDEO = 'video-2.zip'
 VIDEO_VERSION = '2' # version 1.0.1
-EXAMPLES = '0.7'.freeze
+EXAMPLES = '0.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.1.0
+  version: 2.1.1
 platform: java
 authors:
 - monkstone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-26 00:00:00.000000000 Z
+date: 2017-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arcball
@@ -24,7 +24,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.3
-description: A batteries included version of processing in ruby, macOS and linux
+description: A batteries included version of processing in ruby, MacOS and linux64
 email:
 - mamba2928@yahoo.co.uk
 executables:
@@ -45,13 +45,11 @@ files:
 - Rakefile
 - bin/propane
 - lib/PROCESSING_LICENSE.txt
-- lib/core-3.2.3.jar
+- lib/core-3.2.4.jar
 - lib/export.txt
-- lib/gluegen-rt-2.3.2-natives-linux-amd64.jar
-- lib/gluegen-rt-2.3.2-natives-macosx-universal.jar
+- lib/gluegen-rt-2.3.2-natives-linux-armv6hf.jar
 - lib/gluegen-rt-2.3.2.jar
-- lib/jogl-all-2.3.2-natives-linux-amd64.jar
-- lib/jogl-all-2.3.2-natives-macosx-universal.jar
+- lib/jogl-all-2.3.2-natives-linux-armv6hf.jar
 - lib/jogl-all-2.3.2.jar
 - lib/propane.jar
 - lib/propane.rb
@@ -106,6 +104,12 @@ files:
 - test/deglut_spec_test.rb
 - test/math_tool_test.rb
 - test/respond_to_test.rb
+- test/test_create.rb
+- test/test_deglut_spec.rb
+- test/test_helper.rb
+- test/test_math_tool.rb
+- test/test_respond_to.rb
+- test/vecmath_spec_test.rb
 - vendors/Rakefile
 homepage: https://ruby-processing.github.io/propane/
 licenses:
@@ -128,12 +132,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.3
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
-summary: A jruby wrapper for processing-3.2.3
+summary: ruby wrapper for processing-3.2.4 on MacOS and linux64 bit only for opengl
 test_files:
 - test/create_test.rb
 - test/deglut_spec_test.rb
 - test/math_tool_test.rb
 - test/respond_to_test.rb
+- test/test_create.rb
+- test/test_deglut_spec.rb
+- test/test_helper.rb
+- test/test_math_tool.rb
+- test/test_respond_to.rb
+- test/vecmath_spec_test.rb