picrate 2.5.1-java → 2.5.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3f8a1c6f427e8d6496ffa52f10da57bc8763f8dd92d52074652409658684fba
-  data.tar.gz: b0e3cf6d3c457bea3fdda0642d10c0a443528752b13e1ac2dd767f2bb3c0798a
+  metadata.gz: b4a2f73c549d8ee796280cc60c5f304c50adc474375e56a7f1c27517f4e04f90
+  data.tar.gz: f326bd382abcdf8bb8b6ae76124ccddbfff932a4aac2f0c22c176928575bdbeb
 SHA512:
-  metadata.gz: 1de09c1115c514a845a63b00d777784550c2d1a1c20662ed59974727460652927ab7706d7380433cea31fd1f7d67c7b31f494bd566b990c9e94152120766b543
-  data.tar.gz: 290f982b1b70b41e58de89182b2603f96c6276f1381d19f10b5d3827aebea20f81af3c609cb07fda2a662a21b02dae5ce72dbd18b9adda12970bf0eca87865c8
+  metadata.gz: '088cbf53dfa5f0b149d5312a7c5a2e52d81cebb54f05370feb813fb9aaa59bfc56dc6659dc0090c6b6451fb730a269e1e536e88c7cd2ce22a25c263a547ebf17'
+  data.tar.gz: 82ad21a6e136b0206018dc8b8906884303e1daf36995568e774a8ce5a4894733df1d5c0486b4ad4c910cb4c29df938c613cdf621d85ae4c5af87d0d0cb31e605

data/CHANGELOG.md

@@ -1,4 +1,6 @@
-v2.5.1 Update to JRuby-9.3.1.0, under the hood changes in how we access java fields, no using `field` in place of `declared_field`, possible since JRuby-9.3.0.0 required since JRuby-9.3.1.0.
+v2.5.2 Update to JRuby-9.3.2.0.
+
+v2.5.1 Update to JRuby-9.3.1.0, under the hood changes in how we access java fields, no using `field` in place of `declared_field`, possible since JRuby-9.3.0.0 required since JRuby-9.3.2.0.
 
 v2.5.0 Update to JRuby-9.3.0.0.
 

data/README.md

@@ -19,7 +19,7 @@ Requires java to build (and [jogl-2.4.0-rc jars][jogl_jars]), but uses a maven w
 ```bash
 cd PiCrate # or whatever you call it
 rake # assumes an installed version of vanilla processing
-jgem install picrate-2.5.1-java.gem
+jgem install picrate-2.5.2-java.gem
 
 ```
 To create a template sketch:-

data/docs/_classes/vec2d/vec2d.md

@@ -4,7 +4,7 @@ title: "Vec2D"
 permalink: /classes/vec2d/
 ---
 
-The Vec2D class is a direct replacement for processings PVector class (when used for 2D work, see Vec3D for 3D version).
+The Vec2D class is a direct replacement for processings PVector class (when used for 2D work, see Vec3D for 3D version). Recently cross product is deprecated in favor of the more correct wedge `^` product
 
 ### Methods:-
 ```ruby
@@ -15,7 +15,7 @@ a / b # where a is instance of Vec2D and b is a scalar
 a == b # where both a and b are both instances of Vec2D
 a.angle_between(b) # where both a and b are both instances of Vec2D
 a.copy # where a is instance of Vec2D returns a deep copy
-a.cross(b) # where both a and b are both instances of Vec2D
+a ^ b # wedge product where both a and b are both instances of Vec2D
 a.dist(b) # where both a and b are both instances of Vec2D
 a.dot(b) # where both a and b are both instances of Vec2D
 a.heading # where a is instance of Vec2D

data/docs/_posts/2018-05-06-install_jruby.md

@@ -14,7 +14,7 @@ Get the latest version from [http://jruby.org/download][download]
 
 ```bash
 cd /opt
-sudo tar xzvf /pathToDownload/jruby-bin-9.3.1.0.tar.gz
+sudo tar xzvf /pathToDownload/jruby-bin-9.3.2.0.tar.gz
 ```
 
 Then use the excellent `update-alternatives` tool to provide symbolic links to `jruby`, `jgem`, `jirb` and `rake` especially if you haven't installed `mri` ruby.
@@ -42,5 +42,5 @@ The [picrate2_install.sh][bash] script currently installs jruby-9.3.0.0 and picr
 
 If you know better please post on wiki
 
-[download]:"https://repo1.maven.org/maven2/org/jruby/jruby-dist/9.3.1.0/jruby-dist-9.3.1.0-bin.tar.gz"
+[download]:"https://repo1.maven.org/maven2/org/jruby/jruby-dist/9.3.2.0/jruby-dist-9.3.2.0-bin.tar.gz"
 [bash]:https://gist.github.com/monkstone/6ae9840d7b7008c177b4a9f589d14ec6

data/docs/_posts/2020-05-11-getting_started_manjaro.md

@@ -8,7 +8,7 @@ permalink: /getting_manjaro/
 If Manjaro does not come with a pre-installed java, then the first step is to install a `jdk` the distro version (jdk16) should work.
 
 ```bash
-sudo pacman -S jre-openjdk # current distro version jdk16
+sudo pacman -S jre-openjdk # current distro version jdk17
 ```
 You can also use pacman to install jruby
 ```bash

data/lib/picrate/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PiCrate
-  VERSION = '2.5.1'
+  VERSION = '2.5.2'
 end

data/pom.rb

@@ -2,7 +2,7 @@
 
 project 'picrate', 'http://maven.apache.org' do
   model_version '4.0.0'
-  id 'ruby-processing:picrate:2.5.1'
+  id 'ruby-processing:picrate:2.5.2'
   packaging 'jar'
 
   description 'An integrated processing-core (somewhat hacked), with additional java code for a jruby version of processing.'
@@ -24,7 +24,7 @@ project 'picrate', 'http://maven.apache.org' do
   issue_management 'https://github.com/ruby-processing/PiCrate/issues', 'Github'
   # Need to update to jogl 2.4.1 as soon as available, then make a dependency
   properties('jogl.version' => '2.3.2',
-             'jruby.version' => '9.3.1.0',
+             'jruby.version' => '9.3.2.0',
              'batik.version' => '1.14',
              'itextpdf.version' => '5.5.13.2',
              'jruby.api' => 'http://jruby.org/apidocs/',

data/pom.xml

@@ -11,7 +11,7 @@ DO NOT MODIFY - GENERATED CODE
   <modelVersion>4.0.0</modelVersion>
   <groupId>ruby-processing</groupId>
   <artifactId>picrate</artifactId>
-  <version>2.5.1</version>
+  <version>2.5.2</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>
@@ -68,7 +68,7 @@ DO NOT MODIFY - GENERATED CODE
     <itextpdf.version>5.5.13.2</itextpdf.version>
     <jogl.version>2.3.2</jogl.version>
     <jruby.api>http://jruby.org/apidocs/</jruby.api>
-    <jruby.version>9.3.1.0</jruby.version>
+    <jruby.version>9.3.2.0</jruby.version>
     <picrate.basedir>${project.basedir}</picrate.basedir>
     <polyglot.dump.pom>pom.xml</polyglot.dump.pom>
     <processing.api>http://processing.github.io/processing-javadocs/core/</processing.api>

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

@@ -21,6 +21,7 @@ package monkstone.vecmath.vec2;
 *
 * fastAtan2 algorithm from https://github.com/libgdx/libgdx (Apache 2.0 license)
  */
+import java.util.logging.Logger; 
 import org.jruby.Ruby;
 import org.jruby.RubyArray;
 import org.jruby.RubyClass;
@@ -228,19 +229,27 @@ public final class Vec2 extends RubyObject {
         return runtime.newFloat(result);
     }
 
+    @Deprecated
+    @JRubyMethod(name = "cross", required = 1)
+    public IRubyObject cross(ThreadContext context, IRubyObject other) {
+        Logger log = Logger.getGlobal();
+        log.warning("prefer ^ operator");
+        return op_wedge(context, other);
+    }
+
     /**
      *
      * @param context ThreadContext
      * @param other IRubyObject
-     * @return cross product IRubyObject
+     * @return wedge product IRubyObject
      */
-    @JRubyMethod(name = "cross", required = 1)
+    @JRubyMethod(name = "^", required = 1)
 
-    public IRubyObject cross(ThreadContext context, IRubyObject other) {
+    public IRubyObject op_wedge(ThreadContext context, IRubyObject other) {
         Vec2 b = null;
         Ruby runtime = context.runtime;
         if (other instanceof Vec2) {
-            b = (Vec2) other.toJava(Vec2.class);
+            b = other.toJava(Vec2.class);
         } else {
             throw runtime.newTypeError("argument should be Vec2D");
         }
@@ -401,7 +410,7 @@ public final class Vec2 extends RubyObject {
     public IRubyObject set_mag(ThreadContext context, IRubyObject scalar, Block block) {
         double new_mag = scalar.toJava(Double.class);
         if (block.isGiven() && !block.yield(context, scalar).toJava(Boolean.class)) {
-            return this;        
+            return this;
         }
         double current = 0;
         if (Math.abs(jx) > EPSILON && Math.abs(jy) > EPSILON) {
@@ -789,7 +798,7 @@ public final class Vec2 extends RubyObject {
             double diff = jx - v.jx;
             if ((diff < 0 ? -diff : diff) > Vec2.EPSILON) {
                 return runtime.newBoolean(false);
-            } 
+            }
             diff = jy - v.jy;
             return runtime.newBoolean((diff < 0 ? -diff : diff) < Vec2.EPSILON);
         }

data/test/vecmath_spec_test.rb

@@ -270,14 +270,14 @@ class VecmathTest < Minitest::Test
     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')
+    assert_equal((a ^ 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')
+    assert_equal(((a - b) ^ (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
@@ -285,7 +285,7 @@ class VecmathTest < Minitest::Test
     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')
+    assert(((a - b) ^ (b - c)).zero?, 'Failed collinearity test using 2D vector cross product')
   end
 
   def test_equals3

data/vendors/Rakefile

@@ -8,7 +8,7 @@ SOUND = 'sound.zip'
 PROCESSING_GITHUB = 'https://github.com/processing'
 VIDEO = 'video.zip'
 DOWNLOAD = 'releases/download/latest'
-EXAMPLES = '0.5.8'
+EXAMPLES = '0.5.9'
 HOME_DIR = ENV['HOME']
 LIBRARY = File.join(HOME_DIR, '.picrate', 'libraries')
 PROJECT_DIR = File.join(HOME_DIR, 'projects')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: picrate
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.5.2
 platform: java
 authors:
 - monkstone
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-16 00:00:00.000000000 Z
+date: 2021-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -185,7 +185,7 @@ files:
 - lib/jogl-all-natives-linux-amd64.jar
 - lib/jogl-all-natives-linux-armv6hf.jar
 - lib/jogl-all.jar
-- lib/picrate-2.5.1.jar
+- lib/picrate-2.5.2.jar
 - lib/picrate.rb
 - lib/picrate/app.rb
 - lib/picrate/creators/parameters.rb