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

fix: SymbolLayer first item from prevTextures could not have been removed

Browse Source
This commit is contained in:
Hannes Janetzek 2013-09-28 21:45:33 +02:00
parent 9653c02b46
commit c1bb637fbf
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
vtm/src/org/oscim/renderer/elements/SymbolLayer.java
View File

@ -26,7 +26,9 @@ public final class SymbolLayer extends TextureLayer {
private final static float SCALE = 8.0f; private final static float SCALE = 8.0f;
private final static int VERTICES_PER_SPRITE = 4; private final static int VERTICES_PER_SPRITE = 4;
private final static int LBIT_MASK = 0xfffffffe;
private TextureItem prevTextures;
private SymbolItem symbols; private SymbolItem symbols;
public SymbolLayer() { public SymbolLayer() {
@ -53,8 +55,6 @@ public final class SymbolLayer extends TextureLayer {
symbols = item; symbols = item;
} }
private final static int LBIT_MASK = 0xfffffffe;
@Override @Override
protected void compile(ShortBuffer sbuf) { protected void compile(ShortBuffer sbuf) {
// offset of layer data in vbo // offset of layer data in vbo
@ -67,8 +67,7 @@ public final class SymbolLayer extends TextureLayer {
int pos = 0; int pos = 0;
short buf[] = si.vertices; short buf[] = si.vertices;
TextureItem prevTextures = textures; prevTextures = textures;
textures = null; textures = null;
TextureItem to = null; TextureItem to = null;
@ -98,12 +97,9 @@ public final class SymbolLayer extends TextureLayer {
} else if (it.bitmap != null) { } else if (it.bitmap != null) {
width = it.bitmap.getWidth(); width = it.bitmap.getWidth();
height = it.bitmap.getHeight(); height = it.bitmap.getHeight();
to = getTexture(prevTextures, it.bitmap); to = getTexture(it.bitmap);
if (to == null) { if (to == null) {
to = new TextureItem(it.bitmap); to = new TextureItem(it.bitmap);
// to.bitmap = it.bitmap;
// to.width = it.bitmap.getWidth();
// to.height = it.bitmap.getHeight();
textures = Inlist.appendItem(textures, to); textures = Inlist.appendItem(textures, to);
to.upload(); to.upload();
@ -184,7 +180,7 @@ public final class SymbolLayer extends TextureLayer {
prevTextures = null; prevTextures = null;
} }
private TextureItem getTexture(TextureItem prevTextures, Bitmap bitmap) { private TextureItem getTexture(Bitmap bitmap) {
TextureItem to; TextureItem to;
for (to = prevTextures; to != null; to = to.next) { for (to = prevTextures; to != null; to = to.next) {