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

Renamed some variables and adjusted some comments in ArbitraryShape.

Quellcode durchsuchen
Dieser Commit ist enthalten in:
TomyLobo 2011-11-24 10:11:53 +01:00
Ursprung d69b04caf5
Commit adf326e2bf
1 geänderte Dateien mit 12 neuen und 12 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

24
src/main/java/com/sk89q/worldedit/ArbitraryShape.java
Datei anzeigen

@ -31,12 +31,12 @@ import com.sk89q.worldedit.regions.Region;
*/ */
public abstract class ArbitraryShape { public abstract class ArbitraryShape {
private final Region extent; private final Region extent;
private int cacheOffsetX;
private int cacheOffsetY;
private int cacheOffsetZ;
private int cacheSizeX; private int cacheSizeX;
private int cacheSizeY; private int cacheSizeY;
private int cacheSizeZ; private int cacheSizeZ;
private int cacheX;
private int cacheY;
private int cacheZ;
public ArbitraryShape(Region extent) { public ArbitraryShape(Region extent) {
this.extent = extent; this.extent = extent;
@ -44,13 +44,13 @@ public abstract class ArbitraryShape {
Vector min = extent.getMinimumPoint(); Vector min = extent.getMinimumPoint();
Vector max = extent.getMaximumPoint(); Vector max = extent.getMaximumPoint();
cacheSizeX = (int) (max.getX() - min.getX() + 1 + 2); cacheOffsetX = min.getBlockX() - 1;
cacheSizeY = (int) (max.getY() - min.getY() + 1 + 2); cacheOffsetY = min.getBlockY() - 1;
cacheSizeZ = (int) (max.getZ() - min.getZ() + 1 + 2); cacheOffsetZ = min.getBlockZ() - 1;
cacheX = min.getBlockX() - 1; cacheSizeX = (int) (max.getX() - cacheOffsetX + 2);
cacheY = min.getBlockY() - 1; cacheSizeY = (int) (max.getY() - cacheOffsetY + 2);
cacheZ = min.getBlockZ() - 1; cacheSizeZ = (int) (max.getZ() - cacheOffsetZ + 2);
cache = new short[cacheSizeX * cacheSizeY * cacheSizeZ]; cache = new short[cacheSizeX * cacheSizeY * cacheSizeZ];
} }
@ -65,7 +65,7 @@ public abstract class ArbitraryShape {
* 0 = unknown * 0 = unknown
* -1 = outside * -1 = outside
* -2 = inside but type and data 0 * -2 = inside but type and data 0
* > 0 = inside, value = (type | (data << 8)), not handling data < -1 * > 0 = inside, value = (type | (data << 8)), not handling data < 0
*/ */
private final short[] cache; private final short[] cache;
@ -81,7 +81,7 @@ public abstract class ArbitraryShape {
protected abstract BaseBlock getMaterial(int x, int y, int z, BaseBlock defaultMaterial); protected abstract BaseBlock getMaterial(int x, int y, int z, BaseBlock defaultMaterial);
private BaseBlock getMaterialCached(int x, int y, int z, Pattern pattern) { private BaseBlock getMaterialCached(int x, int y, int z, Pattern pattern) {
final int index = (y - cacheY) + (z - cacheZ) * cacheSizeY + (x - cacheX) * cacheSizeY * cacheSizeZ; final int index = (y - cacheOffsetY) + (z - cacheOffsetZ) * cacheSizeY + (x - cacheOffsetX) * cacheSizeY * cacheSizeZ;
final short cacheEntry = cache[index]; final short cacheEntry = cache[index];
switch (cacheEntry) { switch (cacheEntry) {
@ -116,7 +116,7 @@ public abstract class ArbitraryShape {
} }
private boolean isInsideCached(int x, int y, int z, Pattern pattern) { private boolean isInsideCached(int x, int y, int z, Pattern pattern) {
final int index = (y - cacheY) + (z - cacheZ) * cacheSizeY + (x - cacheX) * cacheSizeY * cacheSizeZ; final int index = (y - cacheOffsetY) + (z - cacheOffsetZ) * cacheSizeY + (x - cacheOffsetX) * cacheSizeY * cacheSizeZ;
switch (cache[index]) { switch (cache[index]) {
case 0: case 0: