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

avoid copy - pin coordinate buffer for triangulation

Browse Source
This commit is contained in:
Hannes Janetzek 2013-03-16 03:56:17 +01:00
parent f2bbc51558
commit 22441bf527
3 changed files with 110 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

140
jni/triangle/TriangleJni.c
View File

@ -13,7 +13,8 @@
int pnpoly(int nvert, float *vert, float testx, float testy) int pnpoly(int nvert, float *vert, float testx, float testy)
{ {
int i, j, c = 0; int i, j, c = 0;
for (i = 0, j = (nvert-1)*2; i < nvert * 2; j = i++) { for (i = 0, j = (nvert-1)*2; i < nvert * 2; j = i++)
{
if ( ((vert[i*2+1] > testy) != (vert[j*j+1] > testy)) && if ( ((vert[i*2+1] > testy) != (vert[j*j+1] > testy)) &&
(testx < (vert[j*2]-vert[i*2]) (testx < (vert[j*2]-vert[i*2])
* (testy - vert[i*2+1]) * (testy - vert[i*2+1])
@ -26,7 +27,8 @@ int pnpoly(int nvert, float *vert, float testx, float testy)
//#define TESTING //#define TESTING
int compare_dups(const void *a, const void *b) { int compare_dups(const void *a, const void *b)
{
int da = *((const int*) a); int da = *((const int*) a);
int db = *((const int*) b); int db = *((const int*) b);
@ -35,31 +37,42 @@ int compare_dups(const void *a, const void *b) {
typedef struct triangulateio TriangleIO; typedef struct triangulateio TriangleIO;
jint Java_org_oscim_jni_TriangleJNI_triangulate(JNIEnv *env, jclass c, jint Java_org_oscim_renderer_layer_ExtrusionLayer_triangulate(JNIEnv *env,
jobject point_buf, jint num_rings, jobject indice_buf, jint offset) { jclass c, jfloatArray obj_points, jint pos, jint len, jint num_rings,
jfloat* points = (jfloat*) (*env)->GetDirectBufferAddress(env, point_buf); jobject indice_buf, jint offset)
{
jshort* indices = (jshort*) (*env)->GetDirectBufferAddress(env, indice_buf); jshort* indices = (jshort*) (*env)->GetDirectBufferAddress(env, indice_buf);
jboolean isCopy;
float* orig_points = (float*) (*env)->GetPrimitiveArrayCritical(env,
obj_points, &isCopy);
if (orig_points == NULL)
return 0;
if (isCopy)
printf("Poor bugger: VM copied array");
float *points = orig_points + pos;
TriangleIO in, out; TriangleIO in, out;
char buf[128]; char buf[128];
memset(&in, 0, sizeof(TriangleIO)); memset(&in, 0, sizeof(TriangleIO));
//int num_points = (indices[0])>>1; in.numberofpoints = len >> 1;
in.numberofpoints = (indices[0]) >> 1;
in.pointlist = (float *) points; in.pointlist = (float *) points;
// check if explicitly closed // check if explicitly closed
if (in.pointlist[0] == in.pointlist[indices[1] - 2] if (in.pointlist[0] == in.pointlist[indices[0] - 2]
&& in.pointlist[1] == in.pointlist[indices[1] - 1]) { && in.pointlist[1] == in.pointlist[indices[0] - 1])
{
int point = 0; int point = 0;
for (int i = 0; i < num_rings; i++) { for (int i = 0; i < num_rings; i++)
{
// remove last point in ring // remove last point in ring
indices[i + 1] -= 2; indices[i] -= 2;
int last = point + (indices[i + 1] >> 1); int last = point + (indices[i] >> 1);
//sprintf(buf, "drop closing point at %d, %d:\n", point, last);
//mylog(buf);
if (in.numberofpoints - last > 1) if (in.numberofpoints - last > 1)
memmove(in.pointlist + (last * 2), memmove(in.pointlist + (last * 2),
@ -70,7 +83,6 @@ jint Java_org_oscim_jni_TriangleJNI_triangulate(JNIEnv *env, jclass c,
point = last; point = last;
} }
} }
int dups = 0; int dups = 0;
@ -79,13 +91,16 @@ jint Java_org_oscim_jni_TriangleJNI_triangulate(JNIEnv *env, jclass c,
// check for duplicate vertices and keep a list // check for duplicate vertices and keep a list
// of dups and the first occurence // of dups and the first occurence
for (int i = 0; i < in.numberofpoints - 1; i++) { for (int i = 0; i < in.numberofpoints - 1; i++)
{
float x = *i_points++; float x = *i_points++;
float y = *i_points++; float y = *i_points++;
float *j_points = i_points; float *j_points = i_points;
for (int j = i + 1; j < in.numberofpoints; j++, j_points += 2) { for (int j = i + 1; j < in.numberofpoints; j++, j_points += 2)
if ((*j_points == x) && (*(j_points + 1) == y)) { {
if ((*j_points == x) && (*(j_points + 1) == y))
{
skip_list = realloc(skip_list, (dups + 2) * 2 * sizeof(int)); skip_list = realloc(skip_list, (dups + 2) * 2 * sizeof(int));
skip_list[dups * 2 + 0] = j; skip_list[dups * 2 + 0] = j;
skip_list[dups * 2 + 1] = i; skip_list[dups * 2 + 1] = i;
@ -95,7 +110,8 @@ jint Java_org_oscim_jni_TriangleJNI_triangulate(JNIEnv *env, jclass c,
} }
#ifdef TESTING #ifdef TESTING
for (i = 0; i < in.numberofpoints; i++) { for (i = 0; i < in.numberofpoints; i++)
{
printf("point: %f, %f\n", points[i*2], points[i*2+1]); printf("point: %f, %f\n", points[i*2], points[i*2+1]);
} }
printf("points: %d, rings: %d\n", in.numberofpoints, num_rings); printf("points: %d, rings: %d\n", in.numberofpoints, num_rings);
@ -105,7 +121,8 @@ jint Java_org_oscim_jni_TriangleJNI_triangulate(JNIEnv *env, jclass c,
in.numberofholes = num_rings - 1; in.numberofholes = num_rings - 1;
int *rings = NULL; int *rings = NULL;
if (in.numberofholes > 0) { if (in.numberofholes > 0)
{
in.holelist = (float *) malloc(in.numberofholes * 2 * sizeof(float)); in.holelist = (float *) malloc(in.numberofholes * 2 * sizeof(float));
rings = (int*) malloc(num_rings * sizeof(int)); rings = (int*) malloc(num_rings * sizeof(int));
} }
@ -119,9 +136,10 @@ jint Java_org_oscim_jni_TriangleJNI_triangulate(JNIEnv *env, jclass c,
int ring; int ring;
// assign all points to segments for each ring // assign all points to segments for each ring
for (ring = 0, point = 0; ring < num_rings; ring++, point++) { for (ring = 0, point = 0; ring < num_rings; ring++, point++)
{
int len; int len;
int num_points = indices[ring + 1] >> 1; int num_points = indices[ring] >> 1;
if (rings) if (rings)
rings[ring] = num_points; rings[ring] = num_points;
@ -131,7 +149,8 @@ jint Java_org_oscim_jni_TriangleJNI_triangulate(JNIEnv *env, jclass c,
// 'parallel' lines have a distance of at least // 'parallel' lines have a distance of at least
// 1 unit. you'll notice when things went wrong // 1 unit. you'll notice when things went wrong
// when the hole is rendered instead of the poly // when the hole is rendered instead of the poly
if (ring > 0) { if (ring > 0)
{
int k = point * 2; int k = point * 2;
float nx = in.pointlist[k++]; float nx = in.pointlist[k++];
@ -140,7 +159,8 @@ jint Java_org_oscim_jni_TriangleJNI_triangulate(JNIEnv *env, jclass c,
float cx, cy, vx, vy; float cx, cy, vx, vy;
// try to find a large enough segment // try to find a large enough segment
for (len = (point + num_points) * 2; k < len;) { for (len = (point + num_points) * 2; k < len;)
{
cx = nx; cx = nx;
cy = ny; cy = ny;
@ -171,16 +191,18 @@ jint Java_org_oscim_jni_TriangleJNI_triangulate(JNIEnv *env, jclass c,
*seg++ = last; *seg++ = last;
*seg++ = point; *seg++ = point;
for (len = point + num_points - 1; point < len; point++) { for (len = point + num_points - 1; point < len; point++)
{
*seg++ = point; *seg++ = point;
*seg++ = point + 1; *seg++ = point + 1;
} }
} }
if (dups) { if (dups)
{
for (int i = 0; i < dups; i++) { for (int i = 0; i < dups; i++)
printf("duplicate points at %d, %d: %f,%f\n", {
printf( "duplicate points at %d, %d: %f,%f\n",
skip_list[i*2], skip_list[i*2+1], skip_list[i*2], skip_list[i*2+1],
in.pointlist[skip_list[i*2+1]*2], in.pointlist[skip_list[i*2+1]*2],
in.pointlist[skip_list[i*2+1]*2+1]); in.pointlist[skip_list[i*2+1]*2+1]);
@ -193,19 +215,23 @@ jint Java_org_oscim_jni_TriangleJNI_triangulate(JNIEnv *env, jclass c,
for (int j = 0; j < in.numberofsegments; j++, seg += 2) for (int j = 0; j < in.numberofsegments; j++, seg += 2)
printf("%d %d %d\n", j, *seg, *(seg+1)); printf("%d %d %d\n", j, *seg, *(seg+1));
for (int j = 0; j < in.numberofholes; j++) { for (int j = 0; j < in.numberofholes; j++)
{
printf("%d %f %f\n", j, in.holelist[j*2], in.holelist[j*2+1]); printf("%d %f %f\n", j, in.holelist[j*2], in.holelist[j*2+1]);
} }
if (0) { if (0)
{
free(in.segmentlist); free(in.segmentlist);
free(in.holelist); free(in.holelist);
free(rings); free(rings);
free(skip_list); free(skip_list);
return 0; return 0;
} }
if (dups == 2) { if (dups == 2)
if (skip_list[0] > skip_list[2]) { {
if (skip_list[0] > skip_list[2])
{
int tmp = skip_list[0]; int tmp = skip_list[0];
skip_list[0] = skip_list[2]; skip_list[0] = skip_list[2];
skip_list[2] = tmp; skip_list[2] = tmp;
@ -216,14 +242,17 @@ jint Java_org_oscim_jni_TriangleJNI_triangulate(JNIEnv *env, jclass c,
printf("flip items\n"); printf("flip items\n");
} }
} else if (dups > 2) { }
else if (dups > 2)
{
printf("sort dups\n"); printf("sort dups\n");
qsort(skip_list, dups, 2 * sizeof(float), compare_dups); qsort(skip_list, dups, 2 * sizeof(float), compare_dups);
} }
// shift segment indices while removing duplicate points // shift segment indices while removing duplicate points
for (int i = 0; i < dups; i++) { for (int i = 0; i < dups; i++)
{
// position of the duplicate vertex // position of the duplicate vertex
int pos = skip_list[i * 2] - i; int pos = skip_list[i * 2] - i;
// first vertex // first vertex
@ -231,18 +260,21 @@ jint Java_org_oscim_jni_TriangleJNI_triangulate(JNIEnv *env, jclass c,
printf("add offset: %d, from pos %d\n", i, pos); printf("add offset: %d, from pos %d\n", i, pos);
seg = in.segmentlist; seg = in.segmentlist;
for (int j = 0; j < in.numberofsegments * 2; for (int j = 0; j < in.numberofsegments * 2; j++, seg++)
j++, seg++) { {
if (*seg == pos) { if (*seg == pos)
{
if (replacement >= pos) if (replacement >= pos)
*seg = replacement - i; *seg = replacement - i;
else else
*seg = replacement; *seg = replacement;
} else if (*seg > pos) }
else if (*seg > pos)
*seg -= 1; *seg -= 1;
} }
printf("move %d %d %d\n", pos, pos + 1, in.numberofpoints - pos - 1); printf(
"move %d %d %d\n", pos, pos + 1, in.numberofpoints - pos - 1);
if (in.numberofpoints - pos > 1) if (in.numberofpoints - pos > 1)
memmove(in.pointlist + (pos * 2), memmove(in.pointlist + (pos * 2),
@ -278,19 +310,24 @@ jint Java_org_oscim_jni_TriangleJNI_triangulate(JNIEnv *env, jclass c,
// Q - be quiet! // Q - be quiet!
triangulate("pzPNBQ", &in, &out, (TriangleIO *) NULL); triangulate("pzPNBQ", &in, &out, (TriangleIO *) NULL);
if (in.numberofpoints < out.numberofpoints) { if (in.numberofpoints < out.numberofpoints)
printf( {
"polygon input is bad! points in:%d out%d\n", in.numberofpoints, out.numberofpoints); printf( "polygon input is bad! points in:%d out%d\n",
in.numberofpoints,
out.numberofpoints);
for (int j = 0; j < in.numberofpoints; j++) { for (int j = 0; j < in.numberofpoints; j++)
{
printf("%d %f %f\n", j, in.pointlist[j*2], in.pointlist[j*2+1]); printf("%d %f %f\n", j, in.pointlist[j*2], in.pointlist[j*2+1]);
} }
seg = in.segmentlist; seg = in.segmentlist;
for (int j = 0; j < in.numberofsegments; j++, seg += 2) { for (int j = 0; j < in.numberofsegments; j++, seg += 2)
{
printf("%d %d %d\n", j, *seg, *(seg+1)); printf("%d %d %d\n", j, *seg, *(seg+1));
} }
(*env)->ReleasePrimitiveArrayCritical(env, obj_points, orig_points,
JNI_ABORT);
free(in.segmentlist); free(in.segmentlist);
free(in.holelist); free(in.holelist);
free(rings); free(rings);
@ -311,7 +348,8 @@ jint Java_org_oscim_jni_TriangleJNI_triangulate(JNIEnv *env, jclass c,
INDICE *tri; INDICE *tri;
/* shift back indices from removed duplicates */ /* shift back indices from removed duplicates */
for (int i = 0; i < dups; i++) { for (int i = 0; i < dups; i++)
{
int pos = skip_list[i * 2] + i; int pos = skip_list[i * 2] + i;
tri = out.trianglelist; tri = out.trianglelist;
@ -338,7 +376,8 @@ jint Java_org_oscim_jni_TriangleJNI_triangulate(JNIEnv *env, jclass c,
// additional vertices will be added. so the following rings // additional vertices will be added. so the following rings
// needs extra offset... // needs extra offset...
int start = offset; int start = offset;
for (int j = 0, m = in.numberofholes; j < m; j++) { for (int j = 0, m = in.numberofholes; j < m; j++)
{
start += rings[j] * stride; start += rings[j] * stride;
// even number of points? // even number of points?
if (!(rings[j] & 1)) if (!(rings[j] & 1))
@ -354,6 +393,9 @@ jint Java_org_oscim_jni_TriangleJNI_triangulate(JNIEnv *env, jclass c,
start += stride; start += stride;
} }
(*env)->ReleasePrimitiveArrayCritical(env, obj_points, orig_points,
JNI_ABORT);
free(in.segmentlist); free(in.segmentlist);
free(in.holelist); free(in.holelist);
free(rings); free(rings);

71
src/org/oscim/jni/TriangleJNI.java
View File

@ -1,71 +0,0 @@
package org.oscim.jni;
import java.nio.FloatBuffer;
import java.nio.ShortBuffer;
public class TriangleJNI {
public TriangleJNI() {
}
// private static boolean initialized = false;
//
// private static ShortBuffer sBuf;
// private static FloatBuffer fBuf;
//
// public static synchronized int triangulate(float[] points, int pos, int len, short[] indices) {
//
// int numRings = 1;
//
// if (!initialized) {
// fBuf = ByteBuffer.allocateDirect(360 * 4).order(ByteOrder.nativeOrder())
// .asFloatBuffer();
// sBuf = ByteBuffer.allocateDirect(360 * 2).order(ByteOrder.nativeOrder())
// .asShortBuffer();
// initialized = true;
// }
//
// fBuf.clear();
// fBuf.put(points, pos, len);
//
// sBuf.clear();
// sBuf.put((short) (len >> 1)); // all points
// sBuf.put((short) (len >> 1)); // outer ring
// //sBuf.put((short)4); // inner ring
//
// int numTris = TriangleJNI.triangulate(fBuf, numRings, sBuf);
// if (numTris > 100)
// Log.d("triangle", "Triangles: " + numTris);
//
// sBuf.limit(numTris * 3);
// sBuf.position(0);
//
// // for(int i = 0; i < numTris * 3; i+=3){
// // Log.d("triangle", ">>" + sBuf.get()+ " "+ sBuf.get() + " "+ sBuf.get());
// // }
//
// sBuf.get(indices, 0, numTris * 3);
//
// return numTris * 3;
// }
/**
* !!! NOT for general use!!! - this is specifically for ExtrusionLayer
* .
*
* @param points an array of x,y coordinates
* @param numRings number of rings in polygon == outer(1) + inner rings
* @param io input: 1. number of all points, 2.. number of points in rings -
* times 2!
* output: indices of triangles, 3 per triangle :) (indices use
* stride=2, i.e. 0,2,4...)
* @param ioffset offset used to add offset to indices
* @return number of triangles in io buffer
*/
public static native int triangulate(FloatBuffer points, int numRings, ShortBuffer io,
int ioffset);
static {
System.loadLibrary("triangle-jni");
}
}

31
src/org/oscim/renderer/layer/ExtrusionLayer.java
View File

@ -16,11 +16,9 @@ package org.oscim.renderer.layer;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.ByteOrder; import java.nio.ByteOrder;
import java.nio.FloatBuffer;
import java.nio.ShortBuffer; import java.nio.ShortBuffer;
import org.oscim.core.Tile; import org.oscim.core.Tile;
import org.oscim.jni.TriangleJNI;
import org.oscim.renderer.BufferObject; import org.oscim.renderer.BufferObject;
import org.oscim.renderer.GLRenderer; import org.oscim.renderer.GLRenderer;
import org.oscim.utils.LineClipper; import org.oscim.utils.LineClipper;
@ -414,31 +412,22 @@ public class ExtrusionLayer extends Layer {
private static boolean initialized = false; private static boolean initialized = false;
private static ShortBuffer sBuf; private static ShortBuffer sBuf;
private static FloatBuffer fBuf;
public static synchronized int triangulate(float[] points, int ppos, int plen, short[] index, public static synchronized int triangulate(float[] points, int ppos, int plen, short[] index,
int ipos, int rings, int vertexOffset, VertexPoolItem item) { int ipos, int rings, int vertexOffset, VertexPoolItem item) {
if (!initialized) { if (!initialized) {
// FIXME also cleanup on shutdown! // FIXME also cleanup on shutdown!
fBuf = ByteBuffer.allocateDirect(1200 * 4).order(ByteOrder.nativeOrder())
.asFloatBuffer();
sBuf = ByteBuffer.allocateDirect(1800 * 2).order(ByteOrder.nativeOrder()) sBuf = ByteBuffer.allocateDirect(1800 * 2).order(ByteOrder.nativeOrder())
.asShortBuffer(); .asShortBuffer();
initialized = true; initialized = true;
} }
fBuf.clear();
fBuf.put(points, ppos, plen);
sBuf.clear(); sBuf.clear();
sBuf.put((short) plen); // all points
sBuf.put(index, ipos, rings); sBuf.put(index, ipos, rings);
int numTris = TriangleJNI.triangulate(fBuf, rings, sBuf, vertexOffset); int numTris = triangulate(points, ppos, plen, rings, sBuf, vertexOffset);
int numIndices = numTris * 3; int numIndices = numTris * 3;
sBuf.limit(numIndices); sBuf.limit(numIndices);
@ -462,4 +451,22 @@ public class ExtrusionLayer extends Layer {
return numIndices; return numIndices;
} }
/**
* @param points an array of x,y coordinates
* @param pos position in points array
* @param len number of points * 2 (i.e. values to read)
* @param numRings number of rings in polygon == outer(1) + inner rings
* @param io input: number of points in rings - times 2!
* output: indices of triangles, 3 per triangle :) (indices use
* stride=2, i.e. 0,2,4...)
* @param ioffset offset used to add offset to indices
* @return number of triangles in io buffer
*/
public static native int triangulate(float[] points, int pos, int len, int numRings, ShortBuffer io,
int ioffset);
static {
System.loadLibrary("triangle-jni");
}
} }