commit 09d0ba46ffda95f4de759daf0b146479e5fba93d
parent e0d453d8c2f2705e709e697c612ca1338f125dbe
Author: Christophe Coustet <christophe.coustet@meso-star.com>
Date: Thu, 15 Feb 2018 11:24:00 +0100
Fix spelling (mediums = > media).
Diffstat:
14 files changed, 97 insertions(+), 97 deletions(-)
diff --git a/src/senc.h b/src/senc.h
@@ -102,7 +102,7 @@ senc_device_ref_put
SENC_API res_T
senc_scene_create
(struct senc_device* device,
- const unsigned mediums_count,
+ const unsigned media_count,
struct senc_scene** scene);
/* Add a new set of vertices and triangles to the scene.
@@ -114,7 +114,7 @@ senc_scene_add_geometry
(struct senc_scene* scene,
const unsigned triangles_count,
void(*indices)(const unsigned itri, unsigned ids[3], void* context),
- void(*mediums)(const unsigned itri, unsigned med[2], void* context),
+ void(*media)(const unsigned itri, unsigned med[2], void* context),
const unsigned vertices_count,
void(*position)(const unsigned ivert, double pos[3], void* context),
void* context);
@@ -169,10 +169,10 @@ senc_descriptor_get_global_vertex
double coord[3]);
SENC_API res_T
-senc_descriptor_get_global_triangle_mediums
+senc_descriptor_get_global_triangle_media
(const struct senc_descriptor* descriptor,
const unsigned itri,
- unsigned mediums[2]);
+ unsigned media[2]);
SENC_API res_T
senc_descriptor_get_global_triangle_enclosures
@@ -217,7 +217,7 @@ senc_enclosure_get_vertex
double coord[3]);
SENC_API res_T
-senc_enclosure_get_triangle_mediums
+senc_enclosure_get_triangle_media
(const struct senc_enclosure* enclosure,
const unsigned itri,
unsigned medium[2]);
diff --git a/src/senc_descriptor.c b/src/senc_descriptor.c
@@ -163,20 +163,20 @@ senc_descriptor_get_global_vertex
}
res_T
-senc_descriptor_get_global_triangle_mediums
+senc_descriptor_get_global_triangle_media
(const struct senc_descriptor* desc,
const unsigned itri,
- unsigned mediums[2])
+ unsigned media[2])
{
const struct triangle_in* trg;
int i;
- if(!mediums || !desc
+ if(!media || !desc
|| itri >= darray_triangle_in_size_get(&desc->scene->triangles_in))
return RES_BAD_ARG;
trg = darray_triangle_in_cdata_get(&desc->scene->triangles_in) + itri;
FOR_EACH(i, 0, 2) {
ASSERT(trg->medium[i] < UINT_MAX);
- mediums[i] = (unsigned)trg->medium[i]; /* Back to API type */
+ media[i] = (unsigned)trg->medium[i]; /* Back to API type */
}
return RES_OK;
}
diff --git a/src/senc_enclosure.c b/src/senc_enclosure.c
@@ -112,7 +112,7 @@ senc_enclosure_get_vertex
}
res_T
-senc_enclosure_get_triangle_mediums
+senc_enclosure_get_triangle_media
(const struct senc_enclosure* enclosure,
const unsigned itri,
unsigned medium[2])
diff --git a/src/senc_scene.c b/src/senc_scene.c
@@ -93,8 +93,8 @@ res_T
senc_scene_add_geometry
(struct senc_scene* scn,
const unsigned ntris,
- void(*indices)(const unsigned itri, unsigned ids[3], void*),
- void(*mediums)(const unsigned itri, unsigned medium[2], void*),
+ void(*indices)(const unsigned itri, unsigned ids[3], void* ctx),
+ void(*media)(const unsigned itri, unsigned med[2], void* ctx),
const unsigned nverts,
void(*position)(const unsigned ivert, double pos[3], void* ctx),
void* ctx)
@@ -108,7 +108,7 @@ senc_scene_add_geometry
res_T res = RES_OK;
if(!scn
- || !indices || !mediums || !position
+ || !indices || !media || !position
|| !nverts || ((size_t)scn->nverts + (size_t)nverts) > VRTX_MAX__
|| !ntris || ((size_t)scn->ntris + (size_t)ntris) > TRG_MAX__)
return RES_BAD_ARG;
@@ -185,8 +185,8 @@ senc_scene_add_geometry
res = RES_BAD_ARG;
goto error;
}
- /* Get mediums */
- mediums(i, med, ctx); /* API: mediums needs an unsigned */
+ /* Get media */
+ media(i, med, ctx); /* API: media needs an unsigned */
ASSERT(scn->nmeds <= MEDIUM_MAX__);
FOR_EACH(j, 0, 2) {
if(med[j] >= scn->nmeds) {
@@ -214,17 +214,17 @@ senc_scene_add_geometry
umed = trg[*p_trg].medium;
if(umed[0] != (same ? med[0] : med[1])
|| umed[1] != (same ? med[1] : med[0])) {
- /* Same triangles with different mediums: invalid! */
+ /* Same triangles with different media: invalid! */
const union double3* positions
= darray_position_cdata_get(&scn->vertices);
- log_err(scn->dev, "%s: triangle %lu is a duplicate with incoherent mediums.\n",
+ log_err(scn->dev, "%s: triangle %lu is a duplicate with incoherent media.\n",
FUNC_NAME, (unsigned long)*p_trg);
log_err(scn->dev, "Triangle %lu:\n (%g %g %g)\n (%g %g %g)\n (%g %g %g)\n",
(unsigned long)*p_trg,
SPLIT3(positions[trg[*p_trg].vertice_id[0]].vec),
SPLIT3(positions[trg[*p_trg].vertice_id[1]].vec),
SPLIT3(positions[trg[*p_trg].vertice_id[2]].vec));
- log_err(scn->dev, "Mediums: (%lu, %lu) VS (%lu, %lu)\n",
+ log_err(scn->dev, "Media: (%lu, %lu) VS (%lu, %lu)\n",
umed[ureversed? 1 : 0], umed[ureversed ? 0 : 1],
med[reversed ? 1 : 0], med[reversed ? 0 : 1]);
res = RES_BAD_ARG;
diff --git a/src/senc_scene_analyze.c b/src/senc_scene_analyze.c
@@ -402,7 +402,7 @@ extract_connex_components
SPLIT3(positions[triangles_in[neighbour_id].vertice_id[0]].vec),
SPLIT3(positions[triangles_in[neighbour_id].vertice_id[1]].vec),
SPLIT3(positions[triangles_in[neighbour_id].vertice_id[2]].vec));
- log_err(desc->scene->dev, "Mediums: %lu VS %lu\n",
+ log_err(desc->scene->dev, "Media: %lu VS %lu\n",
neighbour->medium, crt_side->medium);
res = RES_BAD_ARG;
cc_descriptor_release(¤t_cc);
@@ -584,7 +584,7 @@ group_connex_components
SPLIT3(positions[triangles_in[t2].vertice_id[0]].vec),
SPLIT3(positions[triangles_in[t2].vertice_id[1]].vec),
SPLIT3(positions[triangles_in[t2].vertice_id[2]].vec));
- log_err(desc->scene->dev, "Mediums: %lu VS %lu\n",
+ log_err(desc->scene->dev, "Media: %lu VS %lu\n",
infinite_medium, cc->medium);
res = RES_BAD_ARG;
goto error;
@@ -645,7 +645,7 @@ group_connex_components
SPLIT3(positions[triangles_in[t2].vertice_id[0]].vec),
SPLIT3(positions[triangles_in[t2].vertice_id[1]].vec),
SPLIT3(positions[triangles_in[t2].vertice_id[2]].vec));
- log_err(desc->scene->dev, "Mediums: %lu VS %lu\n",
+ log_err(desc->scene->dev, "Media: %lu VS %lu\n",
hit_trg_in->medium[hit_side], cc->medium);
res = RES_BAD_ARG;
goto error;
diff --git a/src/senc_scene_c.h b/src/senc_scene_c.h
@@ -41,7 +41,7 @@ union double3 {
struct triangle_in {
/* Ids of the triangle's vertices */
vrtx_id_t vertice_id[3];
- /* Ids of this triangle's mediums */
+ /* Ids of this triangle's media */
medium_id_t medium[2];
};
diff --git a/src/test_senc_cube_behind_cube.c b/src/test_senc_cube_behind_cube.c
@@ -41,11 +41,11 @@ main(int argc, char** argv)
ctx.reverse_vrtx = 0;
ctx.reverse_med = 0;
d3(ctx.offset, 0, 0, 0);
- ctx.front_mediums = medium0;
- ctx.back_mediums = medium1;
+ ctx.front_media = medium0;
+ ctx.back_media = medium1;
/* First cube */
- CHK(senc_scene_add_geometry(scn, box_ntriangles, get_indices, get_mediums,
+ CHK(senc_scene_add_geometry(scn, box_ntriangles, get_indices, get_media,
box_nvertices, get_position, &ctx) == RES_OK);
/* +Z from the first cube,
@@ -54,7 +54,7 @@ main(int argc, char** argv)
ctx.scale = 5;
/* Second cube */
- CHK(senc_scene_add_geometry(scn, box_ntriangles, get_indices, get_mediums,
+ CHK(senc_scene_add_geometry(scn, box_ntriangles, get_indices, get_media,
box_nvertices, get_position, &ctx) == RES_OK);
CHK(senc_scene_analyze(scn, &desc) == RES_OK);
@@ -62,11 +62,11 @@ main(int argc, char** argv)
/* Even further in +Z, even bigger */
d3(ctx.offset, -3, -3, 30);
ctx.scale = 7;
- ctx.front_mediums = medium1;
- ctx.back_mediums = medium0;
+ ctx.front_media = medium1;
+ ctx.back_media = medium0;
/* Third cube */
- CHK(senc_scene_add_geometry(scn, box_ntriangles, get_indices, get_mediums,
+ CHK(senc_scene_add_geometry(scn, box_ntriangles, get_indices, get_media,
box_nvertices, get_position, &ctx) == RES_OK);
if(desc) CHK(senc_descriptor_ref_put(desc) == RES_OK);
diff --git a/src/test_senc_cube_in_cube.c b/src/test_senc_cube_in_cube.c
@@ -42,12 +42,12 @@ main(int argc, char** argv)
ctx.reverse_med = 0;
d3(ctx.offset, 0, 0, 0);
/* Smallest cube exterior is medium 0 */
- ctx.front_mediums = medium0;
+ ctx.front_media = medium0;
/* Smallest cube interior is medium 1 */
- ctx.back_mediums = medium1;
+ ctx.back_media = medium1;
/* First cube */
- CHK(senc_scene_add_geometry(scn, box_ntriangles, get_indices, get_mediums,
+ CHK(senc_scene_add_geometry(scn, box_ntriangles, get_indices, get_media,
box_nvertices, get_position, &ctx) == RES_OK);
d3(ctx.offset, -1, -1, -1);
@@ -57,7 +57,7 @@ main(int argc, char** argv)
ctx.reverse_vrtx = 1;
/* Second cube */
- CHK(senc_scene_add_geometry(scn, box_ntriangles, get_indices, get_mediums,
+ CHK(senc_scene_add_geometry(scn, box_ntriangles, get_indices, get_media,
box_nvertices, get_position, &ctx) == RES_OK);
CHK(senc_scene_analyze(scn, &desc) == RES_OK);
@@ -67,12 +67,12 @@ main(int argc, char** argv)
ctx.reverse_vrtx = 1;
ctx.reverse_med = 1;
/* Biggest cube exterior is medium 1 */
- ctx.front_mediums = medium1;
+ ctx.front_media = medium1;
/* Biggest cube interior is medium 0 */
- ctx.back_mediums = medium0; /* mismatch with cube 2 */
+ ctx.back_media = medium0; /* mismatch with cube 2 */
/* Third cube */
- CHK(senc_scene_add_geometry(scn, box_ntriangles, get_indices, get_mediums,
+ CHK(senc_scene_add_geometry(scn, box_ntriangles, get_indices, get_media,
box_nvertices, get_position, &ctx) == RES_OK);
if(desc) CHK(senc_descriptor_ref_put(desc) == RES_OK);
diff --git a/src/test_senc_cube_on_cube.c b/src/test_senc_cube_on_cube.c
@@ -63,24 +63,24 @@ main(int argc, char** argv)
d3(ctx.offset, 1, 1, 2);
/* Small cube #1 exterior is medium 1,
* except for the top face where it is 0 */
- ctx.front_mediums = medium1_front0;
+ ctx.front_media = medium1_front0;
/* Smallest cube interior is medium 0 */
- ctx.back_mediums = medium0;
+ ctx.back_media = medium0;
/* Add cube #1 */
- CHK(senc_scene_add_geometry(scn, box_ntriangles, get_indices, get_mediums,
+ CHK(senc_scene_add_geometry(scn, box_ntriangles, get_indices, get_media,
box_nvertices, get_position, &ctx) == RES_OK);
d3(ctx.offset, 1, 1, 1);
ctx.scale = 1;
/* Small cube #2 exterior is medium 1,
* except for the bottom face where it is 0 */
- ctx.front_mediums = medium1_back0;
+ ctx.front_media = medium1_back0;
/* Smallest cube interior is medium 0 */
- ctx.back_mediums = medium0;
+ ctx.back_media = medium0;
/* Add cube #2 (has a duplicate face with cube #1) */
- CHK(senc_scene_add_geometry(scn, box_ntriangles, get_indices, get_mediums,
+ CHK(senc_scene_add_geometry(scn, box_ntriangles, get_indices, get_media,
box_nvertices, get_position, &ctx) == RES_OK);
d3(ctx.offset, 0, 0, 0);
@@ -88,12 +88,12 @@ main(int argc, char** argv)
ctx.reverse_vrtx = 1;
ctx.reverse_med = 1;
/* Big cube #3 exterior is medium 2 */
- ctx.front_mediums = medium2;
+ ctx.front_media = medium2;
/* Big cube #3 interior is medium 1 */
- ctx.back_mediums = medium1;
+ ctx.back_media = medium1;
/* Add cube #3 */
- CHK(senc_scene_add_geometry(scn, box_ntriangles, get_indices, get_mediums,
+ CHK(senc_scene_add_geometry(scn, box_ntriangles, get_indices, get_media,
box_nvertices, get_position, &ctx) == RES_OK);
CHK(senc_scene_analyze(scn, &desc) == RES_OK);
diff --git a/src/test_senc_descriptor.c b/src/test_senc_descriptor.c
@@ -33,7 +33,7 @@ main(int argc, char** argv)
unsigned count;
unsigned indices[3];
double coord[3];
- unsigned mediums[2];
+ unsigned media[2];
unsigned enclosures[2];
(void) argc, (void) argv;
@@ -50,10 +50,10 @@ main(int argc, char** argv)
ctx.reverse_vrtx = 0;
ctx.reverse_med = 0;
d3(ctx.offset, 0, 0, 0);
- ctx.front_mediums = medium0;
- ctx.back_mediums = medium1;
+ ctx.front_media = medium0;
+ ctx.back_media = medium1;
- CHK(senc_scene_add_geometry(scn, box_ntriangles, get_indices, get_mediums,
+ CHK(senc_scene_add_geometry(scn, box_ntriangles, get_indices, get_media,
box_nvertices, get_position, &ctx) == RES_OK);
CHK(senc_scene_analyze(scn, &desc) == RES_OK);
@@ -107,15 +107,15 @@ main(int argc, char** argv)
&& coord[1] == box_vertices[1]
&& coord[2] == box_vertices[2]);
- CHK(senc_descriptor_get_global_triangle_mediums(NULL, 0, mediums)
+ CHK(senc_descriptor_get_global_triangle_media(NULL, 0, media)
== RES_BAD_ARG);
- CHK(senc_descriptor_get_global_triangle_mediums(NULL, box_nvertices, mediums)
+ CHK(senc_descriptor_get_global_triangle_media(NULL, box_nvertices, media)
== RES_BAD_ARG);
- CHK(senc_descriptor_get_global_triangle_mediums(desc, 0, NULL)
+ CHK(senc_descriptor_get_global_triangle_media(desc, 0, NULL)
== RES_BAD_ARG);
- CHK(senc_descriptor_get_global_triangle_mediums(desc, 0, mediums) == RES_OK);
- CHK(mediums[0] == ctx.front_mediums[0]
- && mediums[1] == ctx.back_mediums[1]);
+ CHK(senc_descriptor_get_global_triangle_media(desc, 0, media) == RES_OK);
+ CHK(media[0] == ctx.front_media[0]
+ && media[1] == ctx.back_media[1]);
CHK(senc_descriptor_get_global_triangle_enclosures(
NULL, 0, enclosures) == RES_BAD_ARG);
@@ -131,7 +131,7 @@ main(int argc, char** argv)
/* Add valid duplicate geometry */
CHK(senc_descriptor_ref_put(desc) == RES_OK);
desc = NULL;
- CHK(senc_scene_add_geometry(scn, box_ntriangles, get_indices, get_mediums,
+ CHK(senc_scene_add_geometry(scn, box_ntriangles, get_indices, get_media,
box_nvertices, get_position, &ctx) == RES_OK);
CHK(senc_scene_analyze(scn, &desc) == RES_OK);
@@ -146,9 +146,9 @@ main(int argc, char** argv)
/* Add invalid duplicate geometry */
CHK(senc_descriptor_ref_put(desc) == RES_OK);
desc = NULL;
- ctx.front_mediums = medium1;
- ctx.back_mediums = medium0;
- CHK(senc_scene_add_geometry(scn, box_ntriangles, get_indices, get_mediums,
+ ctx.front_media = medium1;
+ ctx.back_media = medium0;
+ CHK(senc_scene_add_geometry(scn, box_ntriangles, get_indices, get_media,
box_nvertices, get_position, &ctx) == RES_BAD_ARG);
CHK(senc_scene_ref_put(scn) == RES_OK);
diff --git a/src/test_senc_enclosure.c b/src/test_senc_enclosure.c
@@ -62,10 +62,10 @@ main(int argc, char** argv)
ctx.reverse_vrtx = 0;
ctx.reverse_med = 0;
d3(ctx.offset, 0, 0, 0);
- ctx.front_mediums = medium0;
- ctx.back_mediums = medium1;
+ ctx.front_media = medium0;
+ ctx.back_media = medium1;
- CHK(senc_scene_add_geometry(scn, box_ntriangles, get_indices, get_mediums,
+ CHK(senc_scene_add_geometry(scn, box_ntriangles, get_indices, get_media,
box_nvertices, get_position, &ctx) == RES_OK);
CHK(senc_scene_analyze(scn, &desc) == RES_OK);
@@ -118,10 +118,10 @@ main(int argc, char** argv)
ctx.indices = box_indices;
ctx.scale = 1;
d3(ctx.offset, 0, 0, 0);
- ctx.front_mediums = medium0;
- ctx.back_mediums = medium0;
+ ctx.front_media = medium0;
+ ctx.back_media = medium0;
- CHK(senc_scene_add_geometry(scn, box_ntriangles - 1, get_indices, get_mediums,
+ CHK(senc_scene_add_geometry(scn, box_ntriangles - 1, get_indices, get_media,
box_nvertices, get_position, &ctx) == RES_OK);
CHK(senc_scene_analyze(scn, &desc) == RES_OK);
diff --git a/src/test_senc_sample_enclosure.c b/src/test_senc_sample_enclosure.c
@@ -67,10 +67,10 @@ main(int argc, char** argv)
ctx.reverse_vrtx = 0;
ctx.reverse_med = 0;
d3(ctx.offset, 0, 0, 0);
- ctx.front_mediums = medium0;
- ctx.back_mediums = medium0;
+ ctx.front_media = medium0;
+ ctx.back_media = medium0;
- CHK(senc_scene_add_geometry(scn, box_ntriangles - 1, get_indices, get_mediums,
+ CHK(senc_scene_add_geometry(scn, box_ntriangles - 1, get_indices, get_media,
box_nvertices, get_position, &ctx) == RES_OK);
CHK(senc_scene_analyze(scn, &desc) == RES_OK);
diff --git a/src/test_senc_scene.c b/src/test_senc_scene.c
@@ -42,7 +42,7 @@ main(int argc, char** argv)
CHK(senc_scene_create(NULL, 2, NULL) == RES_BAD_ARG);
CHK(senc_scene_create(dev, 0, NULL) == RES_BAD_ARG);
CHK(senc_scene_create(NULL, 0, NULL) == RES_BAD_ARG);
- /* It is valid to have unused mediums */
+ /* It is valid to have unused media */
CHK(senc_scene_create(dev, 4, &scn) == RES_OK);
/* A 3D cube */
@@ -52,22 +52,22 @@ main(int argc, char** argv)
ctx.reverse_vrtx = 0;
ctx.reverse_med = 0;
d3(ctx.offset, 0, 0, 0);
- ctx.front_mediums = medium0;
- ctx.back_mediums = medium1;
+ ctx.front_media = medium0;
+ ctx.back_media = medium1;
- CHK(senc_scene_add_geometry(NULL, box_ntriangles, get_indices, get_mediums,
+ CHK(senc_scene_add_geometry(NULL, box_ntriangles, get_indices, get_media,
box_nvertices, get_position, &ctx) == RES_BAD_ARG);
- CHK(senc_scene_add_geometry(scn, 0, get_indices, get_mediums,
+ CHK(senc_scene_add_geometry(scn, 0, get_indices, get_media,
box_nvertices, get_position, &ctx) == RES_BAD_ARG);
- CHK(senc_scene_add_geometry(scn, box_ntriangles, NULL, get_mediums,
+ CHK(senc_scene_add_geometry(scn, box_ntriangles, NULL, get_media,
box_nvertices, get_position, &ctx) == RES_BAD_ARG);
CHK(senc_scene_add_geometry(scn, box_ntriangles, get_indices, NULL,
box_nvertices, get_position, &ctx) == RES_BAD_ARG);
- CHK(senc_scene_add_geometry(scn, box_ntriangles, get_indices, get_mediums,
+ CHK(senc_scene_add_geometry(scn, box_ntriangles, get_indices, get_media,
0, get_position, &ctx) == RES_BAD_ARG);
- CHK(senc_scene_add_geometry(scn, box_ntriangles, get_indices, get_mediums,
+ CHK(senc_scene_add_geometry(scn, box_ntriangles, get_indices, get_media,
box_nvertices, NULL, &ctx) == RES_BAD_ARG);
- CHK(senc_scene_add_geometry(scn, box_ntriangles, get_indices, get_mediums,
+ CHK(senc_scene_add_geometry(scn, box_ntriangles, get_indices, get_media,
box_nvertices, get_position, &ctx) == RES_OK);
CHK(senc_scene_analyze(NULL, NULL) == RES_BAD_ARG);
@@ -82,41 +82,41 @@ main(int argc, char** argv)
CHK(senc_scene_ref_put(scn) == RES_OK);
/* Invalid medium ID */
- ctx.back_mediums = medium1_12;
- CHK(senc_scene_add_geometry(scn, box_ntriangles, get_indices, get_mediums,
+ ctx.back_media = medium1_12;
+ CHK(senc_scene_add_geometry(scn, box_ntriangles, get_indices, get_media,
box_nvertices, get_position, &ctx) == RES_BAD_ARG);
- ctx.back_mediums = medium1;
+ ctx.back_media = medium1;
/* Invalid vertex ID */
- CHK(senc_scene_add_geometry(scn, box_ntriangles, get_indices, get_mediums,
+ CHK(senc_scene_add_geometry(scn, box_ntriangles, get_indices, get_media,
box_nvertices - 1, get_position, &ctx) == RES_BAD_ARG);
/* Incoherent medium on a duplicate triangle */
- ctx.back_mediums = medium1_3;
- CHK(senc_scene_add_geometry(scn, box_ntriangles, get_indices, get_mediums,
+ ctx.back_media = medium1_3;
+ CHK(senc_scene_add_geometry(scn, box_ntriangles, get_indices, get_media,
box_nvertices, get_position, &ctx) == RES_BAD_ARG);
/* It is OK dd geometry after a failed add */
- ctx.back_mediums = medium1;
- CHK(senc_scene_add_geometry(scn, box_ntriangles, get_indices, get_mediums,
+ ctx.back_media = medium1;
+ CHK(senc_scene_add_geometry(scn, box_ntriangles, get_indices, get_media,
box_nvertices, get_position, &ctx) == RES_OK);
/* Coherent medium on duplicate triangle */
- ctx.back_mediums = medium1;
- CHK(senc_scene_add_geometry(scn, box_ntriangles, get_indices, get_mediums,
+ ctx.back_media = medium1;
+ CHK(senc_scene_add_geometry(scn, box_ntriangles, get_indices, get_media,
box_nvertices, get_position, &ctx) == RES_OK);
/* Coherent medium on duplicate triangle V2 */
ctx.reverse_med = 1;
- ctx.front_mediums = medium1;
- ctx.back_mediums = medium0;
- CHK(senc_scene_add_geometry(scn, box_ntriangles, get_indices, get_mediums,
+ ctx.front_media = medium1;
+ ctx.back_media = medium0;
+ CHK(senc_scene_add_geometry(scn, box_ntriangles, get_indices, get_media,
box_nvertices, get_position, &ctx) == RES_OK);
/* Coherent medium on duplicate triangle V3 */
ctx.reverse_med = 0;
ctx.reverse_vrtx = 1;
- CHK(senc_scene_add_geometry(scn, box_ntriangles, get_indices, get_mediums,
+ CHK(senc_scene_add_geometry(scn, box_ntriangles, get_indices, get_media,
box_nvertices, get_position, &ctx) == RES_OK);
CHK(senc_scene_ref_put(scn) == RES_OK);
diff --git a/src/test_senc_utils.h b/src/test_senc_utils.h
@@ -58,8 +58,8 @@ struct context {
const double* positions;
const unsigned* indices;
struct cube_specifics* specifics;
- const unsigned* front_mediums;
- const unsigned* back_mediums;
+ const unsigned* front_media;
+ const unsigned* back_media;
double offset[3];
double scale;
char reverse_vrtx, reverse_med;
@@ -94,12 +94,12 @@ get_position(const unsigned ivert, double pos[3], void* context)
}
static void
-get_mediums(const unsigned itri, unsigned medium[2], void* context)
+get_media(const unsigned itri, unsigned medium[2], void* context)
{
struct context* ctx = context;
ASSERT(medium && ctx);
- medium[ctx->reverse_med ? 1 : 0] = ctx->front_mediums[itri];
- medium[ctx->reverse_med ? 0 : 1] = ctx->back_mediums[itri];
+ medium[ctx->reverse_med ? 1 : 0] = ctx->front_media[itri];
+ medium[ctx->reverse_med ? 0 : 1] = ctx->back_media[itri];
}
/*******************************************************************************
@@ -140,7 +140,7 @@ dump_enclosure
ASSERT(desc && name);
- CHK(senc_descriptor_get_enclosure_count(desc, &count) == RES_OK);
+ SENC(descriptor_get_enclosure_count(desc, &count));
ASSERT(enc < count);
CHK(senc_descriptor_get_enclosure(desc, enc, &enclosure) == RES_OK);
CHK(senc_enclosure_get_header(enclosure, &header) == RES_OK);
