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

add /circleh (/sphere hollowcircle) for drawing hollow circles, fixes #300

Browse Source
This commit is contained in:
UnknownShadow200 2017-06-01 12:49:21 +10:00
parent c5a19db3ba
commit 003896e1ab
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
MCGalaxy/Commands/building/CmdSphere.cs
View File

@ -26,11 +26,12 @@ namespace MCGalaxy.Commands.Building {
public override string shortcut { get { return "sp"; } } public override string shortcut { get { return "sp"; } }
public override LevelPermission defaultRank { get { return LevelPermission.AdvBuilder; } } public override LevelPermission defaultRank { get { return LevelPermission.AdvBuilder; } }
public override CommandAlias[] Aliases { public override CommandAlias[] Aliases {
get { return new[] { new CommandAlias("sphereh", null, "hollow"), get { return new[] { new CommandAlias("sphereh", null, "hollow"),
new CommandAlias("sph", null, "hollow"), new CommandAlias("circle", null, "circle" ) }; } new CommandAlias("sph", null, "hollow"), new CommandAlias("circle", null, "circle" ),
new CommandAlias("circleh", null, "hollowcircle") }; }
} }
protected override string PlaceMessage { protected override string PlaceMessage {
get { return "Place a block for the centre, then another for the radius."; } get { return "Place a block for the centre, then another for the radius."; }
} }
protected override DrawMode GetMode(string[] parts) { protected override DrawMode GetMode(string[] parts) {
@ -38,6 +39,7 @@ namespace MCGalaxy.Commands.Building {
if (msg == "solid") return DrawMode.solid; if (msg == "solid") return DrawMode.solid;
else if (msg == "hollow") return DrawMode.hollow; else if (msg == "hollow") return DrawMode.hollow;
else if (msg == "circle") return DrawMode.circle; else if (msg == "circle") return DrawMode.circle;
else if (msg == "hollowcircle") return DrawMode.hcircle;
return DrawMode.normal; return DrawMode.normal;
} }
@ -45,6 +47,7 @@ namespace MCGalaxy.Commands.Building {
switch (dArgs.Mode) { switch (dArgs.Mode) {
case DrawMode.hollow: return new AdvHollowSphereDrawOp(); case DrawMode.hollow: return new AdvHollowSphereDrawOp();
case DrawMode.circle: return new EllipsoidDrawOp(); case DrawMode.circle: return new EllipsoidDrawOp();
case DrawMode.hcircle: return new EllipsoidHollowDrawOp();
} }
return new AdvSphereDrawOp(); return new AdvSphereDrawOp();
} }
@ -66,7 +69,8 @@ namespace MCGalaxy.Commands.Building {
int dy = Math.Abs(m[0].Y - m[1].Y); int dy = Math.Abs(m[0].Y - m[1].Y);
int dz = Math.Abs(m[0].Z - m[1].Z); int dz = Math.Abs(m[0].Z - m[1].Z);
if (mode != DrawMode.circle) { bool circle = mode == DrawMode.circle || mode == DrawMode.hcircle;
if (!circle) {
int R = (int)Math.Sqrt(dx * dx + dy * dy + dz * dz); int R = (int)Math.Sqrt(dx * dx + dy * dy + dz * dz);
return new Vec3S32(R, R, R); return new Vec3S32(R, R, R);
} else if (dx >= dy && dz >= dy) { } else if (dx >= dy && dz >= dy) {
@ -85,7 +89,7 @@ namespace MCGalaxy.Commands.Building {
Player.Message(p, "%T/sphere <brush args> <mode>"); Player.Message(p, "%T/sphere <brush args> <mode>");
Player.Message(p, "%HCreates a sphere, with the first point as the centre, " + Player.Message(p, "%HCreates a sphere, with the first point as the centre, " +
"and second being the radius."); "and second being the radius.");
Player.Message(p, " %HModes: &fsolid/hollow/circle"); Player.Message(p, " %HModes: &fsolid/hollow/circle/hollowcircle");
Player.Message(p, " %HFor help about brushes, type %T/help brush%H."); Player.Message(p, " %HFor help about brushes, type %T/help brush%H.");
} }
} }

2
MCGalaxy/Commands/building/DrawCmd.cs
View File

@ -108,6 +108,6 @@ namespace MCGalaxy.Commands.Building {
up, down, layer, verticalX, verticalZ, // fill up, down, layer, verticalX, verticalZ, // fill
cone, hcone, icone, hicone, volcano, // draw cone, hcone, icone, hicone, volcano, // draw
pyramid, hpyramid, ipyramid, hipyramid,// draw pyramid, hpyramid, ipyramid, hipyramid,// draw
sphere, hsphere, circle, // draw sphere, hsphere, circle, hcircle // draw
} }
} }