propane 3.5.0-java → 3.6.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7837b349f30c7e79ee7e90b36eb7603174a0228d49fcaa8ec321ea5db24ae112
-  data.tar.gz: 38d0c0cc6972e111fe2bb7a81cf3f5bbe20cbb795b31f880acfaaff8a1008023
+  metadata.gz: f8e0f1b907888514e27260110225621d9fa5f7792d319ddae436540bd98be75a
+  data.tar.gz: f26c694203a50b98df365b2b003d2c258c11c87e550618a146158a69dfa7954e
 SHA512:
-  metadata.gz: 9f2f530ad672d28338340409760883e5bec5ce735a07fac5b76e9fba5e8965c37674410eb54c6aeec46d78e3568850719765738c71b359cdb37a0b30d6060af5
-  data.tar.gz: b0f30134fb858c2dbbc3a40eb9772e9788e1bca09f3cb2c893139bf690cef294d9dc5a30cf3667fd73016144807f6778b2cb5d13a02111f85ae56c91e5a64a17
+  metadata.gz: 1263af382d8cec20f5d16d760d0afe542802955ee42bb398e4ca28e8e5583ca04a04fd619529567b5df78cadd3f824c17de8d860a8ba1c3f003b2453a87fa16a
+  data.tar.gz: 90b9e87ca02ee5dde1bfd71dc51efc91574ee2855fddfea113793d2e3d8434b07f090d2170c0a4df798fd6b200846cb9645415c09158d684f3a757ef8ee0682f

data/.mvn/extensions.xml

@@ -3,6 +3,6 @@
   <extension>
     <groupId>io.takari.polyglot</groupId>
     <artifactId>polyglot-ruby</artifactId>
-    <version>0.4.4</version>
+    <version>0.4.5</version>
   </extension>
 </extensions>

data/.mvn/wrapper/MavenWrapperDownloader.java

@@ -20,7 +20,7 @@ import java.util.Properties;
 
 public class MavenWrapperDownloader {
 
-    private static final String WRAPPER_VERSION = "0.5.5";
+    private static final String WRAPPER_VERSION = "0.5.6";
     /**
      * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
      */

data/.mvn/wrapper/maven-wrapper.properties

@@ -1,2 +1,2 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.1/apache-maven-3.6.1-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar

data/.travis.yml

@@ -2,7 +2,7 @@ language: java
 dist: bionic
 
 rvm:
-  - jruby-9.2.11.1
+  - jruby-9.2.12.0
 jdk:
   - openjdk11
 os:

data/CHANGELOG.md

@@ -1,4 +1,6 @@
-**v3.5.0** Rebase processing core code around Sam Pottinhgers latest fixes for JOGL an image save, does mean breaking some of Diwis and Joshua Davis examples, but one hopes codeanticode knows what he's doing.
+**v3.6.0** Recommend JRuby-9.2.14.0 use video-2.0 release
+
+**v3.5.0** Rebase processing core code around Sam Pottingers latest fixes for JOGL an image save, does mean breaking some of Diwis and Joshua Davis examples, but one hopes codeanticode knows what he's doing.
 
 **v3.4.3** Use Map.of to initialize HashMap bump processing version in build bump to jruby-9.2.11.0
 

data/README.md

@@ -11,7 +11,7 @@ adjust above for your OS/distro setup.
 There may be a linker issue with P2D or P3D sketches with stock openjdk with some linux distros, in which case you might find [Adopt open jdk binaries][adopt] will work for you.
 
 - `jdk-11.0.3+`
-- `jruby-9.2.11.1`
+- `jruby-9.2.12.0`
 
 Currently you can ignore `illegal reflective access` warnings, see [here how to suppress them][warning].
 
@@ -27,10 +27,10 @@ rake javadoc
 
 ```bash
 jgem install propane # from rubygems
-jgem install propane-3.4.3-java.gem # local install
+jgem install propane-3.6.0-java.gem # local install
 # Alternative
 jruby -S gem install propane # from rubygems
-jruby -S gem install propane-3.4.3-java.gem # local install
+jruby -S gem install propane-3.6.0-java.gem # local install
 ```
 
 ## Check Install
@@ -42,15 +42,7 @@ propane --version
 
 ## Suppressing Reflective Access warnings
 
-Since propane-3.4.3 it is possible to suppress reflective access warnings by including a `~/.jruby.java_opts` file with following contents:-
-
-```bash
---add-opens java.base/java.lang=ALL-UNNAMED
---add-opens java.desktop/java.awt=ALL-UNNAMED
---add-opens java.desktop/sun.awt=ALL-UNNAMED
---add-opens java.desktop/sun.java2d.opengl=ALL-UNNAMED
-```
-Mainly needed for opengl sketches.
+Since propane-3.5.0 it is possible to suppress reflective access warnings by setting JAVA_HOME environmental variable jruby does the rest.
 
 ## Usage
 
@@ -103,7 +95,7 @@ See [gh-pages][gh-pages] for more detailed instructions and much more.
 
 ## Examples
 
-[Worked Examples](https://github.com/ruby-processing/propane-examples) more to follow, feel free to add your own, especially ruby-2.4
+[Worked Examples](https://github.com/ruby-processing/propane-examples) more to follow, feel free to add your own, especially ruby-2.5
 + syntax now we can. To install the samples.  The samples get copied to `~/propane_samples`. Depends on wget.
 ```bash
 propane --install samples

data/Rakefile

@@ -22,7 +22,7 @@ end
 
 desc 'Gem'
 task :gem do
-  sh 'gem build propane.gemspec'
+  sh 'jgem build propane.gemspec'
 end
 
 desc 'Document'

data/lib/propane.rb

@@ -8,4 +8,5 @@ end
 Dir["#{PROPANE_ROOT}/lib/*.jar"].sort.each do |jar|
   require jar
 end
-require_relative 'propane/app'
+require "#{PROPANE_ROOT}/lib/propane/app"
+require "#{PROPANE_ROOT}/lib/propane/helpers/numeric"

data/lib/propane/helper_methods.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: false
 
 # processing module wrapper
-require_relative 'helpers/numeric'
 module Propane
   # Provides some convenience methods
   module HelperMethods

data/lib/propane/runner.rb

@@ -55,6 +55,8 @@ module Propane
         # assumed to have this option.
         opts.on('-h', '--help', 'Display this screen') do
           puts opts
+          puts ''
+          puts 'Run a sketch: jruby [--dev] [<sketch.rb>]'
           exit
         end
       end

data/lib/propane/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Propane
-  VERSION = '3.5.0'
+  VERSION = '3.6.0'
 end

data/pom.rb

@@ -2,7 +2,7 @@
 
 project 'propane', 'https://github.com/monkstone/propane' do
   model_version '4.0.0'
-  id 'propane:propane:3.5.0'
+  id 'propane:propane:3.6.0'
   packaging 'jar'
 
   description 'An integrated processing-core (somewhat hacked), with additional java code for a jruby version of processing.'
@@ -35,48 +35,48 @@ project 'propane', 'https://github.com/monkstone/propane' do
   issue_management 'https://github.com/ruby-processing/propane/issues', 'Github'
 
   source_control(url: 'https://github.com/ruby-processing/propane',
-                 connection: 'scm:git:git://github.com/ruby-processing/propane.git',
-                 developer_connection: 'scm:git:git@github.com/ruby-processing/propane.git')
+    connection: 'scm:git:git://github.com/ruby-processing/propane.git',
+    developer_connection: 'scm:git:git@github.com/ruby-processing/propane.git')
 
-  properties('propane.basedir' => '${project.basedir}',
-             'processing.api' => 'http://processing.github.io/processing-javadocs/core/',
-             'source.directory' => 'src',
-             'polyglot.dump.pom' => 'pom.xml',
-             'project.build.sourceEncoding' => 'utf-8',
-             'jogl.version' => '2.3.2', # for compiling actual included 2.4.0-rc
-             'jruby.api' => 'http://jruby.org/apidocs/')
+    properties('propane.basedir' => '${project.basedir}',
+      'processing.api' => 'http://processing.github.io/processing-javadocs/core/',
+      'source.directory' => 'src',
+      'polyglot.dump.pom' => 'pom.xml',
+      'project.build.sourceEncoding' => 'utf-8',
+      'jogl.version' => '2.3.2', # for compiling actual included 2.4.0-rc
+      'jruby.api' => 'http://jruby.org/apidocs/')
 
-  pom 'org.jruby:jruby:9.2.11.1'
-  jar 'org.processing:video:3.3.7' # only for compiling
-  jar 'org.jogamp.jogl:jogl-all:${jogl.version}'
-  jar 'org.jogamp.gluegen:gluegen-rt-main:${jogl.version}'
+      pom 'org.jruby:jruby:9.2.14.0'
+      jar 'org.processing:video:3.3.7' # only for compiling
+      jar 'org.jogamp.jogl:jogl-all:${jogl.version}'
+      jar 'org.jogamp.gluegen:gluegen-rt-main:${jogl.version}'
 
-  overrides do
-    plugin('org.codehaus.mojo:versions-maven-plugin:2.7',
-           'generateBackupPoms' => 'false')
-    plugin(:compiler, '3.8.1',
-           'release' => '11')
-    plugin(:javadoc, '3.2.0',
-           'detectOfflineLinks' => 'false',
-           'links' => ['${jruby.api}',
-                       '${processing.api}'])
-    plugin(
-      :jar, '3.2.0',
-      'archive' => {
-        'manifestEntries' => { 'Class-Path' => 'gluegen-rt.jar jog-all.jar' }
-      }
-    )
-  end
-  build do
-    resource do
-      directory '${source.directory}/main/java'
-      includes '**/**/*.glsl', '**/*.jnilib'
-      excludes '**/**/*.java'
-    end
-    resource do
-      directory '${source.directory}/main/resources'
-      includes '**/*.png', '*.txt'
-      excludes
-    end
-  end
-end
+      overrides do
+        plugin('org.codehaus.mojo:versions-maven-plugin:2.7',
+          'generateBackupPoms' => 'false')
+          plugin(:compiler, '3.8.1',
+            'release' => '11')
+            plugin(:javadoc, '3.2.0',
+              'detectOfflineLinks' => 'false',
+              'links' => ['${jruby.api}',
+                '${processing.api}'])
+                plugin(:jar, '3.2.0',
+                  'archive' => {
+                    'manifestEntries' => {
+                      'Automatic-Module-Name' => 'processing.core'
+                    }
+                    })                    
+                  end
+                  build do
+                    resource do
+                      directory '${source.directory}/main/java'
+                      includes '**/**/*.glsl', '**/*.jnilib'
+                      excludes '**/**/*.java'
+                    end
+                    resource do
+                      directory '${source.directory}/main/resources'
+                      includes '**/*.png', '*.txt'
+                      excludes
+                    end
+                  end
+                end

data/pom.xml

@@ -6,12 +6,12 @@ DO NOT MODIFIY - GENERATED CODE
 
 
 -->
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <groupId>propane</groupId>
   <artifactId>propane</artifactId>
-  <version>3.5.0</version>
+  <version>3.6.0</version>
   <name>propane</name>
   <description>An integrated processing-core (somewhat hacked), with additional java code for a jruby version of processing.</description>
   <url>https://github.com/monkstone/propane</url>
@@ -74,7 +74,7 @@ DO NOT MODIFIY - GENERATED CODE
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby</artifactId>
-      <version>9.2.11.1</version>
+      <version>9.2.14.0</version>
       <type>pom</type>
     </dependency>
     <dependency>
@@ -147,7 +147,7 @@ DO NOT MODIFIY - GENERATED CODE
           <configuration>
             <archive>
               <manifestEntries>
-                <Class-Path>gluegen-rt.jar jog-all.jar</Class-Path>
+                <Automatic-Module-Name>processing.core</Automatic-Module-Name>
               </manifestEntries>
             </archive>
           </configuration>

data/propane.gemspec

@@ -27,9 +27,10 @@ Gem::Specification.new do |gem|
   gem.files << 'lib/jogl-all-natives-windows-amd64.jar'
   gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.add_development_dependency 'minitest', '~> 5.11'
-  gem.add_development_dependency 'rake', '~> 12.3'
-  gem.add_runtime_dependency 'arcball', '~> 1.0', '>= 1.0.0'
+  gem.add_development_dependency 'jruby-openssl', '~> 0.1.0', '>=0.1.3'
+  gem.add_development_dependency 'minitest', '~> 5.14'
+  gem.add_runtime_dependency 'rake', '~> 12.3'
+  gem.add_runtime_dependency 'arcball', '~> 1.0', '>= 1.0.2'
   gem.require_paths = ['lib']
   gem.platform      = 'java'
   gem.requirements << 'java runtime >= 11.0.2+'

data/src/main/java/japplemenubar/JAppleMenuBar.java

@@ -19,9 +19,8 @@
 */ 
 package japplemenubar;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
+
 import processing.core.PApplet;
 
 
@@ -59,6 +58,7 @@ public class JAppleMenuBar {
 	    }
 	  } catch (IOException e) {
 	    sadness("Unknown error, here's the stack trace.");
+	    e.printStackTrace();
 	  }
 	}
 	

data/src/main/java/processing/awt/PGraphicsJava2D.java

@@ -541,7 +541,7 @@ public class PGraphicsJava2D extends PGraphics {
 //        try {
 //          ImageIO.write(image, "jpg", new java.io.File("/Users/fry/Desktop/buff.jpg"));
 //        } catch (IOException e) {
-//    
+//          e.printStackTrace();
 //        }
 //      }
 //        }
@@ -994,10 +994,9 @@ public class PGraphicsJava2D extends PGraphics {
   // BLEND
 
   /**
+   * ( begin auto-generated from blendMode.xml )
    *
-   * This is a new reference entry for Processing 2.0.It will be updated shortly.
-   *
-   * 
+   * This is a new reference entry for Processing 2.0.It will be updated shortly. ( end auto-generated )
    *
    * @webref Rendering
    */
@@ -1565,15 +1564,6 @@ public class PGraphicsJava2D extends PGraphics {
 
   /**
    * Handle renderer-specific image drawing.
-   * @param who
-   * @param x1
-   * @param y1
-   * @param x2
-   * @param y2
-   * @param u1
-   * @param v1
-   * @param u2
-   * @param v2
    */
   @Override
   protected void imageImpl(PImage who,
@@ -3042,8 +3032,9 @@ public class PGraphicsJava2D extends PGraphics {
   // SAVE
 
 
-//  public void save(String filename) {
-//    loadPixels();
-//    super.save(filename);
-//  }
+  @Override
+  public boolean save(String filename) {
+    PImageAWT outImage = new PImageAWT(image);
+    return outImage.save(filename);
+  }
 }

data/src/main/java/processing/awt/PImageAWT.java

@@ -31,8 +31,21 @@ import java.awt.image.DataBuffer;
 import java.awt.image.DataBufferInt;
 import java.awt.image.PixelGrabber;
 import java.awt.image.WritableRaster;
+import java.io.BufferedOutputStream;
+import java.io.File;
 import java.io.IOException;
-
+import java.util.Iterator;
+
+import javax.imageio.IIOImage;
+import javax.imageio.ImageIO;
+import javax.imageio.ImageTypeSpecifier;
+import javax.imageio.ImageWriteParam;
+import javax.imageio.ImageWriter;
+import javax.imageio.metadata.IIOInvalidTreeException;
+import javax.imageio.metadata.IIOMetadata;
+import javax.imageio.metadata.IIOMetadataNode;
+
+import processing.core.PApplet;
 import processing.core.PImage;
 
 
@@ -202,10 +215,8 @@ public class PImageAWT extends PImage {
       prevH = h;
       outgoing = scratchImage;
     } while (w != targetWidth || h != targetHeight);
+    g2.dispose();
 
-    if (g2 != null) {
-      g2.dispose();
-    }
 
     // If we used a scratch buffer that is larger than our target size,
     // create an image of the right size and copy the results into it
@@ -251,10 +262,116 @@ public class PImageAWT extends PImage {
    * Use ImageIO functions from Java 1.4 and later to handle image save.
    * Various formats are supported, typically jpeg, png, bmp, and wbmp.
    * To get a list of the supported formats for writing, use: <BR>
-   * <code>println(javax.imageio.ImageIO.getReaderFormatNames())</code>
+   * <TT>println(javax.imageio.ImageIO.getReaderFormatNames())</TT>
+   *
+   * @path The path to which the file should be written.
    */
   protected boolean saveImageIO(String path) throws IOException {
-    return PImage.saveViaImageIO(this, path);
+    try {
+      int outputFormat = (format == ARGB) ?
+        BufferedImage.TYPE_INT_ARGB : BufferedImage.TYPE_INT_RGB;
+
+      String extension =
+        path.substring(path.lastIndexOf('.') + 1).toLowerCase();
+
+      // JPEG and BMP images that have an alpha channel set get pretty unhappy.
+      // BMP just doesn't write, and JPEG writes it as a CMYK image.
+      // http://code.google.com/p/processing/issues/detail?id=415
+      if (extension.equals("bmp") || extension.equals("jpg") || extension.equals("jpeg")) {
+        outputFormat = BufferedImage.TYPE_INT_RGB;
+      }
+
+      BufferedImage bimage = new BufferedImage(pixelWidth, pixelHeight, outputFormat);
+      bimage.setRGB(0, 0, pixelWidth, pixelHeight, pixels, 0, pixelWidth);
+
+      File file = new File(path);
+
+      ImageWriter writer = null;
+      ImageWriteParam param = null;
+      IIOMetadata metadata = null;
+
+      if (extension.equals("jpg") || extension.equals("jpeg")) {
+        if ((writer = imageioWriter("jpeg")) != null) {
+          // Set JPEG quality to 90% with baseline optimization. Setting this
+          // to 1 was a huge jump (about triple the size), so this seems good.
+          // Oddly, a smaller file size than Photoshop at 90%, but I suppose
+          // it's a completely different algorithm.
+          param = writer.getDefaultWriteParam();
+          param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
+          param.setCompressionQuality(0.9f);
+        }
+      }
+
+      if (extension.equals("png")) {
+        if ((writer = imageioWriter("png")) != null) {
+          param = writer.getDefaultWriteParam();
+          if (false) {
+            metadata = imageioDPI(writer, param, 100);
+          }
+        }
+      }
+
+      if (writer != null) {
+        try (BufferedOutputStream output = new BufferedOutputStream(PApplet.createOutput(file))) {
+          writer.setOutput(ImageIO.createImageOutputStream(output));
+//        writer.write(null, new IIOImage(bimage, null, null), param);
+          writer.write(metadata, new IIOImage(bimage, null, metadata), param);
+          writer.dispose();
+
+          output.flush();
+        }
+        return true;
+      }
+      // If iter.hasNext() somehow fails up top, it falls through to here
+      return javax.imageio.ImageIO.write(bimage, extension, file);
+
+    } catch (IOException e) {
+      throw new IOException("image save failed.");
+    }
+  }
+
+
+  private ImageWriter imageioWriter(String extension) {
+    Iterator<ImageWriter> iter = ImageIO.getImageWritersByFormatName(extension);
+    if (iter.hasNext()) {
+      return iter.next();
+    }
+    return null;
   }
 
+
+  private IIOMetadata imageioDPI(ImageWriter writer, ImageWriteParam param, double dpi) {
+    // http://stackoverflow.com/questions/321736/how-to-set-dpi-information-in-an-image
+    ImageTypeSpecifier typeSpecifier =
+      ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB);
+    IIOMetadata metadata =
+      writer.getDefaultImageMetadata(typeSpecifier, param);
+
+    if (!metadata.isReadOnly() && metadata.isStandardMetadataFormatSupported()) {
+      // for PNG, it's dots per millimeter
+      double dotsPerMilli = dpi / 25.4;
+
+      IIOMetadataNode horiz = new IIOMetadataNode("HorizontalPixelSize");
+      horiz.setAttribute("value", Double.toString(dotsPerMilli));
+
+      IIOMetadataNode vert = new IIOMetadataNode("VerticalPixelSize");
+      vert.setAttribute("value", Double.toString(dotsPerMilli));
+
+      IIOMetadataNode dim = new IIOMetadataNode("Dimension");
+      dim.appendChild(horiz);
+      dim.appendChild(vert);
+
+      IIOMetadataNode root = new IIOMetadataNode("javax_imageio_1.0");
+      root.appendChild(dim);
+
+      try {
+        metadata.mergeTree("javax_imageio_1.0", root);
+        return metadata;
+
+      } catch (IIOInvalidTreeException e) {
+        System.err.println("Could not set the DPI of the output image");
+      }
+    }
+    return null;
+  }
 }