stardis

commit a70d910379f5b2e6f3a9a8fb2ecc17d6628a52da
parent 474ee20b12004314f19c64eb8f8690cdc8e7d10e
Author: Christophe Coustet <christophe.coustet@meso-star.com>
Date:   Fri,  7 Jun 2019 16:29:23 +0200

Fix an error message

Diffstat:
M
src/stardis-app.c
 | 
7
++++---
M
src/stardis-app.h
 | 
10
+++++-----
M
src/stardis-compute.c
 | 
2
+-

3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/stardis-app.c b/src/stardis-app.c
@@ -631,11 +631,12 @@ read_triangles
     }
     if (*side_desc_ptr != UINT_MAX && *side_desc_ptr != desc_id) {
       /* Already described with a different description! */
-      fprintf(stderr, "Triangle %u %s with 2 different descriptions\n",
+      fprintf(stderr, "Triangle %u %s from file %s with 2 different descriptions\n",
         tri_index,
         (file_type == CONTENT_CONNECTION
-          ? "connection" : (current_side == SDIS_FRONT ? "front" : "back")));
-      print_trg_as_obj(stderr, (const struct vertex*)stl_desc->vertices, &tri);
+          ? "connection" : (current_side == SDIS_FRONT ? "front" : "back")),
+        stl_filename);
+      print_trg_as_obj(stderr, (const struct vertex*)stl_desc->vertices, stl_desc->indices + (3 * tri_index));
       return RES_BAD_ARG;
     }
     /* Everithing is OK: store description */
diff --git a/src/stardis-app.h b/src/stardis-app.h
@@ -67,13 +67,13 @@ static INLINE void
 print_trg_as_obj
   (FILE* stream,
    const struct vertex* vertices,
-   const struct triangle* trg)
+   const unsigned* indices)
 {
-  ASSERT(stream && vertices && trg);
+  ASSERT(stream && vertices && indices);
   fprintf(stream, "v %.8f %.8f %.8f\nv %.8f %.8f %.8f\nv %.8f %.8f %.8f\nf 1 2 3\n",
-    SPLIT3(vertices[trg->indices.data[0]].xyz),
-    SPLIT3(vertices[trg->indices.data[1]].xyz),
-    SPLIT3(vertices[trg->indices.data[2]].xyz));
+    SPLIT3(vertices[indices[0]].xyz),
+    SPLIT3(vertices[indices[1]].xyz),
+    SPLIT3(vertices[indices[2]].xyz));
 }
 
 static INLINE char
diff --git a/src/stardis-compute.c b/src/stardis-compute.c
@@ -1514,7 +1514,7 @@ stardis_compute(struct stardis* stardis, enum stardis_mode mode)
       {
         /* Incoherent triangle description */
         fprintf(stderr, "Incoherent triangle description (%u)\n", i);
-        print_trg_as_obj(stderr, stardis->geometry.vertex, trg);
+        print_trg_as_obj(stderr, stardis->geometry.vertex, trg->indices.data);
         fprintf(stderr, "Front: ");
         if (!front_defined) fprintf(stderr, "undefined\n");
         else print_description(stderr, &stardis->descriptions[fd]);