PonyMirrors/MineLittlePony
1
0
Fork 0
mirror of https://github.com/MineLittlePony/MineLittlePony.git synced 2025-02-13 16:24:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

Ignore transparent colours when reading trigger pixels

Browse source
This commit is contained in:
Sollace 2018-09-07 13:12:15 +02:00
parent f4a3d93d23
commit 0f454b753c
2 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/com/minelittlepony/pony/data/ITriggerPixelMapped.java
View file

@ -20,7 +20,7 @@ public interface ITriggerPixelMapped<T extends Enum<T> & ITriggerPixelMapped<T>>
* @param pixelValue The pixel colour to search for. * @param pixelValue The pixel colour to search for.
*/ */
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public static <T extends Enum<T> & ITriggerPixelMapped<T>> T getByTriggerPixel(T type, int pixelValue) { static <T extends Enum<T> & ITriggerPixelMapped<T>> T getByTriggerPixel(T type, int pixelValue) {
for (T i : (T[])type.getClass().getEnumConstants()) { for (T i : (T[])type.getClass().getEnumConstants()) {
if (i.getTriggerPixel() == pixelValue) return i; if (i.getTriggerPixel() == pixelValue) return i;
} }

21
src/main/java/com/minelittlepony/pony/data/TriggerPixels.java
View file

@ -44,6 +44,10 @@ public enum TriggerPixels {
* @param image Image to read * @param image Image to read
*/ */
public <T extends Enum<T> & ITriggerPixelMapped<T>> T readValue(BufferedImage image) { public <T extends Enum<T> & ITriggerPixelMapped<T>> T readValue(BufferedImage image) {
if (Channel.ALPHA.readValue(x, y, image) < 255) {
return (T)def;
}
return ITriggerPixelMapped.getByTriggerPixel((T)def, readColor(image)); return ITriggerPixelMapped.getByTriggerPixel((T)def, readColor(image));
} }
@ -60,16 +64,23 @@ public enum TriggerPixels {
} }
private <T extends Enum<T> & ITriggerPixelMapped<T>> void readFlag(boolean[] out, Channel channel, BufferedImage image) { private <T extends Enum<T> & ITriggerPixelMapped<T>> void readFlag(boolean[] out, Channel channel, BufferedImage image) {
if (Channel.ALPHA.readValue(x, y, image) < 255) {
return;
}
T value = ITriggerPixelMapped.getByTriggerPixel((T)def, channel.readValue(x, y, image)); T value = ITriggerPixelMapped.getByTriggerPixel((T)def, channel.readValue(x, y, image));
if (value != def) out[value.ordinal()] = true;
out[value.ordinal()] |= value != def;
} }
enum Channel { enum Channel {
RAW(-1, 0), RAW(-1, 0),
ALL (0xffffff, 0), ALL (0xffffff, 0),
RED(0xff0000, 16), ALPHA(0xff, 24),
GREEN(0x00ff00, 8), RED (0xff, 16),
BLUE(0x0000ff, 0); GREEN(0xff, 8),
BLUE (0xff, 0);
private int mask; private int mask;
private int offset; private int offset;
@ -80,7 +91,7 @@ public enum TriggerPixels {
} }
public int readValue(int x, int y, BufferedImage image) { public int readValue(int x, int y, BufferedImage image) {
return (image.getRGB(x, y) & mask) >> offset; return (image.getRGB(x, y) >> offset) & mask;
} }
} }
} }