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

refactor loops

Browse Source
This commit is contained in:
Hannes Janetzek 2013-01-30 04:12:30 +01:00
parent 3d8f62ec4a
commit c81b417ea5
1 changed files with 30 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
src/org/oscim/renderer/layer/TextLayer.java
View File

@ -52,15 +52,16 @@ public final class TextLayer extends TextureLayer {
} }
public boolean removeText(TextItem item) { public boolean removeText(TextItem item) {
TextItem prev = null;
for (TextItem it = labels; it != null; it = it.next) { if (item == labels) {
labels = labels.next;
return true;
}
for (TextItem prev = labels, it = labels.next; it != null; it = it.next) {
if (it == item) { if (it == item) {
if (prev == null) prev.next = it.next;
labels = it.next;
else
prev.next = it.next;
return true; return true;
} }
prev = it; prev = it;
@ -103,9 +104,6 @@ public final class TextLayer extends TextureLayer {
item.next = labels; item.next = labels;
labels = item; labels = item;
// for (it = labels; it != null; it = it.next)
// Log.d(TAG, "> " + it.text + " " + it.string);
// Log.d(TAG, "< ");
} }
@Override @Override
@ -145,10 +143,6 @@ public final class TextLayer extends TextureLayer {
advanceY = (int) (height + 0.5f); advanceY = (int) (height + 0.5f);
if (y + height > TEXTURE_HEIGHT) { if (y + height > TEXTURE_HEIGHT) {
// Log.d(TAG, "reached max labels " + numTextures + " " +
// numLabel + " "
// + ((numIndices - offsetIndices) / 6));
to.offset = offsetIndices; to.offset = offsetIndices;
to.vertices = (short) (numIndices - offsetIndices); to.vertices = (short) (numIndices - offsetIndices);
offsetIndices = numIndices; offsetIndices = numIndices;
@ -193,31 +187,25 @@ public final class TextLayer extends TextureLayer {
short u2 = (short) (SCALE * (x + width)); short u2 = (short) (SCALE * (x + width));
short v2 = (short) (SCALE * (y + height)); short v2 = (short) (SCALE * (y + height));
// add symbol items referencing the same bitmap / drawable while (it != null) {
for (TextItem it2 = it;; it2 = it2.next) {
if (it != it2) {
if (it2 == null
|| (it2.text != it.text)
|| (it2.string != it.string)) {
it = it2;
break;
}
//Log.d(TAG, "pack strings: " + it.string);
}
short x1, x2, x3, x4, y1, y3, y2, y4; short x1, x2, x3, x4, y1, y3, y2, y4;
if (it.text.caption) { if (it.text.caption) {
x1 = x3 = (short) (SCALE * -hw); if (it.origin == 0) {
x2 = x4 = (short) (SCALE * hw); x1 = x3 = (short) (SCALE * -hw);
y1 = y2 = (short) (SCALE * hh); x2 = x4 = (short) (SCALE * hw);
y3 = y4 = (short) (SCALE * -hh); y1 = y2 = (short) (SCALE * hh);
// x1 = x3 = (short) (0); y3 = y4 = (short) (SCALE * -hh);
// x2 = x4 = (short) (SCALE * width); } else {
x1 = x3 = (short) (SCALE * 0);
x2 = x4 = (short) (SCALE * width);
y1 = y2 = (short) (SCALE * 0);
y3 = y4 = (short) (SCALE * -height);
}
} else { } else {
float vx = it2.x1 - it2.x2; float vx = it.x1 - it.x2;
float vy = it2.y1 - it2.y2; float vy = it.y1 - it.y2;
float a = (float) Math.sqrt(vx * vx + vy * vy); float a = (float) Math.sqrt(vx * vx + vy * vy);
vx = vx / a; vx = vx / a;
vy = vy / a; vy = vy / a;
@ -236,9 +224,9 @@ public final class TextLayer extends TextureLayer {
} }
// add vertices // add vertices
int tmp = (int) (SCALE * it2.x) & LBIT_MASK; int tmp = (int) (SCALE * it.x) & LBIT_MASK;
short tx = (short) (tmp | (it2.text.caption ? 1 : 0)); short tx = (short) (tmp | (it.text.caption ? 1 : 0));
short ty = (short) (SCALE * it2.y); short ty = (short) (SCALE * it.y);
if (pos == VertexPoolItem.SIZE) { if (pos == VertexPoolItem.SIZE) {
vi.used = VertexPoolItem.SIZE; vi.used = VertexPoolItem.SIZE;
@ -280,13 +268,11 @@ public final class TextLayer extends TextureLayer {
numIndices += TextureRenderer.INDICES_PER_SPRITE; numIndices += TextureRenderer.INDICES_PER_SPRITE;
verticesCnt += 4; verticesCnt += 4;
// FIXME this does not work, need to draw bitmap on next if (it.next == null || (it.next.text != it.text) || (it.next.string != it.string)) {
// texture... it = it.next;
// if (numLabel == TextureRenderer.MAX_ITEMS) { break;
// Log.d(TAG, "--- reached max label per texture " + numLabel); }
// sbuf.put(buf, 0, pos); it = it.next;
// pos = 0;
// }
} }
x += width; x += width;
@ -297,8 +283,6 @@ public final class TextLayer extends TextureLayer {
to.offset = offsetIndices; to.offset = offsetIndices;
to.vertices = (short) (numIndices - offsetIndices); to.vertices = (short) (numIndices - offsetIndices);
// Log.d(TAG, "added labels " + numTextures + " " + numLabel);
return true; return true;
} }