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

Replay accuracy improvements.

Browse Source 
Store keys from previous frame, and only send a keypress if a new frame's keys differ.

Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
This commit is contained in:
Jeffrey Han 2015-03-14 17:51:49 -04:00
parent 356772b6b6
commit 6e0fcca84c
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -166,6 +166,9 @@ public class Game extends BasicGameState {
/** The replay cursor coordinates. */ /** The replay cursor coordinates. */
private int replayX, replayY; private int replayX, replayY;
/** The replay keys pressed. */
private int replayKeys;
/** Whether a replay key is currently pressed. */ /** Whether a replay key is currently pressed. */
private boolean replayKeyPressed; private boolean replayKeyPressed;
@ -594,7 +597,7 @@ public class Game extends BasicGameState {
} }
// update objects (loop in unlikely event of any skipped indexes) // update objects (loop in unlikely event of any skipped indexes)
boolean keyPressed = ((isReplay && replayKeyPressed) || Utils.isGameKeyPressed()); boolean keyPressed = (isReplay) ? replayKeyPressed : Utils.isGameKeyPressed();
while (objectIndex < hitObjects.length && trackPosition > osu.objects[objectIndex].getTime()) { while (objectIndex < hitObjects.length && trackPosition > osu.objects[objectIndex].getTime()) {
// check if we've already passed the next object's start time // check if we've already passed the next object's start time
boolean overlap = (objectIndex + 1 < hitObjects.length && boolean overlap = (objectIndex + 1 < hitObjects.length &&
@ -786,7 +789,8 @@ public class Game extends BasicGameState {
if (GameMod.AUTO.isActive() || GameMod.RELAX.isActive()) if (GameMod.AUTO.isActive() || GameMod.RELAX.isActive())
return; return;
addReplayFrame(x, y, lastKeysPressed | keys); if (!isReplay)
addReplayFrame(x, y, lastKeysPressed | keys);
// circles // circles
if (hitObject.isCircle() && hitObjects[objectIndex].mousePressed(x, y)) if (hitObject.isCircle() && hitObjects[objectIndex].mousePressed(x, y))
@ -805,26 +809,26 @@ public class Game extends BasicGameState {
if (button == Input.MOUSE_MIDDLE_BUTTON) if (button == Input.MOUSE_MIDDLE_BUTTON)
return; return;
int key = (button == Input.MOUSE_LEFT_BUTTON) ? ReplayFrame.KEY_M1 : ReplayFrame.KEY_M2; if (!isReplay && lastKeysPressed != ReplayFrame.KEY_NONE)
if ((lastKeysPressed & key) > 0)
addReplayFrame(x, y, ReplayFrame.KEY_NONE); addReplayFrame(x, y, ReplayFrame.KEY_NONE);
} }
@Override @Override
public void keyReleased(int key, char c) { public void keyReleased(int key, char c) {
if ((key == Options.getGameKeyLeft() && (lastKeysPressed & ReplayFrame.KEY_K1) > 0) || if (!isReplay && lastKeysPressed != ReplayFrame.KEY_NONE && (key == Options.getGameKeyLeft() || key == Options.getGameKeyRight()))
(key == Options.getGameKeyRight() && (lastKeysPressed & ReplayFrame.KEY_K2) > 0))
addReplayFrame(input.getMouseX(), input.getMouseY(), ReplayFrame.KEY_NONE); addReplayFrame(input.getMouseX(), input.getMouseY(), ReplayFrame.KEY_NONE);
} }
@Override @Override
public void mouseMoved(int oldx, int oldy, int newx, int newy) { public void mouseMoved(int oldx, int oldy, int newx, int newy) {
addReplayFrame(newx, newy, lastKeysPressed); if (!isReplay)
addReplayFrame(newx, newy, lastKeysPressed);
} }
@Override @Override
public void mouseDragged(int oldx, int oldy, int newx, int newy) { public void mouseDragged(int oldx, int oldy, int newx, int newy) {
addReplayFrame(newx, newy, lastKeysPressed); if (!isReplay)
addReplayFrame(newx, newy, lastKeysPressed);
} }
@Override @Override
@ -908,6 +912,7 @@ public class Game extends BasicGameState {
// load initial data // load initial data
replayX = container.getWidth() / 2; replayX = container.getWidth() / 2;
replayY = container.getHeight() / 2; replayY = container.getHeight() / 2;
replayKeys = ReplayFrame.KEY_NONE;
replayKeyPressed = false; replayKeyPressed = false;
replaySkipTime = -1; replaySkipTime = -1;
for (replayIndex = 0; replayIndex < replay.frames.length; replayIndex++) { for (replayIndex = 0; replayIndex < replay.frames.length; replayIndex++) {
@ -918,6 +923,7 @@ public class Game extends BasicGameState {
} else if (frame.getTime() == 0) { } else if (frame.getTime() == 0) {
replayX = frame.getScaledX(); replayX = frame.getScaledX();
replayY = frame.getScaledY(); replayY = frame.getScaledY();
replayKeys = frame.getKeys();
replayKeyPressed = frame.isKeyPressed(); replayKeyPressed = frame.isKeyPressed();
} else } else
break; break;
@ -936,8 +942,10 @@ public class Game extends BasicGameState {
replayX = frame.getScaledX(); replayX = frame.getScaledX();
replayY = frame.getScaledY(); replayY = frame.getScaledY();
replayKeyPressed = frame.isKeyPressed(); replayKeyPressed = frame.isKeyPressed();
if (replayKeyPressed) // send a key press int keys = frame.getKeys();
if (replayKeyPressed && keys != replayKeys) // send a key press
gameKeyPressed(frame.getKeys(), replayX, replayY); gameKeyPressed(frame.getKeys(), replayX, replayY);
replayKeys = keys;
replayIndex++; replayIndex++;
} }
@ -1213,9 +1221,6 @@ public class Game extends BasicGameState {
* @param keys the keys pressed * @param keys the keys pressed
*/ */
private void addReplayFrame(int x, int y, int keys) { private void addReplayFrame(int x, int y, int keys) {
if (isReplay)
return;
int time = MusicController.getPosition(); int time = MusicController.getPosition();
int timeDiff = time - lastReplayTime; int timeDiff = time - lastReplayTime;
lastReplayTime = time; lastReplayTime = time;