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

fix warning, cleanups

Browse Source
This commit is contained in:
Hannes Janetzek 2013-03-18 03:49:04 +01:00
parent 38e2ac110d
commit a1604b3b33
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/org/oscim/utils/Triangulator.java
View File

@ -12,9 +12,9 @@ public class Triangulator {
/** The accepted error value */ /** The accepted error value */
private static final float EPSILON = 0.0000000001f; private static final float EPSILON = 0.0000000001f;
/** The list of points to be triangulated */ /** The list of points to be triangulated */
private PointList poly = new PointList(); private final PointList poly = new PointList();
/** The list of points describing the triangles */ /** The list of points describing the triangles */
private PointList tris = new PointList(); private final PointList tris = new PointList();
/** True if we've tried to triangulate */ /** True if we've tried to triangulate */
private boolean tried; private boolean tried;
@ -213,7 +213,8 @@ public class Triangulator {
/* remove nv-2 Vertices, creating 1 triangle every time */ /* remove nv-2 Vertices, creating 1 triangle every time */
int count = 2 * nv; /* error detection */ int count = 2 * nv; /* error detection */
for (int m = 0, v = nv - 1; nv > 2;) { //for (int m = 0, v = nv - 1; nv > 2;) {
for (int v = nv - 1; nv > 2;) {
/* if we loop, it is probably a non-simple polygon */ /* if we loop, it is probably a non-simple polygon */
if (0 >= (count--)) { if (0 >= (count--)) {
//** Triangulate: ERROR - probable bad polygon! //** Triangulate: ERROR - probable bad polygon!
@ -244,7 +245,7 @@ public class Triangulator {
result.add(contour.get(b)); result.add(contour.get(b));
result.add(contour.get(c)); result.add(contour.get(c));
m++; //m++;
/* remove v from remaining polygon */ /* remove v from remaining polygon */
for (s = v, t = v + 1; t < nv; s++, t++) { for (s = v, t = v + 1; t < nv; s++, t++) {
@ -267,9 +268,9 @@ public class Triangulator {
*/ */
private class Point { private class Point {
/** The x coorindate of this point */ /** The x coorindate of this point */
private float x; private final float x;
/** The y coorindate of this point */ /** The y coorindate of this point */
private float y; private final float y;
/** /**
* Create a new point * Create a new point
@ -317,7 +318,7 @@ public class Triangulator {
*/ */
private class PointList { private class PointList {
/** The list of points */ /** The list of points */
private ArrayList<Point> points = new ArrayList<Point>(); private final ArrayList<Point> points = new ArrayList<Point>();
/** /**
* Create a new empty list * Create a new empty list
@ -334,14 +335,14 @@ public class Triangulator {
points.add(point); points.add(point);
} }
/** ///**
* Remove a point from the list // * Remove a point from the list
* // *
* @param point The point to remove // * @param point The point to remove
*/ // */
public void remove(Point point) { //public void remove(Point point) {
points.remove(point); // points.remove(point);
} //}
/** /**
* Get the size of the list * Get the size of the list