add BitmapLayer renderer to BasicOverlay

This commit is contained in:
Hannes Janetzek 2013-05-01 03:23:38 +02:00
parent 00839e9a9a
commit b45249ffff

View File

@ -17,9 +17,10 @@ package org.oscim.renderer.overlays;
import org.oscim.core.MapPosition; import org.oscim.core.MapPosition;
import org.oscim.renderer.BufferObject; import org.oscim.renderer.BufferObject;
import org.oscim.renderer.GLRenderer; import org.oscim.renderer.GLRenderer;
import org.oscim.renderer.RenderLayer;
import org.oscim.renderer.GLRenderer.Matrices; import org.oscim.renderer.GLRenderer.Matrices;
import org.oscim.renderer.GLState; import org.oscim.renderer.GLState;
import org.oscim.renderer.RenderLayer;
import org.oscim.renderer.layer.BitmapRenderer;
import org.oscim.renderer.layer.Layer; import org.oscim.renderer.layer.Layer;
import org.oscim.renderer.layer.Layers; import org.oscim.renderer.layer.Layers;
import org.oscim.renderer.layer.LineRenderer; import org.oscim.renderer.layer.LineRenderer;
@ -31,7 +32,9 @@ import org.oscim.view.MapView;
import android.opengl.GLES20; import android.opengl.GLES20;
// Base class to use the Layers drawing 'API' /**
* Base class to use the renderer.layer.Layers drawing 'API'
*/
public abstract class BasicOverlay extends RenderLayer { public abstract class BasicOverlay extends RenderLayer {
public final Layers layers; public final Layers layers;
@ -83,10 +86,17 @@ public abstract class BasicOverlay extends RenderLayer {
float scale = (float) (pos.scale / curPos.scale); float scale = (float) (pos.scale / curPos.scale);
for (Layer l = layers.textureLayers; l != null;) { for (Layer l = layers.textureLayers; l != null;) {
switch (l.type) {
case Layer.BITMAP:
l = BitmapRenderer.draw(l, 1, m);
break;
default:
l = TextureRenderer.draw(l, scale, m); l = TextureRenderer.draw(l, scale, m);
} }
} }
} }
}
@Override @Override
public void compile() { public void compile() {