star-enclosures-3d

commit dd1768c8ab0abea05c1a143a9e3eea279fec6d54
parent 85a6c25776b1fceb72c9f975a4e53fbf785a736e
Author: Christophe Coustet <christophe.coustet@meso-star.com>
Date:   Wed, 14 Feb 2018 11:58:30 +0100

Remove useless data and code.

Kept a per-triangle ID that was not used.

Diffstat:
M
src/senc_scene.c
 | 
15
---------------
M
src/senc_scene_c.h
 | 
9
---------

2 files changed, 0 insertions(+), 24 deletions(-)
diff --git a/src/senc_scene.c b/src/senc_scene.c
@@ -38,8 +38,6 @@ scene_release(ref_T * ref)
   htable_vrtx_release(&scn->unique_vertices);
   darray_vrtx_id_release(&scn->unique_vertice_ids);
   htable_trg_release(&scn->unique_triangles);
-  darray_trg_id_release(&scn->unique_triangle_ids);
-  darray_char_release(&scn->triangle_reversed);
   MEM_RM(dev->allocator, scn);
   SENC(device_ref_put(dev));
 }
@@ -79,8 +77,6 @@ senc_scene_create
   htable_vrtx_init(dev->allocator, &scn->unique_vertices);
   darray_vrtx_id_init(dev->allocator, &scn->unique_vertice_ids);
   htable_trg_init(dev->allocator, &scn->unique_triangles);
-  darray_trg_id_init(dev->allocator, &scn->unique_triangle_ids);
-  darray_char_init(dev->allocator, &scn->triangle_reversed);
 
 exit:
   if(scn) *out_scn = scn;
@@ -123,8 +119,6 @@ senc_scene_add_geometry
   OK(htable_vrtx_reserve(&scn->unique_vertices, scn->nuverts + nverts));
   OK(darray_vrtx_id_reserve(&scn->unique_vertice_ids, scn->nverts + nverts));
   OK(htable_trg_reserve(&scn->unique_triangles, scn->nutris + ntris));
-  OK(darray_trg_id_reserve(&scn->unique_triangle_ids, scn->ntris + ntris));
-  OK(darray_char_reserve(&scn->triangle_reversed, scn->ntris + ntris));
 
   /* Get geometry */
   trg = darray_triangle_in_cdata_get(&scn->triangles_in);
@@ -251,13 +245,7 @@ senc_scene_add_geometry
       OK(darray_triangle_in_push_back(&scn->triangles_in, &tmp));
       ++actual_nutris;
     }
-    ASSERT(darray_trg_id_size_get(&scn->unique_triangle_ids)
-      == darray_char_size_get(&scn->triangle_reversed));
-    ASSERT(scn->ntris + i
-      == darray_trg_id_size_get(&scn->unique_triangle_ids));
     tr = scn->nutris + i;
-    OK(darray_trg_id_push_back(&scn->unique_triangle_ids, &tr));
-    OK(darray_char_push_back(&scn->triangle_reversed, &reversed));
     ++actual_ntris;
   }
 
@@ -270,9 +258,6 @@ exit:
   ASSERT(scn->nverts == darray_vrtx_id_size_get(&scn->unique_vertice_ids));
   ASSERT(scn->nuverts == htable_vrtx_size_get(&scn->unique_vertices));
   ASSERT(scn->nutris == htable_trg_size_get(&scn->unique_triangles));
-  ASSERT(scn->ntris == darray_trg_id_size_get(&scn->unique_triangle_ids));
-  ASSERT(darray_trg_id_size_get(&scn->unique_triangle_ids)
-    == darray_char_size_get(&scn->triangle_reversed));
   ++scn->ngeoms;
   return res;
 error:
diff --git a/src/senc_scene_c.h b/src/senc_scene_c.h
@@ -21,7 +21,6 @@
 #include <rsys/ref_count.h>
 #include <rsys/dynamic_array.h>
 #include <rsys/hash_table.h>
-#include <rsys/dynamic_array_char.h>
 
 struct mem_allocator;
 
@@ -175,10 +174,6 @@ trg_key_eq(const union vrtx_id3* k1, const union vrtx_id3* k2)
 #define HTABLE_KEY_FUNCTOR_EQ trg_key_eq
 #include <rsys/hash_table.h>
 
-#define DARRAY_NAME trg_id
-#define DARRAY_DATA trg_id_t
-#include <rsys/dynamic_array.h>
-
 struct senc_scene {
   /* Triangle information as given by user; no duplicates here */
   struct darray_triangle_in triangles_in;
@@ -197,10 +192,6 @@ struct senc_scene {
   /* Htables used to detect duplicate triangles. */
   /* Keep each unique triangle; no duplicates here. */
   struct htable_trg unique_triangles;
-  /* Associate each triangle with its rank in unique_triangles... */
-  struct darray_trg_id unique_triangle_ids;
-  /* ... and a bool indicating reverse vertices order. */
-  struct darray_char triangle_reversed;
 
   /* Keep sizes */
   unsigned ngeoms; /* Not used yet (just counted). */