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

Moved EllipsoidRegion's iterator into a separate class called RegionIterator.

Browse Source
This commit is contained in:
TomyLobo 2012-01-03 14:08:31 +01:00
parent eafde8cc49
commit 082a1995db
2 changed files with 76 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -217,55 +217,7 @@ public class EllipsoidRegion implements Region {
* @return iterator of points inside the region * @return iterator of points inside the region
*/ */
public Iterator<BlockVector> iterator() { public Iterator<BlockVector> iterator() {
return new Iterator<BlockVector>() { return new RegionIterator(this);
private Vector min = getMinimumPoint();
private Vector max = getMaximumPoint();
private int nextX = min.getBlockX();
private int nextY = min.getBlockY();
private int nextZ = min.getBlockZ();
{
forward();
}
public boolean hasNext() {
return (nextX != Integer.MIN_VALUE);
}
private void forward() {
while (hasNext() && !contains(new BlockVector(nextX, nextY, nextZ))) {
forwardOne();
}
}
public BlockVector next() {
if (!hasNext()) throw new java.util.NoSuchElementException();
BlockVector answer = new BlockVector(nextX, nextY, nextZ);
forwardOne();
forward();
return answer;
}
private void forwardOne() {
if (++nextX <= max.getBlockX()) {
return;
}
nextX = min.getBlockX();
if (++nextY <= max.getBlockY()) {
return;
}
nextY = min.getBlockY();
if (++nextZ <= max.getBlockZ()) {
return;
}
nextX = Integer.MIN_VALUE;
}
public void remove() {
throw new UnsupportedOperationException();
}
};
} }
/** /**

75
src/main/java/com/sk89q/worldedit/regions/RegionIterator.java Normal file
View File

@ -0,0 +1,75 @@
package com.sk89q.worldedit.regions;
import java.util.Iterator;
import com.sk89q.worldedit.BlockVector;
import com.sk89q.worldedit.Vector;
public class RegionIterator implements Iterator<BlockVector> {
private final Region region;
private final int maxX;
private final int maxY;
private final int maxZ;
private final Vector min;
private int nextX;
private int nextY;
private int nextZ;
public RegionIterator(Region region) {
this.region = region;
Vector max = region.getMaximumPoint();
this.maxX = max.getBlockX();
this.maxY = max.getBlockY();
this.maxZ = max.getBlockZ();
this.min = region.getMinimumPoint();
this.nextX = min.getBlockX();
this.nextY = min.getBlockY();
this.nextZ = min.getBlockZ();
forward();
}
public boolean hasNext() {
return nextX != Integer.MIN_VALUE;
}
private void forward() {
while (hasNext() && !region.contains(new BlockVector(nextX, nextY, nextZ))) {
forwardOne();
}
}
public BlockVector next() {
if (!hasNext()) throw new java.util.NoSuchElementException();
BlockVector answer = new BlockVector(nextX, nextY, nextZ);
forwardOne();
forward();
return answer;
}
private void forwardOne() {
if (++nextX <= maxX) {
return;
}
nextX = min.getBlockX();
if (++nextY <= maxY) {
return;
}
nextY = min.getBlockY();
if (++nextZ <= maxZ) {
return;
}
nextX = Integer.MIN_VALUE;
}
public void remove() {
throw new UnsupportedOperationException();
}
}