toxiclibs 0.9.1 → 0.9.2

data/toxiclibs.gemspec

@@ -7,20 +7,18 @@ Gem::Specification.new do |spec|
   spec.name = 'toxiclibs'
   spec.version = Toxiclibs::VERSION
   spec.has_rdoc = true
-  spec.extra_rdoc_files = %w{README.md LICENSE.md}
-  spec.summary = %q{Updated and extended toxiclibs libraries for JRubyArt}
+  spec.extra_rdoc_files = %w(README.md LICENSE.md)
+  spec.summary = %q(Updated and extended toxiclibs libraries for JRubyArt and propane)
   spec.description =<<-EOS
-  Toxiclibs java libraries wrapped in a rubygem. Compiled and tested with JRubyArt-1.2.5 and processing-3.2.1
+  Toxiclibs java libraries wrapped in a rubygem. Compiled and tested with JRubyArt-1.3.0 and processing-3.3
   EOS
-  spec.licenses = %w{MIT LGPL-3.0}
-  spec.authors = %w{Karsten\ Schmidt Martin\ Prout}
+  spec.licenses = %w(MIT LGPL-3.0)
+  spec.authors = %w(Karsten\ Schmidt Martin\ Prout)
   spec.email = 'mamba2928@yahoo.co.uk'
   spec.homepage = 'http://ruby-processing.github.io/toxicgem/'
   spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.files << 'lib/toxiclibs.jar'
-  spec.files << 'lib/args4j-2.0.31.jar' 
-  spec.files << 'lib/joal-2.3.1.jar' 
+  spec.files << 'lib/args4j-2.0.31.jar'
   spec.require_paths = ['lib']
-  spec.add_dependency 'jruby_art', '~> 1.2'
   spec.add_development_dependency 'rake', '~> 11.2', '>= 11.2.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: toxiclibs
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Karsten Schmidt
@@ -9,22 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-28 00:00:00.000000000 Z
+date: 2017-04-02 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: jruby_art
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -46,7 +32,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 11.2.2
 description: "  Toxiclibs java libraries wrapped in a rubygem. Compiled and tested
-  with JRubyArt-1.2.5 and processing-3.2.1\n"
+  with JRubyArt-1.3.0 and processing-3.3\n"
 email: mamba2928@yahoo.co.uk
 executables: []
 extensions: []
@@ -70,6 +56,7 @@ files:
 - examples/attract_repel/attract_repel.rb
 - examples/attract_repel/attractor.rb
 - examples/attract_repel/particle.rb
+- examples/boolean_shapes.rb
 - examples/data/ReplicaBold.ttf
 - examples/data/ti_yong.png
 - examples/force_directed/cluster.rb
@@ -95,12 +82,12 @@ files:
 - examples/spherical_harmonics_mesh.rb
 - examples/test_rect.rb
 - lib/args4j-2.0.31.jar
-- lib/joal-2.3.1.jar
 - lib/toxiclibs.jar
 - lib/toxiclibs.rb
 - lib/toxiclibs/version.rb
 - pom.rb
 - pom.xml
+- src/BooleanShapes.java
 - src/com/toxi/net/ClientListener.java
 - src/com/toxi/net/ServerListener.java
 - src/com/toxi/net/ServerListenerAdapter.java
@@ -111,14 +98,6 @@ files:
 - src/com/toxi/nio/UDPClient.java
 - src/com/toxi/nio/UDPClientState.java
 - src/com/toxi/nio/UDPServer.java
-- src/toxi/audio/AudioBuffer.java
-- src/toxi/audio/AudioSource.java
-- src/toxi/audio/DecompressInputStream.java
-- src/toxi/audio/IIRFilter.java
-- src/toxi/audio/JOALUtil.java
-- src/toxi/audio/MultiTimbralManager.java
-- src/toxi/audio/SoundListener.java
-- src/toxi/audio/SynthUtil.java
 - src/toxi/color/AccessCriteria.java
 - src/toxi/color/AlphaAccessor.java
 - src/toxi/color/CMYKAccessor.java
@@ -481,8 +460,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.3
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
-summary: Updated and extended toxiclibs libraries for JRubyArt
+summary: Updated and extended toxiclibs libraries for JRubyArt and propane
 test_files: []

data/src/toxi/audio/AudioBuffer.java

@@ -1,229 +0,0 @@
-/*
- *   __               .__       .__  ._____.           
- * _/  |_  _______  __|__| ____ |  | |__\_ |__   ______
- * \   __\/  _ \  \/  /  |/ ___\|  | |  || __ \ /  ___/
- *  |  | (  <_> >    <|  \  \___|  |_|  || \_\ \\___ \ 
- *  |__|  \____/__/\_ \__|\___  >____/__||___  /____  >
- *                   \/       \/             \/     \/ 
- *
- * 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
- * Modified and updated by Martin Prout December 2015
- */
-
-package toxi.audio;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import com.jogamp.openal.AL;
-
-/**
- * A wrapper for the actual sample data byte buffer in memory. The buffer can be
- * queried to find out more information about the underlying audio data.
- */
-public class AudioBuffer {
-
-    /**
-     * Format descriptor
-     */
-    public enum Format {
-        MONO8(AL.AL_FORMAT_MONO8, 8, 1), MONO16(AL.AL_FORMAT_MONO16, 16, 1), STEREO8(
-                AL.AL_FORMAT_STEREO8, 8, 2), STEREO16(AL.AL_FORMAT_STEREO16,
-                16, 2);
-
-        public static Format getForID(int id) {
-            Format format = null;
-            for (Format f : values()) {
-                if (f.id == id) {
-                    format = f;
-                    break;
-                }
-            }
-            return format;
-        }
-
-        private final int id;
-        private final int numBits;
-        private final int numChannels;
-
-        private Format(int id, int bits, int channels) {
-            this.id = id;
-            this.numBits = bits;
-            this.numChannels = channels;
-        }
-
-        public int getID() {
-            return id;
-        }
-
-        /**
-         * @return the numBits
-         */
-        public int getNumBits() {
-            return numBits;
-        }
-
-        /**
-         * @return the numChannels
-         */
-        public int getNumChannels() {
-            return numChannels;
-        }
-    }
-
-    protected final AL al;
-    protected ByteBuffer data;
-
-    protected final int id;
-
-    protected final int[] alResult = new int[1];
-    protected Format format;
-
-    public AudioBuffer(AL al, int bufferID) {
-        this.id = bufferID;
-        this.al = al;
-    }
-
-    public AudioBuffer configure(ByteBuffer data, Format format, int freq) {
-        return configure(data, format.getID(), freq);
-    }
-
-    /**
-     * Configure the audio buffer
-     * 
-     * @param data
-     *            the raw audio data
-     * @param format
-     *            the internal format ID of the audio data
-     * @param freq
-     *            the frequency of the data
-     * @return 
-     */
-    public AudioBuffer configure(ByteBuffer data, int format, int freq) {
-        this.data = data;
-        this.format = Format.getForID(format);
-        al.alBufferData(id, format, data, data.capacity(), freq);
-        return this;
-    }
-
-    public boolean convertUlawToPCM(boolean isAlaw) {
-        byte[] ulaw = new byte[getByteSize()];
-        data.rewind();
-        data.get(ulaw);
-        byte[] pcm = new byte[ulaw.length * 2];
-        ByteArrayInputStream bin = new ByteArrayInputStream(ulaw);
-        try {
-            new DecompressInputStream(bin, isAlaw).read(pcm);
-            configure(ByteBuffer.wrap(pcm), Format.MONO16, getFrequency());
-            return true;
-        } catch (IOException e) {
-        }
-        return false;
-    }
-
-    /**
-     * Deletes this buffer, and frees its resources.
-     * 
-     * @return true, if removed successfully
-     */
-    public boolean delete() {
-        data = null;
-        al.alDeleteBuffers(1, new int[] { id }, 0);
-        return al.alGetError() == AL.AL_NO_ERROR;
-    }
-
-    /**
-     * Get the bit-depth of the data, (8 or 16)
-     * 
-     * @return the bit-depth of the data
-     */
-    public final int getBitDepth() {
-        // al.alGetBufferi(id, AL.AL_BITS, alResult, 0);
-        // return alResult[0];
-        return format.getNumBits();
-    }
-
-    /**
-     * Gets the size (in bytes) of the raw data contained in this buffer.
-     * 
-     * @return the size of the data.
-     */
-    public final int getByteSize() {
-        // al.alGetBufferi(id, AL.AL_SIZE, alResult, 0);
-        // return alResult[0];
-        return data.capacity();
-    }
-
-    /**
-     * Gets the raw data contained in this buffer.
-     * 
-     * @return the raw buffer data.
-     */
-    public final ByteBuffer getData() {
-        return data;
-    }
-
-    /**
-     * Gets the audio frequency of the data contained in this buffer.
-     * 
-     * @return the frequency of the data
-     */
-    public final int getFrequency() {
-        al.alGetBufferi(id, AL.AL_FREQUENCY, alResult, 0);
-        return alResult[0];
-    }
-
-    /**
-     * Returns the OpenAL reference ID for this buffer.
-     * 
-     * @return buffer id
-     */
-    public final int getID() {
-        return id;
-    }
-
-    /**
-     * Get the number of channels of the data (1-Mono, 2-Stereo)
-     * 
-     * @return the number of audio channels.
-     */
-    public final int getNumChannels() {
-        // al.alGetBufferi(id, AL.AL_CHANNELS, alResult, 0);
-        // return alResult[0];
-        return format.getNumChannels();
-    }
-
-    /**
-     * Gets the size (in samples) of the raw data contained in this buffer.
-     * 
-     * @return sample size.
-     */
-    public final int getSampleSize() {
-        return getByteSize() * 8 / getBitDepth() / getNumChannels();
-    }
-
-    /**
-     *
-     * @return
-     */
-    @Override
-    public String toString() {
-        return "AudioBuffer: id=" + id + " format=" + format;
-    }
-}

data/src/toxi/audio/AudioSource.java

@@ -1,288 +0,0 @@
-/*
- *   __               .__       .__  ._____.           
- * _/  |_  _______  __|__| ____ |  | |__\_ |__   ______
- * \   __\/  _ \  \/  /  |/ ___\|  | |  || __ \ /  ___/
- *  |  | (  <_> >    <|  \  \___|  |_|  || \_\ \\___ \ 
- *  |__|  \____/__/\_ \__|\___  >____/__||___  /____  >
- *                   \/       \/             \/     \/ 
- *
- * 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
- */
-
-package toxi.audio;
-
-import com.jogamp.openal.AL;
-import toxi.geom.Vec3D;
-import toxi.math.MathUtils;
-
-/**
- * A wrapper for {@link AudioBuffer}s and similar to the built in JOAL
- * net.java.games.sound3d.Source, though less restrictive. The class extends
- * {@link Vec3D} and so can be used to position the sound in 3D space (provided
- * the underlying audio hardware does support 3D audio). Unfortunately due to
- * OpenAL's limitations only mono samples can be positioned in that way. Stereo
- * samples will can only manipulated in terms of gain/volume.
- * 
- * <p>
- * If the position of an AudioSource is changed via the public x,y,z vector
- * components, the <code>updatePosition()</code> method needs to be called
- * afterwards in order to reflect the changes in the OpenAL context.
- */
-public class AudioSource extends Vec3D {
-
-    protected AL al;
-
-    protected AudioBuffer buffer;
-
-    protected final int id;
-    protected int size;
-
-    protected final float[] position = { 0.0f, 0.0f, 0.0f };
-    protected final float[] velocity = { 0.0f, 0.0f, 0.0f };
-    protected final float[] direction = { 0.0f, 0.0f, 0.0f };
-
-    protected int[] alResult = new int[1];
-
-    protected boolean isLooping;
-
-    public AudioSource(AL al, int id) {
-        this(al, id, null);
-    }
-
-    public AudioSource(AL al, int id, AudioBuffer buf) {
-        super();
-        this.al = al;
-        this.id = id;
-        setBuffer(buf);
-    }
-
-    /**
-     * Deletes this source, and free its resources. Note, this method does NOT
-     * release the associated audio buffer. If you want to remove a source
-     * including its wave data use
-     * {@link JOALUtil#deleteSource(AudioSource, boolean)} instead.
-     * 
-     * @return true, if source was removed successfully
-     */
-    public boolean delete() {
-        stop();
-        setBuffer(null);
-        al.alDeleteSources(1, new int[] { id }, 0);
-        return al.alGetError() == AL.AL_NO_ERROR;
-    }
-
-    /**
-     * Gets the buffer associated with this source.
-     * 
-     * @return the buffer associated with this source
-     */
-    public AudioBuffer getBuffer() {
-        return buffer;
-    }
-
-    /**
-     * Gets the number of buffers already processed on this source.
-     * 
-     * @return the number of buffers already processed on this source.
-     */
-    public int getBuffersProcessed() {
-        al.alGetSourcei(id, AL.AL_BUFFERS_PROCESSED, alResult, 0);
-        return alResult[0];
-    }
-
-    public final float[] getDirection() {
-        return direction;
-    }
-
-    public final int getID() {
-        return id;
-    }
-
-    public final int getOffset() {
-        al.alGetSourcei(id, AL.AL_SAMPLE_OFFSET, alResult, 0);
-        return alResult[0];
-    }
-
-    public final float[] getPosition() {
-        return position;
-    }
-
-    public final float[] getVelocity() {
-        return velocity;
-    }
-
-    public final boolean isLooping() {
-        return isLooping;
-    }
-
-    public final int length() {
-        return size;
-    }
-
-    public AudioSource play() {
-        if (buffer != null) {
-            al.alSourcePlay(id);
-        }
-        return this;
-    }
-
-    public AudioSource rewind() {
-        if (buffer != null) {
-            al.alSourceRewind(id);
-        }
-        return this;
-    }
-
-    /**
-     * Sets the buffer associated with this source.
-     * 
-     * @param buffer
-     *            the buffer associated with this source
-     * @return 
-     */
-    public final AudioSource setBuffer(AudioBuffer buffer) {
-        this.buffer = buffer;
-        if (buffer != null) {
-            al.alSourcei(id, AL.AL_BUFFER, buffer.getID());
-            size = buffer.getSampleSize();
-        } else {
-            al.alSourcei(id, AL.AL_BUFFER, AL.AL_NONE);
-            size = 0;
-        }
-        return this;
-    }
-
-    public AudioSource setDirection(float xx, float yy, float zz) {
-        direction[0] = xx;
-        direction[1] = yy;
-        direction[2] = zz;
-        al.alSourcefv(id, AL.AL_DIRECTION, direction, 0);
-        return this;
-    }
-
-    public AudioSource setDirection(float[] d) {
-        if (d.length == 3) {
-            direction[0] = d[0];
-            direction[1] = d[1];
-            direction[2] = d[2];
-            al.alSourcefv(id, AL.AL_DIRECTION, direction, 0);
-        } else {
-            throw new IllegalArgumentException("wrong number of array elements");
-        }
-        return this;
-    }
-
-    public AudioSource setDirection(Vec3D dir) {
-        return setDirection(dir.x, dir.y, dir.z);
-    }
-
-    public AudioSource setGain(float gain) {
-        al.alSourcef(id, AL.AL_GAIN, gain);
-        return this;
-    }
-
-    public AudioSource setLooping(boolean state) {
-        isLooping = state;
-        al.alSourcei(id, AL.AL_LOOPING, (state ? AL.AL_TRUE : AL.AL_FALSE));
-        return this;
-    }
-
-    public AudioSource setOffset(int off) {
-        off = MathUtils.clip(off, 0, size - 1);
-        al.alSourcei(id, AL.AL_SAMPLE_OFFSET, off);
-        return this;
-    }
-
-    public AudioSource setPitch(float pitch) {
-        al.alSourcef(id, AL.AL_PITCH, pitch);
-        return this;
-    }
-
-    public AudioSource setPosition(float xx, float yy, float zz) {
-        position[0] = xx;
-        position[1] = yy;
-        position[2] = zz;
-        al.alSourcefv(id, AL.AL_POSITION, position, 0);
-        return this;
-    }
-
-    public AudioSource setPosition(float[] p) {
-        if (p.length == 3) {
-            x = position[0] = p[0];
-            y = position[1] = p[1];
-            z = position[2] = p[2];
-            al.alSourcefv(id, AL.AL_POSITION, position, 0);
-        } else {
-            throw new IllegalArgumentException("wrong number of array elements");
-        }
-        return this;
-    }
-
-    public AudioSource setPosition(Vec3D p) {
-        return setPosition(p.x, p.y, p.z);
-    }
-
-    public AudioSource setReferenceDistance(float d) {
-        al.alSourcef(id, AL.AL_REFERENCE_DISTANCE, d);
-        return this;
-    }
-
-    public AudioSource setVelocity(float xx, float yy, float zz) {
-        velocity[0] = xx;
-        velocity[1] = yy;
-        velocity[2] = zz;
-        al.alSourcefv(id, AL.AL_VELOCITY, velocity, 0);
-        return this;
-    }
-
-    public AudioSource setVelocity(float[] v) {
-        if (v.length == 3) {
-            velocity[0] = v[0];
-            velocity[1] = v[1];
-            velocity[2] = v[2];
-            al.alSourcefv(id, AL.AL_VELOCITY, velocity, 0);
-        } else {
-            throw new IllegalArgumentException("wrong number of array elements");
-        }
-        return this;
-    }
-
-    public AudioSource setVelocity(Vec3D p) {
-        return setVelocity(p.x, p.y, p.z);
-    }
-
-    public AudioSource stop() {
-        al.alSourceStop(id);
-        return this;
-    }
-
-    @Override
-    public String toString() {
-        return "AudioSource: id=" + id
-                + (buffer != null ? " buffer=" + buffer.toString() : "");
-    }
-
-    public AudioSource updatePosition() {
-        position[0] = x;
-        position[1] = y;
-        position[2] = z;
-        al.alSourcefv(id, AL.AL_POSITION, position, 0);
-        return this;
-    }
-}