diff --git a/Meteo_Engine.jar b/Meteo_Engine.jar index 2c116f2..61b8f1b 100644 Binary files a/Meteo_Engine.jar and b/Meteo_Engine.jar differ diff --git a/src/sig/Block.java b/src/sig/Block.java index ebc3b52..c0f6dc0 100644 --- a/src/sig/Block.java +++ b/src/sig/Block.java @@ -23,6 +23,6 @@ public class Block{ } public void draw(Graphics g, double x, double y, int block_width, int block_height) { g.setColor(state.getCol()); - g.fill3DRect((int)x+this.x*block_width,(int)y+this.y*block_height, block_width, block_height, true); + g.fill3DRect((int)x+this.x*block_width,(int)y-this.y*block_height, block_width, block_height, true); } } \ No newline at end of file diff --git a/src/sig/BlockClump.java b/src/sig/BlockClump.java index e6e0074..1a9561c 100644 --- a/src/sig/BlockClump.java +++ b/src/sig/BlockClump.java @@ -19,7 +19,7 @@ public class BlockClump { } public void drawBlocks(Graphics g, int originX, int originY, int block_width, int block_height) { for (Block b : blocks) { - b.draw(g,originX-x*block_width,originY-y*block_height,block_width,block_height); + b.draw(g,originX+x*block_width,originY-y*block_height,block_width,block_height); } } } diff --git a/src/sig/Board.java b/src/sig/Board.java index 66f068f..b39ebad 100644 --- a/src/sig/Board.java +++ b/src/sig/Board.java @@ -1,6 +1,7 @@ package sig; import java.awt.Graphics; +import java.awt.Color; import java.util.ArrayList; import java.util.List; @@ -44,9 +45,12 @@ public class Board { public void drawBoard(Graphics g) { final int DRAW_STARTX = (int)(x - block_width*((double)width/2)); final int DRAW_STARTY = (int)(y + block_height*((double)height/2)); + final int DRAW_ENDX = (int)(x + block_width*((double)width/2)); for (BlockClump bc : blockData) { bc.drawBlocks(g,DRAW_STARTX,DRAW_STARTY,block_width,block_height); } + g.setColor(Color.BLACK); + g.fillRoundRect(DRAW_STARTX, DRAW_STARTY+block_height, DRAW_ENDX-DRAW_STARTX, 3, 3, 1); } }