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

fix: PolygonBucket screen intersection test

Browse Source 
- actually make a box
This commit is contained in:
Hannes Janetzek 2014-09-20 13:57:55 +02:00
parent 85377b42c4
commit e20a342f81
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vtm/src/org/oscim/renderer/bucket/PolygonBucket.java
View File

@ -360,16 +360,16 @@ public final class PolygonBucket extends RenderBucket {
if (area.fadeScale > 0 && area.fadeScale > zoom)
continue;
/* project bbox of polygon to screen */
v.mvp.prj2D(pb.bbox, 0, box, 0, 4);
boolean clipRect = true;
int out = 0;
int out = 0;
for (int i = 0; i < 8; i += 2) {
int o = mScreenClip.outcode(box[i], box[i + 1]);
if (o == 0) {
/* at least one corner is inside */
clipRect = false;
out = 0;
break;
}
out |= o;
@ -378,7 +378,7 @@ public final class PolygonBucket extends RenderBucket {
/* Check if any polygon-bucket edge intersects the screen.
* Also check the very unlikely case where the view might be
* completly contained within box */
if (clipRect && (out != 0xF)) {
if ((out != 0) && (out != 0xF)) {
mScreenClip.clipStart(box[0], box[1]);
if (mScreenClip.clipNext(box[2], box[3]) == 0 &&

11
vtm/src/org/oscim/utils/ArrayUtils.java
View File

@ -148,10 +148,17 @@ public class ArrayUtils {
return true;
}
/**
* Set bbox array to:
* xmin, ymin,
* xmin, ymax,
* xmax, ymax,
* xmax, ymin,
*/
public static void setBox2D(float[] bbox, float xmin, float ymin, float xmax, float ymax) {
bbox[0] = bbox[2] = xmin;
bbox[4] = bbox[6] = xmax;
bbox[1] = bbox[5] = ymin;
bbox[3] = bbox[7] = ymax;
bbox[1] = bbox[7] = ymin;
bbox[3] = bbox[5] = ymax;
}
}