Removing some examples files and references to Processing.js

REAS · REAS · commit 73749d35e469 · 2015-06-21T22:42:34.000+02:00
diff --git a/content/api_en/displayDensity.xml b/content/api_en/displayDensity.xml
@@ -27,7 +27,7 @@ void draw() {
 </example>
 
 <description><![CDATA[
-This function is new with Processing 3.0. It returns the number "2" if the screen is a high-density screen (called a Retina display on OS X or high-dpi on Windows and Linux)and a "1" if not. This information is useful for a program to adapt to run at double the pixel density on a screen that supports it.
+This function returns the number "2" if the screen is a high-density screen (called a Retina display on OS X or high-dpi on Windows and Linux) and a "1" if not. This information is useful for a program to adapt to run at double the pixel density on a screen that supports it.
 ]]></description>
 
 </root>
diff --git a/content/api_en/pixelHeight.xml b/content/api_en/pixelHeight.xml
@@ -20,3 +20,4 @@ When <b>pixelDensity(2)</b> is used to make use of a high resolution display (ca
 ]]></description>
 
 </root>
+
diff --git a/content/examples/Basics/Data/CharactersStrings/CharactersStrings.pde b/content/examples/Basics/Data/CharactersStrings/CharactersStrings.pde
@@ -16,9 +16,6 @@
  * featured below. 
  */
 
-// The next line is needed if running in JavaScript Mode with Processing.js
-/* @pjs font="Georgia.ttf"; */
-
 char letter;
 String words = "Begin...";
 
diff --git a/content/examples/Basics/Data/CharactersStrings/data/Georgia.ttf b/content/examples/Basics/Data/CharactersStrings/data/Georgia.ttf
diff --git a/content/examples/Basics/Data/DatatypeConversion/DatatypeConversion.pde b/content/examples/Basics/Data/DatatypeConversion/DatatypeConversion.pde
@@ -7,9 +7,6 @@
  * The conversion functions include int(), float(), char(), byte(), and others. 
  */
 
-// The next line is needed if running in JavaScript Mode with Processing.js
-/* @pjs font="Georgia.ttf"; */
-
 size(640, 360);
 background(0);
 noStroke();
diff --git a/content/examples/Basics/Data/DatatypeConversion/data/Georgia.ttf b/content/examples/Basics/Data/DatatypeConversion/data/Georgia.ttf
diff --git a/content/examples/Basics/Image/Alphamask/Alphamask.pde b/content/examples/Basics/Image/Alphamask/Alphamask.pde
@@ -6,9 +6,6 @@
  * together using the mask() method of PImage. 
  */
 
-// The next line is needed if running in JavaScript Mode with Processing.js
-/* @pjs preload="moonwalk.jpg,mask.jpg"; */ 
-
 PImage img;
 PImage imgMask;
 
diff --git a/content/examples/Basics/Image/BackgroundImage/BackgroundImage.pde b/content/examples/Basics/Image/BackgroundImage/BackgroundImage.pde
@@ -5,9 +5,6 @@
  * into Processing. To load an image as the background, it must be
  * the same width and height as the program.
  */
- 
-// The next line is needed if running in JavaScript Mode with Processing.js
-/* @pjs preload="moonwalk.jpg"; */ 
 
 PImage bg;
 int y;
diff --git a/content/examples/Basics/Image/LoadDisplayImage/LoadDisplayImage.pde b/content/examples/Basics/Image/LoadDisplayImage/LoadDisplayImage.pde
@@ -4,9 +4,6 @@
  * Images can be loaded and displayed to the screen at their actual size
  * or any other size. 
  */
- 
-// The next line is needed if running in JavaScript Mode with Processing.js
-/* @pjs preload="moonwalk.jpg"; */ 
 
 PImage img;  // Declare variable "a" of type PImage
 
diff --git a/content/examples/Basics/Image/Pointillism/Pointillism.pde b/content/examples/Basics/Image/Pointillism/Pointillism.pde
@@ -6,9 +6,6 @@
  * Creates a simple pointillist effect using ellipses colored
  * according to pixels in an image. 
  */
- 
-// The next line is needed if running in JavaScript Mode with Processing.js
-/* @pjs preload="moonwalk.jpg"; */ 
 
 PImage img;
 int smallPoint, largePoint;
diff --git a/content/examples/Basics/Image/Transparency/Transparency.pde b/content/examples/Basics/Image/Transparency/Transparency.pde
@@ -6,9 +6,6 @@
  * by modifying the alpha value of the image with the tint() function. 
  */
 
-// The next line is needed if running in JavaScript Mode with Processing.js
-/* @pjs preload="moonwalk.jpg"; */ 
-
 PImage img;
 float offset = 0;
 float easing = 0.05;
diff --git a/content/examples/Basics/Shape/DisableStyle/DisableStyle.pde b/content/examples/Basics/Shape/DisableStyle/DisableStyle.pde
@@ -8,9 +8,6 @@
  * method turns it back on.
  */
 
-// The next line is needed if running in JavaScript Mode with Processing.js
-/* @pjs preload="bot1.svg"; */ 
-
 PShape bot;
 
 void setup() {
diff --git a/content/examples/Basics/Shape/GetChild/GetChild.pde b/content/examples/Basics/Shape/GetChild/GetChild.pde
@@ -8,9 +8,6 @@
  * two new PShape objects by extracting the data from two states.
  */
 
-// The next line is needed if running in JavaScript Mode with Processing.js
-/* @pjs preload="usa-wikipedia.svg"; */ 
-
 PShape usa;
 PShape michigan;
 PShape ohio;
diff --git a/content/examples/Basics/Shape/LoadDisplaySVG/LoadDisplaySVG.pde b/content/examples/Basics/Shape/LoadDisplaySVG/LoadDisplaySVG.pde
@@ -7,9 +7,6 @@
  * SVG file of a monster robot face and displays it to the screen. 
  */
 
-// The next line is needed if running in JavaScript Mode with Processing.js
-/* @pjs preload="bot1.svg"; */ 
-
 PShape bot;
 
 void setup() {
diff --git a/content/examples/Basics/Shape/ScaleShape/ScaleShape.pde b/content/examples/Basics/Shape/ScaleShape/ScaleShape.pde
@@ -7,9 +7,6 @@
  * remain smooth at any size.
  */
 
-// The next line is needed if running in JavaScript Mode with Processing.js
-/* @pjs preload="bot1.svg"; */ 
-
 PShape bot;
 
 void setup() {
diff --git a/content/examples/Basics/Typography/Letters/data/Georgia.ttf b/content/examples/Basics/Typography/Letters/data/Georgia.ttf
diff --git a/content/examples/Basics/Typography/Words/data/Georgia.ttf b/content/examples/Basics/Typography/Words/data/Georgia.ttf
diff --git a/content/examples/Topics/Advanced Data/CountingStrings/CountingStrings.pde b/content/examples/Topics/Advanced Data/CountingStrings/CountingStrings.pde
@@ -13,9 +13,6 @@
  *
  */
 
-// The next line is needed if running in JavaScript Mode with Processing.js
-/* @pjs font="Georgia.ttf"; */
-
 // An IntDict pairs Strings with integers
 IntDict concordance;
 
diff --git a/content/examples/Topics/Advanced Data/CountingStrings/data/Georgia.ttf b/content/examples/Topics/Advanced Data/CountingStrings/data/Georgia.ttf
diff --git a/content/examples/Topics/Advanced Data/HashMapClass/HashMapClass.pde b/content/examples/Topics/Advanced Data/HashMapClass/HashMapClass.pde
@@ -18,9 +18,6 @@
  * while words the other (Frankenstein) are colored black.
  */
 
-// The next line is needed if running in JavaScript Mode with Processing.js
-/* @pjs font="Georgia.ttf"; */
-
 HashMap<String, Word> words;  // HashMap object
 
 void setup() {
diff --git a/content/examples/Topics/Advanced Data/HashMapClass/data/Georgia.ttf b/content/examples/Topics/Advanced Data/HashMapClass/data/Georgia.ttf
diff --git a/content/examples/Topics/Animation/Sequential/Sequential.pde b/content/examples/Topics/Animation/Sequential/Sequential.pde
@@ -6,12 +6,6 @@
  * Twelve images are loaded and each is displayed individually in a loop. 
  */
 
-// @pjs preload must be used to preload media if the program is 
-// running with Processing.js
-/* @pjs preload="PT_anim0000.gif, PT_anim0001.gif, PT_anim0002.gif, PT_anim0003.gif,
-PT_anim0004.gif, PT_anim0005.gif, PT_anim0006.gif, PT_anim0007.gif, PT_anim0008.gif,
-PT_anim0009.gif, PT_anim0010.gif, PT_anim0011.gif"; */ 
-
 int numFrames = 12;  // The number of frames in the animation
 int currentFrame = 0;
 PImage[] images = new PImage[numFrames];
diff --git a/content/examples/Topics/GUI/Scrollbar/Scrollbar.pde b/content/examples/Topics/GUI/Scrollbar/Scrollbar.pde
@@ -4,11 +4,6 @@
  * Move the scrollbars left and right to change the positions of the images. 
  */
 
-
-// The next line is needed if running in JavaScript Mode with Processing.js
-/* @pjs preload="seedTop.jpg,seedBottom.jpg"; */ 
-
-
 HScrollbar hs1, hs2;  // Two scrollbars
 PImage img1, img2;  // Two images to load
 
diff --git a/content/examples/Topics/Image Processing/Blur/Blur.pde b/content/examples/Topics/Image Processing/Blur/Blur.pde
@@ -6,9 +6,6 @@
  * to blur the image. 
  */
 
-// The next line is needed if running in JavaScript Mode with Processing.js
-/* @pjs preload="moon.jpg"; */ 
-
 float v = 1.0 / 9.0;
 float[][] kernel = {{ v, v, v }, 
                     { v, v, v }, 
diff --git a/content/examples/Topics/Image Processing/Brightness/Brightness.pde b/content/examples/Topics/Image Processing/Brightness/Brightness.pde
@@ -6,9 +6,6 @@
  * calculating the distance of each pixel to the mouse.
  */
 
-// The next line is needed if running in JavaScript Mode with Processing.js
-/* @pjs preload="moon-wide.jpg"; */ 
-
 PImage img;
 
 void setup() {
diff --git a/content/examples/Topics/Image Processing/Convolution/Convolution.pde b/content/examples/Topics/Image Processing/Convolution/Convolution.pde
@@ -7,10 +7,6 @@
  * not accurate in JavaScript mode.
  */
 
-
-// The next line is needed if running in JavaScript Mode with Processing.js
-/* @pjs preload="moon-wide.jpg"; */ 
-
 PImage img;
 int w = 120;
 
diff --git a/content/examples/Topics/Image Processing/EdgeDetection/EdgeDetection.pde b/content/examples/Topics/Image Processing/EdgeDetection/EdgeDetection.pde
@@ -6,9 +6,6 @@
  * the image. This example is currently not accurate in JavaScript mode.
  */
 
-// The next line is needed if running in JavaScript Mode with Processing.js
-/* @pjs preload="moon.jpg"; */
-
 float[][] kernel = {{ -1, -1, -1}, 
                     { -1,  9, -1}, 
                     { -1, -1, -1}};
diff --git a/content/examples/Topics/Image Processing/Explode/Explode.pde b/content/examples/Topics/Image Processing/Explode/Explode.pde
@@ -7,9 +7,6 @@
  * translation along z axis. 
  */
 
-// The next line is needed if running in JavaScript Mode with Processing.js
-/* @pjs preload="eames.jpg"; */ 
-
 PImage img;       // The source image
 int cellsize = 2; // Dimensions of each cell in the grid
 int columns, rows;   // Number of columns and rows in our system
diff --git a/content/examples/Topics/Image Processing/Histogram/Histogram.pde b/content/examples/Topics/Image Processing/Histogram/Histogram.pde
@@ -10,9 +10,6 @@
  * since most images will no longer be full 24-bit color.
  */
 
-// The next line is needed if running in JavaScript Mode with Processing.js
-/* @pjs preload="frontier.jpg"; */ 
-
 size(640, 360);
 
 // Load an image from the data directory
diff --git a/content/examples/Topics/Image Processing/LinearImage/LinearImage.pde b/content/examples/Topics/Image Processing/LinearImage/LinearImage.pde
@@ -5,9 +5,6 @@
  * Press and hold any key to watch the scanning. 
  */
 
-// The next line is needed if running in JavaScript Mode with Processing.js
-/* @pjs preload="sea.jpg"; */
-
 PImage img;
 int direction = 1;
 
diff --git a/content/examples/Topics/Image Processing/PixelArray/PixelArray.pde b/content/examples/Topics/Image Processing/PixelArray/PixelArray.pde
@@ -7,9 +7,6 @@
  * and displays this color to fill the window.  
  */
 
-// The next line is needed if running in JavaScript Mode with Processing.js
-/* @pjs preload="sea.jpg"; */ 
-
 PImage img;
 int direction = 1;
 float signal;
diff --git a/content/examples/Topics/Image Processing/Zoom/Zoom.pde b/content/examples/Topics/Image Processing/Zoom/Zoom.pde
@@ -6,9 +6,6 @@
  * heights corresponding to a color value read from an image. 
  */
 
-// The next line is needed if running in JavaScript Mode with Processing.js
-/* @pjs preload="ystone08.jpg"; */ 
-
 PImage img;
 int[][] imgPixels;
 float sval = 1.0;
diff --git a/content/examples/Topics/Interaction/Tickle/Tickle.pde b/content/examples/Topics/Interaction/Tickle/Tickle.pde
@@ -5,9 +5,6 @@
  * Sometimes, it can be tickled off the screen.
  */
 
-// The next line is needed if running in JavaScript Mode with Processing.js
-/* @pjs font="Georgia.ttf"; */
-
 String message = "tickle";
 float x, y; // X and Y coordinates of text
 float hr, vr;  // horizontal and vertical radius of the text
diff --git a/content/examples/Topics/Interaction/Tickle/data/Georgia.ttf b/content/examples/Topics/Interaction/Tickle/data/Georgia.ttf
diff --git a/content/examples/Topics/Simulate/SmokeParticleSystem/SmokeParticleSystem.pde b/content/examples/Topics/Simulate/SmokeParticleSystem/SmokeParticleSystem.pde
@@ -6,10 +6,6 @@
  * is rendered as an alpha masked image.
  */
 
-// @pjs preload must be used to preload media if the program is
-// running with Processing.js
-/* @pjs preload="texture.png"; */
-
 ParticleSystem ps;
 
 void setup() {
diff --git a/content/examples/Topics/Textures/TextureCube/TextureCube.pde b/content/examples/Topics/Textures/TextureCube/TextureCube.pde
@@ -7,9 +7,6 @@
  * the P3D renderer as you can see, but they look great using OPENGL.
 */
 
-// The next line is needed if running in JavaScript Mode with Processing.js
-/* @pjs preload="berlin-1.jpg"; */ 
-
 PImage tex;
 float rotx = PI/4;
 float roty = PI/4;
@@ -88,4 +85,4 @@ void mouseDragged() {
   float rate = 0.01;
   rotx += (pmouseY-mouseY) * rate;
   roty += (mouseX-pmouseX) * rate;
-}
+}
diff --git a/content/examples/Topics/Textures/TextureCylinder/TextureCylinder.pde b/content/examples/Topics/Textures/TextureCylinder/TextureCylinder.pde
@@ -3,10 +3,7 @@
  * 
  * Load an image and draw it onto a cylinder and a quad. 
  */
-
-// The next line is needed if running in JavaScript Mode with Processing.js
-/* @pjs preload="berlin-1.jpg"; */ 
-
+ 
 int tubeRes = 32;
 float[] tubeX = new float[tubeRes];
 float[] tubeY = new float[tubeRes];
diff --git a/content/examples/Topics/Textures/TextureQuad/TextureQuad.pde b/content/examples/Topics/Textures/TextureQuad/TextureQuad.pde
@@ -5,9 +5,6 @@
  * the texture image. The vertex() function maps the image to the geometry.
  */
 
-// The next line is needed if running in JavaScript Mode with Processing.js
-/* @pjs preload="berlin-1.jpg"; */ 
-
 PImage img;
 
 void setup() {
diff --git a/content/examples/Topics/Textures/TextureSphere/TextureSphere.pde b/content/examples/Topics/Textures/TextureSphere/TextureSphere.pde
@@ -9,9 +9,6 @@
  * A 3D textured sphere with simple rotation control.
  */
 
-// The next line is needed if running in JavaScript Mode with Processing.js
-/* @pjs preload="world32k.jpg"; */
-
 int ptsW, ptsH;
 
 PImage img;
diff --git a/content/examples/Topics/Textures/TextureTriangle/TextureTriangle.pde b/content/examples/Topics/Textures/TextureTriangle/TextureTriangle.pde
@@ -4,9 +4,6 @@
  * Using a rectangular image to map a texture onto a triangle.
  */
 
-// The next line is needed if running in JavaScript Mode with Processing.js
-/* @pjs preload="berlin-1.jpg"; */ 
-
 PImage img;
 
 void setup() {

Original file line number	Diff line number	Diff line change
`@@ -20,3 +20,4 @@ When <b>pixelDensity(2)</b> is used to make use of a high resolution display (ca`
`20`	`20`	`]]></description>`
`21`	`21`
`22`	`22`	`</root>`
	`23`	`+`