aaron/7not7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added plotting nextBlocks

Browse Source
This commit is contained in:
t-moe
2016-06-17 08:51:53 +02:00
parent 78eddfe5d2
commit 969a4e7869
2 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/ch/bfh/sevennotseven/FieldCanvas.java
View File

@@ -11,7 +11,10 @@ import javax.swing.JPanel;
public class FieldCanvas extends JPanel{ public class FieldCanvas extends JPanel{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
static final int border = 5; static final int borderLeft = 5;
static final int borderRight = 5;
static final int borderTop = 100;
static final int borderBottom = 5;
static final Color[] colors = {Color.red,Color.green, Color.blue, Color.yellow,Color.magenta}; static final Color[] colors = {Color.red,Color.green, Color.blue, Color.yellow,Color.magenta};
@@ -29,7 +32,7 @@ public class FieldCanvas extends JPanel{
super.mousePressed(e); super.mousePressed(e);
Point p = FieldCanvas.this.getClickPoint(e.getPoint()); Point p = FieldCanvas.this.getClickPoint(e.getPoint());
if(p==null) { //invalid click if(p==null || game.getField()[p.x][p.y]==0) { //invalid click
src = null; src = null;
} else { } else {
src = p; src = p;
@@ -57,7 +60,7 @@ public class FieldCanvas extends JPanel{
super.mouseReleased(e); super.mouseReleased(e);
dst = FieldCanvas.this.getClickPoint(e.getPoint()); dst = FieldCanvas.this.getClickPoint(e.getPoint());
path = null; path = null;
if(dst != null && src!=null) { if(dst != null && src!=null && !src.equals(dst)) {
System.out.println("Moving from "+src.toString()+ " to "+dst.toString()); System.out.println("Moving from "+src.toString()+ " to "+dst.toString());
game.doMove(src, dst); game.doMove(src, dst);
repaint(); repaint();
@@ -72,10 +75,10 @@ public class FieldCanvas extends JPanel{
} }
private Point getClickPoint(Point globalPos) { private Point getClickPoint(Point globalPos) {
int total = Math.min(this.getHeight(),FieldCanvas.this.getWidth())-2*border; int total = Math.min(this.getHeight()-borderTop-borderBottom,FieldCanvas.this.getWidth()-borderLeft-borderRight);
int space = total/size; int space = total/size;
globalPos.translate(-border, -border); globalPos.translate(-borderLeft, -borderTop);
if(globalPos.x<0 || globalPos.x >total || globalPos.y < 0 || globalPos.y > total) return null; if(globalPos.x<0 || globalPos.x >total || globalPos.y < 0 || globalPos.y > total) return null;
return new Point(globalPos.x/space,globalPos.y/space); return new Point(globalPos.x/space,globalPos.y/space);
} }
@@ -89,16 +92,28 @@ public class FieldCanvas extends JPanel{
} }
public void paintComponent(Graphics g) { public void paintComponent(Graphics g) {
super.paintComponent(g); super.paintComponent(g);
g.setColor(Color.lightGray); g.setColor(Color.lightGray);
g.translate(border, border); List<Integer> nextBlocks = game.getNextBlocks();
int total = Math.min(this.getHeight(),this.getWidth())-2*border; for(int i=0; i< nextBlocks.size(); i++) {
g.setColor(colors[nextBlocks.get(i)-1]);
g.fillRect(borderLeft + borderTop/2 *i, borderTop/4, borderTop/2, borderTop/2);
g.setColor(Color.white);
g.drawRect(borderLeft + borderTop/2 *i, borderTop/4, borderTop/2, borderTop/2);
}
g.setColor(Color.lightGray);
g.translate(borderLeft, borderTop);
int total = Math.min(this.getHeight()-borderTop-borderBottom,FieldCanvas.this.getWidth()-borderLeft-borderRight);
int space = total/size; int space = total/size;
g.setClip(0, 0, total-1,total-1); g.setClip(0, 0, total-4,total-4);
g.fillRect(0, 0, total-1,total-1); g.fillRect(0, 0, total-4,total-4);
g.setColor(Color.white); g.setColor(Color.white);

7
src/ch/bfh/sevennotseven/Game.java
View File

@@ -63,15 +63,14 @@ public class Game {
} }
public boolean doMove(Point src, Point dst){ public boolean doMove(Point src, Point dst){
if(field[src.x][src.y]==0 ||field[dst.x][dst.y] !=0 || src.equals(dst)) {
return false;
}
if(!canMove(src, dst)) { if(!canMove(src, dst)) {
return false; //checking if there is a path from src to dest return false; //checking if there is a path from src to dest
} }
if(field[src.x][src.y]==0) {
return false;
}
field[dst.x][dst.y] = field[src.x][src.y]; field[dst.x][dst.y] = field[src.x][src.y];
field[src.x][src.y] = 0; field[src.x][src.y] = 0;