star-3daw

commit e655d9b9149356015acb9894a9c94ded29cc9324
parent 35594b78e23cd2efe675d0dc1df6305723eac601
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Tue, 26 May 2015 16:36:56 +0200

Implement and test the s3d_load_stream function

Diffstat:
M
src/s3daw.c
 | 
12
++++++++++++
M
src/test_s3daw.c
 | 
6
++----

2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/s3daw.c b/src/s3daw.c
@@ -488,6 +488,18 @@ s3daw_load(struct s3daw* s3daw, const char* filename)
 }
 
 res_T
+s3daw_load_stream(struct s3daw* s3daw, FILE* stream)
+{
+  res_T res = RES_OK;
+
+  if(!s3daw || !stream) return RES_BAD_ARG;
+
+  res = aw_obj_load_stream(s3daw->loader_obj, stream);
+  if(res != RES_OK) return res;
+  return shapes_create(s3daw, "./");
+}
+
+res_T
 s3daw_clear(struct s3daw* s3daw)
 {
   if(!s3daw) return RES_BAD_ARG;
diff --git a/src/test_s3daw.c b/src/test_s3daw.c
@@ -178,13 +178,11 @@ test_cbox(struct s3daw* s3daw)
   file = fopen("cbox.obj", "r");
   NCHECK(file, NULL);
 
-#if 0
   CHECK(s3daw_load_stream(s3daw, file), RES_OK);
-  CHECK(s3daw_shapes_count_get(s3daw, &nshapes), RES_OK);
+  CHECK(s3daw_get_shapes_count(s3daw, &nshapes), RES_OK);
   CHECK(nshapes, 5);
   FOR_EACH(ishape, 0, nshapes)
-    CHECK(s3daw_shape_get(s3daw, 0, &shape), RES_OK);
-#endif
+    CHECK(s3daw_get_shape(s3daw, 0, &shape), RES_OK);
 
   fclose(file);
 }