loic/2048-javafx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add 2 and 4

Browse source
This commit is contained in:
loic 2016-09-22 20:57:53 +02:00
parent 641043d526
commit 93953a52ce
2 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/adapter/ModelAdapter.java
View file

@ -24,28 +24,24 @@ public class ModelAdapter implements IModelAdapter, IObservable{
@Override @Override
public void goUp() { public void goUp() {
model.goUp(); model.goUp();
model.addRandomNumber();
this.notifyObservers(); this.notifyObservers();
} }
@Override @Override
public void goDown() { public void goDown() {
model.goDown(); model.goDown();
model.addRandomNumber();
this.notifyObservers(); this.notifyObservers();
} }
@Override @Override
public void goLeft() { public void goLeft() {
model.goLeft(); model.goLeft();
model.addRandomNumber();
this.notifyObservers(); this.notifyObservers();
} }
@Override @Override
public void goRight() { public void goRight() {
model.goRight(); model.goRight();
model.addRandomNumber();
this.notifyObservers(); this.notifyObservers();
} }

20
src/main/java/model/Board.java
View file

@ -20,6 +20,8 @@ public class Board implements IModel{
} }
public void goUp() { public void goUp() {
int [][] lastBoard=this.getCloneOfBoard();
for(int i=0;i<this.board[0].length;i++){ for(int i=0;i<this.board[0].length;i++){
int[] column=this.lineAlgorithm.reverseLine(this.getColumn(i)); int[] column=this.lineAlgorithm.reverseLine(this.getColumn(i));
@ -28,30 +30,48 @@ public class Board implements IModel{
this.setColumn(this.lineAlgorithm.reverseLine(this.lineAlgorithm.mergeRight(column)), i); this.setColumn(this.lineAlgorithm.reverseLine(this.lineAlgorithm.mergeRight(column)), i);
} }
if(!boardsIsEquals(this.board,lastBoard)){
this.addRandomNumber();
}
} }
public void goDown() { public void goDown() {
int [][] lastBoard=this.getCloneOfBoard();
for(int i=0;i<this.board[0].length;i++){ for(int i=0;i<this.board[0].length;i++){
int[] column=this.getColumn(i); int[] column=this.getColumn(i);
this.setColumn(this.lineAlgorithm.mergeRight(column), i); this.setColumn(this.lineAlgorithm.mergeRight(column), i);
} }
if(!boardsIsEquals(this.board,lastBoard)){
this.addRandomNumber();
}
} }
public void goLeft() { public void goLeft() {
int [][] lastBoard=this.getCloneOfBoard();
for(int i=0;i<this.board.length;i++){ for(int i=0;i<this.board.length;i++){
int[] tmp=this.lineAlgorithm.reverseLine(board[i]); int[] tmp=this.lineAlgorithm.reverseLine(board[i]);
tmp=this.lineAlgorithm.mergeRight(tmp); tmp=this.lineAlgorithm.mergeRight(tmp);
tmp=this.lineAlgorithm.reverseLine(tmp); tmp=this.lineAlgorithm.reverseLine(tmp);
this.board[i]=tmp; this.board[i]=tmp;
} }
if(!boardsIsEquals(this.board,lastBoard)){
this.addRandomNumber();
}
} }
public void goRight() { public void goRight() {
int [][] lastBoard=this.getCloneOfBoard();
for(int i=0;i<this.board.length;i++){ for(int i=0;i<this.board.length;i++){
this.board[i]=this.lineAlgorithm.mergeRight(board[i]); this.board[i]=this.lineAlgorithm.mergeRight(board[i]);
} }
if(!boardsIsEquals(this.board,lastBoard)){
this.addRandomNumber();
}
} }