ydeng/rhythmbullet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

background changed, pellet resized, other minor cleanups and adjustments

Browse Source
This commit is contained in:
Harrison Deng
2017-07-16 21:33:10 -05:00
parent a02e5565ff
commit a90fea5a46
21 changed files with 2 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/zero1hd/polyjet/entity/enemies/Pellet.java
View File

@@ -29,7 +29,7 @@ public class Pellet extends Actor implements Entity, Poolable {
public void init(float x, float y, float angle, float rate) {
setPosition(x, y);
direction.set(MathUtils.sinDeg(angle), MathUtils.cosDeg(angle));
setSize(0.75f, 0.75f);
setSize(0.5f, 0.5f);
hitBox.setSize(getWidth(), getHeight());
this.rate = rate;
}

32
core/src/zero1hd/polyjet/ui/stages/GamePlayArea.java
View File

@@ -32,12 +32,9 @@ public class GamePlayArea extends Stage {
private int score;
private ShaderProgram invert;
private ShaderProgram bgShader;
private Texture background;
private float time;
public GamePlayArea(AssetManager assetManager, Preferences prefs) {
super(new FitViewport(Polyjet.GAME_AREA_WIDTH, Polyjet.GAME_AREA_HEIGHT));
Gdx.app.debug("Game Area", "new area created");
@@ -51,7 +48,6 @@ public class GamePlayArea extends Stage {
}
public void setAudioMap(GamePlayMap audioMap) {
time = 0;
this.audioMap = audioMap;
}
@@ -75,23 +71,6 @@ public class GamePlayArea extends Stage {
}
if (prefs.getBoolean("bg shader")) {
Gdx.app.debug("Shader", "using background shader");
bgShader = new ShaderProgram(Gdx.files.internal("shaders/star_vert.glsl").readString(), Gdx.files.internal("shaders/star_frag.glsl").readString());
if (!bgShader.isCompiled()) {
System.err.println(bgShader.getLog());
System.exit(0);
}
if (bgShader.getLog().length()!=0) {
System.out.println(bgShader.getLog());
}
} else {
//TODO prepare background rendering without shader
}
ShaderProgram.pedantic = false;
}
@@ -99,18 +78,8 @@ public class GamePlayArea extends Stage {
public void draw() {
//TODO batch draw background
getBatch().begin();
if (bgShader != null) {
getBatch().setShader(bgShader);
bgShader.setUniformf("resolution", background.getWidth(), background.getHeight());
bgShader.setUniformf("time", time);
}
getBatch().draw(background, 0f, 0f, Polyjet.GAME_AREA_WIDTH, Polyjet.GAME_AREA_HEIGHT);
getBatch().end();
getBatch().setShader(null);
super.draw();
}
@@ -119,7 +88,6 @@ public class GamePlayArea extends Stage {
MapWindowData mwd;
if (audioMap != null && audioMap.getPlayableClip().isPlaying()) {
audioMap.getMusicData().readIndexUpdate();
time = audioMap.getPlayableClip().getPosition();
if ((mwd = audioMap.nextWindowData()) != null) {
EntitySpawnInfo[] currentSpawnInfo = mwd.getArray();
if (currentSpawnInfo != null) {