Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-23 09:47:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added getChunkCubes() to Region to get 16^3 chunks a region overlaps with

Browse Source
This commit is contained in:
zml2008 2012-03-29 21:06:43 -07:00
parent 3bfb12c051
commit 03f7d4ecfb
5 changed files with 161 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/main/java/com/sk89q/worldedit/regions/CuboidRegion.java
View File

@ -20,6 +20,7 @@
package com.sk89q.worldedit.regions; package com.sk89q.worldedit.regions;
import com.sk89q.worldedit.BlockVector; import com.sk89q.worldedit.BlockVector;
import com.sk89q.worldedit.BlockVector2D;
import com.sk89q.worldedit.LocalWorld; import com.sk89q.worldedit.LocalWorld;
import com.sk89q.worldedit.Vector; import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.Vector2D; import com.sk89q.worldedit.Vector2D;
@ -302,11 +303,27 @@ public class CuboidRegion extends AbstractRegion implements FlatRegion {
Vector min = getMinimumPoint(); Vector min = getMinimumPoint();
Vector max = getMaximumPoint(); Vector max = getMaximumPoint();
for (int x = min.getBlockX(); x <= max.getBlockX(); ++x) {
for (int z = min.getBlockZ(); z <= max.getBlockZ(); ++z) {
chunks.add(new BlockVector2D(x >> ChunkStore.CHUNK_SHIFTS,
z >> ChunkStore.CHUNK_SHIFTS));
}
}
return chunks;
}
public Set<Vector> getChunkCubes() {
Set<Vector> chunks = new HashSet<Vector>();
Vector min = getMinimumPoint();
Vector max = getMaximumPoint();
for (int x = min.getBlockX(); x <= max.getBlockX(); ++x) { for (int x = min.getBlockX(); x <= max.getBlockX(); ++x) {
for (int y = min.getBlockY(); y <= max.getBlockY(); ++y) { for (int y = min.getBlockY(); y <= max.getBlockY(); ++y) {
for (int z = min.getBlockZ(); z <= max.getBlockZ(); ++z) { for (int z = min.getBlockZ(); z <= max.getBlockZ(); ++z) {
Vector pt = new Vector(x, y, z); chunks.add(new BlockVector(x >> ChunkStore.CHUNK_SHIFTS,
chunks.add(ChunkStore.toChunk(pt)); y >> ChunkStore.CHUNK_SHIFTS, z >> ChunkStore.CHUNK_SHIFTS));
} }
} }
} }
@ -376,7 +393,33 @@ public class CuboidRegion extends AbstractRegion implements FlatRegion {
return new Iterable<Vector2D>() { return new Iterable<Vector2D>() {
@Override @Override
public Iterator<Vector2D> iterator() { public Iterator<Vector2D> iterator() {
return new FlatRegionIterator(CuboidRegion.this); return new Iterator<Vector2D>() {
private Vector min = getMinimumPoint();
private Vector max = getMaximumPoint();
private int nextX = min.getBlockX();
private int nextZ = min.getBlockZ();
public boolean hasNext() {
return (nextX != Integer.MIN_VALUE);
}
public Vector2D next() {
if (!hasNext()) throw new java.util.NoSuchElementException();
Vector2D answer = new Vector2D(nextX, nextZ);
if (++nextX > max.getBlockX()) {
nextX = min.getBlockX();
if (++nextZ > max.getBlockZ()) {
nextX = Integer.MIN_VALUE;
}
}
return answer;
}
@Override
public void remove() {
throw new UnsupportedOperationException();
}
};
} }
}; };
} }

75
src/main/java/com/sk89q/worldedit/regions/CylinderRegion.java
View File

@ -22,6 +22,9 @@ package com.sk89q.worldedit.regions;
import java.util.HashSet; import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
import java.util.Set; import java.util.Set;
import com.sk89q.worldedit.BlockVector;
import com.sk89q.worldedit.BlockVector2D;
import com.sk89q.worldedit.LocalWorld; import com.sk89q.worldedit.LocalWorld;
import com.sk89q.worldedit.Vector; import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.Vector2D; import com.sk89q.worldedit.Vector2D;
@ -49,7 +52,7 @@ public class CylinderRegion extends AbstractRegion implements FlatRegion {
/** /**
* Construct the region. * Construct the region.
* *
* @param world * @param world
*/ */
public CylinderRegion(LocalWorld world) { public CylinderRegion(LocalWorld world) {
@ -59,9 +62,10 @@ public class CylinderRegion extends AbstractRegion implements FlatRegion {
/** /**
* Construct the region. * Construct the region.
* *
* @param world * @param world
* @param points * @param center
* @param radius
* @param minY * @param minY
* @param maxY * @param maxY
*/ */
@ -81,8 +85,8 @@ public class CylinderRegion extends AbstractRegion implements FlatRegion {
/** /**
* Returns the main center point of the cylinder * Returns the main center point of the cylinder
* *
* @return * @return
*/ */
public Vector getCenter() { public Vector getCenter() {
return center; return center;
@ -90,7 +94,7 @@ public class CylinderRegion extends AbstractRegion implements FlatRegion {
/** /**
* Sets the main center point of the region * Sets the main center point of the region
* *
*/ */
public void setCenter(Vector center) { public void setCenter(Vector center) {
this.center = center; this.center = center;
@ -99,8 +103,8 @@ public class CylinderRegion extends AbstractRegion implements FlatRegion {
/** /**
* Returns the radius of the cylinder * Returns the radius of the cylinder
* *
* @return * @return
*/ */
public Vector2D getRadius() { public Vector2D getRadius() {
return radius.subtract(0.5, 0.5); return radius.subtract(0.5, 0.5);
@ -108,8 +112,8 @@ public class CylinderRegion extends AbstractRegion implements FlatRegion {
/** /**
* Sets the radius of the cylinder * Sets the radius of the cylinder
* *
* @param radius * @param radius
*/ */
public void setRadius(Vector2D radius) { public void setRadius(Vector2D radius) {
this.radius = radius.add(0.5, 0.5); this.radius = radius.add(0.5, 0.5);
@ -117,7 +121,7 @@ public class CylinderRegion extends AbstractRegion implements FlatRegion {
/** /**
* Extends the radius to be at least the given radius * Extends the radius to be at least the given radius
* *
* @param minRadius * @param minRadius
*/ */
public void extendRadius(Vector2D minRadius) { public void extendRadius(Vector2D minRadius) {
@ -126,7 +130,7 @@ public class CylinderRegion extends AbstractRegion implements FlatRegion {
/** /**
* Set the minimum Y. * Set the minimum Y.
* *
* @param y * @param y
*/ */
public void setMinimumY(int y) { public void setMinimumY(int y) {
@ -136,7 +140,7 @@ public class CylinderRegion extends AbstractRegion implements FlatRegion {
/** /**
* Se the maximum Y. * Se the maximum Y.
* *
* @param y * @param y
*/ */
public void setMaximumY(int y) { public void setMaximumY(int y) {
@ -146,7 +150,7 @@ public class CylinderRegion extends AbstractRegion implements FlatRegion {
/** /**
* Get the lower point of a region. * Get the lower point of a region.
* *
* @return min. point * @return min. point
*/ */
public Vector getMinimumPoint() { public Vector getMinimumPoint() {
@ -155,7 +159,7 @@ public class CylinderRegion extends AbstractRegion implements FlatRegion {
/** /**
* Get the upper point of a region. * Get the upper point of a region.
* *
* @return max. point * @return max. point
*/ */
public Vector getMaximumPoint() { public Vector getMaximumPoint() {
@ -164,7 +168,7 @@ public class CylinderRegion extends AbstractRegion implements FlatRegion {
/** /**
* Gets the maximum Y value * Gets the maximum Y value
* @return * @return
*/ */
public int getMaximumY() { public int getMaximumY() {
return maxY; return maxY;
@ -172,7 +176,7 @@ public class CylinderRegion extends AbstractRegion implements FlatRegion {
/** /**
* Gets the minimum Y value * Gets the minimum Y value
* @return * @return
*/ */
public int getMinimumY() { public int getMinimumY() {
return minY; return minY;
@ -180,7 +184,7 @@ public class CylinderRegion extends AbstractRegion implements FlatRegion {
/** /**
* Get the number of blocks in the region. * Get the number of blocks in the region.
* *
* @return number of blocks * @return number of blocks
*/ */
public int getArea() { public int getArea() {
@ -299,7 +303,7 @@ public class CylinderRegion extends AbstractRegion implements FlatRegion {
/** /**
* Get a list of chunks. * Get a list of chunks.
* *
* @return * @return
*/ */
public Set<Vector2D> getChunks() { public Set<Vector2D> getChunks() {
@ -310,9 +314,30 @@ public class CylinderRegion extends AbstractRegion implements FlatRegion {
for (int x = min.getBlockX(); x <= max.getBlockX(); ++x) { for (int x = min.getBlockX(); x <= max.getBlockX(); ++x) {
for (int z = min.getBlockZ(); z <= max.getBlockZ(); ++z) { for (int z = min.getBlockZ(); z <= max.getBlockZ(); ++z) {
Vector pt = new Vector(x, minY, z); if (contains(new BlockVector(x, minY, z))) {
if (contains(pt)) { chunks.add(new BlockVector2D(x >> ChunkStore.CHUNK_SHIFTS,
chunks.add(ChunkStore.toChunk(pt)); z >> ChunkStore.CHUNK_SHIFTS));
}
}
}
return chunks;
}
@Override
public Set<Vector> getChunkCubes() {
Set<Vector> chunks = new HashSet<Vector>();
Vector min = getMinimumPoint();
Vector max = getMaximumPoint();
for (int x = min.getBlockX(); x <= max.getBlockX(); ++x) {
for (int y = min.getBlockY(); y <= max.getBlockY(); ++y) {
for (int z = min.getBlockZ(); z <= max.getBlockZ(); ++z) {
if (contains(new BlockVector(x, y, z))) {
chunks.add(new BlockVector(x >> ChunkStore.CHUNK_SHIFTS,
y >> ChunkStore.CHUNK_SHIFTS, z >> ChunkStore.CHUNK_SHIFTS));
}
} }
} }
} }
@ -322,8 +347,8 @@ public class CylinderRegion extends AbstractRegion implements FlatRegion {
/** /**
* Sets the height of the cylinder to fit the specified Y. * Sets the height of the cylinder to fit the specified Y.
* *
* @param y * @param y
* @return true if the area was expanded * @return true if the area was expanded
*/ */
public boolean setY(int y) { public boolean setY(int y) {
@ -356,7 +381,7 @@ public class CylinderRegion extends AbstractRegion implements FlatRegion {
/** /**
* Returns string representation in the format * Returns string representation in the format
* "(centerX, centerY, centerZ) - (radiusX, radiusZ)" * "(centerX, centerY, centerZ) - (radiusX, radiusZ)"
* *
* @return string * @return string
*/ */
@Override @Override

35
src/main/java/com/sk89q/worldedit/regions/EllipsoidRegion.java
View File

@ -19,6 +19,8 @@
package com.sk89q.worldedit.regions; package com.sk89q.worldedit.regions;
import com.sk89q.worldedit.BlockVector;
import com.sk89q.worldedit.BlockVector2D;
import com.sk89q.worldedit.LocalWorld; import com.sk89q.worldedit.LocalWorld;
import com.sk89q.worldedit.Vector; import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.Vector2D; import com.sk89q.worldedit.Vector2D;
@ -48,10 +50,10 @@ public class EllipsoidRegion extends AbstractRegion {
public EllipsoidRegion(Vector pos1, Vector pos2) { public EllipsoidRegion(Vector pos1, Vector pos2) {
this(null, pos1, pos2); this(null, pos1, pos2);
} }
/** /**
* Construct a new instance of this ellipsoid region. * Construct a new instance of this ellipsoid region.
* *
* @param world * @param world
* @param center * @param center
* @param radius * @param radius
@ -198,7 +200,7 @@ public class EllipsoidRegion extends AbstractRegion {
/** /**
* Set radiuses. * Set radiuses.
* *
* @param radiuses * @param radius
*/ */
public void setRadius(Vector radius) { public void setRadius(Vector radius) {
this.radius = radius.add(0.5, 0.5, 0.5); this.radius = radius.add(0.5, 0.5, 0.5);
@ -218,8 +220,31 @@ public class EllipsoidRegion extends AbstractRegion {
for (int x = min.getBlockX(); x <= max.getBlockX(); ++x) { for (int x = min.getBlockX(); x <= max.getBlockX(); ++x) {
for (int y = min.getBlockY(); y <= max.getBlockY(); ++y) { for (int y = min.getBlockY(); y <= max.getBlockY(); ++y) {
for (int z = min.getBlockZ(); z <= max.getBlockZ(); ++z) { for (int z = min.getBlockZ(); z <= max.getBlockZ(); ++z) {
Vector pt = new Vector(x, y, z); if (contains(new BlockVector(x, y, z))) {
chunks.add(ChunkStore.toChunk(pt)); chunks.add(new BlockVector2D(x >> ChunkStore.CHUNK_SHIFTS,
z >> ChunkStore.CHUNK_SHIFTS));
}
}
}
}
return chunks;
}
@Override
public Set<Vector> getChunkCubes() {
Set<Vector> chunks = new HashSet<Vector>();
Vector min = getMinimumPoint();
Vector max = getMaximumPoint();
for (int x = min.getBlockX(); x <= max.getBlockX(); ++x) {
for (int y = min.getBlockY(); y <= max.getBlockY(); ++y) {
for (int z = min.getBlockZ(); z <= max.getBlockZ(); ++z) {
if (contains(new BlockVector(x, y, z))) {
chunks.add(new BlockVector(x >> ChunkStore.CHUNK_SHIFTS,
y >> ChunkStore.CHUNK_SHIFTS, z >> ChunkStore.CHUNK_SHIFTS));
}
} }
} }
} }

29
src/main/java/com/sk89q/worldedit/regions/Polygonal2DRegion.java
View File

@ -269,7 +269,7 @@ public class Polygonal2DRegion extends AbstractRegion implements FlatRegion {
/** /**
* Expand the region. * Expand the region.
* *
* @param change * @param changes
*/ */
public void expand(Vector... changes) throws RegionOperationException { public void expand(Vector... changes) throws RegionOperationException {
for (Vector change : changes) { for (Vector change : changes) {
@ -292,7 +292,7 @@ public class Polygonal2DRegion extends AbstractRegion implements FlatRegion {
/** /**
* Contract the region. * Contract the region.
* *
* @param change * @param changes
*/ */
public void contract(Vector... changes) throws RegionOperationException { public void contract(Vector... changes) throws RegionOperationException {
for (Vector change : changes) { for (Vector change : changes) {
@ -415,12 +415,31 @@ public class Polygonal2DRegion extends AbstractRegion implements FlatRegion {
Vector min = getMinimumPoint(); Vector min = getMinimumPoint();
Vector max = getMaximumPoint(); Vector max = getMaximumPoint();
for (int x = min.getBlockX(); x <= max.getBlockX(); ++x) {
for (int z = min.getBlockZ(); z <= max.getBlockZ(); ++z) {
if (contains(new BlockVector(x, minY, z))) { // Not the best
chunks.add(new BlockVector2D(x >> ChunkStore.CHUNK_SHIFTS,
z >> ChunkStore.CHUNK_SHIFTS));
}
}
}
return chunks;
}
@Override
public Set<Vector> getChunkCubes() {
Set<Vector> chunks = new HashSet<Vector>();
Vector min = getMinimumPoint();
Vector max = getMaximumPoint();
for (int x = min.getBlockX(); x <= max.getBlockX(); ++x) { for (int x = min.getBlockX(); x <= max.getBlockX(); ++x) {
for (int y = min.getBlockY(); y <= max.getBlockY(); ++y) { for (int y = min.getBlockY(); y <= max.getBlockY(); ++y) {
for (int z = min.getBlockZ(); z <= max.getBlockZ(); ++z) { for (int z = min.getBlockZ(); z <= max.getBlockZ(); ++z) {
Vector pt = new Vector(x, y, z); if (contains(new BlockVector(x, y, z))) { // Not the best
if (contains(pt)) { // Not the best chunks.add(new BlockVector(x >> ChunkStore.CHUNK_SHIFTS,
chunks.add(ChunkStore.toChunk(pt)); y >> ChunkStore.CHUNK_SHIFTS, z >> ChunkStore.CHUNK_SHIFTS));
} }
} }
} }

15
src/main/java/com/sk89q/worldedit/regions/Region.java
View File

@ -130,17 +130,24 @@ public interface Region extends Iterable<BlockVector> {
* @return * @return
*/ */
public Set<Vector2D> getChunks(); public Set<Vector2D> getChunks();
/**
* Return a list of 16*16*16 chunks in a region
*
* @return The chunk cubes this region overlaps with
*/
public Set<Vector> getChunkCubes();
/** /**
* Get the world the selection is in * Get the world the selection is in
* *
* @return * @return
*/ */
public LocalWorld getWorld(); public LocalWorld getWorld();
/** /**
* Sets the world the selection is in * Sets the world the selection is in
* *
* @return * @return
*/ */
public void setWorld(LocalWorld world); public void setWorld(LocalWorld world);