[brlcad-commits] SF.net SVN: brlcad:[47284] brlcad/trunk/src/libgcv/bottess.c

[<eri...@us...>]

Revision: 47284
          http://brlcad.svn.sourceforge.net/brlcad/?rev=47284&view=rev
Author:   erikgreenwald
Date:     2011-10-18 14:43:19 +0000 (Tue, 18 Oct 2011)
Log Message:
-----------
collapse switch into ternary/math

Modified Paths:
--------------
    brlcad/trunk/src/libgcv/bottess.c

Modified: brlcad/trunk/src/libgcv/bottess.c
===================================================================
--- brlcad/trunk/src/libgcv/bottess.c	2011-10-18 14:27:56 UTC (rev 47283)
+++ brlcad/trunk/src/libgcv/bottess.c	2011-10-18 14:43:19 UTC (rev 47284)
@@ -499,26 +499,10 @@
 
     /* if LINE+FACE, break into 4 */
     if(isv[0]&LINE_INT ) {
-	switch(a) {
-	    case 0:
-		soup_add_face_precomputed(s, f->vert[0], isectpt[0], isectpt[1], f->plane, 0);
-		soup_add_face_precomputed(s, f->vert[1], isectpt[1], isectpt[0], f->plane, 0);
-		soup_add_face_precomputed(s, f->vert[1], f->vert[2], isectpt[1], f->plane, 0);
-		soup_add_face_precomputed(s, f->vert[0], isectpt[1], f->vert[2], f->plane, 0);
-		break;
-	    case 1:
-		soup_add_face_precomputed(s, f->vert[1], isectpt[0], isectpt[1], f->plane, 0);
-		soup_add_face_precomputed(s, f->vert[2], isectpt[1], isectpt[0], f->plane, 0);
-		soup_add_face_precomputed(s, f->vert[2], f->vert[0], isectpt[1], f->plane, 0);
-		soup_add_face_precomputed(s, f->vert[1], isectpt[1], f->vert[0], f->plane, 0);
-		break;
-	    case 2:
-		soup_add_face_precomputed(s, f->vert[2], isectpt[0], isectpt[1], f->plane, 0);
-		soup_add_face_precomputed(s, f->vert[0], isectpt[1], isectpt[0], f->plane, 0);
-		soup_add_face_precomputed(s, f->vert[0], f->vert[1], isectpt[1], f->plane, 0);
-		soup_add_face_precomputed(s, f->vert[2], isectpt[1], f->vert[1], f->plane, 0);
-		break;
-	}
+	soup_add_face_precomputed(s, f->vert[a], isectpt[0], isectpt[1], f->plane, 0);
+	soup_add_face_precomputed(s, f->vert[a==2?0:a+1], isectpt[1], isectpt[0], f->plane, 0);
+	soup_add_face_precomputed(s, f->vert[a==2?0:a+1], f->vert[a==0?2:a-1], isectpt[1], f->plane, 0);
+	soup_add_face_precomputed(s, f->vert[a], isectpt[1], f->vert[a==0?2:a-1], f->plane, 0);
 	soup_rm_face(s, fid);
 	return 4;
     }
@@ -732,7 +716,7 @@
 
 
 HIDDEN union tree *
-compose(union tree *left_tree, union tree *right_tree, unsigned long int face_status1, unsigned long int face_status2, unsigned long int face_status3)
+compose(union tree *left_tree, union tree *right_tree, unsigned long int face_status1, unsigned long int UNUSED(face_status2), unsigned long int face_status3)
 {
     struct soup_s *l, *r;
     int i;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.