New MINIMUM_ANGLE constant in Ball, currently PI/16

Apply impulses to ball when angle relative to horizontal axis is less
than MINIMUM_ANGLE. Prevents balls getting stuck going horizontally

core/src/com/me/brickbuster/entity/Ball.java

@@ -6,11 +6,9 @@ import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
 import com.badlogic.gdx.graphics.glutils.ShapeRenderer.ShapeType;
 import com.badlogic.gdx.math.MathUtils;
 import com.badlogic.gdx.math.Vector2;
-import com.badlogic.gdx.physics.box2d.Body;
+import com.badlogic.gdx.physics.box2d.*;
-import com.badlogic.gdx.physics.box2d.BodyDef;
-import com.badlogic.gdx.physics.box2d.CircleShape;
-import com.badlogic.gdx.physics.box2d.FixtureDef;
 import com.me.brickbuster.physics.CollisionListener;
+import com.me.brickbuster.physics.EntityType;
 import com.me.brickbuster.physics.PhysicsBody;
 import com.me.brickbuster.state.PlayState;
 
@@ -22,6 +20,8 @@ public class Ball extends Entity implements PhysicsBody, CollisionListener {
 	public static final float BOOST_SPEED = 55;
 	public static final int BLOCKS_FOR_BOOST = 39;
 
+	public static final float MINIMUM_ANGLE = MathUtils.PI/16;
+
 	private float speed;
 	private boolean isStuck = true;
 	private boolean touchedPaddle = false;
@@ -30,7 +30,7 @@ public class Ball extends Entity implements PhysicsBody, CollisionListener {
 
 	public Ball(PlayState state) {
 		super(state, state.paddle.getX(), state.paddle.getY() + Paddle.PADDLE_HEIGHT + RADIUS);
-		this.speed = state.bricks.size() > BLOCKS_FOR_BOOST? DEFAULT_SPEED : BOOST_SPEED;
+		this.speed = state.bricks.size > BLOCKS_FOR_BOOST? DEFAULT_SPEED : BOOST_SPEED;
 		createBody();
 	}
 
@@ -58,11 +58,18 @@ public class Ball extends Entity implements PhysicsBody, CollisionListener {
 			touchedPaddle = false;
 		}
 
-		if (getY() + RADIUS < 0) {
+		if (pos.y + RADIUS < 0) {
 			deleted = true;
+			return;
 		}
 
-		body.setLinearVelocity(body.getLinearVelocity().nor().scl(speed));
+		Vector2 velocity = body.getLinearVelocity();
+		float rad = velocity.angleRad();
+		if (Math.abs(rad) < MINIMUM_ANGLE || Math.abs(rad) > MathUtils.PI - MINIMUM_ANGLE) {
+			body.applyLinearImpulse(new Vector2(0, rad > 0? 1 : -1), pos, true);
+		}
+
+		body.setLinearVelocity(velocity.nor().scl(speed));
 	}
 
 	@Override
@@ -83,6 +90,12 @@ public class Ball extends Entity implements PhysicsBody, CollisionListener {
 		ballFixture.shape = ballShape;
 		ballFixture.restitution = 1f;
 		ballFixture.friction = 0f;
+		ballFixture.density = 1f;
+
+		ballFixture.filter.categoryBits = EntityType.BALL;
+		ballFixture.filter.maskBits = EntityType.BOUNDARY | EntityType.BRICK
+						| EntityType.PADDLE | EntityType.POWER_UP
+						| EntityType.SHIELD;
 
 		body = state.world.createBody(ballBody);
 		body.createFixture(ballFixture);
@@ -107,10 +120,9 @@ public class Ball extends Entity implements PhysicsBody, CollisionListener {
 	}
 
 	public Vector2 paddleReflectAngle() {
-		float trim = state.paddle.getWidth() * 0.10f;
+		float rel = (pos.x - state.paddle.getX()) + (state.paddle.getWidth()/2);
-		float rel = MathUtils.clamp((pos.x - state.paddle.getX()) + (state.paddle.getWidth()/2),
-				trim, state.paddle.getWidth()-trim);
 		float newAngle = MathUtils.PI - (MathUtils.PI * (rel / state.paddle.getWidth()));
+		newAngle = MathUtils.clamp(newAngle, MINIMUM_ANGLE, MathUtils.PI-MINIMUM_ANGLE);
 		return new Vector2(MathUtils.cos(newAngle), MathUtils.sin(newAngle));
 	}
 
@@ -122,7 +134,6 @@ public class Ball extends Entity implements PhysicsBody, CollisionListener {
 			// launch at random angle between 135 and 45 degrees
 			float angle = MathUtils.random(MathUtils.PI/2) + MathUtils.PI/4;
 			direction = new Vector2(MathUtils.cos(angle), MathUtils.sin(angle));
-
 		}
 		body.setLinearVelocity(direction.scl(speed));
 		isStuck = false;

core/src/com/me/brickbuster/entity/Brick.java

@@ -3,6 +3,8 @@ package com.me.brickbuster.entity;
 import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
 import com.badlogic.gdx.graphics.glutils.ShapeRenderer.ShapeType;
+import com.badlogic.gdx.math.MathUtils;
+import com.badlogic.gdx.math.Rectangle;
 import com.badlogic.gdx.math.Vector2;
 import com.badlogic.gdx.physics.box2d.Body;
 import com.badlogic.gdx.physics.box2d.BodyDef;
@@ -10,6 +12,7 @@ import com.badlogic.gdx.physics.box2d.FixtureDef;
 import com.badlogic.gdx.physics.box2d.PolygonShape;
 import com.me.brickbuster.entity.powerup.PowerUpType;
 import com.me.brickbuster.physics.CollisionListener;
+import com.me.brickbuster.physics.EntityType;
 import com.me.brickbuster.physics.PhysicsBody;
 import com.me.brickbuster.state.PlayState;
 
@@ -44,10 +47,11 @@ public class Brick extends Entity implements PhysicsBody, CollisionListener {
 	public void render(ShapeRenderer sr) {
 		sr.begin(ShapeType.Filled);
 		sr.setColor(color);
-		sr.rect(getX() * PlayState.PIXEL_PER_METER,
+		sr.rect(pos.x * PlayState.PIXEL_PER_METER, pos.y * PlayState.PIXEL_PER_METER,
-				getY() * PlayState.PIXEL_PER_METER,
+				0f, 0f,
-				BRICK_WIDTH * PlayState.PIXEL_PER_METER,
+				BRICK_WIDTH * PlayState.PIXEL_PER_METER, BRICK_HEIGHT * PlayState.PIXEL_PER_METER,
-				BRICK_HEIGHT * PlayState.PIXEL_PER_METER);
+				1f, 1f,
+				body.getAngle() * MathUtils.radiansToDegrees);
 		sr.end();
 	}
 
@@ -78,6 +82,9 @@ public class Brick extends Entity implements PhysicsBody, CollisionListener {
 		brickFixture.shape = brickShape;
 		brickFixture.friction = 0f;
 
+		brickFixture.filter.categoryBits = EntityType.BRICK;
+		brickFixture.filter.maskBits = EntityType.BALL;
+
 		body = state.world.createBody(brickBody);
 		body.createFixture(brickFixture);
 		body.setUserData(this);
@@ -97,7 +104,7 @@ public class Brick extends Entity implements PhysicsBody, CollisionListener {
 	}
 
 	public boolean hit() {
-		if (state.bricks.size()-1 <= Ball.BLOCKS_FOR_BOOST) {
+		if (state.bricks.size-1 <= Ball.BLOCKS_FOR_BOOST) {
 			for (Ball ball : state.balls) {
 				ball.setSpeed(Ball.BOOST_SPEED);
 			}

core/src/com/me/brickbuster/entity/Paddle.java

@@ -5,12 +5,14 @@ import com.badlogic.gdx.Input;
 import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
 import com.badlogic.gdx.graphics.glutils.ShapeRenderer.ShapeType;
+import com.badlogic.gdx.math.MathUtils;
 import com.badlogic.gdx.math.Vector2;
 import com.badlogic.gdx.physics.box2d.Body;
 import com.badlogic.gdx.physics.box2d.BodyDef;
 import com.badlogic.gdx.physics.box2d.EdgeShape;
 import com.badlogic.gdx.physics.box2d.FixtureDef;
 import com.me.brickbuster.physics.CollisionListener;
+import com.me.brickbuster.physics.EntityType;
 import com.me.brickbuster.physics.PhysicsBody;
 import com.me.brickbuster.state.PlayState;
 import net.dermetfan.utils.Pair;
@@ -48,29 +50,27 @@ public class Paddle extends Entity implements PhysicsBody {
 
 	@Override
 	public void update(float dt) {
+		float displacement = PADDLE_SPEED * dt;
+		float adjust = 0;
 		if (Gdx.input.isKeyPressed(Input.Keys.LEFT)) {
-			if (pos.x - width/2 - PADDLE_SPEED * dt < 0) {
+			if (pos.x - width / 2 - displacement < PlayState.EDGE_PADDING) {
-				setX(width/2);
+				adjust = -(pos.x - width/2 - PlayState.EDGE_PADDING);
-				return;
+			} else {
-			}
+				adjust = -displacement;
-			setX(pos.x - PADDLE_SPEED * dt);
-
-			for (Ball ball : state.balls) {
-				if (ball.isStuck()) {
-					ball.setX(ball.getX() - PADDLE_SPEED * dt);
-				}
 			}
 		}
 		if (Gdx.input.isKeyPressed(Input.Keys.RIGHT)) {
-			if (pos.x + width/2 + PADDLE_SPEED * dt > PlayState.BOARD_WIDTH) {
+			if (pos.x + width / 2 + displacement > PlayState.BOARD_WIDTH-PlayState.EDGE_PADDING) {
-				setX(PlayState.BOARD_WIDTH - width/2);
+				adjust = PlayState.BOARD_WIDTH - PlayState.EDGE_PADDING - width/2 - pos.x;
-				return;
+			} else {
+				adjust = displacement;
 			}
-			setX(pos.x + PADDLE_SPEED * dt);
+		}
-
+		if (!MathUtils.isZero(adjust)) {
+			setX(pos.x + adjust);
 			for (Ball ball : state.balls) {
 				if (ball.isStuck()) {
-					ball.setX(ball.getX() + PADDLE_SPEED * dt);
+					ball.setX(ball.getX() + adjust);
 				}
 			}
 		}
@@ -88,7 +88,9 @@ public class Paddle extends Entity implements PhysicsBody {
 
 		FixtureDef paddleFixture = new FixtureDef();
 		paddleFixture.shape = paddleShape;
-		//paddleFixture.isSensor = true;
+
+		paddleFixture.filter.categoryBits = EntityType.PADDLE;
+		paddleFixture.filter.maskBits = EntityType.BALL | EntityType.POWER_UP;
 
 		body = state.world.createBody(paddleBody);
 		body.createFixture(paddleFixture);

core/src/com/me/brickbuster/entity/Shield.java

@@ -8,6 +8,7 @@ import com.badlogic.gdx.physics.box2d.BodyDef;
 import com.badlogic.gdx.physics.box2d.FixtureDef;
 import com.badlogic.gdx.physics.box2d.PolygonShape;
 import com.me.brickbuster.entity.powerup.PowerUpType;
+import com.me.brickbuster.physics.EntityType;
 import com.me.brickbuster.physics.PhysicsBody;
 import com.me.brickbuster.state.PlayState;
 
@@ -53,6 +54,9 @@ public class Shield extends Entity implements PhysicsBody {
 		brickFixture.shape = brickShape;
 		brickFixture.friction = 0f;
 
+		brickFixture.filter.categoryBits = EntityType.SHIELD;
+		brickFixture.filter.maskBits = EntityType.BALL;
+
 		body = state.world.createBody(brickBody);
 		body.createFixture(brickFixture);
 		body.setUserData(this);

core/src/com/me/brickbuster/entity/powerup/PowerUp.java

@@ -9,9 +9,11 @@ import com.badlogic.gdx.physics.box2d.BodyDef;
 import com.badlogic.gdx.physics.box2d.CircleShape;
 import com.badlogic.gdx.physics.box2d.FixtureDef;
 import com.me.brickbuster.Utils;
+import com.me.brickbuster.entity.Ball;
 import com.me.brickbuster.entity.Entity;
 import com.me.brickbuster.entity.Paddle;
 import com.me.brickbuster.physics.CollisionListener;
+import com.me.brickbuster.physics.EntityType;
 import com.me.brickbuster.physics.PhysicsBody;
 import com.me.brickbuster.state.PlayState;
 import net.dermetfan.utils.Pair;
@@ -72,6 +74,9 @@ public abstract class PowerUp extends Entity implements PhysicsBody, CollisionLi
 		ballFixture.shape = ballShape;
 		ballFixture.isSensor = true;
 
+		ballFixture.filter.categoryBits = EntityType.POWER_UP;
+		ballFixture.filter.maskBits = EntityType.PADDLE | EntityType.BALL;
+
 		body = state.world.createBody(ballBody);
 		body.createFixture(ballFixture);
 		body.setUserData(this);
@@ -83,7 +88,7 @@ public abstract class PowerUp extends Entity implements PhysicsBody, CollisionLi
 
 	@Override
 	public void beginContact(Entity contacted) {
-		if (contacted instanceof Paddle) {
+		if (contacted instanceof Paddle || contacted instanceof Ball) {
 			isCaught = true;
 		}
 	}

core/src/com/me/brickbuster/physics/EntityType.java

@@ -0,0 +1,12 @@
+package com.me.brickbuster.physics;
+
+public final class EntityType {
+
+	public static final short BOUNDARY = 0x1;
+	public static final short BALL = 0x1 << 1;
+	public static final short BRICK = 0x1 << 2;
+	public static final short PADDLE = 0x1 << 3;
+	public static final short POWER_UP = 0x1 << 4;
+	public static final short SHIELD = 0x1 << 5;
+
+}

core/src/com/me/brickbuster/state/PlayState.java

@@ -11,10 +11,9 @@ import com.me.brickbuster.entity.*;
 import com.me.brickbuster.entity.powerup.PowerUp;
 import com.me.brickbuster.entity.powerup.PowerUpType;
 import com.me.brickbuster.physics.Box2dContactListener;
+import com.me.brickbuster.physics.EntityType;
 
-import java.util.ArrayList;
 import java.util.Iterator;
-import java.util.List;
 
 public class PlayState extends State {
 
@@ -42,11 +41,11 @@ public class PlayState extends State {
 	public Body playArea;
 	public Array<Body> bodies;
 
-	public List<PowerUp> powerUps;
+	public Array<PowerUp> powerUps;
 	public Paddle paddle;
-	public List<Ball> balls;
+	public Array<Ball> balls;
-	public List<Brick> bricks;
+	public Array<Brick> bricks;
-	public List<Shield> shields;
+	public Array<Shield> shields;
 
 	private float updateTime = 0f;
 
@@ -62,6 +61,8 @@ public class PlayState extends State {
 		// Initialize a world with no gravity
 		world = new World(new Vector2(), false);
 		world.setContactListener(new Box2dContactListener());
+		bodies = new Array<Body>();
+
 
 		// define a playArea body with position set to 0
 		BodyDef playAreaDef = new BodyDef();
@@ -70,26 +71,32 @@ public class PlayState extends State {
 
 		EdgeShape screenEdge = new EdgeShape();
 
+		FixtureDef playAreaFixture = new FixtureDef();
+		playAreaFixture.shape = screenEdge;
+
+		playAreaFixture.filter.categoryBits = EntityType.BOUNDARY;
+		playAreaFixture.filter.maskBits = EntityType.BALL | EntityType.BRICK;
+
 		playArea = world.createBody(playAreaDef);
 		// Right edge
 		screenEdge.set(lowerRightCorner, upperRightCorner);
-		playArea.createFixture(screenEdge, 0f);
+		playArea.createFixture(playAreaFixture);
 		// Top edge
 		screenEdge.set(upperRightCorner, upperLeftCorner);
-		playArea.createFixture(screenEdge, 0f);
+		playArea.createFixture(playAreaFixture);
 		// Left edge
 		screenEdge.set(upperLeftCorner, lowerLeftCorner);
-		playArea.createFixture(screenEdge, 0f);
+		playArea.createFixture(playAreaFixture);
 		// Bottom edge
 		//screenEdge.set(lowerLeftCorner, lowerRightCorner);
-		//playArea.createFixture(screenEdge, 0f);
+		//playArea.createFixture(playAreaFixture);
 		screenEdge.dispose();
 
-		powerUps = new ArrayList<PowerUp>();
+		powerUps = new Array<PowerUp>();
 		paddle = new Paddle(this);
 
 		float brick_padding = ((BrickBuster.BOARD_WIDTH/PIXEL_PER_METER) - COLUMNS * Brick.BRICK_WIDTH) / (COLUMNS + 1);
-		bricks = new ArrayList<Brick>();
+		bricks = new Array<Brick>();
 		for (int col = 0; col < COLUMNS; col++) {
 			for (int row = 0; row < ROWS; row++) {
 				float x = brick_padding + (col * (Brick.BRICK_WIDTH + brick_padding));
@@ -104,19 +111,18 @@ public class PlayState extends State {
 			}
 		}
 
-		balls = new ArrayList<Ball>();
+		balls = new Array<Ball>();
 		balls.add(new Ball(this));
 
-		shields = new ArrayList<Shield>();
+		shields = new Array<Shield>();
 	}
 
 	@Override
 	public void render() {
-		Array<Body> bodies = new Array<Body>();
 		world.getBodies(bodies);
 		for (Body b : bodies) {
 			Entity e = (Entity) b.getUserData();
-			if (e instanceof Ball || e instanceof PowerUp) {
+			if (e instanceof Ball || e instanceof PowerUp || e instanceof Brick) {
 				e.setPos(b.getPosition());
 			}
 		}
@@ -159,7 +165,7 @@ public class PlayState extends State {
 				world.destroyBody(ball.getBody());
 			}
 		}
-		if (balls.isEmpty()) {
+		if (balls.size == 0) {
 			ballReset();
 		}
 
@@ -189,7 +195,7 @@ public class PlayState extends State {
 				world.destroyBody(brick.getBody());
 			}
 		}
-		if (bricks.isEmpty()) {
+		if (bricks.size == 0) {
 			game.setScreen(new MenuState(game));
 			dispose();
 			return;
@@ -202,9 +208,10 @@ public class PlayState extends State {
 	@Override
 	public void dispose() {
 		super.dispose();
-
 		world.dispose();
 
+		bodies.clear();
+
 		powerUps.clear();
 		powerUps = null;
 		balls.clear();
@@ -215,7 +222,7 @@ public class PlayState extends State {
 	}
 
 	public int getShieldCount() {
-		return shields.size();
+		return shields.size;
 	}
 
 	public void addShield() {