Merge pull request #389 from 17bcs029/simulate

Updating Simulate example to ES6 Standards

Author: lmccart

src/data/examples/en/09_Simulate/00_Forces.js

@@ -3,51 +3,51 @@
  * @description Demonstration of multiple force acting on bodies
  * (<a href="http://natureofcode.com">natureofcode.com</a>)
  */
-// Demonstration of multiple force acting on 
+// Demonstration of multiple force acting on
 // bodies (Mover class)
 // Bodies experience gravity continuously
 // Bodies experience fluid resistance when in "water"
 
 // Five moving bodies
-var movers = [];
+let movers = [];
 
 // Liquid
-var liquid;
+let liquid;
 
 function setup() {
   createCanvas(640, 360);
   reset();
   // Create liquid object
-  liquid = new Liquid(0, height/2, width, height/2, 0.1);
+  liquid = new Liquid(0, height / 2, width, height / 2, 0.1);
 }
 
 function draw() {
   background(127);
-  
+
   // Draw water
   liquid.display();
 
-  for (var i = 0; i < movers.length; i++) {
-    
+  for (let i = 0; i < movers.length; i++) {
+
     // Is the Mover in the liquid?
     if (liquid.contains(movers[i])) {
       // Calculate drag force
-      var dragForce = liquid.calculateDrag(movers[i]);
+      let dragForce = liquid.calculateDrag(movers[i]);
       // Apply drag force to Mover
       movers[i].applyForce(dragForce);
     }
 
     // Gravity is scaled by mass here!
-    var gravity = createVector(0, 0.1*movers[i].mass);
+    let gravity = createVector(0, 0.1 * movers[i].mass);
     // Apply gravity
     movers[i].applyForce(gravity);
-   
+
     // Update and display
     movers[i].update();
     movers[i].display();
     movers[i].checkEdges();
   }
-  
+
 }
 
 
@@ -57,63 +57,63 @@ function mousePressed() {
 
 // Restart all the Mover objects randomly
 function reset() {
-  for (var i = 0; i < 9; i++) {
-    movers[i] = new Mover(random(0.5, 3), 40+i*70, 0);
+  for (let i = 0; i < 9; i++) {
+    movers[i] = new Mover(random(0.5, 3), 40 + i * 70, 0);
   }
 }
 
-var Liquid = function(x, y, w, h, c) {
+let Liquid = function(x, y, w, h, c) {
   this.x = x;
   this.y = y;
   this.w = w;
   this.h = h;
   this.c = c;
 };
-  
+
 // Is the Mover in the Liquid?
 Liquid.prototype.contains = function(m) {
-  var l = m.position;
+  let l = m.position;
   return l.x > this.x && l.x < this.x + this.w &&
          l.y > this.y && l.y < this.y + this.h;
 };
-  
+
 // Calculate drag force
 Liquid.prototype.calculateDrag = function(m) {
   // Magnitude is coefficient * speed squared
-  var speed = m.velocity.mag();
-  var dragMagnitude = this.c * speed * speed;
+  let speed = m.velocity.mag();
+  let dragMagnitude = this.c * speed * speed;
 
   // Direction is inverse of velocity
-  var dragForce = m.velocity.copy();
+  let dragForce = m.velocity.copy();
   dragForce.mult(-1);
-  
+
   // Scale according to magnitude
   // dragForce.setMag(dragMagnitude);
   dragForce.normalize();
   dragForce.mult(dragMagnitude);
   return dragForce;
 };
-  
+
 Liquid.prototype.display = function() {
   noStroke();
   fill(50);
   rect(this.x, this.y, this.w, this.h);
 };
 
-function Mover(m,x,y) {
+function Mover(m, x, y) {
   this.mass = m;
-  this.position = createVector(x,y);
-  this.velocity = createVector(0,0);
-  this.acceleration = createVector(0,0);
+  this.position = createVector(x, y);
+  this.velocity = createVector(0, 0);
+  this.acceleration = createVector(0, 0);
 }
 
 // Newton's 2nd law: F = M * A
 // or A = F / M
 Mover.prototype.applyForce = function(force) {
-  var f = p5.Vector.div(force,this.mass);
+  let f = p5.Vector.div(force, this.mass);
   this.acceleration.add(f);
 };
-  
+
 Mover.prototype.update = function() {
   // Velocity changes according to acceleration
   this.velocity.add(this.acceleration);
@@ -127,15 +127,15 @@ Mover.prototype.display = function() {
   stroke(0);
   strokeWeight(2);
   fill(255,127);
-  ellipse(this.position.x,this.position.y,this.mass*16,this.mass*16);
+  ellipse(this.position.x, this.position.y, this.mass * 16, this.mass * 16);
 };
 
 // Bounce off bottom of window
 Mover.prototype.checkEdges = function() {
-  if (this.position.y > (height - this.mass*8)) {
+  if (this.position.y > (height - this.mass * 8)) {
     // A little dampening when hitting the bottom
     this.velocity.y *= -0.9;
-    this.position.y = (height - this.mass*8);
+    this.position.y = (height - this.mass * 8);
   }
 };
 

src/data/examples/en/09_Simulate/01_ParticleSystem.js

@@ -3,11 +3,11 @@
  * @description This is a basic Particle System
  * (<a href="http://natureofcode.com">natureofcode.com</a>)
  */
-var system;
+let system;
 
 function setup() {
   createCanvas(720, 400);
-  system = new ParticleSystem(createVector(width/2, 50));
+  system = new ParticleSystem(createVector(width / 2, 50));
 }
 
 function draw() {
@@ -17,7 +17,7 @@ function draw() {
 }
 
 // A simple Particle class
-var Particle = function(position) {
+let Particle = function(position) {
   this.acceleration = createVector(0, 0.05);
   this.velocity = createVector(random(-1, 1), random(-1, 0));
   this.position = position.copy();
@@ -49,7 +49,7 @@ Particle.prototype.isDead = function(){
   return this.lifespan < 0;
 };
 
-var ParticleSystem = function(position) {
+let ParticleSystem = function(position) {
   this.origin = position.copy();
   this.particles = [];
 };
@@ -59,8 +59,8 @@ ParticleSystem.prototype.addParticle = function() {
 };
 
 ParticleSystem.prototype.run = function() {
-  for (var i = this.particles.length-1; i >= 0; i--) {
-    var p = this.particles[i];
+  for (let i = this.particles.length-1; i >= 0; i--) {
+    let p = this.particles[i];
     p.run();
     if (p.isDead()) {
       this.particles.splice(i, 1);