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

Merge branch 'mirrortoggle' into master

Browse Source
This commit is contained in:
yugecin 2016-10-01 13:58:27 +02:00
commit 54fa335492
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/itdelatrisu/opsu/Options.java
View File

@ -694,7 +694,7 @@ public class Options {
} }
}, },
DANCE_MIRROR ("Mirror collage", "MirrorCollage", "Hypnotizing stuff", Dancer.mirror) { DANCE_MIRROR ("Mirror collage", "MirrorCollage", "Hypnotizing stuff. Toggle this ingame by pressing the M key.", Dancer.mirror) {
@Override @Override
public void click(GameContainer container) { public void click(GameContainer container) {
bool = !bool; bool = !bool;

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

@ -254,6 +254,9 @@ public class Game extends BasicGameState {
/** Music position bar coordinates and dimensions (for replay seeking). */ /** Music position bar coordinates and dimensions (for replay seeking). */
private float musicBarX, musicBarY, musicBarWidth, musicBarHeight; private float musicBarX, musicBarY, musicBarWidth, musicBarHeight;
private int mirrorFrom;
private int mirrorTo;
/** Music position bar background colors. */ /** Music position bar background colors. */
private static final Color private static final Color
MUSICBAR_NORMAL = new Color(12, 9, 10, 0.25f), MUSICBAR_NORMAL = new Color(12, 9, 10, 0.25f),
@ -1014,6 +1017,17 @@ public class Game extends BasicGameState {
case Input.KEY_F12: case Input.KEY_F12:
Utils.takeScreenShot(); Utils.takeScreenShot();
break; break;
case Input.KEY_M:
if (Dancer.mirror) {
mirrorTo = objectIndex;
Dancer.mirror = false;
mirrorCursor.resetLocations();
} else {
mirrorFrom = objectIndex + 1;
mirrorTo = gameObjects.length;
Dancer.mirror = true;
}
break;
} }
} }
@ -1314,6 +1328,8 @@ public class Game extends BasicGameState {
} }
Slider.bpm = beatmap.bpmMin * GameMod.getSpeedMultiplier(); Slider.bpm = beatmap.bpmMin * GameMod.getSpeedMultiplier();
mirrorFrom = 0;
mirrorTo = gameObjects.length;
skipButton.resetHover(); skipButton.resetHover();
if (isReplay || GameMod.AUTO.isActive()) if (isReplay || GameMod.AUTO.isActive())
@ -1427,7 +1443,7 @@ public class Game extends BasicGameState {
if (!loseState) { if (!loseState) {
if (!Dancer.hideobjects) { if (!Dancer.hideobjects) {
gameObj.draw(g, trackPosition, false); gameObj.draw(g, trackPosition, false);
if (Dancer.mirror && GameMod.AUTO.isActive()) { if (Dancer.mirror && GameMod.AUTO.isActive() && idx <= mirrorTo && idx >= mirrorFrom) {
g.pushTransform(); g.pushTransform();
g.rotate(Options.width / 2f, Options.height / 2f, 180f); g.rotate(Options.width / 2f, Options.height / 2f, 180f);
gameObj.draw(g, trackPosition, true); gameObj.draw(g, trackPosition, true);