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

Stage 2: Optimise /draw to do skip processing coordinates outside the map.

Browse Source
This commit is contained in:
UnknownShadow200 2016-03-28 22:54:19 +11:00
parent 8bd1e6423d
commit df5d6a1427
18 changed files with 115 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
Commands/building/CmdDraw.cs
View File

@ -46,43 +46,42 @@ namespace MCGalaxy.Commands
string[] parts = message.Split(' '); string[] parts = message.Split(' ');
Player.BlockchangeEventHandler newHandler = null; Player.BlockchangeEventHandler newHandler = null;
bool help;
switch (parts[0].ToLower()) { switch (parts[0].ToLower()) {
case "cone": case "cone":
if (!CheckTwoArgs(p, 1, parts, out help)) { if (help) Help(p); return; } if (!CheckTwoArgs(p, 1, parts)) return;
newHandler = new Player.BlockchangeEventHandler(BlockchangeCone); break; newHandler = new Player.BlockchangeEventHandler(BlockchangeCone); break;
case "hcone": case "hcone":
if (!CheckTwoArgs(p, 1, parts, out help)) { if (help) Help(p); return; } if (!CheckTwoArgs(p, 1, parts)) return;
newHandler = new Player.BlockchangeEventHandler(BlockchangeHCone); break; newHandler = new Player.BlockchangeEventHandler(BlockchangeHCone); break;
case "icone": case "icone":
if (!CheckTwoArgs(p, 1, parts, out help)) { if (help) Help(p); return; } if (!CheckTwoArgs(p, 1, parts)) return;
newHandler = new Player.BlockchangeEventHandler(BlockchangeICone); break; newHandler = new Player.BlockchangeEventHandler(BlockchangeICone); break;
case "hicone": case "hicone":
if (!CheckTwoArgs(p, 1, parts, out help)) { if (help) Help(p); return; } if (!CheckTwoArgs(p, 1, parts)) return;
newHandler = new Player.BlockchangeEventHandler(BlockchangeHICone); break; newHandler = new Player.BlockchangeEventHandler(BlockchangeHICone); break;
case "pyramid": case "pyramid":
if (!CheckTwoArgs(p, 2, parts, out help)) { if (help) Help(p); return; } if (!CheckTwoArgs(p, 2, parts)) return;
newHandler = new Player.BlockchangeEventHandler(BlockchangePyramid); break; newHandler = new Player.BlockchangeEventHandler(BlockchangePyramid); break;
case "hpyramid": case "hpyramid":
if (!CheckTwoArgs(p, 2, parts, out help)) { if (help) Help(p); return; } if (!CheckTwoArgs(p, 2, parts)) return;
newHandler = new Player.BlockchangeEventHandler(BlockchangeHPyramid); break; newHandler = new Player.BlockchangeEventHandler(BlockchangeHPyramid); break;
case "ipyramid": case "ipyramid":
if (!CheckTwoArgs(p, 2, parts, out help)) { if (help) Help(p); return; } if (!CheckTwoArgs(p, 2, parts)) return;
newHandler = new Player.BlockchangeEventHandler(BlockchangeIPyramid); break; newHandler = new Player.BlockchangeEventHandler(BlockchangeIPyramid); break;
case "hipyramid": case "hipyramid":
if (!CheckTwoArgs(p, 2, parts, out help)) { if (help) Help(p); return; } if (!CheckTwoArgs(p, 2, parts)) return;
newHandler = new Player.BlockchangeEventHandler(BlockchangeHIPyramid); break; newHandler = new Player.BlockchangeEventHandler(BlockchangeHIPyramid); break;
case "sphere": case "sphere":
if (!CheckOneArg(p, 3, parts, out help)) { if (help) Help(p); return; } if (!CheckOneArg(p, 3, parts)) return;
newHandler = new Player.BlockchangeEventHandler(BlockchangeSphere); break; newHandler = new Player.BlockchangeEventHandler(BlockchangeSphere); break;
case "hsphere": case "hsphere":
if (!CheckOneArg(p, 3, parts, out help)) { if (help) Help(p); return; } if (!CheckOneArg(p, 3, parts)) return;
newHandler = new Player.BlockchangeEventHandler(BlockchangeHSphere); break; newHandler = new Player.BlockchangeEventHandler(BlockchangeHSphere); break;
case "volcano": case "volcano":
if (!CheckTwoArgs(p, 4, parts, out help)) { if (help) Help(p); return; } if (!CheckTwoArgs(p, 4, parts)) return;
newHandler = new Player.BlockchangeEventHandler(BlockchangeVolcano); break; newHandler = new Player.BlockchangeEventHandler(BlockchangeVolcano); break;
} }
Player.SendMessage(p, "Place a block"); Player.SendMessage(p, "Place a block");
@ -90,36 +89,35 @@ namespace MCGalaxy.Commands
p.Blockchange += newHandler; p.Blockchange += newHandler;
} }
bool CheckTwoArgs(Player p, int addition, string[] parts, out bool help) { bool CheckTwoArgs(Player p, int addition, string[] parts) {
if ((int)p.group.Permission < CommandOtherPerms.GetPerm(this, addition)) { if ((int)p.group.Permission < CommandOtherPerms.GetPerm(this, addition)) {
Group group = Group.findPermInt(CommandOtherPerms.GetPerm(this, addition)); Group group = Group.findPermInt(CommandOtherPerms.GetPerm(this, addition));
Player.SendMessage(p, "That commands addition is for " + group.name + "+"); Player.SendMessage(p, "That commands addition is for " + group.name + "+");
help = false; return false; return false;
} }
help = true; if (parts.Length != 3) { Help(p); return false; }
if (parts.Length != 3)
return false;
ushort height, radius; ushort height, radius;
if (!ushort.TryParse(parts[1], out height) || !ushort.TryParse(parts[2], out radius)) if (!ushort.TryParse(parts[1], out height) || height > 2000 ||
return false; !ushort.TryParse(parts[2], out radius) || radius > 2000) {
Player.SendMessage(p, "Radius and height must be positive integers less than 2000."); return false;
}
p.BcVar = new int[] { height, radius }; p.BcVar = new int[] { height, radius };
return true; return true;
} }
bool CheckOneArg(Player p, int addition, string[] parts, out bool help) { bool CheckOneArg(Player p, int addition, string[] parts) {
if ((int)p.group.Permission < CommandOtherPerms.GetPerm(this, addition)) { if ((int)p.group.Permission < CommandOtherPerms.GetPerm(this, addition)) {
Group group = Group.findPermInt(CommandOtherPerms.GetPerm(this, addition)); Group group = Group.findPermInt(CommandOtherPerms.GetPerm(this, addition));
Player.SendMessage(p, "That commands addition is for " + group.name + "+"); Player.SendMessage(p, "That commands addition is for " + group.name + "+");
help = false; return false; return false;
} }
help = true; if (parts.Length != 2) { Help(p); return false; }
if (parts.Length != 2)
return false;
ushort radius; ushort radius;
if (!ushort.TryParse(parts[1], out radius)) if (!ushort.TryParse(parts[1], out radius) || radius > 2000) {
return false; Player.SendMessage(p, "Radius must be a positive integer less than 2000."); return false;
}
p.BcVar = new int[] { 0, radius }; p.BcVar = new int[] { 0, radius };
return true; return true;
} }

46
Drawing/DrawOps/AdvConeDrawOps.cs
View File

@ -29,16 +29,18 @@ namespace MCGalaxy.Drawing.Ops {
public override string Name { get { return "Adv Cone"; } } public override string Name { get { return "Adv Cone"; } }
public override int GetBlocksAffected(Level lvl, Vec3U16[] marks) { public override long GetBlocksAffected(Level lvl, Vec3U16[] marks) {
int R = Radius, H = Height; long R = Radius, H = Height;
return (int)(Math.PI / 3 * (R * R * H)); return (long)(Math.PI / 3 * (R * R * H));
} }
public override void Perform(Vec3U16[] marks, Player p, Level lvl, Brush brush) { public override void Perform(Vec3U16[] marks, Player p, Level lvl, Brush brush) {
Vec3U16 P = marks[0]; Vec3U16 P = marks[0];
for (short yy = 0; yy <= Height; yy++) int minX = Math.Max(P.X - Radius, 0) - P.X, maxX = Math.Min(P.X + Radius, lvl.Width - 1) - P.X;
for (short zz = (short)-Radius; zz <= Radius; zz++) int minZ = Math.Max(P.Z - Radius, 0) - P.Z, maxZ = Math.Min(P.Z + Radius, lvl.Length - 1) - P.Z;
for (short xx = (short)-Radius; xx <= Radius; xx++) for (int yy = 0; yy <= Height; yy++)
for (int zz = minZ; zz <= maxZ; zz++)
for (int xx = minX; xx <= maxX; xx++)
{ {
int curHeight = Invert ? yy : Height - yy; int curHeight = Invert ? yy : Height - yy;
if (curHeight == 0) continue; if (curHeight == 0) continue;
@ -59,18 +61,21 @@ namespace MCGalaxy.Drawing.Ops {
public override string Name { get { return "Adv Hollow Cone"; } } public override string Name { get { return "Adv Hollow Cone"; } }
public override int GetBlocksAffected(Level lvl, Vec3U16[] marks) { public override long GetBlocksAffected(Level lvl, Vec3U16[] marks) {
int R = Radius, H = Height; long R = Radius, H = Height;
double outer = (int)(Math.PI / 3 * (R * R * H)); double outer = (int)(Math.PI / 3 * (R * R * H));
double inner = (int)(Math.PI / 3 * ((R - 1) * (R - 1) * (H - 1))); double inner = (int)(Math.PI / 3 * ((R - 1) * (R - 1) * (H - 1)));
return (int)(outer - inner); return (long)(outer - inner);
} }
public override void Perform(Vec3U16[] marks, Player p, Level lvl, Brush brush) { public override void Perform(Vec3U16[] marks, Player p, Level lvl, Brush brush) {
Vec3U16 P = marks[0]; Vec3U16 P = marks[0];
for (short yy = 0; yy <= Height; yy++) int minX = Math.Max(P.X - Radius, 0) - P.X, maxX = Math.Min(P.X + Radius, lvl.Width - 1) - P.X;
for (short zz = (short)-Radius; zz <= Radius; zz++) int minZ = Math.Max(P.Z - Radius, 0) - P.Z, maxZ = Math.Min(P.Z + Radius, lvl.Length - 1) - P.Z;
for (short xx = (short)-Radius; xx <= Radius; xx++) int maxY = Math.Min(P.Y + Height, lvl.Height - 1) - P.Y;
for (int yy = 0; yy <= maxY; yy++)
for (int zz = minZ; zz <= maxZ; zz++)
for (int xx = minX; xx <= maxX; xx++)
{ {
int curHeight = Invert ? yy : Height - yy; int curHeight = Invert ? yy : Height - yy;
if (curHeight == 0) continue; if (curHeight == 0) continue;
@ -92,18 +97,19 @@ namespace MCGalaxy.Drawing.Ops {
public override string Name { get { return "Adv Volcano"; } } public override string Name { get { return "Adv Volcano"; } }
public override int GetBlocksAffected(Level lvl, Vec3U16[] marks) { public override long GetBlocksAffected(Level lvl, Vec3U16[] marks) {
int R = Radius, H = Height; long R = Radius, H = Height;
double outer = (int)(Math.PI / 3 * (R * R * H)); return (long)(Math.PI / 3 * (R * R * H));
double inner = (int)(Math.PI / 3 * ((R - 1) * (R - 1) * (H - 1)));
return (int)(outer - inner);
} }
public override void Perform(Vec3U16[] marks, Player p, Level lvl, Brush brush) { public override void Perform(Vec3U16[] marks, Player p, Level lvl, Brush brush) {
Vec3U16 P = marks[0]; Vec3U16 P = marks[0];
for (short yy = 0; yy <= Height; yy++) int minX = Math.Max(P.X - Radius, 0) - P.X, maxX = Math.Min(P.X + Radius, lvl.Width - 1) - P.X;
for (short zz = (short)-Radius; zz <= Radius; zz++) int minZ = Math.Max(P.Z - Radius, 0) - P.Z, maxZ = Math.Min(P.Z + Radius, lvl.Length - 1) - P.Z;
for (short xx = (short)-Radius; xx <= Radius; xx++) int maxY = Math.Min(P.Y + Height, lvl.Height - 1) - P.Y;
for (int yy = 0; yy <= maxY; yy++)
for (int zz = minZ; zz <= maxZ; zz++)
for (int xx = minX; xx <= maxX; xx++)
{ {
int cx = (P.X + xx), cy = (P.Y + yy), cz = (P.Z + zz); int cx = (P.X + xx), cy = (P.Y + yy), cz = (P.Z + zz);
int curHeight = Height - yy; int curHeight = Height - yy;

30
Drawing/DrawOps/AdvDrawOps.cs
View File

@ -34,17 +34,20 @@ namespace MCGalaxy.Drawing.Ops {
public override string Name { get { return "Adv Sphere"; } } public override string Name { get { return "Adv Sphere"; } }
public override int GetBlocksAffected(Level lvl, Vec3U16[] marks) { public override long GetBlocksAffected(Level lvl, Vec3U16[] marks) {
int R = Radius; long R = Radius;
return (int)(Math.PI * 4.0 / 3.0 * (R * R * R)); return (long)(Math.PI * 4.0 / 3.0 * (R * R * R));
} }
public override void Perform(Vec3U16[] marks, Player p, Level lvl, Brush brush) { public override void Perform(Vec3U16[] marks, Player p, Level lvl, Brush brush) {
Vec3U16 P = marks[0]; Vec3U16 P = marks[0];
int upper = (Radius + 1) * (Radius + 1); int upper = (Radius + 1) * (Radius + 1);
for (short yy = (short)-Radius; yy <= Radius; yy++) int minX = Math.Max(P.X - Radius, 0) - P.X, maxX = Math.Min(P.X + Radius, lvl.Width - 1) - P.X;
for (short zz = (short)-Radius; zz <= Radius; zz++) int minY = Math.Max(P.Y - Radius, 0) - P.Y, maxY = Math.Min(P.Y + Radius, lvl.Height - 1) - P.Y;
for (short xx = (short)-Radius; xx <= Radius; xx++) int minZ = Math.Max(P.Z - Radius, 0) - P.Z, maxZ = Math.Min(P.Z + Radius, lvl.Length - 1) - P.Z;
for (int yy = minY; yy <= maxY; yy++)
for (int zz = minZ; zz <= maxZ; zz++)
for (int xx = minX; xx <= maxX; xx++)
{ {
int curDist = xx * xx + yy * yy + zz * zz; int curDist = xx * xx + yy * yy + zz * zz;
if (curDist < upper) if (curDist < upper)
@ -58,19 +61,22 @@ namespace MCGalaxy.Drawing.Ops {
public int Radius; public int Radius;
public override string Name { get { return "Adv Hollow Sphere"; } } public override string Name { get { return "Adv Hollow Sphere"; } }
public override int GetBlocksAffected(Level lvl, Vec3U16[] marks) { public override long GetBlocksAffected(Level lvl, Vec3U16[] marks) {
int R = Radius; long R = Radius;
double outer = (int)(Math.PI * 4.0 / 3.0 * (R * R * R)); double outer = (int)(Math.PI * 4.0 / 3.0 * (R * R * R));
double inner = (int)(Math.PI * 4.0 / 3.0 * ((R - 1) * (R - 1) * (R - 1))); double inner = (int)(Math.PI * 4.0 / 3.0 * ((R - 1) * (R - 1) * (R - 1)));
return (int)(outer - inner); return (long)(outer - inner);
} }
public override void Perform(Vec3U16[] marks, Player p, Level lvl, Brush brush) { public override void Perform(Vec3U16[] marks, Player p, Level lvl, Brush brush) {
Vec3U16 P = marks[0]; Vec3U16 P = marks[0];
int upper = (Radius + 1) * (Radius + 1), inner = (Radius - 1) * (Radius - 1); int upper = (Radius + 1) * (Radius + 1), inner = (Radius - 1) * (Radius - 1);
for (short yy = (short)-Radius; yy <= Radius; yy++) int minX = Math.Max(P.X - Radius, 0) - P.X, maxX = Math.Min(P.X + Radius, lvl.Width - 1) - P.X;
for (short zz = (short)-Radius; zz <= Radius; zz++) int minY = Math.Max(P.Y - Radius, 0) - P.Y, maxY = Math.Min(P.Y + Radius, lvl.Height - 1) - P.Y;
for (short xx = (short)-Radius; xx <= Radius; xx++) int minZ = Math.Max(P.Z - Radius, 0) - P.Z, maxZ = Math.Min(P.Z + Radius, lvl.Length - 1) - P.Z;
for (int yy = minY; yy <= maxY; yy++)
for (int zz = minZ; zz <= maxZ; zz++)
for (int xx = minX; xx <= maxX; xx++)
{ {
int curDist = xx * xx + yy * yy + zz * zz; int curDist = xx * xx + yy * yy + zz * zz;
if (curDist < upper && curDist >= inner) { if (curDist < upper && curDist >= inner) {

32
Drawing/DrawOps/AdvPyramidDrawOps.cs
View File

@ -29,20 +29,23 @@ namespace MCGalaxy.Drawing.Ops {
public override string Name { get { return "Adv Pyramid"; } } public override string Name { get { return "Adv Pyramid"; } }
public override int GetBlocksAffected(Level lvl, Vec3U16[] marks) { public override long GetBlocksAffected(Level lvl, Vec3U16[] marks) {
int R = Radius, H = Height; long R = Radius, H = Height;
return (R * R * H) / 3; return (R * R * H) / 3;
} }
public override void Perform(Vec3U16[] marks, Player p, Level lvl, Brush brush) { public override void Perform(Vec3U16[] marks, Player p, Level lvl, Brush brush) {
Vec3U16 P = marks[0]; Vec3U16 P = marks[0];
for (short yy = 0; yy <= Height; yy++) int minX = Math.Max(P.X - Radius, 0) - P.X, maxX = Math.Min(P.X + Radius, lvl.Width - 1) - P.X;
for (short zz = (short)-Radius; zz <= Radius; zz++) int minZ = Math.Max(P.Z - Radius, 0) - P.Z, maxZ = Math.Min(P.Z + Radius, lvl.Length - 1) - P.Z;
for (short xx = (short)-Radius; xx <= Radius; xx++) int maxY = Math.Min(P.Y + Height, lvl.Height - 1) - P.Y;
for (int yy = 0; yy <= maxY; yy++)
for (int zz = minZ; zz <= maxZ; zz++)
for (int xx = minX; xx <= maxX; xx++)
{ {
int curHeight = Invert ? yy : Height - yy; int curHeight = Invert ? yy : Height - yy;
if (curHeight == 0) continue; if (curHeight == 0) continue;
int cx = P.X + xx, cy = P.Y + + (Height - curHeight), cz = P.Z + zz; int cx = P.X + xx, cy = P.Y + (Height - curHeight), cz = P.Z + zz;
double curRadius = Radius * ((double)curHeight / (double)Height); double curRadius = Radius * ((double)curHeight / (double)Height);
if (Math.Abs(xx) > curRadius || Math.Abs(zz) > curRadius) if (Math.Abs(xx) > curRadius || Math.Abs(zz) > curRadius)
@ -58,18 +61,21 @@ namespace MCGalaxy.Drawing.Ops {
public override string Name { get { return "Adv Hollow Pyramid"; } } public override string Name { get { return "Adv Hollow Pyramid"; } }
public override int GetBlocksAffected(Level lvl, Vec3U16[] marks) { public override long GetBlocksAffected(Level lvl, Vec3U16[] marks) {
int R = Radius, H = Height; long R = Radius, H = Height;
int outer = (R * R * H) / 3; long outer = (R * R * H) / 3;
int inner = ((R - 1) * (R - 1) * (H - 1)) / 3; long inner = ((R - 1) * (R - 1) * (H - 1)) / 3;
return outer - inner; return outer - inner;
} }
public override void Perform(Vec3U16[] marks, Player p, Level lvl, Brush brush) { public override void Perform(Vec3U16[] marks, Player p, Level lvl, Brush brush) {
Vec3U16 P = marks[0]; Vec3U16 P = marks[0];
for (short yy = 0; yy <= Height; yy++) int minX = Math.Max(P.X - Radius, 0) - P.X, maxX = Math.Min(P.X + Radius, lvl.Width - 1) - P.X;
for (short zz = (short)-Radius; zz <= Radius; zz++) int minZ = Math.Max(P.Z - Radius, 0) - P.Z, maxZ = Math.Min(P.Z + Radius, lvl.Length - 1) - P.Z;
for (short xx = (short)-Radius; xx <= Radius; xx++) int maxY = Math.Min(P.Y + Height, lvl.Height - 1) - P.Y;
for (int yy = 0; yy <= maxY; yy++)
for (int zz = minZ; zz <= maxZ; zz++)
for (int xx = minX; xx <= maxX; xx++)
{ {
int curHeight = Invert ? yy : Height - yy; int curHeight = Invert ? yy : Height - yy;
if (curHeight == 0) continue; if (curHeight == 0) continue;

8
Drawing/DrawOps/CuboidDrawOp.cs
View File

@ -24,7 +24,7 @@ namespace MCGalaxy.Drawing.Ops {
public override string Name { get { return "Cuboid"; } } public override string Name { get { return "Cuboid"; } }
public override int GetBlocksAffected(Level lvl, Vec3U16[] marks) { public override long GetBlocksAffected(Level lvl, Vec3U16[] marks) {
Vec3U16 p1 = marks[0], p2 = marks[1]; Vec3U16 p1 = marks[0], p2 = marks[1];
return (p2.X - p1.X + 1) * (p2.Y - p1.Y + 1) * (p2.Z - p1.Z + 1); return (p2.X - p1.X + 1) * (p2.Y - p1.Y + 1) * (p2.Z - p1.Z + 1);
} }
@ -44,7 +44,7 @@ namespace MCGalaxy.Drawing.Ops {
public override string Name { get { return "Cuboid Hollow"; } } public override string Name { get { return "Cuboid Hollow"; } }
public override int GetBlocksAffected(Level lvl, Vec3U16[] marks) { public override long GetBlocksAffected(Level lvl, Vec3U16[] marks) {
Vec3U16 p1 = marks[0], p2 = marks[1]; Vec3U16 p1 = marks[0], p2 = marks[1];
int lenX = (p2.X - p1.X + 1), lenY = (p2.Y - p1.Y + 1), lenZ = (p2.Z - p1.Z + 1); int lenX = (p2.X - p1.X + 1), lenY = (p2.Y - p1.Y + 1), lenZ = (p2.Z - p1.Z + 1);
int xQuadsVol = Math.Min(lenX, 2) * (lenY * lenZ); int xQuadsVol = Math.Min(lenX, 2) * (lenY * lenZ);
@ -102,7 +102,7 @@ namespace MCGalaxy.Drawing.Ops {
public override string Name { get { return "Cuboid Walls"; } } public override string Name { get { return "Cuboid Walls"; } }
public override int GetBlocksAffected(Level lvl, Vec3U16[] marks) { public override long GetBlocksAffected(Level lvl, Vec3U16[] marks) {
Vec3U16 p1 = marks[0], p2 = marks[1]; Vec3U16 p1 = marks[0], p2 = marks[1];
int lenX = (p2.X - p1.X + 1), lenY = (p2.Y - p1.Y + 1), lenZ = (p2.Z - p1.Z + 1); int lenX = (p2.X - p1.X + 1), lenY = (p2.Y - p1.Y + 1), lenZ = (p2.Z - p1.Z + 1);
int xQuadsVol = Math.Min(lenX, 2) * (lenY * lenZ); int xQuadsVol = Math.Min(lenX, 2) * (lenY * lenZ);
@ -126,7 +126,7 @@ namespace MCGalaxy.Drawing.Ops {
public override string Name { get { return "Cuboid Wireframe"; } } public override string Name { get { return "Cuboid Wireframe"; } }
public override int GetBlocksAffected(Level lvl, Vec3U16[] marks) { public override long GetBlocksAffected(Level lvl, Vec3U16[] marks) {
Vec3U16 p1 = marks[0], p2 = marks[1]; Vec3U16 p1 = marks[0], p2 = marks[1];
int lenX = (p2.X - p1.X + 1), lenY = (p2.Y - p1.Y + 1), lenZ = (p2.Z - p1.Z + 1); int lenX = (p2.X - p1.X + 1), lenY = (p2.Y - p1.Y + 1), lenZ = (p2.Z - p1.Z + 1);
int horSidesvol = 2 * (lenX * 2 + lenZ * 2); // TODO: slightly overestimated by at most four blocks. int horSidesvol = 2 * (lenX * 2 + lenZ * 2); // TODO: slightly overestimated by at most four blocks.

8
Drawing/DrawOps/DrawOp.cs
View File

@ -66,11 +66,11 @@ namespace MCGalaxy.Drawing.Ops {
/// <summary> Estimates the total number of blocks that the drawing commands affects. <br/> /// <summary> Estimates the total number of blocks that the drawing commands affects. <br/>
/// Note that this estimate assumes that all possibly affected blocks will be changed by the drawing command. </summary> /// Note that this estimate assumes that all possibly affected blocks will be changed by the drawing command. </summary>
public abstract int GetBlocksAffected(Level lvl, Vec3U16[] marks); public abstract long GetBlocksAffected(Level lvl, Vec3U16[] marks);
public abstract void Perform(Vec3U16[] marks, Player p, Level lvl, Brush brush); public abstract void Perform(Vec3U16[] marks, Player p, Level lvl, Brush brush);
public bool CanDraw(Vec3U16[] marks, Player p, out int affected) { public bool CanDraw(Vec3U16[] marks, Player p, out long affected) {
affected = GetBlocksAffected(p.level, marks); affected = GetBlocksAffected(p.level, marks);
if (affected > p.group.maxBlocks) { if (affected > p.group.maxBlocks) {
Player.SendMessage(p, "You tried to draw " + affected + " blocks."); Player.SendMessage(p, "You tried to draw " + affected + " blocks.");
@ -80,7 +80,7 @@ namespace MCGalaxy.Drawing.Ops {
return true; return true;
} }
public virtual bool DetermineDrawOpMethod(Level lvl, int affected) { public virtual bool DetermineDrawOpMethod(Level lvl, long affected) {
if (affected > Server.DrawReloadLimit) { if (affected > Server.DrawReloadLimit) {
method = M_PSetTile; method = M_PSetTile;
return true; return true;
@ -156,7 +156,7 @@ namespace MCGalaxy.Drawing.Ops {
} }
op.Level = p.level; op.Level = p.level;
int affected = 0; long affected = 0;
if (!op.CanDraw(marks, p, out affected)) if (!op.CanDraw(marks, p, out affected))
return false; return false;
if (brush != null && affected != -1) { if (brush != null && affected != -1) {

2
Drawing/DrawOps/FillDrawOp.cs
View File

@ -27,7 +27,7 @@ namespace MCGalaxy.Drawing.Ops {
public override string Name { get { return "Fill"; } } public override string Name { get { return "Fill"; } }
public override int GetBlocksAffected(Level lvl, Vec3U16[] marks) { public override long GetBlocksAffected(Level lvl, Vec3U16[] marks) {
return Positions.Count; return Positions.Count;
} }

2
Drawing/DrawOps/LineDrawOp.cs
View File

@ -30,7 +30,7 @@ namespace MCGalaxy.Drawing.Ops {
public override bool MinMaxCoords { get { return false; } } public override bool MinMaxCoords { get { return false; } }
public override int GetBlocksAffected(Level lvl, Vec3U16[] marks) { public override long GetBlocksAffected(Level lvl, Vec3U16[] marks) {
Vec3U16 p1 = marks[0], p2 = marks[1]; Vec3U16 p1 = marks[0], p2 = marks[1];
double dx = Math.Abs(p2.X - p1.X) + 0.25, dy = Math.Abs(p2.Y - p1.Y) + 0.25, dz = Math.Abs(p2.Z - p1.Z) + 0.25; double dx = Math.Abs(p2.X - p1.X) + 0.25, dy = Math.Abs(p2.Y - p1.Y) + 0.25, dz = Math.Abs(p2.Z - p1.Z) + 0.25;
if (WallsMode) { if (WallsMode) {

2
Drawing/DrawOps/MazeDrawOp.cs
View File

@ -33,7 +33,7 @@ namespace MCGalaxy.Drawing.Ops {
byte[] r = new byte[1]; byte[] r = new byte[1];
int width, length; int width, length;
public override int GetBlocksAffected(Level lvl, Vec3U16[] marks) { public override long GetBlocksAffected(Level lvl, Vec3U16[] marks) {
int lenX = (Math.Abs(marks[1].X - marks[0].X) + 1) / 2; int lenX = (Math.Abs(marks[1].X - marks[0].X) + 1) / 2;
int lenZ = (Math.Abs(marks[1].Z - marks[0].Z) + 1) / 2; int lenZ = (Math.Abs(marks[1].Z - marks[0].Z) + 1) / 2;
return lenX * lenZ * 3; return lenX * lenZ * 3;

4
Drawing/DrawOps/PasteDrawOp.cs
View File

@ -29,7 +29,7 @@ namespace MCGalaxy.Drawing.Ops {
public override bool MinMaxCoords { get { return false; } } public override bool MinMaxCoords { get { return false; } }
public override int GetBlocksAffected(Level lvl, Vec3U16[] marks) { public override long GetBlocksAffected(Level lvl, Vec3U16[] marks) {
return CopyState.Volume; return CopyState.Volume;
} }
@ -65,7 +65,7 @@ namespace MCGalaxy.Drawing.Ops {
public override bool MinMaxCoords { get { return false; } } public override bool MinMaxCoords { get { return false; } }
public override int GetBlocksAffected(Level lvl, Vec3U16[] marks) { public override long GetBlocksAffected(Level lvl, Vec3U16[] marks) {
return CopyState.Volume; return CopyState.Volume;
} }

6
Drawing/DrawOps/PyramidDrawOp.cs
View File

@ -29,14 +29,14 @@ namespace MCGalaxy.Drawing.Ops {
this.yDir = yDir; this.yDir = yDir;
} }
public override bool DetermineDrawOpMethod(Level lvl, int affected) { public override bool DetermineDrawOpMethod(Level lvl, long affected) {
return baseOp.DetermineDrawOpMethod(lvl, affected); return baseOp.DetermineDrawOpMethod(lvl, affected);
} }
public override int GetBlocksAffected(Level lvl, Vec3U16[] marks) { public override long GetBlocksAffected(Level lvl, Vec3U16[] marks) {
Vec3U16 origP1 = marks[0], origP2 = marks[1]; Vec3U16 origP1 = marks[0], origP2 = marks[1];
Vec3U16 p1 = marks[0], p2 = marks[1]; Vec3U16 p1 = marks[0], p2 = marks[1];
int total = 0; long total = 0;
while (true) { while (true) {
total += baseOp.GetBlocksAffected(lvl, marks); total += baseOp.GetBlocksAffected(lvl, marks);
if (p1.Y >= lvl.Height || Math.Abs(p2.X - p1.X) <= 1 || Math.Abs(p2.Z - p1.Z) <= 1) if (p1.Y >= lvl.Height || Math.Abs(p2.X - p1.X) <= 1 || Math.Abs(p2.Z - p1.Z) <= 1)

4
Drawing/DrawOps/ReplaceDrawOp.cs
View File

@ -30,7 +30,7 @@ namespace MCGalaxy.Drawing.Ops {
public override string Name { get { return "Replace"; } } public override string Name { get { return "Replace"; } }
public override int GetBlocksAffected(Level lvl, Vec3U16[] marks) { public override long GetBlocksAffected(Level lvl, Vec3U16[] marks) {
Vec3U16 p1 = marks[0], p2 = marks[1]; Vec3U16 p1 = marks[0], p2 = marks[1];
return (p2.X - p1.X + 1) * (p2.Y - p1.Y + 1) * (p2.Z - p1.Z + 1); return (p2.X - p1.X + 1) * (p2.Y - p1.Y + 1) * (p2.Z - p1.Z + 1);
} }
@ -60,7 +60,7 @@ namespace MCGalaxy.Drawing.Ops {
public override string Name { get { return "ReplaceNot"; } } public override string Name { get { return "ReplaceNot"; } }
public override int GetBlocksAffected(Level lvl, Vec3U16[] marks) { public override long GetBlocksAffected(Level lvl, Vec3U16[] marks) {
Vec3U16 p1 = marks[0], p2 = marks[1]; Vec3U16 p1 = marks[0], p2 = marks[1];
return (p2.X - p1.X + 1) * (p2.Y - p1.Y + 1) * (p2.Z - p1.Z + 1); return (p2.X - p1.X + 1) * (p2.Y - p1.Y + 1) * (p2.Z - p1.Z + 1);
} }

6
Drawing/DrawOps/SpheroidDrawOp.cs
View File

@ -24,7 +24,7 @@ namespace MCGalaxy.Drawing.Ops {
public override string Name { get { return "Ellipsoid"; } } public override string Name { get { return "Ellipsoid"; } }
public override int GetBlocksAffected(Level lvl, Vec3U16[] marks) { public override long GetBlocksAffected(Level lvl, Vec3U16[] marks) {
Vec3U16 p1 = marks[0], p2 = marks[1]; Vec3U16 p1 = marks[0], p2 = marks[1];
double rx = (p2.X - p1.X) / 2.0 + 0.25, ry = (p2.Y - p1.Y) / 2.0 + 0.25, rz = (p2.Z - p1.Z) / 2.0 + 0.25; double rx = (p2.X - p1.X) / 2.0 + 0.25, ry = (p2.Y - p1.Y) / 2.0 + 0.25, rz = (p2.Z - p1.Z) / 2.0 + 0.25;
return (int)(Math.PI * 4.0/3.0 * rx * ry * rz); return (int)(Math.PI * 4.0/3.0 * rx * ry * rz);
@ -52,7 +52,7 @@ namespace MCGalaxy.Drawing.Ops {
public override string Name { get { return "Ellipsoid Hollow"; } } public override string Name { get { return "Ellipsoid Hollow"; } }
public override int GetBlocksAffected(Level lvl, Vec3U16[] marks) { public override long GetBlocksAffected(Level lvl, Vec3U16[] marks) {
Vec3U16 p1 = marks[0], p2 = marks[1]; Vec3U16 p1 = marks[0], p2 = marks[1];
double rx = (p2.X - p1.X) / 2.0 + 0.25, ry = (p2.Y - p1.Y) / 2.0 + 0.25, rz = (p2.Z - p1.Z) / 2.0 + 0.25; double rx = (p2.X - p1.X) / 2.0 + 0.25, ry = (p2.Y - p1.Y) / 2.0 + 0.25, rz = (p2.Z - p1.Z) / 2.0 + 0.25;
return (int)(Math.PI * 4.0/3.0 * rx * ry * rz); return (int)(Math.PI * 4.0/3.0 * rx * ry * rz);
@ -86,7 +86,7 @@ namespace MCGalaxy.Drawing.Ops {
public override string Name { get { return "Cylinder"; } } public override string Name { get { return "Cylinder"; } }
public override int GetBlocksAffected(Level lvl, Vec3U16[] marks) { public override long GetBlocksAffected(Level lvl, Vec3U16[] marks) {
Vec3U16 p1 = marks[0], p2 = marks[1]; Vec3U16 p1 = marks[0], p2 = marks[1];
double rx = (p2.X - p1.X) / 2.0 + 0.25, rz = (p2.Z - p1.Z) / 2.0 + 0.25; double rx = (p2.X - p1.X) / 2.0 + 0.25, rz = (p2.Z - p1.Z) / 2.0 + 0.25;
int height = (p2.Y - p1.Y + 1); int height = (p2.Y - p1.Y + 1);

2
Drawing/DrawOps/TorusDrawOp.cs
View File

@ -24,7 +24,7 @@ namespace MCGalaxy.Drawing.Ops {
public override string Name { get { return "Torus"; } } public override string Name { get { return "Torus"; } }
public override int GetBlocksAffected(Level lvl, Vec3U16[] marks) { public override long GetBlocksAffected(Level lvl, Vec3U16[] marks) {
Vec3U16 p1 = marks[0], p2 = marks[1]; Vec3U16 p1 = marks[0], p2 = marks[1];
double rx = (p2.X - p1.X) / 2.0 + 0.25, ry = (p2.Y - p1.Y) / 2.0 + 0.25, rz = (p2.Z - p1.Z) / 2.0 + 0.25; double rx = (p2.X - p1.X) / 2.0 + 0.25, ry = (p2.Y - p1.Y) / 2.0 + 0.25, rz = (p2.Z - p1.Z) / 2.0 + 0.25;
double rTube = ry, rCentre = Math.Min(rx, rz) - rTube; double rTube = ry, rCentre = Math.Min(rx, rz) - rTube;

2
Drawing/DrawOps/TreeDrawOp.cs
View File

@ -39,7 +39,7 @@ namespace MCGalaxy.Drawing.Ops {
public const int T_Tree = 0, T_NotchTree = 1, T_NotchSwamp = 2, T_Cactus = 3; public const int T_Tree = 0, T_NotchTree = 1, T_NotchSwamp = 2, T_Cactus = 3;
static Brush defBrush = new SolidBrush(Block.leaf, 0); static Brush defBrush = new SolidBrush(Block.leaf, 0);
public override int GetBlocksAffected(Level lvl, Vec3U16[] marks) { return -1; } public override long GetBlocksAffected(Level lvl, Vec3U16[] marks) { return -1; }
public override void Perform(Vec3U16[] marks, Player p, Level lvl, Brush brush) { public override void Perform(Vec3U16[] marks, Player p, Level lvl, Brush brush) {
if (brush == null) brush = defBrush; if (brush == null) brush = defBrush;

2
Drawing/DrawOps/TriangleDrawOp.cs
View File

@ -24,7 +24,7 @@ namespace MCGalaxy.Drawing.Ops {
public override string Name { get { return "Triangle"; } } public override string Name { get { return "Triangle"; } }
public override int GetBlocksAffected(Level lvl, Vec3U16[] marks) { public override long GetBlocksAffected(Level lvl, Vec3U16[] marks) {
// Applying Heron's Formula // Applying Heron's Formula
double a = (marks[0] - marks[2]).Length; double a = (marks[0] - marks[2]).Length;
double b = (marks[1] - marks[2]).Length; double b = (marks[1] - marks[2]).Length;

6
Drawing/DrawOps/UndoDrawOp.cs
View File

@ -35,7 +35,7 @@ namespace MCGalaxy.Drawing.Ops {
internal Player who; internal Player who;
internal Level saveLevel = null; internal Level saveLevel = null;
public override int GetBlocksAffected(Level lvl, Vec3U16[] marks) { return -1; } public override long GetBlocksAffected(Level lvl, Vec3U16[] marks) { return -1; }
public override void Perform(Vec3U16[] marks, Player p, Level lvl, Brush brush) { public override void Perform(Vec3U16[] marks, Player p, Level lvl, Brush brush) {
PerformUndo(p, ref saveLevel); PerformUndo(p, ref saveLevel);
@ -98,7 +98,7 @@ namespace MCGalaxy.Drawing.Ops {
internal string whoName; internal string whoName;
internal bool foundUser = false; internal bool foundUser = false;
public override int GetBlocksAffected(Level lvl, Vec3U16[] marks) { return -1; } public override long GetBlocksAffected(Level lvl, Vec3U16[] marks) { return -1; }
public override void Perform(Vec3U16[] marks, Player p, Level lvl, Brush brush) { public override void Perform(Vec3U16[] marks, Player p, Level lvl, Brush brush) {
UndoFile.UndoPlayer(p, whoName.ToLower(), marks, Start, ref foundUser); UndoFile.UndoPlayer(p, whoName.ToLower(), marks, Start, ref foundUser);
@ -111,7 +111,7 @@ namespace MCGalaxy.Drawing.Ops {
internal long seconds; internal long seconds;
public override int GetBlocksAffected(Level lvl, Vec3U16[] marks) { return -1; } public override long GetBlocksAffected(Level lvl, Vec3U16[] marks) { return -1; }
public override void Perform(Vec3U16[] marks, Player p, Level lvl, Brush brush) { public override void Perform(Vec3U16[] marks, Player p, Level lvl, Brush brush) {
if (lvl.UndoBuffer.Count != Server.physUndo) { if (lvl.UndoBuffer.Count != Server.physUndo) {

2
Drawing/DrawOps/WriteDrawOp.cs
View File

@ -30,7 +30,7 @@ namespace MCGalaxy.Drawing.Ops {
public override bool MinMaxCoords { get { return false; } } public override bool MinMaxCoords { get { return false; } }
public override int GetBlocksAffected(Level lvl, Vec3U16[] marks) { public override long GetBlocksAffected(Level lvl, Vec3U16[] marks) {
int blocks = 0; int blocks = 0;
foreach (char c in Text) { foreach (char c in Text) {
if ((int)c >= 256 || letters[(int)c] == null) { if ((int)c >= 256 || letters[(int)c] == null) {