AstralTransRocketries/MCGalaxy
1
0
Fork 0
mirror of https://github.com/ClassiCube/MCGalaxy.git synced 2025-09-23 12:42:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix /spin and rotating resulting in air no longer being pasted. (Thanks goodlyay)

Browse Source
This commit is contained in:
UnknownShadow200 2016-05-28 16:09:00 +10:00
parent 08186c876c
commit bd874937e4
1 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
Drawing/Flip.cs
View File

@ -22,10 +22,10 @@ namespace MCGalaxy.Drawing {
public static class Flip { public static class Flip {
public static CopyState RotateX(CopyState state, int angle) { public static CopyState RotateX(CopyState state, int angle) {
CopyState newState = Clone(state); CopyState newState = Clone(state);
newState.Height = angle == 180 ? state.Height : state.Length; newState.Height = angle == 180 ? state.Height : state.Length;
newState.Length = angle == 180 ? state.Length : state.Height; newState.Length = angle == 180 ? state.Length : state.Height;
int[] m = { posX, negZ, posY }; int[] m = { posX, negZ, posY };
if (angle == 180) { m[1] = negY; m[2] = negZ; } if (angle == 180) { m[1] = negY; m[2] = negZ; }
if (angle == 270) { m[1] = posZ; m[2] = negY; } if (angle == 270) { m[1] = posZ; m[2] = negY; }
@ -33,9 +33,9 @@ namespace MCGalaxy.Drawing {
} }
public static CopyState RotateY(CopyState state, int angle) { public static CopyState RotateY(CopyState state, int angle) {
CopyState newState = Clone(state); CopyState newState = Clone(state);
newState.Width = angle == 180 ? state.Width : state.Length; newState.Width = angle == 180 ? state.Width : state.Length;
newState.Length = angle == 180 ? state.Length : state.Width; newState.Length = angle == 180 ? state.Length : state.Width;
int[] m = { negZ, posY, posX }; int[] m = { negZ, posY, posX };
if (angle == 180) { m[0] = negX; m[2] = negZ; } if (angle == 180) { m[0] = negX; m[2] = negZ; }
@ -44,10 +44,10 @@ namespace MCGalaxy.Drawing {
} }
public static CopyState RotateZ(CopyState state, int angle) { public static CopyState RotateZ(CopyState state, int angle) {
CopyState newState = Clone(state); CopyState newState = Clone(state);
newState.Width = angle == 180 ? state.Width : state.Height; newState.Width = angle == 180 ? state.Width : state.Height;
newState.Height = angle == 180 ? state.Height : state.Width; newState.Height = angle == 180 ? state.Height : state.Width;
int[] m = { posY, negX, posZ }; int[] m = { posY, negX, posZ };
if (angle == 180) { m[0] = negX; m[1] = negY; } if (angle == 180) { m[0] = negX; m[1] = negY; }
if (angle == 270) { m[0] = negY; m[1] = posX; } if (angle == 270) { m[0] = negY; m[1] = posX; }
@ -72,8 +72,8 @@ namespace MCGalaxy.Drawing {
state.Z + Rotate(m[2], oX, oY, oZ, state)); state.Z + Rotate(m[2], oX, oY, oZ, state));
return newState; return newState;
} }
const int posX = 0x100, negX = 0x200, posY = 0x010, negY = 0x020, posZ = 0x001, negZ = 0x002; const int posX = 0x100, negX = 0x200, posY = 0x010, negY = 0x020, posZ = 0x001, negZ = 0x002;
static int Rotate(int row, int x, int y, int z, CopyState state) { static int Rotate(int row, int x, int y, int z, CopyState state) {
switch (row) { switch (row) {
case posX: return x; case posX: return x;
@ -85,14 +85,15 @@ namespace MCGalaxy.Drawing {
} }
return 0; return 0;
} }
static CopyState Clone(CopyState state) { static CopyState Clone(CopyState state) {
CopyState newState = new CopyState(state.X, state.Y, state.Z, CopyState newState = new CopyState(state.X, state.Y, state.Z,
state.Width, state.Height, state.Length); state.Width, state.Height, state.Length);
newState.UsedBlocks = state.UsedBlocks; newState.UsedBlocks = state.UsedBlocks;
return newState; newState.PasteAir = state.PasteAir;
} return newState;
}
public static void MirrorX(CopyState state) { public static void MirrorX(CopyState state) {
int midZ = state.Length / 2, maxZ = state.Length - 1; int midZ = state.Length / 2, maxZ = state.Length - 1;