mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-07-18 18:23:06 +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
Show Stats 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(T i : b) {
for(int j = 0; j < max - i.getRarity(); j++) { for(int j = 0; j < max - i.getRarity(); j++) {
//noinspection AssignmentUsedAsCondition
if(o = !o) { if(o = !o) {
rarityMapped.add(i); rarityMapped.add(i);
} else { } 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; return ((color >> 8) & 0xFF) / 255D;
} }
case BLUE -> { case BLUE -> {
return ((color >> 0) & 0xFF) / 255D; return ((color) & 0xFF) / 255D;
} }
case SATURATION -> { 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 -> { 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 -> { 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 -> { 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 -> { 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 -> { 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 -> { 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; return (hsb[0] + hsb[1] + hsb[2]) / 3D;
} }
case COMPOSITE_MUL_HSB -> { 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]; return hsb[0] * hsb[1] * hsb[2];
} }
case COMPOSITE_MAX_HSB -> { 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])); return Math.max(hsb[0], Math.max(hsb[1], hsb[2]));
} }
case RAW -> { case RAW -> {

6
src/main/java/com/volmit/iris/util/data/palette/Mth.java
View File

@ -356,8 +356,8 @@ public class Mth {
int var3 = (var1 & 0xFF0000) >> 16; int var3 = (var1 & 0xFF0000) >> 16;
int var4 = (var0 & 0xFF00) >> 8; int var4 = (var0 & 0xFF00) >> 8;
int var5 = (var1 & 0xFF00) >> 8; int var5 = (var1 & 0xFF00) >> 8;
int var6 = (var0 & 0xFF) >> 0; int var6 = (var0 & 0xFF);
int var7 = (var1 & 0xFF) >> 0; int var7 = (var1 & 0xFF);
int var8 = (int) (var2 * var3 / 255.0F); int var8 = (int) (var2 * var3 / 255.0F);
int var9 = (int) (var4 * var5 / 255.0F); int var9 = (int) (var4 * var5 / 255.0F);
int var10 = (int) (var6 * var7 / 255.0F); int var10 = (int) (var6 * var7 / 255.0F);
@ -367,7 +367,7 @@ public class Mth {
public static int colorMultiply(int var0, float var1, float var2, float var3) { public static int colorMultiply(int var0, float var1, float var2, float var3) {
int var4 = (var0 & 0xFF0000) >> 16; int var4 = (var0 & 0xFF0000) >> 16;
int var5 = (var0 & 0xFF00) >> 8; int var5 = (var0 & 0xFF00) >> 8;
int var6 = (var0 & 0xFF) >> 0; int var6 = (var0 & 0xFF);
int var7 = (int) (var4 * var1); int var7 = (int) (var4 * var1);
int var8 = (int) (var5 * var2); int var8 = (int) (var5 * var2);
int var9 = (int) (var6 * var3); int var9 = (int) (var6 * var3);

6
src/main/java/com/volmit/iris/util/math/MathHelper.java
View File

@ -334,8 +334,8 @@ public class MathHelper {
int var3 = (var1 & 16711680) >> 16; int var3 = (var1 & 16711680) >> 16;
int var4 = (var0 & '\uff00') >> 8; int var4 = (var0 & '\uff00') >> 8;
int var5 = (var1 & '\uff00') >> 8; int var5 = (var1 & '\uff00') >> 8;
int var6 = (var0 & 255) >> 0; int var6 = (var0 & 255);
int var7 = (var1 & 255) >> 0; int var7 = (var1 & 255);
int var8 = (int) ((float) var2 * (float) var3 / 255.0F); int var8 = (int) ((float) var2 * (float) var3 / 255.0F);
int var9 = (int) ((float) var4 * (float) var5 / 255.0F); int var9 = (int) ((float) var4 * (float) var5 / 255.0F);
int var10 = (int) ((float) var6 * (float) var7 / 255.0F); int var10 = (int) ((float) var6 * (float) var7 / 255.0F);
@ -345,7 +345,7 @@ public class MathHelper {
public static int a(int var0, float var1, float var2, float var3) { public static int a(int var0, float var1, float var2, float var3) {
int var4 = (var0 & 16711680) >> 16; int var4 = (var0 & 16711680) >> 16;
int var5 = (var0 & '\uff00') >> 8; int var5 = (var0 & '\uff00') >> 8;
int var6 = (var0 & 255) >> 0; int var6 = (var0 & 255);
int var7 = (int) ((float) var4 * var1); int var7 = (int) ((float) var4 * var1);
int var8 = (int) ((float) var5 * var2); int var8 = (int) ((float) var5 * var2);
int var9 = (int) ((float) var6 * var3); int var9 = (int) ((float) var6 * var3);

6
src/main/java/com/volmit/iris/util/nbt/mca/palette/MCAMth.java
View File

@ -356,8 +356,8 @@ public class MCAMth {
int var3 = (var1 & 0xFF0000) >> 16; int var3 = (var1 & 0xFF0000) >> 16;
int var4 = (var0 & 0xFF00) >> 8; int var4 = (var0 & 0xFF00) >> 8;
int var5 = (var1 & 0xFF00) >> 8; int var5 = (var1 & 0xFF00) >> 8;
int var6 = (var0 & 0xFF) >> 0; int var6 = (var0 & 0xFF);
int var7 = (var1 & 0xFF) >> 0; int var7 = (var1 & 0xFF);
int var8 = (int) (var2 * var3 / 255.0F); int var8 = (int) (var2 * var3 / 255.0F);
int var9 = (int) (var4 * var5 / 255.0F); int var9 = (int) (var4 * var5 / 255.0F);
int var10 = (int) (var6 * var7 / 255.0F); int var10 = (int) (var6 * var7 / 255.0F);
@ -367,7 +367,7 @@ public class MCAMth {
public static int colorMultiply(int var0, float var1, float var2, float var3) { public static int colorMultiply(int var0, float var1, float var2, float var3) {
int var4 = (var0 & 0xFF0000) >> 16; int var4 = (var0 & 0xFF0000) >> 16;
int var5 = (var0 & 0xFF00) >> 8; int var5 = (var0 & 0xFF00) >> 8;
int var6 = (var0 & 0xFF) >> 0; int var6 = (var0 & 0xFF);
int var7 = (int) (var4 * var1); int var7 = (int) (var4 * var1);
int var8 = (int) (var5 * var2); int var8 = (int) (var5 * var2);
int var9 = (int) (var6 * var3); int var9 = (int) (var6 * var3);

1
src/main/java/com/volmit/iris/util/noise/CNG.java
View File

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

1
src/main/java/com/volmit/iris/util/noise/RarityCellGenerator.java
View File

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