Repo-Mirror/Iris-World-Engine
9
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-12-31 04:46:40 +00:00
Code Issues Releases Activity

Caching Revisited

Browse Source
This commit is contained in:
Dan Macbook
2020-08-14 05:16:58 -04:00
parent 948317c27a
commit 7f98aff531
8 changed files with 202 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

120
src/main/java/com/volmit/iris/object/IrisObject.java
View File

@@ -26,19 +26,21 @@ import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
public class IrisObject extends IrisRegistrant
{
public class IrisObject extends IrisRegistrant {
private static final Material SNOW = Material.SNOW;
private static final BlockData AIR = B.getBlockData("CAVE_AIR");
private static final BlockData[] SNOW_LAYERS = new BlockData[] {B.getBlockData("minecraft:snow[layers=1]"), B.getBlockData("minecraft:snow[layers=2]"), B.getBlockData("minecraft:snow[layers=3]"), B.getBlockData("minecraft:snow[layers=4]"), B.getBlockData("minecraft:snow[layers=5]"), B.getBlockData("minecraft:snow[layers=6]"), B.getBlockData("minecraft:snow[layers=7]"), B.getBlockData("minecraft:snow[layers=8]")};
private static final BlockData[] SNOW_LAYERS = new BlockData[] { B.getBlockData("minecraft:snow[layers=1]"),
B.getBlockData("minecraft:snow[layers=2]"), B.getBlockData("minecraft:snow[layers=3]"),
B.getBlockData("minecraft:snow[layers=4]"), B.getBlockData("minecraft:snow[layers=5]"),
B.getBlockData("minecraft:snow[layers=6]"), B.getBlockData("minecraft:snow[layers=7]"),
B.getBlockData("minecraft:snow[layers=8]") };
private KMap<BlockVector, BlockData> blocks;
private int w;
private int d;
private int h;
private transient BlockVector center;
public IrisObject(int w, int h, int d)
{
public IrisObject(int w, int h, int d) {
blocks = new KMap<>();
this.w = w;
this.h = h;
@@ -46,8 +48,7 @@ public class IrisObject extends IrisRegistrant
center = new BlockVector(w / 2, h / 2, d / 2);
}
public static BlockVector sampleSize(File file) throws IOException
{
public static BlockVector sampleSize(File file) throws IOException {
FileInputStream in = new FileInputStream(file);
DataInputStream din = new DataInputStream(in);
BlockVector bv = new BlockVector(din.readInt(), din.readInt(), din.readInt());
@@ -55,8 +56,7 @@ public class IrisObject extends IrisRegistrant
return bv;
}
public void read(InputStream in) throws IOException
{
public void read(InputStream in) throws IOException {
DataInputStream din = new DataInputStream(in);
this.w = din.readInt();
this.h = din.readInt();
@@ -64,36 +64,32 @@ public class IrisObject extends IrisRegistrant
center = new BlockVector(w / 2, h / 2, d / 2);
int s = din.readInt();
for(int i = 0; i < s; i++)
{
blocks.put(new BlockVector(din.readShort(), din.readShort(), din.readShort()), B.getBlockData(din.readUTF()));
for (int i = 0; i < s; i++) {
blocks.put(new BlockVector(din.readShort(), din.readShort(), din.readShort()),
B.getBlockData(din.readUTF()));
}
}
public void read(File file) throws IOException
{
public void read(File file) throws IOException {
FileInputStream fin = new FileInputStream(file);
read(fin);
fin.close();
}
public void write(File file) throws IOException
{
public void write(File file) throws IOException {
file.getParentFile().mkdirs();
FileOutputStream out = new FileOutputStream(file);
write(out);
out.close();
}
public void write(OutputStream o) throws IOException
{
public void write(OutputStream o) throws IOException {
DataOutputStream dos = new DataOutputStream(o);
dos.writeInt(w);
dos.writeInt(h);
dos.writeInt(d);
dos.writeInt(blocks.size());
for(BlockVector i : blocks.k())
{
for (BlockVector i : blocks.k()) {
dos.writeShort(i.getBlockX());
dos.writeShort(i.getBlockY());
dos.writeShort(i.getBlockZ());
@@ -101,83 +97,67 @@ public class IrisObject extends IrisRegistrant
}
}
public void setUnsigned(int x, int y, int z, BlockData block)
{
if(x >= w || y >= h || z >= d)
{
public void setUnsigned(int x, int y, int z, BlockData block) {
if (x >= w || y >= h || z >= d) {
throw new RuntimeException(x + " " + y + " " + z + " exceeds limit of " + w + " " + h + " " + d);
}
BlockVector v = new BlockVector(x, y, z).subtract(center).toBlockVector();
if(block == null)
{
if (block == null) {
blocks.remove(v);
}
else
{
else {
blocks.put(v, block);
}
}
public void place(int x, int z, IObjectPlacer placer, IrisObjectPlacement config, RNG rng)
{
public void place(int x, int z, IObjectPlacer placer, IrisObjectPlacement config, RNG rng) {
place(x, -1, z, placer, config, rng);
}
public void place(int x, int yv, int z, IObjectPlacer placer, IrisObjectPlacement config, RNG rng)
{
public void place(int x, int yv, int z, IObjectPlacer placer, IrisObjectPlacement config, RNG rng) {
int spinx = rng.imax() / 1000;
int spiny = rng.imax() / 1000;
int spinz = rng.imax() / 1000;
int y = yv < 0 ? placer.getHighest(x, z, config.isUnderwater()) + config.getRotation().rotate(new BlockVector(0, getCenter().getBlockY(), 0), spinx, spiny, spinz).getBlockY() : yv;
int y = yv < 0 ? placer.getHighest(x, z, config.isUnderwater()) + config.getRotation()
.rotate(new BlockVector(0, getCenter().getBlockY(), 0), spinx, spiny, spinz).getBlockY() : yv;
if(yv >= 0 && config.isBottom())
{
if (yv >= 0 && config.isBottom()) {
y += Math.floorDiv(h, 2);
}
KMap<ChunkPosition, Integer> heightmap = config.getSnow() > 0 ? new KMap<>() : null;
if(yv < 0)
{
if(!config.isUnderwater() && !config.isOnwater() && placer.isUnderwater(x, z))
{
if (yv < 0) {
if (!config.isUnderwater() && !config.isOnwater() && placer.isUnderwater(x, z)) {
return;
}
}
if(config.isBore())
{
for(int i = x - Math.floorDiv(w, 2); i <= x + Math.floorDiv(w, 2) - (w % 2 == 0 ? 1 : 0); i++)
{
for(int j = y - Math.floorDiv(h, 2); j <= y + Math.floorDiv(h, 2) - (h % 2 == 0 ? 1 : 0); j++)
{
for(int k = z - Math.floorDiv(d, 2); k <= z + Math.floorDiv(d, 2) - (d % 2 == 0 ? 1 : 0); k++)
{
if (config.isBore()) {
for (int i = x - Math.floorDiv(w, 2); i <= x + Math.floorDiv(w, 2) - (w % 2 == 0 ? 1 : 0); i++) {
for (int j = y - Math.floorDiv(h, 2); j <= y + Math.floorDiv(h, 2) - (h % 2 == 0 ? 1 : 0); j++) {
for (int k = z - Math.floorDiv(d, 2); k <= z + Math.floorDiv(d, 2) - (d % 2 == 0 ? 1 : 0); k++) {
placer.set(i, j, k, AIR);
}
}
}
}
for(BlockVector g : blocks.keySet())
{
for (BlockVector g : blocks.keySet()) {
BlockVector i = g.clone();
i = config.getRotation().rotate(i.clone(), spinx, spiny, spinz).clone();
i = config.getTranslate().translate(i.clone(), config.getRotation(), spinx, spiny, spinz).clone();
BlockData data = blocks.get(g).clone();
if(placer.isPreventingDecay() && data instanceof Leaves && !((Leaves) data).isPersistent())
{
if (placer.isPreventingDecay() && data instanceof Leaves && !((Leaves) data).isPersistent()) {
((Leaves) data).setPersistent(true);
}
for(IrisObjectReplace j : config.getEdit())
{
if(j.isExact() ? j.getFind().matches(data) : j.getFind().getMaterial().equals(data.getMaterial()))
{
for (IrisObjectReplace j : config.getEdit()) {
if (j.isExact() ? j.getFind().matches(data) : j.getFind().getMaterial().equals(data.getMaterial())) {
data = j.getReplace();
}
}
@@ -187,44 +167,36 @@ public class IrisObject extends IrisRegistrant
int yy = y + (int) Math.round(i.getY());
int zz = z + (int) Math.round(i.getZ());
if(heightmap != null)
{
if (heightmap != null) {
ChunkPosition pos = new ChunkPosition(xx, zz);
if(!heightmap.containsKey(pos))
{
if (!heightmap.containsKey(pos)) {
heightmap.put(pos, yy);
}
if(heightmap.get(pos) < yy)
{
if (heightmap.get(pos) < yy) {
heightmap.put(pos, yy);
}
}
if(config.isMeld() && !placer.isSolid(xx, yy, zz))
{
if (config.isMeld() && !placer.isSolid(xx, yy, zz)) {
continue;
}
placer.set(xx, yy, zz, data);
}
if(heightmap != null)
{
if (heightmap != null) {
RNG rngx = rng.nextParallelRNG(3468854);
for(ChunkPosition i : heightmap.k())
{
for (ChunkPosition i : heightmap.k()) {
int vx = i.getX();
int vy = heightmap.get(i);
int vz = i.getZ();
if(config.getSnow() > 0)
{
if (config.getSnow() > 0) {
BlockData bd = placer.get(vx, vy, vz);
if(bd != null && bd.getMaterial().equals(SNOW))
{
if (bd != null && bd.getMaterial().equals(SNOW)) {
continue;
}
@@ -235,10 +207,8 @@ public class IrisObject extends IrisRegistrant
}
}
public void place(Location at)
{
for(BlockVector i : blocks.keySet())
{
public void place(Location at) {
for (BlockVector i : blocks.keySet()) {
at.clone().add(0, getCenter().getY(), 0).add(i).getBlock().setBlockData(blocks.get(i), false);
}
}