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

Piece optimizations for Jigsaw

Browse Source
This commit is contained in:
Daniel Mills 2021-01-10 04:57:22 -05:00
parent 3f5b799728
commit f50a2fd0ad
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/com/volmit/iris/scaffold/jigsaw/PlannedPiece.java
View File

@ -17,26 +17,36 @@ public class PlannedPiece {
private IrisObjectRotation rotation; private IrisObjectRotation rotation;
private IrisDataManager data; private IrisDataManager data;
private KList<IrisPosition> connected; private KList<IrisPosition> connected;
private boolean dead = false;
private int rotationKey; private int rotationKey;
private AxisAlignedBB box;
private PlannedStructure structure;
public PlannedPiece(IrisPosition position, IrisJigsawPiece piece) public PlannedPiece(PlannedStructure structure, IrisPosition position, IrisJigsawPiece piece)
{ {
this(position, piece, 0,0,0); this(structure, position, piece, 0,0,0);
} }
public PlannedPiece(IrisPosition position, IrisJigsawPiece piece, int rx, int ry, int rz) public PlannedPiece(PlannedStructure structure, IrisPosition position, IrisJigsawPiece piece, int rx, int ry, int rz)
{ {
this.structure = structure;
this.position = position; this.position = position;
rotationKey = (rz * 100) + (rx * 10) + ry; rotationKey = (rz * 100) + (rx * 10) + ry;
this.data = piece.getLoader(); this.data = piece.getLoader();
this.rotation = IrisObjectRotation.of(rx*90D, ry*90D, rz*90D); this.rotation = IrisObjectRotation.of(rx*90D, ry*90D, rz*90D);
this.object = rotation.rotateCopy(data.getObjectLoader().load(piece.getObject())); this.object = structure.rotated(piece, rotation);
this.piece = rotation.rotateCopy(piece); this.piece = rotation.rotateCopy(piece);
this.piece.setLoadKey(piece.getLoadKey()); this.piece.setLoadKey(piece.getLoadKey());
this.object.setLoadKey(object.getLoadKey()); this.object.setLoadKey(object.getLoadKey());
this.connected = new KList<>(); this.connected = new KList<>();
} }
public void setPosition(IrisPosition p)
{
this.position = p;
box = null;
}
public String toString() public String toString()
{ {
return piece.getLoadKey() + "@(" + position.getX() + "," + position.getY() + "," + position.getZ() + ")[rot:" + rotationKey + "]"; return piece.getLoadKey() + "@(" + position.getX() + "," + position.getY() + "," + position.getZ() + ")[rot:" + rotationKey + "]";
@ -44,8 +54,14 @@ public class PlannedPiece {
public AxisAlignedBB getBox() public AxisAlignedBB getBox()
{ {
if(box != null)
{
return box;
}
BlockVector v = getObject().getCenter(); BlockVector v = getObject().getCenter();
return object.getAABB().shifted(position.add(new IrisPosition(object.getCenter()))); box = object.getAABB().shifted(position.add(new IrisPosition(object.getCenter())));
return box;
} }
public boolean contains(IrisPosition p) public boolean contains(IrisPosition p)
@ -109,7 +125,7 @@ public class PlannedPiece {
} }
public boolean isFull() { public boolean isFull() {
return connected.size() >= piece.getConnectors().size(); return connected.size() >= piece.getConnectors().size() || isDead();
} }
public void place(World world) { public void place(World world) {