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

move cast into addVertex

Browse Source
This commit is contained in:
Hannes Janetzek 2014-03-10 23:18:51 +01:00
parent 77d33bb02c
commit 61e2be18ab
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
vtm/src/org/oscim/renderer/elements/LineLayer.java
View File

@ -186,11 +186,11 @@ public final class LineLayer extends RenderElement {
} }
} }
private void addVertex(short[] v, int pos, short x, short y, short dx, short dy) { private void addVertex(short[] v, int pos, short x, short y, int dx, int dy) {
v[pos + 0] = x; v[pos + 0] = x;
v[pos + 1] = y; v[pos + 1] = y;
v[pos + 2] = dx; v[pos + 2] = (short) dx;
v[pos + 3] = dy; v[pos + 3] = (short) dy;
} }
private VertexItem addVertex(VertexItem vertexItem, private VertexItem addVertex(VertexItem vertexItem,
@ -331,8 +331,8 @@ public final class LineLayer extends RenderElement {
ddy = (int) (-(uy + vPrevY) * DIR_SCALE); ddy = (int) (-(uy + vPrevY) * DIR_SCALE);
addVertex(v, opos, ox, oy, addVertex(v, opos, ox, oy,
(short) (2 | ddx & DIR_MASK), (2 | ddx & DIR_MASK),
(short) (2 | ddy & DIR_MASK)); (2 | ddy & DIR_MASK));
if ((opos += 4) == SIZE) { if ((opos += 4) == SIZE) {
vertexItem = pool.getNext(vertexItem); vertexItem = pool.getNext(vertexItem);
@ -345,8 +345,8 @@ public final class LineLayer extends RenderElement {
ddy = (int) (uy * DIR_SCALE); ddy = (int) (uy * DIR_SCALE);
addVertex(v, opos, ox, oy, addVertex(v, opos, ox, oy,
(short) (0 | ddx & DIR_MASK), (0 | ddx & DIR_MASK),
(short) (1 | ddy & DIR_MASK)); (1 | ddy & DIR_MASK));
if ((opos += 4) == SIZE) { if ((opos += 4) == SIZE) {
vertexItem = pool.getNext(vertexItem); vertexItem = pool.getNext(vertexItem);
@ -355,8 +355,8 @@ public final class LineLayer extends RenderElement {
} }
addVertex(v, opos, ox, oy, addVertex(v, opos, ox, oy,
(short) (2 | -ddx & DIR_MASK), (2 | -ddx & DIR_MASK),
(short) (1 | -ddy & DIR_MASK)); (1 | -ddy & DIR_MASK));
} else { } else {
/* outside means line is probably clipped /* outside means line is probably clipped
@ -402,8 +402,8 @@ public final class LineLayer extends RenderElement {
ddy = (int) (-(uy + ty) * DIR_SCALE); ddy = (int) (-(uy + ty) * DIR_SCALE);
addVertex(v, opos, ox, oy, addVertex(v, opos, ox, oy,
(short) (2 | ddx & DIR_MASK), (2 | ddx & DIR_MASK),
(short) (1 | ddy & DIR_MASK)); (1 | ddy & DIR_MASK));
} }
curX = nextX; curX = nextX;
@ -534,8 +534,8 @@ public final class LineLayer extends RenderElement {
ddy = (int) (uy * DIR_SCALE); ddy = (int) (uy * DIR_SCALE);
addVertex(v, opos, ox, oy, addVertex(v, opos, ox, oy,
(short) (0 | ddx & DIR_MASK), (0 | ddx & DIR_MASK),
(short) (1 | ddy & DIR_MASK)); (1 | ddy & DIR_MASK));
if ((opos += 4) == SIZE) { if ((opos += 4) == SIZE) {
vertexItem = pool.getNext(vertexItem); vertexItem = pool.getNext(vertexItem);
@ -544,8 +544,8 @@ public final class LineLayer extends RenderElement {
} }
addVertex(v, opos, ox, oy, addVertex(v, opos, ox, oy,
(short) (2 | -ddx & DIR_MASK), (2 | -ddx & DIR_MASK),
(short) (1 | -ddy & DIR_MASK)); (1 | -ddy & DIR_MASK));
if ((opos += 4) == SIZE) { if ((opos += 4) == SIZE) {
vertexItem = pool.getNext(vertexItem); vertexItem = pool.getNext(vertexItem);
@ -558,8 +558,8 @@ public final class LineLayer extends RenderElement {
ddy = (int) ((uy - vPrevY) * DIR_SCALE); ddy = (int) ((uy - vPrevY) * DIR_SCALE);
addVertex(v, opos, ox, oy, addVertex(v, opos, ox, oy,
(short) (0 | ddx & DIR_MASK), (0 | ddx & DIR_MASK),
(short) (0 | ddy & DIR_MASK)); (0 | ddy & DIR_MASK));
/* last vertex */ /* last vertex */
ddx = (int) (-(ux + vPrevX) * DIR_SCALE); ddx = (int) (-(ux + vPrevX) * DIR_SCALE);
@ -583,8 +583,8 @@ public final class LineLayer extends RenderElement {
ddy = (int) ((uy - vPrevY) * DIR_SCALE); ddy = (int) ((uy - vPrevY) * DIR_SCALE);
addVertex(v, opos, ox, oy, addVertex(v, opos, ox, oy,
(short) (0 | ddx & DIR_MASK), (0 | ddx & DIR_MASK),
(short) (1 | ddy & DIR_MASK)); (1 | ddy & DIR_MASK));
/* last vertex */ /* last vertex */
ddx = (int) (-(ux + vPrevX) * DIR_SCALE); ddx = (int) (-(ux + vPrevX) * DIR_SCALE);