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

testing tile overlay

Browse Source
This commit is contained in:
Hannes Janetzek
2013-04-02 16:29:00 +02:00
parent 67e79d98b2
commit a87a1b761c
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/org/oscim/renderer/PolygonRenderer.java
View File

@@ -294,7 +294,7 @@ public final class PolygonRenderer {
} }
} }
static void drawOver(Matrices m) { public static void drawOver(Matrices m) {
if (GLState.useProgram(polygonProgram)) { if (GLState.useProgram(polygonProgram)) {
GLState.enableVertexArrays(hPolygonVertexPosition, -1); GLState.enableVertexArrays(hPolygonVertexPosition, -1);

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

@@ -106,7 +106,14 @@ public class CustomOverlay extends RenderOverlay {
/* apply view and projection matrices */ /* apply view and projection matrices */
// set mvp (tmp) matrix relative to mMapPosition // set mvp (tmp) matrix relative to mMapPosition
// i.e. fixed on the map // i.e. fixed on the map
setMatrix(pos, m);
float ratio = 1f / mMapView.getWidth();
m.mvp.setScale(ratio, ratio, 1);
m.mvp.multiplyMM(m.proj, m.mvp);
// setMatrix(pos, m);
m.mvp.setAsUniform(hMatrixPosition); m.mvp.setAsUniform(hMatrixPosition);
// Draw the triangle // Draw the triangle

8
src/org/oscim/view/MapView.java
View File

@@ -38,12 +38,15 @@ import org.oscim.generator.JobTile;
import org.oscim.generator.MapWorker; import org.oscim.generator.MapWorker;
import org.oscim.generator.TileGenerator; import org.oscim.generator.TileGenerator;
import org.oscim.overlay.BuildingOverlay; import org.oscim.overlay.BuildingOverlay;
import org.oscim.overlay.GenericOverlay;
import org.oscim.overlay.LabelingOverlay; import org.oscim.overlay.LabelingOverlay;
import org.oscim.overlay.Overlay; import org.oscim.overlay.Overlay;
import org.oscim.overlay.OverlayManager; import org.oscim.overlay.OverlayManager;
import org.oscim.renderer.GLRenderer; import org.oscim.renderer.GLRenderer;
import org.oscim.renderer.GLView; import org.oscim.renderer.GLView;
import org.oscim.renderer.TileManager; import org.oscim.renderer.TileManager;
import org.oscim.renderer.overlays.CustomOverlay;
import org.oscim.renderer.overlays.TileOverlay;
import org.oscim.theme.ExternalRenderTheme; import org.oscim.theme.ExternalRenderTheme;
import org.oscim.theme.InternalRenderTheme; import org.oscim.theme.InternalRenderTheme;
import org.oscim.theme.RenderTheme; import org.oscim.theme.RenderTheme;
@@ -193,8 +196,9 @@ public class MapView extends RelativeLayout {
mOverlayManager.add(new BuildingOverlay(this)); mOverlayManager.add(new BuildingOverlay(this));
mOverlayManager.add(new LabelingOverlay(this)); mOverlayManager.add(new LabelingOverlay(this));
//mOverlayManager.add(new GenericOverlay(this, new TestLineOverlay(this))); mOverlayManager.add(new GenericOverlay(this, new TileOverlay(this)));
//mOverlayManager.add(new GenericOverlay(this, new TestOverlay(this)));
mOverlayManager.add(new GenericOverlay(this, new CustomOverlay(this)));
// if (testRegionZoom) // if (testRegionZoom)
// mRegionLookup = new RegionLookup(this); // mRegionLookup = new RegionLookup(this);