change renderMesh triangle check to single assert

brendankenny · Nov 22, 2014 · e1cbdf3 · e1cbdf3
1 parent a35c63c
commit e1cbdf3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 26 deletions.
diff --git a/libtess.cat.js b/libtess.cat.js
@@ -1465,7 +1465,6 @@ libtess.normal.checkOrientation_ = function(tess) {
 };
 
 
-
 /* global libtess */
 
 /** @const */
@@ -1498,19 +1497,11 @@ libtess.render.renderMesh = function(tess, mesh, flagEdges) {
         beginOrBeginDataCalled = true;
       }
 
-      // Loop once for each edge (there will always be 3 edges)
-      if (libtess.DEBUG) {
-        // check that face has only three edges
-        var edge = f.anEdge;
-        var edgeCount = 0;
-        do {
-          edgeCount++;
-          edge = edge.lNext;
-        } while (edge !== f.anEdge);
-        libtess.assert(edgeCount === 3,
-            'renderMesh called with non-triangulated mesh');
-      }
+      // check that face has only three edges
       var e = f.anEdge;
+      libtess.assert(e.lNext.lNext.lNext === e,
+          'renderMesh called with non-triangulated mesh');
+      // Loop once for each edge (there will always be 3 edges)
       do {
         if (flagEdges) {
           // Set the "edge state" to true just before we output the

diff --git a/src/render.js b/src/render.js
@@ -26,7 +26,6 @@
  * Copyright in any portions created by third parties is as indicated
  * elsewhere herein. All Rights Reserved.
  */
-
 /* global libtess */
 
 /** @const */
@@ -59,19 +58,11 @@ libtess.render.renderMesh = function(tess, mesh, flagEdges) {
         beginOrBeginDataCalled = true;
       }
 
-      // Loop once for each edge (there will always be 3 edges)
-      if (libtess.DEBUG) {
-        // check that face has only three edges
-        var edge = f.anEdge;
-        var edgeCount = 0;
-        do {
-          edgeCount++;
-          edge = edge.lNext;
-        } while (edge !== f.anEdge);
-        libtess.assert(edgeCount === 3,
-            'renderMesh called with non-triangulated mesh');
-      }
+      // check that face has only three edges
       var e = f.anEdge;
+      libtess.assert(e.lNext.lNext.lNext === e,
+          'renderMesh called with non-triangulated mesh');
+      // Loop once for each edge (there will always be 3 edges)
       do {
         if (flagEdges) {
           // Set the "edge state" to true just before we output the