toxiclibs 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1af28673c5330c233c143a8825eaedeec5993fc
-  data.tar.gz: aa5198bc7f98bea0f00398adff8bf4f85e90685a
+  metadata.gz: d3766bf61befbcc60a27816721ef8528c930f0a5
+  data.tar.gz: cea30dbee7899c25c4183b78b0ab13f894f71a1d
 SHA512:
-  metadata.gz: 200337d7250d6d0059e0860384e0ab07889d0021484cf70e5b771b3bd8daccf1328600238f41506dd3b73097196ef1732452d48da46d8f33e54b124f2f76502a
-  data.tar.gz: cde9e87efd021494b928cb5d11027b4d1232477da608ab39987ed6393a0f2eb187fef106a50a34b54284bee5509e3b30b15ee81f2165bb619dc04b3d01c941b4
+  metadata.gz: 76c77948c8763555278cb9f32eb784f875ffac5388a7d337201d978c514cfbe666811efa3f600823ce2a237f665670772e64c3b380f29b4e0abf9db08d272ab2
+  data.tar.gz: 5e6f35deccaf8e35809cf02495b8377b606c57929b5579ef0615085c90a804f78c34f4cd1b4823ecb41058e1b2c6e1706b55fd7fab91e697ae60d094973f77b8

data/.travis.yml

@@ -1,10 +1,10 @@
-sudo: false
-
 language: ruby
+sudo: false
 
 rvm: 
-  - jruby-9.1.1.0
-
+  - jruby-9.1.6.0
 jdk:
   - oraclejdk8
+os:
+  - linux
 

data/CHANGELOG.md

@@ -1,4 +1,6 @@
 
+**v0.9.2** Bump processing version, removed audio, refactored color, including export to ruby string.
+
 **v0.9.1** Make it easier to load PerlinNoise and SimplexNoise
 
 **v0.9.0** Updated maven artifacts, somewhat arbitarily require JRubyArt-1.2+

data/README.md

@@ -1,15 +1,17 @@
 ## Toxiclibs for JRubyArt
 
 ![travis build](https://travis-ci.org/ruby-processing/toxicgem.svg)
+[![Gem Version](https://badge.fury.io/rb/toxiclibs.svg)](https://badge.fury.io/rb/toxiclibs)
 
 ### Installing
 ```bash
 gem install toxiclibs
 ```
 
-### NB: Use version 0.4 for ruby-processing, and 0.8 prior to JRubyArt-1.2.0
+### NB: Use version 0.4 for ruby-processing, and 0.9.2 for propane and JRubyArt
 
-This gem provides Karsten Schmidts (aka toxi, @postspectacular) toxiclibs jars for JRubyArt. To compile the gem follow the instructions for [JRubyArt][]. Most parts of toxiclibs API is exposed in the latest version, (but only a few examples are included) in principle it should be possible to make all available!!! For this demonstration I have used up to date source code for version 21, since [toxis final release][] may never materialise (he's probably got more interesting things to do). There are reported to be number of outstanding bugs with toxiclibs, if they affect you report it [here][] (or better fix them yourself and submit a pull request). Version 0.9.0+ features java code updated to use java lambda (jdk8) and was compiled against processing-3.1.1 core.jar. 
+NB: Build is only failing because current version of processing is not available at maven central.
+This gem provides Karsten Schmidts (aka toxi, @postspectacular) toxiclibs jars for JRubyArt. To compile the gem follow the instructions for [JRubyArt][]. Most parts of toxiclibs API is exposed in the latest version, (but only a few examples are included) in principle it should be possible to make all available!!! For this demonstration I have used up to date source code for version 21, since [toxis final release][] has not yet been released (although [Dan Shiffman][] has released a version for processing-3.0+). There are reported to be number of outstanding bugs with toxiclibs, if they affect you report it [here][] (or better fix them yourself and submit a pull request). Version 0.9.2 features java code updated to use java lambda (jdk8) and was compiled against processing-3.3 core.jar. The audio library was not working and has been dropped since version 0.9.2.
 
 ![grayscott image](http://4.bp.blogspot.com/-d4MiL4_0Njk/VFJMv6VUicI/AAAAAAAAEgY/fFAfrXDxNXM/s400/grayscott.png)
 
@@ -26,7 +28,7 @@ This gem provides Karsten Schmidts (aka toxi, @postspectacular) toxiclibs jars f
 ### Licensing
 
 I should be clear that the original toxiclibs is the work of Karsten Schmidt see [Copyright][]
- 
+
 This demo & 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
@@ -40,4 +42,4 @@ version 2.1 of the License, or (at your option) any later version.
 [Example Usage]:https://github.com/ruby-processing/toxicgem/tree/master/examples
 [here]:https://github.com/ruby-processing/toxiclibs/issues
 [Copyright]:https://github.com/ruby-processing/toxiclibs/COPYING.md
-
+[Dan Shiffman]:https://github.com/shiffman/toxiclibs/tree/p3-update

data/examples/boolean_shapes.rb

@@ -0,0 +1,46 @@
+require 'toxiclibs'
+load_library :control_panel
+attr_reader :gfx, :bool, :panel, :type, :hide, :polies
+include Toxi
+
+TYPE = [BooleanShapeBuilder::Type::UNION, BooleanShapeBuilder::Type::XOR]
+KEY = %w(union xor).freeze
+
+def setup
+  sketch_title 'Boolean Shapes'
+  @gfx = Gfx::ToxiclibsSupport.new(self)
+  @bool = KEY.zip(TYPE).to_h
+  control_panel do |c|
+    c.title = 'Control Panel'
+    c.menu :type, KEY, 'union'
+    @panel = c
+  end
+  @hide = false
+end
+
+def draw
+  unless hide
+    @hide = true
+    panel.set_visible(hide)
+  end
+  background(160)
+  builder = BooleanShapeBuilder.new(bool[type])
+  phi = frame_count * 0.01
+  builder.add_shape(Circle.new(mouse_x, mouse_y, 50))
+  builder.add_shape(Ellipse.new(150, 130 + sin(phi) * 50, 120, 60))
+  builder.add_shape(Rect.new(200 + sin(phi * 13 / 8) * 50, 180, 100, 100))
+  builder.add_shape(Triangle2D.create_equilateral_from(
+    TVec2D.new(50 + sin(phi * 15 / 13) * 50, 200), TVec2D.new(300, 200))
+  )
+  builder.add_shape(
+    Circle.new(100, 300, 50 + 30 * sin(phi * 21 / 15)).toPolygon2D(6)
+  )
+  fill(125)
+  stroke(255, 0, 0)
+  @polies = builder.compute_shapes
+  polies.each { |p| gfx.polygon2D(p) }
+end
+
+def settings
+  size(400, 400)
+end

data/lib/toxiclibs/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Toxiclibs
-  VERSION = '0.9.1'.freeze
+  VERSION = '0.9.2'.freeze
 end

data/pom.rb

@@ -1,7 +1,7 @@
 project 'toxiclibs' do
 
   model_version '4.0.0'
-  id 'ruby-processing:toxiclibs:0.9.1'
+  id 'ruby-processing:toxiclibs:0.9.2'
   packaging 'jar'
 
   description 'toxiclibs-library for JRubyArt'
@@ -28,9 +28,8 @@ project 'toxiclibs' do
               'polyglot.dump.pom' => 'pom.xml'
             )
 
-  jar 'org.jogamp.joal:joal-main:2.3.1'
   jar 'args4j:args4j:2.0.31'
-  jar 'org.processing:core:3.2.1'
+  jar 'org.processing:core:3.3.0'
 
   plugin( :compiler, '3.5.1',
           'source' =>  '1.8',
@@ -46,11 +45,6 @@ project 'toxiclibs' do
                                           'artifactId' =>  'args4j',
                                           'version' =>  '2.0.31',
                                           'type' =>  'jar',
-                                          'outputDirectory' =>  'lib' },
-                                        { 'groupId' =>  'org.jogamp.joal',
-                                          'artifactId' =>  'joal',
-                                          'version' =>  '2.3.1',
-                                          'type' =>  'jar',
                                           'outputDirectory' =>  'lib' } ] )
   end
 

data/pom.xml

@@ -11,7 +11,7 @@ DO NOT MODIFIY - GENERATED CODE
   <modelVersion>4.0.0</modelVersion>
   <groupId>ruby-processing</groupId>
   <artifactId>toxiclibs</artifactId>
-  <version>0.9.1</version>
+  <version>0.9.2</version>
   <name>toxiclibs</name>
   <description>toxiclibs-library for JRubyArt</description>
   <organization>
@@ -50,11 +50,6 @@ DO NOT MODIFIY - GENERATED CODE
     <maven.compiler.target>1.8</maven.compiler.target>
   </properties>
   <dependencies>
-    <dependency>
-      <groupId>org.jogamp.joal</groupId>
-      <artifactId>joal-main</artifactId>
-      <version>2.3.1</version>
-    </dependency>
     <dependency>
       <groupId>args4j</groupId>
       <artifactId>args4j</artifactId>
@@ -63,7 +58,7 @@ DO NOT MODIFIY - GENERATED CODE
     <dependency>
       <groupId>org.processing</groupId>
       <artifactId>core</artifactId>
-      <version>3.2.1</version>
+      <version>3.3.0</version>
     </dependency>
   </dependencies>
   <build>
@@ -107,13 +102,6 @@ DO NOT MODIFIY - GENERATED CODE
                   <type>jar</type>
                   <outputDirectory>lib</outputDirectory>
                 </artifactItem>
-                <artifactItem>
-                  <groupId>org.jogamp.joal</groupId>
-                  <artifactId>joal</artifactId>
-                  <version>2.3.1</version>
-                  <type>jar</type>
-                  <outputDirectory>lib</outputDirectory>
-                </artifactItem>
               </artifactItems>
             </configuration>
           </execution>

data/src/BooleanShapes.java

@@ -0,0 +1,66 @@
+
+import processing.core.*;
+
+import toxi.geom.*;
+import toxi.processing.*;
+import toxi.color.*;
+import java.util.List;
+
+public class BooleanShapes extends PApplet {
+
+    ToxiclibsSupport gfx;
+
+    @Override
+    public void setup() {
+
+        gfx = new ToxiclibsSupport(this);
+    }
+
+    @Override
+    public void draw() {
+        background(160);
+        BooleanShapeBuilder builder = new BooleanShapeBuilder(
+                BooleanShapeBuilder.Type.XOR);
+        float phi = frameCount * 0.01f;
+        builder.addShape(new Circle(mouseX, mouseY, 50));
+        builder.addShape(new Ellipse(150, 130 + sin(phi) * 50, 120, 60));
+        builder.addShape(new Rect(200 + sin(phi * 13 / 8) * 50, 180, 100, 100));
+        builder.addShape(Triangle2D.createEquilateralFrom(new Vec2D(
+                50 + sin(phi * 15 / 13) * 50, 200), new Vec2D(300, 200)));
+        builder.addShape(new Circle(100, 300, 50 + 30 * sin(phi * 21 / 15))
+                .toPolygon2D(6));
+        noFill();
+        stroke(255, 0, 0);
+        List<Polygon2D> polies = builder.computeShapes();
+        polies.forEach((p) -> {
+            gfx.polygon2D(p);
+        });
+        noStroke();
+        Vec2D p = new Vec2D();
+        for (int y = 10; y < height; y += 20) {
+            for (int x = 10; x < height; x += 20) {
+                gfx.fill(pointInShapes(p.set(x, y), polies) ? TColor.GREEN
+                        : TColor.BLUE);
+                gfx.circle(p, 3);
+            }
+        }
+    }
+
+    public boolean pointInShapes(Vec2D p, List<Polygon2D> polies) {
+        return polies.stream().anyMatch((poly) -> (poly.containsPoint(p)));
+    }
+
+    @Override
+    public void settings() {
+        size(400, 400);
+    }
+
+    static public void main(String[] passedArgs) {
+        String[] appletArgs = new String[]{"BooleanShapes"};
+        if (passedArgs != null) {
+            PApplet.main(concat(appletArgs, passedArgs));
+        } else {
+            PApplet.main(appletArgs);
+        }
+    }
+}

data/src/toxi/color/ColorList.java

@@ -2,23 +2,23 @@
  * Some classes in this package have been partly inspired by & bits ported from
  * Python code written by Tom De Smedt & Frederik De Bleser for the "colors" library
  * of Nodebox.net.
- * 
+ *
  * http://nodebox.net/code/index.php/Colors
  *
  * Copyright (c) 2006-2011 Karsten Schmidt
- * 
+ *
  * 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
@@ -45,7 +45,7 @@ import toxi.math.MathUtils;
  * are also created when working with {@link ColorRange}s. The class has various
  * methods to manipulate all colors in the list in parallel, as well as sort
  * them by various criteria.
- * 
+ *
  * @see ColorRange
  * @see AccessCriteria
  */
@@ -56,7 +56,7 @@ public class ColorList implements Iterable<TColor> {
      * ARGB image array. If the number of samples equals or exceeds the number
      * of pixels in the image and no unique colors are required, the function
      * will simply return the same as {@link #ColorList(int[])}.
-     * 
+     *
      * @param pixels
      *            int array of ARGB pixels
      * @param num
@@ -78,7 +78,7 @@ public class ColorList implements Iterable<TColor> {
      * the number of pixels in the source image and no unique colors are
      * required, the function will simply return the same as
      * {@link #ColorList(int[])}.
-     * 
+     *
      * @param pixels
      *            int array of ARGB pixels
      * @param num
@@ -127,7 +127,7 @@ public class ColorList implements Iterable<TColor> {
      * Factory method. Creates a new ColorList based on the given
      * {@link ColorTheoryStrategy} instance and the given source color. The
      * number of colors returned will vary with the strategy chosen.
-     * 
+     *
      * @param strategy
      * @param c
      * @return new list
@@ -140,7 +140,7 @@ public class ColorList implements Iterable<TColor> {
     /**
      * Factory method. Creates a ColorList based on the name of a
      * {@link ColorTheoryStrategy} and the given source color.
-     * 
+     *
      * @param name
      *            strategy name
      * @param c
@@ -174,7 +174,7 @@ public class ColorList implements Iterable<TColor> {
     /**
      * Creates a ColorList by wrapping the given ArrayList of colors. No copies
      * of the given colors are created (shallow copy only).
-     * 
+     *
      * @param colors
      */
     public ColorList(Collection<TColor> colors) {
@@ -185,7 +185,7 @@ public class ColorList implements Iterable<TColor> {
     /**
      * Creates a deep copy of the given ColorList. Manipulating the new list or
      * its color entries does NOT change the colors of the original.
-     * 
+     *
      * @param list
      *            source list to copy
      */
@@ -199,7 +199,7 @@ public class ColorList implements Iterable<TColor> {
     /**
      * Creates a new color list from the array of ARGB int values. In most cases
      * this will be the pixel buffer of an image.
-     * 
+     *
      * @param argbArray
      */
     public ColorList(int[] argbArray) {
@@ -213,18 +213,18 @@ public class ColorList implements Iterable<TColor> {
      * Creates new ColorList from the given colors. Copies of the given colors
      * are created. This is a varargs constructor allowing these two parameter
      * formats:
-     * 
+     *
      * <pre>
      * // individual parameters
      * ColorList cols=new ColorList(TColor.BLACK,TColor.WHITE,TColor.newRGB(1,0,0));
-     * 
+     *
      * // or array of colors
      * ReadonlyTColor[] colArray=new ReadonlyTColor[] {
      *   TColor.BLACK,TColor.WHITE,TColor.newRGB(1,0,0);
      * };
      * ColorList cols=new ColorList(colArray);
      * </pre>
-     * 
+     *
      * @param colorArray
      */
     public ColorList(ReadonlyTColor... colorArray) {
@@ -236,7 +236,7 @@ public class ColorList implements Iterable<TColor> {
 
     /**
      * Adds a copy of the given color to the list
-     * 
+     *
      * @param c
      * @return itself
      */
@@ -248,7 +248,7 @@ public class ColorList implements Iterable<TColor> {
     /**
      * Adds all entries of the TColor collection to the list (shallow copy only,
      * manipulating the new list will modify the original colors).
-     * 
+     *
      * @param collection
      * @return itself
      */
@@ -259,36 +259,36 @@ public class ColorList implements Iterable<TColor> {
 
     /**
      * Adjusts the brightness component of all list colors by the given amount.
-     * 
+     *
      * @param step
      *            adjustment value
      * @return itself
      */
     public ColorList adjustBrightness(float step) {
-        for (TColor c : colors) {
+        colors.forEach((c) -> {
             c.lighten(step);
-        }
+        });
         return this;
     }
 
     /**
      * Adjusts the saturation component of all list colors by the given amount.
-     * 
+     *
      * @param step
      *            adjustment value
      * @return itself
      */
     public ColorList adjustSaturation(float step) {
-        for (TColor c : colors) {
+        colors.forEach((c) -> {
             c.saturate(step);
-        }
+        });
         return this;
     }
 
     /**
      * Sorts the list based on two criteria to create clusters/segments within
      * the list.
-     * 
+     *
      * @param clusterCriteria
      *            main sort criteria
      * @param subClusterCriteria
@@ -334,30 +334,25 @@ public class ColorList implements Iterable<TColor> {
 
     /**
      * Switches all list colors to their complementary color.
-     * 
+     *
      * @return itself
      */
     public ColorList complement() {
-        for (TColor c : colors) {
+        colors.forEach((c) -> {
             c.complement();
-        }
+        });
         return this;
     }
 
     /**
      * Checks if the given color is part of the list. Check is done by value,
      * not instance.
-     * 
+     *
      * @param color
      * @return true, if the color is present.
      */
     public boolean contains(ReadonlyTColor color) {
-        for (ReadonlyTColor c : colors) {
-            if (c.equals(color)) {
-                return true;
-            }
-        }
-        return false;
+        return colors.stream().anyMatch((c) -> (c.equals(color)));
     }
 
     /**
@@ -365,7 +360,7 @@ public class ColorList implements Iterable<TColor> {
      * convention, in that if the index is negative, it is considered relative
      * to the list end. Therefore the color at index -1 is the last color in the
      * list.
-     * 
+     *
      * @param i
      *            index
      * @return color
@@ -379,7 +374,7 @@ public class ColorList implements Iterable<TColor> {
 
     /**
      * Calculates and returns the average color of the list.
-     * 
+     *
      * @return average color or null, if there're no entries yet.
      */
     public ReadonlyTColor getAverage() {
@@ -404,7 +399,7 @@ public class ColorList implements Iterable<TColor> {
     /**
      * Creates a new ColorList by blending all colors in the list with each
      * other (successive indices only)
-     * 
+     *
      * @param amount
      *            blend amount
      * @return new color list
@@ -420,7 +415,7 @@ public class ColorList implements Iterable<TColor> {
 
     /**
      * Finds and returns the darkest color of the list.
-     * 
+     *
      * @return darkest color or null if there're no entries yet.
      */
     public TColor getDarkest() {
@@ -438,7 +433,7 @@ public class ColorList implements Iterable<TColor> {
 
     /**
      * Finds and returns the lightest (luminance) color of the list.
-     * 
+     *
      * @return lightest color or null, if there're no entries yet.
      */
     public ReadonlyTColor getLightest() {
@@ -464,7 +459,7 @@ public class ColorList implements Iterable<TColor> {
 
     /**
      * Returns a reversed copy of the current list.
-     * 
+     *
      * @return reversed copy of the list
      */
     public ColorList getReverse() {
@@ -473,20 +468,35 @@ public class ColorList implements Iterable<TColor> {
 
     /**
      * Inverts all colors in the list.
-     * 
+     *
      * @return itself
      */
     public ColorList invert() {
-        for (TColor c : colors) {
+        colors.forEach((c) -> {
             c.invert();
-        }
+        });
         return this;
     }
 
+
+    public String toRubyString() {
+        StringBuilder ruby = new StringBuilder("%w(");
+        colors.stream().map((c) -> {
+            ruby.append('#');
+            ruby.append(c.toHex());
+            return c;
+        }).forEachOrdered((_item) -> {
+            ruby.append(' ');
+        });
+        ruby.deleteCharAt(ruby.length() - 1);
+        ruby.append(")\n");
+        return ruby.toString();
+    }
+
     /**
      * Returns an iterator over the internal list. This means the list can be
      * accessed via standard Iterator loops.
-     * 
+     *
      * @return list iterator
      */
     @Override
@@ -496,7 +506,7 @@ public class ColorList implements Iterable<TColor> {
 
     /**
      * Reverses the current order of the list.
-     * 
+     *
      * @return itself
      */
     public ColorList reverse() {
@@ -506,7 +516,7 @@ public class ColorList implements Iterable<TColor> {
 
     /**
      * Rotates the hues of all colors in the list by the given amount.
-     * 
+     *
      * @param theta
      *            rotation angle in radians
      * @return itself
@@ -518,7 +528,7 @@ public class ColorList implements Iterable<TColor> {
 
     /**
      * Rotates the hues of all colors in the list by the given amount.
-     * 
+     *
      * @param angle
      *            rotation angle in degrees
      * @return itself
@@ -527,17 +537,17 @@ public class ColorList implements Iterable<TColor> {
         rotateImplementation(angle);
         return this;
     }
-    
+
      /**
      * Rotates the hues of all colors in the list by the given amount.
-     * 
+     *
      * @param angle
      *            rotation angle in degrees
      */
     private void rotateImplementation(float angle) {
-        for (TColor c : colors) {
+        colors.forEach((c) -> {
             c.rotateRYB(angle);
-        }
+        });
     }
 
     /**
@@ -549,7 +559,7 @@ public class ColorList implements Iterable<TColor> {
 
     /**
      * Convenience method. Sorts the list by hue.
-     * 
+     *
      * @return itself
      */
     public ColorList sort() {
@@ -558,7 +568,7 @@ public class ColorList implements Iterable<TColor> {
 
     /**
      * Sorts the list using the given comparator.
-     * 
+     *
      * @param comp
      *            comparator
      * @param isReversed
@@ -576,7 +586,7 @@ public class ColorList implements Iterable<TColor> {
 
     /**
      * Sorts the list using the given {@link AccessCriteria}.
-     * 
+     *
      * @param criteria
      *            sort criteria
      * @param isReversed
@@ -590,7 +600,7 @@ public class ColorList implements Iterable<TColor> {
     /**
      * Sorts the list by relative distance to each predecessor, starting with
      * the darkest color in the list.
-     * 
+     *
      * @param isReversed
      *            true, if list is to be sorted in reverse.
      * @return itself
@@ -602,7 +612,7 @@ public class ColorList implements Iterable<TColor> {
     /**
      * Sorts the list by relative distance to each predecessor, starting with
      * the darkest color in the list.
-     * 
+     *
      * @param proxy
      * @param isReversed
      *            true, if list is to be sorted in reverse.
@@ -653,7 +663,7 @@ public class ColorList implements Iterable<TColor> {
     /**
      * Sorts the list by proximity to the given target color (using RGB distance
      * metrics).
-     * 
+     *
      * @see #sortByProximityTo(ReadonlyTColor, DistanceProxy, boolean)
      * @param target
      *            color
@@ -668,7 +678,7 @@ public class ColorList implements Iterable<TColor> {
     /**
      * Sorts the list by proximity to the given target color using the given
      * {@link DistanceProxy} implementation.
-     * 
+     *
      * @param target
      *            color
      * @param proxy
@@ -685,7 +695,7 @@ public class ColorList implements Iterable<TColor> {
 
     /**
      * Creates an ARGB integer array of the list items.
-     * 
+     *
      * @return all list colors as ARGB values
      */
     public int[] toARGBArray() {