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

Tweaks on height

Browse Source
This commit is contained in:
Daniel Mills 2020-01-21 20:40:30 -05:00
parent 9d5ae41c49
commit 51832005de
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/ninja/bytecode/iris/Settings.java
View File

@ -26,12 +26,12 @@ public class Settings
public static class GeneratorSettings public static class GeneratorSettings
{ {
public InterpolationMode interpolationMode = InterpolationMode.BILINEAR; public InterpolationMode interpolationMode = InterpolationMode.BILINEAR;
public int interpolationRadius = 5; public int interpolationRadius = 3;
public double objectDensity = 1D; public double objectDensity = 1D;
public double horizontalZoom = 2; public double horizontalZoom = 2;
public double heightFracture = 155; public double heightFracture = 155;
public double landScale = 0.75; public double landScale = 0.75;
public double landChance = 0.55; public double landChance = 0.65;
public double roughness = 1.55; public double roughness = 1.55;
public double biomeEdgeFuzzScale = 1; public double biomeEdgeFuzzScale = 1;
public double biomeEdgeScrambleScale = 0.3; public double biomeEdgeScrambleScale = 0.3;
@ -42,7 +42,7 @@ public class Settings
public double heightScale = 0.56; public double heightScale = 0.56;
public double baseHeight = 0.065; public double baseHeight = 0.065;
public int seaLevel = 63; public int seaLevel = 63;
public double biomeScale = 1; public double biomeScale = 0.525;
public boolean flatBedrock = false; public boolean flatBedrock = false;
} }
} }

4
src/main/java/ninja/bytecode/iris/generator/IrisGenerator.java
View File

@ -63,6 +63,7 @@ public class IrisGenerator extends ParallaxWorldGenerator
private boolean disposed; private boolean disposed;
private CNG scatter; private CNG scatter;
private CNG beach;
private CNG swirl; private CNG swirl;
private MB ICE = new MB(Material.ICE); private MB ICE = new MB(Material.ICE);
private MB PACKED_ICE = new MB(Material.PACKED_ICE); private MB PACKED_ICE = new MB(Material.PACKED_ICE);
@ -123,6 +124,7 @@ public class IrisGenerator extends ParallaxWorldGenerator
random = new Random(world.getSeed()); random = new Random(world.getSeed());
rTerrain = new RNG(world.getSeed()); rTerrain = new RNG(world.getSeed());
swirl = new CNG(rTerrain.nextParallelRNG(0), 40, 1).scale(0.012); swirl = new CNG(rTerrain.nextParallelRNG(0), 40, 1).scale(0.012);
beach = new CNG(rTerrain.nextParallelRNG(0), 6, 1).scale(0.15);
glLNoise = new GenLayerLayeredNoise(this, world, random, rTerrain.nextParallelRNG(2)); glLNoise = new GenLayerLayeredNoise(this, world, random, rTerrain.nextParallelRNG(2));
glBiome = new GenLayerBiome(this, world, random, rTerrain.nextParallelRNG(4), dim.getBiomes()); glBiome = new GenLayerBiome(this, world, random, rTerrain.nextParallelRNG(4), dim.getBiomes());
glSnow = new GenLayerSnow(this, world, random, rTerrain.nextParallelRNG(5)); glSnow = new GenLayerSnow(this, world, random, rTerrain.nextParallelRNG(5));
@ -150,7 +152,7 @@ public class IrisGenerator extends ParallaxWorldGenerator
int height = computeHeight(wxx, wzx, new ChunkPlan(), biome); int height = computeHeight(wxx, wzx, new ChunkPlan(), biome);
IrisBiome nbiome = height < 63 ? getOcean(real, height) : biome; IrisBiome nbiome = height < 63 ? getOcean(real, height) : biome;
biome = nbiome; biome = nbiome;
int beach = 65; int beach = (int) Math.round(65 + this.beach.noise(wxx, wzx));
biome = height > 61 && height < 65 ? frozen ? biome : getBeach(real) : biome; biome = height > 61 && height < 65 ? frozen ? biome : getBeach(real) : biome;
biome = height > 63 && biome.getType().equals(BiomeType.FLUID) ? getBeach(real) : biome; biome = height > 63 && biome.getType().equals(BiomeType.FLUID) ? getBeach(real) : biome;
biome = height >= beach && !biome.getType().equals(BiomeType.LAND) ? real : biome; biome = height >= beach && !biome.getType().equals(BiomeType.LAND) ? real : biome;