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

Some code cleanup.

Browse Source 
- Overhauled OsuTimingPoint class: parsing is done in the constructor, and fields are no longer public.
- Improved consistency of static/non-static fields in a couple of classes.

Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
This commit is contained in:
Jeffrey Han
2014-07-09 13:36:42 -04:00
parent 50fb71e353
commit 5a1972a2bd
7 changed files with 172 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/itdelatrisu/opsu/states/Game.java
View File

@@ -71,7 +71,7 @@ public class Game extends BasicGameState {
/**
* The associated OsuFile object.
*/
private static OsuFile osu;
private OsuFile osu;
/**
* The associated GameScore object (holds all score data).
@@ -101,7 +101,7 @@ public class Game extends BasicGameState {
/**
* Delay time, in milliseconds, before song starts.
*/
private static int leadInTime;
private int leadInTime;
/**
* Hit object approach time, in milliseconds.
@@ -141,7 +141,7 @@ public class Game extends BasicGameState {
/**
* Minimum time before start of song, in milliseconds, to process skip-related actions.
*/
private final int skipOffsetTime = 2000;
private static final int SKIP_OFFSET = 2000;
/**
* Current timing point index in timingPoints ArrayList.
@@ -308,8 +308,8 @@ public class Game extends BasicGameState {
// skip beginning
if (objectIndex == 0 &&
osu.objects[0].time - skipOffsetTime > 5000 &&
trackPosition < osu.objects[0].time - skipOffsetTime)
osu.objects[0].time - SKIP_OFFSET > 5000 &&
trackPosition < osu.objects[0].time - SKIP_OFFSET)
skipButton.draw();
if (isLeadIn())
@@ -456,13 +456,13 @@ public class Game extends BasicGameState {
// timing points
if (timingPointIndex < osu.timingPoints.size()) {
OsuTimingPoint timingPoint = osu.timingPoints.get(timingPointIndex);
if (trackPosition >= timingPoint.time) {
if (timingPoint.velocity >= 0)
beatLengthBase = beatLength = timingPoint.beatLength;
if (trackPosition >= timingPoint.getTime()) {
if (!timingPoint.isInherited())
beatLengthBase = beatLength = timingPoint.getBeatLength();
else
beatLength = beatLengthBase * (timingPoint.velocity / -100f);
SoundController.setSampleSet(timingPoint.sampleType);
SoundController.setSampleVolume(timingPoint.sampleVolume);
beatLength = beatLengthBase * timingPoint.getSliderMultiplier();
SoundController.setSampleSet(timingPoint.getSampleType());
SoundController.setSampleVolume(timingPoint.getSampleVolume());
timingPointIndex++;
}
}
@@ -644,7 +644,7 @@ public class Game extends BasicGameState {
pauseTime = -1;
pausedMouseX = -1;
pausedMouseY = -1;
if (!Game.isLeadIn())
if (!isLeadIn())
MusicController.resume();
}
return;
@@ -751,10 +751,10 @@ public class Game extends BasicGameState {
// load the first timingPoint
if (!osu.timingPoints.isEmpty()) {
OsuTimingPoint timingPoint = osu.timingPoints.get(0);
if (timingPoint.velocity >= 0) {
beatLengthBase = beatLength = timingPoint.beatLength;
SoundController.setSampleSet(timingPoint.sampleType);
SoundController.setSampleVolume(timingPoint.sampleVolume);
if (!timingPoint.isInherited()) {
beatLengthBase = beatLength = timingPoint.getBeatLength();
SoundController.setSampleSet(timingPoint.getSampleType());
SoundController.setSampleVolume(timingPoint.getSampleVolume());
timingPointIndex++;
}
}
@@ -777,13 +777,13 @@ public class Game extends BasicGameState {
private boolean skipIntro() {
int trackPosition = MusicController.getPosition();
if (objectIndex == 0 &&
osu.objects[0].time - skipOffsetTime > 4000 &&
trackPosition < osu.objects[0].time - skipOffsetTime) {
osu.objects[0].time - SKIP_OFFSET > 4000 &&
trackPosition < osu.objects[0].time - SKIP_OFFSET) {
if (isLeadIn()) {
leadInTime = 0;
MusicController.resume();
}
MusicController.setPosition(osu.objects[0].time - skipOffsetTime);
MusicController.setPosition(osu.objects[0].time - SKIP_OFFSET);
SoundController.playSound(SoundController.SOUND_MENUHIT);
return true;
}
@@ -931,7 +931,7 @@ public class Game extends BasicGameState {
/**
* Returns whether or not the track is in the lead-in time state.
*/
public static boolean isLeadIn() { return leadInTime > 0; }
public boolean isLeadIn() { return leadInTime > 0; }
/**
* Returns the object approach time, in milliseconds.

2
src/itdelatrisu/opsu/states/GameRanking.java
View File

@@ -50,7 +50,7 @@ public class GameRanking extends BasicGameState {
/**
* Associated GameScore object.
*/
private static GameScore score;
private GameScore score;
/**
* "Retry" and "Exit" buttons.

6
src/itdelatrisu/opsu/states/MainMenu.java
View File

@@ -209,9 +209,9 @@ public class MainMenu extends BasicGameState {
long time = System.currentTimeMillis() - osuStartTime;
g.drawString(String.format("opsu! has been running for %d minutes, %d seconds.",
TimeUnit.MILLISECONDS.toMinutes(time),
TimeUnit.MILLISECONDS.toSeconds(time) -
TimeUnit.MINUTES.toSeconds(TimeUnit.MILLISECONDS.toMinutes(time))),
25, height - 25 - (lineHeight * 2));
TimeUnit.MILLISECONDS.toSeconds(time) -
TimeUnit.MINUTES.toSeconds(TimeUnit.MILLISECONDS.toMinutes(time))),
25, height - 25 - (lineHeight * 2));
g.drawString(String.format("The current time is %s.",
new SimpleDateFormat("h:mm a").format(new Date())),
25, height - 25 - lineHeight);

10
src/itdelatrisu/opsu/states/Options.java
View File

@@ -118,7 +118,7 @@ public class Options extends BasicGameState {
/**
* Game options.
*/
private enum GameOption {
private static enum GameOption {
NULL,
SCREEN_RESOLUTION,
// FULLSCREEN,
@@ -168,7 +168,7 @@ public class Options extends BasicGameState {
/**
* Option tab buttons.
*/
private GUIMenuButton[] optionTabs = new GUIMenuButton[TAB_MAX];
private static GUIMenuButton[] optionTabs = new GUIMenuButton[TAB_MAX];
/**
* Current tab.
@@ -870,7 +870,7 @@ public class Options extends BasicGameState {
drawOption(pos, "Track Checkpoint",
(checkpoint == 0) ? "Disabled" : String.format("%02d:%02d",
TimeUnit.SECONDS.toMinutes(checkpoint),
checkpoint - TimeUnit.MINUTES.toSeconds(TimeUnit.SECONDS.toMinutes(checkpoint))),
checkpoint - TimeUnit.MINUTES.toSeconds(TimeUnit.SECONDS.toMinutes(checkpoint))),
"Press CTRL+L while playing to load a checkpoint, and CTRL+S to set one."
);
break;
@@ -975,8 +975,8 @@ public class Options extends BasicGameState {
public static float getEffectVolume() { return effectVolume / 100f; }
/**
* Returns the default sound effect volume.
* @return the sound volume [0, 1]
* Returns the default hit sound volume.
* @return the hit sound volume [0, 1]
*/
public static float getHitSoundVolume() { return hitSoundVolume / 100f; }