star-3d

commit 4e5b347b408ee8aac95670db09053fe6dac123df
parent 06ba1e03b057a153621c089ab1a45ea2f03d1a4a
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Tue, 22 Oct 2019 10:33:19 +0200

Minor code review of the s3d_scene_view_aabb  tests

Diffstat:
M
src/test_s3d_scene_view_aabb.c
 | 
24
++++++------------------

1 file changed, 6 insertions(+), 18 deletions(-)
diff --git a/src/test_s3d_scene_view_aabb.c b/src/test_s3d_scene_view_aabb.c
@@ -56,12 +56,8 @@ compute_mesh_aabb
 
   FOR_EACH(i, 0, ntris*3) {
     const float* vertex = pos + ids[i]*3;
-    low[0] = MMIN(vertex[0], low[0]);
-    low[1] = MMIN(vertex[1], low[1]);
-    low[2] = MMIN(vertex[2], low[2]);
-    upp[0] = MMAX(vertex[0], upp[0]);
-    upp[1] = MMAX(vertex[1], upp[1]);
-    upp[2] = MMAX(vertex[2], upp[2]);
+    f3_min(low, vertex, low);
+    f3_max(upp, vertex, upp);
   }
 }
 
@@ -308,12 +304,8 @@ test_cbox(struct s3d_device* dev)
   CHK(s3d_scene_attach_shape(scn, short_block) == RES_OK);
   CHK(s3d_scene_view_create(scn, S3D_TRACE, &view) == RES_OK);
   CHK(s3d_scene_view_get_aabb(view, low, upp) == RES_OK);
-  aabb_low[0] = MMIN(tall_block_low[0], short_block_low[0]);
-  aabb_low[1] = MMIN(tall_block_low[1], short_block_low[1]);
-  aabb_low[2] = MMIN(tall_block_low[2], short_block_low[2]);
-  aabb_upp[0] = MMAX(tall_block_upp[0], short_block_upp[0]);
-  aabb_upp[1] = MMAX(tall_block_upp[1], short_block_upp[1]);
-  aabb_upp[2] = MMAX(tall_block_upp[2], short_block_upp[2]);
+  f3_min(aabb_low, tall_block_low, short_block_low);
+  f3_max(aabb_upp, tall_block_upp, short_block_upp);
   CHK(f3_eq_eps(aabb_low, low, 1.e-6f));
   CHK(f3_eq_eps(aabb_upp, upp, 1.e-6f));
   CHK(s3d_scene_view_ref_put(view) == RES_OK);
@@ -347,12 +339,8 @@ test_cbox(struct s3d_device* dev)
   CHK(s3d_scene_attach_shape(scn, walls) == RES_OK);
   CHK(s3d_scene_view_create(scn, 0, &view) == RES_OK);
   CHK(s3d_scene_view_get_aabb(view, low, upp) == RES_OK);
-  aabb_low[0] = MMIN(MMIN(tall_block_low[0], short_block_low[0]), walls_low[0]);
-  aabb_low[1] = MMIN(MMIN(tall_block_low[1], short_block_low[1]), walls_low[1]);
-  aabb_low[2] = MMIN(MMIN(tall_block_low[2], short_block_low[2]), walls_low[2]);
-  aabb_upp[0] = MMAX(MMAX(tall_block_upp[0], short_block_upp[0]), walls_upp[0]);
-  aabb_upp[1] = MMAX(MMAX(tall_block_upp[1], short_block_upp[1]), walls_upp[1]);
-  aabb_upp[2] = MMAX(MMAX(tall_block_upp[2], short_block_upp[2]), walls_upp[2]);
+  f3_min(aabb_low, f3_min(aabb_low, tall_block_low, short_block_low), walls_low);
+  f3_max(aabb_upp, f3_max(aabb_upp, tall_block_upp, short_block_upp), walls_upp);
   CHK(f3_eq_eps(aabb_low, low, 1.e-6f));
   CHK(f3_eq_eps(aabb_upp, upp, 1.e-6f));
   CHK(s3d_scene_view_ref_put(view) == RES_OK);