Merge branch 'master' of github.com:processing/p5.js-website

Author: Lauren McCarthy

.github/issue_template.md

@@ -0,0 +1,19 @@
+**Actual Behaviour**
+
+ <!--Please state here what is currently happening.-->
+
+ **Expected Behaviour**
+
+ <!--State here what the feature should enable the user to do.-->
+
+ **Steps to reproduce it**
+
+ <!--Add steps to reproduce bugs or add information on the place where the feature should be implemented. Add links to a sample deployment or code.-->
+
+ **Screenshots of the issue**
+
+ <!--Where-ever possible attach a screenshot of the issue.-->
+
+ **Would you like to work on the issue?**
+
+ <!--Please let us know if you can work on it or the issue should be assigned to someone else.-->

.github/pull_request_template.md

@@ -0,0 +1,8 @@
+Fixes #[Add issue number here]
+
+ Changes: 
+<!-- Add here what changes were made in this pull request and if possible provide links showcasing the changes. -->
+
+
+ Screenshots of the change: 
+<!-- Add screenshots depicting the changes. -->

src/data/examples/en/13_Motion/04_Bouncy_Bubbles.js

@@ -38,8 +38,8 @@ class Ball {
   constructor(xin, yin, din, idin, oin) {
     this.x = xin;
     this.y = yin;
-    let vx = 0;
-    let vy = 0;
+    this.vx = 0;
+    this.vy = 0;
     this.diameter = din;
     this.id = idin;
     this.others = oin;
@@ -61,31 +61,31 @@ class Ball {
         let targetY = this.y + sin(angle) * minDist;
         let ax = (targetX - this.others[i].x) * spring;
         let ay = (targetY - this.others[i].y) * spring;
-        vx -= ax;
-        vy -= ay;
+        this.vx -= ax;
+        this.vy -= ay;
         this.others[i].vx += ax;
         this.others[i].vy += ay;
       }
     }
   }
 
   move() {
-    vy += gravity;
-    this.x += vx;
-    this.y += vy;
+    this.vy += gravity;
+    this.x += this.vx;
+    this.y += this.vy;
     if (this.x + this.diameter / 2 > width) {
       this.x = width - this.diameter / 2;
-      vx *= friction;
+      this.vx *= friction;
     } else if (this.x - this.diameter / 2 < 0) {
       this.x = this.diameter / 2;
-      vx *= friction;
+      this.vx *= friction;
     }
     if (this.y + this.diameter / 2 > height) {
       this.y = height - this.diameter / 2;
-      vy *= friction;
+      this.vy *= friction;
     } else if (this.y - this.diameter / 2 < 0) {
       this.y = this.diameter / 2;
-      vy *= friction;
+      this.vy *= friction;
     }
   }
 

src/data/examples/es/13_Motion/04_Bouncy_Bubbles.js

@@ -38,8 +38,8 @@ class Ball {
   constructor(xin, yin, din, idin, oin) {
     this.x = xin;
     this.y = yin;
-    let vx = 0;
-    let vy = 0;
+    this.vx = 0;
+    this.vy = 0;
     this.diameter = din;
     this.id = idin;
     this.others = oin;
@@ -61,31 +61,31 @@ class Ball {
         let targetY = this.y + sin(angle) * minDist;
         let ax = (targetX - this.others[i].x) * spring;
         let ay = (targetY - this.others[i].y) * spring;
-        vx -= ax;
-        vy -= ay;
+        this.vx -= ax;
+        this.vy -= ay;
         this.others[i].vx += ax;
         this.others[i].vy += ay;
       }
     }
   }
 
   move() {
-    vy += gravity;
-    this.x += vx;
-    this.y += vy;
+    this.vy += gravity;
+    this.x += this.vx;
+    this.y += this.vy;
     if (this.x + this.diameter / 2 > width) {
       this.x = width - this.diameter / 2;
-      vx *= friction;
+      this.vx *= friction;
     } else if (this.x - this.diameter / 2 < 0) {
       this.x = this.diameter / 2;
-      vx *= friction;
+      this.vx *= friction;
     }
     if (this.y + this.diameter / 2 > height) {
       this.y = height - this.diameter / 2;
-      vy *= friction;
+      this.vy *= friction;
     } else if (this.y - this.diameter / 2 < 0) {
       this.y = this.diameter / 2;
-      vy *= friction;
+      this.vy *= friction;
     }
   }
 

src/data/examples/zh-Hans/13_Motion/04_Bouncy_Bubbles.js

@@ -38,8 +38,8 @@ class Ball {
   constructor(xin, yin, din, idin, oin) {
     this.x = xin;
     this.y = yin;
-    let vx = 0;
-    let vy = 0;
+    this.vx = 0;
+    this.vy = 0;
     this.diameter = din;
     this.id = idin;
     this.others = oin;
@@ -61,31 +61,31 @@ class Ball {
         let targetY = this.y + sin(angle) * minDist;
         let ax = (targetX - this.others[i].x) * spring;
         let ay = (targetY - this.others[i].y) * spring;
-        vx -= ax;
-        vy -= ay;
+        this.vx -= ax;
+        this.vy -= ay;
         this.others[i].vx += ax;
         this.others[i].vy += ay;
       }
     }
   }
 
   move() {
-    vy += gravity;
-    this.x += vx;
-    this.y += vy;
+    this.vy += gravity;
+    this.x += this.vx;
+    this.y += this.vy;
     if (this.x + this.diameter / 2 > width) {
       this.x = width - this.diameter / 2;
-      vx *= friction;
+      this.vx *= friction;
     } else if (this.x - this.diameter / 2 < 0) {
       this.x = this.diameter / 2;
-      vx *= friction;
+      this.vx *= friction;
     }
     if (this.y + this.diameter / 2 > height) {
       this.y = height - this.diameter / 2;
-      vy *= friction;
+      this.vy *= friction;
     } else if (this.y - this.diameter / 2 < 0) {
       this.y = this.diameter / 2;
-      vy *= friction;
+      this.vy *= friction;
     }
   }