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

remove GlAdapter.VBO_TEXTURE_LAYERS hack

Browse Source
This commit is contained in:
Hannes Janetzek 2014-05-16 17:53:41 +02:00
parent 9c1ae887ea
commit 89edbf90f2
3 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vtm/src/org/oscim/backend/GLAdapter.java
View File

@ -28,11 +28,9 @@ public class GLAdapter {
public static boolean GDX_WEBGL_QUIRKS = false; public static boolean GDX_WEBGL_QUIRKS = false;
/** /**
* Set false as workaround for adreno driver issue: * Set true as workaround for adreno driver issue:
* https://github.com/opensciencemap/vtm/issues/52 * https://github.com/opensciencemap/vtm/issues/52
*/ */
public static boolean VBO_TEXTURE_LAYERS = true;
public static boolean NO_BUFFER_SUB_DATA = false; public static boolean NO_BUFFER_SUB_DATA = false;
public static GL20 get() { public static GL20 get() {

3
vtm/src/org/oscim/layers/marker/MarkerRenderer.java
View File

@ -19,7 +19,6 @@ package org.oscim.layers.marker;
import java.util.Comparator; import java.util.Comparator;
import org.oscim.backend.GLAdapter;
import org.oscim.core.MercatorProjection; import org.oscim.core.MercatorProjection;
import org.oscim.core.Point; import org.oscim.core.Point;
import org.oscim.core.Tile; import org.oscim.core.Tile;
@ -62,8 +61,6 @@ public class MarkerRenderer extends ElementRenderer {
} }
public MarkerRenderer(MarkerLayer<MarkerItem> markerLayer, MarkerSymbol defaultSymbol) { public MarkerRenderer(MarkerLayer<MarkerItem> markerLayer, MarkerSymbol defaultSymbol) {
layers.useVBO = GLAdapter.VBO_TEXTURE_LAYERS;
mSymbolLayer = new SymbolLayer(); mSymbolLayer = new SymbolLayer();
mMarkerLayer = markerLayer; mMarkerLayer = markerLayer;
mDefaultMarker = defaultSymbol; mDefaultMarker = defaultSymbol;

3
vtm/src/org/oscim/layers/tile/vector/labeling/TextRenderer.java
View File

@ -31,7 +31,6 @@ package org.oscim.layers.tile.vector.labeling;
// //
import org.oscim.backend.GL20; import org.oscim.backend.GL20;
import org.oscim.backend.GLAdapter;
import org.oscim.layers.tile.vector.labeling.LabelLayer.Worker; import org.oscim.layers.tile.vector.labeling.LabelLayer.Worker;
import org.oscim.renderer.ElementRenderer; import org.oscim.renderer.ElementRenderer;
import org.oscim.renderer.GLState; import org.oscim.renderer.GLState;
@ -49,8 +48,6 @@ class TextRenderer extends ElementRenderer {
public TextRenderer(Worker worker) { public TextRenderer(Worker worker) {
mWorker = worker; mWorker = worker;
layers.useVBO = GLAdapter.VBO_TEXTURE_LAYERS;
} }
long lastDraw = 0; long lastDraw = 0;