mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-07-18 18:23:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix placeobjects not working fixes #409

Browse Source
This commit is contained in:
Daniel Mills 2021-07-14 18:31:29 -04:00
parent bb55cd3c42
commit 1c21b23e8e
1 changed files with 180 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

340
src/main/java/com/volmit/iris/scaffold/engine/EngineParallaxManager.java
View File

@ -242,33 +242,38 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer {
} }
burst.complete(); burst.complete();
burst = MultiBurst.burst.burst(bs);
for (i = -s; i <= s; i++) { if(getEngine().getDimension().isPlaceObjects())
int ii = i; {
for (j = -s; j <= s; j++) { burst = MultiBurst.burst.burst(bs);
int jj = j;
burst.queue(() -> { for (i = -s; i <= s; i++) {
KList<Runnable> a = generateParallaxVacuumLayer(ii + x, jj + z); int ii = i;
synchronized (a) { for (j = -s; j <= s; j++) {
after.addAll(a); int jj = j;
} burst.queue(() -> {
}); KList<Runnable> a = generateParallaxVacuumLayer(ii + x, jj + z);
synchronized (a) {
after.addAll(a);
}
});
}
} }
burst.complete();
burst = MultiBurst.burst.burst(bs);
for (i = -s; i <= s; i++) {
int ii = i;
for (j = -s; j <= s; j++) {
int jj = j;
burst.queue(() -> generateParallaxLayer(ii + x, jj + z));
}
}
burst.complete();
} }
burst.complete();
burst = MultiBurst.burst.burst(bs);
for (i = -s; i <= s; i++) {
int ii = i;
for (j = -s; j <= s; j++) {
int jj = j;
burst.queue(() -> generateParallaxLayer(ii + x, jj + z));
}
}
burst.complete();
MultiBurst.burst.burst(after); MultiBurst.burst.burst(after);
getParallaxAccess().setChunkGenerated(x, z); getParallaxAccess().setChunkGenerated(x, z);
p.end(); p.end();
@ -284,14 +289,19 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer {
if (getParallaxAccess().isParallaxGenerated(x, z)) { if (getParallaxAccess().isParallaxGenerated(x, z)) {
return after; return after;
} }
int xx = x << 4;
int zz = z << 4; if(getEngine().getDimension().isPlaceObjects())
RNG rng = new RNG(Cache.key(x, z)).nextParallelRNG(getEngine().getTarget().getWorld().getSeed()); {
IrisRegion region = getComplex().getRegionStream().get(xx + 8, zz + 8); int xx = x << 4;
IrisBiome biome = getComplex().getTrueBiomeStream().get(xx + 8, zz + 8); int zz = z << 4;
after.addAll(generateParallaxJigsaw(rng, x, z, biome, region)); RNG rng = new RNG(Cache.key(x, z)).nextParallelRNG(getEngine().getTarget().getWorld().getSeed());
generateParallaxSurface(rng, x, z, biome, region, true); IrisRegion region = getComplex().getRegionStream().get(xx + 8, zz + 8);
generateParallaxMutations(rng, x, z, true); IrisBiome biome = getComplex().getTrueBiomeStream().get(xx + 8, zz + 8);
after.addAll(generateParallaxJigsaw(rng, x, z, biome, region));
generateParallaxSurface(rng, x, z, biome, region, true);
generateParallaxMutations(rng, x, z, true);
}
return after; return after;
} }
@ -356,51 +366,55 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer {
default KList<Runnable> generateParallaxJigsaw(RNG rng, int x, int z, IrisBiome biome, IrisRegion region) { default KList<Runnable> generateParallaxJigsaw(RNG rng, int x, int z, IrisBiome biome, IrisRegion region) {
KList<Runnable> placeAfter = new KList<>(); KList<Runnable> placeAfter = new KList<>();
boolean placed = false;
if (getEngine().getDimension().getStronghold() != null) { if(getEngine().getDimension().isPlaceObjects())
List<IrisPosition> poss = getEngine().getCompound().getStrongholdPositions(); {
boolean placed = false;
if (poss != null) { if (getEngine().getDimension().getStronghold() != null) {
for (IrisPosition pos : poss) { List<IrisPosition> poss = getEngine().getCompound().getStrongholdPositions();
if (x == pos.getX() >> 4 && z == pos.getZ() >> 4) {
IrisJigsawStructure structure = getData().getJigsawStructureLoader().load(getEngine().getDimension().getStronghold()); if (poss != null) {
placeAfter.addAll(placeStructure(pos, structure, rng)); for (IrisPosition pos : poss) {
if (x == pos.getX() >> 4 && z == pos.getZ() >> 4) {
IrisJigsawStructure structure = getData().getJigsawStructureLoader().load(getEngine().getDimension().getStronghold());
placeAfter.addAll(placeStructure(pos, structure, rng));
placed = true;
}
}
}
}
if (!placed) {
for (IrisJigsawStructurePlacement i : biome.getJigsawStructures()) {
if (rng.nextInt(i.getRarity()) == 0) {
IrisPosition position = new IrisPosition((x << 4) + rng.nextInt(15), 0, (z << 4) + rng.nextInt(15));
IrisJigsawStructure structure = getData().getJigsawStructureLoader().load(i.getStructure());
placeAfter.addAll(placeStructure(position, structure, rng));
placed = true; placed = true;
} }
} }
} }
}
if (!placed) { if (!placed) {
for (IrisJigsawStructurePlacement i : biome.getJigsawStructures()) { for (IrisJigsawStructurePlacement i : region.getJigsawStructures()) {
if (rng.nextInt(i.getRarity()) == 0) { if (rng.nextInt(i.getRarity()) == 0) {
IrisPosition position = new IrisPosition((x << 4) + rng.nextInt(15), 0, (z << 4) + rng.nextInt(15)); IrisPosition position = new IrisPosition((x << 4) + rng.nextInt(15), 0, (z << 4) + rng.nextInt(15));
IrisJigsawStructure structure = getData().getJigsawStructureLoader().load(i.getStructure()); IrisJigsawStructure structure = getData().getJigsawStructureLoader().load(i.getStructure());
placeAfter.addAll(placeStructure(position, structure, rng)); placeAfter.addAll(placeStructure(position, structure, rng));
placed = true; placed = true;
}
} }
} }
}
if (!placed) { if (!placed) {
for (IrisJigsawStructurePlacement i : region.getJigsawStructures()) { for (IrisJigsawStructurePlacement i : getEngine().getDimension().getJigsawStructures()) {
if (rng.nextInt(i.getRarity()) == 0) { if (rng.nextInt(i.getRarity()) == 0) {
IrisPosition position = new IrisPosition((x << 4) + rng.nextInt(15), 0, (z << 4) + rng.nextInt(15)); IrisPosition position = new IrisPosition((x << 4) + rng.nextInt(15), 0, (z << 4) + rng.nextInt(15));
IrisJigsawStructure structure = getData().getJigsawStructureLoader().load(i.getStructure()); IrisJigsawStructure structure = getData().getJigsawStructureLoader().load(i.getStructure());
placeAfter.addAll(placeStructure(position, structure, rng)); placeAfter.addAll(placeStructure(position, structure, rng));
placed = true; placed = true;
} }
}
}
if (!placed) {
for (IrisJigsawStructurePlacement i : getEngine().getDimension().getJigsawStructures()) {
if (rng.nextInt(i.getRarity()) == 0) {
IrisPosition position = new IrisPosition((x << 4) + rng.nextInt(15), 0, (z << 4) + rng.nextInt(15));
IrisJigsawStructure structure = getData().getJigsawStructureLoader().load(i.getStructure());
placeAfter.addAll(placeStructure(position, structure, rng));
placed = true;
} }
} }
} }
@ -563,101 +577,68 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer {
int jig = 0; int jig = 0;
KSet<String> objects = new KSet<>(); KSet<String> objects = new KSet<>();
KMap<IrisObjectScale, KList<String>> scalars = new KMap<>(); KMap<IrisObjectScale, KList<String>> scalars = new KMap<>();
KList<IrisRegion> r = getAllRegions(); int x = xg.get();
KList<IrisBiome> b = getAllBiomes(); int z = zg.get();
for (IrisBiome i : b) { if(getEngine().getDimension().isPlaceObjects())
for (IrisObjectPlacement j : i.getObjects()) { {
if (j.getScale().canScaleBeyond()) { KList<IrisRegion> r = getAllRegions();
scalars.put(j.getScale(), j.getPlace()); KList<IrisBiome> b = getAllBiomes();
} else {
objects.addAll(j.getPlace()); for (IrisBiome i : b) {
for (IrisObjectPlacement j : i.getObjects()) {
if (j.getScale().canScaleBeyond()) {
scalars.put(j.getScale(), j.getPlace());
} else {
objects.addAll(j.getPlace());
}
}
for (IrisJigsawStructurePlacement j : i.getJigsawStructures()) {
jig = Math.max(jig, getData().getJigsawStructureLoader().load(j.getStructure()).getMaxDimension());
} }
} }
for (IrisJigsawStructurePlacement j : i.getJigsawStructures()) { for (IrisRegion i : r) {
jig = Math.max(jig, getData().getJigsawStructureLoader().load(j.getStructure()).getMaxDimension()); for (IrisObjectPlacement j : i.getObjects()) {
} if (j.getScale().canScaleBeyond()) {
} scalars.put(j.getScale(), j.getPlace());
} else {
objects.addAll(j.getPlace());
}
}
for (IrisRegion i : r) { for (IrisJigsawStructurePlacement j : i.getJigsawStructures()) {
for (IrisObjectPlacement j : i.getObjects()) { jig = Math.max(jig, getData().getJigsawStructureLoader().load(j.getStructure()).getMaxDimension());
if (j.getScale().canScaleBeyond()) {
scalars.put(j.getScale(), j.getPlace());
} else {
objects.addAll(j.getPlace());
} }
} }
for (IrisJigsawStructurePlacement j : i.getJigsawStructures()) { for (IrisJigsawStructurePlacement j : getEngine().getDimension().getJigsawStructures()) {
jig = Math.max(jig, getData().getJigsawStructureLoader().load(j.getStructure()).getMaxDimension()); jig = Math.max(jig, getData().getJigsawStructureLoader().load(j.getStructure()).getMaxDimension());
} }
}
for (IrisJigsawStructurePlacement j : getEngine().getDimension().getJigsawStructures()) { if (getEngine().getDimension().getStronghold() != null) {
jig = Math.max(jig, getData().getJigsawStructureLoader().load(j.getStructure()).getMaxDimension());
}
if (getEngine().getDimension().getStronghold() != null) {
try {
jig = Math.max(jig, getData().getJigsawStructureLoader().load(getEngine().getDimension().getStronghold()).getMaxDimension());
} catch (Throwable e) {
Iris.error("THIS IS THE ONE");
e.printStackTrace();
}
}
Iris.verbose("Checking sizes for " + Form.f(objects.size()) + " referenced objects.");
BurstExecutor e = MultiBurst.burst.burst(objects.size());
KMap<String, BlockVector> sizeCache = new KMap<>();
for (String i : objects) {
e.queue(() -> {
try { try {
BlockVector bv = sizeCache.compute(i, (k, v) -> { jig = Math.max(jig, getData().getJigsawStructureLoader().load(getEngine().getDimension().getStronghold()).getMaxDimension());
if (v != null) { } catch (Throwable e) {
return v; Iris.error("THIS IS THE ONE");
} e.printStackTrace();
try {
return IrisObject.sampleSize(getData().getObjectLoader().findFile(i));
} catch (IOException ioException) {
ioException.printStackTrace();
}
return null;
});
if (bv == null) {
throw new RuntimeException();
}
warn(i, bv);
synchronized (xg) {
xg.getAndSet(Math.max(bv.getBlockX(), xg.get()));
}
synchronized (zg) {
zg.getAndSet(Math.max(bv.getBlockZ(), zg.get()));
}
} catch (Throwable ignored) {
} }
}); }
}
for (Map.Entry<IrisObjectScale, KList<String>> entry : scalars.entrySet()) { Iris.verbose("Checking sizes for " + Form.f(objects.size()) + " referenced objects.");
double ms = entry.getKey().getMaximumScale(); BurstExecutor e = MultiBurst.burst.burst(objects.size());
for (String j : entry.getValue()) { KMap<String, BlockVector> sizeCache = new KMap<>();
for (String i : objects) {
e.queue(() -> { e.queue(() -> {
try { try {
BlockVector bv = sizeCache.compute(j, (k, v) -> { BlockVector bv = sizeCache.compute(i, (k, v) -> {
if (v != null) { if (v != null) {
return v; return v;
} }
try { try {
return IrisObject.sampleSize(getData().getObjectLoader().findFile(j)); return IrisObject.sampleSize(getData().getObjectLoader().findFile(i));
} catch (IOException ioException) { } catch (IOException ioException) {
ioException.printStackTrace(); ioException.printStackTrace();
} }
@ -669,46 +650,85 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer {
throw new RuntimeException(); throw new RuntimeException();
} }
warnScaled(j, bv, ms); warn(i, bv);
synchronized (xg) { synchronized (xg) {
xg.getAndSet((int) Math.max(Math.ceil(bv.getBlockX() * ms), xg.get())); xg.getAndSet(Math.max(bv.getBlockX(), xg.get()));
} }
synchronized (zg) { synchronized (zg) {
zg.getAndSet((int) Math.max(Math.ceil(bv.getBlockZ() * ms), zg.get())); zg.getAndSet(Math.max(bv.getBlockZ(), zg.get()));
} }
} catch (Throwable ignored) { } catch (Throwable ignored) {
} }
}); });
} }
}
e.complete(); for (Map.Entry<IrisObjectScale, KList<String>> entry : scalars.entrySet()) {
double ms = entry.getKey().getMaximumScale();
for (String j : entry.getValue()) {
e.queue(() -> {
try {
BlockVector bv = sizeCache.compute(j, (k, v) -> {
if (v != null) {
return v;
}
int x = xg.get(); try {
int z = zg.get(); return IrisObject.sampleSize(getData().getObjectLoader().findFile(j));
} catch (IOException ioException) {
ioException.printStackTrace();
}
for (IrisDepositGenerator i : getEngine().getDimension().getDeposits()) { return null;
int max = i.getMaxDimension(); });
x = Math.max(max, x);
z = Math.max(max, z);
}
for (IrisRegion v : r) { if (bv == null) {
for (IrisDepositGenerator i : v.getDeposits()) { throw new RuntimeException();
}
warnScaled(j, bv, ms);
synchronized (xg) {
xg.getAndSet((int) Math.max(Math.ceil(bv.getBlockX() * ms), xg.get()));
}
synchronized (zg) {
zg.getAndSet((int) Math.max(Math.ceil(bv.getBlockZ() * ms), zg.get()));
}
} catch (Throwable ignored) {
}
});
}
}
e.complete();
x = xg.get();
z = zg.get();
for (IrisDepositGenerator i : getEngine().getDimension().getDeposits()) {
int max = i.getMaxDimension(); int max = i.getMaxDimension();
x = Math.max(max, x); x = Math.max(max, x);
z = Math.max(max, z); z = Math.max(max, z);
} }
}
for (IrisBiome v : b) { for (IrisRegion v : r) {
for (IrisDepositGenerator i : v.getDeposits()) { for (IrisDepositGenerator i : v.getDeposits()) {
int max = i.getMaxDimension(); int max = i.getMaxDimension();
x = Math.max(max, x); x = Math.max(max, x);
z = Math.max(max, z); z = Math.max(max, z);
}
}
for (IrisBiome v : b) {
for (IrisDepositGenerator i : v.getDeposits()) {
int max = i.getMaxDimension();
x = Math.max(max, x);
z = Math.max(max, z);
}
} }
} }