mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2026-06-18 14:50:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
cyberpwn
2021-08-24 22:28:33 -04:00
parent 432e95e4ec
commit 8df789ae34
84 changed files with 404 additions and 786 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/volmit/iris/util/noise/Worm.java
+3 -6
View File
@@ -25,19 +25,16 @@ public class Worm {
private double position;
private double velocity;
public Worm(double startPosition, double startVelocity)
{
public Worm(double startPosition, double startVelocity) {
this.position = startPosition;
this.velocity = startVelocity;
}
public void unstep()
{
public void unstep() {
position -= velocity;
}
public void step()
{
public void step() {
position += velocity;
}
}
src/main/java/com/volmit/iris/util/noise/Worm2.java
+5 -11
View File
@@ -18,34 +18,28 @@
package com.volmit.iris.util.noise;
import com.volmit.iris.util.math.Position2;
import lombok.Data;
@Data
public class Worm2
{
public class Worm2 {
private final Worm x;
private final Worm z;
public Worm2(Worm x, Worm z)
{
public Worm2(Worm x, Worm z) {
this.x = x;
this.z = z;
}
public Worm2(int x, int z, int vx, int vz)
{
public Worm2(int x, int z, int vx, int vz) {
this(new Worm(x, vx), new Worm(z, vz));
}
public void step()
{
public void step() {
x.step();
z.step();
}
public void unstep()
{
public void unstep() {
x.unstep();
z.unstep();
}
src/main/java/com/volmit/iris/util/noise/Worm3.java
+5 -10
View File
@@ -21,33 +21,28 @@ package com.volmit.iris.util.noise;
import lombok.Data;
@Data
public class Worm3
{
public class Worm3 {
private final Worm x;
private final Worm y;
private final Worm z;
public Worm3(Worm x,Worm y, Worm z)
{
public Worm3(Worm x, Worm y, Worm z) {
this.x = x;
this.y = y;
this.z = z;
}
public Worm3(int x, int y, int z, int vx, int vy, int vz)
{
public Worm3(int x, int y, int z, int vx, int vy, int vz) {
this(new Worm(x, vx), new Worm(y, vy), new Worm(z, vz));
}
public void step()
{
public void step() {
x.step();
y.step();
z.step();
}
public void unstep()
{
public void unstep() {
x.unstep();
y.unstep();
z.unstep();
src/main/java/com/volmit/iris/util/noise/WormIterator2.java
+4 -7
View File
@@ -32,18 +32,15 @@ public class WormIterator2 {
private int maxDistance;
private int maxIterations;
public boolean hasNext()
{
public boolean hasNext() {
double dist = maxDistance - (Math.max(Math.abs(worm.getX().getVelocity()), Math.abs(worm.getZ().getVelocity())) + 1);
return maxIterations > 0 &&
((x * x) - (worm.getX().getPosition() * worm.getX().getPosition()))
+ ((z * z) - (worm.getZ().getPosition() * worm.getZ().getPosition())) < dist * dist;
+ ((z * z) - (worm.getZ().getPosition() * worm.getZ().getPosition())) < dist * dist;
}
public Worm2 next()
{
if(worm == null)
{
public Worm2 next() {
if (worm == null) {
worm = new Worm2(x, z, 0, 0);
return worm;
}
src/main/java/com/volmit/iris/util/noise/WormIterator3.java
+7 -12
View File
@@ -18,7 +18,6 @@
package com.volmit.iris.util.noise;
import com.volmit.iris.Iris;
import com.volmit.iris.util.function.NoiseProvider;
import lombok.Builder;
import lombok.Data;
@@ -34,28 +33,24 @@ public class WormIterator3 {
private int maxDistance;
private int maxIterations;
public boolean hasNext()
{
if(worm == null)
{
public boolean hasNext() {
if (worm == null) {
return true;
}
double dist = maxDistance - (Math.max(Math.max(Math.abs(worm.getX().getVelocity()),
Math.abs(worm.getZ().getVelocity())),
Math.abs(worm.getZ().getVelocity())),
Math.abs(worm.getY().getVelocity())) + 1);
return maxIterations > 0 &&
((x * x) - (worm.getX().getPosition() * worm.getX().getPosition()))
+ ((y * y) - (worm.getY().getPosition() * worm.getY().getPosition()))
+ ((z * z) - (worm.getZ().getPosition() * worm.getZ().getPosition())) < dist * dist;
+ ((y * y) - (worm.getY().getPosition() * worm.getY().getPosition()))
+ ((z * z) - (worm.getZ().getPosition() * worm.getZ().getPosition())) < dist * dist;
}
public Worm3 next()
{
public Worm3 next() {
maxIterations--;
if(worm == null)
{
if (worm == null) {
worm = new Worm3(x, y, z, 0, 0, 0);
return worm;
}