added different world generators

Author: voidconsole

index.html

@@ -13,6 +13,7 @@
   <!-- Include the processing.js library -->
   <!-- See https://khanacademy.zendesk.com/hc/en-us/articles/202260404-What-parts-of-ProcessingJS-does-Khan-Academy-support- for differences -->
   <script src="https://cdn.jsdelivr.net/processing.js/1.4.8/processing.min.js"></script> 
+  <script src="particleGenerators.js"></script>
   <script src="script.js">
 
   </script>

particleGenerators.js

@@ -0,0 +1,80 @@
+class World{
+	constructor(particleCount, particleGenerator, containX = true, containY = true) {
+		this.particleCount = particleCount;
+		this.particleGenerator = particleGenerator;
+		this.containX = containX;
+		this.containY = containY;
+	}
+}
+
+
+
+// Heat transmission wave
+function heatWaveGen(index) {
+	let rnd = () => Math.random();
+	let w = window.innerWidth;
+	let h = window.innerHeight;
+	let size = 50;
+	let position = new Vector(rnd() * w, rnd() * h);
+	let velocity;
+	if (position.x > 500) {
+		velocity = new Vector(rnd() * 10, rnd());
+	}
+	else {
+		position = new Vector(position.x + 400, position.y);
+		velocity = new Vector(rnd() * 10, rnd());
+	}
+
+	return [size, position, velocity];
+}
+var HeatTransmissionWave = new World(600, heatWaveGen, true, true);
+
+
+// hot line between cold gases
+
+function hotLineGenerator(index) {
+	let rnd = () => Math.random();
+	let w = window.innerWidth;
+	let h = window.innerHeight;
+	let size = 20;
+	let position = new Vector(rnd() * w, rnd() * h);
+	let velocity;
+	if (position.y < 450) {
+		velocity = new Vector(2, rnd());
+	}
+	else if (position.y > 450 && position.y < 550) {
+		// position = new Vector(position.x, position.y + 200);
+		velocity = new Vector(20, rnd());
+	}
+	else {
+		velocity = new Vector(2, rnd());
+	}
+	return [size, position, velocity];
+}
+var EnergyLine = new World(500, hotLineGenerator, false, true);
+
+// high speed line above cold gas
+
+function highSpeedLineGen(index) {
+	let rnd = () => Math.random();
+	let w = window.innerWidth;
+	let h = window.innerHeight;
+	let size = 20;
+	let position = new Vector(rnd() * w, rnd() * h);
+	let velocity;
+	if (position.y < 300) {
+		velocity = new Vector(20, rnd());
+	}
+	else if (position.y > 300 && position.y < 400) {
+		position = new Vector(position.x, position.y + 200);
+		velocity = new Vector(2, rnd());
+	}
+	else {
+		velocity = new Vector(2, rnd());
+	}
+	return [size, position, velocity];
+}
+var blowOver = new World(500, highSpeedLineGen, false, true);
+
+
+// fast fluid crashing into slow fluid

script.js

@@ -18,25 +18,7 @@ function triangulate(colliders) {
 	}
 }
 
-function particleGenerator(index){
-	let rnd = () => Math.random();
-	let w = window.innerWidth;
-	let h = window.innerHeight;
-	let size = 10;
-	let position = new Vector(rnd() * w, rnd() * h);
-	let velocity;
-	if(position.y < 450) {
-		velocity = new Vector(2,rnd());
-	}
-	else if (position.y > 450 && position.y < 500) {
-		// position = new Vector(position.x, position.y + 200);
-		velocity = new Vector(20, rnd());
-	}
-	else {
-		velocity = new Vector(2, rnd());
-	}
-	return [size, position, velocity];
-}
+thisWorld = HeatTransmissionWave; // change to EnergyLine for the hot line between cold gases
 class Vector {
 	constructor(x, y) {
 		this.x = x
@@ -50,17 +32,22 @@ class Vector {
 		this.x -= v.x
 		this.y -= v.y
 	}
+	scale(s) {
+		this.x *= s
+		this.y *= s
+	}
 }
 var programCode = function (processingInstance) {
 	with (processingInstance) {
 		size(window.innerWidth, window.innerHeight)
 		frameRate(30)
 
 		class Particle {
-			constructor(size, position, velocity) {
+			constructor(size, position, velocity, density = 0.01) {
 				this.size = size
 				this.position = position
 				this.velocity = velocity
+				this.mass = size * density
 			}
 			display() {
 				noStroke();
@@ -75,16 +62,42 @@ var programCode = function (processingInstance) {
 					this.size,
 					this.size
 				);
+
 			}
 			move() {
-				if (this.position.x > width || this.position.x < 0) {
-					this.position.x = 0;
-					// this.velocity.x = -this.velocity.x;
+				if (this.position.x > width) {
+					if (thisWorld.containX) {
+						this.velocity.x = -this.velocity.x;
+					}
+					else {
+						this.position.x = 0;
+					}
+				}
+				else if (this.position.x < 0) {
+					if (thisWorld.containX) {
+						this.velocity.x = -this.velocity.x;
+					} else {
+						this.position.x = width;
+					}
 				}
-				if (this.position.y > height || this.position.y < 0) {
-					// this.position.y = 0;	
-					this.velocity.y = -this.velocity.y;
+
+				if (this.position.y > height) {
+					if (thisWorld.containY) {
+						this.velocity.y = -this.velocity.y;
+					}
+					else {
+						this.position.y = 0;
+					}
 				}
+				else if (this.position.y < 0) {
+					if (thisWorld.containY) {
+						this.velocity.y = -this.velocity.y;
+					}
+					else {
+						this.position.y = height;
+					}
+				}
+
 				this.position.add(this.velocity);
 			}
 			collide(other) {
@@ -120,8 +133,8 @@ var programCode = function (processingInstance) {
 
 		let particles = [];
 
-		for (let k = 0; k < 500; k++) {
-			let [size, position, velocity] = particleGenerator(k);
+		for (let k = 0; k < thisWorld.particleCount; k++) {
+			let [size, position, velocity] = thisWorld.particleGenerator(k);
 			particles.push(new Particle(size, position, velocity));
 		}