cleanups + comments

This commit is contained in:
Hannes Janetzek
2013-02-06 11:06:47 +01:00
parent f2b7a9fdf8
commit fada95f380
11 changed files with 127 additions and 219 deletions

View File

@@ -21,36 +21,27 @@ import org.oscim.renderer.layer.TextItem;
public final class MapTile extends JobTile {
/**
* VBO layout: - 16 bytes fill coordinates, n bytes polygon vertices, m
* bytes lines vertices
* VBO holds all vertex data to draw lines and polygons
* layout:
* 16 bytes fill coordinates,
* n bytes polygon vertices,
* m bytes lines vertices
*/
BufferObject vbo;
// TextTexture texture;
/**
* Tile data set by TileGenerator:
* Tile data set by TileGenerator.
*/
public TextItem labels;
public Layers layers;
/**
* tile has new data to upload to gl
*/
//boolean newData;
/**
* tile is loaded and ready for drawing.
*/
//boolean isReady;
/**
* tile is in view region.
* Tile is in view region. Set by GLRenderer.
*/
public boolean isVisible;
/**
* pointer to access relatives in QuadTree
* Pointer to access relatives in QuadTree
*/
public QuadTree rel;
@@ -68,18 +59,20 @@ public final class MapTile extends JobTile {
public byte proxies;
// check which labels were joined
public final static int JOIN_T = 1 << 0;
public final static int JOIN_B = 1 << 1;
public final static int JOIN_L = 1 << 2;
public final static int JOIN_R = 1 << 3;
public final static int JOINED = 15;
public byte joined;
// public final static int JOIN_T = 1 << 0;
// public final static int JOIN_B = 1 << 1;
// public final static int JOIN_L = 1 << 2;
// public final static int JOIN_R = 1 << 3;
// public final static int JOINED = 15;
// public byte joined;
// counting the tiles that use this tile as proxy
byte refs;
// up to 255 Threads may lock a tile
byte locked;
// used when this tile sits in fo another tile.
// only used GLRenderer when this tile sits in for another tile.
// e.g. x:-1,y:0,z:1 for x:1,y:0
MapTile holder;