picrate 0.4.0-java → 0.4.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d0093cb47f7b3da255af047a82056efb9ea6d3c4173c13c8336b98c7f4b3cfb
-  data.tar.gz: ea5b1e00ee24ca51bc0625ab261a6914b2c67624f5026a06a4c0283a31b07da0
+  metadata.gz: 25ae4432e0880eeea609a15cbd902db4141cc7ac295eb19e0683bcdd63455979
+  data.tar.gz: 69a516953444d646916d662469b66b4741b64ade197380889b29a0e0edabab95
 SHA512:
-  metadata.gz: 50417839ec672bf61d8fc21f707612959ce3856dd7c85c4d6263308f00e09e209f9cfea4fa94a065232c41fa3a80f6bd715d2cf182a8f0d518e549a8f0ac4ec1
-  data.tar.gz: c852f333c965a5ec7152d312939fbfce171048079838e2e69e46984daa740a19c64e9a789a912f097fd110807864141f8104b0239ad82fce81e5212163cdeae2
+  metadata.gz: c7c0f1e869a86480fd6fdbea6b344a39b8e0a9e2ace90ed86e7443078377a4eff7746a80123a994be71b0ebaa497225fce76adb44b8e2718c4c366624a4d8297
+  data.tar.gz: 1a0a367a70d033c4d0b5f79fb55d6c3a646fe804cb27ac6acf63fb513ac50986291b5d727d02fd4afc7495976b669b2d9abcccecc0b3c74d3ad7647e265712a8

data/Rakefile

@@ -18,6 +18,7 @@ desc 'Create Manifest and Copy Jars'
 task :init do
   create_manifest
   processing_root = File.dirname(`readlink -f $(which processing)`)
+  # processing_root = '/home/tux/processing-3.4'
   jar_dir = File.join(processing_root, 'core', 'library')
   opengl = Dir.entries(jar_dir).grep(/amd64|armv6hf/).select { |jar| jar =~ /linux/ }
   opengl.concat %w[jogl-all.jar gluegen-rt.jar]
@@ -28,7 +29,7 @@ end
 
 desc 'Install'
 task :install do
-  sh 'mv target/picrate-0.4.0.jar lib'
+  sh 'mv target/picrate-0.4.1.jar lib'
 end
 
 desc 'Gem'

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

@@ -13,7 +13,7 @@ There is something wrong with jgem install from rubygems (involving `flock` and
 
 ```bash
 jgem install arcball-1.0.1-java.gem
-jgem install picrate-0.1.0-java.gem
+jgem install picrate-0.4.0-java.gem
 ```
 
 Install samples

data/lib/picrate/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module PiCrate
-  VERSION = '0.4.0'.freeze
+  VERSION = '0.4.1'.freeze
 end

data/library/boids/boids.rb

@@ -59,7 +59,7 @@ class Boid
   end
 
   def angle
-    Vec2D.new(vel.x, vel.y).heading
+    Vec2D.new(vel.x, vel.y).fast_heading
   end
 
   def goal(target, d = 50.0)

data/picrate.gemspec

@@ -12,10 +12,10 @@ Gem::Specification.new do |gem|
   gem.description  = <<-EOS
   A batteries included version of processing in ruby, for raspberrypi and linux.
   EOS
-  gem.summary       = %q{ruby wrapper for processing-3.3.7 on raspberrypi and linux64}
+  gem.summary       = %q{ruby wrapper for processing-3.4 on raspberrypi and linux64}
   gem.homepage      = 'https://ruby-processing.github.io/PiCrate/'
   gem.files         = `git ls-files`.split($/)
-  gem.files << 'lib/picrate-0.4.0.jar'
+  gem.files << 'lib/picrate-0.4.1.jar'
   gem.files << 'lib/gluegen-rt.jar'
   gem.files << 'lib/jogl-all.jar'
   gem.files << 'lib/gluegen-rt-natives-linux-amd64.jar'

data/pom.rb

@@ -1,7 +1,7 @@
 project 'picrate', 'http://maven.apache.org' do
 
   model_version '4.0.0'
-  id 'ruby-processing:picrate:0.4.0'
+  id 'ruby-processing:picrate:0.4.1'
   packaging 'jar'
 
   description 'An integrated processing-core (somewhat hacked), with additional java code for a jruby version of processing.'
@@ -31,8 +31,8 @@ project 'picrate', 'http://maven.apache.org' do
     'project.build.sourceEncoding' => 'utf-8',
     'polyglot.dump.pom' => 'pom.xml',
     'maven.compiler.source' => '1.8' )
-    pom 'org.jruby:jruby:9.1.16.0'
-    jar 'org.processing:video:3.0.2'
+    pom 'org.jruby:jruby:9.2.0.0'
+    jar 'org.processing:video:3.2.3'
     jar 'org.jogamp.jogl:jogl-all:${jogl.version}'
     jar 'org.jogamp.gluegen:gluegen-rt-main:${jogl.version}'
   end

data/pom.xml

@@ -11,7 +11,7 @@ DO NOT MODIFIY - GENERATED CODE
   <modelVersion>4.0.0</modelVersion>
   <groupId>ruby-processing</groupId>
   <artifactId>picrate</artifactId>
-  <version>0.4.0</version>
+  <version>0.4.1</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>
@@ -78,13 +78,13 @@ DO NOT MODIFIY - GENERATED CODE
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby</artifactId>
-      <version>9.1.16.0</version>
+      <version>9.2.0.0</version>
       <type>pom</type>
     </dependency>
     <dependency>
       <groupId>org.processing</groupId>
       <artifactId>video</artifactId>
-      <version>3.0.2</version>
+      <version>3.2.3</version>
     </dependency>
     <dependency>
       <groupId>org.jogamp.jogl</groupId>

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

@@ -1,12 +1,12 @@
 package monkstone.vecmath.vec2;
 
 /*
-* Copyright (c) 2018 Martin Prout
+* Copyright (c) 2015-18 Martin Prout
 *
 * This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public
+* modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
-* version 3.0 of the License, or (at your option) any later version.
+* version 2.1 of the License, or (at your option) any later version.
 *
 * http://creativecommons.org/licenses/LGPL/2.1/
 *
@@ -15,10 +15,12 @@ package monkstone.vecmath.vec2;
 * 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 General Public
+* 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
- */
+*
+* fastAtan2 algorithm from https://github.com/libgdx/libgdx (Apache 2.0 license)
+*/
 import org.jruby.Ruby;
 import org.jruby.RubyArray;
 import org.jruby.RubyClass;
@@ -35,7 +37,7 @@ import monkstone.vecmath.JRender;
 
 /**
  *
- *
+ * @author Martin Prout
  */
 @JRubyClass(name = "Vec2D")
 public class Vec2 extends RubyObject {
@@ -55,18 +57,10 @@ public class Vec2 extends RubyObject {
         vec2Cls.defineAnnotatedMethods(Vec2.class);
     }
 
-    /**
-     *
-     * @return
-     */
     public double javax() {
         return jx;
     }
 
-    /**
-     *
-     * @return
-     */
     public double javay() {
         return jy;
     }
@@ -361,6 +355,16 @@ public class Vec2 extends RubyObject {
         return context.runtime.newFloat(Math.atan2(jy, jx));
     }
 
+    /**
+     *
+     * @param context ThreadContext
+     * @return heading IRubyObject radians
+     */
+    @JRubyMethod(name = "fast_heading")
+    public IRubyObject fastHeading(ThreadContext context) {
+        return context.runtime.newFloat(fastAtan2(jy, jx));
+    }
+
     /**
      *
      * @param context ThreadContext
@@ -448,7 +452,7 @@ public class Vec2 extends RubyObject {
     /**
      *
      * @param context ThreadContext
-     * @return new normalized Vec3D object (ruby)
+     * @return new normalized Vec2D object (ruby)
      */
     @JRubyMethod(name = "normalize")
 
@@ -589,7 +593,7 @@ public class Vec2 extends RubyObject {
     /**
      *
      * @param context ThreadContext
-     * @param other IRubyObject another Vec3D
+     * @param other IRubyObject another Vec2D
      * @return angle IRubyObject in radians
      */
     @JRubyMethod(name = "angle_between")
@@ -605,6 +609,25 @@ public class Vec2 extends RubyObject {
         return runtime.newFloat(Math.atan2(jx - vec.jx, jy - vec.jy));
     }
 
+    /**
+     *
+     * @param context ThreadContext
+     * @param other IRubyObject another Vec2D
+     * @return angle IRubyObject in radians
+     */
+    @JRubyMethod(name = "fast_angle_between")
+
+    public IRubyObject fastAngleBetween(ThreadContext context, IRubyObject other) {
+        Vec2 vec = null;
+        Ruby runtime = context.runtime;
+        if (other instanceof Vec2) {
+            vec = (Vec2) other.toJava(Vec2.class);
+        } else {
+            throw runtime.newTypeError("argument should be Vec2D");
+        }
+        return runtime.newFloat(fastAtan2(jx - vec.jx, jy - vec.jy));
+    }
+
     /**
      *
      * @param context ThreadContext
@@ -673,6 +696,28 @@ public class Vec2 extends RubyObject {
         return context.runtime.newString(String.format("Vec2D(x = %4.4f, y = %4.4f)", jx, jy));
     }
 
+    private double fastAtan2(double y, double x) {
+        if (x == 0) {
+            if (y > 0) {
+                return Math.PI / 2;
+            }
+            if (y == 0) {
+                return 0;
+            }
+            return -Math.PI / 2;
+        }
+        final double atan, z = y / x;
+        if (Math.abs(z) < 1) {
+            atan = z / (1 + 0.28 * z * z);
+            if (x < 0) {
+                return atan + (y < 0 ? -Math.PI : Math.PI);
+            }
+            return atan;
+        }
+        atan = Math.PI / 2 - z / (z * z + 0.28);
+        return y < 0 ? atan - Math.PI : atan;
+    }
+
     /**
      *
      * @return hash int

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: picrate
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: java
 authors:
 - monkstone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-01 00:00:00.000000000 Z
+date: 2018-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -168,7 +168,7 @@ files:
 - lib/jogl-all-natives-linux-amd64.jar
 - lib/jogl-all-natives-linux-armv6hf.jar
 - lib/jogl-all.jar
-- lib/picrate-0.4.0.jar
+- lib/picrate-0.4.1.jar
 - lib/picrate.rb
 - lib/picrate/app.rb
 - lib/picrate/creators/sketch_class.rb
@@ -343,7 +343,7 @@ rubyforge_project:
 rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
-summary: ruby wrapper for processing-3.3.7 on raspberrypi and linux64
+summary: ruby wrapper for processing-3.4 on raspberrypi and linux64
 test_files:
 - test/color_group_test.rb
 - test/create_test.rb