mirror of
https://github.com/VolmitSoftware/Iris.git
synced 2026-10-11 19:14:11 +00:00
chore:
- Moved continent zoom scaling to IrisGeneratorStyle.createScaledGenerator Ref.: https://github.com/VolmitSoftware/Iris/issues/1251
This commit is contained in:
@@ -102,6 +102,10 @@ public class IrisGeneratorStyle {
|
||||
return createNoCache(rng, data, 1, 0, false, resolveEngine(data));
|
||||
}
|
||||
|
||||
public CNG createScaledGenerator(RNG rng, IrisData data, double scaleFactor) {
|
||||
return createNoCache(rng, data).bake().scale(scaleFactor).bake();
|
||||
}
|
||||
|
||||
public CNG createForLayer(RNG rng, IrisData data, int octaveMultiplier) {
|
||||
return createNoCache(rng, data, Math.clamp(octaveMultiplier, 1, 16), 0, false, resolveEngine(data));
|
||||
}
|
||||
|
||||
@@ -11,18 +11,18 @@ public final class ContinentGenerator {
|
||||
}
|
||||
|
||||
public static CNG create(IrisDimension dimension, RNG parentSeedSource, IrisData packData) {
|
||||
return scaleByContinentZoom(createContinentalStyleGenerator(dimension, parentSeedSource, packData), dimension);
|
||||
return createScaledContinentalStyleGenerator(dimension, deriveContinentSeed(parentSeedSource), packData);
|
||||
}
|
||||
|
||||
private static CNG createContinentalStyleGenerator(IrisDimension dimension, RNG parentSeedSource, IrisData packData) {
|
||||
return dimension.getContinentalStyle().createNoCache(deriveContinentSeed(parentSeedSource), packData);
|
||||
private static CNG createScaledContinentalStyleGenerator(IrisDimension dimension, RNG continentSeed, IrisData packData) {
|
||||
return dimension.getContinentalStyle().createScaledGenerator(continentSeed, packData, inverseContinentZoom(dimension));
|
||||
}
|
||||
|
||||
static RNG deriveContinentSeed(RNG parentSeedSource) {
|
||||
return parentSeedSource.nextParallelRNG(CONTINENT_SEED_SALT);
|
||||
}
|
||||
|
||||
private static CNG scaleByContinentZoom(CNG generator, IrisDimension dimension) {
|
||||
return generator.bake().scale(1D / dimension.getContinentZoom()).bake();
|
||||
private static double inverseContinentZoom(IrisDimension dimension) {
|
||||
return 1D / dimension.getContinentZoom();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user