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

fix TextGridLayer

Browse Source
This commit is contained in:
Hannes Janetzek 2013-04-28 04:19:07 +02:00
parent b15fe5fd88
commit 57ec6ea067
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/org/oscim/renderer/layer/TextLayer.java
View File

@ -265,11 +265,17 @@ public final class TextLayer extends TextureLayer {
@Override @Override
protected void clear() { protected void clear() {
TextureItem.releaseAll(textures); TextureItem.releaseAll(textures);
labels = null;
TextItem.pool.releaseAll(labels); TextItem.pool.releaseAll(labels);
VertexItem.pool.releaseAll(vertexItems); VertexItem.pool.releaseAll(vertexItems);
textures = null; textures = null;
labels = null;
vertexItems = null; vertexItems = null;
verticesCnt = 0; verticesCnt = 0;
} }
public void clearLabels() {
TextItem.pool.releaseAll(labels);
labels = null;
}
} }

9
src/org/oscim/renderer/overlays/GridOverlay.java
View File

@ -76,7 +76,8 @@ public class GridOverlay extends BasicOverlay {
for (int i = -2; i < 2; i++) { for (int i = -2; i < 2; i++) {
for (int j = -2; j < 2; j++) { for (int j = -2; j < 2; j++) {
TextItem ti = TextItem.pool.get().set(size * j + size / 2, size * i + size / 2, TextItem ti = TextItem.pool.get();
ti.set(size * j + size / 2, size * i + size / 2,
(x + j) + " / " + (y + i) + " / " + z, mText); (x + j) + " / " + (y + i) + " / " + z, mText);
// TextItem ti = new TextItem(size * j + size / 2, size * i + // TextItem ti = new TextItem(size * j + size / 2, size * i +
@ -93,8 +94,7 @@ public class GridOverlay extends BasicOverlay {
} }
tl.prepare(); tl.prepare();
tl.clearLabels();
TextItem.pool.releaseAll(tl.labels);
layers.textureLayers = tl; layers.textureLayers = tl;
} }
@ -108,7 +108,6 @@ public class GridOverlay extends BasicOverlay {
boolean tilesChanged, Matrices matrices) { boolean tilesChanged, Matrices matrices) {
int z = 1 << curPos.zoomLevel; int z = 1 << curPos.zoomLevel;
int x = (int) (curPos.x * z); int x = (int) (curPos.x * z);
int y = (int) (curPos.y * z); int y = (int) (curPos.y * z);
@ -133,7 +132,7 @@ public class GridOverlay extends BasicOverlay {
ll.width = 1.5f; ll.width = 1.5f;
ll.addLine(mPoints, mIndex, false); ll.addLine(mPoints, mIndex, false);
addLabels(x, y, mCurZ); addLabels(x, y, curPos.zoomLevel);
newData = true; newData = true;
} }
} }