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

use color from Area style in MeshLayer

Browse Source
This commit is contained in:
Hannes Janetzek 2014-01-22 22:52:18 +01:00
parent 36d540da18
commit dc37296750
1 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
vtm/src/org/oscim/renderer/elements/MeshLayer.java
View File

@ -27,6 +27,7 @@ import org.oscim.renderer.GLState;
import org.oscim.renderer.GLUtils;
import org.oscim.renderer.MapRenderer;
import org.oscim.renderer.MapRenderer.Matrices;
import org.oscim.theme.styles.Area;
import org.oscim.utils.Tessellator;
import org.oscim.utils.pool.Inlist;
import org.slf4j.Logger;
@ -39,6 +40,7 @@ public class MeshLayer extends RenderElement {
int numIndices;
VertexItem indiceItems;
public Area area;
public MeshLayer(int level) {
super(RenderElement.MESH);
@ -62,9 +64,8 @@ public class MeshLayer extends RenderElement {
verticesCnt = vertexItems.getSize() / 2;
//log.debug("-> " + verticesCnt + " " + numIndices);
if (numIndices <= 0) {
log.debug("empty " + geom.index);
vertexItems = VertexItem.pool.releaseAll(vertexItems);
indiceItems = VertexItem.pool.releaseAll(indiceItems);
}
@ -77,18 +78,9 @@ public class MeshLayer extends RenderElement {
return;
}
//log.debug("compile");
// add vertices to shared VBO
ElementLayers.addPoolItems(this, sbuf);
int cnt = indiceItems.getSize();
//log.debug("check " + cnt + ":" + numIndices);
if (cnt != numIndices) {
numIndices = cnt;
}
// add indices to indicesVbo
sbuf = MapRenderer.getShortBuffer(numIndices);
@ -127,23 +119,17 @@ public class MeshLayer extends RenderElement {
return true;
}
public static RenderElement draw(MapPosition pos, RenderElement layer,
public static RenderElement draw(MapPosition pos, RenderElement l,
Matrices m) {
GLState.blend(true);
RenderElement l = layer;
GLState.useProgram(shaderProgram);
GLState.enableVertexArrays(hVertexPosition, -1);
//m.viewproj.setAsUniform(hMatrix);
//m.useScreenCoordinates(true, 1f);
m.mvp.setAsUniform(hMatrix);
GLUtils.setColor(hColor, Color.BLUE, 0.4f);
for (; l != null && l.type == RenderElement.MESH; l = l.next) {
MeshLayer ml = (MeshLayer) l;
@ -152,6 +138,11 @@ public class MeshLayer extends RenderElement {
ml.indicesVbo.bind();
if (ml.area == null)
GLUtils.setColor(hColor, Color.BLUE, 0.4f);
else
GLUtils.setColor(hColor, ml.area.color, 1);
GL.glVertexAttribPointer(hVertexPosition, 2, GL20.GL_SHORT,
false, 0, ml.offset);