Sunpy/opsu-dance
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

readd loading bar

Browse Source
This commit is contained in:
yugecin 2017-12-21 22:49:31 +01:00
parent 9acef42502
commit a2edb8a1c1
1 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/itdelatrisu/opsu/ui/UI.java
View File

@ -22,8 +22,6 @@ import itdelatrisu.opsu.GameImage;
import itdelatrisu.opsu.Utils; import itdelatrisu.opsu.Utils;
import itdelatrisu.opsu.audio.SoundController; import itdelatrisu.opsu.audio.SoundController;
import itdelatrisu.opsu.beatmap.BeatmapParser; import itdelatrisu.opsu.beatmap.BeatmapParser;
import itdelatrisu.opsu.beatmap.OszUnpacker;
import itdelatrisu.opsu.replay.ReplayImporter;
import itdelatrisu.opsu.ui.animations.AnimatedValue; import itdelatrisu.opsu.ui.animations.AnimatedValue;
import itdelatrisu.opsu.ui.animations.AnimationEquation; import itdelatrisu.opsu.ui.animations.AnimationEquation;
@ -34,6 +32,7 @@ import yugecin.opsudance.core.DisplayContainer;
import yugecin.opsudance.ui.BackButton; import yugecin.opsudance.ui.BackButton;
import static yugecin.opsudance.options.Options.*; import static yugecin.opsudance.options.Options.*;
import static yugecin.opsudance.core.InstanceContainer.*;
/** /**
* Draws common UI components. * Draws common UI components.
@ -193,29 +192,21 @@ public class UI {
int progress; int progress;
// determine current action // determine current action
// if ((file = oszunpacker.getCurrentFileName()) != null) {
/*
TODO
if ((file = OszUnpacker.getCurrentFileName()) != null) {
text = "Unpacking new beatmaps..."; text = "Unpacking new beatmaps...";
progress = OszUnpacker.getUnpackerProgress(); progress = oszunpacker.getUnpackerProgress();
} else if ((file = BeatmapParser.getCurrentFileName()) != null) { } else if ((file = beatmapParser.getCurrentFileName()) != null) {
text = (BeatmapParser.getStatus() == BeatmapParser.Status.INSERTING) ? text = (beatmapParser.getStatus() == BeatmapParser.Status.INSERTING) ?
"Updating database..." : "Loading beatmaps..."; "Updating database..." : "Loading beatmaps...";
progress = BeatmapParser.getParserProgress(); progress = beatmapParser.getParserProgress();
} else if ((file = ReplayImporter.getCurrentFileName()) != null) { } else if ((file = replayImporter.getCurrentFileName()) != null) {
text = "Importing replays..."; text = "Importing replays...";
progress = ReplayImporter.getLoadingProgress(); progress = replayImporter.getLoadingProgress();
} else if ((file = SoundController.getCurrentFileName()) != null) { } else if ((file = SoundController.getCurrentFileName()) != null) {
text = "Loading sounds..."; text = "Loading sounds...";
progress = SoundController.getLoadingProgress(); progress = SoundController.getLoadingProgress();
} else } else
return; return;
*/
if (true) {
return; // TODO
}
// draw loading info // draw loading info
float marginX = displayContainer.width * 0.02f, marginY = displayContainer.height * 0.02f; float marginX = displayContainer.width * 0.02f, marginY = displayContainer.height * 0.02f;