summaryrefslogtreecommitdiff
path: root/src/glu
diff options
context:
space:
mode:
authorGareth Hughes <gareth@valinux.com>1999-09-17 06:31:02 +0000
committerGareth Hughes <gareth@valinux.com>1999-09-17 06:31:02 +0000
commitb32966fc806187e8c2032236d9f33ac60fa8e873 (patch)
treee9f03afd7f4ddfd438ca26bbd173a3ebaa762b3a /src/glu
parent727f35a518f4793a6597a2a4192278dd32b12ae5 (diff)
Winding rule updates.
Diffstat (limited to 'src/glu')
-rw-r--r--src/glu/mesa/tess.c12
-rw-r--r--src/glu/mesa/tess.h7
2 files changed, 17 insertions, 2 deletions
diff --git a/src/glu/mesa/tess.c b/src/glu/mesa/tess.c
index de5a4f3cc6..3619761930 100644
--- a/src/glu/mesa/tess.c
+++ b/src/glu/mesa/tess.c
@@ -1,4 +1,4 @@
-/* $Id: tess.c,v 1.8 1999/09/17 03:07:28 tjump Exp $ */
+/* $Id: tess.c,v 1.9 1999/09/17 06:34:46 gareth Exp $ */
/*
* Mesa 3-D graphics library
@@ -26,6 +26,9 @@
/*
* $Log: tess.c,v $
+ * Revision 1.9 1999/09/17 06:34:46 gareth
+ * Winding rule updates.
+ *
* Revision 1.8 1999/09/17 03:07:28 tjump
* Win32 build req't updates
*
@@ -120,6 +123,7 @@ GLUtesselator* GLAPIENTRY gluNewTess( void )
#if 0
tobj->grid = NULL;
#endif
+ tobj->cvc_lists = NULL;
tobj->error = GLU_NO_ERROR;
@@ -265,6 +269,9 @@ void GLAPIENTRY gluTessVertex( GLUtesselator *tobj, GLdouble coords[3],
last_vertex->coords[Y] = coords[Y];
last_vertex->coords[Z] = coords[Z];
+ last_vertex->angle = 0.0;
+ last_vertex->label = 0;
+
last_vertex->next = NULL;
last_vertex->previous = NULL;
@@ -289,6 +296,9 @@ void GLAPIENTRY gluTessVertex( GLUtesselator *tobj, GLdouble coords[3],
vertex->coords[Y] = coords[Y];
vertex->coords[Z] = coords[Z];
+ vertex->angle = 0.0;
+ vertex->label = 0;
+
vertex->next = NULL;
vertex->previous = last_vertex;
diff --git a/src/glu/mesa/tess.h b/src/glu/mesa/tess.h
index 3d159fcb89..c9fb9129d0 100644
--- a/src/glu/mesa/tess.h
+++ b/src/glu/mesa/tess.h
@@ -1,4 +1,4 @@
-/* $Id: tess.h,v 1.7 1999/09/16 06:42:01 gareth Exp $ */
+/* $Id: tess.h,v 1.8 1999/09/17 06:31:02 gareth Exp $ */
/*
* Mesa 3-D graphics library
@@ -26,6 +26,9 @@
/*
* $Log: tess.h,v $
+ * Revision 1.8 1999/09/17 06:31:02 gareth
+ * Winding rule updates.
+ *
* Revision 1.7 1999/09/16 06:42:01 gareth
* Misc winding rule bug fixes.
*
@@ -55,6 +58,7 @@
#include "gluP.h"
#include "tess_typedefs.h"
+#include "tess_hash.h"
#include "tess_heap.h"
#if 0
#include "tess_grid.h"
@@ -84,6 +88,7 @@ struct GLUtesselator
tess_grid_t *grid; /* Not currently used... */
#endif
heap_t *ears;
+ hashtable_t *cvc_lists;
GLenum error;
};