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

SmbolLayer, use offset of individual items. Fixes #6

Browse Source
This commit is contained in:
Hannes Janetzek 2013-11-26 13:34:47 +01:00
parent 7533b98780
commit 215d1261ca
1 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
vtm/src/org/oscim/renderer/elements/SymbolLayer.java
View File

@ -17,6 +17,7 @@ package org.oscim.renderer.elements;
import java.nio.ShortBuffer; import java.nio.ShortBuffer;
import org.oscim.backend.canvas.Bitmap; import org.oscim.backend.canvas.Bitmap;
import org.oscim.core.PointF;
import org.oscim.renderer.atlas.TextureAtlas; import org.oscim.renderer.atlas.TextureAtlas;
import org.oscim.utils.pool.Inlist; import org.oscim.utils.pool.Inlist;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -114,33 +115,36 @@ public final class SymbolLayer extends TextureLayer {
continue; continue;
} }
short x1, y1, x2, y2;
if (it.offset == null) {
float hw = width / 2f;
float hh = height / 2f;
x1 = (short) (SCALE * (-hw));
x2 = (short) (SCALE * (hw));
y1 = (short) (SCALE * (hh));
y2 = (short) (SCALE * (-hh));
} else {
float hw = (float) (it.offset.x * width);
float hh = (float) (it.offset.y * height);
x1 = (short) (SCALE * (-hw));
x2 = (short) (SCALE * (width - hw));
y1 = (short) (SCALE * (height - hh));
y2 = (short) (SCALE * (-hh));
}
short u1 = (short) (SCALE * x); short u1 = (short) (SCALE * x);
short v1 = (short) (SCALE * y); short v1 = (short) (SCALE * y);
short u2 = (short) (SCALE * (x + width)); short u2 = (short) (SCALE * (x + width));
short v2 = (short) (SCALE * (y + height)); short v2 = (short) (SCALE * (y + height));
PointF prevOffset = null;
short x1 = 0, y1 = 0, x2 = 0, y2 = 0;
// add symbol items referencing the same bitmap / // add symbol items referencing the same bitmap /
for (SymbolItem it2 = it;; it2 = it2.next) { for (SymbolItem it2 = it;; it2 = it2.next) {
if (it == it2 || it.offset != prevOffset) {
prevOffset = it.offset;
if (it.offset == null) {
float hw = width / 2f;
float hh = height / 2f;
x1 = (short) (SCALE * (-hw));
x2 = (short) (SCALE * (hw));
y1 = (short) (SCALE * (hh));
y2 = (short) (SCALE * (-hh));
} else {
float hw = (float) (it.offset.x * width);
float hh = (float) (it.offset.y * height);
x1 = (short) (SCALE * (-hw));
x2 = (short) (SCALE * (width - hw));
y1 = (short) (SCALE * (height - hh));
y2 = (short) (SCALE * (-hh));
}
}
if (it2 == null if (it2 == null
|| (it.bitmap != null && it2.bitmap != it.bitmap) || (it.bitmap != null && it2.bitmap != it.bitmap)
|| (it.texRegion != null && it2.texRegion != it.texRegion)) { || (it.texRegion != null && it2.texRegion != it.texRegion)) {