MMGames/BrickBuster
2
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

New MINIMUM_ANGLE constant in Ball, currently PI/16

Browse Source 
Apply impulses to ball when angle relative to horizontal axis is less
than MINIMUM_ANGLE. Prevents balls getting stuck going horizontally
This commit is contained in:
Matt Low 2018-11-15 16:17:26 +04:00
parent 998286de8d
commit cb90c949ff
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
core/src/com/me/brickbuster/entity/Ball.java
View File

@ -20,6 +20,8 @@ public class Ball extends Entity implements PhysicsBody, CollisionListener {
public static final float BOOST_SPEED = 55; public static final float BOOST_SPEED = 55;
public static final int BLOCKS_FOR_BOOST = 39; public static final int BLOCKS_FOR_BOOST = 39;
public static final float MINIMUM_ANGLE = MathUtils.PI/16;
private float speed; private float speed;
private boolean isStuck = true; private boolean isStuck = true;
private boolean touchedPaddle = false; private boolean touchedPaddle = false;
@ -56,11 +58,18 @@ public class Ball extends Entity implements PhysicsBody, CollisionListener {
touchedPaddle = false; touchedPaddle = false;
} }
if (getY() + RADIUS < 0) { if (pos.y + RADIUS < 0) {
deleted = true; 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 @Override
@ -111,10 +120,9 @@ public class Ball extends Entity implements PhysicsBody, CollisionListener {
} }
public Vector2 paddleReflectAngle() { 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())); 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)); return new Vector2(MathUtils.cos(newAngle), MathUtils.sin(newAngle));
} }
@ -126,7 +134,6 @@ public class Ball extends Entity implements PhysicsBody, CollisionListener {
// launch at random angle between 135 and 45 degrees // launch at random angle between 135 and 45 degrees
float angle = MathUtils.random(MathUtils.PI/2) + MathUtils.PI/4; float angle = MathUtils.random(MathUtils.PI/2) + MathUtils.PI/4;
direction = new Vector2(MathUtils.cos(angle), MathUtils.sin(angle)); direction = new Vector2(MathUtils.cos(angle), MathUtils.sin(angle));
} }
body.setLinearVelocity(direction.scl(speed)); body.setLinearVelocity(direction.scl(speed));
isStuck = false; isStuck = false;