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

quadtree: add getParent(), abort on invalid index

Browse Source
This commit is contained in:
Hannes Janetzek 2013-11-26 13:29:42 +01:00
parent 153c9b3ec5
commit 7533b98780
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vtm/src/org/oscim/utils/quadtree/QuadTree.java
View File

@ -29,6 +29,10 @@ public class QuadTree<T> {
// number of children and grandchildren // number of children and grandchildren
int refs = 0; int refs = 0;
public T getParent() {
return parent.item;
}
public T get(int i) { public T get(int i) {
switch (i) { switch (i) {
case 0: case 0:

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

@ -25,16 +25,10 @@ public abstract class QuadTreeIndex<T> {
root.parent = root; root.parent = root;
} }
static boolean checkIndex(int x, int y, int z) { static void checkIndex(int x, int y, int z) {
if (x < 0 || x >= 1 << z) { if (x < 0 || x >= 1 << z || y < 0 || y >= 1 << z) {
//Log.d(TAG, "invalid position"); throw new IllegalArgumentException("invalid position " + x + '/' + y + '/' + z);
return false;
} }
if (y < 0 || y >= 1 << z) {
//Log.d(TAG, "invalid position");
return false;
}
return true;
} }
public abstract T create(int x, int y, int z); public abstract T create(int x, int y, int z);
@ -43,8 +37,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) {
if (!checkIndex(x, y, z)) checkIndex(x, y, z);
return null;
QuadTree<T> leaf = root; QuadTree<T> leaf = root;
@ -112,8 +105,7 @@ public abstract class QuadTreeIndex<T> {
public T getTile(int x, int y, int z) { public T getTile(int x, int y, int z) {
if (!checkIndex(x, y, z)) checkIndex(x, y, z);
return null;
QuadTree<T> leaf = root; QuadTree<T> leaf = root;