star-vx

commit 9c6537cbdee20b55e9a1683b6b11e4125c6632d4
parent bec26ec0f030659f51f3eb6bb186ffb58d8889e8
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Tue,  6 Feb 2018 12:00:48 +0100

Minor ajdustment of the scene test

Diffstat:
M
src/test_htvox_scene.c
 | 
9
++++++---

1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/test_htvox_scene.c b/src/test_htvox_scene.c
@@ -36,11 +36,11 @@ no_merge(const double min_val, const double max_val, void* ctx)
 }
 
 static int
-merge(const double min_val, const double max_val, void* ctx)
+merge_level0(const double min_val, const double max_val, void* ctx)
 {
   CHK(min_val <= max_val);
   CHK((intptr_t)ctx == 0xDECAFBAD);
-  return max_val < 128 && (max_val - min_val) < 8;
+  return (max_val - min_val) < 8;
 }
 
 static void
@@ -272,7 +272,10 @@ main(int argc, char** argv)
   CHK(upp[0] == 1 && upp[1] == 1 && upp[2] == 1);
 
   CHK(htvox_scene_ref_put(scn) == RES_OK);
-  CHK(NEW_SCN(dev, low, upp, nvxls, get, merge, ptr, &scn) == RES_OK);
+  CHK(NEW_SCN(dev, low, upp, nvxls, get, merge_level0, ptr, &scn) == RES_OK);
+  CHK(htvox_scene_get_voxels_count(scn, &nvoxels) == RES_OK);
+  CHK(nvoxels == nvxls[0]*nvxls[1]*nvxls[2] / 8);
+
   dump_data(stdout, scn);
 
   #undef NEW_SCN