Small fixes, removed build since we're using RTD

Author: IshanManchanda

.gitignore

@@ -1,2 +1,3 @@
 .idea
+docs/build
 .DS_Store

Challenges/Brownian Motion/script.js

@@ -8,11 +8,13 @@ class Particle {
 	}
 
 	check_bounds() {
-		if (this.position.x >= width - this.size || this.position.x <= this.size) {
+		if (this.position.x >= width - this.size ||
+			this.position.x <= this.size) {
 			this.velocity.x *= -1;
 		}
 
-		if (this.position.y >= height - this.size || this.position.y <= this.size) {
+		if (this.position.y >= height - this.size ||
+			this.position.y <= this.size) {
 			this.velocity.y *= -1;
 		}
 	}
@@ -29,7 +31,8 @@ class Particle {
 
 	draw() {
 		fill(this.color);
-		ellipse(this.position.x, this.position.y, this.size * 2, this.size * 2);
+		ellipse(this.position.x, this.position.y,
+			 this.size * 2, this.size * 2);
 	}
 }
 
@@ -41,12 +44,14 @@ function setup() {
 
 	// Create new particles with random properties and store references to them
 	for (let i = 0; i < 10; i++) {
-		particles.push(new Particle(
-			createVector(random(100, width - 100), random(100, height - 100)),
-			createVector(random(-5, 5), random(-5, 5)),
-			random(20, 50),
-			color(random(255), random(255), random(255))
-		));
+		particles.push(
+			new Particle(
+				createVector(random(100, width - 100), random(100, height - 100)),
+				createVector(random(-5, 5), random(-5, 5)),
+				random(20, 50),
+				color(random(255), random(255), random(255))
+			)
+		);
 	}
 }
 

Lessons/01 Drawing/script.js

@@ -4,20 +4,22 @@ function setup() {
 
 function draw() {
 	// Draw a line
-	line(0, 0, 400, 400);
+	// line(0, 0, 400, 400);
 
 	// Draw a circle
 	// ellipse(200, 200, 200, 200);
-
+	ellipse(400, 400, 200, 200)
 
 	// Draw a square
 	// rect(200, 200, 200, 200);
-
+	rect(200, 200, 200, 200);
 
 	// Draw a line
 	// line(0, 0, 300, 300);
+	line(0, 0, 300, 300);
+	stroke(100); //width of line
 
 	// Draw a colored circle
-	// fill(0, 255, 100);
-	// ellipse(200, 200, 200, 200);
+	 fill(0, 255, 100);
+	 ellipse(200, 200, 200, 200);
 }

Lessons/02 Variables/index.html

@@ -7,9 +7,10 @@ let y = 255;
 let radius = 250;
 
 function draw() {
-	ellipse(x, y, radius, radius);
+	//background(0);
+	//ellipse(x, y, radius, radius);
 	// Every time draw is called, x is updated to 2 + its initial value
-	x = x + 2;
+	//	x = x + 2;
 
 
 	// Background allows us to set a background color
@@ -19,8 +20,8 @@ function draw() {
 
 
 	// We can also change colors using variables
-	// background(255);
-	// fill(x, y - x, 0);
-	// ellipse(x, y, radius, radius);
-	// x = x + 1;
+	background(255);
+	fill(x, y - x, x);
+	ellipse(x, y, radius, radius);
+	x = x + 1;
 }

Lessons/02 Variables/script.js

@@ -1,25 +1,122 @@
 function setup() {
-	createCanvas(1000, 500);
+	createCanvas(1000, 600);
 }
 
-let x = 0;
-let y = 255;
-let radius = 250;
+// function ell(a) {
+// 	ellipse(100 * a, 100, 50, 50);
+// }
+//
+// function add(a, b) {
+// 	let answer = a + b;
+// 	return answer;
+// }
+//
+// let sum = add(10, 5);
+//
+
 
-function draw() {
-	ellipse(x, y, radius, radius);
-	x = x + 2;
 
+// let xchange = 10;
+// let ychange = 10;
+// let x = 100;
+// let y = 100;
+// let r = 50;
+// function draw() {
+// 	background(0);
+// 	ellipse(x, y, r*2, r*2);
+// 	x = x + xchange;
+// 	y = y + ychange;
+//
+// 	fill(255);
+// 	if (x >= 1000 || x < r) {
+// 		xchange = -xchange
+// 	}
+// 	if (y >= 600 || y < r) {
+// 		ychange = -ychange
+// 	}
+// 	if (mouseIsPressed) {
+// 		x = mouseX;
+// 		y = mouseY;
+// 	}
+//
+// }
 
-	// Background allows us to set a background color
-	// background(255);
-	// ellipse(x, y, radius, radius);
-	// x = x + 2;
 
+let change = 5;
+let x = 0;
+function draw() {
+	background(0);
+	if (x >= 1000) {
+		change = -5;
+	}
+	else if (x <= 0) {
+		change = 5;
+	}
+	x = x + change;
 
-	// We can also change colors using variables
-	// background(255);
-	// fill(x, y - x, 0);
-	// ellipse(x, y, radius, radius);
-	// x = x + 1;
+	ellipse(x, 100, 100, 100);
 }
+
+
+
+
+
+//
+//
+//
+//
+//
+//
+// let i = 10;
+//
+// while (i < 20) {
+// 	ellipse(10, 10, 10, 10);
+// }
+//
+//
+//
+// let i = 11;
+//
+// if (i > 5) {
+// 	if (i > 10) {
+// 		ellipse(100, 100, 100, 100);
+// 	}
+// 	else if (i > 6) {
+// 		ellipse(50, 50, 50, 50);
+// 	}
+// 	else {
+// 		ellipse(25, 25, 25, 25);
+// 	}
+// }
+//
+// let j = 9;
+// for (let i = 0; j < 10; i++) {
+// 	ellipse(50, 50, 50, 50);
+// }
+//
+//
+//
+// let i = 0;
+// let j = 0;
+// for (; i < 10; j++) {
+// 	ellipse(50, 50, 50, 50);
+// }
+//
+//
+// let i = 10;
+// let j = i;
+//
+// i = i + 10;
+// // What is j right now?
+//
+// j = j + 5
+// // What is j right now?
+//
+// j = i
+// // What is j now?
+//
+//
+//
+//
+//
+//

Lessons/03 Draw/script.js

@@ -22,6 +22,30 @@ class Character {
 	}
 }
 
-function draw() {
+let Dora = new Character("Dora the Explorer", "Female", 0, 100, 100)
 
+
+class Ball {
+	constructor(position, speed, radius, color) {
+		this.position = position;
+		this.speed = speed;
+		this.radius = radius;
+		this.color = color;
+	}
+
+	check_walls() {
+		if (this.position.x >= width) {
+			this.speed = -this.speed;
+		}
+
+		if (this.position.x <= 0) {
+			this.speed = -this.speed;
+		}
+	}
 }
+
+
+
+let Ball1 = new Ball(10, 10, 10, 50, (10, 20, 30))
+
+Ball1.check_walls()