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

Compare commits

base: MMGames:c34610b3e3847a27d04ec7bc0ec6a1075e27c1ef
Branches Tags
MMGames:master
MMGames:dev
MMGames:box2d
..
compare: MMGames:393b2fae5808162fb74816668f06d78d764e1877
Branches Tags
MMGames:dev
MMGames:master
MMGames:box2d

No commits in common. "c34610b3e3847a27d04ec7bc0ec6a1075e27c1ef" and "393b2fae5808162fb74816668f06d78d764e1877" have entirely different histories.
c34610b3e3 ... 393b2fae58

7 changed files with 38 additions and 78 deletions
Show Stats Expand all files Collapse all files

39
core/src/com/me/brickbuster/BrickBuster.java
View File

@ -2,15 +2,16 @@ package com.me.brickbuster;
import com.badlogic.gdx.ApplicationAdapter; import com.badlogic.gdx.ApplicationAdapter;
import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.GL20; import com.badlogic.gdx.graphics.GL20;
import com.badlogic.gdx.graphics.g2d.BitmapFont; import com.badlogic.gdx.graphics.g2d.BitmapFont;
import com.badlogic.gdx.graphics.g2d.SpriteBatch; import com.badlogic.gdx.graphics.g2d.SpriteBatch;
import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
import com.badlogic.gdx.math.MathUtils; import com.badlogic.gdx.math.MathUtils;
import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.math.Vector2;
import com.me.brickbuster.entity.*; import com.me.brickbuster.entity.*;
import com.me.brickbuster.entity.powerup.*; import com.me.brickbuster.entity.powerup.GluePowerUp;
import com.me.brickbuster.entity.powerup.LongerPaddlePowerUp;
import com.me.brickbuster.entity.powerup.MultiBallPowerUp;
import com.me.brickbuster.entity.powerup.PowerUp;
import java.util.*; import java.util.*;
@ -20,8 +21,6 @@ public class BrickBuster extends ApplicationAdapter {
public static final int HEIGHT = 600; public static final int HEIGHT = 600;
public static final String TITLE = "Brick Buster"; public static final String TITLE = "Brick Buster";
public static final int SHIELD_HEIGHT = 5;
public static final Vector2 HORIZONTAL_EDGE = new Vector2(1, 0); public static final Vector2 HORIZONTAL_EDGE = new Vector2(1, 0);
public static final Vector2 VERTICAL_EDGE = new Vector2(0, 1); public static final Vector2 VERTICAL_EDGE = new Vector2(0, 1);
@ -30,20 +29,16 @@ public class BrickBuster extends ApplicationAdapter {
private BitmapFont font; private BitmapFont font;
private SpriteBatch batch; private SpriteBatch batch;
private ShapeRenderer sr;
private Paddle paddle; private Paddle paddle;
private ArrayList<Ball> balls; private ArrayList<Ball> balls;
private ArrayList<Brick> bricks; private ArrayList<Brick> bricks;
private ArrayList<PowerUp> powerUps; private ArrayList<PowerUp> powerUps;
private boolean shieldActive = false;
@Override @Override
public void create () { public void create () {
font = new BitmapFont(); font = new BitmapFont();
batch = new SpriteBatch(); batch = new SpriteBatch();
sr = new ShapeRenderer();
paddle = new Paddle(this); paddle = new Paddle(this);
@ -71,30 +66,21 @@ public class BrickBuster extends ApplicationAdapter {
Gdx.gl.glClearColor(0.5f,1,1,1); Gdx.gl.glClearColor(0.5f,1,1,1);
Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT); Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
long start_update = System.nanoTime(); long start_update = System.nanoTime();
update(Gdx.graphics.getDeltaTime()); update(Gdx.graphics.getDeltaTime());
long finish_update = System.nanoTime() - start_update; long finish_update = System.nanoTime() - start_update;
long start_render = System.nanoTime(); long start_render = System.nanoTime();
for (Brick block : bricks) { for (Brick block : bricks) {
block.render(sr); block.render();
} }
for (PowerUp powerUp : powerUps) { for (PowerUp powerUp : powerUps) {
powerUp.render(sr); powerUp.render();
} }
for (Ball ball : balls) { for (Ball ball : balls) {
ball.render(sr); ball.render();
} }
paddle.render(sr); paddle.render();
if (shieldActive) {
sr.begin(ShapeRenderer.ShapeType.Filled);
sr.setColor(Color.SALMON);
sr.rect(0, 0, WIDTH, SHIELD_HEIGHT);
sr.end();
}
long finish_render = System.nanoTime() - start_render; long finish_render = System.nanoTime() - start_render;
batch.begin(); batch.begin();
@ -157,14 +143,6 @@ public class BrickBuster extends ApplicationAdapter {
return null; return null;
} }
public void setShieldActive(boolean shieldActive) {
this.shieldActive = shieldActive;
}
public boolean isShieldActive() {
return shieldActive;
}
public ArrayList<Ball> getBalls() { public ArrayList<Ball> getBalls() {
return balls; return balls;
} }
@ -188,7 +166,6 @@ public class BrickBuster extends ApplicationAdapter {
tmp.put(GluePowerUp.class, 30); tmp.put(GluePowerUp.class, 30);
tmp.put(LongerPaddlePowerUp.class, 40); tmp.put(LongerPaddlePowerUp.class, 40);
tmp.put(MultiBallPowerUp.class, 20); tmp.put(MultiBallPowerUp.class, 20);
tmp.put(ShieldPowerUp.class, 40);
powerUpWeights = Collections.unmodifiableMap(tmp); powerUpWeights = Collections.unmodifiableMap(tmp);
int sum = 0; int sum = 0;

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

@ -2,7 +2,6 @@ package com.me.brickbuster.entity;
import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.graphics.Color; 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.graphics.glutils.ShapeRenderer.ShapeType;
import com.badlogic.gdx.math.MathUtils; import com.badlogic.gdx.math.MathUtils;
import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.math.Vector2;
@ -31,11 +30,11 @@ public class Ball extends Entity {
} }
@Override @Override
public void render(ShapeRenderer sr) { public void render() {
sr.begin(ShapeType.Filled); getShapeRenderer().begin(ShapeType.Filled);
sr.setColor(BALL_COLOR); getShapeRenderer().setColor(BALL_COLOR);
sr.circle(getPos().x, getPos().y, RADIUS); getShapeRenderer().circle(getPos().x, getPos().y, RADIUS);
sr.end(); getShapeRenderer().end();
} }
@Override @Override
@ -76,13 +75,12 @@ public class Ball extends Entity {
Utils.reflect(direction, BrickBuster.VERTICAL_EDGE); Utils.reflect(direction, BrickBuster.VERTICAL_EDGE);
} else if (new_pos.y + RADIUS > BrickBuster.HEIGHT) { } else if (new_pos.y + RADIUS > BrickBuster.HEIGHT) {
Utils.reflect(direction, BrickBuster.HORIZONTAL_EDGE); Utils.reflect(direction, BrickBuster.HORIZONTAL_EDGE);
} else if (new_pos.y - RADIUS < BrickBuster.SHIELD_HEIGHT && getBrickBuster().isShieldActive()) {
Utils.reflect(direction, BrickBuster.HORIZONTAL_EDGE);
getBrickBuster().setShieldActive(false);
} else if (new_pos.y + RADIUS < 0) { } else if (new_pos.y + RADIUS < 0) {
isDead = true; isDead = true;
return; return;
} else if (direction.y < 0 && new_pos.y <= Paddle.PADDLE_Y + Paddle.PADDLE_HEIGHT + RADIUS) { }
if (direction.y < 0 && new_pos.y <= Paddle.PADDLE_Y + Paddle.PADDLE_HEIGHT + RADIUS) {
Pair<Vector2, Vector2> paddle = getBrickBuster().getPaddle().getTopEdge(); Pair<Vector2, Vector2> paddle = getBrickBuster().getPaddle().getTopEdge();
Vector2 lineDir = paddle.getValue().sub(paddle.getKey()); Vector2 lineDir = paddle.getValue().sub(paddle.getKey());
Vector2 nearest = Utils.nearestPoint(paddle.getKey().cpy(), lineDir, new_pos.cpy()); Vector2 nearest = Utils.nearestPoint(paddle.getKey().cpy(), lineDir, new_pos.cpy());

11
core/src/com/me/brickbuster/entity/Brick.java
View File

@ -1,7 +1,6 @@
package com.me.brickbuster.entity; package com.me.brickbuster.entity;
import com.badlogic.gdx.graphics.Color; 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.graphics.glutils.ShapeRenderer.ShapeType;
import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.math.Vector2;
import com.me.brickbuster.BrickBuster; import com.me.brickbuster.BrickBuster;
@ -29,11 +28,11 @@ public class Brick extends Entity {
} }
@Override @Override
public void render(ShapeRenderer sr) { public void render() {
sr.begin(ShapeType.Filled); getShapeRenderer().begin(ShapeType.Filled);
sr.setColor(BLOCK_COLOR); getShapeRenderer().setColor(BLOCK_COLOR);
sr.rect(getX(), getY(), BLOCK_WIDTH, BLOCK_HEIGHT); getShapeRenderer().rect(getX(), getY(), BLOCK_WIDTH, BLOCK_HEIGHT);
sr.end(); getShapeRenderer().end();
} }
@Override @Override

8
core/src/com/me/brickbuster/entity/Entity.java
View File

@ -6,15 +6,17 @@ import com.me.brickbuster.BrickBuster;
public abstract class Entity { public abstract class Entity {
private ShapeRenderer shapeRenderer;
private BrickBuster brickBuster; private BrickBuster brickBuster;
private Vector2 pos; private Vector2 pos;
public Entity(BrickBuster brickBuster, float x, float y) { public Entity(BrickBuster brickBuster, float x, float y) {
this.shapeRenderer = new ShapeRenderer();
this.brickBuster = brickBuster; this.brickBuster = brickBuster;
this.pos = new Vector2(x, y); this.pos = new Vector2(x, y);
} }
public abstract void render(ShapeRenderer sr); public abstract void render();
public abstract void update(float dt); public abstract void update(float dt);
@ -22,6 +24,10 @@ public abstract class Entity {
return brickBuster; return brickBuster;
} }
public ShapeRenderer getShapeRenderer() {
return shapeRenderer;
}
public Vector2 getPos() { public Vector2 getPos() {
return pos; return pos;
} }

11
core/src/com/me/brickbuster/entity/Paddle.java
View File

@ -3,7 +3,6 @@ package com.me.brickbuster.entity;
import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.Input; import com.badlogic.gdx.Input;
import com.badlogic.gdx.graphics.Color; 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.graphics.glutils.ShapeRenderer.ShapeType;
import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.math.Vector2;
import com.me.brickbuster.BrickBuster; import com.me.brickbuster.BrickBuster;
@ -25,11 +24,11 @@ public class Paddle extends Entity {
} }
@Override @Override
public void render(ShapeRenderer sr) { public void render() {
sr.begin(ShapeType.Filled); getShapeRenderer().begin(ShapeType.Filled);
sr.setColor(sticky? Color.GRAY : PADDLE_COLOR); getShapeRenderer().setColor(sticky? Color.GRAY : PADDLE_COLOR);
sr.rect(getX() - width/2, getY(), width, PADDLE_HEIGHT); getShapeRenderer().rect(getX() - width/2, getY(), width, PADDLE_HEIGHT);
sr.end(); getShapeRenderer().end();
} }
@Override @Override

11
core/src/com/me/brickbuster/entity/powerup/PowerUp.java
View File

@ -2,7 +2,6 @@ package com.me.brickbuster.entity.powerup;
import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.glutils.ShapeRenderer; import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
import com.badlogic.gdx.graphics.glutils.ShapeRenderer.ShapeType;
import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.math.Vector2;
import com.me.brickbuster.BrickBuster; import com.me.brickbuster.BrickBuster;
import com.me.brickbuster.Utils; import com.me.brickbuster.Utils;
@ -24,11 +23,11 @@ public abstract class PowerUp extends Entity {
} }
@Override @Override
public void render(ShapeRenderer sr) { public void render() {
sr.begin(ShapeType.Filled); getShapeRenderer().begin(ShapeRenderer.ShapeType.Filled);
sr.setColor(color); getShapeRenderer().setColor(color);
sr.circle(getX(), getY(), RADIUS); getShapeRenderer().circle(getX(), getY(), RADIUS);
sr.end(); getShapeRenderer().end();
} }
@Override @Override

18
core/src/com/me/brickbuster/entity/powerup/ShieldPowerUp.java
View File

@ -1,18 +0,0 @@
package com.me.brickbuster.entity.powerup;
import com.badlogic.gdx.graphics.Color;
import com.me.brickbuster.BrickBuster;
import com.me.brickbuster.entity.Brick;
public class ShieldPowerUp extends PowerUp {
public ShieldPowerUp(BrickBuster brickBuster, Brick brick) {
super(brickBuster, brick, Color.SALMON);
}
@Override
public void activate() {
getBrickBuster().setShieldActive(true);
}
}