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

comments + cleanups

Browse Source
This commit is contained in:
Hannes Janetzek 2013-04-30 13:22:49 +02:00
parent 80e45a3fa6
commit 2d0d76d245
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/org/oscim/renderer/layer/Layers.java
View File

@ -35,7 +35,9 @@ public class Layers {
// mixed Polygon- and LineLayer // mixed Polygon- and LineLayer
public Layer baseLayers; public Layer baseLayers;
// Text- and SymbolLayer
public Layer textureLayers; public Layer textureLayers;
//
public Layer extrusionLayers; public Layer extrusionLayers;
// VBO holds all vertex data to draw lines and polygons // VBO holds all vertex data to draw lines and polygons
@ -60,19 +62,31 @@ public class Layers {
private Layer mCurLayer; private Layer mCurLayer;
/**
* Get or add the LineLayer for a level. Levels are ordered from
* bottom (0) to top
*/
public LineLayer getLineLayer(int level) { public LineLayer getLineLayer(int level) {
return (LineLayer) getLayer(level, Layer.LINE); return (LineLayer) getLayer(level, Layer.LINE);
} }
/**
* Get or add the PolygonLayer for a level. Levels are ordered from
* bottom (0) to top
*/
public PolygonLayer getPolygonLayer(int level) { public PolygonLayer getPolygonLayer(int level) {
return (PolygonLayer) getLayer(level, Layer.POLYGON); return (PolygonLayer) getLayer(level, Layer.POLYGON);
} }
/**
* Get or add the TexLineLayer for a level. Levels are ordered from
* bottom (0) to top
*/
public LineTexLayer getLineTexLayer(int level) { public LineTexLayer getLineTexLayer(int level) {
return (LineTexLayer) getLayer(level, Layer.TEXLINE); return (LineTexLayer) getLayer(level, Layer.TEXLINE);
} }
// get or add the Line- or PolygonLayer for a level.
private Layer getLayer(int level, byte type) { private Layer getLayer(int level, byte type) {
Layer l = baseLayers; Layer l = baseLayers;
Layer layer = null; Layer layer = null;
@ -175,17 +189,13 @@ public class Layers {
texLineOffset = size * SHORT_BYTES; texLineOffset = size * SHORT_BYTES;
for (Layer l = baseLayers; l != null; l = l.next) { for (Layer l = baseLayers; l != null; l = l.next) {
if (l.type == Layer.TEXLINE) { if (l.type == Layer.TEXLINE) {
// HACK, see LineTexLayer
//sbuf.position(sbuf.position() + 6);
addPoolItems(l, sbuf); addPoolItems(l, sbuf);
//l.offset -= 12; // add additional vertex for interleaving,
// see TexLineLayer.
sbuf.position(sbuf.position() + 6); sbuf.position(sbuf.position() + 6);
} }
} }
//size += addLayerItems(sbuf, baseLayers, Layer.TEXLINE, 0);
for (Layer l = textureLayers; l != null; l = l.next) { for (Layer l = textureLayers; l != null; l = l.next) {
TextureLayer tl = (TextureLayer) l; TextureLayer tl = (TextureLayer) l;
tl.compile(sbuf); tl.compile(sbuf);
@ -264,6 +274,7 @@ public class Layers {
l.vertexItems = null; l.vertexItems = null;
l.curItem = null; l.curItem = null;
} }
l.verticesCnt = 0;
l = l.next; l = l.next;
} }