picrate 1.3.0-java → 2.1.2-java

data/src/main/java/processing/core/PMatrix.java

@@ -39,13 +39,13 @@ public interface PMatrix {
   /**
    * Make this an identity matrix. Multiplying by it will have no effect.
    */
-  public void reset();
+  void reset();
   
   /**
    * Returns a copy of this PMatrix.
      * @return 
    */
-  public PMatrix get();  
+  PMatrix get();  
 
   /**
    * Copies the matrix contents into a float array.
@@ -53,21 +53,21 @@ public interface PMatrix {
      * @param target
      * @return 
    */
-  public float[] get(float[] target);
+  float[] get(float[] target);
   
   
   /**
    * Make this matrix become a copy of src.
      * @param src
    */
-  public void set(PMatrix src);
+  void set(PMatrix src);
 
   /**
    * Set the contents of this matrix to the contents of source. Fills the
    * matrix left-to-right, starting in the top row.
      * @param source
    */
-  public void set(float[] source);
+  void set(float[] source);
 
   /**
    * Set the matrix content to this 2D matrix or its 3D equivalent.
@@ -78,7 +78,7 @@ public interface PMatrix {
      * @param m12
      * @param m11
    */
-  public void set(float m00, float m01, float m02, 
+  void set(float m00, float m01, float m02, 
                   float m10, float m11, float m12);
 
   /**
@@ -100,7 +100,7 @@ public interface PMatrix {
      * @param m21
      * @param m32
    */
-  public void set(float m00, float m01, float m02, float m03,
+  void set(float m00, float m01, float m02, float m03,
                   float m10, float m11, float m12, float m13,
                   float m20, float m21, float m22, float m23,
                   float m30, float m31, float m32, float m33);
@@ -110,7 +110,7 @@ public interface PMatrix {
      * @param tx
      * @param ty
      */
-    public void translate(float tx, float ty);
+    void translate(float tx, float ty);
   
     /**
      *
@@ -118,31 +118,31 @@ public interface PMatrix {
      * @param ty
      * @param tz
      */
-    public void translate(float tx, float ty, float tz);
+    void translate(float tx, float ty, float tz);
 
     /**
      *
      * @param angle
      */
-    public void rotate(float angle);
+    void rotate(float angle);
 
     /**
      *
      * @param angle
      */
-    public void rotateX(float angle);
+    void rotateX(float angle);
 
     /**
      *
      * @param angle
      */
-    public void rotateY(float angle);
+    void rotateY(float angle);
 
     /**
      *
      * @param angle
      */
-    public void rotateZ(float angle);
+    void rotateZ(float angle);
 
     /**
      *
@@ -151,20 +151,20 @@ public interface PMatrix {
      * @param v1
      * @param v2
      */
-    public void rotate(float angle, float v0, float v1, float v2);
+    void rotate(float angle, float v0, float v1, float v2);
 
     /**
      *
      * @param s
      */
-    public void scale(float s);
+    void scale(float s);
 
     /**
      *
      * @param sx
      * @param sy
      */
-    public void scale(float sx, float sy);
+    void scale(float sx, float sy);
 
     /**
      *
@@ -172,37 +172,37 @@ public interface PMatrix {
      * @param y
      * @param z
      */
-    public void scale(float x, float y, float z);
+    void scale(float x, float y, float z);
   
     /**
      *
      * @param angle
      */
-    public void shearX(float angle);
+    void shearX(float angle);
   
     /**
      *
      * @param angle
      */
-    public void shearY(float angle);
+    void shearY(float angle);
 
   /**
    * Multiply this matrix by another.
      * @param source
    */
-  public void apply(PMatrix source);
+  void apply(PMatrix source);
 
   /**
    * Multiply this matrix by another.
      * @param source
    */
-  public void apply(PMatrix2D source);
+  void apply(PMatrix2D source);
 
   /**
    * Multiply this matrix by another.
      * @param source
    */
-  public void apply(PMatrix3D source);
+  void apply(PMatrix3D source);
 
   /**
    * Multiply this matrix by another.
@@ -213,7 +213,7 @@ public interface PMatrix {
      * @param n01
      * @param n12
    */
-  public void apply(float n00, float n01, float n02, 
+  void apply(float n00, float n01, float n02, 
                     float n10, float n11, float n12);
 
   /**
@@ -235,7 +235,7 @@ public interface PMatrix {
      * @param n30
      * @param n33
    */
-  public void apply(float n00, float n01, float n02, float n03,
+  void apply(float n00, float n01, float n02, float n03,
                     float n10, float n11, float n12, float n13,
                     float n20, float n21, float n22, float n23,
                     float n30, float n31, float n32, float n33);
@@ -244,19 +244,19 @@ public interface PMatrix {
    * Apply another matrix to the left of this one.
      * @param left
    */
-  public void preApply(PMatrix left);
+  void preApply(PMatrix left);
 
   /**
    * Apply another matrix to the left of this one.
      * @param left
    */
-  public void preApply(PMatrix2D left);
+  void preApply(PMatrix2D left);
 
   /**
    * Apply another matrix to the left of this one. 3D only.
      * @param left
    */
-  public void preApply(PMatrix3D left);
+  void preApply(PMatrix3D left);
 
   /**
    * Apply another matrix to the left of this one.
@@ -267,7 +267,7 @@ public interface PMatrix {
      * @param n01
      * @param n11
    */
-  public void preApply(float n00, float n01, float n02, 
+  void preApply(float n00, float n01, float n02, 
                        float n10, float n11, float n12);
 
   /**
@@ -289,7 +289,7 @@ public interface PMatrix {
      * @param n32
      * @param n31
    */
-  public void preApply(float n00, float n01, float n02, float n03,
+  void preApply(float n00, float n01, float n02, float n03,
                        float n10, float n11, float n12, float n13,
                        float n20, float n21, float n22, float n23,
                        float n30, float n31, float n32, float n33);
@@ -304,7 +304,7 @@ public interface PMatrix {
      * @param target
      * @return 
    */
-  public PVector mult(PVector source, PVector target);
+  PVector mult(PVector source, PVector target);
   
   
   /**
@@ -315,21 +315,21 @@ public interface PMatrix {
      * @param target
      * @return 
    */
-  public float[] mult(float[] source, float[] target);
+  float[] mult(float[] source, float[] target);
   
   
-//  public float multX(float x, float y);
-//  public float multY(float x, float y);
+//  float multX(float x, float y);
+//  float multY(float x, float y);
   
-//  public float multX(float x, float y, float z);
-//  public float multY(float x, float y, float z);
-//  public float multZ(float x, float y, float z);  
+//  float multX(float x, float y, float z);
+//  float multY(float x, float y, float z);
+//  float multZ(float x, float y, float z);  
   
   
   /**
    * Transpose this matrix; rows become columns and columns rows.
    */
-  public void transpose();
+  void transpose();
 
   
   /**
@@ -337,11 +337,11 @@ public interface PMatrix {
    * map more than one point to the same image point, and so are irreversible.
    * @return true if successful
    */
-  public boolean invert();
+  boolean invert();
   
   
   /**
    * @return the determinant of the matrix
    */
-  public float determinant();
+  float determinant();
 }

data/src/main/java/processing/core/PSurface.java

@@ -1,6 +1,6 @@
 /* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
 
- /*
+/*
   Part of the Processing project - http://processing.org
 
   Copyright (c) 2014-15 The Processing Foundation
@@ -18,131 +18,112 @@
   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;
 
-/**
- *
- * @author Martin Prout
- */
-public interface PSurface {
+import java.io.File;
 
+public interface PSurface {
   /**
-   * Minimum dimensions for the window holding an applet.
+   * Minimum dimensions for the window holding an applet. This varies between
+   * platforms, Mac OS X 10.3 (confirmed with 10.7 and Java 6) can do any
+   * height but requires at least 128 pixels width. Windows XP has another
+   * set of limitations. And for all I know, Linux probably allows window
+   * sizes to be negative numbers.
    */
   static public final int MIN_WINDOW_WIDTH = 128;
-
-  /**
-   *
-   */
   static public final int MIN_WINDOW_HEIGHT = 128;
 
+  //public int displayDensity();
+
+  //public int displayDensity(int display);
+
+  //
+
   // renderer that doesn't draw to the screen
-  /**
-   *
-   * @param sketch
-   */
   public void initOffscreen(PApplet sketch);
 
   // considering removal in favor of separate Component classes for appropriate renderers
   // (i.e. for Java2D or a generic Image surface, but not PDF, debatable for GL or FX)
   //public Component initComponent(PApplet sketch);
+
   //public Frame initFrame(PApplet sketch, Color backgroundColor,
 //  public void initFrame(PApplet sketch, int backgroundColor,
 //                        int deviceIndex, boolean fullScreen, boolean spanDisplays);
-  /**
-   *
-   * @param sketch
-   */
   public void initFrame(PApplet sketch);
 
+  //
+
+  public PImage loadImage(String path, Object... args);
+
+  //
+
+  public void selectInput(String prompt, String callback,
+                          File file, Object callbackObject);
+
+  public void selectOutput(String prompt, String callback,
+                           File file, Object callbackObject);
+
+  public void selectFolder(String prompt, String callback,
+                           File file, Object callbackObject);
+
+  //
+
   /**
-   * Get the native window object associated with this drawing surface. For
-   * Java2D, this will be an AWT Frame object. For OpenGL, the window. The data
-   * returned here is subject to the whims of the renderer, and using this
-   * method means you're willing to deal with underlying implementation changes
-   * and that you won't throw a fit like a toddler if your code breaks sometime
-   * in the future.
-   *
-   * @return
+   * Get the native window object associated with this drawing surface.For Java2D, this will be an AWT Frame object.
+   * For OpenGL, the window.
+ The data returned here is subject to the whims of the renderer,
+ and using this method means you're willing to deal with underlying
+ implementation changes and that you won't throw a fit like a toddler
+ if your code breaks sometime in the future.
+   * @return 
    */
   public Object getNative();
 
   //
+
   // Just call these on an AWT Frame object stored in PApplet.
   // Silly, but prevents a lot of rewrite and extra methods for little benefit.
   // However, maybe prevents us from having to document the 'frame' variable?
-  /**
-   * Set the window (and dock, or whatever necessary) title.
-   *
-   * @param title
-   */
+
+  /** Set the window (and dock, or whatever necessary) title.
+   * @param title */
   public void setTitle(String title);
 
-  /**
-   * Show or hide the window.
-   *
-   * @param visible
-   */
+  /** Show or hide the window.
+   * @param visible */
   public void setVisible(boolean visible);
 
-  /**
-   * Set true if we want to resize things (default is not resizable)
-   *
-   * @param resizable
-   */
+  /** Set true if we want to resize things (default is not resizable)
+   * @param resizable */
   public void setResizable(boolean resizable);
 
-  /**
-   * Dumb name, but inherited from Frame and no better ideas.
-   *
-   * @param always
-   */
+  /** Dumb name, but inherited from Frame and no better ideas.
+   * @param always */
   public void setAlwaysOnTop(boolean always);
 
-  /**
-   *
-   * @param icon
-   */
   public void setIcon(PImage icon);
 
   //
+
 //  public void placeWindow(int[] location);
-  /**
-   *
-   * @param location
-   * @param editorLocation
-   */
+
   public void placeWindow(int[] location, int[] editorLocation);
 
   //public void placeFullScreen(boolean hideStop);
-  /**
-   *
-   * @param stopColor
-   */
   public void placePresent(int stopColor);
 
   // Sketch is running from the PDE, set up messaging back to the PDE
-  /**
-   *
-   */
   public void setupExternalMessages();
 
   //
+
   // sets displayWidth/Height inside PApplet
   //public void checkDisplaySize();
-  /**
-   *
-   * @param x
-   * @param y
-   */
+
   public void setLocation(int x, int y);
 
-  /**
-   *
-   * @param width
-   * @param height
-   */
   public void setSize(int width, int height);
 
 //  /**
@@ -157,52 +138,45 @@ public interface PSurface {
   //public void initImage(PGraphics gr, int wide, int high);
   // create pixel buffer, called from allocate() to produce a compatible image for rendering efficiently
 //  public void initImage(PGraphics gr);
+
   //public Component getComponent();
+
 //  /**
 //   * Sometimes smoothing must be set at the drawing surface level
 //   * not just inside the renderer itself.
 //   */
 //  public void setSmooth(int level);
-  /**
-   *
-   * @param fps
-   */
+
   public void setFrameRate(float fps);
 
 //  // called on the first frame so that the now-visible drawing surface can
 //  // receive key and mouse events
 //  public void requestFocus();
+
 //  // finish rendering to the screen (called by PApplet)
 //  public void blit();
+
   //
-  /**
-   *
-   * @param kind
-   */
+
   public void setCursor(int kind);
 
-  /**
-   *
-   * @param image
-   * @param hotspotX
-   * @param hotspotY
-   */
   public void setCursor(PImage image, int hotspotX, int hotspotY);
 
-  /**
-   *
-   */
   public void showCursor();
 
-  /**
-   *
-   */
   public void hideCursor();
 
   //
+
   /**
-   * Start the animation thread
+   * @param url the link to open
+   * @return false if unable to find a viable way to open
    */
+  public boolean openLink(String url);
+
+  //
+
+  /** Start the animation thread */
   public void startThread();
 
   /**
@@ -212,21 +186,13 @@ public interface PSurface {
    */
   public void pauseThread();
 
-  /**
-   *
-   */
   public void resumeThread();
 
   /**
    * Stop the animation thread (set it null)
-   *
    * @return false if already stopped
    */
   public boolean stopThread();
 
-  /**
-   *
-   * @return
-   */
   public boolean isStopped();
 }