propane 3.4.0-java → 3.4.1-java

data/vendors/Rakefile

@@ -8,9 +8,9 @@ EOS
 SOUND = 'sound.zip'.freeze
 SOUND_VERSION = 'v1.3.2' # version 1.3.2
 GLVIDEO = 'processing-glvideo.zip'
-VIDEO = 'video-2.zip'
-VIDEO_VERSION = '2' # version 1.0.1
-EXAMPLES = '2.5'.freeze
+VIDEO = 'video-2.0-beta4.zip'
+VIDEO_VERSION = 'r6-v2.0-beta4'
+EXAMPLES = '2.6'.freeze
 HOME_DIR = ENV['HOME']
 MAC_OR_LINUX = /linux|mac|darwin/ =~ RbConfig::CONFIG['host_os']
 
@@ -40,10 +40,6 @@ task download_and_copy_sound: [:init_dir, :download_sound, :copy_sound, :clobber
 desc 'download and copy video library to ~/.propane'
 task download_and_copy_video: [:init_dir, :download_video, :copy_video, :clobber]
 
-desc 'download and copy glvideo library to ~/.propane'
-task download_and_copy_glvideo: [:init_dir, :download_glvideo, :copy_glvideo, :clobber]
-
-
 desc 'download sound library'
 task :download_sound do
   wget_base = 'wget https://github.com/processing/processing-sound'
@@ -55,17 +51,6 @@ task :download_sound do
   end
 end
 
-desc 'download glvideo library'
-task :download_glvideo do
-  wget_base = 'wget https://github.com/gohai/processing-glvideo'
-  wget_string = [wget_base, 'releases/download/latest', GLVIDEO].join('/')
-  begin
-    sh wget_string
-  rescue
-    warn(WARNING)
-  end
-end
-
 desc 'download video library'
 task :download_video do
   wget_base = 'wget https://github.com/processing/processing-video'
@@ -116,12 +101,3 @@ task :copy_video => VIDEO do
   sh "cp -r video #{HOME_DIR}/.propane/libraries/video"
   sh 'rm -r video'
 end
-
-desc 'copy glvideo library'
-task :copy_glvideo => GLVIDEO do
-  directory "~/.propane/libraries/glvideo"
-  sh "unzip #{GLVIDEO}"
-  sh "rm -r #{HOME_DIR}/.propane/libraries/glvideo" if File.exist? "#{HOME_DIR}/.propane/libraries/glvideo"
-  sh "cp -r glvideo #{HOME_DIR}/.propane/libraries/glvideo"
-  sh 'rm -r glvideo'
-end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: propane
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.4.1
 platform: java
 authors:
 - monkstone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-01 00:00:00.000000000 Z
+date: 2019-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -91,7 +91,7 @@ files:
 - lib/jogl-all-natives-macosx-universal.jar
 - lib/jogl-all-natives-windows-amd64.jar
 - lib/jogl-all.jar
-- lib/propane-3.4.0.jar
+- lib/propane-3.4.1.jar
 - lib/propane.rb
 - lib/propane/app.rb
 - lib/propane/creators/sketch_class.rb
@@ -107,11 +107,14 @@ files:
 - lib/propane/runner.rb
 - lib/propane/version.rb
 - library/boids/boids.rb
+- library/color_group/color_group.rb
 - library/control_panel/control_panel.rb
+- library/dxf/dxf.rb
 - library/file_chooser/chooser.rb
 - library/file_chooser/file_chooser.rb
 - library/library_proxy/README.md
 - library/library_proxy/library_proxy.rb
+- library/net/net.rb
 - library/simplex_noise/simplex_noise.rb
 - library/slider/slider.rb
 - library/vector_utils/vector_utils.rb
@@ -149,7 +152,8 @@ files:
 - src/main/java/monkstone/vecmath/vec2/package-info.java
 - src/main/java/monkstone/vecmath/vec3/Vec3.java
 - src/main/java/monkstone/vecmath/vec3/package-info.java
-- src/main/java/monkstone/videoevent/VideoInterface.java
+- src/main/java/monkstone/videoevent/CaptureEvent.java
+- src/main/java/monkstone/videoevent/MovieEvent.java
 - src/main/java/monkstone/videoevent/package-info.java
 - src/main/java/processing/awt/PGraphicsJava2D.java
 - src/main/java/processing/awt/PShapeJava2D.java
@@ -170,26 +174,6 @@ files:
 - src/main/java/processing/core/PSurfaceNone.java
 - src/main/java/processing/core/PVector.java
 - src/main/java/processing/core/ThinkDifferent.java
-- src/main/java/processing/core/util/image/ImageLoadFacade.java
-- src/main/java/processing/core/util/image/ImageSaveFacade.java
-- src/main/java/processing/core/util/image/constants/TifConstants.java
-- src/main/java/processing/core/util/image/load/AwtImageLoadStrategy.java
-- src/main/java/processing/core/util/image/load/Base64StringImageLoadStrategy.java
-- src/main/java/processing/core/util/image/load/FallbackImageLoadStrategy.java
-- src/main/java/processing/core/util/image/load/ImageIoImageLoadStrategy.java
-- src/main/java/processing/core/util/image/load/ImageLoadStrategy.java
-- src/main/java/processing/core/util/image/load/ImageLoadUtil.java
-- src/main/java/processing/core/util/image/load/TgaImageLoadStrategy.java
-- src/main/java/processing/core/util/image/load/TiffImageLoadStrategy.java
-- src/main/java/processing/core/util/image/save/ImageSaveStrategy.java
-- src/main/java/processing/core/util/image/save/ImageSaveUtil.java
-- src/main/java/processing/core/util/image/save/ImageWriterImageSaveStrategy.java
-- src/main/java/processing/core/util/image/save/SaveImageException.java
-- src/main/java/processing/core/util/image/save/TgaImageSaveStrategy.java
-- src/main/java/processing/core/util/image/save/TiffImageSaveStrategy.java
-- src/main/java/processing/core/util/image/save/TiffNakedFilenameImageSaveStrategy.java
-- src/main/java/processing/core/util/io/InputFactory.java
-- src/main/java/processing/core/util/io/PathUtil.java
 - src/main/java/processing/data/DoubleDict.java
 - src/main/java/processing/data/DoubleList.java
 - src/main/java/processing/data/FloatDict.java
@@ -207,12 +191,15 @@ files:
 - src/main/java/processing/data/Table.java
 - src/main/java/processing/data/TableRow.java
 - src/main/java/processing/data/XML.java
+- src/main/java/processing/dxf/RawDXF.java
 - src/main/java/processing/event/Event.java
 - src/main/java/processing/event/KeyEvent.java
 - src/main/java/processing/event/MouseEvent.java
 - src/main/java/processing/event/TouchEvent.java
 - src/main/java/processing/javafx/PGraphicsFX2D.java
 - src/main/java/processing/javafx/PSurfaceFX.java
+- src/main/java/processing/net/Client.java
+- src/main/java/processing/net/Server.java
 - src/main/java/processing/opengl/FontTexture.java
 - src/main/java/processing/opengl/FrameBuffer.java
 - src/main/java/processing/opengl/LinePath.java
@@ -291,7 +278,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - java runtime >= 11.0.2+
-rubygems_version: 3.0.4
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: ruby implementation of processing-4.0 on MacOS, linux and windows (64bit

data/src/main/java/processing/core/util/image/ImageLoadFacade.java

@@ -1,161 +0,0 @@
-/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
-
-/*
-  Part of the Processing project - http://processing.org
-
-  Copyright (c) 2012-18 The Processing Foundation
-  Copyright (c) 2004-12 Ben Fry and Casey Reas
-  Copyright (c) 2001-04 Massachusetts Institute of Technology
-
-  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, version 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., 59 Temple Place, Suite 330,
-  Boston, MA  02111-1307  USA
-*/
-
-package processing.core.util.image;
-
-import processing.core.PApplet;
-import processing.core.PImage;
-import processing.core.util.image.load.*;
-import processing.core.util.io.PathUtil;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicReference;
-
-
-/**
- * Utility for loading images either from file system or string encoding using a set of strategies.
- */
-public class ImageLoadFacade {
-
-  private static final AtomicReference<ImageLoadFacade> instance = new AtomicReference<>(null);
-
-  private static final String PREFIX_BASE64_STRING_IMAGE = "data:image";
-  private static final String PREFIX_FILE_PATH = "file://";
-
-  private final Map<String, ImageLoadStrategy> loadStrategies;
-  private final ImageLoadStrategy defaultImageLoadStrategy;
-
-  /**
-   * Get a shared instance of this singleton.
-   *
-   * @return Shared instance of this singleton.
-   */
-  public static ImageLoadFacade get() {
-    instance.compareAndSet(null, new ImageLoadFacade());
-    return instance.get();
-  }
-
-  /**
-   * Hidden constructor. Clients should use get().
-   */
-  private ImageLoadFacade() {
-    loadStrategies = new HashMap<>();
-
-    loadStrategies.put("base64", new Base64StringImageLoadStrategy());
-
-    loadStrategies.put("tga", new TgaImageLoadStrategy());
-
-    ImageLoadStrategy tifImageLoadStrategy = new TiffImageLoadStrategy();
-    loadStrategies.put("tif", tifImageLoadStrategy);
-    loadStrategies.put("tiff", tifImageLoadStrategy);
-
-    ImageLoadStrategy awtImageLoadStrategy = new AwtImageLoadStrategy();
-    defaultImageLoadStrategy = new ImageIoImageLoadStrategy();
-
-    ImageLoadStrategy awtFallbackStrategy = new FallbackImageLoadStrategy(
-        awtImageLoadStrategy,
-        defaultImageLoadStrategy
-    );
-    loadStrategies.put("jpg", awtFallbackStrategy);
-    loadStrategies.put("jpeg", awtFallbackStrategy);
-    loadStrategies.put("gif", awtFallbackStrategy);
-    loadStrategies.put("png", awtFallbackStrategy);
-    loadStrategies.put("unknown", awtFallbackStrategy);
-  }
-
-  /**
-   * Load an image embedded within an SVG string.
-   *
-   * @param pApplet The PApplet on whose behalf an SVG is being parsed. This must be given so that
-   *                image can be retrieved in the case of sketch relative file.
-   * @param svgImageStr The SVG string to load which can be data:image or file://.
-   * @return The image loaded as a PImage.
-   */
-  public PImage loadFromSvg(PApplet pApplet, String svgImageStr) {
-    if (svgImageStr == null) {
-      return null;
-    }
-
-    if (svgImageStr.startsWith(PREFIX_BASE64_STRING_IMAGE)) {
-      String[] parts = svgImageStr.split(";base64,");
-      String extension = parts[0].substring(11);
-      String encodedData = parts[1];
-      return loadStrategies.get("base64").load(pApplet, encodedData, extension);
-    } else if (svgImageStr.startsWith(PREFIX_FILE_PATH)) {
-      String filePath = svgImageStr.substring(PREFIX_FILE_PATH.length());
-      return loadFromFile(pApplet, filePath);
-    } else {
-      return null;
-    }
-  }
-
-  /**
-   * Load an image from a file.
-   *
-   * @param pApplet The PApplet through which the image should be retrieved in the case of sketch
-   *     relative file (data folder for example).
-   * @param path The path to the file to be opened.
-   * @return The image loaded.
-   */
-  public PImage loadFromFile(PApplet pApplet, String path) {
-    return loadFromFile(pApplet, path, null);
-  }
-
-  /**
-   * Load an image from a file using the given file extension.
-   *
-   * @param pApplet The PApplet through which the image should be retrieved in the case of sketch
-   *     relative file (data folder for example).
-   * @param path The path to the file to be opened.
-   * @param extension The extension with which the image should be loaded like "png".
-   * @return The image loaded.
-   */
-  public PImage loadFromFile(PApplet pApplet, String path, String extension) {
-    if (extension == null) {
-      extension = PathUtil.parseExtension(path);
-    }
-
-    // just in case. them users will try anything!
-    extension = PathUtil.cleanExtension(extension);
-
-    // Find strategy for loading
-    ImageLoadStrategy imageLoadStrategy = loadStrategies.getOrDefault(
-        extension,
-        defaultImageLoadStrategy
-    );
-
-    // Load image
-    PImage resultImage = imageLoadStrategy.load(pApplet, path, extension);
-
-    // Report error or return
-    if (resultImage == null) {
-      System.err.println("Could not find a method to load " + path);
-      return null;
-    } else {
-      return resultImage;
-    }
-  }
-
-}

data/src/main/java/processing/core/util/image/ImageSaveFacade.java

@@ -1,169 +0,0 @@
-/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
-
-/*
-  Part of the Processing project - http://processing.org
-
-  Copyright (c) 2012-18 The Processing Foundation
-  Copyright (c) 2004-12 Ben Fry and Casey Reas
-  Copyright (c) 2001-04 Massachusetts Institute of Technology
-
-  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, version 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., 59 Temple Place, Suite 330,
-  Boston, MA  02111-1307  USA
-*/
-
-package processing.core.util.image;
-
-import processing.core.PApplet;
-import processing.core.PGraphics;
-import processing.core.util.image.save.*;
-import processing.core.util.io.PathUtil;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicReference;
-
-
-/**
- * Facade to load PImages from various sources.
- */
-public class ImageSaveFacade {
-
-  private static final AtomicReference<ImageSaveFacade> instance = new AtomicReference<>(null);
-
-  private final Map<String, ImageSaveStrategy> saveStrategies;
-  private final ImageSaveStrategy defaultImageSaveStrategy;
-
-  /**
-   * Get a shared instance of this singleton.
-   *
-   * @return Shared instance of ImageSaveFacade.
-   */
-  public static ImageSaveFacade get() {
-    instance.compareAndSet(null, new ImageSaveFacade());
-    return instance.get();
-  }
-
-  /**
-   * Private hidden constructor requiring clients to use get().
-   */
-  private ImageSaveFacade() {
-    saveStrategies = new HashMap<>();
-
-    ImageSaveStrategy imageWriterImageSaveStrategy = new ImageWriterImageSaveStrategy();
-    for (String format : javax.imageio.ImageIO.getWriterFormatNames()) {
-      saveStrategies.put(format.toLowerCase(), imageWriterImageSaveStrategy);
-    }
-
-    ImageSaveStrategy tgaImageSaveStrategy = new TgaImageSaveStrategy();
-    saveStrategies.put("tga", tgaImageSaveStrategy);
-
-    ImageSaveStrategy tiffImageSaveStrategy = new TiffImageSaveStrategy();
-    saveStrategies.put("tiff", tiffImageSaveStrategy);
-
-    defaultImageSaveStrategy = new TiffNakedFilenameImageSaveStrategy();
-  }
-
-  /**
-   * Save a raw representation of pixel values to a file given that file's path.
-   *
-   * @param pixels The raw representation of the image to save.
-   * @param pixelWidth Width of the image in pixels.
-   * @param pixelheight Height of the image in pixels.
-   * @param format Format corresponding to value in PConstants like PConstants.ARGB.
-   * @param filename The path at which the file should be saved like "test/path/output.png".
-   */
-  public boolean save(int[] pixels, int pixelWidth, int pixelHeight, int format, String filename) {
-    return save(
-        pixels,
-        pixelWidth,
-        pixelHeight,
-        format,
-        filename,
-        null
-    );
-  }
-
-  /**
-   * Save a raw representation of pixel values to a file given that file's path.
-   *
-   * @param pixels The raw representation of the image to save.
-   * @param pixelWidth Width of the image in pixels.
-   * @param pixelheight Height of the image in pixels.
-   * @param format Format corresponding to value in PConstants like PConstants.ARGB.
-   * @param filename The path at which the file should be saved like "test/path/output.png".
-   * @param pApplet The applet through which files should be saved when using sketch relative paths.
-   *    Can pass null if using absolute paths.
-   */
-  public boolean save(int[] pixels, int pixelWidth, int pixelHeight, int format, String filename,
-      PApplet pApplet) {
-
-    filename = preparePath(pApplet, filename);
-
-    String extension = PathUtil.parseExtension(filename);
-
-    ImageSaveStrategy imageSaveStrategy = saveStrategies.getOrDefault(
-        extension,
-        defaultImageSaveStrategy
-    );
-
-    try {
-      return imageSaveStrategy.save(
-          pixels,
-          pixelWidth,
-          pixelHeight,
-          format,
-          filename
-      );
-    } catch (IOException e) {
-      System.err.println("Error while saving image.");
-      e.printStackTrace();
-      return false;
-    } catch (SaveImageException e) {
-      PGraphics.showException(e.getMessage());
-      return false;
-    }
-
-  }
-
-  /**
-   * Ensure that the path is ready so that a file can be saved.
-   *
-   * @param pApplet The applet through which files should be saved when using sketch relative paths.
-   *    Can pass null if using absolute paths.
-   * @param filename The filename that will be written and for which a path needs to be prepared.
-   * @return Completed path useable for writing like a file path that has been made relative to
-   *    the sketch folder.
-   */
-  private String preparePath(PApplet pApplet, String filename) {
-    if (pApplet != null) {
-      return pApplet.savePath(filename);
-    } else {
-      File file = new File(filename);
-      if (file.isAbsolute()) {
-        // make sure that the intermediate folders have been created
-        PathUtil.createPath(file);
-        return filename;
-      } else {
-        String msg =
-            "PImage.save() requires an absolute path. " +
-                "Use createImage(), or pass savePath() to save().";
-
-        throw new SaveImageException(msg);
-      }
-    }
-  }
-
-}