From c79ca083c19da79cb0d27371ed485f552eeb6276 Mon Sep 17 00:00:00 2001 From: Jonathan Westhues Date: Mon, 9 Nov 2009 03:59:30 -0800 Subject: [PATCH] Remove dead code: the old stuff to abuse the gl triangulation routines, since I now have my own. [git-p4: depot-paths = "//depot/solvespace/": change = 2074] --- polygon.cpp | 59 ----------------------------------------------------- polygon.h | 2 -- 2 files changed, 61 deletions(-) diff --git a/polygon.cpp b/polygon.cpp index 8431dea7..30a9e32f 100644 --- a/polygon.cpp +++ b/polygon.cpp @@ -691,65 +691,6 @@ bool SPolygon::SelfIntersecting(Vector *intersectsAt) { return ret; } -static int TriMode, TriVertexCount; -static Vector Tri1, TriNMinus1, TriNMinus2; -static Vector TriNormal; -static SMesh *TriMesh; -static STriMeta TriMeta; -static void GLX_CALLBACK TriBegin(int mode) -{ - TriMode = mode; - TriVertexCount = 0; -} -static void GLX_CALLBACK TriEnd(void) -{ -} -static void GLX_CALLBACK TriVertex(Vector *triN) -{ - if(TriVertexCount == 0) { - Tri1 = *triN; - } - if(TriMode == GL_TRIANGLES) { - if((TriVertexCount % 3) == 2) { - TriMesh->AddTriangle( - TriMeta, TriNormal, TriNMinus2, TriNMinus1, *triN); - } - } else if(TriMode == GL_TRIANGLE_FAN) { - if(TriVertexCount >= 2) { - TriMesh->AddTriangle( - TriMeta, TriNormal, Tri1, TriNMinus1, *triN); - } - } else if(TriMode == GL_TRIANGLE_STRIP) { - if(TriVertexCount >= 2) { - TriMesh->AddTriangle( - TriMeta, TriNormal, TriNMinus2, TriNMinus1, *triN); - } - } else oops(); - - TriNMinus2 = TriNMinus1; - TriNMinus1 = *triN; - TriVertexCount++; -} -void SPolygon::TriangulateInto(SMesh *m) { - STriMeta meta; - ZERO(&meta); - TriangulateInto(m, meta); -} -void SPolygon::TriangulateInto(SMesh *m, STriMeta meta) { - TriMesh = m; - TriNormal = normal; - TriMeta = meta; - - GLUtesselator *gt = gluNewTess(); - gluTessCallback(gt, GLU_TESS_BEGIN, (glxCallbackFptr *)TriBegin); - gluTessCallback(gt, GLU_TESS_END, (glxCallbackFptr *)TriEnd); - gluTessCallback(gt, GLU_TESS_VERTEX, (glxCallbackFptr *)TriVertex); - - glxTesselatePolygon(gt, this); - - gluDeleteTess(gt); -} - //----------------------------------------------------------------------------- // Low-quality routines to cutter radius compensate a polygon. Assumes the // polygon is in the xy plane, and the contours all go in the right direction diff --git a/polygon.h b/polygon.h index 1efbfb11..3b455c49 100644 --- a/polygon.h +++ b/polygon.h @@ -128,8 +128,6 @@ public: bool ContainsPoint(Vector p); void MakeEdgesInto(SEdgeList *el); void FixContourDirections(void); - void TriangulateInto(SMesh *m); - void TriangulateInto(SMesh *m, STriMeta meta); void Clear(void); bool SelfIntersecting(Vector *intersectsAt); bool IsEmpty(void);