diff options
| author | Gareth Hughes <[email protected]> | 1999-09-16 06:41:42 +0000 |
|---|---|---|
| committer | Gareth Hughes <[email protected]> | 1999-09-16 06:41:42 +0000 |
| commit | 0099981b1cb1eb1ee7b059aeb3970206bd7c4fde (patch) | |
| tree | 89ac7be5d1adfc8721b53a665ad83cd35591980c /src/glu | |
| parent | 69b78057d10f37a79f98e251e5fe1a65eb883fba (diff) | |
Misc winding rule bug fixes.
Diffstat (limited to 'src/glu')
| -rw-r--r-- | src/glu/mesa/tess.c | 20 | ||||
| -rw-r--r-- | src/glu/mesa/tess.h | 7 |
2 files changed, 17 insertions, 10 deletions
diff --git a/src/glu/mesa/tess.c b/src/glu/mesa/tess.c index 166f250bebc..50d9ff23487 100644 --- a/src/glu/mesa/tess.c +++ b/src/glu/mesa/tess.c @@ -1,4 +1,4 @@ -/* $Id: tess.c,v 1.6 1999/09/15 02:11:10 gareth Exp $ */ +/* $Id: tess.c,v 1.7 1999/09/16 06:41:42 gareth Exp $ */ /* * Mesa 3-D graphics library @@ -26,6 +26,9 @@ /* * $Log: tess.c,v $ + * Revision 1.7 1999/09/16 06:41:42 gareth + * Misc winding rule bug fixes. + * * Revision 1.6 1999/09/15 02:11:10 gareth * Fixed vector macro calls, specifically COPY_3V params. * @@ -197,17 +200,18 @@ void GLAPIENTRY gluTessBeginContour( GLUtesselator *tobj ) tobj->current_contour->vertices = tobj->current_contour->last_vertex = NULL; - tobj->current_contour->reflex_count = 0; - tobj->current_contour->reflex_vertices = - tobj->current_contour->last_reflex = NULL; + tobj->current_contour->reflex_vertices = NULL; + tobj->current_contour->cross_vertices = hashtable_init( HT_DEFAULT_SIZE ); tobj->current_contour->orientation = GLU_UNKNOWN; tobj->current_contour->area = 0.0; - tobj->current_contour->winding = 0; + tobj->current_contour->label = 0; CLEAR_BBOX_2DV( tobj->current_contour->mins, tobj->current_contour->maxs ); + tobj->current_contour->rotx = tobj->current_contour->roty = 0.0; + cleanup: DEBUGP( 3, ( " <- gluTessBeginContour( tobj:%p )\n", tobj ) ); return; @@ -772,7 +776,7 @@ static void project_current_contour( GLUtesselator *tobj ) znormal[Z] = current->plane.normal[Z]; dot = DOT3( znormal, zaxis ); - roty = acos( dot ); + current->roty = roty = acos( dot ); /* Rotate the plane normal around the x-axis. */ @@ -781,7 +785,7 @@ static void project_current_contour( GLUtesselator *tobj ) xnormal[Z] = sin( roty ) * znormal[X] + cos( roty ) * znormal[Z]; dot = DOT3( xnormal, zaxis ); - rotx = acos( dot ); + current->rotx = rotx = acos( dot ); for ( vertex = current->vertices, i = 0; i < current->vertex_count; vertex = vertex->next, i++ ) @@ -964,7 +968,7 @@ static void delete_all_contours( GLUtesselator *tobj ) * Debugging output *****************************************************************************/ #ifdef DEBUG -int tess_debug_level = 3; +int tess_debug_level = 0; int vdebugstr( char *format_str, ... ) { diff --git a/src/glu/mesa/tess.h b/src/glu/mesa/tess.h index 15eef76bc1b..3d159fcb890 100644 --- a/src/glu/mesa/tess.h +++ b/src/glu/mesa/tess.h @@ -1,4 +1,4 @@ -/* $Id: tess.h,v 1.6 1999/09/15 02:12:16 gareth Exp $ */ +/* $Id: tess.h,v 1.7 1999/09/16 06:42:01 gareth Exp $ */ /* * Mesa 3-D graphics library @@ -26,6 +26,9 @@ /* * $Log: tess.h,v $ + * Revision 1.7 1999/09/16 06:42:01 gareth + * Misc winding rule bug fixes. + * * Revision 1.6 1999/09/15 02:12:16 gareth * Added debugging pragma message. * @@ -80,7 +83,7 @@ struct GLUtesselator #if 0 tess_grid_t *grid; /* Not currently used... */ #endif - heap_t *heap; + heap_t *ears; GLenum error; }; |