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

Support rotating orientable blocks

Browse Source
This commit is contained in:
Daniel Mills 2021-01-14 14:53:04 -05:00
parent a92e651b43
commit a438817d00
1 changed files with 47 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/main/java/com/volmit/iris/object/IrisObjectRotation.java
View File

@ -58,7 +58,6 @@ public class IrisObjectRotation
return e.rotateCopy(this); return e.rotateCopy(this);
} }
public IrisJigsawPiece rotateCopy(IrisJigsawPiece v) { public IrisJigsawPiece rotateCopy(IrisJigsawPiece v) {
IrisJigsawPiece piece = v.copy(); IrisJigsawPiece piece = v.copy();
for(IrisJigsawPieceConnector i : piece.getConnectors()) for(IrisJigsawPieceConnector i : piece.getConnectors())
@ -247,6 +246,19 @@ public class IrisObjectRotation
g.setRotation(t); g.setRotation(t);
} }
else if(d instanceof Orientable)
{
BlockFace f = getFace(((Orientable) d).getAxis());
BlockVector bv = new BlockVector(f.getModX(), f.getModY(), f.getModZ());
bv = rotate(bv.clone(), spinx, spiny, spinz);
Axis a = getAxis(bv);
if(!a.equals(((Orientable) d).getAxis()) && ((Orientable) d).getAxes().contains(a))
{
((Orientable) d).setAxis(a);
}
}
else if(d instanceof MultipleFacing) else if(d instanceof MultipleFacing)
{ {
List<BlockFace> faces = new KList<>(); List<BlockFace> faces = new KList<>();
@ -290,6 +302,40 @@ public class IrisObjectRotation
return d; return d;
} }
public Axis getAxis(BlockVector v)
{
if(Math.abs(v.getBlockX()) > Math.max(Math.abs(v.getBlockY()), Math.abs(v.getBlockZ())))
{
return Axis.X;
}
if(Math.abs(v.getBlockY()) > Math.max(Math.abs(v.getBlockX()), Math.abs(v.getBlockZ())))
{
return Axis.Y;
}
if(Math.abs(v.getBlockZ()) > Math.max(Math.abs(v.getBlockX()), Math.abs(v.getBlockY())))
{
return Axis.Z;
}
return Axis.Y;
}
private BlockFace getFace(Axis axis) {
switch (axis)
{
case X:
return BlockFace.EAST;
case Y:
return BlockFace.UP;
case Z:
return BlockFace.SOUTH;
}
return BlockFace.UP;
}
public IrisPosition rotate(IrisPosition b) public IrisPosition rotate(IrisPosition b)
{ {
return rotate(b, 0,0,0); return rotate(b, 0,0,0);