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

implement API for 3d biomes

Browse Source
This commit is contained in:
dfsek
2022-05-27 14:40:50 -07:00
parent ee373bbe4b
commit b6b6cb185d
15 changed files with 72 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
common/api/src/main/java/com/dfsek/terra/api/world/biome/generation/BiomeProvider.java
View File

@@ -7,10 +7,17 @@
package com.dfsek.terra.api.world.biome.generation;
import com.dfsek.terra.api.util.vector.Vector2;
import com.dfsek.terra.api.util.vector.Vector3;
import com.dfsek.terra.api.util.vector.Vector3Int;
import com.dfsek.terra.api.world.biome.Biome;
import com.dfsek.terra.api.world.info.WorldProperties;
import org.jetbrains.annotations.Contract;
import java.util.stream.Stream;
import java.util.stream.StreamSupport;
/**
* Provides locations of biomes in a world.
@@ -20,23 +27,26 @@ public interface BiomeProvider {
* Get the biome at a location.
*
* @param x X coordinate
* @param y
* @param z Z coordinate
* @param seed World seed
*
* @return Biome at the location
*/
Biome getBiome(int x, int z, long seed);
@Contract(pure = true)
Biome getBiome(int x, int y, int z, long seed);
/**
* Get the biome at a location.
*
* @param vector2 Location
* @param vector3 Location
* @param seed World seed
*
* @return Biome at the location
*/
default Biome getBiome(Vector2 vector2, long seed) {
return getBiome(vector2.getBlockX(), vector2.getBlockZ(), seed);
@Contract(pure = true)
default Biome getBiome(Vector3 vector3, long seed) {
return getBiome(vector3.getBlockX(), vector3.getBlockY(), vector3.getBlockZ(), seed);
}
/**
@@ -47,8 +57,9 @@ public interface BiomeProvider {
*
* @return Biome at the location
*/
default Biome getBiome(Vector3 vector3, long seed) {
return getBiome(vector3.getBlockX(), vector3.getBlockZ(), seed);
@Contract(pure = true)
default Biome getBiome(Vector3Int vector3, long seed) {
return getBiome(vector3.getX(), vector3.getY(), vector3.getZ(), seed);
}
/**
@@ -58,9 +69,19 @@ public interface BiomeProvider {
*
* @return {@link Iterable} of all biomes this provider can generate.
*/
@Contract(pure = true)
Iterable<Biome> getBiomes();
default BiomeProvider caching() {
return new CachingBiomeProvider(this);
@Contract(pure = true)
default Stream<Biome> stream() {
return StreamSupport.stream(getBiomes().spliterator(), false);
}
default BiomeProvider caching(int minY, int maxY) {
return new CachingBiomeProvider(this, minY, maxY);
}
default BiomeProvider caching(WorldProperties worldProperties) {
return caching(worldProperties.getMinHeight(), worldProperties.getMaxHeight());
}
}

24
common/api/src/main/java/com/dfsek/terra/api/world/biome/generation/CachingBiomeProvider.java
View File

@@ -1,12 +1,12 @@
package com.dfsek.terra.api.world.biome.generation;
import java.util.HashMap;
import java.util.Map;
import com.dfsek.terra.api.Handle;
import com.dfsek.terra.api.util.MathUtil;
import com.dfsek.terra.api.world.biome.Biome;
import java.util.HashMap;
import java.util.Map;
/**
* A biome provider implementation that lazily evaluates biomes, and caches them.
@@ -15,10 +15,14 @@ import com.dfsek.terra.api.world.biome.Biome;
*/
public class CachingBiomeProvider implements BiomeProvider, Handle {
private final BiomeProvider delegate;
private final Map<Long, Biome> cache = new HashMap<>();
private final int minY;
private final int maxY;
private final Map<Long, Biome[]> cache = new HashMap<>();
protected CachingBiomeProvider(BiomeProvider delegate) {
protected CachingBiomeProvider(BiomeProvider delegate, int minY, int maxY) {
this.delegate = delegate;
this.minY = minY;
this.maxY = maxY;
}
@Override
@@ -27,8 +31,14 @@ public class CachingBiomeProvider implements BiomeProvider, Handle {
}
@Override
public Biome getBiome(int x, int z, long seed) {
return cache.computeIfAbsent(MathUtil.squash(x, z), key -> delegate.getBiome(x, z, seed));
public Biome getBiome(int x, int y, int z, long seed) {
if(y >= maxY || y < minY) throw new IllegalArgumentException("Y out of range: " + y + " (min: " + minY + ", max: " + maxY + ")");
Biome[] biomes = cache.computeIfAbsent(MathUtil.squash(x, z), key -> new Biome[maxY - minY]);
int yi = y - minY;
if(biomes[yi] == null) {
biomes[yi] = delegate.getBiome(x, y, z, seed);
}
return biomes[yi];
}
@Override