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

start BitmapTileLayer pool

Browse Source
This commit is contained in:
Hannes Janetzek 2014-03-16 03:51:24 +01:00
parent 879e0ccb81
commit 2e56e3facc
4 changed files with 59 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vtm-android/src/org/oscim/android/canvas/AndroidBitmap.java
View File

@ -25,12 +25,13 @@ import android.opengl.GLUtils;
public class AndroidBitmap implements org.oscim.backend.canvas.Bitmap { public class AndroidBitmap implements org.oscim.backend.canvas.Bitmap {
final Bitmap mBitmap; final Bitmap mBitmap;
public AndroidBitmap(InputStream inputStream) { public AndroidBitmap(InputStream inputStream) {
mBitmap = BitmapFactory.decodeStream(inputStream); mBitmap = BitmapFactory.decodeStream(inputStream);
} }
@Override @Override
public boolean isValid(){ public boolean isValid() {
return mBitmap != null; return mBitmap != null;
} }
@ -86,6 +87,9 @@ public class AndroidBitmap implements org.oscim.backend.canvas.Bitmap {
@Override @Override
public void recycle() { public void recycle() {
if (mBitmap == null)
return;
mBitmap.recycle(); mBitmap.recycle();
} }
} }

37
vtm/src/org/oscim/layers/tile/bitmap/BitmapTileLayer.java
View File

@ -23,6 +23,7 @@ import org.oscim.layers.tile.TileLoader;
import org.oscim.layers.tile.TileManager; import org.oscim.layers.tile.TileManager;
import org.oscim.layers.tile.VectorTileRenderer; import org.oscim.layers.tile.VectorTileRenderer;
import org.oscim.map.Map; import org.oscim.map.Map;
import org.oscim.renderer.elements.TextureItem.TexturePool;
import org.oscim.tiling.TileSource; import org.oscim.tiling.TileSource;
import org.oscim.utils.FastMath; import org.oscim.utils.FastMath;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -102,4 +103,40 @@ public class BitmapTileLayer extends TileLayer {
protected TileLoader createLoader() { protected TileLoader createLoader() {
return new BitmapTileLoader(this, mTileSource); return new BitmapTileLoader(this, mTileSource);
} }
final static int TEXTURE_HEIGHT = 256;
final static int TEXTURE_WIDTH = 256;
final static int POOL_FILL = 40;
/** pool shared by TextLayers */
final static TexturePool pool = new TexturePool(POOL_FILL,
TEXTURE_WIDTH,
TEXTURE_HEIGHT) {
// int sum = 0;
//
// public TextureItem release(TextureItem item) {
// log.debug(getFill() + " " + sum + " release tex " + item.id);
// return super.release(item);
// };
//
// public synchronized TextureItem get() {
// log.debug(getFill() + " " + sum + " get tex ");
//
// return super.get();
// };
//
// protected TextureItem createItem() {
// log.debug(getFill() + " " + (sum++) + " create tex ");
//
// return super.createItem();
// };
//
// protected void freeItem(TextureItem t) {
// log.debug(getFill() + " " + (sum--) + " free tex ");
// super.freeItem(t);
//
// };
};
} }

3
vtm/src/org/oscim/layers/tile/bitmap/BitmapTileLoader.java
View File

@ -63,7 +63,8 @@ public class BitmapTileLoader extends TileLoader {
throw new CancellationException(); throw new CancellationException();
BitmapLayer l = new BitmapLayer(false); BitmapLayer l = new BitmapLayer(false);
l.setBitmap(bitmap, Tile.SIZE, Tile.SIZE); l.setBitmap(bitmap, Tile.SIZE, Tile.SIZE, BitmapTileLayer.pool);
ElementLayers layers = new ElementLayers(); ElementLayers layers = new ElementLayers();
layers.setTextureLayers(l); layers.setTextureLayers(l);
mTile.data = layers; mTile.data = layers;

17
vtm/src/org/oscim/renderer/elements/BitmapLayer.java
View File

@ -24,6 +24,7 @@ import org.oscim.renderer.GLState;
import org.oscim.renderer.GLUtils; import org.oscim.renderer.GLUtils;
import org.oscim.renderer.GLViewport; import org.oscim.renderer.GLViewport;
import org.oscim.renderer.MapRenderer; import org.oscim.renderer.MapRenderer;
import org.oscim.renderer.elements.TextureItem.TexturePool;
/** /**
* Renderer for a single bitmap, width and height must be power of 2. * Renderer for a single bitmap, width and height must be power of 2.
@ -54,13 +55,25 @@ public class BitmapLayer extends TextureLayer {
/** /**
* w/h sets also target dimension to render the bitmap. * w/h sets also target dimension to render the bitmap.
*/ */
public void setBitmap(Bitmap bitmap, int w, int h) { public void setBitmap(Bitmap bitmap, int w, int h) {
setBitmap(bitmap, w, h, null);
}
public void setBitmap(Bitmap bitmap, int w, int h, TexturePool pool) {
mWidth = w; mWidth = w;
mHeight = h; mHeight = h;
mBitmap = bitmap; mBitmap = bitmap;
if (textures == null) if (textures == null) {
textures = new TextureItem(mBitmap); if (pool == null)
textures = new TextureItem(mBitmap);
else {
textures = pool.get();
textures.bitmap = mBitmap;
}
}
TextureItem t = textures; TextureItem t = textures;
t.vertices = TextureLayer.INDICES_PER_SPRITE; t.vertices = TextureLayer.INDICES_PER_SPRITE;