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

cleanup

Browse Source
This commit is contained in:
Hannes Janetzek 2013-01-11 20:08:16 +01:00
parent 464e0b17ec
commit 74cf517b15
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -496,7 +496,7 @@ public class GLRenderer implements GLSurfaceView.Renderer {
if (debugView) { if (debugView) {
GLState.test(false, false); GLState.test(false, false);
float mm = 0.25f; // * mHeight; float mm = 0.5f;
float min = -mm; float min = -mm;
float max = mm; float max = mm;
float ymax = mm * mHeight / mWidth; float ymax = mm * mHeight / mWidth;
@ -546,7 +546,7 @@ public class GLRenderer implements GLSurfaceView.Renderer {
float s = MapViewPosition.VIEW_SCALE; float s = MapViewPosition.VIEW_SCALE;
float aspect = mHeight / (float) mWidth; float aspect = mHeight / (float) mWidth;
Matrix.frustumM(mProjMatrix, 0, -1 * s, 1 * s, Matrix.frustumM(mProjMatrix, 0, -s, s,
aspect * s, -aspect * s, MapViewPosition.VIEW_NEAR, aspect * s, -aspect * s, MapViewPosition.VIEW_NEAR,
MapViewPosition.VIEW_FAR); MapViewPosition.VIEW_FAR);
@ -554,13 +554,13 @@ public class GLRenderer implements GLSurfaceView.Renderer {
Matrix.translateM(mTmpMatrix, 0, 0, 0, -MapViewPosition.VIEW_DISTANCE); Matrix.translateM(mTmpMatrix, 0, 0, 0, -MapViewPosition.VIEW_DISTANCE);
Matrix.multiplyMM(mProjMatrix, 0, mProjMatrix, 0, mTmpMatrix, 0); Matrix.multiplyMM(mProjMatrix, 0, mProjMatrix, 0, mTmpMatrix, 0);
// if (debugView) { if (debugView) {
// // modify this to scale only the view, to see better which tiles are // modify this to scale only the view, to see better which tiles are
// // rendered // rendered
// Matrix.setIdentityM(mMVPMatrix, 0); Matrix.setIdentityM(mMVPMatrix, 0);
// Matrix.scaleM(mMVPMatrix, 0, 0.75f, 0.75f, 1); Matrix.scaleM(mMVPMatrix, 0, 0.5f, 0.5f, 1);
// Matrix.multiplyMM(mProjMatrix, 0, mMVPMatrix, 0, mProjMatrix, 0); Matrix.multiplyMM(mProjMatrix, 0, mMVPMatrix, 0, mProjMatrix, 0);
// } }
BaseLayer.setProjection(mProjMatrix); BaseLayer.setProjection(mProjMatrix);