Merge pull request #225 from processing/examples-cleanup

Examples updates for 4 beta 2

Author: REAS

content/examples/Basic Examples/Color/Hue/Hue.pde

@@ -9,16 +9,14 @@
 int barWidth = 20;
 int lastBar = -1;
 
-void setup() 
-{
+void setup() {
   size(640, 360);
   colorMode(HSB, height, height, height);  
   noStroke();
   background(0);
 }
 
-void draw() 
-{
+void draw() {
   int whichBar = mouseX / barWidth;
   if (whichBar != lastBar) {
     int barX = whichBar * barWidth;

content/examples/Basic Examples/Data/CharactersStrings/liveSketch.js

@@ -16,17 +16,14 @@
  * featured below.
  */
 
-// The next line is needed if running in JavaScript Mode with Processing.js
-/* @pjs font="Georgia.ttf"; */
-
 function runLiveSketch(s) {
   var letter = '';
   var words = 'Begin...';
 
   s.setup = () => {
     s.createCanvas(640, 360);
     // Create the font
-    s.textFont('Georgia', 36);
+    s.textFont('Source Code Pro', 36);
   };
 
   s.draw = () => {

content/examples/Basic Examples/Data/DatatypeConversion/liveSketch.js

@@ -16,7 +16,7 @@ function runLiveSketch(s) {
     s.background(0);
     s.noStroke();
 
-    s.textFont('Georgia', 24);
+    s.textFont('Source Code Pro', 24);
 
     var c; // Chars are used for storing alphanumeric symbols
     var f; // Floats are decimal numbers

content/examples/Basic Examples/Input/Easing/liveSketch.js

@@ -28,7 +28,7 @@ function runLiveSketch(s) {
       x += dx * easing;
     }
 
-    var targetY = mouseY;
+    var targetY = s.mouseY;
     var dy = targetY - y;
     if (s.abs(dy) > 1) {
       y += dy * easing;

content/examples/Basic Examples/Input/MouseSignals/liveSketch.js

@@ -35,12 +35,12 @@ function runLiveSketch(s) {
       bvals[i - 1] = bvals[i];
     }
     // Add the new values to the end of the array
-    xvals[width - 1] = s.mouseX;
-    yvals[width - 1] = s.mouseY;
+    xvals[s.width - 1] = s.mouseX;
+    yvals[s.width - 1] = s.mouseY;
     if (s.mouseIsPressed) {
-      bvals[width - 1] = 0;
+      bvals[s.width - 1] = 0;
     } else {
-      bvals[width - 1] = 255;
+      bvals[s.width - 1] = 255;
     }
 
     s.fill(255);

content/examples/Basic Examples/Math/Interpolate/Interpolate.pde

@@ -4,7 +4,7 @@
  * Move the mouse across the screen and the symbol will follow.  
  * Between drawing each frame of the animation, the ellipse moves 
  * part of the distance (0.05) from its current position toward 
- * the cursor using the lerp() function
+ * the cursor using the lerp() function. 
  *
  * This is the same as the Easing under input only with lerp() instead. 
  */
@@ -32,4 +32,4 @@ void draw() {
   fill(255);
   stroke(255);
   ellipse(x, y, 66, 66);
-}
+}

content/examples/Basic Examples/Shape/DisableStyle/DisableStyle.pde

@@ -1,11 +1,12 @@
 /**
- * Ignore Styles. 
- * Illustration by George Brower. 
+ * Disable Style 
+ * by George Brower.
  * 
  * Shapes are loaded with style information that tells them how
- * to draw (the color, stroke weight, etc.) The disableStyle() 
- * method of PShape turns off this information. The enableStyle()
- * method turns it back on.
+ * to draw (e.g. color, stroke weight). The disableStyle() 
+ * method of PShape turns off this information so functions like
+ * stroke() and fill() change the SVGs color. The enableStyle()
+ * method turns the file's original styles back on.
  */
 
 PShape bot;

content/examples/Basic Examples/Structure/Loop/liveSketch.js

@@ -1,11 +1,11 @@
 /**
  * Loop.
  *
- * The loop() function causes draw() to execute
- * continuously. If noLoop is called in setup()
- * the draw() is only executed once. In this example
+ * The loop() function causes draw() to run
+ * continuously. If noLoop() is called in setup()
+ * the draw() is only run once. In this example
  * click the mouse to execute loop(), which will
- * cause the draw() the execute continuously.
+ * cause the draw() the run continuously.
  */
 function runLiveSketch(s) {
   var y = 100;
@@ -20,10 +20,10 @@ function runLiveSketch(s) {
     y = s.height * 0.5;
   };
 
-  // The statements in draw() are run until the
-  // program is stopped. Each statement is run in
-  // sequence and after the last line is read, the first
-  // line is run again.
+  // The code in draw() is run until the program 
+  // is stopped. Each statement is executed in
+  // sequence and after the last line is read, 
+  // the first line is run again.
   s.draw = () => {
     s.background(0); // Set the background to black
     s.line(0, y, s.width, y);
@@ -34,7 +34,7 @@ function runLiveSketch(s) {
     }
   };
 
-  function mousePressed() {
+  s.mousePressed() {
     s.loop();
   }
 }

content/examples/Basic Examples/Structure/NoLoop/liveSketch.js

@@ -2,7 +2,7 @@
  * No Loop.
  *
  * The noLoop() function causes draw() to only
- * execute once. Without calling noLoop(), the
+ * run once. Without calling noLoop(), the
  * code inside draw() is run continually.
  */
 
@@ -19,10 +19,10 @@ function runLiveSketch(s) {
     y = s.height * 0.5;
   };
 
-  // The statements in draw() are executed until the
-  // program is stopped. Each statement is executed in
-  // sequence and after the last line is read, the first
-  // line is executed again.
+  // The code in draw() is run until the program 
+  // is stopped. Each statement is executed in
+  // sequence and after the last line is read, 
+  // the first line is run again.
   s.draw = () => {
     s.background(0); // Set the background to black
     y = y - 1;

content/examples/Basic Examples/Structure/Redraw/liveSketch.js

@@ -18,10 +18,10 @@ function runLiveSketch(s) {
     y = s.height * 0.5;
   };
 
-  // The statements in draw() are executed until the
-  // program is stopped. Each statement is executed in
-  // sequence and after the last line is read, the first
-  // line is executed again.
+  // The code in draw() is run until the program 
+  // is stopped. Each statement is executed in
+  // sequence and after the last line is read, 
+  // the first line is run again.
   s.draw = () => {
     s.background(0); // Set the background to black
     y = y - 4;
@@ -31,7 +31,7 @@ function runLiveSketch(s) {
     s.line(0, y, s.width, y);
   };
 
-  function mousePressed() {
+  s.mousePressed() {
     s.redraw();
   }
 }