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

formatting

Browse Source
This commit is contained in:
Hannes Janetzek 2013-04-21 23:20:32 +02:00
parent 6eb3b9221b
commit 17cc09c3b9
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,6 +23,7 @@ import android.util.Log;
public class Layers { public class Layers {
private final static String TAG = Layers.class.getName(); private final static String TAG = Layers.class.getName();
// mixed Polygon- and LineLayer // mixed Polygon- and LineLayer
public Layer baseLayers; public Layer baseLayers;
public Layer textureLayers; public Layer textureLayers;
@ -51,15 +52,15 @@ public class Layers {
private Layer mCurLayer; private Layer mCurLayer;
public LineLayer getLineLayer(int level) { public LineLayer getLineLayer(int level) {
return (LineLayer)getLayer(level, Layer.LINE); return (LineLayer) getLayer(level, Layer.LINE);
} }
public PolygonLayer getPolygonLayer(int level) { public PolygonLayer getPolygonLayer(int level) {
return (PolygonLayer)getLayer(level, Layer.POLYGON); return (PolygonLayer) getLayer(level, Layer.POLYGON);
} }
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. // get or add the Line- or PolygonLayer for a level.
@ -152,7 +153,7 @@ public class Layers {
int pos = 0; int pos = 0;
int size = 0; int size = 0;
if (addFill){ if (addFill) {
pos = 4; pos = 4;
size = 8; size = 8;
} }
@ -163,8 +164,8 @@ public class Layers {
size += addLayerItems(sbuf, baseLayers, Layer.LINE, 0); size += addLayerItems(sbuf, baseLayers, Layer.LINE, 0);
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 // HACK, see LineTexLayer
//sbuf.position(sbuf.position() + 6); //sbuf.position(sbuf.position() + 6);
addPoolItems(l, sbuf); addPoolItems(l, sbuf);
@ -199,11 +200,11 @@ public class Layers {
continue; continue;
for (VertexItem it = l.vertexItems; it != null; it = it.next) { for (VertexItem it = l.vertexItems; it != null; it = it.next) {
if (it.next == null){ if (it.next == null) {
size += it.used; size += it.used;
sbuf.put(it.vertices, 0, it.used); sbuf.put(it.vertices, 0, it.used);
} }
else{ else {
size += VertexItem.SIZE; size += VertexItem.SIZE;
sbuf.put(it.vertices, 0, VertexItem.SIZE); sbuf.put(it.vertices, 0, VertexItem.SIZE);
} }