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

reenable grid labels

Browse Source
This commit is contained in:
Hannes Janetzek 2013-06-28 04:20:46 +02:00
parent 50cb603bbf
commit 092e5b7780
1 changed files with 41 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
vtm/src/org/oscim/renderer/layers/GridRenderLayer.java
View File

@ -21,13 +21,16 @@ import org.oscim.core.MapPosition;
import org.oscim.core.Tile; import org.oscim.core.Tile;
import org.oscim.renderer.GLRenderer.Matrices; import org.oscim.renderer.GLRenderer.Matrices;
import org.oscim.renderer.sublayers.LineLayer; import org.oscim.renderer.sublayers.LineLayer;
import org.oscim.renderer.sublayers.TextItem;
import org.oscim.renderer.sublayers.TextLayer;
import org.oscim.theme.renderinstruction.Line; import org.oscim.theme.renderinstruction.Line;
import org.oscim.theme.renderinstruction.Text;
import org.oscim.view.MapView; import org.oscim.view.MapView;
public class GridRenderLayer extends BasicRenderLayer { public class GridRenderLayer extends BasicRenderLayer {
private final static String TILE_FORMAT = "%d/%d/%d"; // private final static String TILE_FORMAT = "%d/%d/%d";
// private final TextLayer mTextLayer; private final TextLayer mTextLayer;
// private final Text mText; private final Text mText;
private final LineLayer mLineLayer; private final LineLayer mLineLayer;
@ -62,44 +65,43 @@ public class GridRenderLayer extends BasicRenderLayer {
mLines.addPoint(pos + size * 8, y); mLines.addPoint(pos + size * 8, y);
} }
// mText = Text.createText(22, 0, Color.RED, 0, false); mText = Text.createText(22, 0, Color.RED, 0, false);
// mTextLayer = layers.addTextLayer(new TextLayer()); mTextLayer = layers.addTextLayer(new TextLayer());
mLineLayer = layers.addLineLayer(0, mLineLayer = layers.addLineLayer(0, new Line(0x66000066, 1.5f, Cap.BUTT));
new Line(Color.BLUE, 1.5f, Cap.BUTT));
} }
// private void addLabels(int x, int y, int z) { private void addLabels(int x, int y, int z) {
// int s = Tile.SIZE; int s = Tile.SIZE;
//
// TextLayer tl = mTextLayer; TextLayer tl = mTextLayer;
// tl.clear(); tl.clear();
//
// for (int yy = -2; yy < 2; yy++) { for (int yy = -2; yy < 2; yy++) {
// for (int xx = -2; xx < 2; xx++) { for (int xx = -2; xx < 2; xx++) {
//
// // String label = String.format( // String label = String.format(
// // Locale.ROOT, TILE_FORMAT, // Locale.ROOT, TILE_FORMAT,
// // Integer.valueOf(x + xx), // Integer.valueOf(x + xx),
// // Integer.valueOf(y + yy), // Integer.valueOf(y + yy),
// // Integer.valueOf(z)); // Integer.valueOf(z));
// String label = Integer.valueOf(x + xx) + "/" + String label = Integer.valueOf(x + xx) + "/" +
// Integer.valueOf(y + yy) + "/" + Integer.valueOf(y + yy) + "/" +
// Integer.valueOf(z); Integer.valueOf(z);
//
// TextItem ti = TextItem.pool.get(); TextItem ti = TextItem.pool.get();
// ti.set(s * xx + s / 2, s * yy + s / 2, label, mText); ti.set(s * xx + s / 2, s * yy + s / 2, label, mText);
//
// tl.addText(ti); tl.addText(ti);
// } }
// } }
//
// // render TextItems to a bitmap and prepare vertex buffer data. // render TextItems to a bitmap and prepare vertex buffer data.
// tl.prepare(); tl.prepare();
//
// // release TextItems // release TextItems
// tl.clearLabels(); tl.clearLabels();
// } }
@Override @Override
public void update(MapPosition pos, boolean changed, Matrices m) { public void update(MapPosition pos, boolean changed, Matrices m) {
@ -124,7 +126,7 @@ public class GridRenderLayer extends BasicRenderLayer {
layerPos.y = (double) y / z; layerPos.y = (double) y / z;
layerPos.scale = z; layerPos.scale = z;
// addLabels(x, y, pos.zoomLevel); addLabels(x, y, pos.zoomLevel);
mLineLayer.clear(); mLineLayer.clear();
mLineLayer.addLine(mLines); mLineLayer.addLine(mLines);