From 15ac81485303acd5fcd7ae075182ec695dc05736 Mon Sep 17 00:00:00 2001 From: Jay Date: Fri, 20 Feb 2015 09:31:36 -0500 Subject: [PATCH 1/2] Fixed java issue --- .../controllers/GameController.java | 47 ++++++++++--------- 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/MoveTheSquare/src/edu/ycp/cs320/movethesquare/controllers/GameController.java b/MoveTheSquare/src/edu/ycp/cs320/movethesquare/controllers/GameController.java index 9c20be9..4e9b039 100644 --- a/MoveTheSquare/src/edu/ycp/cs320/movethesquare/controllers/GameController.java +++ b/MoveTheSquare/src/edu/ycp/cs320/movethesquare/controllers/GameController.java @@ -1,33 +1,38 @@ -package edu.ycp.cs320.movethesquare.controllers; - import edu.ycp.cs320.movethesquare.model.Game; import edu.ycp.cs320.movethesquare.model.Square; -public class GameController { - 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); + +class GameController: + def __init__(self, game, square, mouseX, mouseY): + game = game + square = square + mouseX = mouseX + mouseY = mouseY + self.control_game() + + def control_game(): + if mouseX >= 0 and mouseX < game.getWidth() and mouseY >= 0 and mouseY < game.getHeight(): + dx = mouseX - (square.getX() + square.getWidth()/2); + dy = mouseY - (square.getY() + square.getHeight()/2); - double moveX = 0, moveY = 0; - if (dx > 0) { + moveX = 0 + moveY = 0 + if dx > 0: moveX = Game.MOVE_DIST; - } else { + else: moveX = -Game.MOVE_DIST; - } - if (dy > 0) { + if dy > 0: moveY = Game.MOVE_DIST; - } else { + else: moveY = -Game.MOVE_DIST; - } game.setSquareDx(moveX); game.setSquareDy(moveY); - } - } + + + def moveSquare(Game model, Square square): + square.setX(square.getX() + model.getSquareDx()) + square.setY(square.getY() + model.getSquareDy()) + + - public void moveSquare(Game model, Square square) { - square.setX(square.getX() + model.getSquareDx()); - square.setY(square.getY() + model.getSquareDy()); - } -} From d675e696dac30489d510350baf4eb659c51053c6 Mon Sep 17 00:00:00 2001 From: Jay Date: Fri, 20 Feb 2015 09:34:06 -0500 Subject: [PATCH 2/2] completed filetype conversion --- .../controllers/{GameController.java => GameController.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename MoveTheSquare/src/edu/ycp/cs320/movethesquare/controllers/{GameController.java => GameController.py} (100%) diff --git a/MoveTheSquare/src/edu/ycp/cs320/movethesquare/controllers/GameController.java b/MoveTheSquare/src/edu/ycp/cs320/movethesquare/controllers/GameController.py similarity index 100% rename from MoveTheSquare/src/edu/ycp/cs320/movethesquare/controllers/GameController.java rename to MoveTheSquare/src/edu/ycp/cs320/movethesquare/controllers/GameController.py