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

new cursor override: use next object's colors (close #43)

Browse Source
This commit is contained in:
yugecin 2016-11-20 22:10:17 +01:00
parent 3cbc02c253
commit 63144426d1
3 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -859,6 +859,9 @@ public class Game extends BasicGameState {
if ((g.isCircle() || g.isSlider()) && g.getTime() <= trackPosition) { if ((g.isCircle() || g.isSlider()) && g.getTime() <= trackPosition) {
Cursor.lastObjColor = g.getColor(); Cursor.lastObjColor = g.getColor();
Cursor.lastMirroredObjColor = g.getMirroredColor(); Cursor.lastMirroredObjColor = g.getMirroredColor();
} else {
Cursor.nextObjColor = g.getColor();
Cursor.nextMirroredObjColor = g.getMirroredColor();
} }
// timing points // timing points
@ -1478,6 +1481,8 @@ public class Game extends BasicGameState {
Cursor.lastObjColor = Color.white; Cursor.lastObjColor = Color.white;
Cursor.lastMirroredObjColor = Color.white; Cursor.lastMirroredObjColor = Color.white;
Cursor.nextObjColor = Color.white;
Cursor.nextMirroredObjColor = Color.white;
// re-hide cursor // re-hide cursor
if (GameMod.AUTO.isActive() || isReplay) if (GameMod.AUTO.isActive() || isReplay)

2
src/itdelatrisu/opsu/ui/Cursor.java
View File

@ -71,6 +71,8 @@ public class Cursor {
public static Color lastObjColor = Color.white; public static Color lastObjColor = Color.white;
public static Color lastMirroredObjColor = Color.white; public static Color lastMirroredObjColor = Color.white;
public static Color nextObjColor = Color.white;
public static Color nextMirroredObjColor = Color.white;
private boolean isMirrored; private boolean isMirrored;

9
src/yugecin/opsudance/CursorColorOverrides.java
View File

@ -62,6 +62,15 @@ public enum CursorColorOverrides {
} }
return Cursor.lastObjColor; return Cursor.lastObjColor;
} }
},
NEXTOBJ ("Use next object's colors", 13) {
@Override
public Color getColor(boolean mirrored) {
if (mirrored) {
return Cursor.nextMirroredObjColor;
}
return Cursor.nextObjColor;
}
}; };
public int nr; public int nr;