propane 2.6.4-java → 2.6.5.pre-java
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.mvn/extensions.xml +1 -1
- data/CHANGELOG.md +2 -0
- data/README.md +4 -9
- data/Rakefile +1 -1
- data/lib/propane/app.rb +1 -1
- data/lib/propane/version.rb +1 -1
- data/library/slider/slider.rb +1 -1
- data/pom.rb +3 -9
- data/pom.xml +8 -15
- data/propane.gemspec +2 -2
- data/src/monkstone/ColorUtil.java +1 -1
- data/src/monkstone/MathToolModule.java +5 -5
- data/src/monkstone/PropaneLibrary.java +1 -1
- data/src/monkstone/fastmath/Deglut.java +1 -1
- data/src/monkstone/filechooser/Chooser.java +1 -1
- data/src/monkstone/slider/CustomHorizontalSlider.java +1 -1
- data/src/monkstone/slider/CustomVerticalSlider.java +1 -1
- data/src/monkstone/slider/SimpleHorizontalSlider.java +1 -1
- data/src/monkstone/slider/SimpleVerticalSlider.java +1 -1
- data/src/monkstone/slider/SliderBar.java +1 -1
- data/src/monkstone/slider/SliderGroup.java +1 -1
- data/src/monkstone/slider/WheelHandler.java +1 -1
- data/src/monkstone/vecmath/package-info.java +1 -1
- data/src/monkstone/vecmath/vec2/Vec2.java +14 -7
- data/src/monkstone/vecmath/vec3/Vec3.java +6 -7
- data/src/monkstone/videoevent/VideoInterface.java +1 -1
- data/src/monkstone/videoevent/package-info.java +1 -1
- data/test/vecmath_spec_test.rb +9 -1
- data/vendors/Rakefile +1 -1
- metadata +6 -7
- data/.travis.yml +0 -10
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 3b16068d31d618bf30b5900adc75c7ff12c3f74cbd57856e08b332d791221712
|
|
4
|
+
data.tar.gz: 2803573c8faeda2fff247e0cfbbaedabec16ab11162cf269cdf1895166e25e7e
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 7973f7932ec0314a9cd410af50821fffe0d715ea0f6df86977dda6c24f431dc8793acab956bdd84474581fe49c8a3072aded198ddd1a24023ef7bf9be7100cac
|
|
7
|
+
data.tar.gz: c3f8c7dd36287403e448aae231f8a7b839167bdbf1fc0993a9aa66f4d5c396dcd28d7cfc20bfe4f6455242b21366dcba0ebd8b6cd24a588cf436f8b8b8f9b6be
|
data/.mvn/extensions.xml
CHANGED
data/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
**v2.6.5** bump for processing-3.3.7
|
|
2
|
+
|
|
1
3
|
**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.
|
|
2
4
|
|
|
3
5
|
**v2.6.3** Bump recommended upgrade to jruby-9.1.16.0, possibly the last in 9.1 series?
|
data/README.md
CHANGED
|
@@ -1,21 +1,16 @@
|
|
|
1
1
|
# Propane
|
|
2
2
|
[](https://badge.fury.io/rb/propane) [](https://travis-ci.org/ruby-processing/propane)
|
|
3
3
|
|
|
4
|
-
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.3.
|
|
4
|
+
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.3.7, where we include a modified processing core (`public runPropane()` replaces `protected runSketch()`, not currently useable with jruby and jdk 9). 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). See guide to [building ruby-processing projects][building].
|
|
5
5
|
|
|
6
|
-
NB: The main reason for build failing is when the `core.jar` is not available from maven central, to install a local jar (_example for linux mint_):-
|
|
7
|
-
```bash
|
|
8
|
-
|
|
9
|
-
mvn install:install-file /home/tux/processing-3.3.6/core/library/core.jar -DgroupId=org.processing -DartifactId=core -Dversion=3.3.6
|
|
10
|
-
```
|
|
11
6
|
adjust above for your OS/distro setup.
|
|
12
7
|
|
|
13
8
|
## Requirements
|
|
14
9
|
|
|
15
|
-
- jdk8+
|
|
10
|
+
- jdk8+ (jdk9 works but is noisy)
|
|
16
11
|
- jruby-9.1.16.0
|
|
17
12
|
- mvn-3.5.0+
|
|
18
|
-
- core.jar
|
|
13
|
+
- processing-core.jar (_build only_) not generally available
|
|
19
14
|
|
|
20
15
|
## Building and testing
|
|
21
16
|
|
|
@@ -28,7 +23,7 @@ rake javadoc
|
|
|
28
23
|
## Installation
|
|
29
24
|
```bash
|
|
30
25
|
jgem install propane # from rubygems
|
|
31
|
-
jgem install propane-2.6.
|
|
26
|
+
jgem install propane-2.6.5.pre-java.gem # local install, NB: not currently possible
|
|
32
27
|
```
|
|
33
28
|
|
|
34
29
|
## Usage
|
data/Rakefile
CHANGED
|
@@ -7,7 +7,7 @@ def create_manifest
|
|
|
7
7
|
File.open('MANIFEST.MF', 'w') do |f|
|
|
8
8
|
f.puts(title)
|
|
9
9
|
f.puts(version)
|
|
10
|
-
f.puts('Class-Path: core
|
|
10
|
+
f.puts('Class-Path: processing-core.jar gluegen-rt-2.3.2.jar jog-all-2.3.2.jar')
|
|
11
11
|
end
|
|
12
12
|
end
|
|
13
13
|
|
data/lib/propane/app.rb
CHANGED
data/lib/propane/version.rb
CHANGED
data/library/slider/slider.rb
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
# Here's a little library for quickly hooking up in sketch sliders.
|
|
3
|
-
# Copyright (c) 2016-
|
|
3
|
+
# Copyright (c) 2016-18 Martin Prout.
|
|
4
4
|
|
|
5
5
|
java_import 'monkstone.slider.CustomHorizontalSlider'
|
|
6
6
|
java_import 'monkstone.slider.CustomVerticalSlider'
|
data/pom.rb
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
require 'fileutils'
|
|
2
2
|
project 'rp5extras', 'https://github.com/monkstone/propane' do
|
|
3
3
|
model_version '4.0.0'
|
|
4
|
-
id 'propane:propane', '2.6.
|
|
4
|
+
id 'propane:propane', '2.6.5'
|
|
5
5
|
packaging 'jar'
|
|
6
6
|
description 'rp5extras for propane'
|
|
7
7
|
organization 'ruby-processing', 'https://ruby-processing.github.io'
|
|
@@ -33,7 +33,7 @@ project 'rp5extras', 'https://github.com/monkstone/propane' do
|
|
|
33
33
|
)
|
|
34
34
|
|
|
35
35
|
pom 'org.jruby:jruby:9.1.16.0'
|
|
36
|
-
jar 'org.processing:core:3.3.
|
|
36
|
+
jar 'org.processing:core:3.3.7'
|
|
37
37
|
jar 'org.processing:video:3.0.2'
|
|
38
38
|
jar('org.jogamp.jogl:jogl-all:${jogl.version}')
|
|
39
39
|
jar('org.jogamp.gluegen:gluegen-rt-main:${jogl.version}')
|
|
@@ -42,13 +42,7 @@ project 'rp5extras', 'https://github.com/monkstone/propane' do
|
|
|
42
42
|
plugin :resources, '2.6'
|
|
43
43
|
plugin :dependency, '2.10' do
|
|
44
44
|
execute_goals( id: 'default-cli',
|
|
45
|
-
artifactItems: [ { groupId: 'org.
|
|
46
|
-
artifactId: 'core',
|
|
47
|
-
version: '3.3.6',
|
|
48
|
-
type: 'jar',
|
|
49
|
-
outputDirectory: '${propane.basedir}/lib'
|
|
50
|
-
},
|
|
51
|
-
{ groupId: 'org.jogamp.jogl',
|
|
45
|
+
artifactItems: [ { groupId: 'org.jogamp.jogl',
|
|
52
46
|
artifactId: 'jogl-all',
|
|
53
47
|
version: '${jogl.version}',
|
|
54
48
|
type: 'jar',
|
data/pom.xml
CHANGED
|
@@ -11,7 +11,7 @@ DO NOT MODIFIY - GENERATED CODE
|
|
|
11
11
|
<modelVersion>4.0.0</modelVersion>
|
|
12
12
|
<groupId>propane</groupId>
|
|
13
13
|
<artifactId>propane</artifactId>
|
|
14
|
-
<version>2.6.
|
|
14
|
+
<version>2.6.5</version>
|
|
15
15
|
<name>rp5extras</name>
|
|
16
16
|
<description>rp5extras for propane</description>
|
|
17
17
|
<url>https://github.com/monkstone/propane</url>
|
|
@@ -44,15 +44,15 @@ DO NOT MODIFIY - GENERATED CODE
|
|
|
44
44
|
<url>https://github.com/ruby-processing/propane/issues</url>
|
|
45
45
|
</issueManagement>
|
|
46
46
|
<properties>
|
|
47
|
-
<
|
|
48
|
-
<jruby.api>http://jruby.org/apidocs/</jruby.api>
|
|
49
|
-
<source.directory>src</source.directory>
|
|
47
|
+
<propane.basedir>${project.basedir}</propane.basedir>
|
|
50
48
|
<maven.compiler.target>1.8</maven.compiler.target>
|
|
51
49
|
<processing.api>http://processing.github.io/processing-javadocs/core/</processing.api>
|
|
52
|
-
<
|
|
53
|
-
<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
|
|
54
|
-
<polyglot.dump.pom>pom.xml</polyglot.dump.pom>
|
|
50
|
+
<source.directory>src</source.directory>
|
|
55
51
|
<maven.compiler.source>1.8</maven.compiler.source>
|
|
52
|
+
<polyglot.dump.pom>pom.xml</polyglot.dump.pom>
|
|
53
|
+
<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
|
|
54
|
+
<jogl.version>2.3.2</jogl.version>
|
|
55
|
+
<jruby.api>http://jruby.org/apidocs/</jruby.api>
|
|
56
56
|
</properties>
|
|
57
57
|
<dependencies>
|
|
58
58
|
<dependency>
|
|
@@ -64,7 +64,7 @@ DO NOT MODIFIY - GENERATED CODE
|
|
|
64
64
|
<dependency>
|
|
65
65
|
<groupId>org.processing</groupId>
|
|
66
66
|
<artifactId>core</artifactId>
|
|
67
|
-
<version>3.3.
|
|
67
|
+
<version>3.3.7</version>
|
|
68
68
|
</dependency>
|
|
69
69
|
<dependency>
|
|
70
70
|
<groupId>org.processing</groupId>
|
|
@@ -100,13 +100,6 @@ DO NOT MODIFIY - GENERATED CODE
|
|
|
100
100
|
<id>default-cli</id>
|
|
101
101
|
<configuration>
|
|
102
102
|
<artifactItems>
|
|
103
|
-
<artifactItem>
|
|
104
|
-
<groupId>org.processing</groupId>
|
|
105
|
-
<artifactId>core</artifactId>
|
|
106
|
-
<version>3.3.6</version>
|
|
107
|
-
<type>jar</type>
|
|
108
|
-
<outputDirectory>${propane.basedir}/lib</outputDirectory>
|
|
109
|
-
</artifactItem>
|
|
110
103
|
<artifactItem>
|
|
111
104
|
<groupId>org.jogamp.jogl</groupId>
|
|
112
105
|
<artifactId>jogl-all</artifactId>
|
data/propane.gemspec
CHANGED
|
@@ -12,11 +12,11 @@ Gem::Specification.new do |gem|
|
|
|
12
12
|
gem.description = <<-EOS
|
|
13
13
|
A batteries included version of processing in ruby, for MacOS and linux64.
|
|
14
14
|
EOS
|
|
15
|
-
gem.summary = %q{ruby wrapper for processing-3.3.
|
|
15
|
+
gem.summary = %q{ruby wrapper for processing-3.3.7 on MacOS and linux64 bit only for opengl}
|
|
16
16
|
gem.homepage = 'https://ruby-processing.github.io/propane/'
|
|
17
17
|
gem.files = `git ls-files`.split($/)
|
|
18
18
|
gem.files << 'lib/propane.jar'
|
|
19
|
-
gem.files << 'lib/core
|
|
19
|
+
gem.files << 'lib/processing-core.jar'
|
|
20
20
|
gem.files << 'lib/gluegen-rt-2.3.2.jar'
|
|
21
21
|
gem.files << 'lib/jogl-all-2.3.2.jar'
|
|
22
22
|
gem.files << 'lib/gluegen-rt-2.3.2-natives-linux-amd64.jar'
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
* in their sketches. Includes a method to efficiently convert an array of web
|
|
4
4
|
* strings to an array of color int, and another to convert an array of color
|
|
5
5
|
* int to a string that can be used in ruby code (to generate web color array).
|
|
6
|
-
* Copyright (c) 2015-
|
|
6
|
+
* Copyright (c) 2015-18 Martin Prout.
|
|
7
7
|
* This utility is free software; you can redistribute it and/or modify
|
|
8
8
|
* it under the terms of the GNU Lesser General Public License as published by
|
|
9
9
|
* the Free Software Foundation; either version 2.1 of the License, or (at
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* The purpose of this tool is to allow propane users to use an alternative
|
|
3
3
|
* to processing.org map, lerp and norm methods in their sketches
|
|
4
|
-
* Copyright (c) 2015-
|
|
4
|
+
* Copyright (c) 2015-18 Martin Prout. This tool is free software; you can
|
|
5
5
|
* redistribute it and/or modify it under the terms of the GNU Lesser General
|
|
6
6
|
* Public License as published by the Free Software Foundation; either version
|
|
7
7
|
* 2.1 of the License, or (at your option) any later version.
|
|
@@ -214,13 +214,13 @@ public class MathToolModule {
|
|
|
214
214
|
*/
|
|
215
215
|
@JRubyMethod(name = "grid", rest = true, module = true)
|
|
216
216
|
public static IRubyObject createGrid(ThreadContext context, IRubyObject recv, IRubyObject[] args, Block block) {
|
|
217
|
-
int row = (
|
|
218
|
-
int column = (
|
|
217
|
+
int row = (int) args[0].toJava(Integer.class);
|
|
218
|
+
int column = (int) args[1].toJava(Integer.class);
|
|
219
219
|
int rowStep = 1;
|
|
220
220
|
int colStep = 1;
|
|
221
221
|
if (args.length == 4){
|
|
222
|
-
rowStep = (
|
|
223
|
-
colStep = (
|
|
222
|
+
rowStep = (int) args[2].toJava(Integer.class);
|
|
223
|
+
colStep = (int) args[3].toJava(Integer.class);
|
|
224
224
|
}
|
|
225
225
|
if (block.isGiven()) {
|
|
226
226
|
int tempRow = row / rowStep;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* The purpose of this class is to load the MathTool into ruby-processing runtime
|
|
3
|
-
* Copyright (C) 2015-
|
|
3
|
+
* Copyright (C) 2015-18 Martin Prout. This code is free software; you can
|
|
4
4
|
* redistribute it and/or modify it under the terms of the GNU Lesser General
|
|
5
5
|
* Public License as published by the Free Software Foundation; either version
|
|
6
6
|
* 2.1 of the License, or (at your option) any later version.
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
package monkstone.vecmath.vec2;
|
|
2
2
|
|
|
3
3
|
/*
|
|
4
|
-
* Copyright (c) 2015-
|
|
4
|
+
* Copyright (c) 2015-18 Martin Prout
|
|
5
5
|
*
|
|
6
6
|
* This library is free software; you can redistribute it and/or
|
|
7
7
|
* modify it under the terms of the GNU Lesser General Public
|
|
@@ -72,7 +72,7 @@ public class Vec2 extends RubyObject {
|
|
|
72
72
|
* @return new Vec2 object (ruby)
|
|
73
73
|
*/
|
|
74
74
|
@JRubyMethod(name = "new", meta = true, rest = true)
|
|
75
|
-
public static final IRubyObject rbNew(ThreadContext context, IRubyObject klazz, IRubyObject
|
|
75
|
+
public static final IRubyObject rbNew(ThreadContext context, IRubyObject klazz, IRubyObject... args) {
|
|
76
76
|
Vec2 vec2 = (Vec2) ((RubyClass) klazz).allocate();
|
|
77
77
|
vec2.init(context, args);
|
|
78
78
|
return vec2;
|
|
@@ -87,14 +87,16 @@ public class Vec2 extends RubyObject {
|
|
|
87
87
|
super(runtime, klass);
|
|
88
88
|
}
|
|
89
89
|
|
|
90
|
-
void init(ThreadContext context, IRubyObject
|
|
91
|
-
int count =
|
|
90
|
+
void init(ThreadContext context, IRubyObject... args) {
|
|
91
|
+
int count = args.length;
|
|
92
92
|
if (count == 2) {
|
|
93
93
|
jx = (args[0] instanceof RubyFloat) ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
|
|
94
94
|
jy = (args[1] instanceof RubyFloat) ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
|
|
95
95
|
} // allow ruby ducktyping in constructor
|
|
96
96
|
if (count == 1) {
|
|
97
|
-
if (!(args[0].respondsTo("x"))) {
|
|
97
|
+
if (!(args[0].respondsTo("x"))) {
|
|
98
|
+
throw context.runtime.newTypeError(args[0].getType() + " doesn't respond_to :x & :y");
|
|
99
|
+
}
|
|
98
100
|
jx = ((args[0].callMethod(context, "x")) instanceof RubyFloat)
|
|
99
101
|
? ((RubyFloat) args[0].callMethod(context, "x")).getValue() : ((RubyFixnum) args[0].callMethod(context, "x")).getDoubleValue();
|
|
100
102
|
jy = ((args[0].callMethod(context, "y")) instanceof RubyFloat)
|
|
@@ -542,7 +544,9 @@ public class Vec2 extends RubyObject {
|
|
|
542
544
|
@JRubyMethod(name = "lerp", rest = true)
|
|
543
545
|
public IRubyObject lerp(ThreadContext context, IRubyObject[] args) {
|
|
544
546
|
Ruby runtime = context.runtime;
|
|
545
|
-
|
|
547
|
+
if (args.length != 2) {
|
|
548
|
+
throw runtime.newSyntaxError("Check syntax");
|
|
549
|
+
}
|
|
546
550
|
Vec2 vec = (Vec2) args[0].toJava(Vec2.class);
|
|
547
551
|
double scalar = (args[1] instanceof RubyFloat)
|
|
548
552
|
? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
|
|
@@ -561,7 +565,10 @@ public class Vec2 extends RubyObject {
|
|
|
561
565
|
*/
|
|
562
566
|
@JRubyMethod(name = "lerp!", rest = true)
|
|
563
567
|
public IRubyObject lerp_bang(ThreadContext context, IRubyObject[] args) {
|
|
564
|
-
|
|
568
|
+
Ruby runtime = context.runtime;
|
|
569
|
+
if (args.length != 2) {
|
|
570
|
+
throw runtime.newSyntaxError("Check syntax");
|
|
571
|
+
}
|
|
565
572
|
Vec2 vec = (Vec2) args[0].toJava(Vec2.class);
|
|
566
573
|
double scalar = (args[1] instanceof RubyFloat)
|
|
567
574
|
? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
package monkstone.vecmath.vec3;
|
|
2
2
|
|
|
3
3
|
/*
|
|
4
|
-
* Copyright (c) 2015-
|
|
4
|
+
* Copyright (c) 2015-18 Martin Prout
|
|
5
5
|
*
|
|
6
6
|
* This library is free software; you can redistribute it and/or
|
|
7
7
|
* modify it under the terms of the GNU Lesser General Public
|
|
@@ -28,7 +28,6 @@ import org.jruby.RubyObject;
|
|
|
28
28
|
import org.jruby.RubySymbol;
|
|
29
29
|
import org.jruby.anno.JRubyClass;
|
|
30
30
|
import org.jruby.anno.JRubyMethod;
|
|
31
|
-
import org.jruby.runtime.Arity;
|
|
32
31
|
import org.jruby.runtime.Block;
|
|
33
32
|
import org.jruby.runtime.ThreadContext;
|
|
34
33
|
import org.jruby.runtime.builtin.IRubyObject;
|
|
@@ -66,7 +65,7 @@ public final class Vec3 extends RubyObject {
|
|
|
66
65
|
* @return new Vec3 object (ruby)
|
|
67
66
|
*/
|
|
68
67
|
@JRubyMethod(name = "new", meta = true, rest = true)
|
|
69
|
-
public final static IRubyObject rbNew(ThreadContext context, IRubyObject klazz, IRubyObject
|
|
68
|
+
public final static IRubyObject rbNew(ThreadContext context, IRubyObject klazz, IRubyObject... args) {
|
|
70
69
|
Vec3 vec = (Vec3) ((RubyClass) klazz).allocate();
|
|
71
70
|
vec.init(context, args);
|
|
72
71
|
return vec;
|
|
@@ -81,8 +80,8 @@ public final class Vec3 extends RubyObject {
|
|
|
81
80
|
super(runtime, klass);
|
|
82
81
|
}
|
|
83
82
|
|
|
84
|
-
void init(ThreadContext context, IRubyObject
|
|
85
|
-
int count =
|
|
83
|
+
void init(ThreadContext context, IRubyObject... args) {
|
|
84
|
+
int count = args.length;
|
|
86
85
|
if (count >= 2) {
|
|
87
86
|
jx = (args[0] instanceof RubyFloat)
|
|
88
87
|
? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
|
|
@@ -594,8 +593,8 @@ public final class Vec3 extends RubyObject {
|
|
|
594
593
|
* @param args IRubyObject[]
|
|
595
594
|
*/
|
|
596
595
|
@JRubyMethod(name = "to_vertex_uv", rest = true)
|
|
597
|
-
public void toVertexUV(ThreadContext context, IRubyObject
|
|
598
|
-
int count =
|
|
596
|
+
public void toVertexUV(ThreadContext context, IRubyObject... args) {
|
|
597
|
+
int count = args.length;
|
|
599
598
|
double u = 0;
|
|
600
599
|
double v = 0;
|
|
601
600
|
if (count == 3) {
|
data/test/vecmath_spec_test.rb
CHANGED
|
@@ -159,13 +159,21 @@ class VecmathTest < Minitest::Test
|
|
|
159
159
|
assert_equal(a.lerp(b, 0.5), Vec2D.new(2, 2), 'Failed to return lerp between two vectors')
|
|
160
160
|
end
|
|
161
161
|
|
|
162
|
+
def test_lerp_exception
|
|
163
|
+
a = Vec2D.new(1, 1)
|
|
164
|
+
b = Vec2D.new(3, 3)
|
|
165
|
+
assert_raises SyntaxError do
|
|
166
|
+
a.lerp(b, 0.5, 0.5)
|
|
167
|
+
end
|
|
168
|
+
end
|
|
169
|
+
|
|
162
170
|
def test_lerp_unclamped
|
|
163
171
|
a = Vec2D.new(1, 1)
|
|
164
172
|
b = Vec2D.new(3, 3)
|
|
165
173
|
assert_equal(a.lerp(b, 5), Vec2D.new(11, 11), 'Failed to return lerp between two vectors')
|
|
166
174
|
end
|
|
167
175
|
|
|
168
|
-
|
|
176
|
+
def test_lerp!
|
|
169
177
|
a = Vec2D.new(1, 1)
|
|
170
178
|
b = Vec2D.new(3, 3)
|
|
171
179
|
a.lerp!(b, 0.5)
|
data/vendors/Rakefile
CHANGED
|
@@ -10,7 +10,7 @@ SOUND_VERSION = 'v1.3.2' # version 1.3.2
|
|
|
10
10
|
GLVIDEO = 'processing-glvideo.zip'
|
|
11
11
|
VIDEO = 'video-2.zip'
|
|
12
12
|
VIDEO_VERSION = '2' # version 1.0.1
|
|
13
|
-
EXAMPLES = '
|
|
13
|
+
EXAMPLES = '2.0'.freeze
|
|
14
14
|
HOME_DIR = ENV['HOME']
|
|
15
15
|
MAC_OR_LINUX = /linux|mac|darwin/ =~ RbConfig::CONFIG['host_os']
|
|
16
16
|
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: propane
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.6.
|
|
4
|
+
version: 2.6.5.pre
|
|
5
5
|
platform: java
|
|
6
6
|
authors:
|
|
7
7
|
- monkstone
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2018-
|
|
11
|
+
date: 2018-03-25 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rake
|
|
@@ -72,7 +72,6 @@ files:
|
|
|
72
72
|
- ".gitignore"
|
|
73
73
|
- ".mvn/extensions.xml"
|
|
74
74
|
- ".mvn/wrapper/maven-wrapper.properties"
|
|
75
|
-
- ".travis.yml"
|
|
76
75
|
- ".yardopts"
|
|
77
76
|
- CHANGELOG.md
|
|
78
77
|
- Gemfile
|
|
@@ -81,7 +80,6 @@ files:
|
|
|
81
80
|
- Rakefile
|
|
82
81
|
- bin/propane
|
|
83
82
|
- lib/PROCESSING_LICENSE.txt
|
|
84
|
-
- lib/core-3.3.6.jar
|
|
85
83
|
- lib/export.txt
|
|
86
84
|
- lib/gluegen-rt-2.3.2-natives-linux-amd64.jar
|
|
87
85
|
- lib/gluegen-rt-2.3.2-natives-macosx-universal.jar
|
|
@@ -89,6 +87,7 @@ files:
|
|
|
89
87
|
- lib/jogl-all-2.3.2-natives-linux-amd64.jar
|
|
90
88
|
- lib/jogl-all-2.3.2-natives-macosx-universal.jar
|
|
91
89
|
- lib/jogl-all-2.3.2.jar
|
|
90
|
+
- lib/processing-core.jar
|
|
92
91
|
- lib/propane.jar
|
|
93
92
|
- lib/propane.rb
|
|
94
93
|
- lib/propane/app.rb
|
|
@@ -169,16 +168,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
|
169
168
|
version: '0'
|
|
170
169
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
|
171
170
|
requirements:
|
|
172
|
-
- - "
|
|
171
|
+
- - ">"
|
|
173
172
|
- !ruby/object:Gem::Version
|
|
174
|
-
version:
|
|
173
|
+
version: 1.3.1
|
|
175
174
|
requirements:
|
|
176
175
|
- java runtime >= 1.8.0_151+
|
|
177
176
|
rubyforge_project:
|
|
178
177
|
rubygems_version: 2.7.6
|
|
179
178
|
signing_key:
|
|
180
179
|
specification_version: 4
|
|
181
|
-
summary: ruby wrapper for processing-3.3.
|
|
180
|
+
summary: ruby wrapper for processing-3.3.7 on MacOS and linux64 bit only for opengl
|
|
182
181
|
test_files:
|
|
183
182
|
- test/create_test.rb
|
|
184
183
|
- test/deglut_spec_test.rb
|