- rename class Tiles -> TileSet

- cleanup + comments
This commit is contained in:
Hannes Janetzek
2012-11-24 19:37:33 +01:00
parent 64c56ce7df
commit 3dc36e108a
8 changed files with 77 additions and 98 deletions

View File

@@ -20,7 +20,7 @@ import org.oscim.core.Tile;
import org.oscim.renderer.GLRenderer;
import org.oscim.renderer.MapTile;
import org.oscim.renderer.TileManager;
import org.oscim.renderer.Tiles;
import org.oscim.renderer.TileSet;
import org.oscim.renderer.layer.TextItem;
import org.oscim.renderer.layer.TextLayer;
import org.oscim.utils.FastMath;
@@ -34,7 +34,7 @@ import android.util.FloatMath;
public class OverlayText extends RenderOverlay {
private Tiles tiles;
private TileSet tiles;
private LabelThread mThread;
private MapPosition mWorkPos;

View File

@@ -46,6 +46,8 @@ public abstract class RenderOverlay {
public BufferObject vbo;
protected float[] mvp = new float[16];
public RenderOverlay(MapView mapView) {
mMapView = mapView;
mMapPosition = new MapPosition();
@@ -68,7 +70,7 @@ public abstract class RenderOverlay {
* @param positionChanged
* true when MapPosition has changed
* @param tilesChanged
* true when loaded tiles changed
* true when current tiles changed
*/
public synchronized void update(MapPosition curPos, boolean positionChanged,
boolean tilesChanged) {
@@ -86,8 +88,15 @@ public abstract class RenderOverlay {
// }
}
float[] mvp = new float[16];
/**
* Default overlay render function
* @param pos
* current MapPosition
* @param mv
* current model-view matrix
* @param proj
* current projection matrix
*/
public synchronized void render(MapPosition pos, float[] mv, float[] proj) {
float div = setMatrix(pos, mv);
@@ -105,8 +114,6 @@ public abstract class RenderOverlay {
}
}
// float scale = curPos.scale / div;
for (Layer l = layers.textureLayers; l != null;) {
l = TextureRenderer.draw(l, (mMapPosition.scale / pos.scale) * div, proj, mv,