summaryrefslogtreecommitdiff
path: root/patches/CGAL-OGL-Tess-Combine-Fix.patch
diff options
context:
space:
mode:
authorMarius Kintel <marius@kintel.net>2011-09-29 21:13:22 (GMT)
committerMarius Kintel <marius@kintel.net>2011-09-29 21:13:22 (GMT)
commit1b31c32638faa0429ffb6af0751a2199b33c52a0 (patch)
tree02db39aa979996789565daa660a8780f98f216b2 /patches/CGAL-OGL-Tess-Combine-Fix.patch
parentc1fa2f9675225df448a1c1f162ae7d93573401fa (diff)
Cleaned up the OGL_helper patches a bit
Diffstat (limited to 'patches/CGAL-OGL-Tess-Combine-Fix.patch')
-rw-r--r--patches/CGAL-OGL-Tess-Combine-Fix.patch43
1 files changed, 0 insertions, 43 deletions
diff --git a/patches/CGAL-OGL-Tess-Combine-Fix.patch b/patches/CGAL-OGL-Tess-Combine-Fix.patch
deleted file mode 100644
index 2a4ad1a..0000000
--- a/patches/CGAL-OGL-Tess-Combine-Fix.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- CGAL-3.4/include/CGAL/Nef_3/OGL_helper.h
-+++ CGAL-3.4/include/CGAL/Nef_3/OGL_helper.h
-@@ -243,6 +243,23 @@
- glVertex3dv(pc);
- }
-
-+ inline void CGAL_GLU_TESS_CALLBACK combineCallback(GLdouble coords[3], GLvoid *d[4], GLfloat w[4], GLvoid **dataOut)
-+ {
-+ static std::list<GLdouble*> pcache;
-+ if (dataOut) {
-+ GLdouble *n = new GLdouble[3];
-+ n[0] = coords[0];
-+ n[1] = coords[1];
-+ n[2] = coords[2];
-+ pcache.push_back(n);
-+ *dataOut = n;
-+ } else {
-+ for (std::list<GLdouble*>::const_iterator i = pcache.begin(); i != pcache.end(); i++)
-+ delete[] *i;
-+ pcache.clear();
-+ }
-+ }
-+
-
- enum { SNC_AXES};
- enum { SNC_BOUNDARY, SNC_SKELETON };
-@@ -376,6 +393,8 @@
- GLUtesselator* tess_ = gluNewTess();
- gluTessCallback(tess_, GLenum(GLU_TESS_VERTEX_DATA),
- (GLvoid (CGAL_GLU_TESS_CALLBACK *)(CGAL_GLU_TESS_DOTS)) &vertexCallback);
-+ gluTessCallback(tess_, GLenum(GLU_TESS_COMBINE),
-+ (GLvoid (CGAL_GLU_TESS_CALLBACK *)(CGAL_GLU_TESS_DOTS)) &combineCallback);
- gluTessCallback(tess_, GLenum(GLU_TESS_BEGIN),
- (GLvoid (CGAL_GLU_TESS_CALLBACK *)(CGAL_GLU_TESS_DOTS)) &beginCallback);
- gluTessCallback(tess_, GLenum(GLU_TESS_END),
-@@ -410,6 +429,7 @@
- gluTessEndPolygon(tess_);
- // CGAL_NEF_TRACEN("End Polygon");
- gluDeleteTess(tess_);
-+ combineCallback(NULL, NULL, NULL, NULL);
- }
-
- void construct_axes() const
contact: Jan Huwald // Impressum