Begin javafx
This commit is contained in:
parent
f281a7189c
commit
5446859dee
17 changed files with 681 additions and 103 deletions
12
src/main/java/adapter/IModelAdapter.java
Normal file
12
src/main/java/adapter/IModelAdapter.java
Normal file
|
@ -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();
|
||||
}
|
80
src/main/java/adapter/ModelAdapter.java
Normal file
80
src/main/java/adapter/ModelAdapter.java
Normal file
|
@ -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();
|
||||
}
|
||||
}
|
||||
}
|
|
@ -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();
|
||||
}
|
||||
}
|
||||
|
|
50
src/main/java/controller/ConsoleController.java
Normal file
50
src/main/java/controller/ConsoleController.java
Normal file
|
@ -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();
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
147
src/main/java/model/Board.java
Normal file
147
src/main/java/model/Board.java
Normal file
|
@ -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;
|
||||
}
|
||||
}
|
8
src/main/java/model/IModel.java
Normal file
8
src/main/java/model/IModel.java
Normal file
|
@ -0,0 +1,8 @@
|
|||
package model;
|
||||
|
||||
/**
|
||||
* Created by loic on 21/09/16.
|
||||
*/
|
||||
public interface IModel {
|
||||
int[][] getBoard();
|
||||
}
|
91
src/main/java/model/LineAlgorithm.java
Normal file
91
src/main/java/model/LineAlgorithm.java
Normal file
|
@ -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----------");
|
||||
|
||||
}
|
||||
}
|
10
src/main/java/observer/IObservable.java
Normal file
10
src/main/java/observer/IObservable.java
Normal file
|
@ -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();
|
||||
}
|
8
src/main/java/observer/IObserver.java
Normal file
8
src/main/java/observer/IObserver.java
Normal file
|
@ -0,0 +1,8 @@
|
|||
package observer;
|
||||
|
||||
/**
|
||||
* Created by loic on 21/09/16.
|
||||
*/
|
||||
public interface IObserver {
|
||||
void update();
|
||||
}
|
68
src/main/java/view/ConsoleView.java
Normal file
68
src/main/java/view/ConsoleView.java
Normal file
|
@ -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();
|
||||
}
|
||||
}
|
||||
}
|
13
src/main/java/view/IView.java
Normal file
13
src/main/java/view/IView.java
Normal file
|
@ -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();
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue