Brandon/FastAsyncWorldedit
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add scatter overlay

Browse Source
This commit is contained in:
Jesse Boyd 2017-03-11 21:26:35 +11:00
parent cff2cc846a
commit ec455189dc
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
4 changed files with 50 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/main/java/com/boydti/fawe/object/brush/ScatterBrush.java
View File

@ -24,6 +24,7 @@ public class ScatterBrush implements Brush {
private final int count;
private final int distance;
private Mask mask;
private AdjacentAnyMask adjacent;
public ScatterBrush(int count, int distance) {
this.count = count;
@ -44,7 +45,7 @@ public class ScatterBrush implements Brush {
if (this.mask == null) {
this.mask = Masks.alwaysTrue();
}
final AdjacentAnyMask adjacent = new AdjacentAnyMask(editSession, Arrays.asList(new BaseBlock(0)));
this.adjacent = new AdjacentAnyMask(editSession, Arrays.asList(new BaseBlock(0)));
final SolidBlockMask solid = new SolidBlockMask(editSession);
final RadiusMask radius = new RadiusMask(0, (int) size);
@ -83,6 +84,10 @@ public class ScatterBrush implements Brush {
return mask.test(pos);
}
public Vector getDirection(Vector pt) {
return adjacent.direction(pt);
}
public void apply(EditSession editSession, LocalBlockVectorSet placed, Vector pt, Pattern p, double size) throws MaxChangedBlocksException {
editSession.setBlock(pt, p);
}

23
core/src/main/java/com/boydti/fawe/object/brush/ScatterOverlayBrush.java Normal file
View File

@ -0,0 +1,23 @@
package com.boydti.fawe.object.brush;
import com.boydti.fawe.object.collection.LocalBlockVectorSet;
import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.MaxChangedBlocksException;
import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.function.pattern.Pattern;
public class ScatterOverlayBrush extends ScatterBrush {
public ScatterOverlayBrush(int count, int distance) {
super(count, distance);
}
@Override
public void apply(EditSession editSession, LocalBlockVectorSet placed, Vector pt, Pattern p, double size) throws MaxChangedBlocksException {
int x = pt.getBlockX();
int y = pt.getBlockY();
int z = pt.getBlockZ();
Vector dir = getDirection(pt);
dir.setComponents(x + dir.getBlockX(), y + dir.getBlockY(), z + dir.getBlockZ());
editSession.setBlock(dir, p);
}
}

15
core/src/main/java/com/boydti/fawe/object/mask/AdjacentAnyMask.java
View File

@ -11,6 +11,9 @@ import java.util.Collection;
* Just an optimized version of the Adjacent Mask for single adjacency
*/
public class AdjacentAnyMask extends BlockMask {
private MutableBlockVector mutable = new MutableBlockVector();
public AdjacentAnyMask(Extent extent, Collection<BaseBlock> blocks) {
super(extent, blocks);
}
@ -43,19 +46,19 @@ public class AdjacentAnyMask extends BlockMask {
int y = v.getBlockY();
int z = v.getBlockZ();
v.mutY(y + 1);
if (super.test(v)) { v.mutY(y); return MutableBlockVector.get(0, 1, 0); }
if (super.test(v)) { v.mutY(y); return mutable.setComponents(0, 1, 0); }
v.mutY(y - 1);
if (super.test(v)) { v.mutY(y); return MutableBlockVector.get(0, -1, 0); }
if (super.test(v)) { v.mutY(y); return mutable.setComponents(0, -1, 0); }
v.mutY(y);
v.mutX(x + 1);
if (super.test(v)) { v.mutX(x); return MutableBlockVector.get(1, 0, 0); }
if (super.test(v)) { v.mutX(x); return mutable.setComponents(1, 0, 0); }
v.mutX(x - 1);
if (super.test(v)) { v.mutX(x); return MutableBlockVector.get(-1, 0, 0); }
if (super.test(v)) { v.mutX(x); return mutable.setComponents(-1, 0, 0); }
v.mutX(x);
v.mutZ(z + 1);
if (super.test(v)) { v.mutZ(z); return MutableBlockVector.get(0, 0, 1); }
if (super.test(v)) { v.mutZ(z); return mutable.setComponents(0, 0, 1); }
v.mutZ(z - 1);
if (super.test(v)) { v.mutZ(z); return MutableBlockVector.get(0, 0, - 1); }
if (super.test(v)) { v.mutZ(z); return mutable.setComponents(0, 0, - 1); }
v.mutZ(z);
return null;
}

15
core/src/main/java/com/sk89q/worldedit/command/BrushCommands.java
View File

@ -36,6 +36,7 @@ import com.boydti.fawe.object.brush.RaiseBrush;
import com.boydti.fawe.object.brush.RecurseBrush;
import com.boydti.fawe.object.brush.ScatterBrush;
import com.boydti.fawe.object.brush.ScatterCommand;
import com.boydti.fawe.object.brush.ScatterOverlayBrush;
import com.boydti.fawe.object.brush.ShatterBrush;
import com.boydti.fawe.object.brush.SplatterBrush;
import com.boydti.fawe.object.brush.SplineBrush;
@ -68,6 +69,7 @@ import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.blocks.BaseBlock;
import com.sk89q.worldedit.blocks.BlockID;
import com.sk89q.worldedit.command.tool.BrushTool;
import com.sk89q.worldedit.command.tool.brush.Brush;
import com.sk89q.worldedit.command.tool.brush.ButcherBrush;
import com.sk89q.worldedit.command.tool.brush.ClipboardBrush;
import com.sk89q.worldedit.command.tool.brush.CylinderBrush;
@ -570,17 +572,24 @@ public class BrushCommands {
usage = "<pattern> [radius=5] [points=5] [distance=1]",
desc = "Scatter blocks on a surface",
help =
"Chooses the scatter brush.",
"Chooses the scatter brush.\n" +
" The -o flag will overlay the block",
min = 1,
max = 4
)
@CommandPermissions("worldedit.brush.scatter")
public void scatterBrush(Player player, EditSession editSession, LocalSession session, Pattern fill, @Optional("5") double radius, @Optional("5") double points, @Optional("1") double distance) throws WorldEditException {
public void scatterBrush(Player player, EditSession editSession, LocalSession session, Pattern fill, @Optional("5") double radius, @Optional("5") double points, @Optional("1") double distance, @Switch('o') boolean overlay) throws WorldEditException {
worldEdit.checkMaxBrushRadius(radius);
BrushTool tool = session.getBrushTool(player);
tool.setFill(fill);
tool.setSize(radius);
tool.setBrush(new ScatterBrush((int) points, (int) distance), "worldedit.brush.scatter", player);
Brush brush;
if (overlay) {
brush = new ScatterOverlayBrush((int) points, (int) distance);
} else {
brush = new ScatterBrush((int) points, (int) distance);
}
tool.setBrush(brush, "worldedit.brush.scatter", player);
player.print(BBC.getPrefix() + BBC.BRUSH_SCATTER.f(radius, points));
}