xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cleanup: QuadTree

Browse Source
This commit is contained in:
Hannes Janetzek 2014-01-21 04:39:52 +01:00
parent f2e1b33db5
commit 1e34a823b3
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
vtm/src/org/oscim/utils/quadtree/QuadTreeIndex.java
View File

@ -27,9 +27,9 @@ public abstract class QuadTreeIndex<T> {
root.parent = root; root.parent = root;
} }
static void checkIndex(int x, int y, int z) { static void checkIndex(int x, int y, int max) {
if (x < 0 || x >= 1 << z || y < 0 || y >= 1 << z) { if (x < 0 || x >= max || y < 0 || y >= max) {
throw new IllegalArgumentException("invalid position " + x + '/' + y + '/' + z); throw new IllegalArgumentException("invalid position " + x + '/' + y + '/' + (max >> 1));
} }
} }
@ -39,7 +39,7 @@ public abstract class QuadTreeIndex<T> {
public QuadTree<T> add(int x, int y, int z) { public QuadTree<T> add(int x, int y, int z) {
checkIndex(x, y, z); checkIndex(x, y, 1 << z);
QuadTree<T> leaf = root; QuadTree<T> leaf = root;
@ -107,7 +107,7 @@ public abstract class QuadTreeIndex<T> {
public T getTile(int x, int y, int z) { public T getTile(int x, int y, int z) {
checkIndex(x, y, z); checkIndex(x, y, 1 << z);
QuadTree<T> leaf = root; QuadTree<T> leaf = root;