star-mc

commit 03d9991c98ad77771c8b63d84885fa99562ff667
parent f3601b600e7373cdae0d0530b881d3456a15816b
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Tue,  6 Oct 2015 10:39:56 +0200

Update the Star-3D dependency to 0.3

Diffstat:
M
cmake/CMakeLists.txt
 | 
2
+-
M
src/test_smc_light_path.c
 | 
15
+++++++--------

2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -42,7 +42,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.1)
+find_package(Star3D 0.3)
 find_package(OpenMP)
 
 if(NOT OPENMP_FOUND)
diff --git a/src/test_smc_light_path.c b/src/test_smc_light_path.c
@@ -319,7 +319,7 @@ main(int argc, char** argv)
   struct s3d_device* dev;
   struct s3d_scene* scn;
   struct s3d_shape* shape;
-  struct s3d_vertex_data attribs[2];
+  struct s3d_vertex_data attrib;
   struct smc_device* smc;
   struct smc_integrator integrator = SMC_INTEGRATOR_NULL;
   struct smc_estimator** estimators;
@@ -339,26 +339,25 @@ main(int argc, char** argv)
   CHECK(s3d_device_create(NULL, &allocator, 1, &dev), RES_OK);
   CHECK(s3d_scene_create(dev, &scn), RES_OK);
 
-  attribs[0].usage = S3D_POSITION;
-  attribs[0].type = S3D_FLOAT3;
-  attribs[0].get = cbox_get_position;
-  attribs[1] = S3D_VERTEX_DATA_NULL;
+  attrib.usage = S3D_POSITION;
+  attrib.type = S3D_FLOAT3;
+  attrib.get = cbox_get_position;
 
   CHECK(s3d_shape_create_mesh(dev, &shape), RES_OK);
   CHECK(s3d_mesh_setup_indexed_vertices(shape, cbox_walls_ntris, cbox_get_ids,
-    cbox_walls_nverts, attribs, &cbox_walls_desc), RES_OK);
+    cbox_walls_nverts, &attrib, 1, &cbox_walls_desc), RES_OK);
   CHECK(s3d_scene_attach_shape(scn, shape), RES_OK);
   CHECK(s3d_shape_ref_put(shape), RES_OK);
 
   CHECK(s3d_shape_create_mesh(dev, &shape), RES_OK);
   CHECK(s3d_mesh_setup_indexed_vertices(shape, cbox_block_ntris, cbox_get_ids,
-    cbox_short_block_nverts, attribs, &cbox_short_block_desc), RES_OK);
+    cbox_short_block_nverts, &attrib, 1, &cbox_short_block_desc), RES_OK);
   CHECK(s3d_scene_attach_shape(scn, shape), RES_OK);
   CHECK(s3d_shape_ref_put(shape), RES_OK);
 
   CHECK(s3d_shape_create_mesh(dev, &shape), RES_OK);
   CHECK(s3d_mesh_setup_indexed_vertices(shape, cbox_block_ntris, cbox_get_ids,
-    cbox_tall_block_nverts, attribs, &cbox_tall_block_desc), RES_OK);
+    cbox_tall_block_nverts, &attrib, 1, &cbox_tall_block_desc), RES_OK);
   CHECK(s3d_scene_attach_shape(scn, shape), RES_OK);
   CHECK(s3d_shape_ref_put(shape), RES_OK);