Merge 76b8f3e into b3937ce

org.uqbar.project.wollok.game/src/org/uqbar/project/wollok/game/Position.xtend

@@ -49,9 +49,9 @@ abstract class Position {
 	def abstract int getX()
 	def abstract int getY()
 
-	def getXinPixels() { x * Gameboard.CELLZISE }
+	def getXinPixels() { x * Gameboard.instance.cellsize }
 
-	def getYinPixels() { y * Gameboard.CELLZISE }
+	def getYinPixels() { y * Gameboard.instance.cellsize }
 
 	override public int hashCode() {
 		val prime = 31

org.uqbar.project.wollok.game/src/org/uqbar/project/wollok/game/VisualComponent.xtend

@@ -105,8 +105,8 @@ class VisualComponent {
 		val yMouse = Gdx.input.y
 		val bottomX = position.xinPixels
 		val bottomY = Gameboard.getInstance().pixelHeight - position.yinPixels
-		val topX = bottomX + Gameboard.CELLZISE
-		val topY = bottomY - Gameboard.CELLZISE
+		val topX = bottomX + Gameboard.instance.cellsize
+		val topY = bottomY - Gameboard.instance.cellsize
 		return (xMouse > bottomX && xMouse < topX) && (yMouse < bottomY && yMouse > topY)
 	}
 

org.uqbar.project.wollok.game/src/org/uqbar/project/wollok/game/gameboard/Cell.xtend

@@ -12,7 +12,7 @@ class Cell {
 
 	new(Position position, Image image) {
 		this.position = position
-		this.image = image => [ size = new CellSize(Gameboard.CELLZISE) ]
+		this.image = image => [ size = new CellSize(Gameboard.instance.cellsize) ]
 	}
 
 	def draw(Window window) {

org.uqbar.project.wollok.game/src/org/uqbar/project/wollok/game/gameboard/Gameboard.xtend

@@ -22,8 +22,7 @@ import static org.uqbar.project.wollok.sdk.WollokSDK.*
 
 @Accessors
 class Gameboard {
-	public static Gameboard instance
-	public static final int CELLZISE = 50
+	static Gameboard instance
 
 	val Logger log = Logger.getLogger(this.class)	
 
@@ -32,6 +31,7 @@ class Gameboard {
 	String boardGround
 	int height
 	int width
+	@Accessors int cellsize = 50
 	Background background
 	List<VisualComponent> components = newArrayList
 	List<GameboardListener> listeners = newArrayList
@@ -41,10 +41,14 @@ class Gameboard {
 
 	def static getInstance() {
 		if (instance === null) {
-			instance = new Gameboard()
+			resetInstance
 		}
 		instance
 	}
+
+	def static resetInstance() {
+		instance = new Gameboard()
+	}
 
 	new() {
 		title = "Wollok Game"
@@ -102,9 +106,9 @@ class Gameboard {
 		null
 	}
 
-	def pixelHeight() {	height * CELLZISE }
+	def pixelHeight() {	height * cellsize }
 
-	def pixelWidth() { width * CELLZISE }
+	def pixelWidth() { width * cellsize }
 
 	def clear() {
 		components.clear()

org.uqbar.project.wollok.game/src/org/uqbar/project/wollok/game/gameboard/GameboardInputProcessor.xtend

@@ -26,7 +26,7 @@ class GameboardInputProcessor implements InputProcessor {
 
 	override boolean touchDown(int x, int y, int pointer, int button) {
 		val inverseY = Gameboard.getInstance().pixelHeight() - y
-		val position = new WGPosition(x / Gameboard.CELLZISE, inverseY / Gameboard.CELLZISE )
+		val position = new WGPosition(x / Gameboard.instance.cellsize, inverseY / Gameboard.instance.cellsize )
 
 		val Iterable<VisualComponent> lista = Gameboard.getInstance.getComponentsInPosition(position)
 

org.uqbar.project.wollok.lib/src/wollok/game.wlk

@@ -217,6 +217,20 @@ object game {
 	 */			
 	method ground(image) native
 
+	/**
+	 * Sets cells size.
+	 */			
+	method cellSize(size){
+		if(size<=0)
+			throw new Exception(message = "Cell size can't be 0 or lower")
+		self.doCellSize(size)
+	}
+
+	/** 
+	* @private
+	*/
+	method doCellSize(size) native	
+
 	/**
 	 * Sets full background image.
 	 */			

org.uqbar.project.wollok.lib/src/wollok/game/GameObject.xtend

@@ -207,4 +207,6 @@ class GameObject {
 	def ground(String image) { board.ground = image }
 	def boardGround(String image) { board.boardGround = image }
 
+	def doCellSize(WollokObject size) { board.cellsize = size.coerceToInteger   }
+
 }