star-3daw

commit 1555bc87cd45a87673868313bd73957539aaa897
parent 251e7670be80a1ffb81d7dfd9113ac65faa7cbb0
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Tue,  6 Oct 2015 10:24:52 +0200

Update the Star-3D dependency to 0.3

Diffstat:
M
cmake/CMakeLists.txt
 | 
4
++--
M
src/s3daw.c
 | 
14
++++++--------

2 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -40,7 +40,7 @@ find_package(AW 1.1.0 REQUIRED)
 find_package(Polygon 0.0.4 REQUIRED)
 find_package(RCMake 0.1 REQUIRED)
 find_package(RSys 0.2 REQUIRED)
-find_package(Star3D 0.1 REQUIRED)
+find_package(Star3D 0.3 REQUIRED)
 
 include_directories(
   ${AW_INCLUDE_DIR}
@@ -57,7 +57,7 @@ include(rcmake_runtime)
 ################################################################################
 set(VERSION_MAJOR 0)
 set(VERSION_MINOR 1)
-set(VERSION_PATCH 1)
+set(VERSION_PATCH 2)
 set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
 
 set(S3DAW_FILES_SRC s3daw.c)
diff --git a/src/s3daw.c b/src/s3daw.c
@@ -194,7 +194,7 @@ error:
 static res_T
 shape_register(struct s3daw* s3daw, const struct aw_obj_named_group* obj_mtl)
 {
-  struct s3d_vertex_data vertex_data[2];
+  struct s3d_vertex_data vertex_data;
   struct s3d_shape* shape = NULL;
   size_t iface;
   size_t ntris, nverts;
@@ -263,14 +263,12 @@ shape_register(struct s3daw* s3daw, const struct aw_obj_named_group* obj_mtl)
 
   res = s3d_shape_create_mesh(s3daw->s3d, &shape);
   if(res != RES_OK) goto error;
+  vertex_data.usage = S3D_POSITION;
+  vertex_data.type = S3D_FLOAT3;
+  vertex_data.get = get_position;
 
-  vertex_data[0].usage = S3D_POSITION;
-  vertex_data[0].type = S3D_FLOAT3;
-  vertex_data[0].get = get_position;
-  vertex_data[1] = S3D_VERTEX_DATA_NULL;
-
-  res = s3d_mesh_setup_indexed_vertices
-    (shape, (unsigned)ntris, get_indices, (unsigned)nverts, vertex_data, s3daw);
+  res = s3d_mesh_setup_indexed_vertices(shape, (unsigned)ntris, get_indices,
+    (unsigned)nverts, &vertex_data, 1, s3daw);
   if(res != RES_OK) goto error;
 
   res = darray_shape_push_back(&s3daw->shapes, &shape);