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

cleanup: ExtrusionLayer

Browse Source
This commit is contained in:
Hannes Janetzek 2014-03-22 03:54:35 +01:00
parent e900b4243d
commit a377e96128
2 changed files with 30 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
vtm/src/org/oscim/renderer/ExtrusionRenderer.java
View File

@ -100,9 +100,6 @@ public class ExtrusionRenderer extends LayerRenderer {
if (!initialized && !initShader()) if (!initialized && !initShader())
return; return;
// if (shaderProgram[0] == 0)
// return;
if (mAlpha == 0 || v.pos.zoomLevel < mTileZoom) { if (mAlpha == 0 || v.pos.zoomLevel < mTileZoom) {
setReady(false); setReady(false);
return; return;
@ -118,7 +115,7 @@ public class ExtrusionRenderer extends LayerRenderer {
return; return;
} }
// keep a list of tiles available for rendering /* keep a list of tiles available for rendering */
if (mTiles == null || mTiles.length < mTileSet.cnt * 4) if (mTiles == null || mTiles.length < mTileSet.cnt * 4)
mTiles = new MapTile[mTileSet.cnt * 4]; mTiles = new MapTile[mTileSet.cnt * 4];
@ -149,7 +146,7 @@ public class ExtrusionRenderer extends LayerRenderer {
mTiles[activeTiles++] = t; mTiles[activeTiles++] = t;
} }
} else if (zoom == mTileZoom - 1) { } else if (zoom == mTileZoom - 1) {
// check if proxy children are ready /* check if proxy children are ready */
for (int i = 0; i < mTileSet.cnt; i++) { for (int i = 0; i < mTileSet.cnt; i++) {
MapTile t = tiles[i]; MapTile t = tiles[i];
for (byte j = 0; j < 4; j++) { for (byte j = 0; j < 4; j++) {
@ -313,7 +310,7 @@ public class ExtrusionRenderer extends LayerRenderer {
GL.glUniform1i(s.uMode, -1); GL.glUniform1i(s.uMode, -1);
//GLUtils.glUniform4fv(uExtColor, 4, mColor); //GLUtils.glUniform4fv(uExtColor, 4, mColor);
// draw to depth buffer /* draw to depth buffer */
for (int i = 0; i < mTileCnt; i++) { for (int i = 0; i < mTileCnt; i++) {
MapTile t = tiles[i]; MapTile t = tiles[i];
ExtrusionLayer el = t.getLayers().getExtrusionLayers(); ExtrusionLayer el = t.getLayers().getExtrusionLayers();

62
vtm/src/org/oscim/renderer/elements/ExtrusionLayer.java
View File

@ -51,7 +51,6 @@ public class ExtrusionLayer extends RenderElement {
/** indices for: 0. even sides, 1. odd sides, 2. roof, 3. roof outline */ /** indices for: 0. even sides, 1. odd sides, 2. roof, 3. roof outline */
public int numIndices[] = { 0, 0, 0, 0, 0 }; public int numIndices[] = { 0, 0, 0, 0, 0 };
//public int sumIndices = 0;
public int sumVertices = 0; public int sumVertices = 0;
public int sumIndices = 0; public int sumIndices = 0;
@ -66,17 +65,14 @@ public class ExtrusionLayer extends RenderElement {
private final static int IND_OUTLINE = 3; private final static int IND_OUTLINE = 3;
private final static int IND_MESH = 4; private final static int IND_MESH = 4;
//private static final int NORMAL_DIR_MASK = 0xFFFFFFFE;
public boolean compiled = false; public boolean compiled = false;
private final float mGroundResolution; private final float mGroundResolution;
//private HashMap<Vertex, Vertex> mVertexMap = new HashMap<Vertex, Vertex>();
private KeyMap<Vertex> mVertexMap = new KeyMap<Vertex>(); private KeyMap<Vertex> mVertexMap = new KeyMap<Vertex>();
//private Vertex mTmpVertex = new Vertex();
public int indexOffset; public int indexOffset;
//private static final int NORMAL_DIR_MASK = 0xFFFFFFFE;
//private int numIndexHits = 0; //private int numIndexHits = 0;
/** /**
@ -169,7 +165,7 @@ public class ExtrusionLayer extends RenderElement {
if (index[k] < 0) if (index[k] < 0)
break; break;
// FIXME: workaround: dont overflow max index id. /* FIXME: workaround: dont overflow max index id. */
if (vertexCnt >= 1 << 16) if (vertexCnt >= 1 << 16)
break; break;
@ -309,18 +305,15 @@ public class ExtrusionLayer extends RenderElement {
// //
public void addNoNormal(MapElement element) { public void addNoNormal(MapElement element) {
if (element.type != GeometryType.TRIS) if (element.type != GeometryType.TRIS)
return; //FIXME throw return;
short[] index = element.index; short[] index = element.index;
float[] points = element.points; float[] points = element.points;
//log.debug("add " + Arrays.toString(index)); /* current vertex id */
//log.debug("add " + Arrays.toString(points));
// current vertex id
int startVertex = sumVertices; int startVertex = sumVertices;
// roof indices for convex shapes /* roof indices for convex shapes */
int i = mCurIndices[IND_MESH].used; int i = mCurIndices[IND_MESH].used;
short[] indices = mCurIndices[IND_MESH].vertices; short[] indices = mCurIndices[IND_MESH].vertices;
int first = startVertex; int first = startVertex;
@ -356,7 +349,7 @@ public class ExtrusionLayer extends RenderElement {
vertices = mCurVertices.vertices; vertices = mCurVertices.vertices;
v = 0; v = 0;
} }
// set coordinate /* set coordinate */
vertices[v++] = (short) (points[j++] * S); vertices[v++] = (short) (points[j++] * S);
vertices[v++] = (short) (points[j++] * S); vertices[v++] = (short) (points[j++] * S);
vertices[v++] = (short) (points[j++] * S); vertices[v++] = (short) (points[j++] * S);
@ -372,31 +365,30 @@ public class ExtrusionLayer extends RenderElement {
short[] index = element.index; short[] index = element.index;
float[] points = element.points; float[] points = element.points;
// 10 cm steps /* 10 cm steps */
float sfactor = 1 / 10f; float sfactor = 1 / 10f;
height *= sfactor; height *= sfactor;
minHeight *= sfactor; minHeight *= sfactor;
// match height with ground resultion /* match height with ground resultion (meter per pixel) */
// (meter per pixel)
height /= mGroundResolution; height /= mGroundResolution;
minHeight /= mGroundResolution; minHeight /= mGroundResolution;
boolean complexOutline = false; boolean complexOutline = false;
boolean simpleOutline = true; boolean simpleOutline = true;
// current vertex id /* current vertex id */
int startVertex = sumVertices; int startVertex = sumVertices;
int length = 0, ipos = 0, ppos = 0; int length = 0, ipos = 0, ppos = 0;
for (int n = index.length; ipos < n; ipos++, ppos += length) { for (int n = index.length; ipos < n; ipos++, ppos += length) {
length = index[ipos]; length = index[ipos];
// end marker /* end marker */
if (length < 0) if (length < 0)
break; break;
// start next polygon /* start next polygon */
if (length == 0) { if (length == 0) {
startVertex = sumVertices; startVertex = sumVertices;
simpleOutline = true; simpleOutline = true;
@ -404,7 +396,7 @@ public class ExtrusionLayer extends RenderElement {
continue; continue;
} }
// check: drop last point from explicitly closed rings /* check: drop last point from explicitly closed rings */
int len = length; int len = length;
if (points[ppos] == points[ppos + len - 2] if (points[ppos] == points[ppos + len - 2]
&& points[ppos + 1] == points[ppos + len - 1]) { && points[ppos + 1] == points[ppos + len - 1]) {
@ -412,11 +404,11 @@ public class ExtrusionLayer extends RenderElement {
log.debug("explicit closed poly " + len); log.debug("explicit closed poly " + len);
} }
// need at least three points /* need at least three points */
if (len < 6) if (len < 6)
continue; continue;
// check if polygon contains inner rings /* check if polygon contains inner rings */
if (simpleOutline && (ipos < n - 1) && (index[ipos + 1] > 0)) if (simpleOutline && (ipos < n - 1) && (index[ipos + 1] > 0))
simpleOutline = false; simpleOutline = false;
@ -433,7 +425,7 @@ public class ExtrusionLayer extends RenderElement {
} }
private void addRoofSimple(int startVertex, int len) { private void addRoofSimple(int startVertex, int len) {
// roof indices for convex shapes /* roof indices for convex shapes */
int i = mCurIndices[IND_ROOF].used; int i = mCurIndices[IND_ROOF].used;
short[] indices = mCurIndices[IND_ROOF].vertices; short[] indices = mCurIndices[IND_ROOF].vertices;
short first = (short) (startVertex + 1); short first = (short) (startVertex + 1);
@ -462,7 +454,7 @@ public class ExtrusionLayer extends RenderElement {
int len = 0; int len = 0;
int rings = 0; int rings = 0;
// get sum of points in polygon /* get sum of points in polygon */
for (int i = ipos, n = index.length; i < n && index[i] > 0; i++) { for (int i = ipos, n = index.length; i < n && index[i] > 0; i++) {
len += index[i]; len += index[i];
rings++; rings++;
@ -477,7 +469,7 @@ public class ExtrusionLayer extends RenderElement {
private boolean addOutline(float[] points, int pos, int len, float minHeight, private boolean addOutline(float[] points, int pos, int len, float minHeight,
float height, boolean convex) { float height, boolean convex) {
// 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);
int vertexCnt = len + (addFace ? 2 : 0); int vertexCnt = len + (addFace ? 2 : 0);
@ -489,10 +481,10 @@ public class ExtrusionLayer extends RenderElement {
float nx = points[pos + 0]; float nx = points[pos + 0];
float ny = points[pos + 1]; float ny = points[pos + 1];
// vector to next point /* vector to next point */
float vx = nx - cx; float vx = nx - cx;
float vy = ny - cy; float vy = ny - cy;
// vector from previous point /* vector from previous point */
float ux, uy; float ux, uy;
float a = (float) Math.sqrt(vx * vx + vy * vy); float a = (float) Math.sqrt(vx * vx + vy * vy);
@ -505,7 +497,7 @@ public class ExtrusionLayer extends RenderElement {
int changeY = 0; int changeY = 0;
int angleSign = 0; int angleSign = 0;
// vertex offset for all vertices in layer /* vertex offset for all vertices in layer */
int vOffset = sumVertices; int vOffset = sumVertices;
short[] vertices = mCurVertices.vertices; short[] vertices = mCurVertices.vertices;
@ -529,15 +521,15 @@ public class ExtrusionLayer extends RenderElement {
v = 0; v = 0;
} }
// set coordinate /* set coordinate */
vertices[v + 0] = vertices[v + 4] = (short) (cx * S); vertices[v + 0] = vertices[v + 4] = (short) (cx * S);
vertices[v + 1] = vertices[v + 5] = (short) (cy * S); vertices[v + 1] = vertices[v + 5] = (short) (cy * S);
// set height /* set height */
vertices[v + 2] = mh; vertices[v + 2] = mh;
vertices[v + 6] = h; vertices[v + 6] = h;
// get direction to next point /* get direction to next point */
if (i < len) { if (i < len) {
nx = points[pos + i + 0]; nx = points[pos + i + 0];
ny = points[pos + i + 1]; ny = points[pos + i + 1];
@ -554,7 +546,7 @@ public class ExtrusionLayer extends RenderElement {
vx = nx - cx; vx = nx - cx;
vy = ny - cy; vy = ny - cy;
// set lighting (by direction) /* set lighting (by direction) */
a = (float) Math.sqrt(vx * vx + vy * vy); a = (float) Math.sqrt(vx * vx + vy * vy);
color2 = (short) ((1 + vx / a) * 127); color2 = (short) ((1 + vx / a) * 127);
@ -569,8 +561,8 @@ public class ExtrusionLayer extends RenderElement {
/* check if polygon is convex */ /* check if polygon is convex */
if (convex) { if (convex) {
// TODO simple polys with only one concave arc /* TODO simple polys with only one concave arc
// could be handled without special triangulation * could be handled without special triangulation */
if ((ux < 0 ? 1 : -1) != (vx < 0 ? 1 : -1)) if ((ux < 0 ? 1 : -1) != (vx < 0 ? 1 : -1))
changeX++; changeX++;
if ((uy < 0 ? 1 : -1) != (vy < 0 ? 1 : -1)) if ((uy < 0 ? 1 : -1) != (vy < 0 ? 1 : -1))
@ -605,7 +597,7 @@ public class ExtrusionLayer extends RenderElement {
short s2 = vert++; short s2 = vert++;
short s3 = vert++; short s3 = vert++;
// connect last to first (when number of faces is even) /* connect last to first (when number of faces is even) */
if (!addFace && i == len) { if (!addFace && i == len) {
s2 -= len; s2 -= len;
s3 -= len; s3 -= len;