verified that faceuses are properly gathered in get_face_list. todo: …

…use bu_list instead of array placeholder for faceuse list.
behollis · Aug 8, 2015 · 35e5931 · 35e5931
1 parent db9a7aa
commit 35e5931
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 12 deletions.
diff --git a/src/librt/vlist.c b/src/librt/vlist.c
@@ -507,27 +507,36 @@ rt_label_vlist_verts(struct bn_vlblock *vbp, struct bu_list *src, fastf_t *mat,
 }
 
 void
-rt_label_vlist_faces( struct bn_vlblock* UNUSED(vbp), struct faceuse** UNUSED(fu_list),
+rt_label_vlist_faces(struct bn_vlblock* UNUSED(vbp), struct faceuse** fu_list,
                      fastf_t *UNUSED(mat), double UNUSED(sz), double UNUSED(mm2local) )
 {
 #if 0
     struct bn_vlist *vp;
     struct bu_list *vhead;
+#endif
     char label[256];
-
+    int idx;
+#if 0
     vhead = bn_vlblock_find(vbp, 255, 255, 255);    /* white */
+#endif
 
-    for (BU_LIST_FOR(vp, bn_vlist, src)) {
-    register int i;
-    register int nused = vp->nused;
-    register int *cmd = vp->cmd;
-    register point_t *pt = vp->pt;
-    for (i = 0; i < nused; i++, cmd++, pt++) {
-        sprintf(label, " %g", (*pt)[0]*mm2local);
-        bn_vlist_3string(vhead, vbp->free_vlist_hd, label, (*pt), mat, sz);
-    }
-    }
+    for ( idx = 0; idx < 50; idx++ ) {
+#if 0
+        register int i;
+        register int nused = vp->nused;
+        register int *cmd = vp->cmd;
+
+
+        for (i = 0; i < nused; i++, cmd++, pt++) {
+        register point_t *pt = vp->pt;
 #endif
+        if (fu_list[idx]) {
+            sprintf(label, " %d", (int)fu_list[idx]->index );
+#if 0
+            bn_vlist_3string(vhead, vbp->free_vlist_hd, label, (*pt), mat, sz);
+#endif
+        }
+    }
 }
 
 

diff --git a/src/mged/overlay.c b/src/mged/overlay.c
@@ -187,7 +187,9 @@ f_labelface(ClientData UNUSED(clientData), Tcl_Interp *interp, int argc, const c
     struct rt_db_internal internal;
     struct directory *dp;
     struct display_list *gdlp;
+#if 0
     struct display_list *next_gdlp;
+#endif
     int i;
     struct bn_vlblock*vbp;
     mat_t mat;
@@ -244,7 +246,9 @@ f_labelface(ClientData UNUSED(clientData), Tcl_Interp *interp, int argc, const c
     /* Find uses of this solid in the solid table */
     gdlp = BU_LIST_NEXT(display_list, gedp->ged_gdp->gd_headDisplay);
     while (BU_LIST_NOT_HEAD(gdlp, gedp->ged_gdp->gd_headDisplay)) {
+#if 0
         next_gdlp = BU_LIST_PNEXT(display_list, gdlp);
+#endif
 
         FOR_ALL_SOLIDS(s, &gdlp->dl_headSolid) {
         if (db_full_path_search(&s->s_fullpath, dp)) {
@@ -253,7 +257,10 @@ f_labelface(ClientData UNUSED(clientData), Tcl_Interp *interp, int argc, const c
         }
         }
 
+        break;
+#if 0
         gdlp = next_gdlp;
+#endif
     }
     }