Various minor
Closes #482 Optimized sqrt for small ranges Close clipboard on finalize
This commit is contained in:
Jesse Boyd
parent
6f664c19bb
commit
b902a57c2c
|
|
@ -1,4 +1,57 @@
|
|||
package com.boydti.fawe.object.brush;
|
||||
|
||||
public class FallingSphere {
|
||||
import com.boydti.fawe.util.MathMan;
|
||||
import com.sk89q.worldedit.EditSession;
|
||||
import com.sk89q.worldedit.MaxChangedBlocksException;
|
||||
import com.sk89q.worldedit.Vector;
|
||||
import com.sk89q.worldedit.command.tool.brush.Brush;
|
||||
import com.sk89q.worldedit.function.pattern.Pattern;
|
||||
|
||||
public class FallingSphere implements Brush {
|
||||
@Override
|
||||
public void build(EditSession editSession, Vector position, Pattern pattern, double size) throws MaxChangedBlocksException {
|
||||
int px = position.getBlockX();
|
||||
int py = position.getBlockY();
|
||||
int pz = position.getBlockZ();
|
||||
int maxY = editSession.getMaxY();
|
||||
|
||||
int lastY = py;
|
||||
|
||||
int radius = (int) Math.round(size);
|
||||
int radiusSqr = (int) Math.round(size * size);
|
||||
for (int z = -radius; z <= radius; z++) {
|
||||
int zz = z * z;
|
||||
int az = pz + z;
|
||||
|
||||
int remaining = radiusSqr - zz;
|
||||
int xRadius = MathMan.usqrt(remaining);
|
||||
|
||||
|
||||
for (int x = -xRadius; x <= xRadius; x++) {
|
||||
int xx = x * x;
|
||||
int ax = px + x;
|
||||
|
||||
int remainingY = remaining - xx;
|
||||
if (remainingY < 0) continue;
|
||||
|
||||
int yRadius = MathMan.usqrt(remainingY);
|
||||
int startY = Math.max(0, py - yRadius);
|
||||
int endY = Math.min(maxY, py + yRadius);
|
||||
|
||||
int heightY = editSession.getHighestTerrainBlock(ax, az, 0, endY);
|
||||
if (heightY < startY) {
|
||||
int diff = startY - heightY;
|
||||
startY -= diff;
|
||||
endY -= diff;
|
||||
}
|
||||
|
||||
for (int y = startY; y <= heightY; y++) {
|
||||
editSession.setBlock(ax, y, az, pattern);
|
||||
}
|
||||
for (int y = heightY + 1; y <= endY; y++) {
|
||||
editSession.setBlock(ax, y, az, pattern);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,6 +22,25 @@ public class MathMan {
|
|||
}
|
||||
|
||||
private static float[] ANGLES = new float[65536];
|
||||
private static char[] SQRT = new char[65536];
|
||||
|
||||
static {
|
||||
for (int i = 0; i < SQRT.length; i++) {
|
||||
SQRT[i] = (char) Math.round(Math.sqrt(i));
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Optimized for i elem 0,65536 (characters)
|
||||
* @param i
|
||||
* @return square root
|
||||
*/
|
||||
public static int usqrt(int i) {
|
||||
if (i < 65536) {
|
||||
return SQRT[i];
|
||||
}
|
||||
return (int) Math.round(Math.sqrt(i));
|
||||
}
|
||||
|
||||
public static float sinInexact(double paramFloat) {
|
||||
return ANGLES[(int) (paramFloat * 10430.378F) & 0xFFFF];
|
||||
|
|
@ -106,28 +125,6 @@ public class MathMan {
|
|||
}
|
||||
}
|
||||
|
||||
private final static int[] table = {
|
||||
0, 16, 22, 27, 32, 35, 39, 42, 45, 48, 50, 53, 55, 57,
|
||||
59, 61, 64, 65, 67, 69, 71, 73, 75, 76, 78, 80, 81, 83,
|
||||
84, 86, 87, 89, 90, 91, 93, 94, 96, 97, 98, 99, 101, 102,
|
||||
103, 104, 106, 107, 108, 109, 110, 112, 113, 114, 115, 116, 117, 118,
|
||||
119, 120, 121, 122, 123, 124, 125, 126, 128, 128, 129, 130, 131, 132,
|
||||
133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 144, 145,
|
||||
146, 147, 148, 149, 150, 150, 151, 152, 153, 154, 155, 155, 156, 157,
|
||||
158, 159, 160, 160, 161, 162, 163, 163, 164, 165, 166, 167, 167, 168,
|
||||
169, 170, 170, 171, 172, 173, 173, 174, 175, 176, 176, 177, 178, 178,
|
||||
179, 180, 181, 181, 182, 183, 183, 184, 185, 185, 186, 187, 187, 188,
|
||||
189, 189, 190, 191, 192, 192, 193, 193, 194, 195, 195, 196, 197, 197,
|
||||
198, 199, 199, 200, 201, 201, 202, 203, 203, 204, 204, 205, 206, 206,
|
||||
207, 208, 208, 209, 209, 210, 211, 211, 212, 212, 213, 214, 214, 215,
|
||||
215, 216, 217, 217, 218, 218, 219, 219, 220, 221, 221, 222, 222, 223,
|
||||
224, 224, 225, 225, 226, 226, 227, 227, 228, 229, 229, 230, 230, 231,
|
||||
231, 232, 232, 233, 234, 234, 235, 235, 236, 236, 237, 237, 238, 238,
|
||||
239, 240, 240, 241, 241, 242, 242, 243, 243, 244, 244, 245, 245, 246,
|
||||
246, 247, 247, 248, 248, 249, 249, 250, 250, 251, 251, 252, 252, 253,
|
||||
253, 254, 254, 255
|
||||
};
|
||||
|
||||
public static double hypot(final double... pars) {
|
||||
double sum = 0;
|
||||
for (final double d : pars) {
|
||||
|
|
@ -326,73 +323,6 @@ public class MathMan {
|
|||
return result;
|
||||
}
|
||||
|
||||
public static final int sqrt(int x) {
|
||||
int xn;
|
||||
|
||||
if (x >= 0x10000) {
|
||||
if (x >= 0x1000000) {
|
||||
if (x >= 0x10000000) {
|
||||
if (x >= 0x40000000) {
|
||||
xn = table[x >> 24] << 8;
|
||||
} else {
|
||||
xn = table[x >> 22] << 7;
|
||||
}
|
||||
} else {
|
||||
if (x >= 0x4000000) {
|
||||
xn = table[x >> 20] << 6;
|
||||
} else {
|
||||
xn = table[x >> 18] << 5;
|
||||
}
|
||||
}
|
||||
|
||||
xn = (xn + 1 + (x / xn)) >> 1;
|
||||
xn = (xn + 1 + (x / xn)) >> 1;
|
||||
return ((xn * xn) > x) ? --xn : xn;
|
||||
} else {
|
||||
if (x >= 0x100000) {
|
||||
if (x >= 0x400000) {
|
||||
xn = table[x >> 16] << 4;
|
||||
} else {
|
||||
xn = table[x >> 14] << 3;
|
||||
}
|
||||
} else {
|
||||
if (x >= 0x40000) {
|
||||
xn = table[x >> 12] << 2;
|
||||
} else {
|
||||
xn = table[x >> 10] << 1;
|
||||
}
|
||||
}
|
||||
|
||||
xn = (xn + 1 + (x / xn)) >> 1;
|
||||
|
||||
return ((xn * xn) > x) ? --xn : xn;
|
||||
}
|
||||
} else {
|
||||
if (x >= 0x100) {
|
||||
if (x >= 0x1000) {
|
||||
if (x >= 0x4000) {
|
||||
xn = (table[x >> 8]) + 1;
|
||||
} else {
|
||||
xn = (table[x >> 6] >> 1) + 1;
|
||||
}
|
||||
} else {
|
||||
if (x >= 0x400) {
|
||||
xn = (table[x >> 4] >> 2) + 1;
|
||||
} else {
|
||||
xn = (table[x >> 2] >> 3) + 1;
|
||||
}
|
||||
}
|
||||
|
||||
return ((xn * xn) > x) ? --xn : xn;
|
||||
} else {
|
||||
if (x >= 0) {
|
||||
return table[x] >> 4;
|
||||
}
|
||||
}
|
||||
}
|
||||
throw new IllegalArgumentException("Invalid number:" + x);
|
||||
}
|
||||
|
||||
|
||||
public static final double getMean(int[] array) {
|
||||
double count = 0;
|
||||
|
|
|
|||
|
|
@ -284,32 +284,39 @@ public class BrushCommands extends MethodCommands {
|
|||
@Command(
|
||||
aliases = {"sphere", "s"},
|
||||
usage = "<pattern> [radius=2]",
|
||||
flags = "h",
|
||||
flags = "hf",
|
||||
desc = "Creates a sphere",
|
||||
help =
|
||||
"Creates a sphere.\n" +
|
||||
"The -h flag creates hollow spheres instead.",
|
||||
"The -h flag creates hollow spheres instead." +
|
||||
"The -f flag creates falling spheres.",
|
||||
min = 1,
|
||||
max = 2
|
||||
)
|
||||
@CommandPermissions("worldedit.brush.sphere")
|
||||
public BrushSettings sphereBrush(Player player, EditSession editSession, LocalSession session, Pattern fill, @Optional("2") @Range(min=0) double radius, @Switch('h') boolean hollow, CommandContext context) throws WorldEditException {
|
||||
public BrushSettings sphereBrush(Player player, EditSession editSession, LocalSession session, Pattern fill, @Optional("2") @Range(min=0) double radius, @Switch('h') boolean hollow, @Switch('f') boolean falling, CommandContext context) throws WorldEditException {
|
||||
worldEdit.checkMaxBrushRadius(radius);
|
||||
|
||||
Brush brush;
|
||||
if (hollow) {
|
||||
brush = new HollowSphereBrush();
|
||||
} else {
|
||||
brush = new SphereBrush();
|
||||
}
|
||||
if (fill instanceof BaseBlock) {
|
||||
BaseBlock block = (BaseBlock) fill;
|
||||
switch (block.getId()) {
|
||||
case BlockID.SAND:
|
||||
case BlockID.GRAVEL:
|
||||
BBC.BRUSH_TRY_OTHER.send(player);
|
||||
break;
|
||||
if (fill instanceof BaseBlock) {
|
||||
BaseBlock block = (BaseBlock) fill;
|
||||
switch (block.getId()) {
|
||||
case BlockID.SAND:
|
||||
case BlockID.GRAVEL:
|
||||
BBC.BRUSH_TRY_OTHER.send(player);
|
||||
falling = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (falling) {
|
||||
brush = new FallingSphere();
|
||||
} else {
|
||||
brush = new SphereBrush();
|
||||
}
|
||||
|
||||
}
|
||||
return get(context)
|
||||
.setBrush(brush)
|
||||
|
|
|
|||
|
|
@ -115,6 +115,11 @@ public class BlockArrayClipboard implements Clipboard, LightingExtent {
|
|||
this.mz = origin.getBlockZ();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void finalize() throws Throwable {
|
||||
close();
|
||||
}
|
||||
|
||||
public void close() {
|
||||
IMP.close();
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue