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

fix against overflowing max polygon offset (whatever that value might be...)

Browse Source
This commit is contained in:
Hannes Janetzek 2012-10-28 17:30:30 +01:00
parent 5916f1be5e
commit e65911fb07
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/org/oscim/renderer/GLRenderer.java
View File

@ -176,8 +176,10 @@ public class GLRenderer implements GLSurfaceView.Renderer {
} }
}; };
/** @param mapView /**
* the MapView */ * @param mapView
* the MapView
*/
public GLRenderer(MapView mapView) { public GLRenderer(MapView mapView) {
mMapView = mapView; mMapView = mapView;
@ -522,6 +524,8 @@ public class GLRenderer implements GLSurfaceView.Renderer {
GLES20.glEnable(GL_DEPTH_TEST); GLES20.glEnable(GL_DEPTH_TEST);
GLES20.glEnable(GL_POLYGON_OFFSET_FILL); GLES20.glEnable(GL_POLYGON_OFFSET_FILL);
mDrawCount = 0;
for (int i = 0; i < tileCnt; i++) { for (int i = 0; i < tileCnt; i++) {
MapTile t = tiles[i]; MapTile t = tiles[i];
if (t.isVisible && t.isReady) if (t.isVisible && t.isReady)
@ -541,7 +545,8 @@ public class GLRenderer implements GLSurfaceView.Renderer {
GLES20.glDisable(GL_POLYGON_OFFSET_FILL); GLES20.glDisable(GL_POLYGON_OFFSET_FILL);
GLES20.glDisable(GL_DEPTH_TEST); GLES20.glDisable(GL_DEPTH_TEST);
mDrawCount = 0; // Log.d(TAG, "tiles: " + mDrawCount);
mDrawSerial++; mDrawSerial++;
GLES20.glEnable(GL_BLEND); GLES20.glEnable(GL_BLEND);
@ -621,6 +626,12 @@ public class GLRenderer implements GLSurfaceView.Renderer {
GLES20.glPolygonOffset(0, mDrawCount++); GLES20.glPolygonOffset(0, mDrawCount++);
// seems there are not infinite offset units possible
// this should suffice for at least two rows, i.e.
// having not two neighbours with the same depth
if (mDrawCount == 20)
mDrawCount = 0;
GLES20.glBindBuffer(GL_ARRAY_BUFFER, tile.vbo.id); GLES20.glBindBuffer(GL_ARRAY_BUFFER, tile.vbo.id);
boolean clipped = false; boolean clipped = false;
@ -789,6 +800,7 @@ public class GLRenderer implements GLSurfaceView.Renderer {
// String ext = GLES20.glGetString(GLES20.GL_EXTENSIONS); // String ext = GLES20.glGetString(GLES20.GL_EXTENSIONS);
// Log.d(TAG, "Extensions: " + ext); // Log.d(TAG, "Extensions: " + ext);
// GLES20.GL_POLYGON_OFFSET_UNITS
LineRenderer.init(); LineRenderer.init();
PolygonRenderer.init(); PolygonRenderer.init();
// TextRenderer.init(); // TextRenderer.init();