Merge branch 'cursorcolors' into master
This commit is contained in:
commit
8aa4ec0ee5
|
@ -829,10 +829,10 @@ public class Options {
|
|||
}
|
||||
},
|
||||
|
||||
DANCE_RGB_CURSOR_INC ("RGB cursor increment", "RGBCursorInc", "Amount of hue to shift, used for rainbow cursor override", Dancer.rgbhueinc, -1800, 1800) {
|
||||
DANCE_RGB_CURSOR_INC ("RGB cursor increment", "RGBCursorInc", "Amount of hue to shift, used for rainbow cursor override", Dancer.rgbhueinc, -2000, 2000) {
|
||||
@Override
|
||||
public String getValueString() {
|
||||
return String.format("%.1f°", val / 100f);
|
||||
return String.format("%.2f°", val / 1000f);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -97,12 +97,12 @@ public enum CursorColorOverrides {
|
|||
}
|
||||
|
||||
private static Color nextRainbowColor() {
|
||||
hue += Dancer.rgbcursorhueinc / 100f;
|
||||
hue += Dancer.rgbcursorhueinc / 1000f;
|
||||
return new Color(java.awt.Color.getHSBColor(hue / 360f, 1.0f, 1.0f).getRGB());
|
||||
}
|
||||
|
||||
private static Color nextMirrorRainbowColor() {
|
||||
hue += Dancer.rgbcursorhueinc / 100f;
|
||||
hue += Dancer.rgbcursorhueinc / 1000f;
|
||||
return new Color(java.awt.Color.getHSBColor((hue + 180f) / 360f, 1.0f, 1.0f).getRGB());
|
||||
}
|
||||
|
||||
|
|
|
@ -65,7 +65,7 @@ public class Dancer {
|
|||
public static int rgbhueinc = 70; // this should really get its own place somewhere...
|
||||
public static CursorColorOverrides cursorColorOverride = CursorColorOverrides.NONE;
|
||||
public static CursorColorOverrides cursorColorMirrorOverride = CursorColorOverrides.NONE;
|
||||
public static int rgbcursorhueinc = 10; // this should really get its own place somewhere...
|
||||
public static int rgbcursorhueinc = 100; // this should really get its own place somewhere...
|
||||
public static MoverDirection moverDirection = MoverDirection.RANDOM;
|
||||
public static boolean hideobjects = false;
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user