mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2026-04-08 16:56:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Biome Styling

Browse Source
This commit is contained in:
Dan Macbook
2020-08-14 05:43:58 -04:00
parent 7f98aff531
commit 31bd6a0c0d
5 changed files with 134 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/volmit/iris/gen/layer/BiomeDataProvider.java
View File

@@ -1,10 +1,10 @@
package com.volmit.iris.gen.layer;
import com.volmit.iris.gen.ContextualChunkGenerator;
import com.volmit.iris.noise.RarityCellGenerator;
import com.volmit.iris.noise.CNG;
import com.volmit.iris.object.InferredType;
import com.volmit.iris.object.IrisBiome;
import com.volmit.iris.object.IrisRegion;
import com.volmit.iris.object.NoiseStyle;
import com.volmit.iris.util.BiomeResult;
import com.volmit.iris.util.RNG;
@@ -14,19 +14,18 @@ import lombok.Data;
public class BiomeDataProvider
{
private InferredType type;
private RarityCellGenerator<IrisBiome> generator;
private CNG generator;
private GenLayerBiome layer;
public BiomeDataProvider(GenLayerBiome layer, InferredType type, RNG rng)
{
this.type = type;
this.layer = layer;
generator = new RarityCellGenerator<IrisBiome>(rng.nextParallelRNG(4645079 + (type.ordinal() * 23845)));
generator = NoiseStyle.CELLULAR_IRIS_DOUBLE.create(rng.nextParallelRNG(4645079 + (type.ordinal() * 23845)));
}
public BiomeResult generatePureData(ContextualChunkGenerator g, double bx, double bz, int rawX, int rawZ, IrisRegion regionData)
{
getGenerator().setShuffle(regionData.getBiomeShuffle());
return layer.generateBiomeData(bx, bz, regionData, getGenerator(), regionData.getBiomes(g, getType()), getType());
}

136
src/main/java/com/volmit/iris/gen/layer/GenLayerBiome.java
View File

@@ -2,8 +2,7 @@ package com.volmit.iris.gen.layer;
import com.volmit.iris.Iris;
import com.volmit.iris.gen.DimensionChunkGenerator;
import com.volmit.iris.noise.CellGenerator;
import com.volmit.iris.noise.RarityCellGenerator;
import com.volmit.iris.noise.CNG;
import com.volmit.iris.object.InferredType;
import com.volmit.iris.object.IrisBiome;
import com.volmit.iris.object.IrisRegion;
@@ -19,10 +18,9 @@ import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
public class GenLayerBiome extends GenLayer
{
private RarityCellGenerator<IrisRegion> regionGenerator;
private CellGenerator bridgeGenerator;
public class GenLayerBiome extends GenLayer {
private CNG regionGenerator;
private CNG bridgeGenerator;
private BiomeDataProvider seaProvider;
private BiomeDataProvider landProvider;
private BiomeDataProvider shoreProvider;
@@ -31,8 +29,7 @@ public class GenLayerBiome extends GenLayer
private BiomeDataProvider skylandProvider;
private DimensionChunkGenerator iris;
public GenLayerBiome(DimensionChunkGenerator iris, RNG rng)
{
public GenLayerBiome(DimensionChunkGenerator iris, RNG rng) {
super(iris, rng);
this.iris = iris;
seaProvider = new BiomeDataProvider(this, InferredType.SEA, rng);
@@ -41,119 +38,99 @@ public class GenLayerBiome extends GenLayer
caveProvider = new BiomeDataProvider(this, InferredType.CAVE, rng);
islandProvider = new BiomeDataProvider(this, InferredType.ISLAND, rng);
skylandProvider = new BiomeDataProvider(this, InferredType.SKYLAND, rng);
regionGenerator = new RarityCellGenerator<IrisRegion>(rng.nextParallelRNG(1188519));
bridgeGenerator = new CellGenerator(rng.nextParallelRNG(1541462));
regionGenerator = iris.getDimension().getRegionStyle().create(rng.nextParallelRNG(1188519)).bake()
.scale(1D / iris.getDimension().getRegionZoom());
bridgeGenerator = iris.getDimension().getContinentalStyle().create(rng.nextParallelRNG(1541462)).bake()
.scale(1D / iris.getDimension().getContinentZoom());
}
public IrisRegion getRegion(double bx, double bz)
{
if(iris.getDimension().getRegions().isEmpty())
{
public IrisRegion getRegion(double bx, double bz) {
if (iris.getDimension().getRegions().isEmpty()) {
Iris.error("NO REGIONS!");
return null;
}
regionGenerator.setShuffle(iris.getDimension().getRegionShuffle());
regionGenerator.setCellScale(0.35);
double x = bx / iris.getDimension().getRegionZoom();
double z = bz / iris.getDimension().getRegionZoom();
double x = bx;
double z = bz;
return regionGenerator.get(x, z, iris.getDimension().getAllRegions(iris));
return regionGenerator.fitRarity(iris.getDimension().getAllRegions(iris), x, z);
}
public BiomeResult generateData(double bx, double bz, int rawX, int rawZ)
{
public BiomeResult generateData(double bx, double bz, int rawX, int rawZ) {
return generateRegionData(bx, bz, rawX, rawZ, getRegion(bx, bz));
}
public BiomeResult generateData(InferredType type, double bx, double bz, int rawX, int rawZ, IrisRegion regionData)
{
public BiomeResult generateData(InferredType type, double bx, double bz, int rawX, int rawZ,
IrisRegion regionData) {
return getProvider(type).generateData(iris, bx, bz, rawX, rawZ, regionData);
}
public BiomeDataProvider getProvider(InferredType type)
{
if(type.equals(InferredType.SEA))
{
public BiomeDataProvider getProvider(InferredType type) {
if (type.equals(InferredType.SEA)) {
return seaProvider;
}
else if(type.equals(InferredType.LAND))
{
else if (type.equals(InferredType.LAND)) {
return landProvider;
}
else if(type.equals(InferredType.SHORE))
{
else if (type.equals(InferredType.SHORE)) {
return shoreProvider;
}
else if(type.equals(InferredType.CAVE))
{
else if (type.equals(InferredType.CAVE)) {
return caveProvider;
}
else if(type.equals(InferredType.ISLAND))
{
else if (type.equals(InferredType.ISLAND)) {
return islandProvider;
}
else if(type.equals(InferredType.SKYLAND))
{
else if (type.equals(InferredType.SKYLAND)) {
return skylandProvider;
}
else
{
else {
Iris.error("Cannot find a BiomeDataProvider for type " + type.name());
}
return null;
}
public BiomeResult generateRegionData(double bx, double bz, int rawX, int rawZ, IrisRegion regionData)
{
public BiomeResult generateRegionData(double bx, double bz, int rawX, int rawZ, IrisRegion regionData) {
return generateData(getType(bx, bz, regionData), bx, bz, rawX, rawZ, regionData);
}
public InferredType getType(double bx, double bz, IrisRegion regionData)
{
bridgeGenerator.setShuffle(iris.getDimension().getContinentalShuffle());
bridgeGenerator.setCellScale(0.33);
double x = bx / iris.getDimension().getContinentZoom();
double z = bz / iris.getDimension().getContinentZoom();
return bridgeGenerator.getIndex(x, z, 2) == 1 ? InferredType.LAND : InferredType.SEA;
public InferredType getType(double bx, double bz, IrisRegion regionData) {
double x = bx;
double z = bz;
return bridgeGenerator.fit(0, 1, x, z) == 0 ? InferredType.LAND : InferredType.SEA;
}
public BiomeResult generateBiomeData(double bx, double bz, IrisRegion regionData, RarityCellGenerator<IrisBiome> cell, KList<IrisBiome> biomes, InferredType inferredType)
{
if(biomes.isEmpty())
{
public BiomeResult generateBiomeData(double bx, double bz, IrisRegion regionData, CNG cell, KList<IrisBiome> biomes,
InferredType inferredType) {
if (biomes.isEmpty()) {
return new BiomeResult(null, 0);
}
double x = bx / (iris.getDimension().getBiomeZoom() * regionData.getBiomeZoom(inferredType));
double z = bz / (iris.getDimension().getBiomeZoom() * regionData.getBiomeZoom(inferredType));
IrisBiome biome = cell.get(x, z, biomes);
IrisBiome biome = cell.fitRarity(biomes, x, z);
biome.setInferredType(inferredType);
return implode(bx, bz, regionData, cell, new BiomeResult(biome, cell.getDistance(x, z)));
return implode(bx, bz, regionData, cell, new BiomeResult(biome, 1));
}
public BiomeResult generateImpureData(int rawX, int rawZ, InferredType type, IrisRegion regionData, BiomeResult pureResult)
{
for(IrisRegionRidge i : regionData.getRidgeBiomes())
{
if(i.getType().equals(type) && i.isRidge(rng, rawX, rawZ))
{
public BiomeResult generateImpureData(int rawX, int rawZ, InferredType type, IrisRegion regionData,
BiomeResult pureResult) {
for (IrisRegionRidge i : regionData.getRidgeBiomes()) {
if (i.getType().equals(type) && i.isRidge(rng, rawX, rawZ)) {
return new BiomeResult(iris.loadBiome(i.getBiome()).infer(i.getAs(), type), 0.5);
}
}
for(IrisRegionSpot i : regionData.getSpotBiomes())
{
if(i.getType().equals(type) && i.isSpot(rng, rawX, rawZ))
{
for (IrisRegionSpot i : regionData.getSpotBiomes()) {
if (i.getType().equals(type) && i.isSpot(rng, rawX, rawZ)) {
return new BiomeResult(iris.loadBiome(i.getBiome()).infer(i.getAs(), type), 0.5);
}
}
@@ -161,41 +138,34 @@ public class GenLayerBiome extends GenLayer
return pureResult;
}
public BiomeResult implode(double bx, double bz, IrisRegion regionData, RarityCellGenerator<IrisBiome> parentCell, BiomeResult parent)
{
public BiomeResult implode(double bx, double bz, IrisRegion regionData, CNG parentCell, BiomeResult parent) {
return implode(bx, bz, regionData, parentCell, parent, 1);
}
public BiomeResult implode(double bx, double bz, IrisRegion regionData, RarityCellGenerator<IrisBiome> parentCell, BiomeResult parent, int hits)
{
if(hits > 9)
{
public BiomeResult implode(double bx, double bz, IrisRegion regionData, CNG parentCell, BiomeResult parent,
int hits) {
if (hits > 9) {
return parent;
}
double x = bx / iris.getDimension().getBiomeZoom();
double z = bz / iris.getDimension().getBiomeZoom();
if(parent.getDistance() > regionData.getBiomeImplosionRatio())
{
if(!parent.getBiome().getRealChildren(iris).isEmpty())
{
RarityCellGenerator<IrisBiome> childCell = parent.getBiome().getChildrenGenerator(rng, 123, parentCell.getCellScale() * parent.getBiome().getChildShrinkFactor());
KList<IrisBiome> chx = parent.getBiome().getRealChildren(iris).copy();
chx.add(parent.getBiome());
IrisBiome biome = childCell.get(x, z, chx);
biome.setInferredType(parent.getBiome().getInferredType());
if (!parent.getBiome().getRealChildren(iris).isEmpty()) {
CNG childCell = parent.getBiome().getChildrenGenerator(rng, 123, parent.getBiome().getChildShrinkFactor());
KList<IrisBiome> chx = parent.getBiome().getRealChildren(iris).copy(); // TODO Cache
chx.add(parent.getBiome());
IrisBiome biome = childCell.fitRarity(chx, x, z);
biome.setInferredType(parent.getBiome().getInferredType());
return implode(bx, bz, regionData, childCell, new BiomeResult(biome, childCell.getDistance(x, z)), hits + 1);
}
return implode(bx, bz, regionData, childCell, new BiomeResult(biome, 0), hits + 1);
}
return parent;
}
@Override
public double generate(double x, double z)
{
public double generate(double x, double z) {
return 0;
}
}