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

GeometryBuffer: use 'pointLimit' field in addPoint

Browse Source
This commit is contained in:
Hannes Janetzek 2013-10-08 16:48:39 +02:00
parent 46b641c6cc
commit 7f4825afa5
1 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
vtm/src/org/oscim/core/GeometryBuffer.java
View File

@ -20,8 +20,6 @@ public class GeometryBuffer {
private final static int GROW_INDICES = 64; private final static int GROW_INDICES = 64;
private final static int GROW_POINTS = 512; private final static int GROW_POINTS = 512;
private PointF mTmpPoint = new PointF();
/** /**
* The Enum GeometryType. * The Enum GeometryType.
*/ */
@ -54,6 +52,9 @@ public class GeometryBuffer {
/** The current geometry type. */ /** The current geometry type. */
public GeometryType type; public GeometryType type;
private PointF mTmpPoint = new PointF();
private int pointLimit;
/** /**
* Instantiates a new geometry buffer. * Instantiates a new geometry buffer.
* *
@ -71,6 +72,7 @@ public class GeometryBuffer {
this.type = GeometryType.NONE; this.type = GeometryType.NONE;
this.indexPos = 0; this.indexPos = 0;
this.pointPos = 0; this.pointPos = 0;
this.pointLimit = points.length - 2;
} }
public PointF getPoint(int i) { public PointF getPoint(int i) {
@ -105,13 +107,13 @@ public class GeometryBuffer {
} }
/** /**
* Adds a point with the coordinates x and y. * Adds a point with the coordinate x, y.
* *
* @param x the x ordinate * @param x the x ordinate
* @param y the y ordinate * @param y the y ordinate
*/ */
public void addPoint(float x, float y) { public void addPoint(float x, float y) {
if (pointPos >= points.length - 1) if (pointPos > pointLimit)
ensurePointSize((pointPos >> 1) + 1, true); ensurePointSize((pointPos >> 1) + 1, true);
points[pointPos++] = x; points[pointPos++] = x;
@ -180,14 +182,10 @@ public class GeometryBuffer {
boolean start = (type == GeometryType.NONE); boolean start = (type == GeometryType.NONE);
setOrCheckMode(GeometryType.POLY); setOrCheckMode(GeometryType.POLY);
// ignore
if (index[indexPos] == 0)
return;
if ((indexPos + 3) > index.length) if ((indexPos + 3) > index.length)
ensureIndexSize(indexPos + 2, true); ensureIndexSize(indexPos + 2, true);
if (!start) { if (!start && index[indexPos] != 0) {
// end polygon // end polygon
index[++indexPos] = 0; index[++indexPos] = 0;
@ -237,21 +235,25 @@ public class GeometryBuffer {
} }
/** /**
* Ensure point size. * Ensure that 'points' array can hold the number of points.
* *
* @param size the size * @param size the number of points to hold
* @param copy the copy * @param copy the the current data when array is reallocated
* @return the float[] array holding current coordinates * @return the float[] array holding current coordinates
*/ */
public float[] ensurePointSize(int size, boolean copy) { public float[] ensurePointSize(int size, boolean copy) {
if (size * 2 < points.length) if (size * 2 < points.length)
return points; return points;
float[] tmp = new float[size * 2 + GROW_POINTS]; size = size * 2 + GROW_POINTS;
if (copy)
System.arraycopy(points, 0, tmp, 0, points.length); float[] newPoints = new float[size];
if (copy)
System.arraycopy(points, 0, newPoints, 0, points.length);
points = newPoints;
pointLimit = size - 2;
points = tmp;
return points; return points;
} }
@ -266,11 +268,11 @@ public class GeometryBuffer {
if (size < index.length) if (size < index.length)
return index; return index;
short[] tmp = new short[size + GROW_INDICES]; short[] newIndex = new short[size + GROW_INDICES];
if (copy) if (copy)
System.arraycopy(index, 0, tmp, 0, index.length); System.arraycopy(index, 0, newIndex, 0, index.length);
index = tmp; index = newIndex;
return index; return index;
} }