Show
Ignore:
Timestamp:
10/07/10 13:53:28 (4 years ago)
Author:
robert
Message:

Introduced osg namespace to new local GLU functions

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osg/glu/libtess/tess.cpp

    r11818 r11829  
    5555#endif 
    5656 
     57 
    5758/*ARGSUSED*/ static void GLAPIENTRY noBegin( GLenum type ) {} 
    5859/*ARGSUSED*/ static void GLAPIENTRY noEdgeFlag( GLboolean boundaryEdge ) {} 
     
    9091 
    9192GLUtesselator * GLAPIENTRY 
    92 gluNewTess( void ) 
     93osg::gluNewTess( void ) 
    9394{ 
    9495  GLUtesselator *tess; 
     
    191192 
    192193void GLAPIENTRY 
    193 gluDeleteTess( GLUtesselator *tess ) 
     194osg::gluDeleteTess( GLUtesselator *tess ) 
    194195{ 
    195196  RequireState( tess, T_DORMANT ); 
     
    199200 
    200201void GLAPIENTRY 
    201 gluTessProperty( GLUtesselator *tess, GLenum which, GLdouble value ) 
     202osg::gluTessProperty( GLUtesselator *tess, GLenum which, GLdouble value ) 
    202203{ 
    203204  GLenum windingRule; 
     
    238239/* Returns tessellator property */ 
    239240void GLAPIENTRY 
    240 gluGetTessProperty( GLUtesselator *tess, GLenum which, GLdouble *value ) 
     241osg::gluGetTessProperty( GLUtesselator *tess, GLenum which, GLdouble *value ) 
    241242{ 
    242243   switch (which) { 
     
    266267 
    267268void GLAPIENTRY 
    268 gluTessNormal( GLUtesselator *tess, GLdouble x, GLdouble y, GLdouble z ) 
     269osg::gluTessNormal( GLUtesselator *tess, GLdouble x, GLdouble y, GLdouble z ) 
    269270{ 
    270271  tess->normal[0] = x; 
     
    274275 
    275276void GLAPIENTRY 
    276 gluTessCallback( GLUtesselator *tess, GLenum which, _GLUfuncptr fn) 
     277osg::gluTessCallback( GLUtesselator *tess, GLenum which, _GLUfuncptr fn) 
    277278{ 
    278279  switch( which ) { 
     
    413414 
    414415void GLAPIENTRY 
    415 gluTessVertex( GLUtesselator *tess, GLdouble coords[3], void *data ) 
     416osg::gluTessVertex( GLUtesselator *tess, GLdouble coords[3], void *data ) 
    416417{ 
    417418  int i, tooLarge = FALSE; 
     
    460461 
    461462void GLAPIENTRY 
    462 gluTessBeginPolygon( GLUtesselator *tess, void *data ) 
     463osg::gluTessBeginPolygon( GLUtesselator *tess, void *data ) 
    463464{ 
    464465  RequireState( tess, T_DORMANT ); 
     
    474475 
    475476void GLAPIENTRY 
    476 gluTessBeginContour( GLUtesselator *tess ) 
     477osg::gluTessBeginContour( GLUtesselator *tess ) 
    477478{ 
    478479  RequireState( tess, T_IN_POLYGON ); 
     
    491492 
    492493void GLAPIENTRY 
    493 gluTessEndContour( GLUtesselator *tess ) 
     494osg::gluTessEndContour( GLUtesselator *tess ) 
    494495{ 
    495496  RequireState( tess, T_IN_CONTOUR ); 
     
    498499 
    499500void GLAPIENTRY 
    500 gluTessEndPolygon( GLUtesselator *tess ) 
     501osg::gluTessEndPolygon( GLUtesselator *tess ) 
    501502{ 
    502503  GLUmesh *mesh; 
     
    591592  tess->mesh = NULL; 
    592593} 
    593  
    594  
    595 /*XXXblythe unused function*/ 
    596 #if 0 
    597 void GLAPIENTRY 
    598 gluDeleteMesh( GLUmesh *mesh ) 
    599 { 
    600   __gl_meshDeleteMesh( mesh ); 
    601 } 
    602 #endif 
    603  
    604  
    605  
    606 /*******************************************************/ 
    607  
    608 /* Obsolete calls -- for backward compatibility */ 
    609  
    610 void GLAPIENTRY 
    611 gluBeginPolygon( GLUtesselator *tess ) 
    612 { 
    613   gluTessBeginPolygon( tess, NULL ); 
    614   gluTessBeginContour( tess ); 
    615 } 
    616  
    617  
    618 /*ARGSUSED*/ 
    619 void GLAPIENTRY 
    620 gluNextContour( GLUtesselator *tess, GLenum type ) 
    621 { 
    622   gluTessEndContour( tess ); 
    623   gluTessBeginContour( tess ); 
    624 } 
    625  
    626  
    627 void GLAPIENTRY 
    628 gluEndPolygon( GLUtesselator *tess ) 
    629 { 
    630   gluTessEndContour( tess ); 
    631   gluTessEndPolygon( tess ); 
    632 }