stardis

commit 02c4a0578155894a9278610ab73ed1ec21be5ae3
parent 7480c2bc89ba2de4670ce45d5da90a819d216cfa
Author: Christophe Coustet <christophe.coustet@meso-star.com>
Date:   Wed, 30 Mar 2022 14:26:52 +0200

Print triangle counts if verbose

Diffstat:
M
src/stardis-app.c
 | 
4
++++
M
src/stardis-parsing.c
 | 
12
++++++++----

2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/stardis-app.c b/src/stardis-app.c
@@ -318,6 +318,9 @@ stardis_init
   ERR(sg3d_geometry_get_unique_vertices_count(stardis->geometry.sg3d, &vcount));
   ERR(sg3d_geometry_get_unique_triangles_count(stardis->geometry.sg3d, &tcount));
 
+  logger_print(stardis->logger, LOG_OUTPUT,
+    "Read %u unique triangles.\n", tcount);
+
   ERR(sg3d_geometry_validate_properties(stardis->geometry.sg3d,
      validate_properties, stardis));
   ERR(sg3d_geometry_get_unique_triangles_with_properties_conflict_count(
@@ -520,6 +523,7 @@ init_enclosures
   struct senc3d_device* senc_dev = NULL;
 
   ERR(sg3d_geometry_get_unique_triangles_count(stardis->geometry.sg3d, &tsz));
+
   ERR(sg3d_geometry_get_unique_vertices_count(stardis->geometry.sg3d, &vsz));
   ERR(senc3d_device_create(stardis->logger, stardis->allocator,
     stardis->nthreads, stardis->verbose, &senc_dev));
diff --git a/src/stardis-parsing.c b/src/stardis-parsing.c
@@ -171,14 +171,18 @@ read_sides_and_files
     }
     file_count++;
     res = sstl_load(sstl, tk);
-    if(res != RES_OK) {
+    if(res == RES_OK) {
+      ERR(sstl_get_desc(sstl, &add_geom_ctx.stl_desc));
+      ASSERT(add_geom_ctx.stl_desc.vertices_count <= UINT_MAX
+        && add_geom_ctx.stl_desc.triangles_count <= UINT_MAX);
+      logger_print(stardis->logger, LOG_OUTPUT,
+        "Read file '%s': %u triangle found\n",
+        tk, (unsigned)add_geom_ctx.stl_desc.triangles_count);
+    } else {
       logger_print(stardis->logger, LOG_ERROR,
         "Cannot read STL file: '%s'\n", tk);
       goto error;
     }
-    ERR(sstl_get_desc(sstl, &add_geom_ctx.stl_desc));
-    ASSERT(add_geom_ctx.stl_desc.vertices_count <= UINT_MAX
-      && add_geom_ctx.stl_desc.triangles_count <= UINT_MAX);
 
     res = sg3d_geometry_add(
       stardis->geometry.sg3d,