From eff5fa506f7ccc530676bf7b6c88a8a318e03f15 Mon Sep 17 00:00:00 2001 From: monkstone Date: Mon, 24 Apr 2017 20:07:16 +0100 Subject: [PATCH] about time we updated to 1.0 --- arcball.gemspec | 4 ++-- lib/arcball.jar | Bin 12168 -> 12539 bytes lib/arcball/version.rb | 3 +-- pom.rb | 28 ++++++++++++++-------------- pom.xml | 18 +++++++++--------- src/monkstone/arcball/Arcball.java | 7 ++----- src/monkstone/arcball/Rarcball.java | 17 ++++++++++++----- 7 files changed, 40 insertions(+), 37 deletions(-) diff --git a/arcball.gemspec b/arcball.gemspec index 4b29a49..b4ec9a3 100644 --- a/arcball.gemspec +++ b/arcball.gemspec @@ -10,13 +10,13 @@ Gem::Specification.new do |s| s.extra_rdoc_files = ['README.md', 'LICENSE.md'] s.authors = ['Martin Prout'] s.date = %q{2016-03-13} - s.description = %q{A ArcBall in java for processing on ruby} + s.description = %q{A ArcBall in java for propane} s.summary = %q{Provides arcball functionality to processing, from a ruby environment} s.email = %q{martin_p@lineone.net} s.files = ['Rakefile', 'lib/arcball.rb', 'lib/arcball.jar', 'lib/arcball/version.rb'] s.homepage = %q{http://rubygems.org/gems/arcball} s.require_paths = ['lib'] - s.add_development_dependency 'rake', '~> 10.0' + s.add_development_dependency 'rake', '~> 12' s.platform='java' s.rubygems_version = %q{2.5.2} end diff --git a/lib/arcball.jar b/lib/arcball.jar index ebdb5e39b2193a26655047483c29ca7809a758a2..120476a88c965411d6730f64b3bb8e3becb8b0d6 100644 GIT binary patch literal 12539 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 W6!>cu8wd#L^>_4Yz4z2V{{26f>+ui( literal 12168 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 pPs;Wjp!nAi{Z#Dd`9 'src', 'arcball.basedir' => '${project.basedir}', 'polyglot.dump.pom' => 'pom.xml', - 'maven.compiler.source' => '1.7', + 'maven.compiler.source' => '1.8', 'project.build.sourceEncoding' => 'utf-8', - 'maven.compiler.target' => '1.7', + 'maven.compiler.target' => '1.8', 'jruby.api' => 'http://jruby.org/apidocs/', 'processing.api' => 'http://processing.github.io/processing-javadocs/core/', 'jruby.api' => 'http://jruby.org/apidocs/', ) - - pom('org.jruby:jruby:9.0.5.0') - jar('org.processing:core:2.2.1') - + + pom('org.jruby:jruby:9.1.8.0') + jar('org.processing:core:3.2.3') + plugin_management do plugin :resources, '2.6' plugin :dependency, '2.10' - - plugin( :compiler, '3.3', + + plugin( :compiler, '3.5.1', source: '${maven.compiler.source}', target: '${maven.compiler.target}' ) - plugin( :javadoc, '2.10.3', + plugin( :javadoc, '2.10.4', detect_offline_links: 'false', links: ['${jruby.api}', '${processing.api}'] ) - plugin( :jar, '2.6', + plugin( :jar, '3.0.2', archive: { manifestFile: 'MANIFEST.MF' } ) end diff --git a/pom.xml b/pom.xml index 676d752..d8e321c 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ DO NOT MODIFIY - GENERATED CODE 4.0.0 arcball arcball - 0.0.2 + 1.0.0 arcball arcball for arcball https://github.com/ruby-processing/ArcBall @@ -43,21 +43,21 @@ DO NOT MODIFIY - GENERATED CODE pom.xml ${project.basedir} utf-8 - 1.7 + 1.8 http://jruby.org/apidocs/ - 1.7 + 1.8 org.jruby jruby - 9.0.5.0 + 9.1.8.0 pom org.processing core - 2.2.1 + 3.2.3 @@ -76,7 +76,7 @@ DO NOT MODIFIY - GENERATED CODE maven-compiler-plugin - 3.3 + 3.5.1 ${maven.compiler.source} ${maven.compiler.target} @@ -84,9 +84,9 @@ DO NOT MODIFIY - GENERATED CODE maven-javadoc-plugin - 2.10.3 + 2.10.4 - false + false ${jruby.api} ${processing.api} @@ -95,7 +95,7 @@ DO NOT MODIFIY - GENERATED CODE maven-jar-plugin - 2.6 + 3.0.2 MANIFEST.MF diff --git a/src/monkstone/arcball/Arcball.java b/src/monkstone/arcball/Arcball.java index 4f074a0..ef5f470 100644 --- a/src/monkstone/arcball/Arcball.java +++ b/src/monkstone/arcball/Arcball.java @@ -68,11 +68,8 @@ public class Arcball { * @param radius double radius of arcball */ public Arcball(PApplet parent, double center_x, double center_y, double radius) { - this.zoomWheelHandler = new WheelHandler() { - @Override - public void handleWheel(int delta) { - zoom += delta * 0.05; - } + this.zoomWheelHandler = (int delta) -> { + zoom += delta * 0.05; }; this.parent = parent; this.center_x = center_x; diff --git a/src/monkstone/arcball/Rarcball.java b/src/monkstone/arcball/Rarcball.java index ac6f39d..c9d8eb2 100644 --- a/src/monkstone/arcball/Rarcball.java +++ b/src/monkstone/arcball/Rarcball.java @@ -19,6 +19,8 @@ import org.jruby.Ruby; import org.jruby.RubyClass; +import org.jruby.RubyFloat; +import org.jruby.RubyFixnum; import org.jruby.RubyModule; import org.jruby.RubyObject; import org.jruby.RubySymbol; @@ -69,15 +71,20 @@ public static void init(ThreadContext context, IRubyObject self, IRubyObject arg int count = Arity.checkArgumentCount(context.getRuntime(), args, 1, 4); if (count == 4) { PApplet parent = (PApplet) args[0].toJava(PApplet.class); - double cx = (double) args[1].toJava(Double.class); - double cy = (double) args[2].toJava(Double.class); - double radius = (double) args[3].toJava(Double.class); + double cx = (args[1] instanceof RubyFloat) + ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue(); + double cy = (args[2] instanceof RubyFloat) + ? ((RubyFloat) args[2]).getValue() : ((RubyFixnum) args[2]).getDoubleValue(); + double radius = (args[3] instanceof RubyFloat) + ? ((RubyFloat) args[3]).getValue() : ((RubyFixnum) args[3]).getDoubleValue(); new Arcball(parent, cx, cy, radius).setActive(true); } if (count == 3) { PApplet parent = (PApplet) args[0].toJava(PApplet.class); - double cx = (double) args[1].toJava(Double.class); - double cy = (double) args[2].toJava(Double.class); + double cx = (args[1] instanceof RubyFloat) + ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue(); + double cy = (args[2] instanceof RubyFloat) + ? ((RubyFloat) args[2]).getValue() : ((RubyFixnum) args[2]).getDoubleValue(); new Arcball(parent, cx, cy, parent.width * 0.8f).setActive(true); } if (count == 1) {