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

Cleanup

Browse Source
This commit is contained in:
cyberpwn
2021-08-26 06:35:12 -04:00
parent 44d75d9955
commit 2aa240337c
27 changed files with 146 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/volmit/iris/util/math/IrisMathHelper.java
View File

@@ -361,9 +361,7 @@ public class IrisMathHelper {
var9 = var5;
var10 = var6;
}
default -> {
throw new RuntimeException("Something went wrong when converting from HSV to RGB. Input was " + var0 + ", " + var1 + ", " + var2);
}
default -> throw new RuntimeException("Something went wrong when converting from HSV to RGB. Input was " + var0 + ", " + var1 + ", " + var2);
}
final int var11 = clamp((int) (var8 * 255.0f), 0, 255);
final int var12 = clamp((int) (var9 * 255.0f), 0, 255);

22
src/main/java/com/volmit/iris/util/math/KochanekBartelsInterpolation.java
View File

@@ -197,19 +197,15 @@ public class KochanekBartelsInterpolation implements PathInterpolation {
* Assumes a < b.
*/
private double arcLengthRecursive(int indexLeft, double remainderLeft, int indexRight, double remainderRight) {
switch (indexRight - indexLeft) {
case 0:
return arcLengthRecursive(indexLeft, remainderLeft, remainderRight);
case 1:
// This case is merely a speed-up for a very common case
return arcLengthRecursive(indexLeft, remainderLeft, 1.0)
+ arcLengthRecursive(indexRight, 0.0, remainderRight);
default:
return arcLengthRecursive(indexLeft, remainderLeft, indexRight - 1, 1.0)
+ arcLengthRecursive(indexRight, 0.0, remainderRight);
}
return switch (indexRight - indexLeft) {
case 0 -> arcLengthRecursive(indexLeft, remainderLeft, remainderRight);
case 1 ->
// This case is merely a speed-up for a very common case
arcLengthRecursive(indexLeft, remainderLeft, 1.0)
+ arcLengthRecursive(indexRight, 0.0, remainderRight);
default -> arcLengthRecursive(indexLeft, remainderLeft, indexRight - 1, 1.0)
+ arcLengthRecursive(indexRight, 0.0, remainderRight);
};
}
private double arcLengthRecursive(int index, double remainderLeft, double remainderRight) {

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

@@ -200,11 +200,10 @@ public class MathHelper {
public static double a(long[] var0) {
long var1 = 0L;
long[] var3 = var0;
int var4 = var0.length;
for (int var5 = 0; var5 < var4; ++var5) {
long var6 = var3[var5];
long var6 = var0[var5];
var1 += var6;
}
@@ -452,7 +451,7 @@ public class MathHelper {
public static double d(double var0, double var2) {
double var4 = var2 * var2 + var0 * var0;
if (Double.isNaN(var4)) {
return 0.0D / 0.0;
return Double.NaN;
} else {
boolean var6 = var0 < 0.0D;
if (var6) {
@@ -536,38 +535,37 @@ public class MathHelper {
float var9;
float var10;
switch (var3) {
case 0:
case 0 -> {
var8 = var2;
var9 = var7;
var10 = var5;
break;
case 1:
}
case 1 -> {
var8 = var6;
var9 = var2;
var10 = var5;
break;
case 2:
}
case 2 -> {
var8 = var5;
var9 = var2;
var10 = var7;
break;
case 3:
}
case 3 -> {
var8 = var5;
var9 = var6;
var10 = var2;
break;
case 4:
}
case 4 -> {
var8 = var7;
var9 = var5;
var10 = var2;
break;
case 5:
}
case 5 -> {
var8 = var2;
var9 = var5;
var10 = var6;
break;
default:
throw new RuntimeException("Something went wrong when converting from HSV to RGB. Input was " + var0 + ", " + var1 + ", " + var2);
}
default -> throw new RuntimeException("Something went wrong when converting from HSV to RGB. Input was " + var0 + ", " + var1 + ", " + var2);
}
int var11 = clamp((int) (var8 * 255.0F), 0, 255);
@@ -596,11 +594,10 @@ public class MathHelper {
public static double[] a(double... var0) {
float var1 = 0.0F;
double[] var2f = var0;
int var3 = var0.length;
for (int var4 = 0; var4 < var3; ++var4) {
double var5 = var2f[var4];
double var5 = var0[var4];
var1 = (float) ((double) var1 + var5);
}

80
src/main/java/com/volmit/iris/util/math/VectorMath.java
View File

@@ -265,85 +265,71 @@ public class VectorMath {
KList<BlockFace> faces = new KList<>();
switch (f) {
case DOWN:
faces.add(BlockFace.DOWN);
break;
case EAST:
faces.add(BlockFace.EAST);
break;
case EAST_NORTH_EAST:
case DOWN -> faces.add(BlockFace.DOWN);
case EAST -> faces.add(BlockFace.EAST);
case EAST_NORTH_EAST -> {
faces.add(BlockFace.EAST);
faces.add(BlockFace.EAST);
faces.add(BlockFace.NORTH);
break;
case EAST_SOUTH_EAST:
}
case EAST_SOUTH_EAST -> {
faces.add(BlockFace.EAST);
faces.add(BlockFace.EAST);
faces.add(BlockFace.SOUTH);
break;
case NORTH:
faces.add(BlockFace.NORTH);
break;
case NORTH_EAST:
}
case NORTH -> faces.add(BlockFace.NORTH);
case NORTH_EAST -> {
faces.add(BlockFace.NORTH);
faces.add(BlockFace.EAST);
break;
case NORTH_NORTH_EAST:
}
case NORTH_NORTH_EAST -> {
faces.add(BlockFace.NORTH);
faces.add(BlockFace.NORTH);
faces.add(BlockFace.EAST);
break;
case NORTH_NORTH_WEST:
}
case NORTH_NORTH_WEST -> {
faces.add(BlockFace.NORTH);
faces.add(BlockFace.NORTH);
faces.add(BlockFace.WEST);
break;
case NORTH_WEST:
}
case NORTH_WEST -> {
faces.add(BlockFace.NORTH);
faces.add(BlockFace.WEST);
break;
case SELF:
faces.add(BlockFace.SELF);
break;
case SOUTH:
faces.add(BlockFace.SOUTH);
break;
case SOUTH_EAST:
}
case SELF -> faces.add(BlockFace.SELF);
case SOUTH -> faces.add(BlockFace.SOUTH);
case SOUTH_EAST -> {
faces.add(BlockFace.SOUTH);
faces.add(BlockFace.EAST);
break;
case SOUTH_SOUTH_EAST:
}
case SOUTH_SOUTH_EAST -> {
faces.add(BlockFace.SOUTH);
faces.add(BlockFace.SOUTH);
faces.add(BlockFace.EAST);
break;
case SOUTH_SOUTH_WEST:
}
case SOUTH_SOUTH_WEST -> {
faces.add(BlockFace.SOUTH);
faces.add(BlockFace.SOUTH);
faces.add(BlockFace.WEST);
break;
case SOUTH_WEST:
}
case SOUTH_WEST -> {
faces.add(BlockFace.SOUTH);
faces.add(BlockFace.WEST);
break;
case UP:
faces.add(BlockFace.UP);
break;
case WEST:
faces.add(BlockFace.WEST);
break;
case WEST_NORTH_WEST:
}
case UP -> faces.add(BlockFace.UP);
case WEST -> faces.add(BlockFace.WEST);
case WEST_NORTH_WEST -> {
faces.add(BlockFace.WEST);
faces.add(BlockFace.WEST);
faces.add(BlockFace.NORTH);
break;
case WEST_SOUTH_WEST:
}
case WEST_SOUTH_WEST -> {
faces.add(BlockFace.WEST);
faces.add(BlockFace.WEST);
faces.add(BlockFace.SOUTH);
break;
default:
break;
}
default -> {
}
}
return faces;