Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Two ColorUtils Improvements #63

Closed
wants to merge 2 commits into from
Closed

Two ColorUtils Improvements #63

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa41b21
Add paint-compatible hex codes to the ColorMeta enum.
DeviousNull Nov 27, 2016
6ae92bb
Change ColorUtils::RGB.distanceSq(RGB) implementation to address the …
DeviousNull Nov 27, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 34 additions & 23 deletions src/main/java/openmods/utils/ColorUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,22 @@

public class ColorUtils {
public static enum ColorMeta {
BLACK("black", 0x1E1B1B),
RED("red", 0xB3312C),
GREEN("green", 0x3B511A),
BROWN("brown", 0x51301A),
BLUE("blue", 0x253192),
PURPLE("purple", 0x7B2FBE),
CYAN("cyan", 0x287697),
LIGHT_GRAY("lightGray", "silver", 0xABABAB),
GRAY("gray", 0x434343),
PINK("pink", 0xD88198),
LIME("lime", 0x41CD34),
YELLOW("yellow", 0xDECF2A),
LIGHT_BLUE("lightBlue", "light_blue", 0x6689D3),
MAGENTA("magenta", 0xC354CD),
ORANGE("orange", 0xEB8844),
WHITE("white", 0xF0F0F0);
BLACK("black", 0x1E1B1B, "f"),
RED("red", 0xB3312C, "e"),
GREEN("green", 0x3B511A, "d"),
BROWN("brown", 0x51301A, "c"),
BLUE("blue", 0x253192, "b"),
PURPLE("purple", 0x7B2FBE, "a"),
CYAN("cyan", 0x287697, "9"),
LIGHT_GRAY("lightGray", "silver", 0xABABAB, "8"),
GRAY("gray", 0x434343, "7"),
PINK("pink", 0xD88198, "6"),
LIME("lime", 0x41CD34, "5"),
YELLOW("yellow", 0xDECF2A, "4"),
LIGHT_BLUE("lightBlue", "light_blue", 0x6689D3, "3"),
MAGENTA("magenta", 0xC354CD, "2"),
ORANGE("orange", 0xEB8844, "1"),
WHITE("white", 0xF0F0F0, "0");

public final int rgb;
public final int vanillaDyeId;
Expand All @@ -42,6 +42,7 @@ public static enum ColorMeta {
public final String name;
public final String unlocalizedName;
public final String textureName;
public final String paintId;
public final RGB rgbWrap;
public final CYMK cymkWrap;

Expand All @@ -53,17 +54,18 @@ public ItemStack createStack(Item item, int amount) {
return new ItemStack(item, amount, vanillaDyeId);
}

private ColorMeta(String name, int rgb) {
this(name, name, rgb);
private ColorMeta(String name, int rgb, String paintId) {
this(name, name, rgb, paintId);
}

private ColorMeta(String name, String textureName, int rgb) {
private ColorMeta(String name, String textureName, int rgb, String paintId) {
this.oreName = "dye" + WordUtils.capitalize(name);
this.oreId = OreDictionary.getOreID(oreName);
this.textureName = textureName;
this.name = name.toLowerCase(Locale.ENGLISH);
this.unlocalizedName = "openmodslib.color." + name;
this.rgb = rgb;
this.paintId = paintId;

final int index = ordinal();
this.vanillaDyeId = index;
Expand Down Expand Up @@ -229,10 +231,19 @@ public CYMK toCYMK() {
}

public int distanceSq(RGB other) {
final int dR = this.r - other.r;
final int dG = this.g - other.g;
final int dB = this.b - other.b;
return (dR * dR) + (dG * dG) + (dB * dB);
// Formula taken from http://www.compuphase.com/cmetric.htm
int meanR = (this.r + other.r) >>> 1;
int dR = this.r - other.r;
int dG = this.g - other.g;
int dB = this.b - other.b;

int dR2 = dR*dR;
int dG2 = dG*dG;
int dB2 = dB*dB;

return Math.abs((((512+meanR)*dR2)>>8)
+ (dG2 << 2)
+ (((767-meanR)*dB2)>>8));
}
}

Expand Down