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

11
src/org/oscim/overlay/ItemizedOverlay.java
View File

@@ -73,9 +73,9 @@ public abstract class ItemizedOverlay<Item extends OverlayItem> extends Overlay
class ItemOverlay extends BasicOverlay {
private SymbolLayer mSymbolLayer;
private float[] mMvp = new float[16];
private float[] mVec = new float[4];
private final SymbolLayer mSymbolLayer;
private final float[] mMvp = new float[16];
private final float[] mVec = new float[4];
public ItemOverlay(MapView mapView) {
super(mapView);
@@ -84,7 +84,8 @@ public abstract class ItemizedOverlay<Item extends OverlayItem> extends Overlay
// note: this is called from GL-Thread. so check your syncs!
@Override
public synchronized void update(MapPosition curPos, boolean positionChanged,
public synchronized void update(MapPosition curPos,
boolean positionChanged,
boolean tilesChanged) {
if (!tilesChanged && !mUpdate)
@@ -97,7 +98,7 @@ public abstract class ItemizedOverlay<Item extends OverlayItem> extends Overlay
int my = (int) curPos.y;
// TODO could pass mvp as param
mMapView.getMapViewPosition().getMVP(mMvp);
mMapView.getMapViewPosition().getMatrix(null, null, mMvp);
float[] matrix = mMvp;
float[] vec = mVec;

10
src/org/oscim/overlay/PathOverlay.java
View File

@@ -25,6 +25,7 @@ import org.oscim.renderer.layer.Layer;
import org.oscim.renderer.layer.LineLayer;
import org.oscim.renderer.overlays.BasicOverlay;
import org.oscim.theme.renderinstruction.Line;
import org.oscim.utils.FastMath;
import org.oscim.view.MapView;
import android.content.Context;
@@ -52,10 +53,10 @@ public class PathOverlay extends Overlay {
// projected points
private float[] mPPoints;
private short[] mIndex;
private final short[] mIndex;
private int mSize;
private Line mLine;
private final Line mLine;
// limit coords
private final int max = 2048;
@@ -70,7 +71,8 @@ public class PathOverlay extends Overlay {
// note: this is called from GL-Thread. so check your syncs!
// TODO use an Overlay-Thread to build up layers (like for Labeling)
@Override
public synchronized void update(MapPosition curPos, boolean positionChanged,
public synchronized void update(MapPosition curPos,
boolean positionChanged,
boolean tilesChanged) {
if (!tilesChanged && !mUpdatePoints)
@@ -144,7 +146,7 @@ public class PathOverlay extends Overlay {
// skip too near points
int dx = x - px;
int dy = y - py;
if ((i == 0) || dx > MIN_DIST || dx < -MIN_DIST || dy > MIN_DIST || dy < -MIN_DIST) {
if ((i == 0) || FastMath.absMaxCmp(dx, dy, MIN_DIST)) {
projected[i + 0] = px = x;
projected[i + 1] = py = y;
i += 2;