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

add safety check...

Browse Source 
jni => for the real segv!
This commit is contained in:
Hannes Janetzek 2013-01-04 11:29:39 +01:00
parent 230f9b2828
commit 6681247215
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -95,9 +95,19 @@ public class ExtrusionLayer extends Layer {
// we dont need to add duplicate end/start point // we dont need to add duplicate end/start point
int len = length; int len = length;
if (!MapView.enableClosePolygons)
len -= 2;
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) {
circle = true;
len -= 2;
}
// need at least three points // need at least three points
if (len < 6) { if (len < 6) {
ppos += length; ppos += length;
@ -111,7 +121,7 @@ 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 (ipos == outer) // only add roof once else if (!circle && ipos == outer) // only add roof once
//addRoof(startVertex, pos, len, points); //addRoof(startVertex, pos, len, points);
addRoof(startVertex, index, ipos, points, ppos); addRoof(startVertex, index, ipos, points, ppos);
@ -173,9 +183,6 @@ public class ExtrusionLayer extends Layer {
// add two vertices for last face to make zigzag indices work // add two vertices for last face to make zigzag indices work
boolean addFace = (len % 4 != 0); boolean addFace = (len % 4 != 0);
// Log.d(TAG, "add: " + addFace + " " + len + " (" + pos + ")");
int vertexCnt = len + (addFace ? 2 : 0); int vertexCnt = len + (addFace ? 2 : 0);
short h = (short) height; short h = (short) height;
@ -199,7 +206,6 @@ public class ExtrusionLayer extends Layer {
short color2 = 0; short color2 = 0;
int even = 0; int even = 0;
int changeX = 0; int changeX = 0;
int changeY = 0; int changeY = 0;
@ -210,13 +216,13 @@ public class ExtrusionLayer extends Layer {
int v = mCurVertices.used; int v = mCurVertices.used;
for (int i = 2, n = vertexCnt + 2; i < n; i += 2, v += 8) { for (int i = 2, n = vertexCnt + 2; i < n; i += 2, v += 8) {
/* add bottom and top vertex for each point */
cx = nx; cx = nx;
cy = ny; cy = ny;
ux = vx; ux = vx;
uy = vy; uy = vy;
/* add bottom and top vertex for each point */
if (v == VertexPoolItem.SIZE) { if (v == VertexPoolItem.SIZE) {
mCurVertices.used = VertexPoolItem.SIZE; mCurVertices.used = VertexPoolItem.SIZE;
mCurVertices.next = VertexPool.get(); mCurVertices.next = VertexPool.get();