star-2d

commit e088a688571da2923d53b6fb5fd758f0bb6f5813
parent 962edc30dcf467b31d3479a3dee901e0f5107564
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Fri, 12 Jan 2018 14:49:07 +0100

Upd the shape test to use the scene view API

Diffstat:
M
cmake/CMakeLists.txt
 | 
1
+
M
src/test_s2d_shape.c
 | 
80
++++++++++++++++++++++++++++++++++++++++----------------------------------------

2 files changed, 41 insertions(+), 40 deletions(-)
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -132,6 +132,7 @@ if(NOT NO_TEST)
   new_test(test_s2d_device)
   new_test(test_s2d_primitive)
   new_test(test_s2d_sample)
+  new_test(test_s2d_shape)
   new_test(test_s2d_scene)
   new_test(test_s2d_scene_view)
   new_test(test_s2d_scene_view2)
diff --git a/src/test_s2d_shape.c b/src/test_s2d_shape.c
@@ -52,12 +52,12 @@ main(int argc, char** argv)
   struct s2d_shape* shape_copy;
   struct s2d_vertex_data vdata[4];
   struct s2d_attrib attr;
-  const unsigned nsegs = sizeof(box_ids) / sizeof(unsigned[2]);
-  const unsigned nverts = sizeof(box_verts) / sizeof(float[2]);
+  const unsigned nsegs = sizeof(square_ids) / sizeof(unsigned[2]);
+  const unsigned nverts = sizeof(square_verts) / sizeof(float[2]);
   unsigned n;
   unsigned ids[2];
   unsigned id;
-  void* data = (void*)&box_desc;
+  void* data = (void*)&square_desc;
   char c;
   (void)argc, (void)argv;
 
@@ -95,83 +95,83 @@ main(int argc, char** argv)
   vdata[0].get = line_segments_get_position;
 
   #define SETUP s2d_line_segments_setup_indexed_vertices
-  #define box_get_ids line_segments_get_ids
+  #define square_get_ids line_segments_get_ids
   CHK(SETUP(NULL, 0, NULL, 0, NULL, 0, data) == RES_BAD_ARG);
   CHK(SETUP(shape, 0, NULL, 0, NULL, 0, data) == RES_BAD_ARG);
   CHK(SETUP(NULL, nsegs, NULL, 0, NULL, 0, data) == RES_BAD_ARG);
   CHK(SETUP(shape, nsegs, NULL, 0, NULL, 0, data) == RES_BAD_ARG);
-  CHK(SETUP(NULL, 0, box_get_ids, 0, NULL, 0, data) == RES_BAD_ARG);
-  CHK(SETUP(shape, 0, box_get_ids, 0, NULL, 0, data) == RES_BAD_ARG);
-  CHK(SETUP(NULL, nsegs, box_get_ids, 0, NULL, 0, data) == RES_BAD_ARG);
-  CHK(SETUP(shape, nsegs, box_get_ids, 0, NULL, 0, data) == RES_BAD_ARG);
+  CHK(SETUP(NULL, 0, square_get_ids, 0, NULL, 0, data) == RES_BAD_ARG);
+  CHK(SETUP(shape, 0, square_get_ids, 0, NULL, 0, data) == RES_BAD_ARG);
+  CHK(SETUP(NULL, nsegs, square_get_ids, 0, NULL, 0, data) == RES_BAD_ARG);
+  CHK(SETUP(shape, nsegs, square_get_ids, 0, NULL, 0, data) == RES_BAD_ARG);
   CHK(SETUP(NULL, 0, NULL, nverts, NULL, 0, data) == RES_BAD_ARG);
   CHK(SETUP(shape, 0, NULL, nverts, NULL, 0, data) == RES_BAD_ARG);
   CHK(SETUP(NULL, nsegs, NULL, nverts, NULL, 0, data) == RES_BAD_ARG);
   CHK(SETUP(shape, nsegs, NULL, nverts, NULL, 0, data) == RES_BAD_ARG);
-  CHK(SETUP(NULL, 0, box_get_ids, nverts, NULL, 0, data) == RES_BAD_ARG);
-  CHK(SETUP(shape, 0, box_get_ids, nverts, NULL, 0, data) == RES_BAD_ARG);
-  CHK(SETUP(NULL, nsegs, box_get_ids, nverts, NULL, 0, data) == RES_BAD_ARG);
-  CHK(SETUP(shape, nsegs, box_get_ids, nverts, NULL, 0, data) == RES_BAD_ARG);
+  CHK(SETUP(NULL, 0, square_get_ids, nverts, NULL, 0, data) == RES_BAD_ARG);
+  CHK(SETUP(shape, 0, square_get_ids, nverts, NULL, 0, data) == RES_BAD_ARG);
+  CHK(SETUP(NULL, nsegs, square_get_ids, nverts, NULL, 0, data) == RES_BAD_ARG);
+  CHK(SETUP(shape, nsegs, square_get_ids, nverts, NULL, 0, data) == RES_BAD_ARG);
   CHK(SETUP(NULL, 0, NULL, 0, vdata, 0, data) == RES_BAD_ARG);
   CHK(SETUP(shape, 0, NULL, 0, vdata, 0, data) == RES_BAD_ARG);
   CHK(SETUP(NULL, nsegs, NULL, 0, vdata, 0, data) == RES_BAD_ARG);
   CHK(SETUP(shape, nsegs, NULL, 0, vdata, 0, data) == RES_BAD_ARG);
-  CHK(SETUP(NULL, 0, box_get_ids, 0, vdata, 0, data) == RES_BAD_ARG);
-  CHK(SETUP(shape, 0, box_get_ids, 0, vdata, 0, data) == RES_BAD_ARG);
-  CHK(SETUP(NULL, nsegs, box_get_ids, 0, vdata, 0, data) == RES_BAD_ARG);
-  CHK(SETUP(shape, nsegs, box_get_ids, 0, vdata, 0, data) == RES_BAD_ARG);
+  CHK(SETUP(NULL, 0, square_get_ids, 0, vdata, 0, data) == RES_BAD_ARG);
+  CHK(SETUP(shape, 0, square_get_ids, 0, vdata, 0, data) == RES_BAD_ARG);
+  CHK(SETUP(NULL, nsegs, square_get_ids, 0, vdata, 0, data) == RES_BAD_ARG);
+  CHK(SETUP(shape, nsegs, square_get_ids, 0, vdata, 0, data) == RES_BAD_ARG);
   CHK(SETUP(NULL, 0, NULL, nverts, vdata, 0, data) == RES_BAD_ARG);
   CHK(SETUP(shape, 0, NULL, nverts, vdata, 0, data) == RES_BAD_ARG);
   CHK(SETUP(NULL, nsegs, NULL, nverts, vdata, 0, data) == RES_BAD_ARG);
   CHK(SETUP(shape, nsegs, NULL, nverts, vdata, 0, data) == RES_BAD_ARG);
-  CHK(SETUP(NULL, 0, box_get_ids, nverts, vdata, 0, data) == RES_BAD_ARG);
-  CHK(SETUP(shape, 0, box_get_ids, nverts, vdata, 0, data) == RES_BAD_ARG);
-  CHK(SETUP(NULL, nsegs, box_get_ids, nverts, vdata, 0, data) == RES_BAD_ARG);
-  CHK(SETUP(shape, nsegs, box_get_ids, nverts, vdata, 0, data) == RES_BAD_ARG);
+  CHK(SETUP(NULL, 0, square_get_ids, nverts, vdata, 0, data) == RES_BAD_ARG);
+  CHK(SETUP(shape, 0, square_get_ids, nverts, vdata, 0, data) == RES_BAD_ARG);
+  CHK(SETUP(NULL, nsegs, square_get_ids, nverts, vdata, 0, data) == RES_BAD_ARG);
+  CHK(SETUP(shape, nsegs, square_get_ids, nverts, vdata, 0, data) == RES_BAD_ARG);
   CHK(SETUP(NULL, 0, NULL, 0, NULL, 1, data) == RES_BAD_ARG);
   CHK(SETUP(shape, 0, NULL, 0, NULL, 1, data) == RES_BAD_ARG);
   CHK(SETUP(NULL, nsegs, NULL, 0, NULL, 1, data) == RES_BAD_ARG);
   CHK(SETUP(shape, nsegs, NULL, 0, NULL, 1, data) == RES_BAD_ARG);
-  CHK(SETUP(NULL, 0, box_get_ids, 0, NULL, 1, data) == RES_BAD_ARG);
-  CHK(SETUP(shape, 0, box_get_ids, 0, NULL, 1, data) == RES_BAD_ARG);
-  CHK(SETUP(NULL, nsegs, box_get_ids, 0, NULL, 1, data) == RES_BAD_ARG);
-  CHK(SETUP(shape, nsegs, box_get_ids, 0, NULL, 1, data) == RES_BAD_ARG);
+  CHK(SETUP(NULL, 0, square_get_ids, 0, NULL, 1, data) == RES_BAD_ARG);
+  CHK(SETUP(shape, 0, square_get_ids, 0, NULL, 1, data) == RES_BAD_ARG);
+  CHK(SETUP(NULL, nsegs, square_get_ids, 0, NULL, 1, data) == RES_BAD_ARG);
+  CHK(SETUP(shape, nsegs, square_get_ids, 0, NULL, 1, data) == RES_BAD_ARG);
   CHK(SETUP(NULL, 0, NULL, nverts, NULL, 1, data) == RES_BAD_ARG);
   CHK(SETUP(shape, 0, NULL, nverts, NULL, 1, data) == RES_BAD_ARG);
   CHK(SETUP(NULL, nsegs, NULL, nverts, NULL, 1, data) == RES_BAD_ARG);
   CHK(SETUP(shape, nsegs, NULL, nverts, NULL, 1, data) == RES_BAD_ARG);
-  CHK(SETUP(NULL, 0, box_get_ids, nverts, NULL, 1, data) == RES_BAD_ARG);
-  CHK(SETUP(shape, 0, box_get_ids, nverts, NULL, 1, data) == RES_BAD_ARG);
-  CHK(SETUP(NULL, nsegs, box_get_ids, nverts, NULL, 1, data) == RES_BAD_ARG);
-  CHK(SETUP(shape, nsegs, box_get_ids, nverts, NULL, 1, data) == RES_BAD_ARG);
+  CHK(SETUP(NULL, 0, square_get_ids, nverts, NULL, 1, data) == RES_BAD_ARG);
+  CHK(SETUP(shape, 0, square_get_ids, nverts, NULL, 1, data) == RES_BAD_ARG);
+  CHK(SETUP(NULL, nsegs, square_get_ids, nverts, NULL, 1, data) == RES_BAD_ARG);
+  CHK(SETUP(shape, nsegs, square_get_ids, nverts, NULL, 1, data) == RES_BAD_ARG);
   CHK(SETUP(NULL, 0, NULL, 0, vdata, 1, data) == RES_BAD_ARG);
   CHK(SETUP(shape, 0, NULL, 0, vdata, 1, data) == RES_BAD_ARG);
   CHK(SETUP(NULL, nsegs, NULL, 0, vdata, 1, data) == RES_BAD_ARG);
   CHK(SETUP(shape, nsegs, NULL, 0, vdata, 1, data) == RES_BAD_ARG);
-  CHK(SETUP(NULL, 0, box_get_ids, 0, vdata, 1, data) == RES_BAD_ARG);
-  CHK(SETUP(shape, 0, box_get_ids, 0, vdata, 1, data) == RES_BAD_ARG);
-  CHK(SETUP(NULL, nsegs, box_get_ids, 0, vdata, 1, data) == RES_BAD_ARG);
-  CHK(SETUP(shape, nsegs, box_get_ids, 0, vdata, 1, data) == RES_BAD_ARG);
+  CHK(SETUP(NULL, 0, square_get_ids, 0, vdata, 1, data) == RES_BAD_ARG);
+  CHK(SETUP(shape, 0, square_get_ids, 0, vdata, 1, data) == RES_BAD_ARG);
+  CHK(SETUP(NULL, nsegs, square_get_ids, 0, vdata, 1, data) == RES_BAD_ARG);
+  CHK(SETUP(shape, nsegs, square_get_ids, 0, vdata, 1, data) == RES_BAD_ARG);
   CHK(SETUP(NULL, 0, NULL, nverts, vdata, 1, data) == RES_BAD_ARG);
   CHK(SETUP(shape, 0, NULL, nverts, vdata, 1, data) == RES_BAD_ARG);
   CHK(SETUP(NULL, nsegs, NULL, nverts, vdata, 1, data) == RES_BAD_ARG);
   CHK(SETUP(shape, nsegs, NULL, nverts, vdata, 1, data) == RES_BAD_ARG);
-  CHK(SETUP(NULL, 0, box_get_ids, nverts, vdata, 1, data) == RES_BAD_ARG);
-  CHK(SETUP(shape, 0, box_get_ids, nverts, vdata, 1, data) == RES_BAD_ARG);
-  CHK(SETUP(NULL, nsegs, box_get_ids, nverts, vdata, 1, data) == RES_BAD_ARG);
-  CHK(SETUP(shape, nsegs, box_get_ids, nverts, vdata, 1, data) == RES_OK);
+  CHK(SETUP(NULL, 0, square_get_ids, nverts, vdata, 1, data) == RES_BAD_ARG);
+  CHK(SETUP(shape, 0, square_get_ids, nverts, vdata, 1, data) == RES_BAD_ARG);
+  CHK(SETUP(NULL, nsegs, square_get_ids, nverts, vdata, 1, data) == RES_BAD_ARG);
+  CHK(SETUP(shape, nsegs, square_get_ids, nverts, vdata, 1, data) == RES_OK);
 
   vdata[0] = S2D_VERTEX_DATA_NULL;
-  CHK(SETUP(shape, nsegs, box_get_ids, nverts, vdata, 1, data) == RES_BAD_ARG);
+  CHK(SETUP(shape, nsegs, square_get_ids, nverts, vdata, 1, data) == RES_BAD_ARG);
 
   vdata[0].type = S2D_FLOAT2;
   vdata[0].usage = S2D_POSITION;
   vdata[0].get = S2D_KEEP;
-  CHK(SETUP(shape, nsegs, box_get_ids, nverts, vdata, 1, data) == RES_OK);
+  CHK(SETUP(shape, nsegs, square_get_ids, nverts, vdata, 1, data) == RES_OK);
 
   vdata[0].get = line_segments_get_position;
-  CHK(SETUP(shape, nsegs, box_get_ids, nverts, vdata, 1, data) == RES_OK);
-  #undef box_get_ids
+  CHK(SETUP(shape, nsegs, square_get_ids, nverts, vdata, 1, data) == RES_OK);
+  #undef square_get_ids
   #undef SETUP
 
   CHK(s2d_line_segments_get_vertices_count(NULL, NULL) == RES_BAD_ARG);