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

api changes

Browse Source
This commit is contained in:
Hannes Janetzek
2013-06-28 04:34:28 +02:00
parent dad16ea796
commit ea60d150e1
3 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vtm-android/src/org/oscim/android/AndroidMapView.java
View File

@@ -63,7 +63,7 @@ public class AndroidMapView extends RelativeLayout implements MapRenderCallback
//System.loadLibrary("tessellate"); //System.loadLibrary("tessellate");
CanvasAdapter.g = AndroidGraphics.INSTANCE; CanvasAdapter.g = AndroidGraphics.INSTANCE;
GLAdapter.INSTANCE = new AndroidGL20(); GLAdapter.g = new AndroidGL20();
Log.logger = new AndroidLog(); Log.logger = new AndroidLog();
} }

17
vtm-android/src/org/oscim/android/canvas/AndroidGraphics.java
View File

@@ -14,8 +14,10 @@
*/ */
package org.oscim.android.canvas; package org.oscim.android.canvas;
import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import org.oscim.backend.BitmapUtils;
import org.oscim.backend.CanvasAdapter; import org.oscim.backend.CanvasAdapter;
import org.oscim.backend.canvas.Bitmap; import org.oscim.backend.canvas.Bitmap;
import org.oscim.backend.canvas.Canvas; import org.oscim.backend.canvas.Canvas;
@@ -31,10 +33,6 @@ import android.graphics.drawable.Drawable;
public final class AndroidGraphics extends CanvasAdapter { public final class AndroidGraphics extends CanvasAdapter {
public static final AndroidGraphics INSTANCE = new AndroidGraphics(); public static final AndroidGraphics INSTANCE = new AndroidGraphics();
// public static android.graphics.Bitmap getAndroidBitmap(Bitmap bitmap) {
// return ((AndroidBitmap) bitmap).bitmap;
// }
public static android.graphics.Paint getAndroidPaint(Paint paint) { public static android.graphics.Paint getAndroidPaint(Paint paint) {
return ((AndroidPaint) paint).mPaint; return ((AndroidPaint) paint).mPaint;
} }
@@ -48,6 +46,16 @@ public final class AndroidGraphics extends CanvasAdapter {
return new AndroidBitmap(inputStream); return new AndroidBitmap(inputStream);
} }
@Override
public Bitmap loadBitmapAsset(String fileName) {
try {
return BitmapUtils.createBitmap(fileName);
} catch (IOException e) {
e.printStackTrace();
}
return null;
}
@Override @Override
public int getColor(Color color) { public int getColor(Color color) {
switch (color) { switch (color) {
@@ -114,4 +122,5 @@ public final class AndroidGraphics extends CanvasAdapter {
return new OverlayMarker(drawableToBitmap(drawable), place); return new OverlayMarker(drawableToBitmap(drawable), place);
} }
} }

12
vtm-gdx-android/src/org/oscim/android/canvas/AndroidGraphics.java
View File

@@ -14,8 +14,10 @@
*/ */
package org.oscim.android.canvas; package org.oscim.android.canvas;
import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import org.oscim.backend.BitmapUtils;
import org.oscim.backend.CanvasAdapter; import org.oscim.backend.CanvasAdapter;
import org.oscim.backend.canvas.Bitmap; import org.oscim.backend.canvas.Bitmap;
import org.oscim.backend.canvas.Canvas; import org.oscim.backend.canvas.Canvas;
@@ -114,4 +116,14 @@ public final class AndroidGraphics extends CanvasAdapter {
return new OverlayMarker(drawableToBitmap(drawable), place); return new OverlayMarker(drawableToBitmap(drawable), place);
} }
@Override
public Bitmap loadBitmapAsset(String fileName) {
try {
return BitmapUtils.createBitmap(fileName);
} catch (IOException e) {
e.printStackTrace();
}
return null;
}
} }