remove an ifdef for compiling with older apple compiler. no more needed under leopard (thanks to Iacopo Peri)
This commit is contained in:
parent
99e6ea5dd6
commit
818eb2b61d
|
@ -217,15 +217,15 @@ class glu_tesselator
|
||||||
static void do_tesselation(const std::vector< std::vector<point_type> > & outlines, tess_prim_data_vec & t_data)
|
static void do_tesselation(const std::vector< std::vector<point_type> > & outlines, tess_prim_data_vec & t_data)
|
||||||
{
|
{
|
||||||
GLUtesselator * tess = gluNewTess();
|
GLUtesselator * tess = gluNewTess();
|
||||||
#ifdef __APPLE__
|
//#ifdef __APPLE__
|
||||||
gluTessCallback(tess, GLU_TESS_BEGIN_DATA, (GLvoid (CALLBACK *)(...))(this_type::begin_cb));
|
// gluTessCallback(tess, GLU_TESS_BEGIN_DATA, (GLvoid (CALLBACK *)(...))(this_type::begin_cb));
|
||||||
gluTessCallback(tess, GLU_TESS_END_DATA, (GLvoid (CALLBACK *)(...))(this_type::end_cb));
|
// gluTessCallback(tess, GLU_TESS_END_DATA, (GLvoid (CALLBACK *)(...))(this_type::end_cb));
|
||||||
gluTessCallback(tess, GLU_TESS_VERTEX_DATA, (GLvoid (CALLBACK *)(...))(this_type::vertex_cb));
|
// gluTessCallback(tess, GLU_TESS_VERTEX_DATA, (GLvoid (CALLBACK *)(...))(this_type::vertex_cb));
|
||||||
#else
|
//#else
|
||||||
gluTessCallback(tess, GLU_TESS_BEGIN_DATA, (GLvoid (CALLBACK *)())(this_type::begin_cb));
|
gluTessCallback(tess, GLU_TESS_BEGIN_DATA, (GLvoid (CALLBACK *)())(this_type::begin_cb));
|
||||||
gluTessCallback(tess, GLU_TESS_END_DATA, (GLvoid (CALLBACK *)())(this_type::end_cb));
|
gluTessCallback(tess, GLU_TESS_END_DATA, (GLvoid (CALLBACK *)())(this_type::end_cb));
|
||||||
gluTessCallback(tess, GLU_TESS_VERTEX_DATA, (GLvoid (CALLBACK *)())(this_type::vertex_cb));
|
gluTessCallback(tess, GLU_TESS_VERTEX_DATA, (GLvoid (CALLBACK *)())(this_type::vertex_cb));
|
||||||
#endif
|
//#endif
|
||||||
void * polygon_data = (void *)(&t_data);
|
void * polygon_data = (void *)(&t_data);
|
||||||
|
|
||||||
GLdouble vertex[3];
|
GLdouble vertex[3];
|
||||||
|
|
Loading…
Reference in New Issue