From 92129daa77fa558b27f0dc70084f7228e34d3cf4 Mon Sep 17 00:00:00 2001
From: Nilaw5 <89407770+Nilaw5@users.noreply.github.com>
Date: Thu, 26 Aug 2021 09:19:31 -0700
Subject: [PATCH 1/5] Update README.md
---
README.md | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 79 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index f7aa78e1..40e6b9e0 100644
--- a/README.md
+++ b/README.md
@@ -21,5 +21,83 @@ Note: The following Processing functions do not work on the web:
Samples of Student Work
-----------------------
-None yet!
+void setup (){
+size(400,400);
+background (100,150,200);
+}
+
+void draw(){
+
+//Back Tenticles
+stroke(50,150,90);
+strokeWeight(40);
+noFill();
+arc (150,70,100,200,PI/4,PI);
+
+arc(250,70,100,200,0,3*PI/4);
+strokeWeight(4);
+
+//Second from Back Tenticles
+stroke(50,150,90);
+strokeWeight(40);
+noFill();
+bezier(200,150,150,250,100,200,50,150);
+
+bezier(200,150,250,250,300,200,350,150);
+strokeWeight(4);
+
+//2nd from front Tenticles
+stroke(50,150,90);
+strokeWeight(40);
+noFill();
+arc (100,170,175,200,PI/4,4*PI/5);
+
+arc(300,170,175,200,1*PI/5, 3*PI/4);
+strokeWeight(4);
+
+//Front Tenticles
+stroke(50,150,90);
+strokeWeight(40);
+noFill();
+bezier(200,250,200,250,150,250,175,375);
+
+bezier(200,250,200,250,250,250,225,375);
+strokeWeight(4);
+
+//Body
+noStroke();
+fill(40,140,90);
+ellipse(200,200,110,120);
+
+/*control points for front tenticles
+stroke(255,0,0);
+point(200,250);
+point(200,250);
+point(150,250);
+point(250,250);*/
+
+//Head
+noStroke();
+fill(50,150,100);
+ellipse(200,125,110,150);
+
+//Eyes
+float leftEye = 175;
+float rightEye = 225;
+float eyeHeight = 100;
+float eyeSmall = 112.5;
+noStroke();
+fill(255,255,255);
+ellipse(leftEye,eyeHeight,20,40);
+ellipse(rightEye,eyeHeight,20,40);
+fill(0,0,0);
+ellipse(leftEye,eyeSmall,15,15);
+ellipse(rightEye,eyeSmall,15,15);
+
+//Mouth
+noFill();
+stroke(0,0,0);
+arc(200,170,50,25,PI/6,5*PI/6);
+
+}
From 1fc80a61db09f8f77aa7a86d2838ad926c870e31 Mon Sep 17 00:00:00 2001
From: Nilaw5 <89407770+Nilaw5@users.noreply.github.com>
Date: Thu, 26 Aug 2021 09:21:47 -0700
Subject: [PATCH 2/5] Update README.md
---
README.md | 80 +------------------------------------------------------
1 file changed, 1 insertion(+), 79 deletions(-)
diff --git a/README.md b/README.md
index 40e6b9e0..0bf0f51f 100644
--- a/README.md
+++ b/README.md
@@ -21,83 +21,5 @@ Note: The following Processing functions do not work on the web:
Samples of Student Work
-----------------------
-void setup (){
-size(400,400);
-background (100,150,200);
-}
-
-void draw(){
-
-//Back Tenticles
-stroke(50,150,90);
-strokeWeight(40);
-noFill();
-arc (150,70,100,200,PI/4,PI);
-
-arc(250,70,100,200,0,3*PI/4);
-strokeWeight(4);
-
-//Second from Back Tenticles
-stroke(50,150,90);
-strokeWeight(40);
-noFill();
-bezier(200,150,150,250,100,200,50,150);
-
-bezier(200,150,250,250,300,200,350,150);
-strokeWeight(4);
-
-//2nd from front Tenticles
-stroke(50,150,90);
-strokeWeight(40);
-noFill();
-arc (100,170,175,200,PI/4,4*PI/5);
-
-arc(300,170,175,200,1*PI/5, 3*PI/4);
-strokeWeight(4);
-
-//Front Tenticles
-stroke(50,150,90);
-strokeWeight(40);
-noFill();
-bezier(200,250,200,250,150,250,175,375);
-
-bezier(200,250,200,250,250,250,225,375);
-strokeWeight(4);
-
-//Body
-noStroke();
-fill(40,140,90);
-ellipse(200,200,110,120);
-
-/*control points for front tenticles
-stroke(255,0,0);
-point(200,250);
-point(200,250);
-point(150,250);
-point(250,250);*/
-
-//Head
-noStroke();
-fill(50,150,100);
-ellipse(200,125,110,150);
-
-//Eyes
-float leftEye = 175;
-float rightEye = 225;
-float eyeHeight = 100;
-float eyeSmall = 112.5;
-noStroke();
-fill(255,255,255);
-ellipse(leftEye,eyeHeight,20,40);
-ellipse(rightEye,eyeHeight,20,40);
-fill(0,0,0);
-ellipse(leftEye,eyeSmall,15,15);
-ellipse(rightEye,eyeSmall,15,15);
-
-//Mouth
-noFill();
-stroke(0,0,0);
-arc(200,170,50,25,PI/6,5*PI/6);
-
-}
+none yet!
From 9654111fcc7d61dcb3e20aeab8afc334bb958bad Mon Sep 17 00:00:00 2001
From: Nilaw5 <89407770+Nilaw5@users.noreply.github.com>
Date: Thu, 26 Aug 2021 09:22:25 -0700
Subject: [PATCH 3/5] Update VirtualPet.pde
---
VirtualPet.pde | 80 +++++++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 76 insertions(+), 4 deletions(-)
diff --git a/VirtualPet.pde b/VirtualPet.pde
index 08ca48b8..fe00aeeb 100644
--- a/VirtualPet.pde
+++ b/VirtualPet.pde
@@ -1,8 +1,80 @@
-void setup(){
- //some of your code here
+void setup (){
+size(400,400);
+background (100,150,200);
}
+
void draw(){
- //more of your code here
-}
+
+//Back Tenticles
+stroke(50,150,90);
+strokeWeight(40);
+noFill();
+arc (150,70,100,200,PI/4,PI);
+
+arc(250,70,100,200,0,3*PI/4);
+strokeWeight(4);
+
+//Second from Back Tenticles
+stroke(50,150,90);
+strokeWeight(40);
+noFill();
+bezier(200,150,150,250,100,200,50,150);
+
+bezier(200,150,250,250,300,200,350,150);
+strokeWeight(4);
+
+//2nd from front Tenticles
+stroke(50,150,90);
+strokeWeight(40);
+noFill();
+arc (100,170,175,200,PI/4,4*PI/5);
+
+arc(300,170,175,200,1*PI/5, 3*PI/4);
+strokeWeight(4);
+
+//Front Tenticles
+stroke(50,150,90);
+strokeWeight(40);
+noFill();
+bezier(200,250,200,250,150,250,175,375);
+bezier(200,250,200,250,250,250,225,375);
+strokeWeight(4);
+
+//Body
+noStroke();
+fill(40,140,90);
+ellipse(200,200,110,120);
+
+/*control points for front tenticles
+stroke(255,0,0);
+point(200,250);
+point(200,250);
+point(150,250);
+point(250,250);*/
+
+//Head
+noStroke();
+fill(50,150,100);
+ellipse(200,125,110,150);
+
+//Eyes
+float leftEye = 175;
+float rightEye = 225;
+float eyeHeight = 100;
+float eyeSmall = 112.5;
+noStroke();
+fill(255,255,255);
+ellipse(leftEye,eyeHeight,20,40);
+ellipse(rightEye,eyeHeight,20,40);
+fill(0,0,0);
+ellipse(leftEye,eyeSmall,15,15);
+ellipse(rightEye,eyeSmall,15,15);
+
+//Mouth
+noFill();
+stroke(0,0,0);
+arc(200,170,50,25,PI/6,5*PI/6);
+
+}
From 2fef835360a52786e38154ccb8763e67f955c810 Mon Sep 17 00:00:00 2001
From: Nilaw5 <89407770+Nilaw5@users.noreply.github.com>
Date: Thu, 26 Aug 2021 09:24:57 -0700
Subject: [PATCH 4/5] Update index.html
---
index.html | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/index.html b/index.html
index 237da25c..6cd6c5af 100644
--- a/index.html
+++ b/index.html
@@ -1,21 +1,21 @@
- Title
+ Nikhita's Octopus Pet
- Headline
+ Thomas the Octopus