star-enclosures-3d

commit cdfd04dfe9704d959c210551a0051496a9761a12
parent efd30b9ec5bad416af326ee72274b6b342150945
Author: Christophe Coustet <christophe.coustet@meso-star.com>
Date:   Thu, 12 Apr 2018 15:10:18 +0200

Fix naming for enclosure header type.

Diffstat:
M
src/senc.h
 | 
4
++--
M
src/senc_enclosure.c
 | 
2
+-
M
src/senc_enclosure_data.h
 | 
4
++--
M
src/test_senc_enclosure.c
 | 
2
+-
M
src/test_senc_many_enclosures.c
 | 
2
+-
M
src/test_senc_many_triangles.c
 | 
2
+-
M
src/test_senc_sample_enclosure.c
 | 
2
+-
M
src/test_senc_utils.h
 | 
2
+-

8 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/senc.h b/src/senc.h
@@ -57,7 +57,7 @@ struct senc_scene;
 struct senc_enclosure;
 
 /* Enclosure header type */
-struct enclosure_header {
+struct senc_enclosure_header {
   /* The ID of the enclosure; 0, 1, ... */
   unsigned enclosure_id;
   /* Number of triangles; a triangle can be accounted for twice, once by side */
@@ -233,7 +233,7 @@ senc_descriptor_ref_put
 SENC_API res_T
 senc_enclosure_get_header
   (const struct senc_enclosure* enclosure,
-   struct enclosure_header* header);
+   struct senc_enclosure_header* header);
 
 SENC_API res_T
 senc_enclosure_get_triangle
diff --git a/src/senc_enclosure.c b/src/senc_enclosure.c
@@ -66,7 +66,7 @@ enclosure_create
 res_T
 senc_enclosure_get_header
   (const struct senc_enclosure* enclosure,
-   struct enclosure_header* header)
+   struct senc_enclosure_header* header)
 {
   if(!enclosure || !header) return RES_BAD_ARG;
   *header = enclosure->data->header;
diff --git a/src/senc_enclosure_data.h b/src/senc_enclosure_data.h
@@ -26,7 +26,7 @@
 #include <limits.h>
 
 static void
-init_header(struct enclosure_header* header)
+init_header(struct senc_enclosure_header* header)
 {
   ASSERT(header);
   header->enclosure_id = ENCLOSURE_NULL__;
@@ -38,7 +38,7 @@ init_header(struct enclosure_header* header)
 }
 
 struct enclosure_data {
-  struct enclosure_header header;
+  struct senc_enclosure_header header;
   /* Same triangle can appear twice if both sides */
   struct darray_triangle_in sides;
   /* Index of vertices in scene's unique vertices */
diff --git a/src/test_senc_enclosure.c b/src/test_senc_enclosure.c
@@ -31,7 +31,7 @@ main(int argc, char** argv)
   struct senc_scene* scn = NULL;
   struct senc_enclosure* enclosures[2] = { NULL, NULL };
   struct senc_enclosure* enclosure;
-  struct enclosure_header header;
+  struct senc_enclosure_header header;
   struct s3d_device* s3d = NULL;
   struct s3d_scene* s3d_scn = NULL;
   struct s3d_shape* s3d_shp = NULL;
diff --git a/src/test_senc_many_enclosures.c b/src/test_senc_many_enclosures.c
@@ -145,7 +145,7 @@ main(int argc, char** argv)
 
   FOR_EACH(e, 0, count) {
     struct senc_enclosure* enclosure;
-    struct enclosure_header header;
+    struct senc_enclosure_header header;
     CHK(senc_descriptor_get_enclosure(desc, e, &enclosure) == RES_OK);
     CHK(senc_enclosure_get_header(enclosure, &header) == RES_OK);
     CHK(header.triangle_count ==
diff --git a/src/test_senc_many_triangles.c b/src/test_senc_many_triangles.c
@@ -129,7 +129,7 @@ main(int argc, char** argv)
   CHK(count == 1 + NB_CYL);
   FOR_EACH(i, 0, count) {
     struct senc_enclosure* enclosure;
-    struct enclosure_header header;
+    struct senc_enclosure_header header;
     CHK(senc_descriptor_get_enclosure(desc, i, &enclosure) == RES_OK);
     CHK(senc_enclosure_get_header(enclosure, &header) == RES_OK);
     CHK(header.triangle_count ==
diff --git a/src/test_senc_sample_enclosure.c b/src/test_senc_sample_enclosure.c
@@ -31,7 +31,7 @@ main(int argc, char** argv)
   struct senc_device* dev = NULL;
   struct senc_scene* scn = NULL;
   struct senc_enclosure* enclosure = NULL;
-  struct enclosure_header header;
+  struct senc_enclosure_header header;
   struct s3d_device* s3d = NULL;
   struct s3d_scene* s3d_scn = NULL;
   struct s3d_scene_view* s3d_view = NULL;
diff --git a/src/test_senc_utils.h b/src/test_senc_utils.h
@@ -154,7 +154,7 @@ dump_enclosure
    const char* name)
 {
   struct senc_enclosure* enclosure;
-  struct enclosure_header header;
+  struct senc_enclosure_header header;
   FILE* stream;
   unsigned count, i;