mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2026-04-05 07:16:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove useless bitwise ops

Browse Source
This commit is contained in:
cyberpwn
2022-01-13 07:09:52 -05:00
parent 7a7596fb7b
commit 62c2757afc
7 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/volmit/iris/engine/object/IrisGenerator.java
View File

@@ -125,6 +125,7 @@ public class IrisGenerator extends IrisRegistrant {
for(T i : b) {
for(int j = 0; j < max - i.getRarity(); j++) {
//noinspection AssignmentUsedAsCondition
if(o = !o) {
rarityMapped.add(i);
} else {

20
src/main/java/com/volmit/iris/engine/object/IrisImage.java
View File

@@ -59,36 +59,36 @@ public class IrisImage extends IrisRegistrant {
return ((color >> 8) & 0xFF) / 255D;
}
case BLUE -> {
return ((color >> 0) & 0xFF) / 255D;
return ((color) & 0xFF) / 255D;
}
case SATURATION -> {
return Color.RGBtoHSB((color >> 16) & 0xFF, (color >> 8) & 0xFF, (color >> 0) & 0xFF, null)[1];
return Color.RGBtoHSB((color >> 16) & 0xFF, (color >> 8) & 0xFF, (color) & 0xFF, null)[1];
}
case HUE -> {
return Color.RGBtoHSB((color >> 16) & 0xFF, (color >> 8) & 0xFF, (color >> 0) & 0xFF, null)[0];
return Color.RGBtoHSB((color >> 16) & 0xFF, (color >> 8) & 0xFF, (color) & 0xFF, null)[0];
}
case BRIGHTNESS -> {
return Color.RGBtoHSB((color >> 16) & 0xFF, (color >> 8) & 0xFF, (color >> 0) & 0xFF, null)[2];
return Color.RGBtoHSB((color >> 16) & 0xFF, (color >> 8) & 0xFF, (color) & 0xFF, null)[2];
}
case COMPOSITE_ADD_RGB -> {
return ((((color >> 16) & 0xFF) / 255D) + (((color >> 8) & 0xFF) / 255D) + (((color >> 0) & 0xFF) / 255D)) / 3D;
return ((((color >> 16) & 0xFF) / 255D) + (((color >> 8) & 0xFF) / 255D) + (((color) & 0xFF) / 255D)) / 3D;
}
case COMPOSITE_MUL_RGB -> {
return (((color >> 16) & 0xFF) / 255D) * (((color >> 8) & 0xFF) / 255D) * (((color >> 0) & 0xFF) / 255D);
return (((color >> 16) & 0xFF) / 255D) * (((color >> 8) & 0xFF) / 255D) * (((color) & 0xFF) / 255D);
}
case COMPOSITE_MAX_RGB -> {
return Math.max(Math.max((((color >> 16) & 0xFF) / 255D), (((color >> 8) & 0xFF) / 255D)), (((color >> 0) & 0xFF) / 255D));
return Math.max(Math.max((((color >> 16) & 0xFF) / 255D), (((color >> 8) & 0xFF) / 255D)), (((color) & 0xFF) / 255D));
}
case COMPOSITE_ADD_HSB -> {
float[] hsb = Color.RGBtoHSB((color >> 16) & 0xFF, (color >> 8) & 0xFF, (color >> 0) & 0xFF, null);
float[] hsb = Color.RGBtoHSB((color >> 16) & 0xFF, (color >> 8) & 0xFF, (color) & 0xFF, null);
return (hsb[0] + hsb[1] + hsb[2]) / 3D;
}
case COMPOSITE_MUL_HSB -> {
float[] hsb = Color.RGBtoHSB((color >> 16) & 0xFF, (color >> 8) & 0xFF, (color >> 0) & 0xFF, null);
float[] hsb = Color.RGBtoHSB((color >> 16) & 0xFF, (color >> 8) & 0xFF, (color) & 0xFF, null);
return hsb[0] * hsb[1] * hsb[2];
}
case COMPOSITE_MAX_HSB -> {
float[] hsb = Color.RGBtoHSB((color >> 16) & 0xFF, (color >> 8) & 0xFF, (color >> 0) & 0xFF, null);
float[] hsb = Color.RGBtoHSB((color >> 16) & 0xFF, (color >> 8) & 0xFF, (color) & 0xFF, null);
return Math.max(hsb[0], Math.max(hsb[1], hsb[2]));
}
case RAW -> {