propane 0.5.0-java → 0.6.0-java

data/src/monkstone/slider/SliderGroup.java

@@ -0,0 +1,56 @@
+/* 
+ * Copyright (c) 2016 Martin Prout
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * http://creativecommons.org/licenses/LGPL/2.1/
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * 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 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
+ */
+package monkstone.slider;
+
+import java.util.ArrayList;
+import java.util.List;
+import processing.core.PApplet;
+
+public class SliderGroup {
+
+    int count = 0;
+    List<Slider> sliders;
+    PApplet applet;
+    boolean vertical;
+
+    public SliderGroup(final PApplet outer) {
+        applet = outer;
+        sliders = new ArrayList<>();
+        vertical = false;
+    }
+
+    public void vertical() {
+        vertical = true;
+    }
+
+    public void addSlider(float beginRange, float endRange, float initial) {
+        if (vertical) {
+            sliders.add(new SimpleVerticalSlider(applet, beginRange, endRange, initial, count));
+        } else {
+            sliders.add(new SimpleHorizontalSlider(applet, beginRange, endRange, initial, count));
+        }
+        count = sliders.size();
+    }
+
+    public float readValue(int count) {
+        return sliders.get(count).readValue();
+    }
+
+}

data/src/monkstone/slider/WheelHandler.java

@@ -0,0 +1,35 @@
+/* 
+ * Copyright (c) 2016 Martin Prout
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * http://creativecommons.org/licenses/LGPL/2.1/
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * 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 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
+ */
+package monkstone.slider;
+
+/**
+ * @author Martin Prout 
+ * from a borrowed pattern seen in Jonathan Feinbergs Peasycam
+ * when I was struggling with non functioning browser applet, 
+ * probably superfluous here. 
+ */
+public interface WheelHandler { 
+    /**
+     * 
+     * @param amount int
+     */   
+
+    public void handleWheel(final short amount);
+}

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

@@ -58,15 +58,10 @@ public class Vec2 extends RubyObject {
   * @param runtime
   */
   public static void createVec2(final Ruby runtime) {
-    RubyClass vec2Cls = runtime.defineClass("Vec2D", runtime.getObject(), new ObjectAllocator() {
-        @Override
-        public IRubyObject allocate(Ruby runtime, RubyClass rubyClass) {
-          return new Vec2(runtime, rubyClass);
-        }
-    });
-    vec2Cls.defineAnnotatedMethods(Vec2.class);
-    
+      RubyClass vec2Cls = runtime.defineClass("Vec2D", runtime.getObject(), (Ruby runtime1, RubyClass rubyClass) -> new Vec2(runtime1, rubyClass));
+      vec2Cls.defineAnnotatedMethods(Vec2.class);
   }
+    
   
   /**
   *

data/src/monkstone/vecmath/vec3/Vec3.java

@@ -44,19 +44,14 @@ public final class Vec3 extends RubyObject {
   
   private static final long serialVersionUID = 4563517343762009867L;
   
-    /**
-     *
-     * @param runtime
-     */
-    public static void createVec3(final Ruby runtime) {
-        RubyClass vec3Cls = runtime.defineClass("Vec3D", runtime.getObject(), new ObjectAllocator() {
-            @Override
-            public IRubyObject allocate(Ruby runtime, RubyClass rubyClass) {
-                return new Vec3(runtime, rubyClass);
-            }
-        });
-        vec3Cls.defineAnnotatedMethods(Vec3.class);
-    }
+  /**
+  *
+  * @param runtime Ruby
+  */
+  public static void createVec3(final Ruby runtime) {
+    RubyClass vec3Cls = runtime.defineClass("Vec3D", runtime.getObject(), (Ruby runtime1, RubyClass rubyClass) -> new Vec3(runtime1, rubyClass));
+    vec3Cls.defineAnnotatedMethods(Vec3.class);
+  }
   
   static final double EPSILON = 9.999999747378752e-05; // matches processing.org EPSILON
   private double jx = 0;

data/vendors/Rakefile

@@ -8,7 +8,7 @@ WARNING = <<-EOS
    re-run
 EOS
 
-JRUBYC_VERSION = '9.0.5.0'.freeze
+JRUBYC_VERSION = '9.1.0.0'.freeze
 
 CLOBBER.include("jruby-complete-#{JRUBYC_VERSION}.jar")
 
@@ -24,7 +24,7 @@ file "jruby-complete-#{JRUBYC_VERSION}.jar" do
   rescue
     warn(WARNING)
   end
-  check_sha256("jruby-complete-#{JRUBYC_VERSION}.jar", '7fe1054bf6085f24b9e3069d3e93abf8f17d1448f503eaea2042f98bce2a1d43')
+  check_sha256("jruby-complete-#{JRUBYC_VERSION}.jar", "8a4b5f4cbdcfd43272002a543a59abfbf419577ef679273d4893a4f09594267e")
 end
 
 directory '../lib/ruby'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: propane
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: java
 authors:
 - filib
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-01 00:00:00.000000000 Z
+date: 2016-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arcball
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.0.2
 description: A Standalone Ruby Processing implementation
 email:
 - martin_p@lineone.net
@@ -44,26 +44,42 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- VERSION.txt
 - bin/propane
 - examples/complete/Rakefile
+- examples/complete/bw_shader.rb
 - examples/complete/data/Texture01.jpg
 - examples/complete/data/Texture02.jpg
 - examples/complete/data/Univers45.vlw
+- examples/complete/data/bwfrag.glsl
 - examples/complete/data/displaceFrag.glsl
 - examples/complete/data/displaceVert.glsl
+- examples/complete/data/lachoy.jpg
+- examples/complete/data/landscape.glsl
+- examples/complete/data/monjori.glsl
+- examples/complete/data/moon.jpg
+- examples/complete/data/sea.jpg
+- examples/complete/edge_detection.rb
 - examples/complete/glsl_heightmap_noise.rb
 - examples/complete/kinetic_type.rb
+- examples/complete/landscape.rb
+- examples/complete/linear_image.rb
+- examples/complete/monjori.rb
 - examples/regular/Rakefile
 - examples/regular/arcball_box.rb
+- examples/regular/arcball_constrain.rb
+- examples/regular/bezier_playground.rb
 - examples/regular/circle_collision.rb
+- examples/regular/colors_two.rb
 - examples/regular/creating_colors.rb
 - examples/regular/drawolver.rb
 - examples/regular/elegant_ball.rb
 - examples/regular/empathy.rb
 - examples/regular/fern.rb
+- examples/regular/fibonacci_sphere.rb
 - examples/regular/flight_patterns.rb
 - examples/regular/fractions.rb
+- examples/regular/grapher.rb
+- examples/regular/gravity.rb
 - examples/regular/grey_circles.rb
 - examples/regular/jwishy.rb
 - examples/regular/letters.rb
@@ -76,6 +92,10 @@ files:
 - examples/regular/polyhedrons.rb
 - examples/regular/raining.rb
 - examples/regular/ribbon_doodle.rb
+- examples/regular/slider_demo.rb
+- examples/regular/slider_example.rb
+- examples/regular/slider_simple.rb
+- examples/regular/tree.rb
 - examples/regular/vector_math.rb
 - examples/regular/words.rb
 - lib/PROCESSING_LICENSE.txt
@@ -100,6 +120,7 @@ files:
 - lib/propane/version.rb
 - library/boids/boids.rb
 - library/control_panel/control_panel.rb
+- library/slider/slider.rb
 - pom.rb
 - pom.xml
 - propane.gemspec
@@ -108,6 +129,15 @@ files:
 - src/monkstone/PropaneLibrary.java
 - src/monkstone/core/AbstractLibrary.java
 - src/monkstone/fastmath/Deglut.java
+- src/monkstone/slider/CustomHorizontalSlider.java
+- src/monkstone/slider/CustomVerticalSlider.java
+- src/monkstone/slider/SimpleHorizontalSlider.java
+- src/monkstone/slider/SimpleSlider.java
+- src/monkstone/slider/SimpleVerticalSlider.java
+- src/monkstone/slider/Slider.java
+- src/monkstone/slider/SliderBar.java
+- src/monkstone/slider/SliderGroup.java
+- src/monkstone/slider/WheelHandler.java
 - src/monkstone/vecmath/AppRender.java
 - src/monkstone/vecmath/JRender.java
 - src/monkstone/vecmath/ShapeRender.java
@@ -135,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.3
 signing_key: 
 specification_version: 4
 summary: A really slim layer between Ruby and Processing-2.2.1.

data/VERSION.txt

@@ -1,4 +0,0 @@
-0.2.0
-=====
-
-* Added some guard clauses and fleshed out specs.