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

let MeshLayer extend IndexedRenderElement

Browse Source
This commit is contained in:
Hannes Janetzek 2014-06-23 15:02:21 +02:00
parent 8c13a82df7
commit 033a0d9c9d
1 changed files with 17 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,32 +16,30 @@
*/ */
package org.oscim.renderer.elements; package org.oscim.renderer.elements;
import java.nio.ShortBuffer; import static org.oscim.backend.GL20.GL_ELEMENT_ARRAY_BUFFER;
import static org.oscim.backend.GL20.GL_LINES;
import static org.oscim.backend.GL20.GL_SHORT;
import static org.oscim.backend.GL20.GL_TRIANGLES;
import static org.oscim.backend.GL20.GL_UNSIGNED_SHORT;
import static org.oscim.renderer.MapRenderer.COORD_SCALE;
import org.oscim.backend.GL20;
import org.oscim.backend.canvas.Color; import org.oscim.backend.canvas.Color;
import org.oscim.core.GeometryBuffer; import org.oscim.core.GeometryBuffer;
import org.oscim.core.MercatorProjection; import org.oscim.core.MercatorProjection;
import org.oscim.renderer.BufferObject;
import org.oscim.renderer.GLShader; import org.oscim.renderer.GLShader;
import org.oscim.renderer.GLState; import org.oscim.renderer.GLState;
import org.oscim.renderer.GLUtils; import org.oscim.renderer.GLUtils;
import org.oscim.renderer.GLViewport; import org.oscim.renderer.GLViewport;
import org.oscim.renderer.MapRenderer;
import org.oscim.theme.styles.AreaStyle; import org.oscim.theme.styles.AreaStyle;
import org.oscim.utils.ColorUtil; import org.oscim.utils.ColorUtil;
import org.oscim.utils.Tessellator; import org.oscim.utils.Tessellator;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
public class MeshLayer extends RenderElement { public class MeshLayer extends IndexedRenderElement {
static final Logger log = LoggerFactory.getLogger(MeshLayer.class); static final Logger log = LoggerFactory.getLogger(MeshLayer.class);
static final boolean dbgRender = false; static final boolean dbgRender = false;
BufferObject indicesVbo;
int numIndices;
VertexData indiceItems = new VertexData();
public AreaStyle area; public AreaStyle area;
public float heightOffset; public float heightOffset;
@ -54,7 +52,7 @@ public class MeshLayer extends RenderElement {
if (geom.index[0] < 6) if (geom.index[0] < 6)
return; return;
numIndices += Tessellator.tessellate(geom, MapRenderer.COORD_SCALE, numIndices += Tessellator.tessellate(geom, COORD_SCALE,
vertexItems, vertexItems,
indiceItems, indiceItems,
numVertices); numVertices);
@ -65,35 +63,6 @@ public class MeshLayer extends RenderElement {
log.debug("empty " + geom.index); log.debug("empty " + geom.index);
} }
@Override
protected void compile(ShortBuffer sbuf) {
if (numIndices <= 0) {
indicesVbo = BufferObject.release(indicesVbo);
return;
}
/* add vertices to shared VBO */
ElementLayers.compileVertexItems(this, sbuf);
/* add indices to indicesVbo */
sbuf = MapRenderer.getShortBuffer(numIndices);
indiceItems.compile(sbuf);
if (indicesVbo == null)
indicesVbo = BufferObject.get(GL20.GL_ELEMENT_ARRAY_BUFFER, 0);
indicesVbo.loadBufferData(sbuf.flip(), sbuf.limit() * 2);
}
@Override
protected void clear() {
indicesVbo = BufferObject.release(indicesVbo);
vertexItems.dispose();
indiceItems.dispose();
numIndices = 0;
numVertices = 0;
}
public static class Renderer { public static class Renderer {
static Shader shader; static Shader shader;
@ -128,7 +97,7 @@ public class MeshLayer extends RenderElement {
float heightOffset = 0; float heightOffset = 0;
GL.glUniform1f(s.uHeight, heightOffset); GL.glUniform1f(s.uHeight, heightOffset);
for (; l != null && l.type == RenderElement.MESH; l = l.next) { for (; l != null && l.type == MESH; l = l.next) {
MeshLayer ml = (MeshLayer) l; MeshLayer ml = (MeshLayer) l;
if (ml.indicesVbo == null) if (ml.indicesVbo == null)
@ -148,20 +117,21 @@ public class MeshLayer extends RenderElement {
else else
GLUtils.setColor(s.uColor, ml.area.color, 1); GLUtils.setColor(s.uColor, ml.area.color, 1);
GL.glVertexAttribPointer(s.aPos, 2, GL20.GL_SHORT, GL.glVertexAttribPointer(s.aPos, 2, GL_SHORT,
false, 0, ml.offset); false, 0, ml.offset);
GL.glDrawElements(GL20.GL_TRIANGLES, ml.numIndices, GL.glDrawElements(GL_TRIANGLES, ml.numIndices,
GL20.GL_UNSIGNED_SHORT, 0); GL_UNSIGNED_SHORT, 0);
if (dbgRender) { if (dbgRender) {
GLUtils.setColor(s.uColor, ColorUtil.shiftHue(ml.area.color, 0.5), 0.8f); int c = ColorUtil.shiftHue(ml.area.color, 0.5);
GL.glDrawElements(GL20.GL_LINES, ml.numIndices, GLUtils.setColor(s.uColor, c, 0.8f);
GL20.GL_UNSIGNED_SHORT, 0); GL.glDrawElements(GL_LINES, ml.numIndices,
GL_UNSIGNED_SHORT, 0);
} }
} }
GL.glBindBuffer(GL20.GL_ELEMENT_ARRAY_BUFFER, 0); GL.glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
return l; return l;
} }