Merge pull request #125 from ferreira-mariana/master

NOC in ES6: change from var to let

Author: shiffman

chp00_introduction/NOC_I_01_RandomWalkTraditional/sketch.js

@@ -27,7 +27,7 @@ class Walker {
   }
 
   step() {
-    var choice = floor(random(4));
+    let choice = floor(random(4));
     if (choice === 0) {
       this.x++;
     } else if (choice == 1) {

chp01_vectors/NOC_1_10_motion101_acceleration/mover.js

@@ -14,7 +14,7 @@ class Mover{
 
   update() {
     // Compute a vector that points from position to mouse
-    var mouse = createVector(mouseX,mouseY);
+    let mouse = createVector(mouseX,mouseY);
     this.acceleration = p5.Vector.sub(mouse,this.position);
     // Set magnitude of acceleration
     this.acceleration.setMag(0.2);

chp01_vectors/NOC_1_11_motion101_acceleration_array/mover.js

@@ -14,7 +14,7 @@ class Mover{
 
   update() {
     // Compute a vector that points from position to mouse
-    var mouse = createVector(mouseX,mouseY);
+    let mouse = createVector(mouseX,mouseY);
     this.acceleration = p5.Vector.sub(mouse,this.position);
     // Set magnitude of acceleration
     this.acceleration.setMag(0.2);

chp01_vectors/NOC_1_11_motion101_acceleration_array/sketch.js

@@ -10,7 +10,7 @@ let movers = [];
 
 function setup() {
   createCanvas(640,360);
-  for (var i = 0; i < 20; i++) {
+  for (let i = 0; i < 20; i++) {
      movers[i] = new Mover();
   }
 }

chp02_forces/NOC_2_01_forces/mover.js

@@ -11,7 +11,7 @@ class Mover {
   }
 
   applyForce(force) {
-    var f = p5.Vector.div(force, this.mass);
+    let f = p5.Vector.div(force, this.mass);
     this.acceleration.add(f);
   }
 

chp04_systems/NOC_4_02_ArrayParticles/sketch.js

@@ -13,8 +13,8 @@ function draw() {
   particles.push(new Particle(createVector(width / 2, 50)));
 
   // Looping through backwards to delete
-  for (var i = particles.length - 1; i >= 0; i--) {
-    var p = particles[i];
+  for (let i = particles.length - 1; i >= 0; i--) {
+    let p = particles[i];
     p.run();
     if (p.isDead()) {
       //remove the particle

chp04_systems/NOC_4_05_ParticleSystemInheritancePolymorphism/confetti.js

@@ -13,7 +13,7 @@ class Confetti extends Particle {
     strokeWeight(2);
     push();
     translate(this.position.x, this.position.y);
-    var theta = map(this.position.x, 0, width, 0, TWO_PI * 2);
+    let theta = map(this.position.x, 0, width, 0, TWO_PI * 2);
     rotate(theta);
     rect(0, 0, 12, 12);
     pop();

chp06_agents/NOC_6_01_Seek/vehicle.js

@@ -34,13 +34,13 @@ class Vehicle {
   // STEER = DESIRED MINUS VELOCITY
   seek(target) {
 
-    var desired = p5.Vector.sub(target, this.position); // A vector pointing from the location to the target
+    let desired = p5.Vector.sub(target, this.position); // A vector pointing from the location to the target
 
     // Scale to maximum speed
     desired.setMag(this.maxspeed);
 
     // Steering = Desired minus velocity
-    var steer = p5.Vector.sub(desired, this.velocity);
+    let steer = p5.Vector.sub(desired, this.velocity);
     steer.limit(this.maxforce); // Limit to maximum steering force
 
     this.applyForce(steer);

chp06_agents/NOC_6_02_Arrive/vehicle.js

@@ -37,7 +37,7 @@ class Vehicle {
     let d = desired.mag();
     // Scale with arbitrary damping within 100 pixels
     if (d < 100) {
-      var m = map(d, 0, 100, 0, this.maxspeed);
+      let m = map(d, 0, 100, 0, this.maxspeed);
       desired.setMag(m);
     } else {
       desired.setMag(this.maxspeed);

chp07_CA/Exercise_7_01_WolframCA_randomizedrules/CA.js

@@ -15,14 +15,14 @@ function CA(r) {
 
   // Make a random ruleset
   this.randomize = function() {
-  	for (var i = 0; i < 8; i++) {
+  	for (let i = 0; i < 8; i++) {
   		this.ruleset[i] = Math.floor(random(2));
   	}
   };
 
   // Reset to generation 0
   this.restart = function() {
-  	for (var i = 0; i < this.cells.length; i++) {
+  	for (let i = 0; i < this.cells.length; i++) {
   		this.cells[i] = 0;
   	}
     // We arbitrarily start with just the middle cell having a state of "1"
@@ -34,13 +34,13 @@ function CA(r) {
   // The process of creating the new generation
   this.generate = function() {
     // First we create an empty array for the new values
-    var nextgen = new Array(this.cells.length);
+    let nextgen = new Array(this.cells.length);
     // For every spot, determine new state by examing current state, and neighbor states
     // Ignore edges that only have one neighor
-    for (var i = 1; i < this.cells.length-1; i++) {
-      var left = this.cells[i-1];   // Left neighbor state
-      var me = this.cells[i];       // Current state
-      var right = this.cells[i+1];  // Right neighbor state
+    for (let i = 1; i < this.cells.length-1; i++) {
+      let left = this.cells[i-1];   // Left neighbor state
+      let me = this.cells[i];       // Current state
+      let right = this.cells[i+1];  // Right neighbor state
       nextgen[i] = this.rules(left, me, right); // Compute next generation state based on ruleset
     }
     // The current generation is the new generation
@@ -50,7 +50,7 @@ function CA(r) {
 
   // This is the easy part, just draw the cells, fill 255 for '1', fill 0 for '0'
   this.display = function() {
-  	for (var i = 0; i < this.cells.length; i++) {
+  	for (let i = 0; i < this.cells.length; i++) {
   		if (this.cells[i] == 1) fill(200);
   		else                    fill(51);
   		noStroke();