diff options
| author | Gareth Hughes <gareth@valinux.com> | 1999-12-02 06:18:25 +0000 |
|---|---|---|
| committer | Gareth Hughes <gareth@valinux.com> | 1999-12-02 06:18:25 +0000 |
| commit | a335bf404f3b40b2a7a66ec8eb6057a2cdecfc28 (patch) | |
| tree | 9f4dff1b2323b13983ca1b1280f63a9100d394c5 | |
| parent | 783a67260a5e4bbe2818eabf2081f0cab7d9ccec (diff) | |
Fixed bug in tessellatin for xlockmore's text3d screensaver. The
external maximums weren't being handled correctly.
Output contours seem to be oriented incorrectly, as they appear as
solidly-filled areas.
| -rw-r--r-- | src/glu/mesa/tess.c | 9 | ||||
| -rw-r--r-- | src/glu/mesa/tess.h | 7 |
2 files changed, 10 insertions, 6 deletions
diff --git a/src/glu/mesa/tess.c b/src/glu/mesa/tess.c index a262b073602..bcad30fafe2 100644 --- a/src/glu/mesa/tess.c +++ b/src/glu/mesa/tess.c @@ -1,4 +1,4 @@ -/* $Id: tess.c,v 1.20.2.4 1999/11/29 18:16:11 gareth Exp $ */ +/* $Id: tess.c,v 1.20.2.5 1999/12/02 06:18:25 gareth Exp $ */ /* * Mesa 3-D graphics library @@ -98,6 +98,7 @@ GLUtesselator* GLAPIENTRY gluNewTess( void ) tobj->boundary_only = GL_FALSE; tobj->winding_rule = GLU_TESS_WINDING_ODD; + tobj->orientation = GLU_UNKNOWN; tobj->tolerance = 0.0; tobj->plane.normal[X] = 0.0; @@ -862,6 +863,8 @@ static GLenum save_current_contour( GLUtesselator *tobj ) { tobj->contours = tobj->last_contour = current; current->next = current->prev = NULL; + + tobj->orientation = current->orientation; } else { @@ -955,7 +958,7 @@ static void delete_all_contours( GLUtesselator *tobj ) /***************************************************************************** * tess_msg *****************************************************************************/ -INLINE void tess_msg( int level, char *format, ... ) +INLINE void tess_msg( GLint level, char *format, ... ) { #ifdef DEBUG va_list ap; @@ -970,7 +973,7 @@ INLINE void tess_msg( int level, char *format, ... ) #endif } -INLINE void tess_info( char *file, char *line ) +INLINE void tess_info( char *file, GLint line ) { #ifdef DEBUG fprintf( DBG_STREAM, "%9.9s:%d:\t ", file, line ); diff --git a/src/glu/mesa/tess.h b/src/glu/mesa/tess.h index d46ded855bd..7246d890d83 100644 --- a/src/glu/mesa/tess.h +++ b/src/glu/mesa/tess.h @@ -1,4 +1,4 @@ -/* $Id: tess.h,v 1.15.2.3 1999/11/29 18:16:11 gareth Exp $ */ +/* $Id: tess.h,v 1.15.2.4 1999/12/02 06:18:25 gareth Exp $ */ /* * Mesa 3-D graphics library @@ -58,6 +58,7 @@ struct GLUtesselator tess_callbacks_t callbacks; GLboolean boundary_only; GLenum winding_rule; + GLenum orientation; GLdouble tolerance; tess_plane_t plane; GLint num_contours; @@ -118,8 +119,8 @@ extern int tess_dbg_level; #define MSG tess_msg #endif /* DEBUG */ -extern INLINE void tess_msg( int level, char *format, ... ); -extern INLINE void tess_info( char *file, char *line ); +extern INLINE void tess_msg( GLint level, char *format, ... ); +extern INLINE void tess_info( char *file, GLint line ); #ifdef __cplusplus } |