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

Options to use object color overrides

Browse Source
This commit is contained in:
yugecin
2016-09-30 19:05:53 +02:00
parent 05c29f1106
commit add5e96af1
8 changed files with 168 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/itdelatrisu/opsu/objects/Circle.java
View File

@@ -55,12 +55,11 @@ public class Circle extends GameObject {
/** The color of this circle. */
private Color color;
private Color mirrorColor;
/** Whether or not the circle result ends the combo streak. */
private boolean comboEnd;
public static int hue;
/**
* Initializes the Circle data type with map modifiers, images, and dimensions.
* @param container the game container
@@ -86,20 +85,17 @@ public class Circle extends GameObject {
this.hitObject = hitObject;
this.game = game;
this.data = data;
this.color = color;
this.comboEnd = comboEnd;
updatePosition();
if (Dancer.rgbobj) {
this.color = Utils.nextColor();
}
this.color = Dancer.colorOverride.getColor(color);
this.mirrorColor = Dancer.colorMirrorOverride.getColor(color);
}
@Override
public void draw(Graphics g, int trackPosition, boolean mirror) {
Color orig = color;
if (mirror) {
//color = Utils.currentShiftColor();
color = Utils.shiftHue(color, 180f);
color = mirrorColor;
}
int timeDiff = hitObject.getTime() - trackPosition;

11
src/itdelatrisu/opsu/objects/Slider.java
View File

@@ -72,6 +72,7 @@ public class Slider extends GameObject {
/** The color of this slider. */
private Color color;
private Color mirrorColor;
/** The underlying Curve. */
private Curve curve;
@@ -150,18 +151,15 @@ public class Slider extends GameObject {
* @param hitObject the associated HitObject
* @param game the associated Game object
* @param data the associated GameData object
* @param color the color of this slider
* @param comboEnd true if this is the last hit object in the combo
*/
public Slider(HitObject hitObject, Game game, GameData data, Color color, boolean comboEnd) {
this.hitObject = hitObject;
this.game = game;
this.data = data;
this.color = color;
this.comboEnd = comboEnd;
if (Dancer.rgbobj) {
this.color = Utils.nextColor();
}
this.color = Dancer.colorOverride.getColor(color);
this.mirrorColor = Dancer.colorMirrorOverride.getColor(color);
updatePosition();
// slider time calculations
@@ -186,8 +184,7 @@ public class Slider extends GameObject {
public void draw(Graphics g, int trackPosition, boolean mirror) {
Color orig = color;
if (mirror) {
//color = Utils.currentShiftColor();
color = Utils.shiftHue(color, 180f);
color = mirrorColor;
}
int timeDiff = hitObject.getTime() - trackPosition;