mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2025-07-04 00:45:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor NoiseSampler

Browse Source
This commit is contained in:
dfsek 2021-01-30 00:16:16 -07:00
parent 66fb481ac2
commit c834d80206
42 changed files with 60 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/java/com/dfsek/terra/api/math/ProbabilityCollection.java
View File

@ -1,6 +1,6 @@
package com.dfsek.terra.api.math; package com.dfsek.terra.api.math;
import com.dfsek.terra.api.math.noise.samplers.NoiseSampler; import com.dfsek.terra.api.math.noise.NoiseSampler;
import java.util.Collections; import java.util.Collections;
import java.util.HashSet; import java.util.HashSet;

2
common/src/main/java/com/dfsek/terra/api/math/noise/samplers/NoiseSampler.java → common/src/main/java/com/dfsek/terra/api/math/noise/NoiseSampler.java
View File

@ -1,4 +1,4 @@
package com.dfsek.terra.api.math.noise.samplers; package com.dfsek.terra.api.math.noise;
import com.dfsek.terra.api.math.vector.Vector2; import com.dfsek.terra.api.math.vector.Vector2;
import com.dfsek.terra.api.math.vector.Vector3; import com.dfsek.terra.api.math.vector.Vector3;

5
common/src/main/java/com/dfsek/terra/api/math/noise/normalizer/LinearNormalizer.java
View File

@ -1,7 +1,10 @@
package com.dfsek.terra.api.math.noise.normalizer; package com.dfsek.terra.api.math.noise.normalizer;
import com.dfsek.terra.api.math.noise.samplers.NoiseSampler; import com.dfsek.terra.api.math.noise.NoiseSampler;
/**
* Normalizer to linearly scale data's range.
*/
public class LinearNormalizer extends Normalizer { public class LinearNormalizer extends Normalizer {
private final double min; private final double min;
private final double max; private final double max;

5
common/src/main/java/com/dfsek/terra/api/math/noise/normalizer/NormalNormalizer.java
View File

@ -1,9 +1,12 @@
package com.dfsek.terra.api.math.noise.normalizer; package com.dfsek.terra.api.math.noise.normalizer;
import com.dfsek.terra.api.math.MathUtil; import com.dfsek.terra.api.math.MathUtil;
import com.dfsek.terra.api.math.noise.samplers.NoiseSampler; import com.dfsek.terra.api.math.noise.NoiseSampler;
import net.jafama.FastMath; import net.jafama.FastMath;
/**
* Normalizer to redistribute normally distributed data to a continuous distribution via an automatically generated lookup table.
*/
public class NormalNormalizer extends Normalizer { public class NormalNormalizer extends Normalizer {
private final double[] lookup; private final double[] lookup;

2
common/src/main/java/com/dfsek/terra/api/math/noise/normalizer/Normalizer.java
View File

@ -1,6 +1,6 @@
package com.dfsek.terra.api.math.noise.normalizer; package com.dfsek.terra.api.math.noise.normalizer;
import com.dfsek.terra.api.math.noise.samplers.NoiseSampler; import com.dfsek.terra.api.math.noise.NoiseSampler;
public abstract class Normalizer implements NoiseSampler { public abstract class Normalizer implements NoiseSampler {
private final NoiseSampler sampler; private final NoiseSampler sampler;

2
common/src/main/java/com/dfsek/terra/api/math/noise/samplers/ConstantSampler.java
View File

@ -1,5 +1,7 @@
package com.dfsek.terra.api.math.noise.samplers; package com.dfsek.terra.api.math.noise.samplers;
import com.dfsek.terra.api.math.noise.NoiseSampler;
/** /**
* Sampler implementation that returns a constant. * Sampler implementation that returns a constant.
*/ */

2
common/src/main/java/com/dfsek/terra/api/math/noise/samplers/DomainWarpedSampler.java
View File

@ -1,5 +1,7 @@
package com.dfsek.terra.api.math.noise.samplers; package com.dfsek.terra.api.math.noise.samplers;
import com.dfsek.terra.api.math.noise.NoiseSampler;
public class DomainWarpedSampler implements NoiseSampler { public class DomainWarpedSampler implements NoiseSampler {
private final NoiseSampler function; private final NoiseSampler function;
private final NoiseSampler warp; private final NoiseSampler warp;

5
common/src/main/java/com/dfsek/terra/api/math/noise/samplers/ExpressionSampler.java
View File

@ -1,8 +1,9 @@
package com.dfsek.terra.api.math.noise.samplers; package com.dfsek.terra.api.math.noise.samplers;
import com.dfsek.terra.api.math.noise.NoiseFunction2; import com.dfsek.terra.api.math.noise.NoiseSampler;
import com.dfsek.terra.api.math.noise.NoiseFunction3;
import com.dfsek.terra.api.math.parsii.RandomFunction; import com.dfsek.terra.api.math.parsii.RandomFunction;
import com.dfsek.terra.api.math.parsii.noise.NoiseFunction2;
import com.dfsek.terra.api.math.parsii.noise.NoiseFunction3;
import com.dfsek.terra.api.util.seeded.NoiseSeeded; import com.dfsek.terra.api.util.seeded.NoiseSeeded;
import parsii.eval.Expression; import parsii.eval.Expression;
import parsii.eval.Parser; import parsii.eval.Parser;

1
common/src/main/java/com/dfsek/terra/api/math/noise/samplers/FastNoiseLite.java
View File

@ -1,5 +1,6 @@
package com.dfsek.terra.api.math.noise.samplers;// MIT License package com.dfsek.terra.api.math.noise.samplers;// MIT License
import com.dfsek.terra.api.math.noise.NoiseSampler;
import com.dfsek.terra.api.math.vector.Vector2; import com.dfsek.terra.api.math.vector.Vector2;
import com.dfsek.terra.api.math.vector.Vector3; import com.dfsek.terra.api.math.vector.Vector3;
import net.jafama.FastMath; import net.jafama.FastMath;

1
common/src/main/java/com/dfsek/terra/api/math/noise/samplers/ImageSampler.java
View File

@ -1,5 +1,6 @@
package com.dfsek.terra.api.math.noise.samplers; package com.dfsek.terra.api.math.noise.samplers;
import com.dfsek.terra.api.math.noise.NoiseSampler;
import net.jafama.FastMath; import net.jafama.FastMath;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;

2
common/src/main/java/com/dfsek/terra/api/math/noise/NoiseFunction.java → common/src/main/java/com/dfsek/terra/api/math/parsii/noise/NoiseFunction.java
View File

@ -1,4 +1,4 @@
package com.dfsek.terra.api.math.noise; package com.dfsek.terra.api.math.parsii.noise;
import parsii.eval.Function; import parsii.eval.Function;

4
common/src/main/java/com/dfsek/terra/api/math/noise/NoiseFunction2.java → common/src/main/java/com/dfsek/terra/api/math/parsii/noise/NoiseFunction2.java
View File

@ -1,6 +1,6 @@
package com.dfsek.terra.api.math.noise; package com.dfsek.terra.api.math.parsii.noise;
import com.dfsek.terra.api.math.noise.samplers.NoiseSampler; import com.dfsek.terra.api.math.noise.NoiseSampler;
import com.dfsek.terra.api.util.seeded.NoiseSeeded; import com.dfsek.terra.api.util.seeded.NoiseSeeded;
import com.dfsek.terra.util.hash.HashMapDoubleDouble; import com.dfsek.terra.util.hash.HashMapDoubleDouble;
import parsii.eval.Expression; import parsii.eval.Expression;

4
common/src/main/java/com/dfsek/terra/api/math/noise/NoiseFunction3.java → common/src/main/java/com/dfsek/terra/api/math/parsii/noise/NoiseFunction3.java
View File

@ -1,6 +1,6 @@
package com.dfsek.terra.api.math.noise; package com.dfsek.terra.api.math.parsii.noise;
import com.dfsek.terra.api.math.noise.samplers.NoiseSampler; import com.dfsek.terra.api.math.noise.NoiseSampler;
import com.dfsek.terra.api.util.seeded.NoiseSeeded; import com.dfsek.terra.api.util.seeded.NoiseSeeded;
import parsii.eval.Expression; import parsii.eval.Expression;

2
common/src/main/java/com/dfsek/terra/api/math/voxel/DeformedSphere.java
View File

@ -1,6 +1,6 @@
package com.dfsek.terra.api.math.voxel; package com.dfsek.terra.api.math.voxel;
import com.dfsek.terra.api.math.noise.samplers.NoiseSampler; import com.dfsek.terra.api.math.noise.NoiseSampler;
import com.dfsek.terra.api.math.vector.Vector3; import com.dfsek.terra.api.math.vector.Vector3;
public class DeformedSphere extends VoxelGeometry { public class DeformedSphere extends VoxelGeometry {

2
common/src/main/java/com/dfsek/terra/api/util/seeded/NoiseSeeded.java
View File

@ -1,6 +1,6 @@
package com.dfsek.terra.api.util.seeded; package com.dfsek.terra.api.util.seeded;
import com.dfsek.terra.api.math.noise.samplers.NoiseSampler; import com.dfsek.terra.api.math.noise.NoiseSampler;
public interface NoiseSeeded extends SeededBuilder<NoiseSampler> { public interface NoiseSeeded extends SeededBuilder<NoiseSampler> {
@Override @Override

2
common/src/main/java/com/dfsek/terra/api/world/biome/Generator.java
View File

@ -1,6 +1,6 @@
package com.dfsek.terra.api.world.biome; package com.dfsek.terra.api.world.biome;
import com.dfsek.terra.api.math.noise.samplers.NoiseSampler; import com.dfsek.terra.api.math.noise.NoiseSampler;
import com.dfsek.terra.api.platform.block.BlockData; import com.dfsek.terra.api.platform.block.BlockData;
import com.dfsek.terra.api.world.palette.Palette; import com.dfsek.terra.api.world.palette.Palette;

2
common/src/main/java/com/dfsek/terra/api/world/palette/NoisePalette.java
View File

@ -1,6 +1,6 @@
package com.dfsek.terra.api.world.palette; package com.dfsek.terra.api.world.palette;
import com.dfsek.terra.api.math.noise.samplers.NoiseSampler; import com.dfsek.terra.api.math.noise.NoiseSampler;
import java.util.List; import java.util.List;

2
common/src/main/java/com/dfsek/terra/api/world/palette/Palette.java
View File

@ -1,7 +1,7 @@
package com.dfsek.terra.api.world.palette; package com.dfsek.terra.api.world.palette;
import com.dfsek.terra.api.math.ProbabilityCollection; import com.dfsek.terra.api.math.ProbabilityCollection;
import com.dfsek.terra.api.math.noise.samplers.NoiseSampler; import com.dfsek.terra.api.math.noise.NoiseSampler;
import com.dfsek.terra.api.util.GlueList; import com.dfsek.terra.api.util.GlueList;
import java.util.List; import java.util.List;

2
common/src/main/java/com/dfsek/terra/api/world/palette/holder/PaletteLayerHolder.java
View File

@ -1,7 +1,7 @@
package com.dfsek.terra.api.world.palette.holder; package com.dfsek.terra.api.world.palette.holder;
import com.dfsek.terra.api.math.ProbabilityCollection; import com.dfsek.terra.api.math.ProbabilityCollection;
import com.dfsek.terra.api.math.noise.samplers.NoiseSampler; import com.dfsek.terra.api.math.noise.NoiseSampler;
import com.dfsek.terra.api.platform.block.BlockData; import com.dfsek.terra.api.platform.block.BlockData;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

2
common/src/main/java/com/dfsek/terra/biome/pipeline/expand/FractalExpander.java
View File

@ -1,7 +1,7 @@
package com.dfsek.terra.biome.pipeline.expand; package com.dfsek.terra.biome.pipeline.expand;
import com.dfsek.terra.api.math.MathUtil; import com.dfsek.terra.api.math.MathUtil;
import com.dfsek.terra.api.math.noise.samplers.NoiseSampler; import com.dfsek.terra.api.math.noise.NoiseSampler;
import com.dfsek.terra.biome.TerraBiome; import com.dfsek.terra.biome.TerraBiome;
public class FractalExpander implements BiomeExpander { public class FractalExpander implements BiomeExpander {

2
common/src/main/java/com/dfsek/terra/biome/pipeline/mutator/BorderListMutator.java
View File

@ -1,7 +1,7 @@
package com.dfsek.terra.biome.pipeline.mutator; package com.dfsek.terra.biome.pipeline.mutator;
import com.dfsek.terra.api.math.ProbabilityCollection; import com.dfsek.terra.api.math.ProbabilityCollection;
import com.dfsek.terra.api.math.noise.samplers.NoiseSampler; import com.dfsek.terra.api.math.noise.NoiseSampler;
import com.dfsek.terra.biome.TerraBiome; import com.dfsek.terra.biome.TerraBiome;
import java.util.Map; import java.util.Map;

2
common/src/main/java/com/dfsek/terra/biome/pipeline/mutator/BorderMutator.java
View File

@ -1,7 +1,7 @@
package com.dfsek.terra.biome.pipeline.mutator; package com.dfsek.terra.biome.pipeline.mutator;
import com.dfsek.terra.api.math.ProbabilityCollection; import com.dfsek.terra.api.math.ProbabilityCollection;
import com.dfsek.terra.api.math.noise.samplers.NoiseSampler; import com.dfsek.terra.api.math.noise.NoiseSampler;
import com.dfsek.terra.biome.TerraBiome; import com.dfsek.terra.biome.TerraBiome;
public class BorderMutator implements BiomeMutator { public class BorderMutator implements BiomeMutator {

2
common/src/main/java/com/dfsek/terra/biome/pipeline/mutator/ReplaceListMutator.java
View File

@ -1,7 +1,7 @@
package com.dfsek.terra.biome.pipeline.mutator; package com.dfsek.terra.biome.pipeline.mutator;
import com.dfsek.terra.api.math.ProbabilityCollection; import com.dfsek.terra.api.math.ProbabilityCollection;
import com.dfsek.terra.api.math.noise.samplers.NoiseSampler; import com.dfsek.terra.api.math.noise.NoiseSampler;
import com.dfsek.terra.biome.TerraBiome; import com.dfsek.terra.biome.TerraBiome;
import java.util.Map; import java.util.Map;

2
common/src/main/java/com/dfsek/terra/biome/pipeline/mutator/ReplaceMutator.java
View File

@ -1,7 +1,7 @@
package com.dfsek.terra.biome.pipeline.mutator; package com.dfsek.terra.biome.pipeline.mutator;
import com.dfsek.terra.api.math.ProbabilityCollection; import com.dfsek.terra.api.math.ProbabilityCollection;
import com.dfsek.terra.api.math.noise.samplers.NoiseSampler; import com.dfsek.terra.api.math.noise.NoiseSampler;
import com.dfsek.terra.biome.TerraBiome; import com.dfsek.terra.biome.TerraBiome;
public class ReplaceMutator implements BiomeMutator { public class ReplaceMutator implements BiomeMutator {

2
common/src/main/java/com/dfsek/terra/biome/pipeline/mutator/SmoothMutator.java
View File

@ -1,7 +1,7 @@
package com.dfsek.terra.biome.pipeline.mutator; package com.dfsek.terra.biome.pipeline.mutator;
import com.dfsek.terra.api.math.MathUtil; import com.dfsek.terra.api.math.MathUtil;
import com.dfsek.terra.api.math.noise.samplers.NoiseSampler; import com.dfsek.terra.api.math.noise.NoiseSampler;
import com.dfsek.terra.biome.TerraBiome; import com.dfsek.terra.biome.TerraBiome;
import java.util.Objects; import java.util.Objects;

2
common/src/main/java/com/dfsek/terra/biome/pipeline/source/RandomSource.java
View File

@ -1,7 +1,7 @@
package com.dfsek.terra.biome.pipeline.source; package com.dfsek.terra.biome.pipeline.source;
import com.dfsek.terra.api.math.ProbabilityCollection; import com.dfsek.terra.api.math.ProbabilityCollection;
import com.dfsek.terra.api.math.noise.samplers.NoiseSampler; import com.dfsek.terra.api.math.noise.NoiseSampler;
import com.dfsek.terra.biome.TerraBiome; import com.dfsek.terra.biome.TerraBiome;
public class RandomSource implements BiomeSource { public class RandomSource implements BiomeSource {

2
common/src/main/java/com/dfsek/terra/biome/provider/StandardBiomeProvider.java
View File

@ -2,7 +2,7 @@ package com.dfsek.terra.biome.provider;
import com.dfsek.tectonic.exception.ConfigException; import com.dfsek.tectonic.exception.ConfigException;
import com.dfsek.terra.api.core.TerraPlugin; import com.dfsek.terra.api.core.TerraPlugin;
import com.dfsek.terra.api.math.noise.samplers.NoiseSampler; import com.dfsek.terra.api.math.noise.NoiseSampler;
import com.dfsek.terra.api.math.vector.Vector2; import com.dfsek.terra.api.math.vector.Vector2;
import com.dfsek.terra.api.util.seeded.NoiseSeeded; import com.dfsek.terra.api.util.seeded.NoiseSeeded;
import com.dfsek.terra.biome.TerraBiome; import com.dfsek.terra.biome.TerraBiome;

2
common/src/main/java/com/dfsek/terra/config/builder/GeneratorBuilder.java
View File

@ -1,8 +1,8 @@
package com.dfsek.terra.config.builder; package com.dfsek.terra.config.builder;
import com.dfsek.terra.api.math.noise.NoiseSampler;
import com.dfsek.terra.api.math.noise.samplers.ConstantSampler; import com.dfsek.terra.api.math.noise.samplers.ConstantSampler;
import com.dfsek.terra.api.math.noise.samplers.ExpressionSampler; import com.dfsek.terra.api.math.noise.samplers.ExpressionSampler;
import com.dfsek.terra.api.math.noise.samplers.NoiseSampler;
import com.dfsek.terra.api.util.seeded.NoiseSeeded; import com.dfsek.terra.api.util.seeded.NoiseSeeded;
import com.dfsek.terra.api.world.palette.holder.PaletteHolder; import com.dfsek.terra.api.world.palette.holder.PaletteHolder;
import com.dfsek.terra.world.generation.WorldGenerator; import com.dfsek.terra.world.generation.WorldGenerator;

2
common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/NoiseSamplerBuilderLoader.java
View File

@ -5,12 +5,12 @@ import com.dfsek.tectonic.exception.ConfigException;
import com.dfsek.tectonic.exception.LoadException; import com.dfsek.tectonic.exception.LoadException;
import com.dfsek.tectonic.loading.ConfigLoader; import com.dfsek.tectonic.loading.ConfigLoader;
import com.dfsek.tectonic.loading.TypeLoader; import com.dfsek.tectonic.loading.TypeLoader;
import com.dfsek.terra.api.math.noise.NoiseSampler;
import com.dfsek.terra.api.math.noise.normalizer.LinearNormalizer; import com.dfsek.terra.api.math.noise.normalizer.LinearNormalizer;
import com.dfsek.terra.api.math.noise.normalizer.NormalNormalizer; import com.dfsek.terra.api.math.noise.normalizer.NormalNormalizer;
import com.dfsek.terra.api.math.noise.normalizer.Normalizer; import com.dfsek.terra.api.math.noise.normalizer.Normalizer;
import com.dfsek.terra.api.math.noise.samplers.DomainWarpedSampler; import com.dfsek.terra.api.math.noise.samplers.DomainWarpedSampler;
import com.dfsek.terra.api.math.noise.samplers.ImageSampler; import com.dfsek.terra.api.math.noise.samplers.ImageSampler;
import com.dfsek.terra.api.math.noise.samplers.NoiseSampler;
import com.dfsek.terra.api.util.seeded.NoiseSeeded; import com.dfsek.terra.api.util.seeded.NoiseSeeded;
import com.dfsek.terra.config.fileloaders.Loader; import com.dfsek.terra.config.fileloaders.Loader;
import com.dfsek.terra.world.generation.config.NoiseBuilder; import com.dfsek.terra.world.generation.config.NoiseBuilder;

2
common/src/main/java/com/dfsek/terra/config/loaders/palette/PaletteLayerLoader.java
View File

@ -4,7 +4,7 @@ import com.dfsek.tectonic.exception.LoadException;
import com.dfsek.tectonic.loading.ConfigLoader; import com.dfsek.tectonic.loading.ConfigLoader;
import com.dfsek.tectonic.loading.TypeLoader; import com.dfsek.tectonic.loading.TypeLoader;
import com.dfsek.terra.api.math.ProbabilityCollection; import com.dfsek.terra.api.math.ProbabilityCollection;
import com.dfsek.terra.api.math.noise.samplers.NoiseSampler; import com.dfsek.terra.api.math.noise.NoiseSampler;
import com.dfsek.terra.api.platform.block.BlockData; import com.dfsek.terra.api.platform.block.BlockData;
import com.dfsek.terra.api.util.seeded.NoiseSeeded; import com.dfsek.terra.api.util.seeded.NoiseSeeded;
import com.dfsek.terra.api.world.palette.holder.PaletteLayerHolder; import com.dfsek.terra.api.world.palette.holder.PaletteLayerHolder;

2
common/src/main/java/com/dfsek/terra/config/templates/BiomeTemplate.java
View File

@ -7,8 +7,8 @@ import com.dfsek.tectonic.config.ValidatedConfigTemplate;
import com.dfsek.tectonic.exception.ValidationException; import com.dfsek.tectonic.exception.ValidationException;
import com.dfsek.terra.api.core.TerraPlugin; import com.dfsek.terra.api.core.TerraPlugin;
import com.dfsek.terra.api.math.ProbabilityCollection; import com.dfsek.terra.api.math.ProbabilityCollection;
import com.dfsek.terra.api.math.noise.NoiseSampler;
import com.dfsek.terra.api.math.noise.samplers.FastNoiseLite; import com.dfsek.terra.api.math.noise.samplers.FastNoiseLite;
import com.dfsek.terra.api.math.noise.samplers.NoiseSampler;
import com.dfsek.terra.api.math.parsii.BlankFunction; import com.dfsek.terra.api.math.parsii.BlankFunction;
import com.dfsek.terra.api.platform.block.BlockData; import com.dfsek.terra.api.platform.block.BlockData;
import com.dfsek.terra.api.platform.block.MaterialData; import com.dfsek.terra.api.platform.block.MaterialData;

2
common/src/main/java/com/dfsek/terra/config/templates/PaletteTemplate.java
View File

@ -3,8 +3,8 @@ package com.dfsek.terra.config.templates;
import com.dfsek.tectonic.annotations.Abstractable; import com.dfsek.tectonic.annotations.Abstractable;
import com.dfsek.tectonic.annotations.Default; import com.dfsek.tectonic.annotations.Default;
import com.dfsek.tectonic.annotations.Value; import com.dfsek.tectonic.annotations.Value;
import com.dfsek.terra.api.math.noise.NoiseSampler;
import com.dfsek.terra.api.math.noise.samplers.FastNoiseLite; import com.dfsek.terra.api.math.noise.samplers.FastNoiseLite;
import com.dfsek.terra.api.math.noise.samplers.NoiseSampler;
import com.dfsek.terra.api.util.seeded.NoiseSeeded; import com.dfsek.terra.api.util.seeded.NoiseSeeded;
import com.dfsek.terra.api.world.palette.holder.PaletteLayerHolder; import com.dfsek.terra.api.world.palette.holder.PaletteLayerHolder;
import com.dfsek.terra.world.generation.config.NoiseBuilder; import com.dfsek.terra.world.generation.config.NoiseBuilder;

2
common/src/main/java/com/dfsek/terra/world/generation/WorldGenerator.java
View File

@ -1,6 +1,6 @@
package com.dfsek.terra.world.generation; package com.dfsek.terra.world.generation;
import com.dfsek.terra.api.math.noise.samplers.NoiseSampler; import com.dfsek.terra.api.math.noise.NoiseSampler;
import com.dfsek.terra.api.platform.block.BlockData; import com.dfsek.terra.api.platform.block.BlockData;
import com.dfsek.terra.api.world.biome.Generator; import com.dfsek.terra.api.world.biome.Generator;
import com.dfsek.terra.api.world.palette.Palette; import com.dfsek.terra.api.world.palette.Palette;

2
common/src/main/java/com/dfsek/terra/world/generation/config/NoiseBuilder.java
View File

@ -3,8 +3,8 @@ package com.dfsek.terra.world.generation.config;
import com.dfsek.tectonic.annotations.Default; import com.dfsek.tectonic.annotations.Default;
import com.dfsek.tectonic.annotations.Value; import com.dfsek.tectonic.annotations.Value;
import com.dfsek.tectonic.config.ConfigTemplate; import com.dfsek.tectonic.config.ConfigTemplate;
import com.dfsek.terra.api.math.noise.NoiseSampler;
import com.dfsek.terra.api.math.noise.samplers.FastNoiseLite; import com.dfsek.terra.api.math.noise.samplers.FastNoiseLite;
import com.dfsek.terra.api.math.noise.samplers.NoiseSampler;
import com.dfsek.terra.api.util.seeded.NoiseSeeded; import com.dfsek.terra.api.util.seeded.NoiseSeeded;
@SuppressWarnings("FieldMayBeFinal") @SuppressWarnings("FieldMayBeFinal")

2
common/src/main/java/com/dfsek/terra/world/generation/math/interpolation/NoiseChunkInterpolator.java
View File

@ -1,6 +1,6 @@
package com.dfsek.terra.world.generation.math.interpolation; package com.dfsek.terra.world.generation.math.interpolation;
import com.dfsek.terra.api.math.noise.samplers.NoiseSampler; import com.dfsek.terra.api.math.noise.NoiseSampler;
import net.jafama.FastMath; import net.jafama.FastMath;
public class NoiseChunkInterpolator implements ChunkInterpolator { public class NoiseChunkInterpolator implements ChunkInterpolator {

2
common/src/main/java/com/dfsek/terra/world/population/items/PlaceableLayer.java
View File

@ -2,7 +2,7 @@ package com.dfsek.terra.world.population.items;
import com.dfsek.terra.api.math.ProbabilityCollection; import com.dfsek.terra.api.math.ProbabilityCollection;
import com.dfsek.terra.api.math.Range; import com.dfsek.terra.api.math.Range;
import com.dfsek.terra.api.math.noise.samplers.NoiseSampler; import com.dfsek.terra.api.math.noise.NoiseSampler;
import com.dfsek.terra.api.math.vector.Vector2; import com.dfsek.terra.api.math.vector.Vector2;
import com.dfsek.terra.api.platform.world.Chunk; import com.dfsek.terra.api.platform.world.Chunk;

2
common/src/main/java/com/dfsek/terra/world/population/items/flora/FloraLayer.java
View File

@ -2,7 +2,7 @@ package com.dfsek.terra.world.population.items.flora;
import com.dfsek.terra.api.math.ProbabilityCollection; import com.dfsek.terra.api.math.ProbabilityCollection;
import com.dfsek.terra.api.math.Range; import com.dfsek.terra.api.math.Range;
import com.dfsek.terra.api.math.noise.samplers.NoiseSampler; import com.dfsek.terra.api.math.noise.NoiseSampler;
import com.dfsek.terra.api.math.vector.Vector2; import com.dfsek.terra.api.math.vector.Vector2;
import com.dfsek.terra.api.platform.world.Chunk; import com.dfsek.terra.api.platform.world.Chunk;
import com.dfsek.terra.api.world.flora.Flora; import com.dfsek.terra.api.world.flora.Flora;

2
common/src/main/java/com/dfsek/terra/world/population/items/tree/TreeLayer.java
View File

@ -2,7 +2,7 @@ package com.dfsek.terra.world.population.items.tree;
import com.dfsek.terra.api.math.ProbabilityCollection; import com.dfsek.terra.api.math.ProbabilityCollection;
import com.dfsek.terra.api.math.Range; import com.dfsek.terra.api.math.Range;
import com.dfsek.terra.api.math.noise.samplers.NoiseSampler; import com.dfsek.terra.api.math.noise.NoiseSampler;
import com.dfsek.terra.api.math.vector.Vector2; import com.dfsek.terra.api.math.vector.Vector2;
import com.dfsek.terra.api.platform.block.Block; import com.dfsek.terra.api.platform.block.Block;
import com.dfsek.terra.api.platform.block.BlockFace; import com.dfsek.terra.api.platform.block.BlockFace;

2
common/src/test/java/biome/BiomeTest.java
View File

@ -1,8 +1,8 @@
package biome; package biome;
import com.dfsek.terra.api.math.ProbabilityCollection; import com.dfsek.terra.api.math.ProbabilityCollection;
import com.dfsek.terra.api.math.noise.NoiseSampler;
import com.dfsek.terra.api.math.noise.samplers.FastNoiseLite; import com.dfsek.terra.api.math.noise.samplers.FastNoiseLite;
import com.dfsek.terra.api.math.noise.samplers.NoiseSampler;
import com.dfsek.terra.api.platform.world.Biome; import com.dfsek.terra.api.platform.world.Biome;
import com.dfsek.terra.api.platform.world.World; import com.dfsek.terra.api.platform.world.World;
import com.dfsek.terra.api.world.biome.Generator; import com.dfsek.terra.api.world.biome.Generator;

4
common/src/test/java/biome/DistributionTest.java
View File

@ -15,6 +15,7 @@ import com.dfsek.terra.api.platform.handle.ItemHandle;
import com.dfsek.terra.api.platform.handle.WorldHandle; import com.dfsek.terra.api.platform.handle.WorldHandle;
import com.dfsek.terra.api.platform.world.Biome; import com.dfsek.terra.api.platform.world.Biome;
import com.dfsek.terra.api.platform.world.World; import com.dfsek.terra.api.platform.world.World;
import com.dfsek.terra.api.util.seeded.NoiseSeeded;
import com.dfsek.terra.api.world.biome.Generator; import com.dfsek.terra.api.world.biome.Generator;
import com.dfsek.terra.biome.TerraBiome; import com.dfsek.terra.biome.TerraBiome;
import com.dfsek.terra.biome.provider.BiomeProvider; import com.dfsek.terra.biome.provider.BiomeProvider;
@ -24,6 +25,7 @@ import com.dfsek.terra.config.fileloaders.FolderLoader;
import com.dfsek.terra.config.lang.Language; import com.dfsek.terra.config.lang.Language;
import com.dfsek.terra.config.loaders.ProbabilityCollectionLoader; import com.dfsek.terra.config.loaders.ProbabilityCollectionLoader;
import com.dfsek.terra.config.loaders.config.biome.BiomeProviderBuilderLoader; import com.dfsek.terra.config.loaders.config.biome.BiomeProviderBuilderLoader;
import com.dfsek.terra.config.loaders.config.sampler.NoiseSamplerBuilderLoader;
import com.dfsek.terra.config.pack.ConfigPack; import com.dfsek.terra.config.pack.ConfigPack;
import com.dfsek.terra.config.templates.AbstractableTemplate; import com.dfsek.terra.config.templates.AbstractableTemplate;
import com.dfsek.terra.debug.DebugLogger; import com.dfsek.terra.debug.DebugLogger;
@ -133,6 +135,7 @@ public class DistributionTest {
AbstractConfigLoader loader = new AbstractConfigLoader(); AbstractConfigLoader loader = new AbstractConfigLoader();
BiomeRegistry biomeRegistry = new BiomeRegistry(); BiomeRegistry biomeRegistry = new BiomeRegistry();
folderLoader.open("biomes", ".yml").then(inputStreams -> ConfigPack.buildAll((template, main) -> template, biomeRegistry, loader.load(inputStreams, TestBiome::new), MAIN)); folderLoader.open("biomes", ".yml").then(inputStreams -> ConfigPack.buildAll((template, main) -> template, biomeRegistry, loader.load(inputStreams, TestBiome::new), MAIN));
@ -142,6 +145,7 @@ public class DistributionTest {
.registerLoader(ProbabilityCollection.class, new ProbabilityCollectionLoader()) .registerLoader(ProbabilityCollection.class, new ProbabilityCollectionLoader())
.registerLoader(TerraBiome.class, biomeRegistry); .registerLoader(TerraBiome.class, biomeRegistry);
new GenericLoaders(null).register(pipeLoader); new GenericLoaders(null).register(pipeLoader);
pipeLoader.registerLoader(NoiseSeeded.class, new NoiseSamplerBuilderLoader(folderLoader));
pipeLoader.load(template, folderLoader.get("pack.yml")); pipeLoader.load(template, folderLoader.get("pack.yml"));
return template.getBiomeProviderBuilder().build(seed); return template.getBiomeProviderBuilder().build(seed);

2
common/src/test/java/noise/NoiseTool.java
View File

@ -3,7 +3,7 @@ package noise;
import com.dfsek.tectonic.exception.ConfigException; import com.dfsek.tectonic.exception.ConfigException;
import com.dfsek.tectonic.loading.ConfigLoader; import com.dfsek.tectonic.loading.ConfigLoader;
import com.dfsek.terra.api.math.ProbabilityCollection; import com.dfsek.terra.api.math.ProbabilityCollection;
import com.dfsek.terra.api.math.noise.samplers.NoiseSampler; import com.dfsek.terra.api.math.noise.NoiseSampler;
import com.dfsek.terra.api.util.seeded.NoiseSeeded; import com.dfsek.terra.api.util.seeded.NoiseSeeded;
import com.dfsek.terra.config.GenericLoaders; import com.dfsek.terra.config.GenericLoaders;
import com.dfsek.terra.config.fileloaders.FolderLoader; import com.dfsek.terra.config.fileloaders.FolderLoader;

4
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitChunkGeneratorWrapper.java
View File

@ -8,6 +8,8 @@ import com.dfsek.terra.bukkit.population.PopulationManager;
import com.dfsek.terra.bukkit.world.BukkitAdapter; import com.dfsek.terra.bukkit.world.BukkitAdapter;
import com.dfsek.terra.bukkit.world.BukkitBiomeGrid; import com.dfsek.terra.bukkit.world.BukkitBiomeGrid;
import com.dfsek.terra.config.lang.LangUtil; import com.dfsek.terra.config.lang.LangUtil;
import com.dfsek.terra.profiler.DataType;
import com.dfsek.terra.profiler.Measurement;
import com.dfsek.terra.world.TerraWorld; import com.dfsek.terra.world.TerraWorld;
import com.dfsek.terra.world.population.FloraPopulator; import com.dfsek.terra.world.population.FloraPopulator;
import com.dfsek.terra.world.population.OrePopulator; import com.dfsek.terra.world.population.OrePopulator;
@ -74,6 +76,8 @@ public class BukkitChunkGeneratorWrapper extends ChunkGenerator implements Gener
e.printStackTrace(); e.printStackTrace();
} }
popMap.put(w, popMan); popMap.put(w, popMan);
main.getWorld(w).getProfiler().addMeasurement(new Measurement(15000000, DataType.PERIOD_MILLISECONDS), "PopulationManagerTime");
popMan.attachProfiler(main.getWorld(w).getProfiler());
needsLoad = false; needsLoad = false;
} }