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

refactor: dont pass matrices with MapPosition -> use GLRender.Matrices

Browse Source
This commit is contained in:
Hannes Janetzek
2013-02-15 16:56:13 +01:00
parent 811ff6ed4a
commit 55030c1166
17 changed files with 362 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/org/oscim/core/MapPosition.java
View File

@@ -15,7 +15,6 @@
*/
package org.oscim.core;
import android.opengl.Matrix;
/** A MapPosition Container. */
public class MapPosition {
@@ -31,11 +30,6 @@ public class MapPosition {
public double x;
public double y;
public float[] viewMatrix;
// // DO NOT MODIFY! shared with MapViewPosition
// public float[] projMatrix;
public MapPosition() {
this.zoomLevel = (byte) 1;
this.scale = 1;
@@ -46,15 +40,6 @@ public class MapPosition {
this.y = MercatorProjection.latitudeToPixelY(this.lat, zoomLevel);
}
// FIXME remove this here
public void init() {
viewMatrix = new float[16];
Matrix.setIdentityM(viewMatrix, 0);
//
// rotateMatrix = new float[16];
// Matrix.setIdentityM(rotateMatrix, 0);
}
// public Point geopointToMap(GeoPoint in, Point reuse) {
// Point out = reuse == null ? new Point() : reuse;
// out.x = (int) (MercatorProjection.longitudeToPixelX(in.getLongitude(), zoomLevel) - x);