From 45162c9f2324a99c28d16731f4431adf543cb240 Mon Sep 17 00:00:00 2001 From: emcheung Date: Tue, 1 Dec 2015 12:30:02 -0500 Subject: [PATCH 1/6] Function "drawARandomCircle" --- ReturningValues/ReturningValues.pde | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/ReturningValues/ReturningValues.pde b/ReturningValues/ReturningValues.pde index 8b13789..57e2b47 100644 --- a/ReturningValues/ReturningValues.pde +++ b/ReturningValues/ReturningValues.pde @@ -1 +1,22 @@ +void setup() { + size(800, 600); +} +void draw() { + drawARandomCircle(); + if(mousePressed) { + drawACircleAt(mouseX,mouseY); + } +} + +void drawARandomCircle() { + float sz = random(5,150); + fill(random(255), 0, random(100,255)); + ellipse(random(width), random(height), sz,sz); +} + +void drawACircleAt(float x, float y) { + float sz = 10; + fill(255); + ellipse(x, y, sz, sz); +} \ No newline at end of file From 0119323c08d3433a4249beec9f2e5c0b3fa42302 Mon Sep 17 00:00:00 2001 From: emcheung Date: Tue, 1 Dec 2015 12:49:58 -0500 Subject: [PATCH 2/6] Added square and moving circle --- ReturningValues/ReturningValues.pde | 30 +++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/ReturningValues/ReturningValues.pde b/ReturningValues/ReturningValues.pde index 57e2b47..fe7877e 100644 --- a/ReturningValues/ReturningValues.pde +++ b/ReturningValues/ReturningValues.pde @@ -3,20 +3,30 @@ void setup() { } void draw() { - drawARandomCircle(); - if(mousePressed) { - drawACircleAt(mouseX,mouseY); - } + background(0); + drawASquare(); + drawACircleAt(mouseX, mouseY); + drawJon(jx, jy); } -void drawARandomCircle() { - float sz = random(5,150); - fill(random(255), 0, random(100,255)); - ellipse(random(width), random(height), sz,sz); +void drawASquare() { + float sz = 50; + fill(0, 0, 255); + rect(width/2-(sz/2), height/2-(sz/2), sz, sz); } void drawACircleAt(float x, float y) { - float sz = 10; + float sz = 30; fill(255); + if (keyPressed && key == '1') { + fill(255, 0, 0); + } + if (keyPressed && key == '2') { + fill(0, 255, 0); + } + if (keyPressed && key == '3') { + fill(0, 0, 255); + } ellipse(x, y, sz, sz); -} \ No newline at end of file +} + \ No newline at end of file From 9eb37d00d6432c445b720ed82d480da7cc5507ca Mon Sep 17 00:00:00 2001 From: emcheung Date: Tue, 1 Dec 2015 13:05:28 -0500 Subject: [PATCH 3/6] Function "drawJon" --- ReturningValues/ReturningValues.pde | 21 +++++++++++++++++++++ ReturningValues/data/jshih.jpg | Bin 0 -> 7648 bytes 2 files changed, 21 insertions(+) create mode 100644 ReturningValues/data/jshih.jpg diff --git a/ReturningValues/ReturningValues.pde b/ReturningValues/ReturningValues.pde index fe7877e..a9f22ac 100644 --- a/ReturningValues/ReturningValues.pde +++ b/ReturningValues/ReturningValues.pde @@ -1,5 +1,13 @@ +float jx, jy, xSpeed, ySpeed; +PImage jon; + void setup() { size(800, 600); + jon = loadImage("jshih.jpg"); + jx = width/2; + jy = height/2; + xSpeed = random(3, 5); + ySpeed = random(3, 5); } void draw() { @@ -7,6 +15,14 @@ void draw() { drawASquare(); drawACircleAt(mouseX, mouseY); drawJon(jx, jy); + jx += xSpeed; + jy += ySpeed; + if(jx > width - jon.width || jx < 0){ + xSpeed *= -1; + } + if(jy > height - jon.height || jy < 0){ + ySpeed *= -1; + } } void drawASquare() { @@ -29,4 +45,9 @@ void drawACircleAt(float x, float y) { } ellipse(x, y, sz, sz); } + +void drawJon(float jx, float jy) { + image(jon, jx, jy); +} + \ No newline at end of file diff --git a/ReturningValues/data/jshih.jpg b/ReturningValues/data/jshih.jpg new file mode 100644 index 0000000000000000000000000000000000000000..43a0fa8040123e5adc36517522e84df425f14933 GIT binary patch literal 7648 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 Date: Thu, 3 Dec 2015 12:54:20 -0500 Subject: [PATCH 4/6] Pythagorean Theorem --- ReturningValues/ReturningValues.pde | 54 ++++------------------------- 1 file changed, 6 insertions(+), 48 deletions(-) diff --git a/ReturningValues/ReturningValues.pde b/ReturningValues/ReturningValues.pde index a9f22ac..e33dc2d 100644 --- a/ReturningValues/ReturningValues.pde +++ b/ReturningValues/ReturningValues.pde @@ -1,53 +1,11 @@ -float jx, jy, xSpeed, ySpeed; -PImage jon; - +float a, b, c; void setup() { - size(800, 600); - jon = loadImage("jshih.jpg"); - jx = width/2; - jy = height/2; - xSpeed = random(3, 5); - ySpeed = random(3, 5); } - void draw() { - background(0); - drawASquare(); - drawACircleAt(mouseX, mouseY); - drawJon(jx, jy); - jx += xSpeed; - jy += ySpeed; - if(jx > width - jon.width || jx < 0){ - xSpeed *= -1; - } - if(jy > height - jon.height || jy < 0){ - ySpeed *= -1; - } -} - -void drawASquare() { - float sz = 50; - fill(0, 0, 255); - rect(width/2-(sz/2), height/2-(sz/2), sz, sz); + println(hypotenuse(5, 12)); } -void drawACircleAt(float x, float y) { - float sz = 30; - fill(255); - if (keyPressed && key == '1') { - fill(255, 0, 0); - } - if (keyPressed && key == '2') { - fill(0, 255, 0); - } - if (keyPressed && key == '3') { - fill(0, 0, 255); - } - ellipse(x, y, sz, sz); -} - -void drawJon(float jx, float jy) { - image(jon, jx, jy); -} - - \ No newline at end of file +float hypotenuse(float a, float b) { + float c = sqrt(sq(a) + sq(b)); + return c; +} \ No newline at end of file From 36d68185c753beb47c4d0362969c898dce5b70d4 Mon Sep 17 00:00:00 2001 From: emcheung Date: Thu, 3 Dec 2015 12:56:53 -0500 Subject: [PATCH 5/6] Adding three values --- ReturningValues/ReturningValues.pde | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/ReturningValues/ReturningValues.pde b/ReturningValues/ReturningValues.pde index e33dc2d..7aed3cb 100644 --- a/ReturningValues/ReturningValues.pde +++ b/ReturningValues/ReturningValues.pde @@ -2,10 +2,13 @@ float a, b, c; void setup() { } void draw() { - println(hypotenuse(5, 12)); + a = random(100); + b = random(100); + c = random(100); + println(add(a, b, c)); } -float hypotenuse(float a, float b) { - float c = sqrt(sq(a) + sq(b)); - return c; +float add(float a, float b, float c) { + float x = sqrt(sq(a) + sq(b)); + return x; } \ No newline at end of file From 1e2f3467e12bdd039ed5dd82c00d861eb77f1058 Mon Sep 17 00:00:00 2001 From: emcheung Date: Thu, 3 Dec 2015 13:03:07 -0500 Subject: [PATCH 6/6] Fixed adding function --- ReturningValues/ReturningValues.pde | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ReturningValues/ReturningValues.pde b/ReturningValues/ReturningValues.pde index 7aed3cb..f14c851 100644 --- a/ReturningValues/ReturningValues.pde +++ b/ReturningValues/ReturningValues.pde @@ -9,6 +9,6 @@ void draw() { } float add(float a, float b, float c) { - float x = sqrt(sq(a) + sq(b)); + float x = a + b + c; return x; } \ No newline at end of file