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

MarkerSymbol: remove redundant bitmap array

Browse Source
This commit is contained in:
Emux 2016-07-17 16:19:53 +03:00
parent 3fc1583649
commit 7f42be2d67
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
vtm/src/org/oscim/layers/marker/MarkerSymbol.java
View File

@ -1,5 +1,6 @@
/* /*
* Copyright 2013 Hannes Janetzek * Copyright 2013 Hannes Janetzek
* Copyright 2016 devemux86
* *
* This file is part of the OpenScienceMap project (http://www.opensciencemap.org). * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
* *
@ -21,7 +22,7 @@ import org.oscim.core.PointF;
import org.oscim.layers.marker.MarkerItem.HotspotPlace; import org.oscim.layers.marker.MarkerItem.HotspotPlace;
public class MarkerSymbol { public class MarkerSymbol {
final Bitmap[] mBitmap; final Bitmap mBitmap;
/** /**
* Hotspot offset * Hotspot offset
*/ */
@ -33,8 +34,7 @@ public class MarkerSymbol {
} }
public MarkerSymbol(Bitmap bitmap, float relX, float relY, boolean billboard) { public MarkerSymbol(Bitmap bitmap, float relX, float relY, boolean billboard) {
mBitmap = new Bitmap[1]; mBitmap = bitmap;
mBitmap[0] = bitmap;
mOffset = new PointF(relX, relY); mOffset = new PointF(relX, relY);
mBillboard = billboard; mBillboard = billboard;
} }
@ -74,8 +74,7 @@ public class MarkerSymbol {
mOffset = new PointF(0.5f, 0.5f); mOffset = new PointF(0.5f, 0.5f);
} }
mBitmap = new Bitmap[1]; mBitmap = bitmap;
mBitmap[0] = bitmap;
mBillboard = billboard; mBillboard = billboard;
} }
@ -88,13 +87,13 @@ public class MarkerSymbol {
} }
public Bitmap getBitmap() { public Bitmap getBitmap() {
return mBitmap[0]; return mBitmap;
} }
public boolean isInside(float dx, float dy) { public boolean isInside(float dx, float dy) {
/* TODO handle no-billboard */ /* TODO handle no-billboard */
int w = mBitmap[0].getWidth(); int w = mBitmap.getWidth();
int h = mBitmap[0].getHeight(); int h = mBitmap.getHeight();
float ox = -w * mOffset.x; float ox = -w * mOffset.x;
float oy = -h * (1 - mOffset.y); float oy = -h * (1 - mOffset.y);