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

other half of the first commit that I didn't update

Browse Source
This commit is contained in:
Harrison Deng 2017-08-18 03:09:20 -05:00
parent 41b90f3311
commit 16954280f2
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/zero1hd/rhythmbullet/screens/CreativeScreen.java
View File

@ -26,7 +26,7 @@ public class CreativeScreen extends ScreenAdapter {
public CreativeScreen(RhythmBullet core, MainMenu mainMenu) { public CreativeScreen(RhythmBullet core, MainMenu mainMenu) {
gamePlayArea = new GamePlayArea(core.getAssetManager(), core.getPrefs()); gamePlayArea = new GamePlayArea(core.getAssetManager(), core.getPrefs());
ghud = new GameHUD(core.getDefaultSkin(), 100f, gamePlayArea); ghud = new GameHUD(core.getDefaultSkin(), 100f, gamePlayArea, mainMenu, core);
chud = new CreativeHUD(core, mainMenu, gamePlayArea, ghud); chud = new CreativeHUD(core, mainMenu, gamePlayArea, ghud);
inputs = new InputMultiplexer(chud, ghud, gamePlayArea); inputs = new InputMultiplexer(chud, ghud, gamePlayArea);

5
core/src/zero1hd/rhythmbullet/screens/GameScreen.java
View File

@ -2,6 +2,7 @@ package zero1hd.rhythmbullet.screens;
import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.InputMultiplexer; import com.badlogic.gdx.InputMultiplexer;
import com.badlogic.gdx.Screen;
import com.badlogic.gdx.ScreenAdapter; import com.badlogic.gdx.ScreenAdapter;
import com.badlogic.gdx.graphics.GL20; import com.badlogic.gdx.graphics.GL20;
import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.Texture;
@ -31,7 +32,7 @@ public class GameScreen extends ScreenAdapter {
private ShaderProgram bgShader; private ShaderProgram bgShader;
private Texture background; private Texture background;
public GameScreen(RhythmBullet core) { public GameScreen(RhythmBullet core, Screen screen) {
this.core = core; this.core = core;
// Overlay stuff // Overlay stuff
@ -47,7 +48,7 @@ public class GameScreen extends ScreenAdapter {
}); });
gameArea = new GamePlayArea(core.getAssetManager(), core.getPrefs()); gameArea = new GamePlayArea(core.getAssetManager(), core.getPrefs());
gameHUD = new GameHUD(core.getDefaultSkin(), 100f, gameArea); gameHUD = new GameHUD(core.getDefaultSkin(), 100f, gameArea, screen, core);
inputs = new InputMultiplexer(); inputs = new InputMultiplexer();
inputs.addProcessor(gameHUD); inputs.addProcessor(gameHUD);
inputs.addProcessor(gameArea); inputs.addProcessor(gameArea);

3
core/src/zero1hd/rhythmbullet/ui/pages/AnalyzePage.java
View File

@ -266,7 +266,7 @@ public class AnalyzePage extends Page implements MiniListener {
Gdx.app.postRunnable(new Runnable() { Gdx.app.postRunnable(new Runnable() {
@Override @Override
public void run() { public void run() {
gameScreen = new GameScreen(core); gameScreen = new GameScreen(core, core.getScreen());
mapGenAlgorithm = new RhythmMapAlgorithm(gameScreen.getGameArea().em, gameScreen.getGameArea().cm, audioAnalyzer, speedModifier.getValue(), healthModifier.getValue(), sensitivityRating.getValue()); mapGenAlgorithm = new RhythmMapAlgorithm(gameScreen.getGameArea().em, gameScreen.getGameArea().cm, audioAnalyzer, speedModifier.getValue(), healthModifier.getValue(), sensitivityRating.getValue());
mapGenAlgorithm.getSender().addListener(ap); mapGenAlgorithm.getSender().addListener(ap);
mapGenThread = new Thread(mapGenAlgorithm); mapGenThread = new Thread(mapGenAlgorithm);
@ -288,6 +288,7 @@ public class AnalyzePage extends Page implements MiniListener {
public void changed(ChangeEvent event, Actor actor) { public void changed(ChangeEvent event, Actor actor) {
gameScreen.setGamePlayMap(mapGenAlgorithm.getMap()); gameScreen.setGamePlayMap(mapGenAlgorithm.getMap());
core.setScreen(gameScreen); core.setScreen(gameScreen);
miniSender.send(MiniEvents.BACK);
} }
}); });

12
core/src/zero1hd/rhythmbullet/ui/stages/GameHUD.java
View File

@ -2,6 +2,7 @@ package zero1hd.rhythmbullet.ui.stages;
import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.Input.Keys; import com.badlogic.gdx.Input.Keys;
import com.badlogic.gdx.Screen;
import com.badlogic.gdx.audio.Music; import com.badlogic.gdx.audio.Music;
import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.Pixmap; import com.badlogic.gdx.graphics.Pixmap;
@ -18,15 +19,13 @@ import com.badlogic.gdx.scenes.scene2d.ui.Skin;
import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener; import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
import zero1hd.rhythmbullet.RhythmBullet; import zero1hd.rhythmbullet.RhythmBullet;
import zero1hd.rhythmbullet.screens.PreGameScreen;
import zero1hd.rhythmbullet.ui.builders.HealthBar; import zero1hd.rhythmbullet.ui.builders.HealthBar;
import zero1hd.rhythmbullet.ui.windows.FPSWindow; import zero1hd.rhythmbullet.ui.windows.FPSWindow;
import zero1hd.rhythmbullet.ui.windows.PauseMenu; import zero1hd.rhythmbullet.ui.windows.PauseMenu;
import zero1hd.rhythmbullet.util.MiniEvents;
import zero1hd.rhythmbullet.util.ScoreManager; import zero1hd.rhythmbullet.util.ScoreManager;
public class GameHUD extends Stage { public class GameHUD extends Stage {
private PreGameScreen pgs; private Screen returnScreen;
private Label scoreLabel; private Label scoreLabel;
private ImageButton pause; private ImageButton pause;
private boolean paused; private boolean paused;
@ -43,14 +42,14 @@ public class GameHUD extends Stage {
private ScoreManager sm; private ScoreManager sm;
private Color original, bass, um; private Color original, bass, um;
public GameHUD(Skin skin, float maxHealth, GamePlayArea gpa, PreGameScreen preGS, final RhythmBullet core) { public GameHUD(Skin skin, float maxHealth, GamePlayArea gpa, Screen rs, final RhythmBullet core) {
super(); super();
scoreLabel = new Label("Score: 0", skin, "default-font", Color.WHITE); scoreLabel = new Label("Score: 0", skin, "default-font", Color.WHITE);
scoreLabel.setPosition(10f, Gdx.graphics.getHeight()-scoreLabel.getHeight() - 10f); scoreLabel.setPosition(10f, Gdx.graphics.getHeight()-scoreLabel.getHeight() - 10f);
addActor(scoreLabel); addActor(scoreLabel);
this.sm = gpa.score; this.sm = gpa.score;
this.gpa = gpa; this.gpa = gpa;
this.pgs = preGS; this.returnScreen = rs;
pause = new ImageButton(skin.getDrawable("pause"), pause = new ImageButton(skin.getDrawable("pause"),
skin.getDrawable("pause-down")); skin.getDrawable("pause-down"));
@ -78,8 +77,7 @@ public class GameHUD extends Stage {
pauseMenu.getQuitButton().addListener(new ChangeListener() { pauseMenu.getQuitButton().addListener(new ChangeListener() {
@Override @Override
public void changed(ChangeEvent event, Actor actor) { public void changed(ChangeEvent event, Actor actor) {
pgs.ap.miniSender.send(MiniEvents.BACK); core.setScreen(returnScreen);
core.setScreen(pgs);
} }
}); });
pauseMenu.setPosition((Gdx.graphics.getWidth()-pauseMenu.getWidth())/2f, (Gdx.graphics.getHeight()-pauseMenu.getHeight())/2f); pauseMenu.setPosition((Gdx.graphics.getWidth()-pauseMenu.getWidth())/2f, (Gdx.graphics.getHeight()-pauseMenu.getHeight())/2f);