Fixed Rotation in Schematic Loader (for real) #33

Merged
SenseiKiwi merged 2 commits from master into master 2013-06-26 05:18:33 +00:00
Showing only changes of commit 6c64b111de - Show all commits

View File

@@ -758,7 +758,7 @@ public class SchematicLoader
//the wooden door leading into the pocket //the wooden door leading into the pocket
Point3D incomingLink= new Point3D(0,0,0); Point3D entrance= new Point3D(0,0,0);
//the iron dim doors leading to more pockets //the iron dim doors leading to more pockets
ArrayList<Point3D> sideLinks = new ArrayList<Point3D>(); ArrayList<Point3D> sideLinks = new ArrayList<Point3D>();
@@ -889,7 +889,7 @@ public class SchematicLoader
} }
else if(((y-1) * width * length + z * width + x)>=0&&blocks[ (y-1) * width * length + z * width + x]==Block.doorWood.blockID) else if(((y-1) * width * length + z * width + x)>=0&&blocks[ (y-1) * width * length + z * width + x]==Block.doorWood.blockID)
{ {
incomingLink=(new Point3D(x,y,z)); entrance=(new Point3D(x,y,z));
} }
} }
@@ -904,7 +904,7 @@ public class SchematicLoader
} }
//Compute the Y-axis translation that places our structure correctly //Compute the Y-axis translation that places our structure correctly
offsetY = riftY - incomingLink.getY(); offsetY = riftY - entrance.getY();
//Loop to actually place the blocks //Loop to actually place the blocks
for ( x = 0; x < width; x++) for ( x = 0; x < width; x++)
@@ -916,20 +916,20 @@ public class SchematicLoader
switch (orientation) switch (orientation)
{ {
case 0: //South case 0: //South
offsetX = incomingLink.getZ() + riftX; offsetX = entrance.getZ() + riftX;
offsetZ = -incomingLink.getX() + riftZ; offsetZ = -entrance.getX() + riftZ;
break; break;
case 1: //West case 1: //West
offsetX = incomingLink.getX() + riftX; offsetX = entrance.getX() + riftX;
offsetZ = incomingLink.getZ() + riftZ; offsetZ = entrance.getZ() + riftZ;
break; break;
case 2: //North case 2: //North
offsetX = -incomingLink.getZ() + riftX; offsetX = -entrance.getZ() + riftX;
offsetZ = incomingLink.getX() + riftZ; offsetZ = entrance.getX() + riftZ;
break; break;
case 3: //East case 3: //East
offsetX = -incomingLink.getX() + riftX; offsetX = -entrance.getX() + riftX;
offsetZ = -incomingLink.getZ() + riftZ; offsetZ = -entrance.getZ() + riftZ;
break; break;
} }