Merge branch 'master' of https://github.com/kanawish/RHoK_libgdx

Conflicts:
	src/com/androidmontreal/rhok/WaterSupplyGame.java

Author: kanawish

src/com/androidmontreal/rhok/pieces/Pump.java

@@ -21,10 +21,12 @@ public class Pump implements Piece {
 	double outputPressure ;
 
 	private double waterContent;
+	private Direction direction;
 
 
 	public Pump( Direction outputDirection, double pressure, Sprite sprite ) {
 
+		this.direction = outputDirection;
 		this.sprite = sprite;
 
 		switch( outputDirection ) {
@@ -117,4 +119,8 @@ public double pullWater(double volume) {
 		return retVal ;
 	}
 
+	public Direction getDirection() {
+		return direction;
+	}
+	
 }

src/com/androidmontreal/rhok/pieces/renderer/IRenderer.java

@@ -0,0 +1,8 @@
+package com.androidmontreal.rhok.renderers;
+
+
+public interface IRenderer {
+		
+	public void render();
+
+}

src/com/androidmontreal/rhok/renderers/IRenderer.java

@@ -1,24 +1,27 @@
-package com.androidmontreal.rhok.pieces.renderer;
+package com.androidmontreal.rhok.renderers;
 
 import com.androidmontreal.rhok.pieces.Piece;
 import com.androidmontreal.rhok.pieces.Pipe;
+import com.androidmontreal.rhok.pieces.Pump;
 
 public class PieceRenderer {
 
-	private PipeRenderer renderer;
+	private IRenderer r;
 
 	public PieceRenderer(Piece p) {
 
 		if(p instanceof Pipe){
-			renderer = new PipeRenderer((Pipe)p);
+			r = new PipeRenderer((Pipe)p);
+		}else if(p instanceof Pump){
+			r = new PumpRenderer((Pump)p);
 		}
 
 		//TODO: Add more type render
 
 	}
 
 	public void render() {
-		renderer.render();
+		r.render();
 	}
 
 }

src/com/androidmontreal/rhok/pieces/renderer/PieceRenderer.java renamed to src/com/androidmontreal/rhok/renderers/PieceRenderer.java

@@ -1,4 +1,4 @@
-package com.androidmontreal.rhok.pieces.renderer;
+package com.androidmontreal.rhok.renderers;
 
 import java.util.ArrayList;
 

src/com/androidmontreal/rhok/pieces/renderer/PipeRenderer.java renamed to src/com/androidmontreal/rhok/renderers/PipeRenderer.java

@@ -0,0 +1,62 @@
+package com.androidmontreal.rhok.renderers;
+
+import java.util.ArrayList;
+
+import com.androidmontreal.rhok.pieces.Pump;
+import com.androidmontreal.rhok.pieces.factory.SpriteFactory;
+import com.badlogic.gdx.graphics.g2d.Sprite;
+import com.badlogic.gdx.graphics.g2d.SpriteBatch;
+
+public class PumpRenderer implements IRenderer {
+
+	private Pump p;
+	private ArrayList<Sprite> sprites;
+	private SpriteFactory sf;
+
+	/**
+	 * 
+	 * @param p
+	 */
+	public PumpRenderer(Pump p) {
+
+		this.p = p;
+		sprites = new ArrayList<Sprite>();
+		sf = SpriteFactory.getInstance();
+
+		createBaseLayer();
+		createComplexLayer();
+
+	}
+
+
+	/**
+	 * Create the first layer
+	 */
+	private void createBaseLayer() {
+
+		switch (p.getDirection()) {		
+			case UP: sprites.add(sf.createSprite(SpriteFactory.PUMP_TOP)); break;
+			case DOWN: sprites.add(sf.createSprite(SpriteFactory.PUMP_DOWN)); break;
+			case RIGHT: sprites.add(sf.createSprite(SpriteFactory.PUMP_LEFT)); break;
+			case LEFT: sprites.add(sf.createSprite(SpriteFactory.PUMP_RIGHT)); break;
+		}
+	}
+	
+	private void createComplexLayer() {
+		// TODO Water related rendering go here
+	}
+
+
+	@Override
+	public void render() {
+		
+		SpriteBatch batch = new SpriteBatch();
+		
+		for (Sprite s : sprites) {
+			s.setPosition(p.getPosition().getX(),p.getPosition().getY());
+			s.draw(batch);
+		}
+										
+	}
+
+}