use new Tessellator for Mesh- and ExtrusionLayer
This commit is contained in:
@@ -1,16 +1,14 @@
|
||||
package org.oscim.utils.tess;
|
||||
|
||||
import static java.lang.System.out;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.Arrays;
|
||||
|
||||
public class Tesselator {
|
||||
package org.oscim.utils;
|
||||
|
||||
public class TessJNI {
|
||||
private long inst;
|
||||
|
||||
public Tesselator() {
|
||||
inst = newTess();
|
||||
public TessJNI() {
|
||||
inst = newTess(0);
|
||||
}
|
||||
|
||||
public TessJNI(int bucketSize) {
|
||||
inst = newTess(bucketSize);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -25,6 +23,10 @@ public class Tesselator {
|
||||
}
|
||||
}
|
||||
|
||||
protected long instance() {
|
||||
return inst;
|
||||
}
|
||||
|
||||
/**
|
||||
* See OpenGL Red Book for description of the winding rules
|
||||
* http://www.glprogramming.com/red/chapter11.html
|
||||
@@ -52,9 +54,8 @@ public class Tesselator {
|
||||
return;
|
||||
if ((length % 2 != 0) || (offset % 2 != 0) || (points.length >> 1) < (offset + length))
|
||||
throw new IllegalArgumentException("Invalid input: length:" + length
|
||||
+ ", offset:" + offset
|
||||
+ ", points.length:" + points.length);
|
||||
|
||||
+ ", offset:" + offset
|
||||
+ ", points.length:" + points.length);
|
||||
addContour(inst, 2, points, 8, offset, length);
|
||||
}
|
||||
|
||||
@@ -62,6 +63,17 @@ public class Tesselator {
|
||||
addMultiContour2D(inst, index, contour, 0, index.length);
|
||||
}
|
||||
|
||||
public void addContour2D(int[] index, float[] contour, int idxStart, int idxEnd) {
|
||||
addMultiContour2D(inst, index, contour, idxStart, idxEnd);
|
||||
}
|
||||
|
||||
public boolean tesselate() {
|
||||
return tessContour2D(inst,
|
||||
TessJNI.WindingRule.POSITIVE,
|
||||
TessJNI.ElementType.POLYGONS,
|
||||
3, 2) == 1;
|
||||
}
|
||||
|
||||
public boolean tesselate(int windingRule, int elementType) {
|
||||
return tessContour2D(inst, windingRule, elementType, 3, 2) == 1;
|
||||
}
|
||||
@@ -94,25 +106,52 @@ public class Tesselator {
|
||||
getVertexIndices(inst, out, offset, length);
|
||||
}
|
||||
|
||||
public void getElementsWithInputVertexIds(short[] out, int dstOffset, int offset, int length) {
|
||||
getElementsWithInputVertexIds(inst, out, dstOffset, offset, length);
|
||||
public void getElementsWithInputVertexIds(short[] dst, int dstOffset, int offset, int length) {
|
||||
getElementsWithInputVertexIds(inst, dst, dstOffset, offset, length);
|
||||
}
|
||||
|
||||
// @formatter:off
|
||||
|
||||
/*JNI
|
||||
#include <tesselator.h>
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
void* heapAlloc( void* userData, unsigned int size ){
|
||||
TESS_NOTUSED( userData );
|
||||
return malloc( size );
|
||||
}
|
||||
void* heapRealloc( void *userData, void* ptr, unsigned int size ){
|
||||
TESS_NOTUSED( userData );
|
||||
return realloc( ptr, size );
|
||||
}
|
||||
void heapFree( void* userData, void* ptr ){
|
||||
TESS_NOTUSED( userData );
|
||||
free( ptr );
|
||||
}
|
||||
*/
|
||||
private static native long newTess(); /* {
|
||||
return (long)tessNewTess(0);
|
||||
static native long newTess(int size); /* {
|
||||
if (size <= 0)
|
||||
return (long)tessNewTess(0);
|
||||
if (size > 10)
|
||||
size = 10;
|
||||
TESSalloc ma;
|
||||
memset(&ma, 0, sizeof(ma));
|
||||
ma.memalloc = heapAlloc;
|
||||
ma.memfree = heapFree;
|
||||
ma.memrealloc = heapRealloc;
|
||||
//ma.userData = (void*)&allocated;
|
||||
ma.meshEdgeBucketSize = 2 << size; // 512
|
||||
ma.meshVertexBucketSize = 2 << size; // 512
|
||||
ma.meshFaceBucketSize = 1 << size; // 256
|
||||
ma.dictNodeBucketSize = 2 << size; // 512
|
||||
ma.regionBucketSize = 1 << size; // 256
|
||||
ma.extraVertices = 8;
|
||||
//ma.extraVertices = 256;
|
||||
return (long)tessNewTess(&ma);
|
||||
} */
|
||||
|
||||
private static native void freeTess(long inst); /* {
|
||||
static native void freeTess(long inst); /* {
|
||||
tessDeleteTess((TESStesselator*) inst);
|
||||
} */
|
||||
|
||||
/**
|
||||
/**
|
||||
* Adds a contour to be tesselated.
|
||||
* The type of the vertex coordinates is assumed to be TESSreal.
|
||||
*
|
||||
@@ -120,220 +159,107 @@ public class Tesselator {
|
||||
* @param size - number of coordinates per vertex. Must be 2 or 3.
|
||||
* @param pointer - pointer to the first coordinate of the first vertex in the array.
|
||||
* @param stride - defines offset in bytes between consecutive vertices.
|
||||
* @param count - number of vertices in contour.
|
||||
* @param count - number of vertices in contour.
|
||||
*/
|
||||
private static native void addContour(long inst, int size, float[] contour, int stride, int offset, int count);/* {
|
||||
static native void addContour(long inst, int size, float[] contour, int stride, int offset, int count);/* {
|
||||
tessAddContour((TESStesselator*) inst, size, contour + (offset * stride), stride, count);
|
||||
} */
|
||||
|
||||
private static native void addMultiContour2D(long inst, int[] index, float[] contour, int idxStart, int idxCount);/* {
|
||||
static native void addMultiContour2D(long inst, int[] index, float[] contour, int idxStart, int idxCount);/* {
|
||||
TESStesselator* tess = (TESStesselator*) inst;
|
||||
int offset = 0;
|
||||
|
||||
// start at 0 to get the correct offset in contour..
|
||||
for (int i = 0; i < idxStart + idxCount; i++){
|
||||
int len = index[i];
|
||||
|
||||
if ((len % 2 != 0) || (len < 0))
|
||||
break;
|
||||
|
||||
if (len < 6 || i < idxStart) {
|
||||
offset += len;
|
||||
continue;
|
||||
}
|
||||
|
||||
tessAddContour(tess, 2, contour + offset, 8, len >> 1);
|
||||
|
||||
offset += len;
|
||||
}
|
||||
} */
|
||||
|
||||
/**
|
||||
* Tesselate contours.
|
||||
*
|
||||
*
|
||||
* @param tess - pointer to tesselator object.
|
||||
* @param windingRule - winding rules used for tesselation, must be one of TessWindingRule.
|
||||
* @param elementType - defines the tesselation result element type, must be one of TessElementType.
|
||||
* @param polySize - defines maximum vertices per polygons if output is polygons.
|
||||
* @param vertexSize - defines the number of coordinates in tesselation result vertex, must be 2 or 3.
|
||||
* @param normal - defines the normal of the input contours, of null the normal is calculated automatically.
|
||||
* @return 1 if succeed, 0 if failed.
|
||||
* @return 1 if succeed, 0 if failed.
|
||||
*/
|
||||
private static native int tessContour2D(long inst, int windingRule, int elementType, int polySize, int vertexSize);/*{
|
||||
static native int tessContour2D(long inst, int windingRule, int elementType, int polySize, int vertexSize);/*{
|
||||
return tessTesselate((TESStesselator*) inst, windingRule, elementType, polySize, vertexSize, 0);
|
||||
} */
|
||||
|
||||
private static native int getVertexCount(long inst); /*{
|
||||
static native int getVertexCount(long inst); /*{
|
||||
return tessGetVertexCount((TESStesselator*) inst);
|
||||
}*/
|
||||
|
||||
/**
|
||||
* Returns pointer to first coordinate of first vertex.
|
||||
*/
|
||||
private static native boolean getVertices(long inst, float[] out, int offset, int length);/*{
|
||||
const TESSIOreal* vertices = tessGetVertices((TESStesselator*) inst);
|
||||
|
||||
//const TESSreal* vertices = tessGetVertices((TESStesselator*) inst);
|
||||
|
||||
static native boolean getVertices(long inst, float[] out, int offset, int length);/*{
|
||||
const TESSreal* vertices = tessGetVertices((TESStesselator*) inst);
|
||||
if (!vertices)
|
||||
return 0;
|
||||
|
||||
memcpy(out, vertices + offset, length * sizeof(TESSIOreal));
|
||||
|
||||
//memcpy(out, vertices + offset, length * sizeof(TESSreal));
|
||||
|
||||
memcpy(out, vertices + offset, length * sizeof(TESSreal));
|
||||
return 1;
|
||||
}*/
|
||||
|
||||
/**
|
||||
* Returns pointer to first coordinate of first vertex.
|
||||
*/
|
||||
private static native void getVerticesS(long inst, short[] out, int offset, int length, float scale);/*{
|
||||
const TESSIOreal* vertices = tessGetVertices((TESStesselator*) inst);
|
||||
|
||||
//const TESSreal* vertices = tessGetVertices((TESStesselator*) inst);
|
||||
|
||||
static native void getVerticesS(long inst, short[] out, int offset, int length, float scale);/*{
|
||||
const TESSreal* vertices = tessGetVertices((TESStesselator*) inst);
|
||||
for(int i = 0; i < length; i++)
|
||||
out[i] = (short)(vertices[offset++] * scale + 0.5f);
|
||||
}*/
|
||||
|
||||
/**
|
||||
* Returns pointer to first vertex index.
|
||||
*
|
||||
*
|
||||
* Vertex indices can be used to map the generated vertices to the original vertices.
|
||||
* Every point added using tessAddContour() will get a new index starting at 0.
|
||||
* New vertices generated at the intersections of segments are assigned value TESS_UNDEF.
|
||||
*/
|
||||
private static native boolean getVertexIndices(long inst, int[] out, int offset, int length);/* {
|
||||
static native boolean getVertexIndices(long inst, int[] out, int offset, int length);/* {
|
||||
const TESSindex* indices = tessGetVertexIndices((TESStesselator*) inst);
|
||||
if (!indices)
|
||||
return 0;
|
||||
|
||||
memcpy(out, indices + offset, length * sizeof(TESSindex));
|
||||
return 1;
|
||||
} */
|
||||
|
||||
/**
|
||||
* Returns number of elements in the the tesselated output.
|
||||
*/
|
||||
private static native int getElementCount(long inst);/*{
|
||||
static native int getElementCount(long inst);/*{
|
||||
return tessGetElementCount((TESStesselator*) inst);
|
||||
}*/
|
||||
|
||||
/**
|
||||
* Returns pointer to the first element.
|
||||
* Returns pointer to the first element.
|
||||
*/
|
||||
private static native boolean getElements(long inst, int[] out, int offset, int length);/*{
|
||||
static native boolean getElements(long inst, int[] out, int offset, int length);/*{
|
||||
const TESSindex* elements = tessGetElements((TESStesselator*) inst);
|
||||
if (!elements)
|
||||
return 0;
|
||||
|
||||
memcpy(out, elements + offset, length * sizeof(TESSindex));
|
||||
return 1;
|
||||
}*/
|
||||
|
||||
|
||||
/**
|
||||
* Returns pointer to the first element.
|
||||
* Returns pointer to the first element.
|
||||
*/
|
||||
private static native void getElementsS(long inst, short[] out, int offset, int length);/*{
|
||||
static native void getElementsS(long inst, short[] out, int offset, int length);/*{
|
||||
const TESSindex* elements = tessGetElements((TESStesselator*) inst);
|
||||
for(int i = 0; i < length; i++)
|
||||
out[i] = (short)elements[offset++];
|
||||
}*/
|
||||
|
||||
/**
|
||||
* Returns list of triangles indices (or to the first element of convex polygons).
|
||||
* Returns list of triangles indices (or to the first element of convex polygons).
|
||||
*/
|
||||
private static native void getElementsWithInputVertexIds(long inst, short[] out, int dstOffset, int offset, int length);/*{
|
||||
static native void getElementsWithInputVertexIds(long inst, short[] out, int dstOffset, int offset, int length);/*{
|
||||
const TESSindex* elements = tessGetElements((TESStesselator*) inst);
|
||||
const TESSindex* indices = tessGetVertexIndices((TESStesselator*) inst);
|
||||
|
||||
for(int i = 0; i < length; i++)
|
||||
out[dstOffset++] = (short)indices[elements[offset++]];
|
||||
out[dstOffset++] = (short)(indices[elements[offset++]]);
|
||||
}*/
|
||||
|
||||
//@formatter:on
|
||||
public static void main(String[] args) throws Exception {
|
||||
System.load(new File("libs/linux64/libvtm-jni64.so").getAbsolutePath());
|
||||
Tesselator tess = new Tesselator();
|
||||
|
||||
float[] c1 = new float[] {
|
||||
0, 0,
|
||||
4, 0,
|
||||
4, 4,
|
||||
0, 4,
|
||||
};
|
||||
|
||||
float[] c2 = new float[] {
|
||||
1, 1,
|
||||
1, 2,
|
||||
2, 2,
|
||||
2, 1
|
||||
};
|
||||
|
||||
float[] c3 = new float[] {
|
||||
0, 0,
|
||||
4, 0,
|
||||
4, 4,
|
||||
0, 4,
|
||||
|
||||
1, 1,
|
||||
1, 2,
|
||||
2, 2,
|
||||
2, 1
|
||||
};
|
||||
|
||||
int polySize = 3;
|
||||
|
||||
addContour(tess.inst, 2, c1, 8, 0, c1.length / 2);
|
||||
|
||||
//addContour(tess.inst, 2, c2, 8, c2.length / 2);
|
||||
|
||||
//addContour(tess.inst, 2, c3, 8, c3.length / 2);
|
||||
|
||||
//int[] index = { 8, 8, -1 };
|
||||
|
||||
//addMultiContour2D(tess.inst, index, c3, 0, 4);
|
||||
out.println("yup");
|
||||
|
||||
tessContour2D(tess.inst,
|
||||
WindingRule.POSITIVE,
|
||||
ElementType.POLYGONS,
|
||||
polySize, 2);
|
||||
|
||||
out.println("y0!");
|
||||
|
||||
int nElem = getElementCount(tess.inst);
|
||||
int nVert = getVertexCount(tess.inst);
|
||||
|
||||
out.println(nVert + "/" + nElem);
|
||||
|
||||
short[] elems = new short[nElem * polySize];
|
||||
getElementsS(tess.inst, elems, 0, nElem * polySize);
|
||||
|
||||
out.println(Arrays.toString(elems));
|
||||
|
||||
int half = nElem * polySize / 2;
|
||||
elems = new short[half];
|
||||
getElementsS(tess.inst, elems, half, half);
|
||||
|
||||
out.println(Arrays.toString(elems));
|
||||
|
||||
float[] verts = new float[nVert * 2];
|
||||
getVertices(tess.inst, verts, 0, nVert * 2);
|
||||
|
||||
out.println(Arrays.toString(verts));
|
||||
|
||||
short[] ids = new short[nElem * polySize];
|
||||
getElementsWithInputVertexIds(tess.inst, ids, 0, 0, ids.length);
|
||||
|
||||
out.println(Arrays.toString(ids));
|
||||
|
||||
for (int i = 0; i < nElem * polySize; i++) {
|
||||
out.println(c3[ids[i] * 2] + ", " + c3[ids[i] * 2 + 1]);
|
||||
}
|
||||
out.println();
|
||||
|
||||
freeTess(tess.inst);
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user