Day 1

audreychan · audreychan · commit 7a10dedf6241 · 2018-07-30T14:58:49.000-07:00
diff --git a/src/section1/Logical Dot/Logical_dot/Logical_dot.pde b/src/section1/Logical Dot/Logical_dot/Logical_dot.pde
@@ -0,0 +1,11 @@
+void setup(){
+  size(800, 800);
+}
+
+void draw(){
+  fill(#2D92FA);
+  if(mousePressed){
+    fill(#890B0B);
+  }
+  ellipse(400, 400, 800, 800);
+}
diff --git a/src/section1/Tash Me/Tash_Me/Tash_Me.pde b/src/section1/Tash Me/Tash_Me/Tash_Me.pde
@@ -0,0 +1,17 @@
+PImage mustache;
+PImage friend;
+
+void setup(){
+  friend = loadImage("delara.jpg");
+  size(800, 600);
+  friend.resize(width, height);
+  mustache = loadImage("Mustache.png");
+  mustache.resize(50, 25);
+}
+
+void draw(){
+  background(friend);
+  if(mousePressed){
+    image(mustache, mouseX - 250, mouseY - 75);
+  }
+}
diff --git a/src/section1/Tash Me/Tash_Me/data/Mustache.png b/src/section1/Tash Me/Tash_Me/data/Mustache.png
diff --git a/src/section1/Tash Me/Tash_Me/data/delara.jpg b/src/section1/Tash Me/Tash_Me/data/delara.jpg
diff --git a/src/section1/Unicorns On A Rainbow/WakandaForever/WakandaForever.pde b/src/section1/Unicorns On A Rainbow/WakandaForever/WakandaForever.pde
@@ -0,0 +1,13 @@
+PImage wakanda;
+PImage quinjet;
+
+void setup(){
+  wakanda = loadImage("Wakanda.jpeg");
+  size(640, 357);
+  quinjet = loadImage("Quinjet.png");
+}
+
+void draw(){
+  background(wakanda);
+  image(quinjet, mouseX, mouseY);
+}
diff --git a/src/section1/Unicorns On A Rainbow/WakandaForever/data/Quinjet.png b/src/section1/Unicorns On A Rainbow/WakandaForever/data/Quinjet.png
diff --git a/src/section1/Unicorns On A Rainbow/WakandaForever/data/Wakanda.jpeg b/src/section1/Unicorns On A Rainbow/WakandaForever/data/Wakanda.jpeg
diff --git a/src/section2/FourSquare.java b/src/section2/FourSquare.java
@@ -6,27 +6,41 @@
 public class FourSquare {
 	
 	// 2. Create a new Robot
+	Robot r2d3 = new Robot();
 
 	void go() {
 		// 4. Make the robot move as fast as possible
+		r2d3.setSpeed(5000);
 
 		// 5. Set the pen width to 5
+		r2d3.setPenWidth(5);
 
 		// 6. Use a for loop to repeat steps #7 to #8, four times...
+		for(int i = 0; i < 4; i ++) {
 
 			// 7. Set the pen color to random
+			r2d3.setRandomPenColor();
 	
 			// 1. Call the drawSquare() method
+		    drawSquare();
 	
 			// 8. Turn the robot 90 degrees to the right
-
+		    r2d3.turn(90);
+		}
 	}
 
 	
 	void drawSquare() {
 		JOptionPane.showMessageDialog(null, "yay! you called the drawSquare() method!");
 		/* 3. Fill in the code to draw a square inside the method below. */
+		r2d3.penDown();
+		r2d3.hide();
+		for(int i = 0; i < 4; i ++) {
+			r2d3.move(100);
+			r2d3.turn(90);
+		
 		
+		}
 		
 	}
 
diff --git a/src/section2/MyFirstJavaProgram.java b/src/section2/MyFirstJavaProgram.java
@@ -8,8 +8,15 @@ public class MyFirstJavaProgram {
 	public static void main(String[] args) {
 		
 		// START HERE
-	
-		
-		
+	System.out.println("Hello world!");
+	Robot r2d2 = new Robot();
+	r2d2.penDown();
+	r2d2.setSpeed(50);
+	r2d2.hide();
+	r2d2.setPenColor(Color.BLUE);
+	for(int i = 0; i < 4; i ++) {
+	r2d2.move(100);	
+	r2d2.turn(90);	
+	}
 	}
 }
diff --git a/src/section2/StarShow.java b/src/section2/StarShow.java
@@ -12,46 +12,24 @@ public class StarShow {
 	Robot robot = new Robot("batman");
 	
 	void makeStars() {
+		robot.hide();
+		robot.moveTo(30, 550);
+		for(int i = 15; i < 150; i += 10) {
+			drawStar(i);
+			robot.moveTo(robot.getX() + 15 + i / 2, robot.getY() - 15 - i / 2);
+			robot.setRandomPenColor();
+		}
 		
-		drawStar(150);	//5. delete this line. You will draw the star again in step 8.
-		// 13. Set the speed to 8
-
-		// 6. Make a variable to hold the X position of the Robot and set it to 10
-
-		// 7. Make a variable to hold the Y position of the Robot and set it to 600
-
-		// 8. Make a variable to hold the star size and set it to 25
-
-		// 12. Use a for loop to repeat steps #19 to #18, 30 times
-
-			// 19. Set the pen width to i 
-	
-			// 10. Set the X position of the robot to your X variable
-	
-			// 11. Set the Y position of the robot to your Y variable
-	
-			// 9. Call the drawStar() method with your star size variable
-	
-			// 14. Increase the value of the X position variable by star size. See Figure 2
-	
-			// 15. decrease the value of the Y position variable by star size. See Figure 3
-	
-			// 16. Increase the star size by 20
-	
-			// 17. Turn the robot 12 degrees
-	
-			// 18. Make each star a different random color like in Figure 4
 
 	}
 
 	private void drawStar(int starSize) {
-		// 2. Put the robot's pen down
-
-		// 4. Repeat both commands 5 times. See Figure 1 at http://bit.ly/star-show
-
-			// 1. Move the robot the distance of the starSize variable
-	
-			// 3. Turn the robot 144 degrees
+		robot.penDown();
+		robot.setSpeed(500000);
+		for(int i = 0; i < 5; i ++) {
+			robot.move(starSize);
+			robot.turn(144);
+		}
 			
 	}
 	
diff --git a/src/section3/CandyCrush.java b/src/section3/CandyCrush.java
@@ -6,13 +6,13 @@ public class CandyCrush {
 
 	public static void main(String[] args) {
 		// 1. Using a pop-up, ask the user who they don't like
-
+        String dislike = JOptionPane.showInputDialog("Who do you dislike");
 		// 2. Change the next line so that the pop-up will tell them they have a crush on that person
-		JOptionPane.showMessageDialog(null, "You totally have a crush on Java!");
+		JOptionPane.showMessageDialog(null, "You totally have a crush on " + dislike + "!");
 		// 3. Ask the user for the name of their best friend
-
+        String bestFriend = JOptionPane.showInputDialog("Who is your best friend?");
 		// 4. Tell them their best friend is as sweet as candy
-
+        JOptionPane.showMessageDialog(null, bestFriend + " is as sweet as candy.");
 	} 
 }
 
diff --git a/src/section3/Greeter.java b/src/section3/Greeter.java
@@ -0,0 +1,10 @@
+package section3;
+
+import javax.swing.JOptionPane;
+
+public class Greeter {
+public static void main(String[] args) {
+	String name = JOptionPane.showInputDialog("What's your name?");
+	System.out.println("Hello," + name);
+}
+}
diff --git a/src/section3/NicestProgram.java b/src/section3/NicestProgram.java
@@ -0,0 +1,10 @@
+package section3;
+
+import javax.swing.JOptionPane;
+
+public class NicestProgram {
+public static void main(String[] args) {
+	JOptionPane.showMessageDialog(null, "Nice shirt");
+	JOptionPane.showMessageDialog(null, "Nice face");
+}
+}
diff --git a/src/section3/SpeakAndSpell.java b/src/section3/SpeakAndSpell.java
@@ -9,13 +9,17 @@ public class SpeakAndSpell {
 
 	public static void main(String[] args) {
 		// 1. Use the speak method to say the word. "e.g. spell mandlebrot"
-
+        speak("handkerchief");
 		// 2. Catch the user's answer in a String
-
+        String answer = JOptionPane.showInputDialog("Spell what you heard");
 		// 3. If the user spelled the word correctly, speak "correct"
-
+        if(answer.equals("handkerchief")) {
+        	speak("correct");
+        }
 		// 4. Otherwise say "wrong"
-
+        else {
+        	speak("wrong");
+        }
 		// 5. repeat the process for other words
 		
 	}
diff --git a/src/section3/StephenHawking.java b/src/section3/StephenHawking.java
@@ -7,13 +7,17 @@
 public class StephenHawking {
 	
 	// 1. make a main method and put steps 2, 3 & 4 inside it
+	public static void main(String[] args) {
+		
 	
 	// 4. Use a for loop to repeat steps #2 and #3, a lot of times
-	
+	for(int i = 0; i < 5; i ++) {
 	// 2. ask the user for a sentence
-	
+	String userSentence = JOptionPane.showInputDialog("Write a sentence:");
 	// 3. call the speak method below and send it the sentence
-
+	speak(userSentence);
+	}
+	}
 	
 
 	
