Merge pull request #25 from mkhattat/game

Game

Author: avanderlinden

src/main/java/nl/tudelft/pooralien/Controller/Board.java

@@ -9,8 +9,8 @@
  * The Board class.
  */
 public class Board {
-    private static final int WIDTH = 10;
-    private static final int HEIGHT = 10;
+    public static final int WIDTH = 10;
+    public static final int HEIGHT = 10;
     private static final int MIN_REQUIRED_ITEMS = 3;
 
     private Item[][] items = new Item[WIDTH][HEIGHT];

src/main/java/nl/tudelft/pooralien/Controller/Game.java

@@ -0,0 +1,35 @@
+package nl.tudelft.pooralien.Controller;
+
+/**
+ * class for controlling the flow of the game.
+ */
+public final class Game {
+    private static Game game;
+    private Board board;
+
+    /**
+     * Initialise the singleton Game object.
+     */
+    private Game() {
+        board = new Board();
+    }
+
+    /**
+     * Returns the single Game object.
+     * @return the Game object
+     */
+    public static synchronized Game getGame() {
+        if (game == null) {
+            game = new Game();
+        }
+        return game;
+    }
+
+    /**
+     * Returns the board.
+     * @return the board being used.
+     */
+    public Board getBoard() {
+        return board;
+    }
+}

src/main/java/nl/tudelft/pooralien/Launcher.java

@@ -1,24 +1,39 @@
 package nl.tudelft.pooralien;
 
+
+import nl.tudelft.pooralien.ui.MainScreen;
+
+import javax.swing.JFrame;
+
 /**
- * Created by mostafa on 7-9-17.
+ * The Launcher of the game.
  */
-final class Launcher {
+public class Launcher {
+
+    private MainScreen mainScreen;
 
     /**
-     * To prevent checkstyle error.
+     * Launch the game GUI.
      */
-    private Launcher() {
+    public void launch() {
+        JFrame mainWindow = new JFrame("Poor Alien");
+        MainScreen mainScreen = new MainScreen();
+        mainWindow.setSize(0, 0);
+        mainWindow.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        mainWindow.getContentPane().add(mainScreen);
 
+        new MouseEventHandler(mainScreen);
+        mainWindow.pack();
+        mainWindow.setVisible(true);
     }
 
     /**
      * Entry point of the game.
      * @param args The program arguments.
      */
-    public static void main(final String[] args) {
-
-        System.out.println("Hi");
-
+    public static void main(String[] args) {
+        //StartupScreen startupScreen = new StartupScreen();
+        //startupScreen.show();
+        new Launcher().launch();
     }
 }

src/main/java/nl/tudelft/pooralien/MouseEventHandler.java

@@ -1,9 +1,13 @@
 package nl.tudelft.pooralien;
 
+import nl.tudelft.pooralien.ui.Animation;
+import nl.tudelft.pooralien.ui.MainScreen;
+import nl.tudelft.pooralien.ui.RTLDragAnimation;
+import nl.tudelft.pooralien.ui.TTBDragAnimation;
+
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 import java.awt.event.MouseMotionListener;
-import javax.swing.JFrame;
 import java.awt.Point;
 
 /**
@@ -14,15 +18,18 @@
 public class MouseEventHandler implements MouseListener, MouseMotionListener {
 
     private MouseEventHandler.MouseAction mouseAction;
+    private MainScreen mainScreen;
+    private Animation dragAnimation;
 
     /**
      * Initiate event mouse listeners on a given JFrame.
      *
-     * @param window the JFrame where where to listen for events
+     * @param mainScreen the JFrame where where to listen for events
      */
-    public MouseEventHandler(JFrame window) {
-        window.addMouseListener(this);
-        window.addMouseMotionListener(this);
+    public MouseEventHandler(MainScreen mainScreen) {
+        mainScreen.addMouseListener(this);
+        mainScreen.addMouseMotionListener(this);
+        this.mainScreen = mainScreen;
     }
 
     /**
@@ -32,7 +39,6 @@ public MouseEventHandler(JFrame window) {
      * @param e the mouse event that was captured
      */
     public void mousePressed(MouseEvent e) {
-        System.out.println("Create MouseAction Object");
         Point mousePosition = new Point(e.getX(), e.getY());
         mouseAction = new MouseEventHandler.MouseAction(mousePosition);
     }
@@ -51,7 +57,11 @@ public void mouseReleased(MouseEvent e) {
         if (mouseAction.getMouseActionType() == MouseAction.CLICK_ACTION) {
             System.out.println("Click Action on x:" + xPos + ", y:" + yPos);
         } else {
-            System.out.println("End Drag Animation");
+            if (dragAnimation == null) {
+                return;
+            }
+            dragAnimation.end();
+            dragAnimation = null;
         }
     }
 
@@ -111,10 +121,17 @@ public void mouseDragged(MouseEvent e) {
         mouseAction.setPosition(mousePosition);
 
         if (mouseAction.getMouseActionType() != MouseAction.CLICK_ACTION) {
+            Point p = e.getPoint();
+            if (dragAnimation != null) {
+                dragAnimation.update(p);
+                return;
+            }
             if (mouseAction.getMouseActionType() == MouseAction.HORIZONTAL_DRAG_ACTION) {
-                System.out.println("Animate DRAG Horizontal x:" + e.getX() + ", y:" + e.getY());
+                dragAnimation = new RTLDragAnimation(mainScreen);
+                dragAnimation.start(p);
             } else if (mouseAction.getMouseActionType() == MouseAction.VERTICAL_DRAG_ACTION) {
-                System.out.println("Animate DRAG Vertical x:" + e.getX() + ", y:" + e.getY());
+                dragAnimation = new TTBDragAnimation(mainScreen);
+                dragAnimation.start(p);
             }
         }
     }
@@ -133,8 +150,6 @@ public class MouseAction {
         private Point startPoint;
         private Point currentPoint;
 
-        //private int xPosStart, yPosStart;
-        //private int xPosCurrent, yPosCurrent;
         private int mouseActionType;
 
 

src/main/java/nl/tudelft/pooralien/ui/Animation.java

@@ -0,0 +1,27 @@
+package nl.tudelft.pooralien.ui;
+
+import java.awt.Point;
+
+/**
+ * Interface for the Animation class.
+ */
+public interface Animation {
+    /**
+     * Initializing the drag move.
+     * @param p is the point where mouse is pressed.
+     */
+
+    void start(Point p);
+
+    /**
+     * updating of the screen when mouse is dragged.
+     * @param p the mouse coordinate of the new point.
+     */
+
+    void update(Point p);
+
+    /**
+     * End the animation.
+     */
+    void end();
+}

src/main/java/nl/tudelft/pooralien/ui/JPanelTile.java

@@ -0,0 +1,59 @@
+package nl.tudelft.pooralien.ui;
+
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import java.awt.Component;
+import java.awt.Point;
+
+/**
+ * JPanelTile holds image icons on the GridBoard on the screen.
+ */
+public class JPanelTile extends JPanel {
+    private JLabel imageIcon = null;
+    private Point gridPosition;
+
+    /**
+     * Constructor of JPanelTile.
+     * @param gridPosition is the position of this tile on the grid board.
+     */
+    public JPanelTile(Point gridPosition) {
+        super();
+        this.gridPosition = gridPosition;
+    }
+
+    @Override
+    public Component add(Component comp) {
+        imageIcon = (JLabel) comp;
+        return super.add(comp);
+    }
+
+    @Override
+    public void remove(Component comp) {
+        if (comp.equals(imageIcon)) {
+            imageIcon = null;
+        }
+        super.remove(comp);
+    }
+
+    @Override
+    public void removeAll() {
+        imageIcon = null;
+        super.removeAll();
+    }
+
+    /**
+     * Get the ImageIcon which is placed on a JLabel.
+     * @return JLabel containing the Icon of this object.
+     */
+    public JLabel getImageIcon() {
+        return imageIcon;
+    }
+
+    /**
+     * Get the position of this item on the GridBoard.
+     * @return the position of tile on the grid board.
+     */
+    public Point getGridPosition() {
+        return gridPosition;
+    }
+}