picrate 2.3.0-java → 2.4.0-java

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

@@ -39,7 +39,6 @@ import java.util.zip.*;
 
 // loadXML() error handling
 import javax.xml.parsers.ParserConfigurationException;
-import monkstone.noise.NoiseGenerator;
 import org.xml.sax.SAXException;
 
 // TODO have this removed by 4.0 final
@@ -48,8 +47,6 @@ import processing.awt.ShimAWT;
 import processing.data.*;
 import processing.event.*;
 import processing.opengl.*;
-import monkstone.noise.Noise;
-import monkstone.noise.NoiseMode;
 
 /**
  * Base class for all sketches that use processing.core.
@@ -106,7 +103,6 @@ public class PApplet implements PConstants {
         }
     }
 
-    Noise noiseGenerator = new NoiseGenerator();
     /**
      * Whether to use native (AWT) dialogs for selectInput and selectOutput. The
      * native dialogs on some platforms can be ugly, buggy, or missing features.
@@ -4887,9 +4883,6 @@ public class PApplet implements PConstants {
         internalRandom.setSeed(seed);
     }
 
-    public void noiseMode(NoiseMode mode) {
-        noiseGenerator.noiseMode(mode);
-    }
     /**
      * 
      * @param lod
@@ -4913,91 +4906,7 @@ public class PApplet implements PConstants {
 
     }
 
-    /**
-     * @param x
-     * @return
-     */
-    public float noise(float x) {
-        return noiseGenerator.noise(x);
-    }
-
-    /**
-     * @param x
-     * @param y
-     * @return
-     */
-    public float noise(float x, float y) {
-        return noiseGenerator.noise(x, y);
-    }
-
-    /**
-     * ( begin auto-generated from noise.xml )
-     *
-     * Returns the Perlin noise value at specified coordinates.Perlin noise is a
-     * random sequence generator producing a more natural ordered, harmonic
-     * succession of numbers compared to the standard <b>random()</b> function.
-     * It was invented by Ken Perlin in the 1980s and been used since in
-     * graphical applications to produce procedural textures, natural motion,
-     * shapes, terrains etc. The main difference to the
-     * <b>random()</b> function is that Perlin noise is defined in an infinite
-     * n-dimensional space where each pair of coordinates corresponds to a fixed
-     * semi-random value (fixed only for the lifespan of the program). The
-     * resulting value will always be between 0.0 and 1.0. Processing can
-     * compute 1D, 2D and 3D noise, depending on the number of coordinates
-     * given. The noise value can be animated by moving through the noise space
-     * as demonstrated in the example above. The 2nd and 3rd dimension can also
-     * be interpreted as time.The actual noise is structured similar to an audio
-     * signal, in respect to the function's use of frequencies. Similar to the
-     * concept of harmonics in physics, perlin noise is computed over several
-     * octaves which are added together for the final result. Another way to
-     * adjust the character of the resulting sequence is the scale of the input
-     * coordinates. As the function works within an infinite space the value of
-     * the coordinates doesn't matter as such, only the distance between
-     * successive coordinates does (eg. when using <b>noise()</b> within a
-     * loop). As a general rule the smaller the difference between coordinates,
-     * the smoother the resulting noise sequence will be. Steps of 0.005-0.03
-     * work best for most applications, but this will differ depending on use.
-     *
-     *
-     *
-     * @return
-     * @webref math:random
-     * @param x x-coordinate in noise space
-     * @param y y-coordinate in noise space
-     * @param z z-coordinate in noise space
-     * @see PApplet#noiseSeed(long)
-     * @see PApplet#noiseDetail(int, float)
-     * @see PApplet#random(float,float)
-     */
-    public float noise(float x, float y, float z) {
-        return noiseGenerator.noise(x, y, z);
-    }
-
-    public float noise(float x, float y, float z, float w) {
-        return noiseGenerator.noise(x, y, z, w);
-    }
-
-    /**
-     *
-     *
-     * Sets the seed value for <b>noise()</b>. By default, <b>noise()</b>
-     * produces different results each time the program is run. Set the
-     * <b>value</b> parameter to a constant to return the same pseudo-random
-     * numbers each time the software is run.
-     *
-     *
-     * @webref math:random
-     * @param seed seed value
-     * @see PApplet#noise(float, float, float)
-     * @see PApplet#noiseDetail(int, float)
-     * @see PApplet#random(float,float)
-     * @see PApplet#randomSeed(long)
-     */
-    public void noiseSeed(long seed) {
-        noiseGenerator.noiseSeed(seed);
-    }
-
-    // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
+   // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
     /**
      * ( begin auto-generated from loadImage.xml )
      *

data/src/main/java/processing/pdf/PGraphicsPDF.java

@@ -21,37 +21,39 @@
 package processing.pdf;
 
 import com.itextpdf.awt.DefaultFontMapper;
-import com.itextpdf.text.Rectangle;
+import com.itextpdf.awt.PdfGraphics2D;
 import com.itextpdf.text.Document;
 import com.itextpdf.text.DocumentException;
+import com.itextpdf.text.Rectangle;
 import com.itextpdf.text.pdf.ByteBuffer;
 import com.itextpdf.text.pdf.PdfContentByte;
 import com.itextpdf.text.pdf.PdfWriter;
 import java.awt.Font;
 import java.awt.Graphics2D;
 import java.awt.Image;
-import java.io.*;
-import java.util.*;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.OutputStream;
+import java.util.Arrays;
+import java.util.HashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-
-//import com.lowagie.text.*;
-//import com.lowagie.text.pdf.*;
-//import com.lowagie.text.pdf.ByteBuffer;
-
 import processing.awt.PGraphicsJava2D;
-import processing.core.*;
+import processing.core.PApplet;
+import processing.core.PConstants;
+import processing.core.PFont;
+import processing.core.PImage;
+import processing.core.PStyle;
+import processing.core.PSurface;
+import processing.core.PSurfaceNone;
 
 /**
  * Thin wrapper for the iText PDF library that handles writing PDF files. The
  * majority of the work in this library is done by
- * <a href="http://www.lowagie.com/iText/">iText</a>.
- * This is currently using iText 2.1.7.
- * The issue is that versions from the 5.x series were slow to handle lots of
- * fonts with the DefaultFontMapper. 2.x seemed a little slower than 1.x, but
- * 5.x took up to 10 times the time to load, meaning a lag of several seconds
- * when starting sketches on a machine that had a good handful of fonts
- * installed. (Like, say, anyone in our target audience. Or me.)
+ * <a href="https://github.com/itext/itextpdf">itextpdf</a>. This is currently using
+ * itextpdf-5.5.13.2.
  */
 public class PGraphicsPDF extends PGraphicsJava2D {
 
@@ -67,20 +69,13 @@ public class PGraphicsPDF extends PGraphicsJava2D {
     protected Document document;
     protected PdfWriter writer;
     protected PdfContentByte content;
-
+    protected PdfGraphics2D graphicContent;
     /**
      * Shared across instances because it's incredibly time-consuming to create.
      */
     static protected DefaultFontMapper mapper;
     static protected String[] fontList;
 
-
-    /*
-  public PGraphicsPDF() {
-    // PDF always likes native fonts. Always.
-    hint(ENABLE_NATIVE_FONTS);
-  }
-     */
     @Override
     public void setPath(String path) {
         this.path = path;
@@ -104,15 +99,6 @@ public class PGraphicsPDF extends PGraphicsJava2D {
         this.output = output;
     }
 
-//  /**
-//   * all the init stuff happens in here, in case someone calls size()
-//   * along the way and wants to hork things up.
-//   */
-//  protected void allocate() {
-//    // can't do anything here, because this will be called by the
-//    // superclass PGraphics, and the file/path object won't be set yet
-//    // (since super() called right at the beginning of the constructor)
-//  }
     @Override
     public PSurface createSurface() {
         return surface = new PSurfaceNone(this);
@@ -126,19 +112,17 @@ public class PGraphicsPDF extends PGraphicsJava2D {
 
     @Override
     public void beginDraw() {
-//    long t0 = System.currentTimeMillis();
-
         if (document == null) {
-            // https://github.com/processing/processing/issues/5801#issuecomment-466632459
             ByteBuffer.HIGH_PRECISION = true;
-
             document = new Document(new Rectangle(width, height));
             boolean missingPath = false;
             try {
                 if (file != null) {
-                    //BufferedOutputStream output = new BufferedOutputStream(stream, 16384);
-                    output = new BufferedOutputStream(new FileOutputStream(file), 16384);
-
+                    try {
+                        output = new BufferedOutputStream(new FileOutputStream(file), 16384);
+                    } catch (FileNotFoundException ex) {
+                        Logger.getLogger(PGraphicsPDF.class.getName()).log(Level.SEVERE, null, ex);
+                    }
                 } else if (output == null) {
                     missingPath = true;
                     throw new RuntimeException("PGraphicsPDF requires a path "
@@ -159,13 +143,8 @@ public class PGraphicsPDF extends PGraphicsJava2D {
                 } else {
                     throw new RuntimeException("Problem saving the PDF file.", re);
                 }
-
-            } catch (FileNotFoundException fnfe) {
-                throw new RuntimeException("Can't save the PDF file to " + path, fnfe);
-
             }
-
-            g2 = content.createGraphicsShapes(width, height);
+            g2 = new PdfGraphics2D(content, width, height);
         }
 
         // super in Java2D now creates an image buffer, don't do that
@@ -173,24 +152,16 @@ public class PGraphicsPDF extends PGraphicsJava2D {
         checkSettings();
         resetMatrix(); // reset model matrix
         vertexCount = 0;
-
-        // Also need to push the matrix since the matrix doesn't reset on each run
-        // http://dev.processing.org/bugs/show_bug.cgi?id=1227
         pushMatrix();
     }
 
     static protected DefaultFontMapper getMapper() {
         if (mapper == null) {
-//      long t = System.currentTimeMillis();
             mapper = new DefaultFontMapper();
-
-            if (PApplet.platform == PConstants.LINUX) {
-                checkDir("/usr/share/fonts/", mapper);
-                checkDir("/usr/local/share/fonts/", mapper);
-                checkDir(System.getProperty("user.home") + "/.fonts", mapper);
+                    checkDir("/usr/share/fonts/", mapper);
+                    checkDir("/usr/local/share/fonts/", mapper);
+                    checkDir(System.getProperty("user.home") + "/.fonts", mapper);
             }
-//      System.out.println("mapping " + (System.currentTimeMillis() - t));
-        }
         return mapper;
     }
 
@@ -204,8 +175,10 @@ public class PGraphicsPDF extends PGraphicsJava2D {
 
     /**
      * Recursive walk to get all subdirectories for font fun.Patch submitted by
- Matthias Breuer.(<a href="http://dev.processing.org/bugs/show_bug.cgi?id=1566">Bug
- 1566</a>)
+     * Matthias
+     * Breuer.(<a href="http://dev.processing.org/bugs/show_bug.cgi?id=1566">Bug
+     * 1566</a>)
+     *
      * @param folder
      * @param mapper
      */
@@ -249,9 +222,9 @@ public class PGraphicsPDF extends PGraphicsJava2D {
 
     protected Graphics2D createGraphics() {
         if (textMode == SHAPE) {
-          return content.createGraphics(width, height);
+          return new PdfGraphics2D(content, width, height);
         } else if (textMode == MODEL) {
-            return content.createGraphics(width, height, getMapper());
+            return new PdfGraphics2D(content, width, height, getMapper());
         }
         // Should not be reachable...
         throw new RuntimeException("Invalid textMode() selected for PDF.");
@@ -276,45 +249,6 @@ public class PGraphicsPDF extends PGraphicsJava2D {
         return false;
     }
 
-    /*
-  protected void finalize() throws Throwable {
-    System.out.println("calling finalize");
-  //document.close();  // do this in dispose instead?
-  }
-     */
-    //////////////////////////////////////////////////////////////
-    /*
-  public void endRecord() {
-    super.endRecord();
-    dispose();
-  }
-
-
-  public void endRaw() {
-    System.out.println("ending raw");
-    super.endRaw();
-    System.out.println("disposing");
-    dispose();
-    System.out.println("done");
-  }
-     */
-    //////////////////////////////////////////////////////////////
-    /*
-  protected void rectImpl(float x1, float y1, float x2, float y2) {
-    //rect.setFrame(x1, y1, x2-x1, y2-y1);
-    //draw_shape(rect);
-    System.out.println("rect implements");
-    g2.fillRect((int)x1, (int)y1, (int) (x2-x1), (int) (y2-y1));
-  }
-  *
-
-  /*
-  public void clear() {
-    g2.setColor(Color.red);
-    g2.fillRect(0, 0, width, height);
-  }
-     */
-    //////////////////////////////////////////////////////////////
     @Override
     protected void imageImpl(PImage image,
             float x1, float y1, float x2, float y2,
@@ -339,49 +273,36 @@ public class PGraphicsPDF extends PGraphicsJava2D {
     public void textFont(PFont which) {
         super.textFont(which);
         checkFont();
-        // Make sure a native version of the font is available.
-//    if (textFont.getFont() == null) {
-//      throw new RuntimeException("Use createFont() instead of loadFont() " +
-//                                 "when drawing text using the PDF library.");
-//    }
-        // Make sure that this is a font that the PDF library can deal with.
-//    if ((textMode != SHAPE) && !checkFont(which.getName())) {
-//      System.err.println("Use PGraphicsPDF.listFonts() to get a list of available fonts.");
-//      throw new RuntimeException("The font “" + which.getName() + "” cannot be used with PDF Export.");
-//    }
     }
 
     /**
-     * Change the textMode() to either SHAPE or MODEL.
-     * This resets all renderer settings, and therefore must be called
+     * Change the textMode() to either SHAPE or MODEL. This resets all renderer
+     * settings, and therefore must be called
      * <EM>before</EM> any other commands that set the fill() or the textFont()
      * or anything. Unlike other renderers, use textMode() directly after the
      * size() command.
      */
-    @Override
-    public void textMode(int mode) {
-        if (textMode != mode) {
-            switch (mode) {
-                case SHAPE:
-                    textMode = SHAPE;
-                    g2.dispose();
-                    //        g2 = content.createGraphicsShapes(width, height);
-                    g2 = createGraphics();
-                    break;
-                case MODEL:
-                    textMode = MODEL;
-                    g2.dispose();
-                    //        g2 = content.createGraphics(width, height, mapper);
-                    g2 = createGraphics();
-//        g2 = template.createGraphics(width, height, mapper);
-                    break;
-                case SCREEN:
-                    throw new RuntimeException("textMode(SCREEN) not supported with PDF");
-                default:
-                    throw new RuntimeException("That textMode() does not exist");
-            }
-        }
-    }
+     @Override
+     public void textMode(int mode) {
+         if (textMode != mode) {
+             switch (mode) {
+                 case SHAPE:
+                     textMode = SHAPE;
+                     g2.dispose();
+                     g2 = createGraphics();
+                     break;
+                 case MODEL:
+                     textMode = MODEL;
+                     g2.dispose();
+                     g2 = createGraphics();
+                     break;
+                 case SCREEN:
+                     throw new RuntimeException("textMode(SCREEN) not supported with PDF");
+                 default:
+                     throw new RuntimeException("That textMode() does not exist");
+             }
+         }
+     }
 
     @Override
     protected void textLineImpl(char buffer[], int start, int stop,
@@ -436,7 +357,6 @@ public class PGraphicsPDF extends PGraphicsJava2D {
     }
 
     //
-
     /**
      *
      * @param alpha
@@ -534,6 +454,7 @@ public class PGraphicsPDF extends PGraphicsJava2D {
      * On Linux or any other platform, you'll need to add the directories by
      * hand. (If there are actual standards here that we can use as a starting
      * point, please file a bug to make a note of it)
+     *
      * @param directory
      */
     public void addFonts(String directory) {
@@ -573,7 +494,8 @@ public class PGraphicsPDF extends PGraphicsJava2D {
 
     /**
      * List the fonts known to the PDF renderer.This is like PFont.list(),
- however not all those fonts are available by default.
+     * however not all those fonts are available by default.
+     *
      * @return
      */
     static public String[] listFonts() {
@@ -595,7 +517,7 @@ public class PGraphicsPDF extends PGraphicsJava2D {
 //        //System.out.println(entry.getKey() + "-->" + entry.getValue());
 //        fontList[count++] = (String) entry.getKey();
 //      }
-            fontList = PApplet.sort(fontList);
+            Arrays.sort(fontList);
         }
         return fontList;
     }