star-gf

commit d69927c18af24f9b01c4f4543effceaa7f9f740b
parent e1c28a16a41e7d09442c5a650b7aeb051fa68ea8
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Mon, 15 Feb 2016 15:01:54 +0100

Use the Star-3D 0.3 API

Diffstat:
M
cmake/CMakeLists.txt
 | 
2
+-
M
src/test_sgf_cube.c
 | 
11
+++++------
M
src/test_sgf_tetrahedron.c
 | 
11
+++++------

3 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -26,7 +26,7 @@ option(NO_TEST "Disable the test" OFF)
 find_package(RCMake 0.1 REQUIRED)
 find_package(RSys 0.2 REQUIRED)
 find_package(StarSP 0.1 REQUIRED)
-find_package(Star3D 0.2 REQUIRED)
+find_package(Star3D 0.3 REQUIRED)
 find_package(OpenMP REQUIRED)
 
 include_directories(
diff --git a/src/test_sgf_cube.c b/src/test_sgf_cube.c
@@ -85,7 +85,7 @@ main(int argc, char** argv)
   struct s3d_device* s3d;
   struct s3d_scene* scn;
   struct s3d_shape* shape;
-  struct s3d_vertex_data attribs[2];
+  struct s3d_vertex_data attrib;
   struct triangle_mesh mesh;
   struct material mtr;
   struct sgf_device* sgf = NULL;
@@ -109,10 +109,9 @@ main(int argc, char** argv)
   CHECK(ssp_rng_proxy_create(&allocator, &ssp_rng_threefry, nbuckets, &proxy), RES_OK);
   CHECK(sgf_device_create(NULL, &allocator, 1, &sgf), RES_OK);
 
-  attribs[0].type = S3D_FLOAT3;
-  attribs[0].usage = S3D_POSITION;
-  attribs[0].get = get_pos;
-  attribs[1] = S3D_VERTEX_DATA_NULL;
+  attrib.type = S3D_FLOAT3;
+  attrib.usage = S3D_POSITION;
+  attrib.get = get_pos;
 
   mesh.vertices = vertices;
   mesh.nvertices = nvertices;
@@ -123,7 +122,7 @@ main(int argc, char** argv)
   mtr.specularity = specularity;
 
   CHECK(s3d_mesh_setup_indexed_vertices(shape, (unsigned)nprims, get_ids,
-    (unsigned)nvertices, attribs, &mesh), RES_OK);
+    (unsigned)nvertices, &attrib, 1, &mesh), RES_OK);
 
   scn_desc.get_material_property = get_material_property;
   scn_desc.material = &mtr;
diff --git a/src/test_sgf_tetrahedron.c b/src/test_sgf_tetrahedron.c
@@ -53,7 +53,7 @@ main(int argc, char** argv)
   struct s3d_device* s3d;
   struct s3d_scene* scn;
   struct s3d_shape* shape;
-  struct s3d_vertex_data attribs[2];
+  struct s3d_vertex_data attrib;
   struct triangle_mesh mesh;
   struct material mtr;
   struct sgf_device* sgf = NULL;
@@ -75,10 +75,9 @@ main(int argc, char** argv)
   CHECK(ssp_rng_proxy_create(&allocator, &ssp_rng_threefry, nbuckets, &proxy), RES_OK);
   CHECK(sgf_device_create(NULL, &allocator, 1, &sgf), RES_OK);
 
-  attribs[0].type = S3D_FLOAT3;
-  attribs[0].usage = S3D_POSITION;
-  attribs[0].get = get_pos;
-  attribs[1] = S3D_VERTEX_DATA_NULL;
+  attrib.type = S3D_FLOAT3;
+  attrib.usage = S3D_POSITION;
+  attrib.get = get_pos;
 
   mesh.vertices = vertices;
   mesh.nvertices = nvertices;
@@ -89,7 +88,7 @@ main(int argc, char** argv)
   mtr.specularity = specularity;
 
   CHECK(s3d_mesh_setup_indexed_vertices(shape, (unsigned)nprims, get_ids,
-    (unsigned)nvertices, attribs, &mesh), RES_OK);
+    (unsigned)nvertices, &attrib, 1, &mesh), RES_OK);
 
   desc.get_material_property = get_material_property;
   desc.material = &mtr;