propane 3.1.0.pre-java → 3.2.0-java

data/src/main/java/monkstone/noise/SimplexNoise.java

@@ -14,7 +14,6 @@
  * attribution is appreciated.
  *
  */
-
 package monkstone.noise;
 
 public class SimplexNoise {  // Simplex noise in 2D, 3D and 4D

data/src/main/java/monkstone/slider/CustomHorizontalSlider.java

@@ -1,5 +1,5 @@
 /* 
- * Copyright (c) 2016-18 Martin Prout
+ * Copyright (c) 2016-19 Martin Prout
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -82,7 +82,7 @@ public class CustomHorizontalSlider extends SliderBar {
             applet.text(String.format(lFormat, (int) vMax), pX + pW, pY - numberSize / 2);
         }
     }
-    
+
     @Override
     void drawGui() {
         if (backgroundVisible) {
@@ -91,7 +91,7 @@ public class CustomHorizontalSlider extends SliderBar {
         }
         applet.fill(sliderFill);
         applet.rect(pX, pY, pScaled, pH);
-    }    
+    }
 
     /**
      *
@@ -151,7 +151,7 @@ public class CustomHorizontalSlider extends SliderBar {
         }
         setValue(pValue + delta);
     }
-    
+
     /**
      *
      * @return

data/src/main/java/monkstone/slider/CustomVerticalSlider.java

@@ -1,5 +1,5 @@
 /* 
- * Copyright (c) 2016-18 Martin Prout
+ * Copyright (c) 2016-19 Martin Prout
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

data/src/main/java/monkstone/slider/SimpleHorizontalSlider.java

@@ -1,5 +1,5 @@
 /* 
- * Copyright (c) 2016-18 Martin Prout
+ * Copyright (c) 2016-19 Martin Prout
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -23,10 +23,10 @@ import processing.core.PApplet;
 import processing.core.PConstants;
 
 public class SimpleHorizontalSlider extends SimpleSlider {
-    
+
     final int SPACING = 20;
     final int LEFT_SPC = SPACING * 2;
-    final int RIGHT_SPC = SPACING * 4;    
+    final int RIGHT_SPC = SPACING * 4;
 
     /**
      *
@@ -58,7 +58,7 @@ public class SimpleHorizontalSlider extends SimpleSlider {
             applet.registerMethod("dispose", this);
             applet.registerMethod("draw", this);
         } else {
-            applet.unregisterMethod("draw", this);            
+            applet.unregisterMethod("draw", this);
         }
     }
 
@@ -75,12 +75,12 @@ public class SimpleHorizontalSlider extends SimpleSlider {
             applet.textSize(numberSize);
             applet.fill(numbersColor);
             applet.textAlign(PConstants.LEFT);
-            applet.text(String.format(lFormat, (int) vMin), pX, pY );
+            applet.text(String.format(lFormat, (int) vMin), pX, pY);
             applet.textAlign(PConstants.RIGHT);
-            applet.text(String.format(lFormat, (int) vMax), pX + pW, pY );
+            applet.text(String.format(lFormat, (int) vMax), pX + pW, pY);
         }
     }
-    
+
     @Override
     void drawGui() {
         if (backgroundVisible) {
@@ -90,7 +90,7 @@ public class SimpleHorizontalSlider extends SimpleSlider {
         applet.noStroke();
         applet.fill(255);
         applet.ellipse(pX + pScaled, pY + pH / 2, 10, 10);
-    }    
+    }
 
     /**
      *
@@ -132,7 +132,7 @@ public class SimpleHorizontalSlider extends SimpleSlider {
             pScaled = map(pValue, vMin, vMax, 0, pW);
         }
     }
-   
+
     /**
      *
      * @return

data/src/main/java/monkstone/slider/SimpleSlider.java

@@ -44,7 +44,6 @@ public abstract class SimpleSlider implements Slider {//implements Slider {
 
     abstract void drawGui();
 
-    
     @Override
     public void draw() {
         applet.pushStyle();
@@ -58,7 +57,6 @@ public abstract class SimpleSlider implements Slider {//implements Slider {
     /**
      *
      */
-    
     @Override
     public void showLabel() {
         displayLabel = true;
@@ -67,7 +65,6 @@ public abstract class SimpleSlider implements Slider {//implements Slider {
     /**
      *
      */
-    
     @Override
     public void hideLabel() {
         displayLabel = false;
@@ -76,7 +73,6 @@ public abstract class SimpleSlider implements Slider {//implements Slider {
     /**
      *
      */
-    
     @Override
     public void showNumbers() {
         displayValue = true;
@@ -97,7 +93,6 @@ public abstract class SimpleSlider implements Slider {//implements Slider {
     /**
      *
      */
-    
     @Override
     public void hideBackground() {
         backgroundVisible = false;
@@ -107,7 +102,6 @@ public abstract class SimpleSlider implements Slider {//implements Slider {
      *
      * @return
      */
-    
     @Override
     public float readValue() {
         return pValue;
@@ -129,7 +123,6 @@ public abstract class SimpleSlider implements Slider {//implements Slider {
      *
      * @param s
      */
-    
     @Override
     public void labelSize(int s) {
         labelSize = (s < 4) ? 4 : s;
@@ -145,7 +138,6 @@ public abstract class SimpleSlider implements Slider {//implements Slider {
 
     abstract void checkKeyboard();
 
-
     protected int constrainMap(double val, double begIn, double endIn, double beginOut, double endOut) {
         double max = Math.max(begIn, endIn);
         double min = Math.min(begIn, endIn);
@@ -167,7 +159,6 @@ public abstract class SimpleSlider implements Slider {//implements Slider {
         }
     }
 
-    
     @Override
     public void dispose() {
         setActive(false);

data/src/main/java/monkstone/slider/SimpleVerticalSlider.java

@@ -1,5 +1,5 @@
 /* 
- * Copyright (c) 2016-18 Martin Prout
+ * Copyright (c) 2016-19 Martin Prout
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -24,10 +24,10 @@ import processing.core.PConstants;
 import static processing.core.PConstants.HALF_PI;
 
 public class SimpleVerticalSlider extends SimpleSlider {
-    
+
     final int SPACING = 20;
     final int TOP_SPC = SPACING * 2;
-    final int BOTTOM_SPC = SPACING * 4;    
+    final int BOTTOM_SPC = SPACING * 4;
 
     /**
      *
@@ -38,18 +38,18 @@ public class SimpleVerticalSlider extends SimpleSlider {
      * @param count
      */
     public SimpleVerticalSlider(final PApplet outer, float beginRange, float endRange, float initial, int count) {
-        this.applet = outer;     
+        this.applet = outer;
         setActive(true);
-        pX = outer.width  - (TOP_SPC + count * SPACING);
+        pX = outer.width - (TOP_SPC + count * SPACING);
         pY = TOP_SPC;
         pW = outer.height - BOTTOM_SPC;
         pH = 10;
         ID = Integer.toString(count + 1);
         limits(beginRange, endRange);
-        
+
     }
 
-   @Override
+    @Override
     boolean mouseOver() {
         return (applet.mouseX >= pX && applet.mouseX <= pX + pH && applet.mouseY >= pY && applet.mouseY <= pY + pW);
     }
@@ -59,11 +59,11 @@ public class SimpleVerticalSlider extends SimpleSlider {
             applet.registerMethod("dispose", this);
             applet.registerMethod("draw", this);
         } else {
-            applet.unregisterMethod("draw", this);            
+            applet.unregisterMethod("draw", this);
         }
     }
 
-@Override
+    @Override
     void displayText() {
         String lFormat = "%d";
         if (displayLabel) {
@@ -93,7 +93,7 @@ public class SimpleVerticalSlider extends SimpleSlider {
             applet.popMatrix();
         }
     }
-    
+
     @Override
     void drawGui() {
         if (backgroundVisible) {
@@ -103,8 +103,6 @@ public class SimpleVerticalSlider extends SimpleSlider {
         applet.fill(sliderFill);
         applet.ellipse(pX + pH / 2, pY + pScaled, 10, 10);
     }
-    
-    
 
     /**
      *
@@ -146,7 +144,7 @@ public class SimpleVerticalSlider extends SimpleSlider {
             pScaled = map(pValue, vMin, vMax, pW, 0);
         }
     }
-   
+
     /**
      *
      * @return

data/src/main/java/monkstone/slider/Slider.java

@@ -57,5 +57,5 @@ public interface Slider {
      *
      */
     void showNumbers();
-    
+
 }

data/src/main/java/monkstone/slider/SliderBar.java

@@ -1,5 +1,5 @@
 /* 
- * Copyright (c) 2016-18 Martin Prout
+ * Copyright (c) 2016-19 Martin Prout
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

data/src/main/java/monkstone/slider/SliderGroup.java

@@ -1,5 +1,5 @@
 /* 
- * Copyright (c) 2016-18 Martin Prout
+ * Copyright (c) 2016-19 Martin Prout
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

data/src/main/java/monkstone/slider/WheelHandler.java

@@ -1,5 +1,5 @@
 /* 
- * Copyright (c) 2016-18 Martin Prout
+ * Copyright (c) 2016-19 Martin Prout
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,16 +20,15 @@
 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. 
+ * @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 { 
+public interface WheelHandler {
+
     /**
-     * 
+     *
      * @param amount int
-     */   
-
+     */
     public void handleWheel(final short amount);
 }

data/src/main/java/monkstone/vecmath/AppRender.java

@@ -27,7 +27,7 @@ public class AppRender implements JRender {
     public void vertex(double x, double y) {
         app.vertex((float) x, (float) y);
     }
-    
+
     /**
      *
      * @param x double
@@ -72,7 +72,7 @@ public class AppRender implements JRender {
     public void vertex(double x, double y, double z, double u, double v) {
         app.vertex((float) x, (float) y, (float) z, (float) u, (float) v);
     }
-    
+
     /**
      *
      * @param x double

data/src/main/java/monkstone/vecmath/ShapeRender.java

@@ -28,7 +28,7 @@ public class ShapeRender implements JRender {
     public void vertex(double x, double y) {
         shape.vertex((float) x, (float) y);
     }
-    
+
     /**
      *
      * @param x double
@@ -73,7 +73,7 @@ public class ShapeRender implements JRender {
     public void vertex(double x, double y, double z, double u, double v) {
         shape.vertex((float) x, (float) y, (float) z, (float) u, (float) v);
     }
-    
+
     /**
      *
      * @param x double

data/src/main/java/monkstone/vecmath/package-info.java

@@ -1,5 +1,5 @@
 /* 
-* Copyright (c) 2015-18 Martin Prout
+* Copyright (c) 2015-19 Martin Prout
 * 
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
@@ -16,5 +16,5 @@
 * 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.vecmath;

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

@@ -1,7 +1,7 @@
 package monkstone.vecmath.vec2;
 
 /*
-* Copyright (c) 2015-18 Martin Prout
+* Copyright (c) 2015-19 Martin Prout
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
@@ -20,7 +20,7 @@ package monkstone.vecmath.vec2;
 * 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;

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

@@ -1,7 +1,7 @@
 package monkstone.vecmath.vec3;
 
 /*
-* Copyright (c) 2015-18 Martin Prout
+* Copyright (c) 2015-19 Martin Prout
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public

data/src/main/java/monkstone/videoevent/VideoInterface.java

@@ -1,5 +1,5 @@
 /* 
- * Copyright (c) 2015-18 Martin Prout
+ * Copyright (c) 2015-19 Martin Prout
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -17,26 +17,32 @@
  * 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.videoevent;
+
 import processing.video.Movie;
 import processing.video.Capture;
+
 /**
- * This interface makes it easier/possible to use the reflection methods
- * from Movie and Capture classes in Propane::App in propane
+ * This interface makes it easier/possible to use the reflection methods from
+ * Movie and Capture classes in Propane::App in propane
+ *
  * @author Martin Prout
  */
 public interface VideoInterface {
+
     /**
      * Used to implement reflection method in PApplet
+     *
      * @see processing.video.Movie
      * @param movie Movie
      */
     public void movieEvent(Movie movie);
+
     /**
      * Used to implement reflection method in PApplet
+     *
      * @see processing.video.Capture
      * @param capture Capture
      */
-    public void captureEvent(Capture capture);    
+    public void captureEvent(Capture capture);
 }

data/src/main/java/monkstone/videoevent/package-info.java

@@ -1,5 +1,5 @@
 /* 
-* Copyright (c) 2015-18 Martin Prout
+* Copyright (c) 2015-19 Martin Prout
 * 
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
@@ -16,5 +16,5 @@
 * 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.videoevent;