Merge pull request #452 from 17bcs029/constructor

converted the koch curve example to es6 constructor syntax

Author: lmccart

src/data/examples/en/09_Simulate/18_Koch.js

@@ -27,32 +27,34 @@ function draw() {
 // A class to describe one line segment in the fractal
 // Includes methods to calculate midp5.Vectors along the line according to the Koch algorithm
 
-function KochLine(a,b) {
-  // Two p5.Vectors,
-  // start is the "left" p5.Vector and
-  // end is the "right p5.Vector
-  this.start = a.copy();
-  this.end = b.copy();
-
-  this.display = function() {
+class KochLine {
+  constructor(a,b) {
+    // Two p5.Vectors,
+    // start is the "left" p5.Vector and
+    // end is the "right p5.Vector
+    this.start = a.copy();
+    this.end = b.copy();
+  }
+
+  display() {
     stroke(255);
     line(this.start.x, this.start.y, this.end.x, this.end.y);
   }
 
-  this.kochA = function() {
+  kochA() {
     return this.start.copy();
   }
 
   // This is easy, just 1/3 of the way
-  this.kochB = function() {
+  kochB() {
     let v = p5.Vector.sub(this.end, this.start);
     v.div(3);
     v.add(this.start);
     return v;
   }
 
   // More complicated, have to use a little trig to figure out where this p5.Vector is!
-  this.kochC = function() {
+  kochC() {
     let a = this.start.copy(); // Start at the beginning
     let v = p5.Vector.sub(this.end, this.start);
     v.div(3);
@@ -63,46 +65,48 @@ function KochLine(a,b) {
   }
 
   // Easy, just 2/3 of the way
-  this.kochD = function() {
+  kochD() {
     let v = p5.Vector.sub(this.end, this.start);
     v.mult(2/3.0);
     v.add(this.start);
     return v;
   }
 
-  this.kochE = function() {
+  kochE() {
     return this.end.copy();
   }
 }
 
 // A class to manage the list of line segments in the snowflake pattern
 
-function KochFractal() {
-  this.start = createVector(0,height-20);   // A p5.Vector for the start
-  this.end = createVector(width,height-20); // A p5.Vector for the end
-  this.lines = [];                         // An array to keep track of all the lines
-  this.count = 0;
+class KochFractal {
+  constructor() {
+    this.start = createVector(0,height-20);   // A p5.Vector for the start
+    this.end = createVector(width,height-20); // A p5.Vector for the end
+    this.lines = [];                         // An array to keep track of all the lines
+    this.count = 0;
+    this.restart();
+  }
 
-  this.nextLevel = function() {
+  nextLevel() {
     // For every line that is in the arraylist
     // create 4 more lines in a new arraylist
     this.lines = this.iterate(this.lines);
     this.count++;
   }
 
-  this.restart = function() {
+  restart() {
     this.count = 0;      // Reset count
     this.lines = [];  // Empty the array list
     this.lines.push(new KochLine(this.start,this.end));  // Add the initial line (from one end p5.Vector to the other)
   }
-  this.restart();
 
-  this.getCount = function() {
+  getCount() {
     return this.count;
   }
 
   // This is easy, just draw all the lines
-  this.render = function() {
+  render() {
     for(let i = 0; i < this.lines.length; i++) {
       this.lines[i].display();
     }
@@ -116,7 +120,7 @@ function KochFractal() {
   // Step 3: Return the new arraylist and it becomes the list of line segments for the structure
 
   // As we do this over and over again, each line gets broken into 4 lines, which gets broken into 4 lines, and so on. . .
-  this.iterate = function(before) {
+  iterate(before) {
     let now = [];    // Create emtpy list
     for(let i = 0; i < this.lines.length; i++) {
       let l = this.lines[i];

src/data/examples/es/09_Simulate/18_Koch.js

@@ -27,32 +27,34 @@ function draw() {
 // A class to describe one line segment in the fractal
 // Includes methods to calculate midp5.Vectors along the line according to the Koch algorithm
 
-function KochLine(a,b) {
-  // Two p5.Vectors,
-  // start is the "left" p5.Vector and
-  // end is the "right p5.Vector
-  this.start = a.copy();
-  this.end = b.copy();
-
-  this.display = function() {
+class KochLine {
+  constructor(a,b) {
+    // Two p5.Vectors,
+    // start is the "left" p5.Vector and
+    // end is the "right p5.Vector
+    this.start = a.copy();
+    this.end = b.copy();
+  }
+
+  display() {
     stroke(255);
     line(this.start.x, this.start.y, this.end.x, this.end.y);
   }
 
-  this.kochA = function() {
+  kochA() {
     return this.start.copy();
   }
 
   // This is easy, just 1/3 of the way
-  this.kochB = function() {
+  kochB() {
     let v = p5.Vector.sub(this.end, this.start);
     v.div(3);
     v.add(this.start);
     return v;
   }
 
   // More complicated, have to use a little trig to figure out where this p5.Vector is!
-  this.kochC = function() {
+  kochC() {
     let a = this.start.copy(); // Start at the beginning
     let v = p5.Vector.sub(this.end, this.start);
     v.div(3);
@@ -63,46 +65,48 @@ function KochLine(a,b) {
   }
 
   // Easy, just 2/3 of the way
-  this.kochD = function() {
+  kochD() {
     let v = p5.Vector.sub(this.end, this.start);
     v.mult(2/3.0);
     v.add(this.start);
     return v;
   }
 
-  this.kochE = function() {
+  kochE() {
     return this.end.copy();
   }
 }
 
 // A class to manage the list of line segments in the snowflake pattern
 
-function KochFractal() {
-  this.start = createVector(0,height-20);   // A p5.Vector for the start
-  this.end = createVector(width,height-20); // A p5.Vector for the end
-  this.lines = [];                         // An array to keep track of all the lines
-  this.count = 0;
+class KochFractal {
+  constructor() {
+    this.start = createVector(0,height-20);   // A p5.Vector for the start
+    this.end = createVector(width,height-20); // A p5.Vector for the end
+    this.lines = [];                         // An array to keep track of all the lines
+    this.count = 0;
+    this.restart();
+  }
 
-  this.nextLevel = function() {
+  nextLevel() {
     // For every line that is in the arraylist
     // create 4 more lines in a new arraylist
     this.lines = this.iterate(this.lines);
     this.count++;
   }
 
-  this.restart = function() {
+  restart() {
     this.count = 0;      // Reset count
     this.lines = [];  // Empty the array list
     this.lines.push(new KochLine(this.start,this.end));  // Add the initial line (from one end p5.Vector to the other)
   }
-  this.restart();
 
-  this.getCount = function() {
+  getCount() {
     return this.count;
   }
 
   // This is easy, just draw all the lines
-  this.render = function() {
+  render() {
     for(let i = 0; i < this.lines.length; i++) {
       this.lines[i].display();
     }
@@ -116,7 +120,7 @@ function KochFractal() {
   // Step 3: Return the new arraylist and it becomes the list of line segments for the structure
 
   // As we do this over and over again, each line gets broken into 4 lines, which gets broken into 4 lines, and so on. . .
-  this.iterate = function(before) {
+  iterate(before) {
     let now = [];    // Create emtpy list
     for(let i = 0; i < this.lines.length; i++) {
       let l = this.lines[i];

src/data/examples/zh-Hans/09_Simulate/18_Koch.js

@@ -27,32 +27,34 @@ function draw() {
 // A class to describe one line segment in the fractal
 // Includes methods to calculate midp5.Vectors along the line according to the Koch algorithm
 
-function KochLine(a,b) {
-  // Two p5.Vectors,
-  // start is the "left" p5.Vector and
-  // end is the "right p5.Vector
-  this.start = a.copy();
-  this.end = b.copy();
-
-  this.display = function() {
+class KochLine {
+  constructor(a,b) {
+    // Two p5.Vectors,
+    // start is the "left" p5.Vector and
+    // end is the "right p5.Vector
+    this.start = a.copy();
+    this.end = b.copy();
+  }
+
+  display() {
     stroke(255);
     line(this.start.x, this.start.y, this.end.x, this.end.y);
   }
 
-  this.kochA = function() {
+  kochA() {
     return this.start.copy();
   }
 
   // This is easy, just 1/3 of the way
-  this.kochB = function() {
+  kochB() {
     let v = p5.Vector.sub(this.end, this.start);
     v.div(3);
     v.add(this.start);
     return v;
   }
 
   // More complicated, have to use a little trig to figure out where this p5.Vector is!
-  this.kochC = function() {
+  kochC() {
     let a = this.start.copy(); // Start at the beginning
     let v = p5.Vector.sub(this.end, this.start);
     v.div(3);
@@ -63,46 +65,47 @@ function KochLine(a,b) {
   }
 
   // Easy, just 2/3 of the way
-  this.kochD = function() {
+  kochD() {
     let v = p5.Vector.sub(this.end, this.start);
     v.mult(2/3.0);
     v.add(this.start);
     return v;
   }
 
-  this.kochE = function() {
+  kochE() {
     return this.end.copy();
   }
 }
 
 // A class to manage the list of line segments in the snowflake pattern
 
-function KochFractal() {
-  this.start = createVector(0,height-20);   // A p5.Vector for the start
-  this.end = createVector(width,height-20); // A p5.Vector for the end
-  this.lines = [];                         // An array to keep track of all the lines
-  this.count = 0;
-
-  this.nextLevel = function() {
+class KochFractal {
+  constructor() {
+    this.start = createVector(0,height-20);   // A p5.Vector for the start
+    this.end = createVector(width,height-20); // A p5.Vector for the end
+    this.lines = [];                         // An array to keep track of all the lines
+    this.count = 0;
+    this.restart();
+  }
+  nextLevel() {
     // For every line that is in the arraylist
     // create 4 more lines in a new arraylist
     this.lines = this.iterate(this.lines);
     this.count++;
   }
 
-  this.restart = function() {
+  restart() {
     this.count = 0;      // Reset count
     this.lines = [];  // Empty the array list
     this.lines.push(new KochLine(this.start,this.end));  // Add the initial line (from one end p5.Vector to the other)
   }
-  this.restart();
 
-  this.getCount = function() {
+  getCount() {
     return this.count;
   }
 
   // This is easy, just draw all the lines
-  this.render = function() {
+  render() {
     for(let i = 0; i < this.lines.length; i++) {
       this.lines[i].display();
     }
@@ -116,7 +119,7 @@ function KochFractal() {
   // Step 3: Return the new arraylist and it becomes the list of line segments for the structure
 
   // As we do this over and over again, each line gets broken into 4 lines, which gets broken into 4 lines, and so on. . .
-  this.iterate = function(before) {
+  iterate(before) {
     let now = [];    // Create emtpy list
     for(let i = 0; i < this.lines.length; i++) {
       let l = this.lines[i];