pooled items now extend pool.Inlist and using generic pool.SyncPool

This commit is contained in:
Hannes Janetzek
2013-04-09 23:06:06 +02:00
parent 5f37f2f0de
commit ab56cc4b18
24 changed files with 767 additions and 680 deletions

View File

@@ -85,10 +85,10 @@ public final class LineLayer extends Layer {
else if (line.cap == Cap.SQUARE)
squared = true;
if (pool == null)
curItem = pool = VertexPool.get();
if (vertexItems == null)
curItem = vertexItems = VertexItem.pool.get();
VertexPoolItem si = curItem;
VertexItem si = curItem;
short v[] = si.vertices;
int opos = si.used;
@@ -175,8 +175,8 @@ public final class LineLayer extends Layer {
// when the endpoint is outside the tile region omit round caps.
boolean outside = (x < tmin || x > tmax || y < tmin || y > tmax);
if (opos == VertexPoolItem.SIZE) {
si = si.next = VertexPool.get();
if (opos == VertexItem.SIZE) {
si = si.next = VertexItem.pool.get();
v = si.vertices;
opos = 0;
}
@@ -193,8 +193,8 @@ public final class LineLayer extends Layer {
v[opos++] = dx;
v[opos++] = dy;
if (opos == VertexPoolItem.SIZE) {
si = si.next = VertexPool.get();
if (opos == VertexItem.SIZE) {
si = si.next = VertexItem.pool.get();
v = si.vertices;
opos = 0;
}
@@ -204,8 +204,8 @@ public final class LineLayer extends Layer {
v[opos++] = dx;
v[opos++] = dy;
if (opos == VertexPoolItem.SIZE) {
si = si.next = VertexPool.get();
if (opos == VertexItem.SIZE) {
si = si.next = VertexItem.pool.get();
v = si.vertices;
opos = 0;
}
@@ -218,8 +218,8 @@ public final class LineLayer extends Layer {
v[opos++] = (short) (2 | ddx & DIR_MASK);
v[opos++] = (short) (2 | ddy & DIR_MASK);
if (opos == VertexPoolItem.SIZE) {
si = si.next = VertexPool.get();
if (opos == VertexItem.SIZE) {
si = si.next = VertexItem.pool.get();
v = si.vertices;
opos = 0;
}
@@ -233,8 +233,8 @@ public final class LineLayer extends Layer {
v[opos++] = (short) (0 | ddx & DIR_MASK);
v[opos++] = (short) (1 | ddy & DIR_MASK);
if (opos == VertexPoolItem.SIZE) {
si = si.next = VertexPool.get();
if (opos == VertexItem.SIZE) {
si = si.next = VertexItem.pool.get();
v = si.vertices;
opos = 0;
}
@@ -273,8 +273,8 @@ public final class LineLayer extends Layer {
v[opos++] = dx;
v[opos++] = dy;
if (opos == VertexPoolItem.SIZE) {
si = si.next = VertexPool.get();
if (opos == VertexItem.SIZE) {
si = si.next = VertexItem.pool.get();
v = si.vertices;
opos = 0;
}
@@ -284,8 +284,8 @@ public final class LineLayer extends Layer {
v[opos++] = dx;
v[opos++] = dy;
if (opos == VertexPoolItem.SIZE) {
si = si.next = VertexPool.get();
if (opos == VertexItem.SIZE) {
si = si.next = VertexItem.pool.get();
v = si.vertices;
opos = 0;
}
@@ -366,8 +366,8 @@ public final class LineLayer extends Layer {
ddx = -ddx;
ddy = -ddy;
}
if (opos == VertexPoolItem.SIZE) {
si = si.next = VertexPool.get();
if (opos == VertexItem.SIZE) {
si = si.next = VertexItem.pool.get();
v = si.vertices;
opos = 0;
}
@@ -377,8 +377,8 @@ public final class LineLayer extends Layer {
v[opos++] = (short) (0 | ddx & DIR_MASK);
v[opos++] = (short) (1 | ddy & DIR_MASK);
if (opos == VertexPoolItem.SIZE) {
si = si.next = VertexPool.get();
if (opos == VertexItem.SIZE) {
si = si.next = VertexItem.pool.get();
v = si.vertices;
opos = 0;
}
@@ -401,8 +401,8 @@ public final class LineLayer extends Layer {
outside = (x < tmin || x > tmax || y < tmin || y > tmax);
if (opos == VertexPoolItem.SIZE) {
si.next = VertexPool.get();
if (opos == VertexItem.SIZE) {
si.next = VertexItem.pool.get();
si = si.next;
opos = 0;
v = si.vertices;
@@ -425,8 +425,8 @@ public final class LineLayer extends Layer {
v[opos++] = (short) (0 | ddx & DIR_MASK);
v[opos++] = (short) (1 | ddy & DIR_MASK);
if (opos == VertexPoolItem.SIZE) {
si = si.next = VertexPool.get();
if (opos == VertexItem.SIZE) {
si = si.next = VertexItem.pool.get();
v = si.vertices;
opos = 0;
}
@@ -436,8 +436,8 @@ public final class LineLayer extends Layer {
v[opos++] = (short) (2 | -ddx & DIR_MASK);
v[opos++] = (short) (1 | -ddy & DIR_MASK);
if (opos == VertexPoolItem.SIZE) {
si = si.next = VertexPool.get();
if (opos == VertexItem.SIZE) {
si = si.next = VertexItem.pool.get();
v = si.vertices;
opos = 0;
}
@@ -454,8 +454,8 @@ public final class LineLayer extends Layer {
v[opos++] = dx;
v[opos++] = dy;
if (opos == VertexPoolItem.SIZE) {
si = si.next = VertexPool.get();
if (opos == VertexItem.SIZE) {
si = si.next = VertexItem.pool.get();
v = si.vertices;
opos = 0;
}
@@ -471,8 +471,8 @@ public final class LineLayer extends Layer {
v[opos++] = dx;
v[opos++] = dy;
if (opos == VertexPoolItem.SIZE) {
si = si.next = VertexPool.get();
if (opos == VertexItem.SIZE) {
si = si.next = VertexItem.pool.get();
v = si.vertices;
opos = 0;
}
@@ -502,8 +502,8 @@ public final class LineLayer extends Layer {
v[opos++] = (short) (0 | (flip ? -ddx : ddx) & DIR_MASK);
v[opos++] = (short) (1 | (flip ? -ddy : ddy) & DIR_MASK);
if (opos == VertexPoolItem.SIZE) {
si = si.next = VertexPool.get();
if (opos == VertexItem.SIZE) {
si = si.next = VertexItem.pool.get();
v = si.vertices;
opos = 0;
}
@@ -519,8 +519,8 @@ public final class LineLayer extends Layer {
v[opos++] = dx;
v[opos++] = dy;
if (opos == VertexPoolItem.SIZE) {
si = si.next = VertexPool.get();
if (opos == VertexItem.SIZE) {
si = si.next = VertexItem.pool.get();
v = si.vertices;
opos = 0;
}