square color and movement speed

MoveTheSquare/src/edu/ycp/cs320/movethesquare/controllers/GameController.java

@@ -4,26 +4,38 @@
 import edu.ycp.cs320.movethesquare.model.Square;
 
 public class GameController {
+	private double lastFrame, currFrame, deltaTime;
+
+	public GameController()
+	{		
+		currFrame = System.currentTimeMillis();
+		lastFrame = System.currentTimeMillis();
+		deltaTime = 0;
+	}
+
 	public void computeSquareMoveDirection(Game game, Square square, double mouseX, double mouseY) {
 		if (mouseX >= 0 && mouseX < game.getWidth() && mouseY >= 0 && mouseY < game.getHeight()) {
 			double dx = mouseX - (square.getX() + square.getWidth()/2);
 			double dy = mouseY - (square.getY() + square.getHeight()/2);
 
 			double moveX = 0, moveY = 0;
 			if (dx > 0) {
-				moveX = Game.MOVE_DIST;
-			} else {
-				moveX = -Game.MOVE_DIST;
+				moveX = Game.MOVE_DIST * deltaTime;
+			} else if(dx < 0){
+				moveX = -Game.MOVE_DIST * deltaTime;
 			}
 			if (dy > 0) {
-				moveY = Game.MOVE_DIST;
-			} else {
-				moveY = -Game.MOVE_DIST;
+				moveY = Game.MOVE_DIST * deltaTime;
+			} else if(dy < 0){
+				moveY = -Game.MOVE_DIST * deltaTime;
 			}
 
 			game.setSquareDx(moveX);
 			game.setSquareDy(moveY);
 		}
+		currFrame = System.currentTimeMillis();
+		deltaTime = (currFrame - lastFrame) / 1000; //	time between frames in seconds
+		lastFrame = currFrame;
 	}
 
 	public void moveSquare(Game model, Square square) {

MoveTheSquare/src/edu/ycp/cs320/movethesquare/model/Game.java

@@ -1,7 +1,7 @@
 package edu.ycp.cs320.movethesquare.model;
 
 public class Game {
-	public static final double MOVE_DIST = 2.0; // x/y distance square moves each tick 
+	public static final double MOVE_DIST = 100; // x/y distance square moves each tick 
 	private double width, height;
 	private Square square;
 	private double squareDx;

MoveTheSquare/src/edu/ycp/cs320/movethesquare/ui/GameView.java

@@ -66,7 +66,7 @@ protected void paintComponent(Graphics g) {
 
 		// djh2-KEC110-21: changed from GREEN to RED
 		// djh2-YCPlaptop: change from RED to YELLOW
-		g.setColor(Color.YELLOW);
+		g.setColor(Color.BLUE);
 
 		Square square = model.getSquare();