Import Geant4 10.5.0.beta source tree
This commit is contained in:
@@ -32,11 +32,20 @@ public:
|
||||
|
||||
GLUtesselator* tobj = gluNewTess();
|
||||
|
||||
::gluTessCallback(tobj,(GLUenum)GLU_TESS_VERTEX_DATA, (Func)vertexCallback);
|
||||
::gluTessCallback(tobj,(GLUenum)GLU_TESS_BEGIN_DATA, (Func)beginCallback);
|
||||
::gluTessCallback(tobj,(GLUenum)GLU_TESS_END_DATA, (Func)endCallback);
|
||||
::gluTessCallback(tobj,(GLUenum)GLU_TESS_ERROR_DATA, (Func)errorCallback);
|
||||
::gluTessCallback(tobj,(GLUenum)GLU_TESS_COMBINE_DATA,(Func)combineCallback);
|
||||
// g++-8.1.0 : the five below lines induce warnings : cast between incompatible function types.
|
||||
//::gluTessCallback(tobj,(GLUenum)GLU_TESS_VERTEX_DATA, (Func)vertexCallback);
|
||||
//::gluTessCallback(tobj,(GLUenum)GLU_TESS_BEGIN_DATA, (Func)beginCallback);
|
||||
//::gluTessCallback(tobj,(GLUenum)GLU_TESS_END_DATA, (Func)endCallback);
|
||||
//::gluTessCallback(tobj,(GLUenum)GLU_TESS_ERROR_DATA, (Func)errorCallback);
|
||||
//::gluTessCallback(tobj,(GLUenum)GLU_TESS_COMBINE_DATA,(Func)combineCallback);
|
||||
|
||||
// NOTE : the gluTessCallback_<> are inlib/glutess specific.
|
||||
::gluTessCallback_GLU_TESS_VERTEX_DATA (tobj,vertexCallback);
|
||||
::gluTessCallback_GLU_TESS_BEGIN_DATA (tobj,beginCallback);
|
||||
::gluTessCallback_GLU_TESS_END_DATA (tobj,endCallback);
|
||||
::gluTessCallback_GLU_TESS_ERROR_DATA (tobj,errorCallback);
|
||||
::gluTessCallback_GLU_TESS_COMBINE_DATA(tobj,combineCallback);
|
||||
|
||||
::gluTessProperty(tobj,(GLUenum)GLU_TESS_WINDING_RULE,GLU_TESS_WINDING_ODD);
|
||||
|
||||
for(unsigned int a=0;a<aContour.size();a++) {
|
||||
@@ -192,7 +201,7 @@ protected:
|
||||
#ifdef TOOLS_TESS_CONTOUR_STDCALL
|
||||
__stdcall
|
||||
#endif
|
||||
endCallback(){}
|
||||
endCallback(void*){}
|
||||
|
||||
static void
|
||||
#ifdef TOOLS_TESS_CONTOUR_STDCALL
|
||||
|
||||
Reference in New Issue
Block a user