another round of example updates for processing#154

shiffman · shiffman · commit 89235f34eaf4 · 2016-02-24T11:41:11.000-05:00
diff --git a/content/examples/Topics/File IO/SaveFile1/SaveFile1.pde b/content/examples/Topics/File IO/SaveFile1/SaveFile1.pde
@@ -4,8 +4,7 @@
  * Saving files is a useful way to store data so it can be viewed after a 
  * program has stopped running. The saveStrings() function writes an array 
  * of strings to a file, with each string written to a new line. This file 
- * is saved to the sketch's folder. This example won't work in a web browser
- * because of Java security restrictions.
+ * is saved to the sketch's folder.
  */
 
 int[] x = new int[0];
diff --git a/content/examples/Topics/File IO/SaveFile2/SaveFile2.pde b/content/examples/Topics/File IO/SaveFile2/SaveFile2.pde
@@ -3,8 +3,7 @@
  * 
  * This file a PrintWriter object to write data continuously to a file
  * while the mouse is pressed. When a key is pressed, the file closes
- * itself and the program is stopped. This example won't work in a web browser
- * because of Java security restrictions.
+ * itself and the program is stopped.
  */
 
 PrintWriter output;
diff --git a/content/examples_p5/Topics/Advanced Data/LoadSaveTable/LoadSaveTable.js b/content/examples_p5/Topics/Advanced Data/LoadSaveTable/LoadSaveTable.js
@@ -45,6 +45,7 @@ function draw() {
 
   textAlign(LEFT);
   fill(0);
+  noStroke();
   text("Click to add bubbles.", 10, height-10);
 }
 
diff --git a/content/examples_p5/Topics/Advanced Data/XMLYahooWeather/XMLYahooWeather.js b/content/examples_p5/Topics/Advanced Data/XMLYahooWeather/XMLYahooWeather.js
@@ -11,27 +11,29 @@
 // We're going to store the temperature
 var temperature = 0;
 // We're going to store text about the weather
-String weather = "";
+var weather = "";
 
 // The zip code we'll check for
-String zip = "10003";
+var zip = "10003";
 
-PFont font;
+var xml;
+
+function preload() {
+  var url = "http://xml.weather.yahoo.com/forecastrss?p=" + zip;
+    // Load the XML document
+  xml = loadXML(url);
+
+}
 
 function setup() {
   createCanvas(600, 360);
   
-  font = createFont("Merriweather-Light.ttf", 28);
-  textFont(font);
+  textFont("Merriweather Light", 28);
 
   // The URL for the XML document
-  String url = "http://xml.weather.yahoo.com/forecastrss?p=" + zip;
-  
-  // Load the XML document
-  XML xml = loadXML(url);
 
   // Grab the element we want
-  XML forecast = xml.getChild("channel/item/yweather:forecast");
+  var forecast = xml.getChild("channel/item/yweather:forecast");
   
   // Get the attributes we want
   temperature = forecast.getInt("high");
diff --git a/content/examples_p5/Topics/Cellular Automata/Spore1/Spore1.js b/content/examples_p5/Topics/Cellular Automata/Spore1/Spore1.js
@@ -22,7 +22,7 @@ var runs_per_loop = 100;
 function setup() {
   var canvas = createCanvas(640, 360);
   canvas.parent("p5container");
-  devicePixelScaling(false);
+  pixelDensity(1);
   frameRate(24);
   reset();
 }
diff --git a/content/examples_p5/Topics/File IO/LoadFile1/LoadFile1.js b/content/examples_p5/Topics/File IO/LoadFile1/LoadFile1.js
@@ -9,11 +9,12 @@ var lines;
 var index = 0;
 
 function preload() {
-  lines = loadStrings("/positions.txt");
+  lines = loadStrings("positions.txt");
 }
 
 function setup() {
-  createCanvas(200, 200);
+  var canvas = createCanvas(200, 200);
+  canvas.parent("p5container");
   background(0);
   stroke(255);
   frameRate(12);
diff --git a/content/examples_p5/Topics/File IO/LoadFile2/LoadFile2.js b/content/examples_p5/Topics/File IO/LoadFile2/LoadFile2.js
@@ -14,11 +14,12 @@ var num = 9; // Display this many entries on each screen.
 var startingEntry = 0;  // Display from this entry number
 
 function preload() {
-  lines = loadStrings("/cars2.tsv");
+  lines = loadStrings("cars2.tsv");
 }
 
 function setup() {
-  createCanvas(200, 200);
+  var canvas = createCanvas(200, 200);
+  canvas.parent("p5container");
   fill(255);
   noLoop();
   
diff --git a/content/examples_p5/Topics/File IO/SaveFile1/SaveFile1.js b/content/examples_p5/Topics/File IO/SaveFile1/SaveFile1.js
@@ -4,20 +4,18 @@
  * Saving files is a useful way to store data so it can be viewed after a 
  * program has stopped running. The saveStrings() function writes an array 
  * of strings to a file, with each string written to a new line. This file 
- * is saved to the sketch's folder. This example won't work in a web browser
- * because of Java security restrictions.
+ * is saved to the sketch's folder.
  */
 
 var x = [];
 var y = [];
 
-function setup() 
-{
-  createCanvas(200, 200);
+function setup() {
+  var canvas = createCanvas(200, 200);
+  canvas.parent("p5container");
 }
 
-function draw() 
-{
+function draw() {
   background(204);
   stroke(0);
   noFill();
@@ -43,7 +41,7 @@ function keyPressed() { // Press a key to save the data
   for (var i = 0; i < x.length; i++) {
     lines[i] = x[i] + "\t" + y[i];
   }
-  saveStrings(lines,"lines.txt");
+  saveStrings(lines, "lines.txt");
   //exit(); // Stop the program
 }
 
diff --git a/content/examples_p5/Topics/File IO/SaveOneFrame/SaveOneImage.js b/content/examples_p5/Topics/File IO/SaveOneFrame/SaveOneImage.js
@@ -8,7 +8,8 @@
  */
 
 function setup() {
-  createCanvas(200, 200);
+  var canvas = createCanvas(200, 200);
+  canvas.parent("p5container");
 }
 
 function draw() {
diff --git a/content/examples_p5/Topics/Fractals and L-Systems/Koch/KochLine.js b/content/examples_p5/Topics/Fractals and L-Systems/Koch/KochLine.js
@@ -10,8 +10,8 @@ function KochLine(a,b) {
   // Two p5.Vectors,
   // start is the "left" p5.Vector and 
   // end is the "right p5.Vector
-  this.start = a.get();
-  this.end = b.get();
+  this.start = a.copy();
+  this.end = b.copy();
 
   this.display = function() {
     stroke(255);
diff --git a/content/examples_p5/Topics/Simulate/ForcesWithVectors/Liquid.js b/content/examples_p5/Topics/Simulate/ForcesWithVectors/Liquid.js
@@ -28,7 +28,7 @@ var Liquid = function(x, y, w, h, c) {
     var dragMagnitude = this.c * speed * speed;
 
     // Direction is inverse of velocity
-    var dragForce = m.velocity.get();
+    var dragForce = m.velocity.copy();
     dragForce.mult(-1);
     
     // Scale according to magnitude
diff --git a/content/examples_p5/Topics/Simulate/MultipleParticleSystems/Particle.js b/content/examples_p5/Topics/Simulate/MultipleParticleSystems/Particle.js
@@ -2,7 +2,7 @@
 var Particle = function(position) {
   this.acceleration = createVector(0, 0.05);
   this.velocity = createVector(random(-1, 1), random(-2, 0));
-  this.position = position.get();
+  this.position = position.copy();
   this.lifespan = 255.0;
 
   this.run = function() {
diff --git a/content/examples_p5/Topics/Simulate/MultipleParticleSystems/ParticleSystem.js b/content/examples_p5/Topics/Simulate/MultipleParticleSystems/ParticleSystem.js
@@ -1,5 +1,5 @@
 var ParticleSystem = function(num, position) {
-  this.origin = position.get();
+  this.origin = position.copy();
   this.particles = [];
   for (var i = 0; i < num; i++) {
     this.particles.push(new Particle(this.origin));    // Add "num" amount of particles to the arraylist
diff --git a/content/examples_p5/Topics/Simulate/SimpleParticleSystem/Particle.js b/content/examples_p5/Topics/Simulate/SimpleParticleSystem/Particle.js
@@ -2,7 +2,7 @@
 var Particle = function(position) {
   this.acceleration = createVector(0, 0.05);
   this.velocity = createVector(random(-1, 1), random(-2, 0));
-  this.position = position.get();
+  this.position = position.copy();
   this.lifespan = 255.0;
 
   this.run = function() {
diff --git a/content/examples_p5/Topics/Simulate/SimpleParticleSystem/ParticleSystem.js b/content/examples_p5/Topics/Simulate/SimpleParticleSystem/ParticleSystem.js
@@ -3,7 +3,7 @@
 // http://natureofcode.com
 
 var ParticleSystem = function(position) {
-  this.origin = position.get();
+  this.origin = position.copy();
   this.particles = [];
 
   this.addParticle = function() {
diff --git a/content/examples_p5/Topics/Simulate/SmokeParticleSystem/Particle.js b/content/examples_p5/Topics/Simulate/SmokeParticleSystem/Particle.js
@@ -5,7 +5,7 @@ var Particle = function(l, img_) {
   var vx = randomGaussian()*0.3;
   var vy = randomGaussian()*0.3 - 1.0;
   this.vel = createVector(vx, vy);
-  this.pos = l.get();
+  this.pos = l.copy();
   this.lifespan = 100.0;
   this.img = img_;
 
diff --git a/content/examples_p5/Topics/Simulate/SmokeParticleSystem/ParticleSystem.js b/content/examples_p5/Topics/Simulate/SmokeParticleSystem/ParticleSystem.js
@@ -2,7 +2,7 @@
 // An ArrayList is used to manage the list of Particles 
 
 var ParticleSystem = function(num, v, img_) {
-  this.origin = v.get();
+  this.origin = v.copy();
   this.img = img_;
   this.particles = [];
   for (var i = 0; i < num; i++) {
diff --git a/content/examples_p5/Topics/Simulate/SmokeParticleSystem/SmokeParticleSystem.js b/content/examples_p5/Topics/Simulate/SmokeParticleSystem/SmokeParticleSystem.js
@@ -13,7 +13,7 @@
 var ps;
 
 function preload() {
-  img = loadImage("/texture.png");
+  img = loadImage("texture.png");
 }
 
 function setup() {
diff --git a/content/examples_p5/testing.html b/content/examples_p5/testing.html
@@ -2,7 +2,7 @@
 <head>
 	<script language="javascript" type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.4.22/p5.min.js"></script>
 	<script language="javascript" type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.4.22/addons/p5.dom.min.js"></script>
-	<script language="javascript" type="text/javascript" src="Topics/Drawing/Pattern/Pattern.js"></script>
+	<script language="javascript" type="text/javascript" src="Topics/Advanced Data/XMLYahooWeather/XMLYahooWeather.js"></script>
 	<script type="text/javascript">
 
 		// function setup() {
diff --git a/content/examples_topics.xml b/content/examples_topics.xml
@@ -59,13 +59,13 @@
 		<ex p5="true" file="IntListLottery.html">Int List Lottery</ex>
 		<ex p5="true" file="LoadSaveJSON.html">Load Save JSON</ex>
 		<ex p5="true" file="LoadSaveTable.html">Load Save Table</ex>
-		<ex p5="true" file="LoadSaveXML.html">Load Save XML</ex>
-		<ex p5="true" file="XMLYahooWeather.html">XML Yahoo Weather</ex>
+		<ex p5="false" file="LoadSaveXML.html">Load Save XML</ex>
+		<ex p5="false" file="XMLYahooWeather.html">XML Yahoo Weather</ex>
 	</cat>
 	<cat label="File IO">
 		<ex p5="true" file="LoadFile1.html">Load File 1</ex>
 		<ex p5="true" file="LoadFile2.html">Load File 2</ex>
-		<ex p5="true" file="SaveFile1.html">Save File 1</ex>
+		<ex p5="false" file="SaveFile1.html">Save File 1</ex>
 		<ex p5="true" file="SaveOneFrame.html">Save One Frame</ex>
 	</cat>
 	<cat label="Textures">
@@ -95,13 +95,13 @@
 		<ex p5="true" file="Tree.html">Tree</ex>
 		<ex p5="true" file="Koch.html">Koch</ex>
 		<ex p5="true" file="PenroseSnowflake.html">Penrose Snowflake</ex>
-		<ex p5="true" file="Penrose Tile.html">Penrose Tile</ex>
+		<ex p5="true" file="PenroseTile.html">Penrose Tile</ex>
 		<ex p5="true" file="Pentigree.html">Pentigree</ex>
 	</cat>
 	<cat label="Cellular Automata">
 		<ex p5="true" file="Wolfram.html">Wolframs's 1D CA</ex>
 		<ex p5="true" file="GameOfLife.html">Conway's Game of Life</ex>
-		<ex p5="true" file="Spore1.html">Spore 1</ex>
+		<ex p5="false" file="Spore1.html">Spore 1</ex>
 		<ex file="Spore2.html">Spore 2</ex>
 	</cat>
 </examples>

Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* This file a PrintWriter object to write data continuously to a file`
`5`	`5`	`* while the mouse is pressed. When a key is pressed, the file closes`
`6`		`- * itself and the program is stopped. This example won't work in a web browser`
`7`		`- * because of Java security restrictions.`
	`6`	`+ * itself and the program is stopped.`
`8`	`7`	`*/`
`9`	`8`
`10`	`9`	`PrintWriter output;`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ function draw() {`
`45`	`45`
`46`	`46`	`textAlign(LEFT);`
`47`	`47`	`fill(0);`
	`48`	`+ noStroke();`
`48`	`49`	`text("Click to add bubbles.", 10, height-10);`
`49`	`50`	`}`
`50`	`51`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ var runs_per_loop = 100;`
`22`	`22`	`function setup() {`
`23`	`23`	`var canvas = createCanvas(640, 360);`
`24`	`24`	`canvas.parent("p5container");`
`25`		`- devicePixelScaling(false);`
	`25`	`+ pixelDensity(1);`
`26`	`26`	`frameRate(24);`
`27`	`27`	`reset();`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,8 @@`
`8`	`8`	`*/`
`9`	`9`
`10`	`10`	`function setup() {`
`11`		`- createCanvas(200, 200);`
	`11`	`+ var canvas = createCanvas(200, 200);`
	`12`	`+ canvas.parent("p5container");`
`12`	`13`	`}`
`13`	`14`
`14`	`15`	`function draw() {`