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

Fixes

Browse Source
This commit is contained in:
Daniel Mills 2020-08-16 02:23:53 -04:00
parent 86be84b015
commit d89371a279
6 changed files with 639 additions and 412 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/volmit/iris/ProjectManager.java
View File

@ -96,8 +96,12 @@ public class ProjectManager
{ {
if(i.getName().endsWith(".code-workspace")) if(i.getName().endsWith(".code-workspace"))
{ {
sender.sendMessage("Updating Workspace"); sender.sendMessage("Updating Workspace...");
updateWorkspace(i); J.a(() ->
{
updateWorkspace(i);
sender.sendMessage("Workspace Updated");
});
Desktop.getDesktop().open(i); Desktop.getDesktop().open(i);
break; break;
} }

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

@ -335,8 +335,8 @@ public class CNG
double scale = this.bakedScale * this.scale; double scale = this.bakedScale * this.scale;
double f = (fracture != null ? (fracture.noise(dim) - 0.5) * fscale : 0D); double f = (fracture != null ? (fracture.noise(dim) - 0.5) * fscale : 0D);
double x = dim.length > 0 ? dim[0] + f : 0D; double x = dim.length > 0 ? dim[0] + f : 0D;
double z = dim.length > 1 ? dim[1] - f : 0D; double y = dim.length > 1 ? dim[1] - f : 0D;
double y = dim.length > 2 ? dim[2] + f : 0D; double z = dim.length > 2 ? dim[2] - f : 0D;
double n = generator.noise(x * scale, y * scale, z * scale) * opacity; double n = generator.noise(x * scale, y * scale, z * scale) * opacity;
n = power != 1D ? Math.pow(n, power) : n; n = power != 1D ? Math.pow(n, power) : n;
double m = 1; double m = 1;

986
src/main/java/com/volmit/iris/noise/FastNoise.java
View File

File diff suppressed because one or more lines are too long

21
src/main/java/com/volmit/iris/noise/FlatNoise.java
View File

@ -1,22 +1,27 @@
package com.volmit.iris.noise; package com.volmit.iris.noise;
public class FlatNoise implements NoiseGenerator { public class FlatNoise implements NoiseGenerator
public FlatNoise(long seed) { {
public FlatNoise(long seed)
{
} }
@Override @Override
public double noise(double x) { public double noise(double x)
return 0.5; {
return 1D;
} }
@Override @Override
public double noise(double x, double z) { public double noise(double x, double z)
return 0.5; {
return 1D;
} }
@Override @Override
public double noise(double x, double y, double z) { public double noise(double x, double y, double z)
return 0.5; {
return 1D;
} }
} }

22
src/main/java/com/volmit/iris/noise/WhiteNoise.java
View File

@ -1,25 +1,29 @@
package com.volmit.iris.noise; package com.volmit.iris.noise;
public class WhiteNoise implements NoiseGenerator { public class WhiteNoise implements NoiseGenerator
{
private final FastNoise n; private final FastNoise n;
public WhiteNoise(long seed) { public WhiteNoise(long seed)
{
n = new FastNoise((int) seed); n = new FastNoise((int) seed);
} }
@Override @Override
public double noise(double x) { public double noise(double x)
return (n.GetWhiteNoise((float) x, 0) / 2D) + 0.5D; {
return (n.GetWhiteNoise(Float.intBitsToFloat((int) Double.doubleToLongBits(x / 1000d)) % 1000000F, 0) / 2D) + 0.5D;
} }
@Override @Override
public double noise(double x, double z) { public double noise(double x, double z)
return (n.GetWhiteNoise((float) x, (float) z) / 2D) + 0.5D; {
return (n.GetWhiteNoise(Float.intBitsToFloat((int) Double.doubleToLongBits(x / 1000d)) % 1000000F, Float.intBitsToFloat((int) Double.doubleToLongBits(z / 1000d)) % 1000000F) / 2D) + 0.5D;
} }
@Override @Override
public double noise(double x, double y, double z) { public double noise(double x, double y, double z)
return (n.GetWhiteNoise((float) x, (float) y, (float) z) / 2D) + 0.5D; {
return (n.GetWhiteNoise(Float.intBitsToFloat((int) Double.doubleToLongBits(x / 1000d)) % 1000000F, Float.intBitsToFloat((int) Double.doubleToLongBits(y / 1000d)) % 1000000F, Float.intBitsToFloat((int) Double.doubleToLongBits(z / 1000d)) % 1000000F) / 2D) + 0.5D;
} }
} }

2
src/main/java/com/volmit/iris/object/IrisBiome.java
View File

@ -265,7 +265,7 @@ public class IrisBiome extends IrisRegistrant implements IRare
for(int i = 0; i < maxDepth; i++) for(int i = 0; i < maxDepth; i++)
{ {
int offset = (getMaxHeight() - height) - i; int offset = (255 - height) - i;
int index = offset % data.size(); int index = offset % data.size();
real.add(data.get(index < 0 ? 0 : index)); real.add(data.get(index < 0 ? 0 : index));
} }