SteamWar/FastAsyncWorldEdit
13
0
Fork 0
geforkt von Mirrors/FastAsyncWorldEdit
Code Issues Pull-Requests Pakete Projekte Releases Wiki Aktivität

Line thickness support

Quellcode durchsuchen
Dieser Commit ist enthalten in:
orthoplex64 2013-08-02 23:11:11 -05:00 committet von TomyLobo
Ursprung 91c6c69551
Commit f38b6c484c
2 geänderte Dateien mit 70 neuen und 29 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

53
src/main/java/com/sk89q/worldedit/EditSession.java
Datei anzeigen

@ -3002,11 +3002,12 @@ public class EditSession {
* @param pattern The block pattern used to draw the line * @param pattern The block pattern used to draw the line
* @param pos1 One of the points that define the line. * @param pos1 One of the points that define the line.
* @param pos2 The other point that defines the line. * @param pos2 The other point that defines the line.
* @param radius The radius of the line.
* *
* @return number of blocks affected * @return number of blocks affected
* @throws MaxChangedBlocksException * @throws MaxChangedBlocksException
*/ */
public int drawLine(Pattern pattern, Vector pos1, Vector pos2) public int drawLine(Pattern pattern, Vector pos1, Vector pos2, int radius)
throws MaxChangedBlocksException { throws MaxChangedBlocksException {
int affected = 0; 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); int dx = Math.abs(x2 - x1), dy = Math.abs(y2 - y1), dz = Math.abs(z2 - z1);
if (dx + dy + dz == 0) { 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) { 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)); 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)); tipz = (int) Math.round(z1 + domstep * ((double) dz) / ((double) dx) * (z2 - z1 > 0 ? 1 : -1));
if (setBlock(new Vector(tipx, tipy, tipz), pattern)) { for (int loopx = tipx - radius; loopx <= tipx + radius; loopx++) {
affected++; 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; notdrawn = false;
@ -3040,8 +3061,16 @@ public class EditSession {
tipx = (int) Math.round(x1 + domstep * ((double) dx) / ((double) dy) * (x2 - x1 > 0 ? 1 : -1)); 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)); tipz = (int) Math.round(z1 + domstep * ((double) dz) / ((double) dy) * (z2 - z1 > 0 ? 1 : -1));
if (setBlock(new Vector(tipx, tipy, tipz), pattern)) { for (int loopx = tipx - radius; loopx <= tipx + radius; loopx++) {
affected++; 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; notdrawn = false;
@ -3053,8 +3082,16 @@ public class EditSession {
tipy = (int) Math.round(y1 + domstep * ((double) dy) / ((double) dz) * (y2-y1>0 ? 1 : -1)); 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)); tipx = (int) Math.round(x1 + domstep * ((double) dx) / ((double) dz) * (x2-x1>0 ? 1 : -1));
if (setBlock(new Vector(tipx, tipy, tipz), pattern)) { for (int loopx = tipx - radius; loopx <= tipx + radius; loopx++) {
affected++; 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; notdrawn = false;

46
src/main/java/com/sk89q/worldedit/commands/RegionCommands.java
Datei anzeigen

@ -85,32 +85,36 @@ public class RegionCommands {
player.print(affected + " block(s) have been changed."); player.print(affected + " block(s) have been changed.");
} }
@Command( @Command(
aliases = { "/line" }, aliases = { "/line" },
usage = "<block>", usage = "<block> [thickness]",
desc = "Draw a line segment between selection corners.", desc = "Draw a line segment between selection corners.",
min = 1, min = 1,
max = 1 max = 2
) )
@CommandPermissions("worldedit.region.line") @CommandPermissions("worldedit.region.line")
@Logging(REGION) @Logging(REGION)
public void line(CommandContext args, LocalSession session, LocalPlayer player, public void line(CommandContext args, LocalSession session, LocalPlayer player,
EditSession editSession) throws WorldEditException { EditSession editSession) throws WorldEditException {
Region region = session.getSelection(session.getSelectionWorld()); Region region = session.getSelection(session.getSelectionWorld());
if (!(region instanceof CuboidRegion)) { if (!(region instanceof CuboidRegion)) {
player.printError("Invalid region type"); player.printError("Invalid region type");
return; return;
} }
if (args.argsLength() < 2 ? false : args.getInteger(1) < 0) {
Pattern pattern = we.getBlockPattern(player, args.getString(0)); player.printError("Invalid thickness. Must be greater than -1");
Vector pos1 = ((CuboidRegion) region).getPos1(); return;
Vector pos2 = ((CuboidRegion) region).getPos2(); }
int blocksChanged = editSession.drawLine(pattern, pos1, pos2);
Pattern pattern = we.getBlockPattern(player, args.getString(0));
player.print(blocksChanged + " block(s) have been changed."); 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( @Command(
aliases = { "/replace", "/re", "/rep" }, aliases = { "/replace", "/re", "/rep" },