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

handle explicitly closed properly:

Browse Source 
- make buildings work with vector-tile-server and old pbmap backend
This commit is contained in:
Hannes Janetzek 2013-01-04 22:41:32 +01:00
parent 35923938db
commit 0c023f9989
1 changed files with 32 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/org/oscim/renderer/layer/ExtrusionLayer.java
View File

@ -78,8 +78,9 @@ public class ExtrusionLayer extends Layer {
else else
height *= 40; height *= 40;
for (int ipos = 0, ppos = 0, n = index.length; ipos < n; ipos++) { int length = 0;
int length = index[ipos]; for (int ipos = 0, ppos = 0, n = index.length; ipos < n; ipos++, ppos += length) {
length = index[ipos];
// end marker // end marker
if (length < 0) if (length < 0)
@ -93,26 +94,24 @@ public class ExtrusionLayer extends Layer {
continue; continue;
} }
// we dont need to add duplicate end/start point // check: do not to add duplicate end/start point
// triangulator can only handle implicity closed polygons
int len = length; int len = length;
boolean closed = false;
boolean circle = false;
// safety check
if (points[ppos] == points[ppos + len - 2]
&& points[ppos + 1] == points[ppos + len - 1]) {
circle = true;
len = -2;
}
if (!MapView.enableClosePolygons) { if (!MapView.enableClosePolygons) {
circle = true; closed = true;
len -= 2;
} else if (points[ppos] == points[ppos + len - 2]
&& points[ppos + 1] == points[ppos + len - 1]) {
// vector-tile-map does not produce implicty closed
// polygons (yet)
closed = true;
len -= 2; len -= 2;
} }
// need at least three points // need at least three points
if (len < 6) { if (len < 6)
ppos += length;
continue; continue;
}
// check if polygon contains inner rings // check if polygon contains inner rings
if (simple && (ipos < n - 1) && (index[ipos + 1] > 0)) if (simple && (ipos < n - 1) && (index[ipos + 1] > 0))
@ -121,11 +120,9 @@ public class ExtrusionLayer extends Layer {
boolean convex = addOutline(points, ppos, len, height, simple); boolean convex = addOutline(points, ppos, len, height, simple);
if (simple && (convex || len <= 8)) if (simple && (convex || len <= 8))
addRoofSimple(startVertex, len); addRoofSimple(startVertex, len);
else if (!circle && ipos == outer) // only add roof once else if (ipos == outer && (!closed || simple)) {// only add roof once
//addRoof(startVertex, pos, len, points); addRoof(startVertex, index, ipos, points, ppos, closed);
addRoof(startVertex, index, ipos, points, ppos); }
ppos += length;
} }
} }
@ -151,7 +148,8 @@ public class ExtrusionLayer extends Layer {
mCurIndices[IND_ROOF].used = i; mCurIndices[IND_ROOF].used = i;
} }
private void addRoof(int startVertex, short[] index, int ipos, float[] points, int ppos) { private void addRoof(int startVertex, short[] index, int ipos, float[] points, int ppos,
boolean closed) {
int len = 0; int len = 0;
int rings = 0; int rings = 0;
@ -160,6 +158,10 @@ public class ExtrusionLayer extends Layer {
len += index[i]; len += index[i];
rings++; rings++;
} }
if (closed) {
rings = 1;
len = index[ipos] - 2;
}
// triangulate up to 200 points (limited only by prepared buffers) // triangulate up to 200 points (limited only by prepared buffers)
if (len > 400) { if (len > 400) {
@ -168,7 +170,7 @@ public class ExtrusionLayer extends Layer {
} }
int used = triangulate(points, ppos, len, index, ipos, rings, int used = triangulate(points, ppos, len, index, ipos, rings,
startVertex + 1, mCurIndices[IND_ROOF]); startVertex + 1, mCurIndices[IND_ROOF], closed);
if (used > 0) { if (used > 0) {
// get back to the last item added.. // get back to the last item added..
@ -414,8 +416,7 @@ public class ExtrusionLayer extends Layer {
private static FloatBuffer fBuf; private static FloatBuffer fBuf;
public static synchronized int triangulate(float[] points, int ppos, int plen, short[] index, public static synchronized int triangulate(float[] points, int ppos, int plen, short[] index,
int ipos, int rings, int ipos, int rings, int vertexOffset, VertexPoolItem item, boolean closed) {
int vertexOffset, VertexPoolItem item) {
if (!initialized) { if (!initialized) {
// FIXME also cleanup on shutdown! // FIXME also cleanup on shutdown!
@ -432,9 +433,13 @@ public class ExtrusionLayer extends Layer {
fBuf.put(points, ppos, plen); fBuf.put(points, ppos, plen);
sBuf.clear(); sBuf.clear();
sBuf.put((short) plen); // all points
sBuf.put(index, ipos, rings);
sBuf.put((short) plen); // all points
if (closed) {
sBuf.put((short) plen);
} else {
sBuf.put(index, ipos, rings);
}
int numTris = TriangleJNI.triangulate(fBuf, rings, sBuf, vertexOffset); int numTris = TriangleJNI.triangulate(fBuf, rings, sBuf, vertexOffset);
int numIndices = numTris * 3; int numIndices = numTris * 3;