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

make object spawning more random

Browse Source
This commit is contained in:
BuildTools
2023-10-24 16:07:43 +02:00
parent a82fa578eb
commit 231d1209c9
1 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
core/src/main/java/com/volmit/iris/engine/mantle/components/MantleObjectComponent.java
View File

@@ -23,10 +23,7 @@ import com.volmit.iris.engine.data.cache.Cache;
import com.volmit.iris.engine.mantle.EngineMantle; import com.volmit.iris.engine.mantle.EngineMantle;
import com.volmit.iris.engine.mantle.IrisMantleComponent; import com.volmit.iris.engine.mantle.IrisMantleComponent;
import com.volmit.iris.engine.mantle.MantleWriter; import com.volmit.iris.engine.mantle.MantleWriter;
import com.volmit.iris.engine.object.IrisBiome; import com.volmit.iris.engine.object.*;
import com.volmit.iris.engine.object.IrisObject;
import com.volmit.iris.engine.object.IrisObjectPlacement;
import com.volmit.iris.engine.object.IrisRegion;
import com.volmit.iris.util.collection.KSet; import com.volmit.iris.util.collection.KSet;
import com.volmit.iris.util.context.ChunkContext; import com.volmit.iris.util.context.ChunkContext;
import com.volmit.iris.util.data.B; import com.volmit.iris.util.data.B;
@@ -35,6 +32,8 @@ import com.volmit.iris.util.documentation.ChunkCoordinates;
import com.volmit.iris.util.mantle.MantleFlag; import com.volmit.iris.util.mantle.MantleFlag;
import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.math.RNG;
import com.volmit.iris.util.matter.MatterStructurePOI; import com.volmit.iris.util.matter.MatterStructurePOI;
import com.volmit.iris.util.noise.CNG;
import com.volmit.iris.util.noise.NoiseType;
import java.util.Set; import java.util.Set;
@@ -45,7 +44,7 @@ public class MantleObjectComponent extends IrisMantleComponent {
@Override @Override
public void generateLayer(MantleWriter writer, int x, int z, ChunkContext context) { public void generateLayer(MantleWriter writer, int x, int z, ChunkContext context) {
RNG rng = new RNG(Cache.key(x, z) + seed()); RNG rng = applyNoise(x, z, Cache.key(x, z) + seed());
int xxx = 8 + (x << 4); int xxx = 8 + (x << 4);
int zzz = 8 + (z << 4); int zzz = 8 + (z << 4);
IrisRegion region = getComplex().getRegionStream().get(xxx, zzz); IrisRegion region = getComplex().getRegionStream().get(xxx, zzz);
@@ -53,15 +52,17 @@ public class MantleObjectComponent extends IrisMantleComponent {
placeObjects(writer, rng, x, z, biome, region); placeObjects(writer, rng, x, z, biome, region);
} }
private RNG applyNoise(int x, int z, long seed) {
CNG noise = CNG.signatureFast(new RNG(seed), NoiseType.WHITE, NoiseType.GLOB);
return new RNG((long) (seed * noise.noise(x, z)));
}
@ChunkCoordinates @ChunkCoordinates
private void placeObjects(MantleWriter writer, RNG rng, int x, int z, IrisBiome biome, IrisRegion region) { private void placeObjects(MantleWriter writer, RNG rng, int x, int z, IrisBiome biome, IrisRegion region) {
long s = Cache.key(x, z) + seed();
RNG rnp = new RNG(s);
for (IrisObjectPlacement i : biome.getSurfaceObjects()) { for (IrisObjectPlacement i : biome.getSurfaceObjects()) {
if (rng.chance(i.getChance() + rng.d(-0.005, 0.005))) { if (rng.chance(i.getChance() + rng.d(-0.005, 0.005))) {
try { try {
placeObject(writer, rnp, x << 4, z << 4, i); placeObject(writer, rng, x << 4, z << 4, i);
rnp.setSeed(s);
} catch (Throwable e) { } catch (Throwable e) {
Iris.reportError(e); Iris.reportError(e);
Iris.error("Failed to place objects in the following biome: " + biome.getName()); Iris.error("Failed to place objects in the following biome: " + biome.getName());
@@ -75,8 +76,7 @@ public class MantleObjectComponent extends IrisMantleComponent {
for (IrisObjectPlacement i : region.getSurfaceObjects()) { for (IrisObjectPlacement i : region.getSurfaceObjects()) {
if (rng.chance(i.getChance() + rng.d(-0.005, 0.005))) { if (rng.chance(i.getChance() + rng.d(-0.005, 0.005))) {
try { try {
placeObject(writer, rnp, x << 4, z << 4, i); placeObject(writer, rng, x << 4, z << 4, i);
rnp.setSeed(s);
} catch (Throwable e) { } catch (Throwable e) {
Iris.reportError(e); Iris.reportError(e);
Iris.error("Failed to place objects in the following region: " + region.getName()); Iris.error("Failed to place objects in the following region: " + region.getName());
@@ -123,23 +123,19 @@ public class MantleObjectComponent extends IrisMantleComponent {
} }
public Set<String> guess(int x, int z) { public Set<String> guess(int x, int z) {
RNG rng = new RNG(Cache.key(x, z) + seed()); RNG rng = applyNoise(x, z, Cache.key(x, z) + seed());
long s = Cache.key(x, z) + seed();
RNG rngd = new RNG(s);
IrisBiome biome = getEngineMantle().getEngine().getSurfaceBiome((x << 4) + 8, (z << 4) + 8); IrisBiome biome = getEngineMantle().getEngine().getSurfaceBiome((x << 4) + 8, (z << 4) + 8);
IrisRegion region = getEngineMantle().getEngine().getRegion((x << 4) + 8, (z << 4) + 8); IrisRegion region = getEngineMantle().getEngine().getRegion((x << 4) + 8, (z << 4) + 8);
Set<String> v = new KSet<>(); Set<String> v = new KSet<>();
for (IrisObjectPlacement i : biome.getSurfaceObjects()) { for (IrisObjectPlacement i : biome.getSurfaceObjects()) {
if (rng.chance(i.getChance() + rng.d(-0.005, 0.005))) { if (rng.chance(i.getChance() + rng.d(-0.005, 0.005))) {
v.addAll(guessPlacedKeys(rngd, x, z, i)); v.addAll(guessPlacedKeys(rng, x, z, i));
rngd.setSeed(s);
} }
} }
for (IrisObjectPlacement i : region.getSurfaceObjects()) { for (IrisObjectPlacement i : region.getSurfaceObjects()) {
if (rng.chance(i.getChance() + rng.d(-0.005, 0.005))) { if (rng.chance(i.getChance() + rng.d(-0.005, 0.005))) {
v.addAll(guessPlacedKeys(rngd, x, z, i)); v.addAll(guessPlacedKeys(rng, x, z, i));
rngd.setSeed(s);
} }
} }