Small tweaks to CDT
- added CDT support for demo - added infinity-loop safety guard on CDT iteration count - visit all 4 neighbours - changed to options based API
This commit is contained in:
Mikko Mononen
parent
c655ececd5
commit
c6e6358018
5 changed files with 158 additions and 108 deletions
|
|
@ -56,6 +56,7 @@ void poolFree( void* userData, void* ptr )
|
|||
|
||||
|
||||
int run = 1;
|
||||
int cdt = 0;
|
||||
|
||||
static void key(GLFWwindow* window, int key, int scancode, int action, int mods)
|
||||
{
|
||||
|
|
@ -65,6 +66,8 @@ static void key(GLFWwindow* window, int key, int scancode, int action, int mods)
|
|||
glfwSetWindowShouldClose(window, GL_TRUE);
|
||||
if (key == GLFW_KEY_SPACE && action == GLFW_PRESS)
|
||||
run = !run;
|
||||
if (key == GLFW_KEY_C && action == GLFW_PRESS)
|
||||
cdt = !cdt;
|
||||
}
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
|
|
@ -79,14 +82,15 @@ int main(int argc, char *argv[])
|
|||
float t = 0.0f, pt = 0.0f;
|
||||
TESSalloc ma;
|
||||
TESStesselator* tess = 0;
|
||||
const int nvp = 6;
|
||||
const int nvp = 3;
|
||||
unsigned char* vflags = 0;
|
||||
int nvflags = 0;
|
||||
#ifdef USE_POOL
|
||||
struct MemPool pool;
|
||||
unsigned char mem[1024*1024];
|
||||
int nvflags = 0;
|
||||
#else
|
||||
int allocated = 0;
|
||||
double t0 = 0, t1 = 0;
|
||||
#endif
|
||||
TESS_NOTUSED(argc);
|
||||
TESS_NOTUSED(argv);
|
||||
|
|
@ -168,6 +172,8 @@ int main(int argc, char *argv[])
|
|||
|
||||
#else
|
||||
|
||||
t0 = glfwGetTime();
|
||||
|
||||
memset(&ma, 0, sizeof(ma));
|
||||
ma.memalloc = stdAlloc;
|
||||
ma.memfree = stdFree;
|
||||
|
|
@ -178,6 +184,8 @@ int main(int argc, char *argv[])
|
|||
if (!tess)
|
||||
return -1;
|
||||
|
||||
tessSetOption(tess, TESS_CONSTRAINED_DELAUNAY_TRIANGULATION, 1);
|
||||
|
||||
// Offset the foreground shape to center of the bg.
|
||||
offx = (bounds[2]+bounds[0])/2;
|
||||
offy = (bounds[3]+bounds[1])/2;
|
||||
|
|
@ -197,6 +205,10 @@ int main(int argc, char *argv[])
|
|||
tessAddContour(tess, 2, it->pts, sizeof(float)*2, it->npts);
|
||||
if (!tessTesselate(tess, TESS_WINDING_POSITIVE, TESS_POLYGONS, nvp, 2, 0))
|
||||
return -1;
|
||||
|
||||
t1 = glfwGetTime();
|
||||
|
||||
printf("Time: %.3f ms\n", (t1 - t0) * 1000.0f);
|
||||
printf("Memory used: %.1f kB\n", allocated/1024.0f);
|
||||
|
||||
#endif
|
||||
|
|
@ -226,12 +238,22 @@ int main(int argc, char *argv[])
|
|||
|
||||
while (!glfwWindowShouldClose(window))
|
||||
{
|
||||
float ct = (float)glfwGetTime();
|
||||
int winWidth, winHeight;
|
||||
int fbWidth, fbHeight;
|
||||
float pxr, ct;
|
||||
|
||||
glfwGetWindowSize(window, &winWidth, &winHeight);
|
||||
glfwGetFramebufferSize(window, &fbWidth, &fbHeight);
|
||||
|
||||
// Calculate pixel ration for hi-dpi devices.
|
||||
pxr = (float)fbWidth / (float)winWidth;
|
||||
|
||||
ct = (float)glfwGetTime();
|
||||
if (run) t += ct - pt;
|
||||
pt = ct;
|
||||
|
||||
// Update and render
|
||||
glViewport(0, 0, width, height);
|
||||
glViewport(0, 0, fbWidth, fbHeight);
|
||||
glClearColor(0.3f, 0.3f, 0.32f, 1.0f);
|
||||
glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
|
||||
glEnable(GL_BLEND);
|
||||
|
|
@ -251,6 +273,8 @@ int main(int argc, char *argv[])
|
|||
tess = tessNewTess(&ma);
|
||||
if (tess)
|
||||
{
|
||||
tessSetOption(tess, TESS_CONSTRAINED_DELAUNAY_TRIANGULATION, cdt);
|
||||
|
||||
offx = (view[2]+view[0])/2 + sinf(t) * (view[2]-view[0])/2;
|
||||
offy = (view[3]+view[1])/2 + cosf(t*3.13f) * (view[3]-view[1])/6;
|
||||
|
||||
|
|
@ -338,6 +362,9 @@ int main(int argc, char *argv[])
|
|||
glEnd();
|
||||
}
|
||||
|
||||
glLineWidth(1.0f * pxr);
|
||||
glPointSize(3.0f * pxr);
|
||||
|
||||
glColor4ub(0,0,0,16);
|
||||
for (i = 0; i < nelems; ++i)
|
||||
{
|
||||
|
|
@ -349,7 +376,6 @@ int main(int argc, char *argv[])
|
|||
}
|
||||
|
||||
glColor4ub(0,0,0,128);
|
||||
glPointSize(3.0f);
|
||||
glBegin(GL_POINTS);
|
||||
for (i = 0; i < nverts; ++i)
|
||||
{
|
||||
|
|
@ -360,6 +386,7 @@ int main(int argc, char *argv[])
|
|||
glVertex2f(verts[i*2], verts[i*2+1]);
|
||||
}
|
||||
glEnd();
|
||||
|
||||
glPointSize(1.0f);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -106,17 +106,22 @@ enum TessWindingRule
|
|||
// }
|
||||
// glEnd();
|
||||
// }
|
||||
//
|
||||
// TESS_CONSTRAINED_DELAUNAY_TRIANGLES
|
||||
// Similar to TESS_POLYGONS, but we output only triangles and we attempt to provide a valid
|
||||
// Constrained Delaunay triangulation.
|
||||
|
||||
enum TessElementType
|
||||
{
|
||||
TESS_POLYGONS,
|
||||
TESS_CONNECTED_POLYGONS,
|
||||
TESS_BOUNDARY_CONTOURS,
|
||||
TESS_CONSTRAINED_DELAUNAY_TRIANGLES
|
||||
};
|
||||
|
||||
|
||||
// TESS_CONSTRAINED_DELAUNAY_TRIANGULATION
|
||||
// If enabled, the initial triagulation is improved with non-robust Constrained Delayney triangulation.
|
||||
// Disable by default.
|
||||
|
||||
enum TessOption
|
||||
{
|
||||
TESS_CONSTRAINED_DELAUNAY_TRIANGULATION,
|
||||
};
|
||||
|
||||
typedef float TESSreal;
|
||||
|
|
@ -189,12 +194,18 @@ void tessDeleteTess( TESStesselator *tess );
|
|||
// count - number of vertices in contour.
|
||||
void tessAddContour( TESStesselator *tess, int size, const void* pointer, int stride, int count );
|
||||
|
||||
// tessSetOption() - Toggles optional tessellation parameters
|
||||
// Parameters:
|
||||
// option - one of TessOption
|
||||
// value - 1 if enabled, 0 if disabled.
|
||||
void tessSetOption( TESStesselator *tess, int option, int value );
|
||||
|
||||
// tessTesselate() - tesselate contours.
|
||||
// Parameters:
|
||||
// tess - pointer to tesselator object.
|
||||
// windingRule - winding rules used for tesselation, must be one of TessWindingRule.
|
||||
// elementType - defines the tesselation result element type, must be one of TessElementType.
|
||||
// polySize - defines maximum vertices per polygons if output is polygons. If elementType is TESS_CONSTRAINED_DELAUNAY_TRIANGLES, this parameter is ignored.
|
||||
// polySize - defines maximum vertices per polygons if output is polygons.
|
||||
// vertexSize - defines the number of coordinates in tesselation result vertex, must be 2 or 3.
|
||||
// normal - defines the normal of the input contours, of null the normal is calculated automatically.
|
||||
// Returns:
|
||||
|
|
|
|||
|
|
@ -266,16 +266,13 @@ void tesedgeIntersect( TESSvertex *o1, TESSvertex *d1,
|
|||
*/
|
||||
TESSreal calcAngle( TESSvertex *v0, TESSvertex *v1, TESSvertex *v2 )
|
||||
{
|
||||
TESSreal num;
|
||||
TESSreal den;
|
||||
TESSreal a[2];
|
||||
TESSreal b[2];
|
||||
a[0] = v2->s - v1->s;
|
||||
a[1] = v2->t - v1->t;
|
||||
b[0] = v0->s - v1->s;
|
||||
b[1] = v0->t - v1->t;
|
||||
num = a[0] * b[0] + a[1] * b[1];
|
||||
den = sqrt( a[0] * a[0] + a[1] * a[1] ) * sqrt( b[0] * b[0] + b[1] * b[1] );
|
||||
TESSreal num, den, ax, ay, bx, by;
|
||||
ax = v2->s - v1->s;
|
||||
ay = v2->t - v1->t;
|
||||
bx = v0->s - v1->s;
|
||||
by = v0->t - v1->t;
|
||||
num = ax * bx + ay * by;
|
||||
den = sqrt( ax * ax + ay * ay ) * sqrt( bx * bx + by * by );
|
||||
if ( den > 0.0 ) num /= den;
|
||||
if ( num < -1.0 ) num = -1.0;
|
||||
if ( num > 1.0 ) num = 1.0;
|
||||
|
|
|
|||
|
|
@ -436,43 +436,49 @@ TESShalfEdge *stackPop( EdgeStack *stack )
|
|||
return e;
|
||||
}
|
||||
|
||||
/*
|
||||
Starting with a valid triangulation, uses the Edge Flip algorithm to
|
||||
refine the triangulation into a Constrained Delaunay Triangulation.
|
||||
*/
|
||||
int tessMeshRefineDelaunay( TESSmesh *mesh, TESSalloc *alloc )
|
||||
{
|
||||
/* At this point, we have a valid, but not optimal, triangulation.
|
||||
We refine the triangulation using the Edge Flip algorithm */
|
||||
|
||||
/*
|
||||
1) Find all internal edges
|
||||
2) Mark all dual edges
|
||||
3) insert all dual edges into a queue
|
||||
*/
|
||||
// Starting with a valid triangulation, uses the Edge Flip algorithm to
|
||||
// refine the triangulation into a Constrained Delaunay Triangulation.
|
||||
void tessMeshRefineDelaunay( TESSmesh *mesh, TESSalloc *alloc )
|
||||
{
|
||||
// At this point, we have a valid, but not optimal, triangulation.
|
||||
// We refine the triangulation using the Edge Flip algorithm
|
||||
//
|
||||
// 1) Find all internal edges
|
||||
// 2) Mark all dual edges
|
||||
// 3) insert all dual edges into a queue
|
||||
|
||||
TESSface *f;
|
||||
EdgeStack stack;
|
||||
TESShalfEdge *e;
|
||||
TESShalfEdge *edges[4];
|
||||
int maxFaces = 0, maxIter = 0, iter = 0;
|
||||
|
||||
stackInit(&stack, alloc);
|
||||
|
||||
for( f = mesh->fHead.next; f != &mesh->fHead; f = f->next ) {
|
||||
if ( f->inside) {
|
||||
e = f->anEdge;
|
||||
do {
|
||||
e->mark = EdgeIsInternal(e); /* Mark internal edges */
|
||||
if (e->mark && !e->Sym->mark) stackPush(&stack, e); /* Insert into queue */
|
||||
e->mark = EdgeIsInternal(e); // Mark internal edges
|
||||
if (e->mark && !e->Sym->mark) stackPush(&stack, e); // Insert into queue
|
||||
e = e->Lnext;
|
||||
} while (e != f->anEdge);
|
||||
maxFaces++;
|
||||
}
|
||||
}
|
||||
|
||||
// The algorithm should converge on O(n^2), since the predicate is not robust,
|
||||
// we'll save guard against infinite loop.
|
||||
maxIter = maxFaces * maxFaces;
|
||||
|
||||
// Pop stack until we find a reversed edge
|
||||
// Flip the reversed edge, and insert any of the four opposite edges
|
||||
// which are internal and not already in the stack (!marked)
|
||||
while (!stackEmpty(&stack)) {
|
||||
while (!stackEmpty(&stack) && iter < maxIter) {
|
||||
e = stackPop(&stack);
|
||||
e->mark = e->Sym->mark = 0;
|
||||
if (!tesedgeIsLocallyDelaunay(e)) {
|
||||
TESShalfEdge *edges[4];
|
||||
int i;
|
||||
tessMeshFlipEdge(mesh, e);
|
||||
// for each opposite edge
|
||||
|
|
@ -480,18 +486,17 @@ int tessMeshRefineDelaunay( TESSmesh *mesh, TESSalloc *alloc )
|
|||
edges[1] = e->Lprev;
|
||||
edges[2] = e->Sym->Lnext;
|
||||
edges[3] = e->Sym->Lprev;
|
||||
for (i=0;i<3;i++) {
|
||||
for (i = 0; i < 4; i++) {
|
||||
if (!edges[i]->mark && EdgeIsInternal(edges[i])) {
|
||||
edges[i]->mark = edges[i]->Sym->mark = 1;
|
||||
stackPush(&stack, edges[i]);
|
||||
}
|
||||
}
|
||||
}
|
||||
iter++;
|
||||
}
|
||||
|
||||
stackDelete(&stack);
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -964,6 +969,17 @@ void tessAddContour( TESStesselator *tess, int size, const void* vertices,
|
|||
}
|
||||
}
|
||||
|
||||
void tessSetOption( TESStesselator *tess, int option, int value )
|
||||
{
|
||||
switch(option)
|
||||
{
|
||||
case TESS_CONSTRAINED_DELAUNAY_TRIANGULATION:
|
||||
tess->processCDT = value > 0 ? 1 : 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
int tessTesselate( TESStesselator *tess, int windingRule, int elementType,
|
||||
int polySize, int vertexSize, const TESSreal* normal )
|
||||
{
|
||||
|
|
@ -1034,11 +1050,8 @@ int tessTesselate( TESStesselator *tess, int windingRule, int elementType,
|
|||
rc = tessMeshSetWindingNumber( mesh, 1, TRUE );
|
||||
} else {
|
||||
rc = tessMeshTessellateInterior( mesh );
|
||||
if (elementType == TESS_CONSTRAINED_DELAUNAY_TRIANGLES) {
|
||||
rc = tessMeshRefineDelaunay( mesh, &tess->alloc );
|
||||
elementType = TESS_POLYGONS;
|
||||
polySize = 3;
|
||||
}
|
||||
if (rc != 0 && tess->processCDT != 0)
|
||||
tessMeshRefineDelaunay( mesh, &tess->alloc );
|
||||
}
|
||||
if (rc == 0) longjmp(tess->env,1); /* could've used a label */
|
||||
|
||||
|
|
|
|||
|
|
@ -61,6 +61,8 @@ struct TESStesselator {
|
|||
TESSreal bmin[2];
|
||||
TESSreal bmax[2];
|
||||
|
||||
int processCDT; /* option to run Constrained Delayney pass. */
|
||||
|
||||
/*** state needed for the line sweep ***/
|
||||
int windingRule; /* rule for determining polygon interior */
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue