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

fixed gl context issue

Browse Source
This commit is contained in:
Harrison Deng 2017-08-04 14:25:50 -05:00
parent 0101f0630b
commit 3c79bdcb32
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,6 +28,8 @@ import zero1hd.rhythmbullet.util.MiniEvents;
import zero1hd.rhythmbullet.util.MiniListener; import zero1hd.rhythmbullet.util.MiniListener;
public class AnalyzePage extends Page implements MiniListener { public class AnalyzePage extends Page implements MiniListener {
private AnalyzePage ap = this;
AudioAnalyzer audioAnalyzer; AudioAnalyzer audioAnalyzer;
AudioData music; AudioData music;
RhythmMapAlgorithm mapGenAlgorithm; RhythmMapAlgorithm mapGenAlgorithm;
@ -55,7 +57,7 @@ public class AnalyzePage extends Page implements MiniListener {
private long startTime, endTime; private long startTime, endTime;
private Thread mapGenThread; private Thread mapGenThread;
private GameScreen gameScreen; private volatile GameScreen gameScreen;
private RhythmBullet core; private RhythmBullet core;
@ -262,11 +264,17 @@ public class AnalyzePage extends Page implements MiniListener {
case MUSIC_DATA_CLEANED: case MUSIC_DATA_CLEANED:
info[3].setText("data cleaning done."); info[3].setText("data cleaning done.");
info[4].addAction(Actions.color(Color.BLACK, 0.75f)); info[4].addAction(Actions.color(Color.BLACK, 0.75f));
gameScreen = new GameScreen(core); Gdx.app.postRunnable(new Runnable() {
mapGenAlgorithm = new RhythmMapAlgorithm(gameScreen.getGameArea().em, gameScreen.getGameArea().cm, audioAnalyzer, speedModifier.getValue(), healthModifier.getValue(), sensitivityRating.getValue()); @Override
mapGenAlgorithm.getSender().addListener(this); public void run() {
mapGenThread = new Thread(mapGenAlgorithm); gameScreen = new GameScreen(core);
mapGenThread.start(); mapGenAlgorithm = new RhythmMapAlgorithm(gameScreen.getGameArea().em, gameScreen.getGameArea().cm, audioAnalyzer, speedModifier.getValue(), healthModifier.getValue(), sensitivityRating.getValue());
mapGenAlgorithm.getSender().addListener(ap);
mapGenThread = new Thread(mapGenAlgorithm);
mapGenThread.start();
}
});
startTime = System.currentTimeMillis(); startTime = System.currentTimeMillis();
break; break;
case MAPGEN_ITERATED: case MAPGEN_ITERATED:
@ -275,25 +283,19 @@ public class AnalyzePage extends Page implements MiniListener {
case MAP_GENERATED: case MAP_GENERATED:
endTime = System.currentTimeMillis(); endTime = System.currentTimeMillis();
info[5].setText("Done. Generation time: " + ((endTime - startTime)/1000f) + "s"); info[5].setText("Done. Generation time: " + ((endTime - startTime)/1000f) + "s");
beginButton.addListener(new ChangeListener() {
Gdx.app.postRunnable(new Runnable() {
@Override @Override
public void run() { public void changed(ChangeEvent event, Actor actor) {
beginButton.addListener(new ChangeListener() { gameScreen.setGamePlayMap(mapGenAlgorithm.getMap());
core.setScreen(gameScreen);
@Override
public void changed(ChangeEvent event, Actor actor) {
gameScreen.setGamePlayMap(mapGenAlgorithm.getMap());
core.setScreen(gameScreen);
}
});
} }
}); });
info[5].addAction(Actions.color(Color.BLACK, 0.75f)); info[5].addAction(Actions.color(Color.BLACK, 0.75f));
songInfo.addAction(Actions.moveTo(songInfo.getX(), getHeightBelowTitle()-songInfo.getHeight(), 0.75f, Interpolation.linear)); songInfo.addAction(Actions.moveTo(songInfo.getX(), getHeight()-songInfo.getHeight()-10, 0.55f, Interpolation.linear));
difficultyTable.addAction(Actions.sequence(Actions.delay(0.4f), Actions.moveTo(songInfo.getX(), getHeightBelowTitle()-songInfo.getHeight()-difficultyTable.getHeight()-10f,0.8f, Interpolation.linear))); difficultyTable.addAction(Actions.sequence(Actions.delay(0.3f), Actions.moveTo(songInfo.getX(), getHeight()-songInfo.getHeight()-10-difficultyTable.getHeight()-5f,0.8f, Interpolation.linear)));
beginTable.addAction(Actions.sequence(Actions.delay(0.5f), Actions.moveTo(difficultyTable.getX(), getHeightBelowTitle()-songInfo.getHeight()-difficultyTable.getHeight()-beginTable.getHeight()-20f,0.8f, Interpolation.linear))); beginTable.addAction(Actions.sequence(Actions.delay(0.5f), Actions.moveTo(difficultyTable.getX(), getHeight()-songInfo.getHeight()-10-difficultyTable.getHeight()-beginTable.getHeight()-10f,0.8f, Interpolation.linear)));
default: default:
break; break;
} }