picrate 2.2.0-java → 2.3.0-java

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

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

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

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

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

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

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

@@ -9,19 +9,27 @@ import java.awt.Image;
 import java.awt.Toolkit;
 import java.awt.color.ColorSpace;
 import java.awt.image.BufferedImage;
+import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
 import java.net.URISyntaxException;
-
+import java.util.Iterator;
 import java.awt.DisplayMode;
 import java.awt.GraphicsConfiguration;
 import java.awt.GraphicsDevice;
 import java.awt.GraphicsEnvironment;
 import java.awt.geom.AffineTransform;
 
+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 javax.swing.ImageIcon;
 import javax.swing.JFileChooser;
 import javax.swing.UIManager;
@@ -34,14 +42,14 @@ import processing.core.PApplet;
 import processing.core.PConstants;
 import processing.core.PImage;
 
+
 /**
- * This class exists as an abstraction layer to remove AWT from PApplet. It is a
- * staging area for AWT-specific code that's shared by the Java2D, JavaFX, and
- * JOGL renderers. Once PSurfaceFX and PSurfaceJOGL have their own
- * implementations, these methods will move to PSurfaceAWT.
+ * This class exists as an abstraction layer to remove AWT from PApplet.
+ * It is a staging area for AWT-specific code that's shared by the Java2D,
+ * JavaFX, and JOGL renderers. Once PSurfaceFX and PSurfaceJOGL have
+ * their own implementations, these methods will move to PSurfaceAWT.
  */
 public class ShimAWT implements PConstants {
-
   /*
   PGraphics graphics;
   PApplet sketch;
@@ -51,17 +59,16 @@ public class ShimAWT implements PConstants {
     this.graphics = graphics;
     this.sketch = sketch;
   }
-   */
+  */
   static private ShimAWT instance;
 
   private GraphicsDevice[] displayDevices;
 
-  private final int displayWidth;
-  private final int displayHeight;
+  private int displayWidth;
+  private int displayHeight;
 
-  /**
-   * Only needed for display functions
-   */
+
+  /** Only needed for display functions */
   static private ShimAWT getInstance() {
     if (instance == null) {
       instance = new ShimAWT();
@@ -69,6 +76,7 @@ public class ShimAWT implements PConstants {
     return instance;
   }
 
+
   private ShimAWT() {
     // Need the list of display devices to be queried already for usage below.
     // https://github.com/processing/processing/issues/3295
@@ -87,24 +95,29 @@ public class ShimAWT implements PConstants {
 //    }
     // When this was called, display will always be unset (even in 3.x),
     // since this happens before settings() is called.
+
     // Set displayWidth and displayHeight for people still using those.
     DisplayMode displayMode = device.getDisplayMode();
     displayWidth = displayMode.getWidth();
     displayHeight = displayMode.getHeight();
   }
 
+
   static public int getDisplayWidth() {
     return getInstance().displayWidth;
   }
 
+
   static public int getDisplayHeight() {
     return getInstance().displayHeight;
   }
 
+
   static public int getDisplayCount() {
     return getInstance().displayDevices.length;
   }
 
+
   static public int getDisplayDensity(int num) {
     return getInstance().displayDensityImpl(num);
   }
@@ -124,20 +137,29 @@ public class ShimAWT implements PConstants {
     // If nobody's density is 2 then everyone is 1
     return 1;
   }
-   */
+  */
+
+
   private int displayDensityImpl(int display) {
     if (display > 0 && display <= displayDevices.length) {
-      GraphicsConfiguration graphicsConfig
-        = displayDevices[display - 1].getDefaultConfiguration();
+      GraphicsConfiguration graphicsConfig =
+        displayDevices[display - 1].getDefaultConfiguration();
       AffineTransform tx = graphicsConfig.getDefaultTransform();
       return (int) Math.round(tx.getScaleX());
     }
 
-    System.err.println("Display " + display + " does not exist, "
-      + "returning 1 for displayDensity(" + display + ")");
+    System.err.println("Display " + display + " does not exist, " +
+                       "returning 1 for displayDensity(" + display + ")");
     return 1;  // not the end of the world, so don't throw a RuntimeException
   }
 
+
+  // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
+
+
+  static protected String[] loadImageFormats;  // list of ImageIO formats
+
+
   static public PImage loadImage(PApplet sketch, String filename, Object... args) {
     String extension = null;
     if (args != null && args.length > 0) {
@@ -169,22 +191,21 @@ public class ShimAWT implements PConstants {
     if (extension.equals("tga")) {
       try {
         InputStream input = sketch.createInput(filename);
-        if (input == null) {
-          return null;
-        }
+        if (input == null) return null;
 
         PImage image = PImage.loadTGA(input);
         image.parent = sketch;
         return image;
 
       } catch (IOException e) {
+        e.printStackTrace();
         return null;
       }
     }
 
     if (extension.equals("tif") || extension.equals("tiff")) {
       InputStream input = sketch.createInput(filename);
-      PImage image = (input == null) ? null : PImage.loadTIFF(input);
+      PImage image =  (input == null) ? null : PImage.loadTIFF(input);
       return image;
     }
 
@@ -192,9 +213,9 @@ public class ShimAWT implements PConstants {
     // because the javax.imageio code was found to be much slower.
     // http://dev.processing.org/bugs/show_bug.cgi?id=392
     try {
-      if (extension.equals("jpg") || extension.equals("jpeg")
-        || extension.equals("gif") || extension.equals("png")
-        || extension.equals("unknown")) {
+      if (extension.equals("jpg") || extension.equals("jpeg") ||
+          extension.equals("gif") || extension.equals("png") ||
+          extension.equals("unknown")) {
         byte[] bytes = sketch.loadBytes(filename);
         if (bytes == null) {
           return null;
@@ -206,8 +227,8 @@ public class ShimAWT implements PConstants {
             BufferedImage buffImage = (BufferedImage) awtImage;
             int space = buffImage.getColorModel().getColorSpace().getType();
             if (space == ColorSpace.TYPE_CMYK) {
-              System.err.println(filename + " is a CMYK image, "
-                + "only RGB images are supported.");
+              System.err.println(filename + " is a CMYK image, " +
+                                 "only RGB images are supported.");
               return null;
               /*
               // wishful thinking, appears to not be supported
@@ -219,19 +240,19 @@ public class ShimAWT implements PConstants {
               ColorConvertOp op = new ColorConvertOp(null);
               op.filter(buffImage, destImage);
               image = new PImage(destImage);
-               */
+              */
             }
           }
 
           PImage image = new PImageAWT(awtImage);
           if (image.width == -1) {
-            System.err.println("The file " + filename
-              + " contains bad image data, or may not be an image.");
+            System.err.println("The file " + filename +
+                               " contains bad image data, or may not be an image.");
           }
 
           // if it's a .gif image, test to see if it has transparency
-          if (extension.equals("gif") || extension.equals("png")
-            || extension.equals("unknown")) {
+          if (extension.equals("gif") || extension.equals("png") ||
+              extension.equals("unknown")) {
             image.checkAlpha();
           }
 
@@ -241,15 +262,15 @@ public class ShimAWT implements PConstants {
       }
     } catch (Exception e) {
       // show error, but move on to the stuff below, see if it'll work
-
+      e.printStackTrace();
     }
 
     if (loadImageFormats == null) {
       loadImageFormats = ImageIO.getReaderFormatNames();
     }
     if (loadImageFormats != null) {
-      for (String loadImageFormat : loadImageFormats) {
-        if (extension.equals(loadImageFormat)) {
+      for (int i = 0; i < loadImageFormats.length; i++) {
+        if (extension.equals(loadImageFormats[i])) {
           return loadImageIO(sketch, filename);
         }
       }
@@ -260,7 +281,6 @@ public class ShimAWT implements PConstants {
     return null;
   }
 
-  static protected String[] loadImageFormats;
 
   /**
    * Use Java 1.4 ImageIO methods to load an image.
@@ -280,6 +300,7 @@ public class ShimAWT implements PConstants {
 
       //bi.getRGB(0, 0, outgoing.width, outgoing.height,
       //          outgoing.pixels, 0, outgoing.width);
+
       // check the alpha for this image
       // was gonna call getType() on the image to see if RGB or ARGB,
       // but it's not actually useful, since gif images will come through
@@ -293,11 +314,164 @@ public class ShimAWT implements PConstants {
       // return the image
       return outgoing;
 
-    } catch (IOException e) {
+    } catch (Exception e) {
+      e.printStackTrace();
       return null;
     }
   }
 
+
+  // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
+
+
+  static public boolean saveImage(PImage image, String path) {
+    if (saveImageFormats == null) {
+      saveImageFormats = javax.imageio.ImageIO.getWriterFormatNames();
+    }
+    try {
+      if (saveImageFormats != null) {
+        for (int i = 0; i < saveImageFormats.length; i++) {
+          if (path.endsWith("." + saveImageFormats[i])) {
+            if (!saveImageIO(image, path)) {
+              System.err.println("Error while saving image.");
+              return false;
+            }
+            return true;
+          }
+        }
+      }
+    } catch (IOException e) {
+      e.printStackTrace();
+    }
+    return false;
+  }
+
+
+  static protected String[] saveImageFormats;
+
+
+  /**
+   * 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>
+   * <TT>println(javax.imageio.ImageIO.getReaderFormatNames())</TT>
+   */
+  static protected boolean saveImageIO(PImage image, String path) throws IOException {
+    try {
+      int outputFormat = (image.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(image.pixelWidth, image.pixelHeight, outputFormat);
+      bimage.setRGB(0, 0, image.pixelWidth, image.pixelHeight, image.pixels, 0, image.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) {
+        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();
+        output.close();
+        return true;
+      }
+      // If iter.hasNext() somehow fails up top, it falls through to here
+      return javax.imageio.ImageIO.write(bimage, extension, file);
+
+    } catch (Exception e) {
+      e.printStackTrace();
+      throw new IOException("image save failed.");
+    }
+  }
+
+
+  static private ImageWriter imageioWriter(String extension) {
+    Iterator<ImageWriter> iter = ImageIO.getImageWritersByFormatName(extension);
+    if (iter.hasNext()) {
+      return iter.next();
+    }
+    return null;
+  }
+
+
+  static 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");
+        e.printStackTrace();
+      }
+    }
+    return null;
+  }
+
+
+  // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
+
+
   static public void initRun() {
     // Supposed to help with flicker, but no effect on OS X.
     // TODO IIRC this helped on Windows, but need to double check.
@@ -332,11 +506,13 @@ public class ShimAWT implements PConstants {
     // If nobody's density is 2 then everyone is 1
     return 1;
   }
-   */
-  /**
-   * @param display the display number to check (1-indexed to match the
-   * Preferences dialog box)
-   */
+  */
+
+
+ /**
+  * @param display the display number to check
+  * (1-indexed to match the Preferences dialog box)
+  */
   /*
   public int displayDensity(int display) {
     if (display > 0 && display <= displayDevices.length) {
@@ -349,12 +525,14 @@ public class ShimAWT implements PConstants {
     System.err.println("Display " + display + " does not exist, returning ");
     return 1;  // not the end of the world, so don't throw a RuntimeException
   }
-   */
+  */
+
+
   static public void selectInput(String prompt, String callbackMethod,
-    File file, Object callbackObject) {
+                                 File file, Object callbackObject) {
     EventQueue.invokeLater(() -> {
       selectImpl(prompt, callbackMethod, file,
-        callbackObject, null, FileDialog.LOAD);
+                 callbackObject, null, FileDialog.LOAD);
     });
   }
 
@@ -371,12 +549,14 @@ public class ShimAWT implements PConstants {
                                   PApplet sketch) {
     selectImpl(prompt, callbackMethod, file, callbackObject, parent, FileDialog.SAVE, sketch);
   }
-   */
+  */
+
+
   static public void selectOutput(String prompt, String callbackMethod,
-    File file, Object callbackObject) {
+                                  File file, Object callbackObject) {
     EventQueue.invokeLater(() -> {
       selectImpl(prompt, callbackMethod, file,
-        callbackObject, null, FileDialog.SAVE);
+                 callbackObject, null, FileDialog.SAVE);
     });
   }
 
@@ -405,13 +585,15 @@ public class ShimAWT implements PConstants {
       }
     });
   }
-   */
+  */
+
+
   static public void selectImpl(final String prompt,
-    final String callbackMethod,
-    final File defaultSelection,
-    final Object callbackObject,
-    final Frame parentFrame,
-    final int mode) {
+                                final String callbackMethod,
+                                final File defaultSelection,
+                                final Object callbackObject,
+                                final Frame parentFrame,
+                                final int mode) {
     File selectedFile = null;
 
     if (PApplet.useNativeSelect) {
@@ -448,13 +630,14 @@ public class ShimAWT implements PConstants {
     PApplet.selectCallback(selectedFile, callbackMethod, callbackObject);
   }
 
+
   static public void selectFolder(final String prompt,
-    final String callbackMethod,
-    final File defaultSelection,
-    final Object callbackObject) {
+                                  final String callbackMethod,
+                                  final File defaultSelection,
+                                  final Object callbackObject) {
     EventQueue.invokeLater(() -> {
       selectFolderImpl(prompt, callbackMethod, defaultSelection,
-        callbackObject, null);
+                       callbackObject, null);
     });
   }
 
@@ -482,49 +665,31 @@ public class ShimAWT implements PConstants {
                        callbackObject, parentFrame, sketch);
     });
   }
-   */
+  */
+
+
   static public void selectFolderImpl(final String prompt,
-    final String callbackMethod,
-    final File defaultSelection,
-    final Object callbackObject,
-    final Frame parentFrame) {
+                                      final String callbackMethod,
+                                      final File defaultSelection,
+                                      final Object callbackObject,
+                                      final Frame parentFrame) {
     File selectedFile = null;
 
-    checkLookAndFeel();
-    JFileChooser fileChooser = new JFileChooser();
-    fileChooser.setDialogTitle(prompt);
-    fileChooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
-    if (defaultSelection != null) {
-      fileChooser.setCurrentDirectory(defaultSelection);
-    }
-
-    int result = fileChooser.showOpenDialog(parentFrame);
-    if (result == JFileChooser.APPROVE_OPTION) {
-      selectedFile = fileChooser.getSelectedFile();
-    }
+      JFileChooser fileChooser = new JFileChooser();
+      fileChooser.setDialogTitle(prompt);
+      fileChooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
+      if (defaultSelection != null) {
+        fileChooser.setCurrentDirectory(defaultSelection);
+      }
 
+      int result = fileChooser.showOpenDialog(parentFrame);
+      if (result == JFileChooser.APPROVE_OPTION) {
+        selectedFile = fileChooser.getSelectedFile();
+      }
+    
     PApplet.selectCallback(selectedFile, callbackMethod, callbackObject);
   }
 
-  static private boolean lookAndFeelCheck;
-
-  /**
-   * Initialize the Look & Feel if it hasn't been already. Call this before
-   * using any Swing-related code in PApplet methods.
-   */
-  static private void checkLookAndFeel() {
-    if (!lookAndFeelCheck) {
-      if (PApplet.platform == PConstants.WINDOWS) {
-        // Windows is defaulting to Metal or something else awful.
-        // Which also is not scaled properly with HiDPI interfaces.
-        try {
-          UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-        } catch (ClassNotFoundException | IllegalAccessException | InstantiationException | UnsupportedLookAndFeelException e) {
-        }
-      }
-      lookAndFeelCheck = true;
-    }
-  }
 
   // TODO maybe call this with reflection from inside PApplet?
   // longer term, develop a more general method for other platforms
@@ -532,6 +697,7 @@ public class ShimAWT implements PConstants {
     return FileSystemView.getFileSystemView().getHomeDirectory();
   }
 
+
   static public boolean openLink(String url) {
     try {
       if (Desktop.isDesktopSupported()) {
@@ -542,4 +708,4 @@ public class ShimAWT implements PConstants {
     }
     return false;
   }
-}
+}