Changeset 11829 for OpenSceneGraph/trunk/src/osg/glu/libtess/tess.cpp

Timestamp:

10/07/10 13:53:28 (3 years ago)

Author:

robert

Message:

Introduced osg namespace to new local GLU functions

Files:

• OpenSceneGraph/trunk/src/osg/glu/libtess/tess.cpp (modified) (13 diffs)

OpenSceneGraph/trunk/src/osg/glu/libtess/tess.cpp

@@ -55 +55 @@
 #endif
 
+
 /*ARGSUSED*/ static void GLAPIENTRY noBegin( GLenum type ) {}
 /*ARGSUSED*/ static void GLAPIENTRY noEdgeFlag( GLboolean boundaryEdge ) {}
@@ -90 +91 @@
 
 GLUtesselator * GLAPIENTRY
-gluNewTess( void )
+osg::gluNewTess( void )
 {
   GLUtesselator *tess;
@@ -191 +192 @@
 
 void GLAPIENTRY
-gluDeleteTess( GLUtesselator *tess )
+osg::gluDeleteTess( GLUtesselator *tess )
 {
   RequireState( tess, T_DORMANT );
@@ -199 +200 @@
 
 void GLAPIENTRY
-gluTessProperty( GLUtesselator *tess, GLenum which, GLdouble value )
+osg::gluTessProperty( GLUtesselator *tess, GLenum which, GLdouble value )
 {
   GLenum windingRule;
@@ -238 +239 @@
 /* Returns tessellator property */
 void GLAPIENTRY
-gluGetTessProperty( GLUtesselator *tess, GLenum which, GLdouble *value )
+osg::gluGetTessProperty( GLUtesselator *tess, GLenum which, GLdouble *value )
 {
    switch (which) {
@@ -266 +267 @@
 
 void GLAPIENTRY
-gluTessNormal( GLUtesselator *tess, GLdouble x, GLdouble y, GLdouble z )
+osg::gluTessNormal( GLUtesselator *tess, GLdouble x, GLdouble y, GLdouble z )
 {
   tess->normal[0] = x;
@@ -274 +275 @@
 
 void GLAPIENTRY
-gluTessCallback( GLUtesselator *tess, GLenum which, _GLUfuncptr fn)
+osg::gluTessCallback( GLUtesselator *tess, GLenum which, _GLUfuncptr fn)
 {
   switch( which ) {
@@ -413 +414 @@
 
 void GLAPIENTRY
-gluTessVertex( GLUtesselator *tess, GLdouble coords[3], void *data )
+osg::gluTessVertex( GLUtesselator *tess, GLdouble coords[3], void *data )
 {
   int i, tooLarge = FALSE;
@@ -460 +461 @@
 
 void GLAPIENTRY
-gluTessBeginPolygon( GLUtesselator *tess, void *data )
+osg::gluTessBeginPolygon( GLUtesselator *tess, void *data )
 {
   RequireState( tess, T_DORMANT );
@@ -474 +475 @@
 
 void GLAPIENTRY
-gluTessBeginContour( GLUtesselator *tess )
+osg::gluTessBeginContour( GLUtesselator *tess )
 {
   RequireState( tess, T_IN_POLYGON );
@@ -491 +492 @@
 
 void GLAPIENTRY
-gluTessEndContour( GLUtesselator *tess )
+osg::gluTessEndContour( GLUtesselator *tess )
 {
   RequireState( tess, T_IN_CONTOUR );
@@ -498 +499 @@
 
 void GLAPIENTRY
-gluTessEndPolygon( GLUtesselator *tess )
+osg::gluTessEndPolygon( GLUtesselator *tess )
 {
   GLUmesh *mesh;
@@ -591 +592 @@
   tess->mesh = NULL;
 }
-
-
-/*XXXblythe unused function*/
-#if 0
-void GLAPIENTRY
-gluDeleteMesh( GLUmesh *mesh )
-{
-  __gl_meshDeleteMesh( mesh );
-}
-#endif
-
-
-
-/*******************************************************/
-
-/* Obsolete calls -- for backward compatibility */
-
-void GLAPIENTRY
-gluBeginPolygon( GLUtesselator *tess )
-{
-  gluTessBeginPolygon( tess, NULL );
-  gluTessBeginContour( tess );
-}
-
-
-/*ARGSUSED*/
-void GLAPIENTRY
-gluNextContour( GLUtesselator *tess, GLenum type )
-{
-  gluTessEndContour( tess );
-  gluTessBeginContour( tess );
-}
-
-
-void GLAPIENTRY
-gluEndPolygon( GLUtesselator *tess )
-{
-  gluTessEndContour( tess );
-  gluTessEndPolygon( tess );
-}