3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/prusa3d/Slic3r into objects_centering

Browse source
This commit is contained in:
Enrico Turri 2019-01-25 09:10:26 +01:00
commit 3b90629d85
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/slic3r/GUI/GLCanvas3D.cpp
View file

@ -6449,11 +6449,18 @@ public:
} }
GLUtesselator *tess = gluNewTess(); // create a tessellator GLUtesselator *tess = gluNewTess(); // create a tessellator
// register callback functions // register callback functions
gluTessCallback(tess, GLU_TESS_BEGIN, (void(__stdcall*)(void))tessBeginCB); #ifndef _GLUfuncptr
gluTessCallback(tess, GLU_TESS_END, (void(__stdcall*)(void))tessEndCB); #ifdef _MSC_VER
gluTessCallback(tess, GLU_TESS_ERROR, (void(__stdcall*)(void))tessErrorCB); typedef void (__stdcall *_GLUfuncptr)(void);
gluTessCallback(tess, GLU_TESS_VERTEX, (void(__stdcall*)())tessVertexCB); #else /* _MSC_VER */
gluTessCallback(tess, GLU_TESS_COMBINE, (void (__stdcall*)(void))tessCombineCB); typedef void (GLAPIENTRYP _GLUfuncptr)(void);
#endif /* _MSC_VER */
#endif /* _GLUfuncptr */
gluTessCallback(tess, GLU_TESS_BEGIN, (_GLUfuncptr)tessBeginCB);
gluTessCallback(tess, GLU_TESS_END, (_GLUfuncptr)tessEndCB);
gluTessCallback(tess, GLU_TESS_ERROR, (_GLUfuncptr)tessErrorCB);
gluTessCallback(tess, GLU_TESS_VERTEX, (_GLUfuncptr)tessVertexCB);
gluTessCallback(tess, GLU_TESS_COMBINE, (_GLUfuncptr)tessCombineCB);
gluTessBeginPolygon(tess, 0); // with NULL data gluTessBeginPolygon(tess, 0); // with NULL data
gluTessBeginContour(tess); gluTessBeginContour(tess);
for (const Point &pt : expoly.contour.points) { for (const Point &pt : expoly.contour.points) {
@ -6523,7 +6530,7 @@ private:
} else if (primitive_type == GL_TRIANGLE_FAN) { } else if (primitive_type == GL_TRIANGLE_FAN) {
memcpy(pt1, ptr, sizeof(GLdouble) * 3); memcpy(pt1, ptr, sizeof(GLdouble) * 3);
} else { } else {
assert(which == GL_TRIANGLES); assert(primitive_type == GL_TRIANGLES);
assert(num_points == 3); assert(num_points == 3);
num_points = 0; num_points = 0;
} }