Begin javafx

12 files changed, 543 insertions, 6 deletions

diff --git a/src/main/java/adapter/IModelAdapter.java b/src/main/java/adapter/IModelAdapter.java
new file mode 100644
index 0000000..86139ee
--- /dev/null
+++ b/src/main/java/adapter/IModelAdapter.java
@@ -0,0 +1,12 @@
+package adapter;
+
+/**
+ * Created by loic on 21/09/16.
+ */
+public interface IModelAdapter {
+    void goUp();
+    void goDown();
+    void goLeft();
+    void goRight();
+    boolean isLoosed();
+}
diff --git a/src/main/java/adapter/ModelAdapter.java b/src/main/java/adapter/ModelAdapter.java
new file mode 100644
index 0000000..1eac58a
--- /dev/null
+++ b/src/main/java/adapter/ModelAdapter.java
@@ -0,0 +1,80 @@
+package adapter;
+
+import model.Board;
+import observer.IObservable;
+import observer.IObserver;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+
+/**
+ * Created by loic on 21/09/16.
+ */
+public class ModelAdapter implements IModelAdapter, IObservable{
+
+    private Board model;
+    private Collection<IObserver> observers;
+
+    public ModelAdapter(Board model){
+        this.model=model;
+        observers = new ArrayList<IObserver>();
+    }
+
+    @Override
+    public void goUp() {
+        model.goUp();
+        model.addRandomNumber();
+        this.notifyObservers();
+    }
+
+    @Override
+    public void goDown() {
+        model.goDown();
+        model.addRandomNumber();
+        this.notifyObservers();
+    }
+
+    @Override
+    public void goLeft() {
+        model.goLeft();
+        model.addRandomNumber();
+        this.notifyObservers();
+    }
+
+    @Override
+    public void goRight() {
+        model.goRight();
+        model.addRandomNumber();
+        this.notifyObservers();
+    }
+
+
+    @Override
+    public boolean isLoosed() {
+        return this.model.isLoosed();
+    }
+
+    public void addRandomNumber() {
+        this.model.addRandomNumber();
+        this.notifyObservers();
+    }
+
+    @Override
+    public void addObserver(IObserver observer) {
+        this.observers.add(observer);
+    }
+
+    @Override
+    public void removeObserver(IObserver observer) {
+        this.observers.remove(observer);
+    }
+
+    @Override
+    public void notifyObservers() {
+        Iterator<IObserver> i=this.observers.iterator();
+        while(i.hasNext()){
+            i.next().update();
+        }
+    }
+}
diff --git a/src/main/java/app/Application.java b/src/main/java/app/Application.java
index 7034373..9efd5e3 100644
--- a/src/main/java/app/Application.java
+++ b/src/main/java/app/Application.java
@@ -1,14 +1,44 @@
 package app;
 
-/**
- * Created by loic on 21/09/16.
- */
-public class Application {
+import adapter.ModelAdapter;
+import controller.MainWindowController;
+import javafx.event.EventHandler;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Parent;
+import javafx.scene.Scene;
+import javafx.scene.input.KeyEvent;
+import javafx.stage.Stage;
+import model.Board;
+import model.IModel;
+import observer.IObserver;
 
+import java.awt.*;
 
+public class Application extends javafx.application.Application{
+
+    public static void main(String[] args) {
+        launch(args);
+    }
+
+    @Override
+    public void start(Stage primaryStage) throws Exception {
+
+        FXMLLoader fxmlLoader = new FXMLLoader(Application.class.getClassLoader().getResource("JavafxView/MainWindow.fxml"));
+        Scene scene=new Scene((Parent)fxmlLoader.load());
+
+        primaryStage.setTitle("2048");
+        primaryStage.setScene(scene);
+
+
+        // COnfigure controller
+        IModel model=new Board(4,4);
+        ModelAdapter adapter=new ModelAdapter((Board) model);
+        adapter.addRandomNumber();
+        MainWindowController controller=fxmlLoader.getController();
+        adapter.addObserver((IObserver)controller);
+        controller.loadComponent(adapter,model,scene);
 
 
-    public static void main(String[] args){
-        System.out.println("Test");
+        primaryStage.show();
     }
 }
diff --git a/src/main/java/controller/ConsoleController.java b/src/main/java/controller/ConsoleController.java
new file mode 100644
index 0000000..95b1821
--- /dev/null
+++ b/src/main/java/controller/ConsoleController.java
@@ -0,0 +1,50 @@
+package controller;
+
+import adapter.IModelAdapter;
+import adapter.ModelAdapter;
+import model.Board;
+
+/**
+ * Created by loic on 21/09/16.
+ */
+public class ConsoleController implements IModelAdapter {
+
+    private ModelAdapter adapter;
+
+    public ConsoleController(ModelAdapter model){
+        this.adapter=model;
+    }
+
+    public void startGame(){
+        this.adapter.addRandomNumber();
+    }
+
+    @Override
+    public void goUp() {
+        adapter.goUp();
+    }
+
+    @Override
+    public void goDown() {
+        adapter.goDown();
+    }
+
+    @Override
+    public void goLeft() {
+        adapter.goLeft();
+    }
+
+    @Override
+    public void goRight() {
+        adapter.goRight();
+    }
+
+    @Override
+    public boolean isLoosed() {
+        return this.adapter.isLoosed();
+    }
+
+
+
+
+}
diff --git a/src/main/java/model/Board.java b/src/main/java/model/Board.java
new file mode 100644
index 0000000..7ed60a7
--- /dev/null
+++ b/src/main/java/model/Board.java
@@ -0,0 +1,147 @@
+package model;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Random;
+
+/**
+ * Created by loic on 21/09/16.
+ */
+public class Board implements IModel{
+
+    private int[][] board;
+    private Random rand = new Random();
+    private LineAlgorithm lineAlgorithm;
+
+
+    public Board(int sizeX, int sizeY){
+        board=new int[sizeY][sizeX];
+        this.cleanBoard();
+    }
+
+    public void goUp() {
+        for(int i=0;i<this.board[0].length;i++){
+
+            int[] column=this.lineAlgorithm.reverseLine(this.getColumn(i));
+
+
+            this.setColumn(this.lineAlgorithm.reverseLine(this.lineAlgorithm.mergeRight(column)), i);
+
+        }
+
+    }
+
+    public void goDown() {
+        for(int i=0;i<this.board[0].length;i++){
+            int[] column=this.getColumn(i);
+            this.setColumn(this.lineAlgorithm.mergeRight(column), i);
+        }
+    }
+
+    public void goLeft() {
+        for(int i=0;i<this.board.length;i++){
+            int[] tmp=this.lineAlgorithm.reverseLine(board[i]);
+            tmp=this.lineAlgorithm.mergeRight(tmp);
+            tmp=this.lineAlgorithm.reverseLine(tmp);
+            this.board[i]=tmp;
+        }
+    }
+
+
+    public void goRight() {
+        for(int i=0;i<this.board.length;i++){
+            this.board[i]=this.lineAlgorithm.mergeRight(board[i]);
+        }
+    }
+
+
+    private void cleanBoard(){
+        for(int i=0;i<this.board.length;i++) {
+            this.board[i]=this.lineAlgorithm.clearLine(this.board[i]);
+        }
+    }
+
+    private int[] getColumn(int index){
+        int[] column=new int[this.board.length];
+        for(int i=0;i<this.board.length;i++){
+            column[i]=this.board[i][index];
+        }
+        return column;
+    }
+
+    private void setColumn(int[] column, int index){
+        for(int i=0;i<this.board[index].length;i++){
+            this.board[i][index]=column[i];
+        }
+    }
+
+
+    public void addRandomNumber(){
+        Collection<Integer[]> choices=new ArrayList<Integer[]>();
+        for(int i=0;i<this.board.length;i++) {
+            for (int j = 0; j < this.board[i].length; j++) {
+                if(this.board[i][j]==-1){
+                    choices.add(new Integer[]{i,j});
+                }
+            }
+        }
+        if(choices.size()>0){
+            int index=0;
+            if(choices.size()>1){
+                index=rand.nextInt(choices.size()-1) + 0;
+            }
+            Integer[] xy=(Integer[])choices.toArray()[index];
+            this.board[xy[0]][xy[1]]=2;
+        }
+    }
+
+    private boolean boardsIsEquals(int[][] board1, int[][] board2){
+        if(board1.length!=board1.length){
+            return false;
+        }
+        else {
+            for (int i=0;i<board1.length;i++){
+                if(!this.lineAlgorithm.linesIsEquals(board1[i],board2[i])){
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public int[][] getBoard() {
+        return this.getCloneOfBoard();
+    }
+
+
+    public boolean isLoosed() {
+        int[][] copyBoard=this.getCloneOfBoard();
+
+        this.goDown();
+        if(boardsIsEquals(copyBoard, this.board)) {
+            this.goUp();
+            if (boardsIsEquals(copyBoard, this.board)) {
+                this.goRight();
+                if (boardsIsEquals(copyBoard, this.board)) {
+                    this.goLeft();
+                    if (boardsIsEquals(copyBoard, this.board)) {
+                        return true;
+                    }
+                }
+            }
+        }
+        this.board=copyBoard;
+
+        return false;
+    }
+
+
+    private int[][] getCloneOfBoard(){
+        int[][] copyBoard=new int[this.board.length][this.board[0].length];
+        for(int i=0;i<this.board.length;i++){
+            copyBoard[i]=this.board[i].clone();
+        }
+        return copyBoard;
+    }
+}
diff --git a/src/main/java/model/IModel.java b/src/main/java/model/IModel.java
new file mode 100644
index 0000000..4db2146
--- /dev/null
+++ b/src/main/java/model/IModel.java
@@ -0,0 +1,8 @@
+package model;
+
+/**
+ * Created by loic on 21/09/16.
+ */
+public interface IModel {
+    int[][] getBoard();
+}
diff --git a/src/main/java/model/LineAlgorithm.java b/src/main/java/model/LineAlgorithm.java
new file mode 100644
index 0000000..024db5c
--- /dev/null
+++ b/src/main/java/model/LineAlgorithm.java
@@ -0,0 +1,91 @@
+package model;
+
+/**
+ * Created by loic on 21/09/16.
+ */
+public class LineAlgorithm {
+
+
+
+    public static int[] mergeRight(int[] line){
+
+        line=gravityRight(line);
+
+        for(int i=(line.length-1);i>=0;i--){
+            if(i>0){
+                int a=line[i];
+                int b=line[i-1];
+                if(a==b && a!=-1){
+                    line[i]=a+b;
+                    line[i-1]=-1;
+                    i--;
+                }
+            }
+        }
+
+        line=gravityRight(line);
+
+        return line;
+    }
+
+
+    private static int[] gravityRight(int[] line){
+        for(int i=0;i<line.length;i++) {
+            for (int j = (line.length - 1); j >= 0; j--) {
+                int a = line[j];
+                if (j > 0) {
+                    int b = line[j - 1];
+                    if (a == -1) {
+                        line[j] = b;
+                        line[j - 1] = -1;
+                    }
+                }
+            }
+        }
+        return line;
+    }
+
+
+    public static int[] clearLine(int[] line){
+        for(int i=0;i<line.length;i++){
+            line[i]=-1;
+        }
+        return line;
+    }
+
+    public static int[] reverseLine(int[] line){
+        int[] reversedLine=new int[line.length];
+
+        int j=0;
+        for(int i=(line.length-1);i>=0;i--){
+            reversedLine[j]=line[i];
+            j++;
+        }
+
+        return reversedLine;
+    }
+
+    public static boolean linesIsEquals(int[] line1, int[] line2){
+        if(line1.length!=line2.length){
+            return false;
+        }
+        else {
+            for (int i=0;i<line1.length;i++){
+                if(line1[i]!=line2[i]){
+                    return false;
+                }
+            }
+        }
+        return true;
+
+    }
+
+    public static void printLine(int[] line){
+        System.out.println("----------");
+        for(int i=0;i<line.length;i++){
+            System.out.print(line[i]);
+        }
+        System.out.println("\n----------");
+
+    }
+}
diff --git a/src/main/java/observer/IObservable.java b/src/main/java/observer/IObservable.java
new file mode 100644
index 0000000..2dadc60
--- /dev/null
+++ b/src/main/java/observer/IObservable.java
@@ -0,0 +1,10 @@
+package observer;
+
+/**
+ * Created by loic on 21/09/16.
+ */
+public interface IObservable {
+    void addObserver(IObserver object);
+    void removeObserver(IObserver object);
+    void notifyObservers();
+}
diff --git a/src/main/java/observer/IObserver.java b/src/main/java/observer/IObserver.java
new file mode 100644
index 0000000..3bd1626
--- /dev/null
+++ b/src/main/java/observer/IObserver.java
@@ -0,0 +1,8 @@
+package observer;
+
+/**
+ * Created by loic on 21/09/16.
+ */
+public interface IObserver {
+    void update();
+}
diff --git a/src/main/java/view/ConsoleView.java b/src/main/java/view/ConsoleView.java
new file mode 100644
index 0000000..68e25f3
--- /dev/null
+++ b/src/main/java/view/ConsoleView.java
@@ -0,0 +1,68 @@
+package view;
+
+import controller.ConsoleController;
+import adapter.IModelAdapter;
+import model.IModel;
+import observer.IObserver;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+
+/**
+ * Created by loic on 21/09/16.
+ */
+public class ConsoleView implements IView, IObserver{
+
+    private ConsoleController controller;
+    private IModel model;
+
+
+    @Override
+    public void loadComponent(IModelAdapter controller, IModel model) {
+        this.controller= (ConsoleController) controller;
+        this.model=model;
+    }
+
+
+
+    @Override
+    public void show() {
+        this.controller.startGame();
+    }
+
+    @Override
+    public void update() {
+        BufferedReader br = new BufferedReader(new InputStreamReader(System.in));
+        int[][] board;
+        board = this.model.getBoard();
+
+        for (int i = 0; i < board.length; i++) {
+            for (int j = 0; j < board[i].length; j++) {
+                System.out.print(board[i][j] + "       ");
+            }
+            System.out.println();
+        }
+        System.out.println();
+
+        System.out.print("Enter U or D or L or R :");
+        String input = null;
+        try {
+            input = br.readLine();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        if(input.equals("U")){
+            controller.goUp();
+        }
+        else if(input.equals("D")){
+            controller.goDown();
+        }
+        else if(input.equals("L")){
+            controller.goLeft();
+        }
+        else if(input.equals("R")){
+            controller.goRight();
+        }
+    }
+}
diff --git a/src/main/java/view/IView.java b/src/main/java/view/IView.java
new file mode 100644
index 0000000..e0c3671
--- /dev/null
+++ b/src/main/java/view/IView.java
@@ -0,0 +1,13 @@
+package view;
+
+import adapter.IModelAdapter;
+import model.IModel;
+
+/**
+ * Created by loic on 21/09/16.
+ */
+public interface IView {
+
+    void loadComponent(IModelAdapter controller, IModel model);
+    void show();
+}
diff --git a/src/main/resources/JavafxView/MainWindow.fxml b/src/main/resources/JavafxView/MainWindow.fxml
new file mode 100644
index 0000000..5cf18e2
--- /dev/null
+++ b/src/main/resources/JavafxView/MainWindow.fxml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import java.net.*?>
+<?import javafx.geometry.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.text.*?>
+
+<?import javafx.scene.canvas.Canvas?>
+<BorderPane fx:controller="controller.MainWindowController"
+            xmlns:fx="http://javafx.com/fxml" prefWidth="800" prefHeight="800">
+
+    <top>
+    </top>
+    <center>
+        <Canvas fx:id="boardCanvas" height="500" width="500" />
+    </center>
+
+
+</BorderPane>
\ No newline at end of file