etc/BiomesOPlenty
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

GenLayerTemperatureNoise appears to work

Browse source
This commit is contained in:
Adubbz 2019-01-14 14:05:26 +11:00
parent cd015346de
commit 65305344f7
8 changed files with 342 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/biomesoplenty/client/util/BiomeMapColours.java
View file

@ -32,7 +32,7 @@ import java.util.Random;
// https://github.com/TTFTCUTS/Pioneer/blob/master/src/main/java/ttftcuts/pioneer/map/MapColours.java
public class BiomeMapColours
{
public static final boolean RANDOM_COLOURS = false;
public static final boolean RANDOM_COLOURS = true;
public static Map<Biome, Integer> biomeColours = new HashMap<Biome, Integer>();
public static Random rand = new Random(50);

10
src/main/java/biomesoplenty/client/util/GenLayerVisualizer.java
View file

@ -8,6 +8,8 @@
package biomesoplenty.client.util;
import biomesoplenty.common.world.BOPLayerUtil;
import biomesoplenty.common.world.BOPWorldSettings;
import biomesoplenty.common.world.layer.traits.LazyAreaLayerContextBOP;
import com.google.common.collect.ImmutableList;
import net.minecraft.init.Biomes;
import net.minecraft.util.math.BlockPos;
@ -162,10 +164,14 @@ public class GenLayerVisualizer
int[] aint = new int[1];
ImmutableList<IAreaFactory<LazyArea>> factoryList = BOPLayerUtil.createAreaFactories(WorldType.DEFAULT, settings, (seedModifier) -> {
++aint[0];
return new LazyAreaLayerContext(1, aint[0], 0, seedModifier);
return new LazyAreaLayerContextBOP(1, aint[0], 0, seedModifier);
});
IAreaFactory<LazyArea> biomeAreaFactory = factoryList.get(0);
IAreaFactory<LazyArea> biomeAreaFactory = BOPLayerUtil.createClimateFactory((seedModifier) -> {
++aint[0];
return new LazyAreaLayerContextBOP(1, aint[0], 348234231, seedModifier);
}, new BOPWorldSettings());
AreaDimension areaDimension = new AreaDimension(0, 0, CANVAS_WIDTH, CANVAS_HEIGHT);
LazyArea area = biomeAreaFactory.make(areaDimension);

68
src/main/java/biomesoplenty/common/world/BOPLayerUtil.java
View file

@ -7,10 +7,11 @@
******************************************************************************/
package biomesoplenty.common.world;
import biomesoplenty.common.world.layer.GenLayerTemperatureNoise;
import biomesoplenty.common.world.layer.traits.LazyAreaLayerContextBOP;
import com.google.common.collect.ImmutableList;
import net.minecraft.world.WorldType;
import net.minecraft.world.gen.IContextExtended;
import net.minecraft.world.gen.LazyAreaLayerContext;
import net.minecraft.world.gen.OverworldGenSettings;
import net.minecraft.world.gen.area.IArea;
import net.minecraft.world.gen.area.IAreaFactory;
@ -21,7 +22,7 @@ import java.util.function.LongFunction;
public class BOPLayerUtil
{
public static <T extends IArea, C extends IContextExtended<T>> IAreaFactory<T> createInitialLandAndSeaProcedure(LongFunction<C> contextFactory)
public static <T extends IArea, C extends IContextExtended<T>> IAreaFactory<T> createInitialLandAndSeaFactory(LongFunction<C> contextFactory)
{
// NOTE: Normally AddSnow, CoolWarm, HeatIce and Special GenLayers occur here, but we handle those ourselves
IAreaFactory<T> factory = GenLayerIsland.INSTANCE.apply(contextFactory.apply(1L));
@ -32,11 +33,7 @@ public class BOPLayerUtil
factory = GenLayerAddIsland.INSTANCE.apply(contextFactory.apply(50L), factory);
factory = GenLayerAddIsland.INSTANCE.apply(contextFactory.apply(70L), factory);
factory = GenLayerRemoveTooMuchOcean.INSTANCE.apply(contextFactory.apply(2L), factory);
factory = GenLayerAddSnow.INSTANCE.apply(contextFactory.apply(2L), factory);
factory = GenLayerAddIsland.INSTANCE.apply(contextFactory.apply(3L), factory);
factory = GenLayerEdge.CoolWarm.INSTANCE.apply(contextFactory.apply(2L), factory);
factory = GenLayerEdge.HeatIce.INSTANCE.apply(contextFactory.apply(2L), factory);
factory = GenLayerEdge.Special.INSTANCE.apply(contextFactory.apply(3L), factory);
factory = GenLayerZoom.NORMAL.apply(contextFactory.apply(2002L), factory);
factory = GenLayerZoom.NORMAL.apply(contextFactory.apply(2003L), factory);
factory = GenLayerAddIsland.INSTANCE.apply(contextFactory.apply(4L), factory);
@ -45,11 +42,60 @@ public class BOPLayerUtil
return factory;
}
public static <T extends IArea, C extends IContextExtended<T>> ImmutableList<IAreaFactory<T>> createAreaFactories(WorldType worldTypeIn, OverworldGenSettings settings, LongFunction<C> contextFactory)
// superimpose hot and cold regions an a land and sea layer
public static <T extends IArea, C extends IContextExtended<T>> IAreaFactory<T> createClimateFactory(LongFunction<C> contextFactory, BOPWorldSettings settings)
{
IAreaFactory<T> temperatureFactory;
temperatureFactory = GenLayerTemperatureNoise.LARGE_ZONES.apply(contextFactory.apply(3L));
/*switch (settings.tempScheme)
{
case LATITUDE: default:
temperature = new GenLayerTemperatureLatitude(2L, 16, worldSeed);
break;
case SMALL_ZONES:
temperature = new GenLayerTemperatureNoise(3L, worldSeed, 0.14D);
break;
case MEDIUM_ZONES:
temperature = new GenLayerTemperatureNoise(4L, worldSeed, 0.08D);
break;
case LARGE_ZONES:
temperature = new GenLayerTemperatureNoise(5L, worldSeed, 0.04D);
break;
case RANDOM:
temperature = new GenLayerTemperatureRandom(6L);
break;
}*/
/*GenLayer rainfall;
switch(settings.rainScheme)
{
case SMALL_ZONES:
rainfall = new GenLayerRainfallNoise(7L, worldSeed, 0.14D);
break;
case MEDIUM_ZONES: default:
rainfall = new GenLayerRainfallNoise(8L, worldSeed, 0.08D);
break;
case LARGE_ZONES:
rainfall = new GenLayerRainfallNoise(9L, worldSeed, 0.04D);
break;
case RANDOM:
rainfall = new GenLayerRainfallRandom(10L);
break;
}
GenLayerClimate climate = new GenLayerClimate(103L, temperature, rainfall);
// stack = new GenLayerEdge(3L, stack, GenLayerEdge.Mode.SPECIAL);
return climate;*/
return temperatureFactory;
}
public static <T extends IArea, C extends IContextExtended<T>> ImmutableList<IAreaFactory<T>> createAreaFactories(WorldType worldType, OverworldGenSettings settings, LongFunction<C> contextFactory)
{
// Create the initial land and sea layer. Is also responsible for adding deep oceans
// and mushroom islands
IAreaFactory<T> landSeaFactory = createInitialLandAndSeaProcedure(contextFactory);
IAreaFactory<T> landSeaFactory = createInitialLandAndSeaFactory(contextFactory);
// Determines positions for all of the new ocean subbiomes added in 1.13
IAreaFactory<T> oceanBiomeFactory = OceanLayer.INSTANCE.apply(contextFactory.apply(2L));
@ -62,14 +108,14 @@ public class BOPLayerUtil
riverSize = settings.getRiverSize();
}
biomeSize = LayerUtil.getModdedBiomeSize(worldTypeIn, biomeSize);
biomeSize = LayerUtil.getModdedBiomeSize(worldType, biomeSize);
// Fork off a new branch as a seed for rivers and sub biomes
IAreaFactory<T> riverAndSubBiomesInitFactory = GenLayerRiverInit.INSTANCE.apply(contextFactory.apply(100L), landSeaFactory);
riverAndSubBiomesInitFactory = LayerUtil.repeat(1000L, GenLayerZoom.NORMAL, riverAndSubBiomesInitFactory, 2, contextFactory);
// Allocate the biomes
IAreaFactory<T> biomesFactory = worldTypeIn.getBiomeLayer(landSeaFactory, settings, contextFactory);
IAreaFactory<T> biomesFactory = worldType.getBiomeLayer(landSeaFactory, settings, contextFactory);
biomesFactory = GenLayerHills.INSTANCE.apply(contextFactory.apply(1000L), biomesFactory, riverAndSubBiomesInitFactory);
// Develop the rivers branch
@ -106,7 +152,7 @@ public class BOPLayerUtil
ImmutableList<IAreaFactory<LazyArea>> factoryList = createAreaFactories(worldType, settings, (seedModifier) ->
{
++layerCount[0];
return new LazyAreaLayerContext(1, layerCount[0], seed, seedModifier);
return new LazyAreaLayerContextBOP(1, layerCount[0], seed, seedModifier);
});
GenLayer biomesLayer = new GenLayer(factoryList.get(0));
GenLayer voroniZoomBiomesLayer = new GenLayer(factoryList.get(1));

151
src/main/java/biomesoplenty/common/world/SimplexNoise.java Normal file
View file

@ -0,0 +1,151 @@
package biomesoplenty.common.world;
/**
* A speed-improved simplex noise algorithm for 2D in Java.
*
* Based on example code by Stefan Gustavson (stegu@itn.liu.se).
* Optimisations by Peter Eastman (peastman@drizzle.stanford.edu).
* Better rank ordering method by Stefan Gustavson in 2012.
*
* This could be speeded up even further, but it's useful as it is.
*
* Version 2012-03-09
*
* This code was placed in the public domain by its original author,
* Stefan Gustavson. You may use it as you see fit, but
* attribution is appreciated.
*/
public final class SimplexNoise {
private static Grad[] grad2 = {
new Grad(1, 1), new Grad(-1, 1), new Grad(1, -1), new Grad(-1, -1),
new Grad(1, 0), new Grad(-1, 0), new Grad(1, 0), new Grad(-1, 0),
new Grad(0, 1), new Grad(0, -1), new Grad(0, 1), new Grad(0, -1)
};
private static short[] p = {151, 160, 137, 91, 90, 15, 131, 13, 201, 95, 96, 53, 194, 233, 7, 225, 140, 36, 103,
30, 69, 142, 8, 99, 37, 240, 21, 10, 23,
190, 6, 148, 247, 120, 234, 75, 0, 26, 197, 62, 94, 252, 219, 203, 117, 35, 11, 32, 57, 177, 33, 88, 237, 149, 56, 87, 174, 20, 125, 136, 171, 168,
68, 175, 74, 165, 71, 134, 139, 48, 27, 166, 77, 146, 158, 231, 83, 111, 229, 122, 60, 211, 133, 230, 220, 105, 92, 41, 55, 46, 245, 40, 244, 102,
143, 54, 65, 25, 63, 161, 1, 216, 80, 73, 209, 76, 132, 187, 208, 89, 18, 169, 200, 196, 135, 130, 116, 188, 159, 86, 164, 100, 109, 198, 173, 186,
3, 64, 52, 217, 226, 250, 124, 123, 5, 202, 38, 147, 118, 126, 255, 82, 85, 212, 207, 206, 59, 227, 47, 16, 58, 17, 182, 189, 28, 42, 223, 183,
170, 213, 119, 248, 152, 2, 44, 154, 163, 70, 221, 153, 101, 155, 167, 43, 172, 9, 129, 22, 39, 253, 19, 98, 108, 110, 79, 113, 224, 232, 178, 185,
112, 104, 218, 246, 97, 228, 251, 34, 242, 193, 238, 210, 144, 12, 191, 179, 162, 241, 81, 51, 145, 235, 249, 14, 239, 107, 49, 192, 214, 31, 181,
199, 106, 157, 184, 84, 204, 176, 115, 121, 50, 45, 127, 4, 150, 254, 138, 236, 205, 93, 222, 114, 67, 29, 24, 72, 243, 141, 128, 195, 78, 66, 215,
61, 156, 180};
// To remove the need for index wrapping, double the permutation table length
private static short[] perm = new short[512];
private static short[] permMod12 = new short[512];
static {
for (int i = 0; i < 512; i++) {
perm[i] = p[i & 255];
permMod12[i] = (short) (perm[i] % 12);
}
}
// Skewing and unskewing factors for 2, 3, and 4 dimensions
private static final double F2 = 0.5 * (Math.sqrt(3.0) - 1.0);
private static final double G2 = (3.0 - Math.sqrt(3.0)) / 6.0;
/**
* Deactivate constructor
*/
private SimplexNoise() {
}
// This method is a *lot* faster than using (int)Math.floor(x)
private static int fastfloor(double x) {
int xi = (int) x;
return x < xi ? xi - 1 : xi;
}
private static double dot(Grad g, double x, double y) {
return g.x * x + g.y * y;
}
// 2D simplex noise
public static double noise(double xin, double yin) {
double n0, n1, n2; // Noise contributions from the three corners
// Skew the input space to determine which simplex cell we're in
double s = (xin + yin) * F2; // Hairy factor for 2D
int i = fastfloor(xin + s);
int j = fastfloor(yin + s);
double t = (i + j) * G2;
double originX0 = i - t; // Unskew the cell origin back to (x,y) space
double originY0 = j - t;
double x0 = xin - originX0; // The x,y distances from the cell origin
double y0 = yin - originY0;
// For the 2D case, the simplex shape is an equilateral triangle.
// Determine which simplex we are in.
int i1, j1; // Offsets for second (middle) corner of simplex in (i,j) coords
if (x0 > y0) {
i1 = 1;
j1 = 0;
} else {
// lower triangle, XY order: (0,0)->(1,0)->(1,1)
i1 = 0;
j1 = 1;
} // upper triangle, YX order: (0,0)->(0,1)->(1,1)
// A step of (1,0) in (i,j) means a step of (1-c,-c) in (x,y), and
// a step of (0,1) in (i,j) means a step of (-c,1-c) in (x,y), where
// c = (3-sqrt(3))/6
double x1 = x0 - i1 + G2; // Offsets for middle corner in (x,y) unskewed coords
double y1 = y0 - j1 + G2;
double x2 = x0 - 1.0 + 2.0 * G2; // Offsets for last corner in (x,y) unskewed coords
double y2 = y0 - 1.0 + 2.0 * G2;
// Work out the hashed gradient indices of the three simplex corners
int ii = i & 255;
int jj = j & 255;
int gi0 = permMod12[ii + perm[jj]];
int gi1 = permMod12[ii + i1 + perm[jj + j1]];
int gi2 = permMod12[ii + 1 + perm[jj + 1]];
// Calculate the contribution from the three corners
double t0 = 0.5 - x0 * x0 - y0 * y0;
if (t0 < 0) {
n0 = 0.0;
} else {
t0 *= t0;
n0 = t0 * t0 * dot(grad2[gi0], x0, y0); // (x,y) of grad3 used for 2D gradient
}
double t1 = 0.5 - x1 * x1 - y1 * y1;
if (t1 < 0) {
n1 = 0.0;
} else {
t1 *= t1;
n1 = t1 * t1 * dot(grad2[gi1], x1, y1);
}
double t2 = 0.5 - x2 * x2 - y2 * y2;
if (t2 < 0) {
n2 = 0.0;
} else {
t2 *= t2;
n2 = t2 * t2 * dot(grad2[gi2], x2, y2);
}
// Add contributions from each corner to get the final noise value.
// The result is scaled to return values in the interval [-1,1].
return 70.0 * (n0 + n1 + n2);
}
// Inner class to speed up gradient computations
// (array access is a lot slower than member access)
private static class Grad {
double x, y;
Grad(double x, double y) {
this.x = x;
this.y = y;
}
}
public static void main(String[] args)
{
double startX = 0.3543276545;
double startZ = 0.534523434;
double d = 0.11111;
for (int i = 0; i < 1000; i++)
{
System.out.println(SimplexNoise.noise(startX + d * i, startZ + d * i));
}
}
}

46
src/main/java/biomesoplenty/common/world/layer/GenLayerTemperatureNoise.java Normal file
View file

@ -0,0 +1,46 @@
/*******************************************************************************
* Copyright 2014-2019, the Biomes O' Plenty Team
*
* This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
*
* To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
******************************************************************************/
package biomesoplenty.common.world.layer;
import biomesoplenty.common.world.SimplexNoise;
import biomesoplenty.common.world.layer.traits.IBOPAreaTransformer;
import biomesoplenty.common.world.layer.traits.IBOPContextExtended;
import net.minecraft.world.gen.area.AreaDimension;
public enum GenLayerTemperatureNoise implements IBOPAreaTransformer
{
SMALL_ZONES(0.14D),
MEDIUM_ZONES(0.08D),
LARGE_ZONES(0.04D);
private final double scale;
GenLayerTemperatureNoise(double scale)
{
this.scale = scale;
}
@Override
public int apply(IBOPContextExtended context, AreaDimension areaDimension, int x, int z)
{
double xOffset = (double)(context.getWorldSeed() & 0xFFFFFF) * 0.000001D;
double zOffset = (double)(context.getWorldSeed() & 0xFFFFFF) * 0.000002D;
double noiseVal = SimplexNoise.noise((x + xOffset) * this.scale, (z + zOffset) * this.scale);
// boundaries were determined empirically by analyzing statistically output from the SimplexNoise function, and splitting into 9 equally likely groups
if (noiseVal < -0.619D) return 0;
else if (noiseVal < -0.503D) return 1;
else if (noiseVal < -0.293D) return 2;
else if (noiseVal < -0.120D) return 3;
else if (noiseVal < 0.085D) return 4;
else if (noiseVal < 0.252D) return 5;
else if (noiseVal < 0.467D) return 6;
else if (noiseVal < 0.619D) return 7;
else return 8;
}
}

35
src/main/java/biomesoplenty/common/world/layer/traits/IBOPAreaTransformer.java Normal file
View file

@ -0,0 +1,35 @@
/*******************************************************************************
* Copyright 2014-2019, the Biomes O' Plenty Team
*
* This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
*
* To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
******************************************************************************/
package biomesoplenty.common.world.layer.traits;
import net.minecraft.world.gen.IContextExtended;
import net.minecraft.world.gen.area.AreaDimension;
import net.minecraft.world.gen.area.IArea;
import net.minecraft.world.gen.area.IAreaFactory;
public interface IBOPAreaTransformer
{
default <R extends IArea> IAreaFactory<R> apply(IContextExtended<R> context)
{
if (!(context instanceof IBOPContextExtended))
throw new IllegalArgumentException("Context must be an IBOPContextExtended");
IBOPContextExtended<R> bopContext = (IBOPContextExtended<R>)context;
// Create a new IAreaFactory
return (areaDimension) ->
// Return a new IArea, with the below IPixelTransformer
context.makeArea(areaDimension, (x, z) ->
{
context.setPosition((long)(x + areaDimension.getStartX()), (long)(z + areaDimension.getStartZ()));
return this.apply(bopContext, areaDimension, x, z);
});
}
int apply(IBOPContextExtended context, AreaDimension areaDimension, int x, int z);
}

16
src/main/java/biomesoplenty/common/world/layer/traits/IBOPContextExtended.java Normal file
View file

@ -0,0 +1,16 @@
/*******************************************************************************
* Copyright 2014-2019, the Biomes O' Plenty Team
*
* This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
*
* To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
******************************************************************************/
package biomesoplenty.common.world.layer.traits;
import net.minecraft.world.gen.IContextExtended;
import net.minecraft.world.gen.area.IArea;
public interface IBOPContextExtended<R extends IArea> extends IContextExtended<R>
{
long getWorldSeed();
}

28
src/main/java/biomesoplenty/common/world/layer/traits/LazyAreaLayerContextBOP.java Normal file
View file

@ -0,0 +1,28 @@
/*******************************************************************************
* Copyright 2014-2019, the Biomes O' Plenty Team
*
* This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
*
* To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
******************************************************************************/
package biomesoplenty.common.world.layer.traits;
import net.minecraft.world.gen.LazyAreaLayerContext;
import net.minecraft.world.gen.area.LazyArea;
public class LazyAreaLayerContextBOP extends LazyAreaLayerContext implements IBOPContextExtended<LazyArea>
{
private long worldSeed;
public LazyAreaLayerContextBOP(int maxCacheSize, int layerCount, long seed, long seedModifier)
{
super(maxCacheSize, layerCount, seed, seedModifier);
this.worldSeed = seed;
}
@Override
public long getWorldSeed()
{
return this.worldSeed;
}
}