From f38b6c484cf9abb7f8aa19bea80b73d5d75e4654 Mon Sep 17 00:00:00 2001 From: orthoplex64 Date: Fri, 2 Aug 2013 23:11:11 -0500 Subject: [PATCH] Line thickness support --- .../java/com/sk89q/worldedit/EditSession.java | 53 ++++++++++++++++--- .../worldedit/commands/RegionCommands.java | 46 ++++++++-------- 2 files changed, 70 insertions(+), 29 deletions(-) diff --git a/src/main/java/com/sk89q/worldedit/EditSession.java b/src/main/java/com/sk89q/worldedit/EditSession.java index f11d76793..630fc25e5 100644 --- a/src/main/java/com/sk89q/worldedit/EditSession.java +++ b/src/main/java/com/sk89q/worldedit/EditSession.java @@ -3002,11 +3002,12 @@ public class EditSession { * @param pattern The block pattern used to draw the line * @param pos1 One of the points that define the line. * @param pos2 The other point that defines the line. + * @param radius The radius of the line. * * @return number of blocks affected * @throws MaxChangedBlocksException */ - public int drawLine(Pattern pattern, Vector pos1, Vector pos2) + public int drawLine(Pattern pattern, Vector pos1, Vector pos2, int radius) throws MaxChangedBlocksException { int affected = 0; @@ -3018,7 +3019,19 @@ public class EditSession { int dx = Math.abs(x2 - x1), dy = Math.abs(y2 - y1), dz = Math.abs(z2 - z1); if (dx + dy + dz == 0) { - return setBlock(new Vector(tipx, tipy, tipz), pattern) ? 1 : 0; + for (int loopx = tipx - radius; loopx <= tipx + radius; loopx++) { + for (int loopy = tipy - radius; loopy <= tipy + radius; loopy++) { + for (int loopz = tipz - radius; loopz <= tipz + radius; loopz++) { + if (Math.sqrt(Math.pow(loopx - tipx, 2) + Math.pow(loopy - tipy, 2) + Math.pow(loopz - tipz, 2)) <= radius) { + if (setBlock(new Vector(loopx, loopy, loopz), pattern)) { + affected++; + } + } + } + } + } + + return affected; } if (Math.max(Math.max(dx, dy), dz) == dx && notdrawn) { @@ -3027,8 +3040,16 @@ public class EditSession { tipy = (int) Math.round(y1 + domstep * ((double) dy) / ((double) dx) * (y2 - y1 > 0 ? 1 : -1)); tipz = (int) Math.round(z1 + domstep * ((double) dz) / ((double) dx) * (z2 - z1 > 0 ? 1 : -1)); - if (setBlock(new Vector(tipx, tipy, tipz), pattern)) { - affected++; + for (int loopx = tipx - radius; loopx <= tipx + radius; loopx++) { + for (int loopy = tipy - radius; loopy <= tipy + radius; loopy++) { + for (int loopz = tipz - radius; loopz <= tipz + radius; loopz++) { + if (Math.sqrt(Math.pow(loopx - tipx, 2) + Math.pow(loopy - tipy, 2) + Math.pow(loopz - tipz, 2)) <= radius) { + if (setBlock(new Vector(loopx, loopy, loopz), pattern)) { + affected++; + } + } + } + } } } notdrawn = false; @@ -3040,8 +3061,16 @@ public class EditSession { tipx = (int) Math.round(x1 + domstep * ((double) dx) / ((double) dy) * (x2 - x1 > 0 ? 1 : -1)); tipz = (int) Math.round(z1 + domstep * ((double) dz) / ((double) dy) * (z2 - z1 > 0 ? 1 : -1)); - if (setBlock(new Vector(tipx, tipy, tipz), pattern)) { - affected++; + for (int loopx = tipx - radius; loopx <= tipx + radius; loopx++) { + for (int loopy = tipy - radius; loopy <= tipy + radius; loopy++) { + for (int loopz = tipz - radius; loopz <= tipz + radius; loopz++) { + if (Math.sqrt(Math.pow(loopx - tipx, 2) + Math.pow(loopy - tipy, 2) + Math.pow(loopz - tipz, 2)) <= radius) { + if (setBlock(new Vector(loopx, loopy, loopz), pattern)) { + affected++; + } + } + } + } } } notdrawn = false; @@ -3053,8 +3082,16 @@ public class EditSession { tipy = (int) Math.round(y1 + domstep * ((double) dy) / ((double) dz) * (y2-y1>0 ? 1 : -1)); tipx = (int) Math.round(x1 + domstep * ((double) dx) / ((double) dz) * (x2-x1>0 ? 1 : -1)); - if (setBlock(new Vector(tipx, tipy, tipz), pattern)) { - affected++; + for (int loopx = tipx - radius; loopx <= tipx + radius; loopx++) { + for (int loopy = tipy - radius; loopy <= tipy + radius; loopy++) { + for (int loopz = tipz - radius; loopz <= tipz + radius; loopz++) { + if (Math.sqrt(Math.pow(loopx - tipx, 2) + Math.pow(loopy - tipy, 2) + Math.pow(loopz - tipz, 2)) <= radius) { + if (setBlock(new Vector(loopx, loopy, loopz), pattern)) { + affected++; + } + } + } + } } } notdrawn = false; diff --git a/src/main/java/com/sk89q/worldedit/commands/RegionCommands.java b/src/main/java/com/sk89q/worldedit/commands/RegionCommands.java index b8b8cf329..c40034c2d 100644 --- a/src/main/java/com/sk89q/worldedit/commands/RegionCommands.java +++ b/src/main/java/com/sk89q/worldedit/commands/RegionCommands.java @@ -85,32 +85,36 @@ public class RegionCommands { player.print(affected + " block(s) have been changed."); } - - @Command( - aliases = { "/line" }, - usage = "", - desc = "Draw a line segment between selection corners.", - min = 1, - max = 1 - ) - @CommandPermissions("worldedit.region.line") - @Logging(REGION) + + @Command( + aliases = { "/line" }, + usage = " [thickness]", + desc = "Draw a line segment between selection corners.", + min = 1, + max = 2 + ) + @CommandPermissions("worldedit.region.line") + @Logging(REGION) public void line(CommandContext args, LocalSession session, LocalPlayer player, EditSession editSession) throws WorldEditException { Region region = session.getSelection(session.getSelectionWorld()); if (!(region instanceof CuboidRegion)) { - player.printError("Invalid region type"); - return; - } - - Pattern pattern = we.getBlockPattern(player, args.getString(0)); - Vector pos1 = ((CuboidRegion) region).getPos1(); - Vector pos2 = ((CuboidRegion) region).getPos2(); - int blocksChanged = editSession.drawLine(pattern, pos1, pos2); - - player.print(blocksChanged + " block(s) have been changed."); - } + player.printError("Invalid region type"); + return; + } + if (args.argsLength() < 2 ? false : args.getInteger(1) < 0) { + player.printError("Invalid thickness. Must be greater than -1"); + return; + } + + Pattern pattern = we.getBlockPattern(player, args.getString(0)); + Vector pos1 = ((CuboidRegion) region).getPos1(); + Vector pos2 = ((CuboidRegion) region).getPos2(); + int blocksChanged = editSession.drawLine(pattern, pos1, pos2, args.argsLength() < 2 ? 0 : args.getInteger(1)); + + player.print(blocksChanged + " block(s) have been changed."); + } @Command( aliases = { "/replace", "/re", "/rep" },