commit 1ae0913afb8d9856cfd66397d122245666f328cf
parent 5ff0e0a25018c088a5239b14f3562aea9ae03e30
Author: Christophe Coustet <christophe.coustet@meso-star.com>
Date: Mon, 3 Feb 2020 15:53:25 +0100
Rename some API calls
Diffstat:
15 files changed, 253 insertions(+), 253 deletions(-)
diff --git a/src/sg3.h b/src/sg3.h
@@ -53,14 +53,14 @@ struct senc_scene;
struct sg3_device;
struct sg3_geometry;
-/*******************************************************************************
- * Some defines to introduce dimensions in use in the library.
- ******************************************************************************/
+/******************************************************************************
+ * The dimension of the geometry used in the library.
+ *****************************************************************************/
#define SG3_GEOMETRY_DIMENSION
-/*******************************************************************************
+/******************************************************************************
* A type to list the different user properties attached to triangles.
- ******************************************************************************/
+ *****************************************************************************/
enum sg3_property_type {
SG3_FRONT,
SG3_BACK,
@@ -68,9 +68,9 @@ enum sg3_property_type {
SG3_PROP_TYPES_COUNT__
};
-/*******************************************************************************
+/******************************************************************************
* A type to list the different possible partitions of triangles.
- ******************************************************************************/
+ *****************************************************************************/
enum sg3_obj_dump_content {
SG3_OBJ_DUMP_MERGE_CONFLICTS = BIT(0),
SG3_OBJ_DUMP_PROPERTY_CONFLICTS = BIT(1),
@@ -81,25 +81,25 @@ enum sg3_obj_dump_content {
| SG3_OBJ_DUMP_VALID_PRIMITIVE
};
-/*******************************************************************************
+/******************************************************************************
* A type to list the different qualifiers of C code variable output.
- ******************************************************************************/
+ *****************************************************************************/
enum sg3_c_dump_qualifiers {
SG3_C_DUMP_CONST = BIT(0),
SG3_C_DUMP_STATIC = BIT(1)
};
-/*******************************************************************************
+/******************************************************************************
* The value that should be used for properties attached to triangles (i.e.
* media or interface) when let unspecified.
* SG3_UNSPECIFIED_PROPERTY can be used for a property that has already been
* defined; in this case the previous value will remain.
- ******************************************************************************/
+ *****************************************************************************/
#define SG3_UNSPECIFIED_PROPERTY UINT_MAX
- /*******************************************************************************
+ /*****************************************************************************
* A type to hold callbacks for sg3_geometry_add.
- ******************************************************************************/
+ ****************************************************************************/
struct sg3_geometry_add_callbacks {
/* User function that provides vertices ids for added triangles */
void(*get_indices)
@@ -150,9 +150,9 @@ struct sg3_geometry_add_callbacks {
BEGIN_DECLS
-/*******************************************************************************
+/******************************************************************************
* A helper function on properties compatibility.
- ******************************************************************************/
+ *****************************************************************************/
static INLINE int
sg3_compatible_property
(const unsigned p1,
@@ -162,10 +162,10 @@ sg3_compatible_property
return (p1 == p2);
}
-/*******************************************************************************
+/******************************************************************************
* star-geometry device. It is an handle toward the star-geometry library.
* It manages the star-geometry resources.
- ******************************************************************************/
+ *****************************************************************************/
SG3_API res_T
sg3_device_create
(struct logger* logger, /* Can be NULL <=> use default logger */
@@ -181,12 +181,12 @@ SG3_API res_T
sg3_device_ref_put
(struct sg3_device* dev);
-/*******************************************************************************
+/******************************************************************************
* star-geometry geometry.
* It stores decorated geometry accumulated through calls to sg3_geometry_add,
- * information related to this geometry and its creation process, including merge
- * conflicts.
- ******************************************************************************/
+ * information related to this geometry and its creation process, including
+ * merge conflicts.
+ *****************************************************************************/
/* Create a geometry that can be used to accumulate vertices and triangles
* decorated with properties. */
SG3_API res_T
@@ -223,8 +223,8 @@ sg3_geometry_reserve
* merge_conflict_status, the callback can change the properties of the
* triangle before the SG3_UNSPECIFIED_PROPERTY overwriting step;
* - if not, a non-SG3_UNSPECIFIED_PROPERTY is only consistent with itself and
- * with SG3_UNSPECIFIED_PROPERTY (if inconsistent, merge_conflict_status is set
- * to 1 and recorded) ; regardless of merge_conflict_status, a
+ * with SG3_UNSPECIFIED_PROPERTY (if inconsistent, merge_conflict_status is
+ * set to 1 and recorded) ; regardless of merge_conflict_status, a
* non-SG3_UNSPECIFIED_PROPERTY property is never overridden.
* When deduplicating triangles, the first occurence remains (with its
* original index in user world). After consistency being computed, a final
@@ -272,26 +272,26 @@ sg3_geometry_get_unique_vertex
/* Get the number of triangles added to the geometry, regardless of unicity. */
SG3_API res_T
-sg3_geometry_get_added_primitives_count
+sg3_geometry_get_added_triangles_count
(const struct sg3_geometry* geometry,
unsigned* count);
/* Get the number of unique triangles. */
SG3_API res_T
-sg3_geometry_get_unique_primitives_count
+sg3_geometry_get_unique_triangles_count
(const struct sg3_geometry* geometry,
unsigned* count);
/* Get the vertex indices of the itri_th unique triangle. */
SG3_API res_T
-sg3_geometry_get_unique_primitive_vertices
+sg3_geometry_get_unique_triangle_vertices
(const struct sg3_geometry* geometry,
const unsigned itri,
unsigned indices[SG3_GEOMETRY_DIMENSION]);
/* Get the properties of the itri_th unique triangle. */
SG3_API res_T
-sg3_geometry_get_unique_primitive_properties
+sg3_geometry_get_unique_triangle_properties
(const struct sg3_geometry* geometry,
const unsigned itri,
unsigned properties[SG3_PROP_TYPES_COUNT__]);
@@ -302,33 +302,33 @@ sg3_geometry_get_unique_primitive_properties
* submitted to sg3_geometry_add calls, regardless of duplication or
* sg3_geometry_add failures (non-RES_OK return value). */
SG3_API res_T
-sg3_geometry_get_unique_primitive_user_id
+sg3_geometry_get_unique_triangle_user_id
(const struct sg3_geometry* geometry,
const unsigned itri,
unsigned* user_id);
/* Get the number of triangles with (at least) one unspecified side. */
SG3_API res_T
-sg3_geometry_get_unique_primitives_with_unspecified_side_count
+sg3_geometry_get_unique_triangles_with_unspecified_side_count
(const struct sg3_geometry* geometry,
unsigned* count);
/* Get the number of triangles with unspecified interface. */
SG3_API res_T
-sg3_geometry_get_unique_primitives_with_unspecified_interface_count
+sg3_geometry_get_unique_triangles_with_unspecified_interface_count
(const struct sg3_geometry* geometry,
unsigned* count);
/* Get the number of triangles flagged with a merge conflict. */
SG3_API res_T
-sg3_geometry_get_unique_primitives_with_merge_conflict_count
+sg3_geometry_get_unique_triangles_with_merge_conflict_count
(const struct sg3_geometry* geometry,
unsigned* count);
/* Get the number of triangles flagged with a property conflict. Only
* meaningful after sg3_geometry_validate_properties has been called. */
SG3_API res_T
-sg3_geometry_get_unique_primitives_with_properties_conflict_count
+sg3_geometry_get_unique_triangles_with_properties_conflict_count
(const struct sg3_geometry* geometry,
unsigned* count);
diff --git a/src/sg3_geometry.c b/src/sg3_geometry.c
@@ -635,7 +635,7 @@ error:
}
res_T
-sg3_geometry_get_added_primitives_count
+sg3_geometry_get_added_triangles_count
(const struct sg3_geometry* geom,
unsigned* count)
{
@@ -652,7 +652,7 @@ error:
}
res_T
-sg3_geometry_get_unique_primitives_count
+sg3_geometry_get_unique_triangles_count
(const struct sg3_geometry* geom,
unsigned* count)
{
@@ -672,7 +672,7 @@ error:
}
res_T
-sg3_geometry_get_unique_primitive_vertices
+sg3_geometry_get_unique_triangle_vertices
(const struct sg3_geometry* geom,
const unsigned itri,
unsigned indices[3])
@@ -695,7 +695,7 @@ error:
}
res_T
-sg3_geometry_get_unique_primitive_properties
+sg3_geometry_get_unique_triangle_properties
(const struct sg3_geometry* geom,
const unsigned itri,
unsigned properties[SG3_PROP_TYPES_COUNT__])
@@ -719,7 +719,7 @@ error:
}
res_T
-sg3_geometry_get_unique_primitive_user_id
+sg3_geometry_get_unique_triangle_user_id
(const struct sg3_geometry* geom,
const unsigned itri,
unsigned* user_id)
@@ -741,7 +741,7 @@ error:
}
res_T
-sg3_geometry_get_unique_primitives_with_unspecified_side_count
+sg3_geometry_get_unique_triangles_with_unspecified_side_count
(const struct sg3_geometry* geom,
unsigned* count)
{
@@ -758,7 +758,7 @@ error:
}
res_T
-sg3_geometry_get_unique_primitives_with_unspecified_interface_count
+sg3_geometry_get_unique_triangles_with_unspecified_interface_count
(const struct sg3_geometry* geom,
unsigned* count)
{
@@ -775,7 +775,7 @@ error:
}
res_T
-sg3_geometry_get_unique_primitives_with_merge_conflict_count
+sg3_geometry_get_unique_triangles_with_merge_conflict_count
(const struct sg3_geometry* geom,
unsigned* count)
{
@@ -792,7 +792,7 @@ error:
}
res_T
-sg3_geometry_get_unique_primitives_with_properties_conflict_count
+sg3_geometry_get_unique_triangles_with_properties_conflict_count
(const struct sg3_geometry* geom,
unsigned* count)
{
diff --git a/src/sg3_s3d_helper.h b/src/sg3_s3d_helper.h
@@ -34,7 +34,7 @@ sg3_s3d_geometry_get_indices__
const struct sg3_geometry* geometry = ctx;
res_T r;
ASSERT(indices && geometry);
- r = sg3_geometry_get_unique_primitive_vertices(geometry, itri, indices);
+ r = sg3_geometry_get_unique_triangle_vertices(geometry, itri, indices);
ASSERT(r == RES_OK); (void)r;
}
diff --git a/src/sg3_senc_helper.h b/src/sg3_senc_helper.h
@@ -32,7 +32,7 @@ sg3_senc_geometry_get_indices__
const struct sg3_geometry* geometry = ctx;
res_T r;
ASSERT(indices && geometry);
- r = sg3_geometry_get_unique_primitive_vertices(geometry, itri, indices);
+ r = sg3_geometry_get_unique_triangle_vertices(geometry, itri, indices);
ASSERT(r == RES_OK); (void)r;
}
@@ -48,7 +48,7 @@ sg3_senc_geometry_get_media__
unsigned tmp[SG3_PROP_TYPES_COUNT__];
res_T r;
ASSERT(media && geometry);
- r = sg3_geometry_get_unique_primitive_properties(geometry, itri, tmp);
+ r = sg3_geometry_get_unique_triangle_properties(geometry, itri, tmp);
ASSERT(r == RES_OK); (void)r;
media[SENC_FRONT] = (tmp[SG3_FRONT] == SG3_UNSPECIFIED_PROPERTY)
? SENC_UNSPECIFIED_MEDIUM : tmp[SG3_FRONT];
diff --git a/src/sgX3.h b/src/sgX3.h
@@ -46,14 +46,14 @@
typedef struct sg3_device sgX_device;
typedef struct sg3_geometry sgX_geometry;
-/*******************************************************************************
- * Some defines to introduce dimensions in use in the library.
- ******************************************************************************/
+/******************************************************************************
+ * The dimension of the geometry used in the library.
+ *****************************************************************************/
#define SGX_GEOMETRY_DIMENSION SG3_GEOMETRY_DIMENSION
-/*******************************************************************************
+/******************************************************************************
* A type to list the different user properties attached to triangles.
- ******************************************************************************/
+ *****************************************************************************/
enum sgX_property_type {
SGX_FRONT = SG3_FRONT,
SGX_BACK = SG3_BACK,
@@ -61,9 +61,9 @@ enum sgX_property_type {
SGX_PROP_TYPES_COUNT__ = SG3_PROP_TYPES_COUNT__
};
-/*******************************************************************************
+/******************************************************************************
* A type to list the different possible partitions of triangles.
- ******************************************************************************/
+ *****************************************************************************/
enum sgX_obj_dump_content {
SGX_OBJ_DUMP_MERGE_CONFLICTS = SG3_OBJ_DUMP_MERGE_CONFLICTS,
SGX_OBJ_DUMP_PROPERTY_CONFLICTS = SG3_OBJ_DUMP_PROPERTY_CONFLICTS,
@@ -71,33 +71,33 @@ enum sgX_obj_dump_content {
SGX_OBJ_DUMP_ALL = SG3_OBJ_DUMP_ALL
};
-/*******************************************************************************
+/******************************************************************************
* A type to list the different qualifiers of C code variable output.
- ******************************************************************************/
+ *****************************************************************************/
enum sgX_c_dump_qualifiers {
SGX_C_DUMP_CONST = SG3_C_DUMP_CONST,
SGX_C_DUMP_STATIC = SG3_C_DUMP_STATIC
};
-/*******************************************************************************
+/******************************************************************************
* The value that should be used for properties attached to triangles (i.e.
* media or interface) when let unspecified.
* SG3_UNSPECIFIED_PROPERTY can be used for a property that has already been
* defined; in this case the previous value will remain.
- ******************************************************************************/
+ *****************************************************************************/
#define SGX_UNSPECIFIED_PROPERTY SG3_UNSPECIFIED_PROPERTY
- /*******************************************************************************
+ /*****************************************************************************
* A type to hold callbacks for sg3_geometry_add.
- ******************************************************************************/
+ ****************************************************************************/
typedef struct sg3_geometry_add_callbacks sgX_geometry_add_callbacks;
#define SGX_ADD_CALLBACKS_NULL__ SG3_ADD_CALLBACKS_NULL__
BEGIN_DECLS
-/*******************************************************************************
+/******************************************************************************
* A helper function on properties compatibility.
- ******************************************************************************/
+ *****************************************************************************/
static FINLINE int
sgX_compatible_property
(const unsigned p1,
@@ -106,10 +106,10 @@ sgX_compatible_property
return sg3_compatible_property(p1, p2);
}
-/*******************************************************************************
+/******************************************************************************
* star-geometry device. It is an handle toward the star-geometry library.
* It manages the star-geometry resources.
- ******************************************************************************/
+ *****************************************************************************/
static FINLINE res_T
sgX_device_create
(struct logger* logger, /* Can be NULL <=> use default logger */
@@ -134,12 +134,12 @@ sgX_device_ref_put
return sg3_device_ref_put(dev);
}
-/*******************************************************************************
+/******************************************************************************
* star-geometry geometry.
* It stores decorated geometry accumulated through calls to sg3_geometry_add,
- * information related to this geometry and its creation process, including merge
- * conflicts.
- ******************************************************************************/
+ * information related to this geometry and its creation process, including
+ * merge conflicts.
+ *****************************************************************************/
/* Create a geometry that can be used to accumulate vertices and triangles
* decorated with properties. */
static FINLINE res_T
@@ -183,8 +183,8 @@ sgX_geometry_reserve
* merge_conflict_status, the callback can change the properties of the
* triangle before the SG3_UNSPECIFIED_PROPERTY overwriting step;
* - if not, a non-SG3_UNSPECIFIED_PROPERTY is only consistent with itself and
- * with SG3_UNSPECIFIED_PROPERTY (if inconsistent, merge_conflict_status is set
- * to 1 and recorded) ; regardless of merge_conflict_status, a
+ * with SG3_UNSPECIFIED_PROPERTY (if inconsistent, merge_conflict_status is
+ * set to 1 and recorded) ; regardless of merge_conflict_status, a
* non-SG3_UNSPECIFIED_PROPERTY property is never overridden.
* When deduplicating triangles, the first occurence remains (with its
* original index in user world). After consistency being computed, a final
@@ -249,7 +249,7 @@ sgX_geometry_get_added_primitives_count
(const sgX_geometry* geometry,
unsigned* count)
{
- return sg3_geometry_get_added_primitives_count(geometry, count);
+ return sg3_geometry_get_added_triangles_count(geometry, count);
}
/* Get the number of unique triangles. */
@@ -258,7 +258,7 @@ sgX_geometry_get_unique_primitives_count
(const sgX_geometry* geometry,
unsigned* count)
{
- return sg3_geometry_get_unique_primitives_count(geometry, count);
+ return sg3_geometry_get_unique_triangles_count(geometry, count);
}
/* Get the vertex indices of the itri_th unique triangle. */
@@ -268,7 +268,7 @@ sgX_geometry_get_unique_primitive_vertices
const unsigned itri,
unsigned indices[SGX_GEOMETRY_DIMENSION])
{
- return sg3_geometry_get_unique_primitive_vertices(geometry, itri, indices);
+ return sg3_geometry_get_unique_triangle_vertices(geometry, itri, indices);
}
/* Get the properties of the itri_th unique triangle. */
@@ -278,7 +278,7 @@ sgX_geometry_get_unique_primitive_properties
const unsigned itri,
unsigned properties[SG3_PROP_TYPES_COUNT__])
{
- return sg3_geometry_get_unique_primitive_properties(
+ return sg3_geometry_get_unique_triangle_properties(
geometry, itri, properties);
}
@@ -293,7 +293,7 @@ sgX_geometry_get_unique_primitive_user_id
const unsigned itri,
unsigned* user_id)
{
- return sg3_geometry_get_unique_primitive_user_id(geometry, itri, user_id);
+ return sg3_geometry_get_unique_triangle_user_id(geometry, itri, user_id);
}
/* Get the number of triangles with (at least) one unspecified side. */
@@ -302,7 +302,7 @@ sgX_geometry_get_unique_primitives_with_unspecified_side_count
(const sgX_geometry* geometry,
unsigned* count)
{
- return sg3_geometry_get_unique_primitives_with_unspecified_side_count(
+ return sg3_geometry_get_unique_triangles_with_unspecified_side_count(
geometry, count);
}
@@ -312,7 +312,7 @@ sgX_geometry_get_unique_primitives_with_unspecified_interface_count
(const sgX_geometry* geometry,
unsigned* count)
{
- return sg3_geometry_get_unique_primitives_with_unspecified_interface_count(
+ return sg3_geometry_get_unique_triangles_with_unspecified_interface_count(
geometry, count);
}
@@ -322,7 +322,7 @@ sgX_geometry_get_unique_primitives_with_merge_conflict_count
(const sgX_geometry* geometry,
unsigned* count)
{
- return sg3_geometry_get_unique_primitives_with_merge_conflict_count(
+ return sg3_geometry_get_unique_triangles_with_merge_conflict_count(
geometry, count);
}
@@ -333,7 +333,7 @@ sgX_geometry_get_unique_primitives_with_properties_conflict_count
(const sgX_geometry* geometry,
unsigned* count)
{
- return sg3_geometry_get_unique_primitives_with_properties_conflict_count(
+ return sg3_geometry_get_unique_triangles_with_properties_conflict_count(
geometry, count);
}
diff --git a/src/test_sg3_cube_behind_cube.c b/src/test_sg3_cube_behind_cube.c
@@ -82,11 +82,11 @@ main(int argc, char** argv)
/* Second cube (front: 0, back: 1), right-handed normal outside */
OK(sg3_geometry_add(geom, nvertices, ntriangles, &callbacks, &ctx));
- OK(sg3_geometry_get_unique_primitives_with_merge_conflict_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_merge_conflict_count(geom, &count));
CHK(count == 0);
- OK(sg3_geometry_get_unique_primitives_with_unspecified_interface_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_unspecified_interface_count(geom, &count));
CHK(count == 0);
- OK(sg3_geometry_get_unique_primitives_with_unspecified_side_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_unspecified_side_count(geom, &count));
CHK(count == 0);
OK(sg3_geometry_dump_as_c_code(geom, stdout, "cube_behind_cube_2",
SG3_C_DUMP_CONST | SG3_C_DUMP_STATIC));
@@ -99,11 +99,11 @@ main(int argc, char** argv)
/* Third cube (front: 1, back: 0), right-handed normal outside */
OK(sg3_geometry_add(geom, nvertices, ntriangles, &callbacks, &ctx));
- OK(sg3_geometry_get_unique_primitives_with_merge_conflict_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_merge_conflict_count(geom, &count));
CHK(count == 0);
- OK(sg3_geometry_get_unique_primitives_with_unspecified_interface_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_unspecified_interface_count(geom, &count));
CHK(count == 0);
- OK(sg3_geometry_get_unique_primitives_with_unspecified_side_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_unspecified_side_count(geom, &count));
CHK(count == 0);
OK(sg3_geometry_dump_as_c_code(geom, stdout, "cube_behind_cube_3",
SG3_C_DUMP_CONST | SG3_C_DUMP_STATIC));
diff --git a/src/test_sg3_cube_in_cube.c b/src/test_sg3_cube_in_cube.c
@@ -73,11 +73,11 @@ main(int argc, char** argv)
/* Second cube (front: 0, back: 1), right-handed normal inside */
OK(sg3_geometry_add(geom, nvertices, ntriangles, &callbacks, &ctx));
- OK(sg3_geometry_get_unique_primitives_with_merge_conflict_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_merge_conflict_count(geom, &count));
CHK(count == 0);
- OK(sg3_geometry_get_unique_primitives_with_unspecified_interface_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_unspecified_interface_count(geom, &count));
CHK(count == 0);
- OK(sg3_geometry_get_unique_primitives_with_unspecified_side_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_unspecified_side_count(geom, &count));
CHK(count == 0);
OK(sg3_geometry_dump_as_c_code(geom, stdout, "cube_in_cube_2",
SG3_C_DUMP_CONST | SG3_C_DUMP_STATIC));
@@ -92,11 +92,11 @@ main(int argc, char** argv)
/* Third cube (front: 0, back: 1), right-handed normal inside */
OK(sg3_geometry_add(geom, nvertices, ntriangles, &callbacks, &ctx));
- OK(sg3_geometry_get_unique_primitives_with_merge_conflict_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_merge_conflict_count(geom, &count));
CHK(count == 0);
- OK(sg3_geometry_get_unique_primitives_with_unspecified_interface_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_unspecified_interface_count(geom, &count));
CHK(count == 0);
- OK(sg3_geometry_get_unique_primitives_with_unspecified_side_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_unspecified_side_count(geom, &count));
CHK(count == 0);
OK(sg3_geometry_dump_as_c_code(geom, stdout, "cube_in_cube_3",
SG3_C_DUMP_CONST | SG3_C_DUMP_STATIC));
diff --git a/src/test_sg3_cube_on_cube.c b/src/test_sg3_cube_on_cube.c
@@ -83,11 +83,11 @@ main(int argc, char** argv)
/* Third cube (front: 2, back: 1), right-handed normal inside */
OK(sg3_geometry_add(geom, nvertices, ntriangles, &callbacks, &ctx));
- OK(sg3_geometry_get_unique_primitives_with_merge_conflict_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_merge_conflict_count(geom, &count));
CHK(count == 0);
- OK(sg3_geometry_get_unique_primitives_with_unspecified_interface_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_unspecified_interface_count(geom, &count));
CHK(count == 0);
- OK(sg3_geometry_get_unique_primitives_with_unspecified_side_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_unspecified_side_count(geom, &count));
CHK(count == 0);
OK(sg3_geometry_dump_as_c_code(geom, stdout, "cube_on_cube",
SG3_C_DUMP_CONST | SG3_C_DUMP_STATIC));
diff --git a/src/test_sg3_geometry.c b/src/test_sg3_geometry.c
@@ -102,35 +102,35 @@ main(int argc, char** argv)
BA(sg3_geometry_get_unique_vertices_count(NULL, &count));
OK(sg3_geometry_get_unique_vertices_count(geom, &count));
- BA(sg3_geometry_get_added_primitives_count(NULL, NULL));
- BA(sg3_geometry_get_added_primitives_count(geom, NULL));
- BA(sg3_geometry_get_added_primitives_count(NULL, &count));
- OK(sg3_geometry_get_added_primitives_count(geom, &count));
-
- BA(sg3_geometry_get_unique_primitives_count(NULL, NULL));
- BA(sg3_geometry_get_unique_primitives_count(geom, NULL));
- BA(sg3_geometry_get_unique_primitives_count(NULL, &count));
- OK(sg3_geometry_get_unique_primitives_count(geom, &count));
-
- BA(sg3_geometry_get_unique_primitives_with_unspecified_side_count(NULL, NULL));
- BA(sg3_geometry_get_unique_primitives_with_unspecified_side_count(geom, NULL));
- BA(sg3_geometry_get_unique_primitives_with_unspecified_side_count(NULL, &count));
- OK(sg3_geometry_get_unique_primitives_with_unspecified_side_count(geom, &count));
-
- BA(sg3_geometry_get_unique_primitives_with_unspecified_interface_count(NULL, NULL));
- BA(sg3_geometry_get_unique_primitives_with_unspecified_interface_count(geom, NULL));
- BA(sg3_geometry_get_unique_primitives_with_unspecified_interface_count(NULL, &count));
- OK(sg3_geometry_get_unique_primitives_with_unspecified_interface_count(geom, &count));
-
- BA(sg3_geometry_get_unique_primitives_with_merge_conflict_count(NULL, NULL));
- BA(sg3_geometry_get_unique_primitives_with_merge_conflict_count(geom, NULL));
- BA(sg3_geometry_get_unique_primitives_with_merge_conflict_count(NULL, &count));
- OK(sg3_geometry_get_unique_primitives_with_merge_conflict_count(geom, &count));
-
- BA(sg3_geometry_get_unique_primitives_with_properties_conflict_count(NULL, NULL));
- BA(sg3_geometry_get_unique_primitives_with_properties_conflict_count(geom, NULL));
- BA(sg3_geometry_get_unique_primitives_with_properties_conflict_count(NULL, &count));
- OK(sg3_geometry_get_unique_primitives_with_properties_conflict_count(geom, &count));
+ BA(sg3_geometry_get_added_triangles_count(NULL, NULL));
+ BA(sg3_geometry_get_added_triangles_count(geom, NULL));
+ BA(sg3_geometry_get_added_triangles_count(NULL, &count));
+ OK(sg3_geometry_get_added_triangles_count(geom, &count));
+
+ BA(sg3_geometry_get_unique_triangles_count(NULL, NULL));
+ BA(sg3_geometry_get_unique_triangles_count(geom, NULL));
+ BA(sg3_geometry_get_unique_triangles_count(NULL, &count));
+ OK(sg3_geometry_get_unique_triangles_count(geom, &count));
+
+ BA(sg3_geometry_get_unique_triangles_with_unspecified_side_count(NULL, NULL));
+ BA(sg3_geometry_get_unique_triangles_with_unspecified_side_count(geom, NULL));
+ BA(sg3_geometry_get_unique_triangles_with_unspecified_side_count(NULL, &count));
+ OK(sg3_geometry_get_unique_triangles_with_unspecified_side_count(geom, &count));
+
+ BA(sg3_geometry_get_unique_triangles_with_unspecified_interface_count(NULL, NULL));
+ BA(sg3_geometry_get_unique_triangles_with_unspecified_interface_count(geom, NULL));
+ BA(sg3_geometry_get_unique_triangles_with_unspecified_interface_count(NULL, &count));
+ OK(sg3_geometry_get_unique_triangles_with_unspecified_interface_count(geom, &count));
+
+ BA(sg3_geometry_get_unique_triangles_with_merge_conflict_count(NULL, NULL));
+ BA(sg3_geometry_get_unique_triangles_with_merge_conflict_count(geom, NULL));
+ BA(sg3_geometry_get_unique_triangles_with_merge_conflict_count(NULL, &count));
+ OK(sg3_geometry_get_unique_triangles_with_merge_conflict_count(geom, &count));
+
+ BA(sg3_geometry_get_unique_triangles_with_properties_conflict_count(NULL, NULL));
+ BA(sg3_geometry_get_unique_triangles_with_properties_conflict_count(geom, NULL));
+ BA(sg3_geometry_get_unique_triangles_with_properties_conflict_count(NULL, &count));
+ OK(sg3_geometry_get_unique_triangles_with_properties_conflict_count(geom, &count));
BA(sg3_geometry_dump_as_obj(NULL, NULL, 0));
BA(sg3_geometry_dump_as_obj(geom, NULL, 0));
@@ -159,10 +159,10 @@ main(int argc, char** argv)
BA(sg3_geometry_dump_as_c_code(geom, stdout, "test", 0));
BA(sg3_geometry_add(NULL, 0, 0, &callbacks, NULL));
- OK(sg3_geometry_get_added_primitives_count(geom, &count));
+ OK(sg3_geometry_get_added_triangles_count(geom, &count));
CHK(count == 0);
BA(sg3_geometry_add(geom, nvertices, ntriangles, NULL, NULL));
- OK(sg3_geometry_get_added_primitives_count(geom, &count));
+ OK(sg3_geometry_get_added_triangles_count(geom, &count));
CHK(count == ntriangles);
/* Mandatory callbacks are NULL */
callbacks.get_indices = NULL;
@@ -178,7 +178,7 @@ main(int argc, char** argv)
callbacks.get_indices = get_indices;
callbacks.get_position = get_position;
OK(sg3_geometry_add(geom, 0, 0, &callbacks, NULL));
- OK(sg3_geometry_get_added_primitives_count(geom, &count));
+ OK(sg3_geometry_get_added_triangles_count(geom, &count));
CHK(count == ntriangles);
/* A 3D cube.
@@ -210,36 +210,36 @@ main(int argc, char** argv)
BA(sg3_geometry_get_unique_vertex(NULL, 0, coord));
OK(sg3_geometry_get_unique_vertex(geom, 0, coord));
- BA(sg3_geometry_get_unique_primitive_vertices(NULL, ntriangles, NULL));
- BA(sg3_geometry_get_unique_primitive_vertices(geom, ntriangles, NULL));
- BA(sg3_geometry_get_unique_primitive_vertices(NULL, 0, NULL));
- BA(sg3_geometry_get_unique_primitive_vertices(NULL, ntriangles, indices));
- BA(sg3_geometry_get_unique_primitive_vertices(geom, 0, NULL));
- BA(sg3_geometry_get_unique_primitive_vertices(geom, ntriangles, indices));
- BA(sg3_geometry_get_unique_primitive_vertices(NULL, 0, indices));
- OK(sg3_geometry_get_unique_primitive_vertices(geom, 0, indices));
+ BA(sg3_geometry_get_unique_triangle_vertices(NULL, ntriangles, NULL));
+ BA(sg3_geometry_get_unique_triangle_vertices(geom, ntriangles, NULL));
+ BA(sg3_geometry_get_unique_triangle_vertices(NULL, 0, NULL));
+ BA(sg3_geometry_get_unique_triangle_vertices(NULL, ntriangles, indices));
+ BA(sg3_geometry_get_unique_triangle_vertices(geom, 0, NULL));
+ BA(sg3_geometry_get_unique_triangle_vertices(geom, ntriangles, indices));
+ BA(sg3_geometry_get_unique_triangle_vertices(NULL, 0, indices));
+ OK(sg3_geometry_get_unique_triangle_vertices(geom, 0, indices));
FOR_EACH(i, 0 , 3) CHK(indices[i] == cube_indices[i]);
- BA(sg3_geometry_get_unique_primitive_properties(NULL, ntriangles, NULL));
- BA(sg3_geometry_get_unique_primitive_properties(geom, ntriangles, NULL));
- BA(sg3_geometry_get_unique_primitive_properties(NULL, 0, NULL));
- BA(sg3_geometry_get_unique_primitive_properties(NULL, ntriangles, properties));
- BA(sg3_geometry_get_unique_primitive_properties(geom, 0, NULL));
- BA(sg3_geometry_get_unique_primitive_properties(geom, ntriangles, properties));
- BA(sg3_geometry_get_unique_primitive_properties(NULL, 0, properties));
- OK(sg3_geometry_get_unique_primitive_properties(geom, 0, properties));
+ BA(sg3_geometry_get_unique_triangle_properties(NULL, ntriangles, NULL));
+ BA(sg3_geometry_get_unique_triangle_properties(geom, ntriangles, NULL));
+ BA(sg3_geometry_get_unique_triangle_properties(NULL, 0, NULL));
+ BA(sg3_geometry_get_unique_triangle_properties(NULL, ntriangles, properties));
+ BA(sg3_geometry_get_unique_triangle_properties(geom, 0, NULL));
+ BA(sg3_geometry_get_unique_triangle_properties(geom, ntriangles, properties));
+ BA(sg3_geometry_get_unique_triangle_properties(NULL, 0, properties));
+ OK(sg3_geometry_get_unique_triangle_properties(geom, 0, properties));
CHK(medium0[0] == properties[SG3_FRONT]);
CHK(medium1[0] == properties[SG3_BACK]);
CHK(intface0[0] == properties[SG3_INTFACE]);
- BA(sg3_geometry_get_unique_primitive_user_id(NULL, ntriangles, NULL));
- BA(sg3_geometry_get_unique_primitive_user_id(geom, ntriangles, NULL));
- BA(sg3_geometry_get_unique_primitive_user_id(NULL, 0, NULL));
- BA(sg3_geometry_get_unique_primitive_user_id(NULL, ntriangles, &user_id));
- BA(sg3_geometry_get_unique_primitive_user_id(geom, 0, NULL));
- BA(sg3_geometry_get_unique_primitive_user_id(geom, ntriangles, &user_id));
- BA(sg3_geometry_get_unique_primitive_user_id(NULL, 0, &user_id));
- OK(sg3_geometry_get_unique_primitive_user_id(geom, 0, &user_id));
+ BA(sg3_geometry_get_unique_triangle_user_id(NULL, ntriangles, NULL));
+ BA(sg3_geometry_get_unique_triangle_user_id(geom, ntriangles, NULL));
+ BA(sg3_geometry_get_unique_triangle_user_id(NULL, 0, NULL));
+ BA(sg3_geometry_get_unique_triangle_user_id(NULL, ntriangles, &user_id));
+ BA(sg3_geometry_get_unique_triangle_user_id(geom, 0, NULL));
+ BA(sg3_geometry_get_unique_triangle_user_id(geom, ntriangles, &user_id));
+ BA(sg3_geometry_get_unique_triangle_user_id(NULL, 0, &user_id));
+ OK(sg3_geometry_get_unique_triangle_user_id(geom, 0, &user_id));
/* Due to a failed attempt to add ntriangles triangles, user_id for the
* first successfully added triangle is shifted */
CHK(user_id == ntriangles);
@@ -247,7 +247,7 @@ main(int argc, char** argv)
/* Conflicts with merge_trg callback */
callbacks.merge_triangle = merge_trg;
OK(sg3_geometry_add(geom, nvertices, ntriangles, &callbacks, &ctx));
- OK(sg3_geometry_get_unique_primitives_with_merge_conflict_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_merge_conflict_count(geom, &count));
/* Due to merge_trg internals, all but the first triangle have conflict */
CHK(count == ntriangles - 1);
OK(sg3_geometry_dump_as_obj(geom, stdout, SG3_OBJ_DUMP_ALL));
@@ -262,7 +262,7 @@ main(int argc, char** argv)
OK(sg3_geometry_add(geom, nvertices, ntriangles, &callbacks, &ctx));
ctx.front_media = medium1_front0;
OK(sg3_geometry_add(geom, nvertices, ntriangles, &callbacks, &ctx));
- OK(sg3_geometry_get_unique_primitives_with_merge_conflict_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_merge_conflict_count(geom, &count));
FOR_EACH(i, 0, ntriangles) if(medium0[i] != medium1_front0[i]) count--;
CHK(count == 0);
OK(sg3_geometry_dump_as_obj(geom, stdout, SG3_OBJ_DUMP_ALL));
diff --git a/src/test_sg3_geometry_2.c b/src/test_sg3_geometry_2.c
@@ -134,25 +134,25 @@ main(int argc, char** argv)
CHK(add_geom_ctx.add_cpt == 0);
OK(sg3_geometry_get_unique_vertices_count(geom, &count));
CHK(count == nvertices);
- OK(sg3_geometry_get_added_primitives_count(geom, &count));
+ OK(sg3_geometry_get_added_triangles_count(geom, &count));
CHK(count == ntriangles);
- OK(sg3_geometry_get_unique_primitives_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_count(geom, &count));
CHK(count == 0);
add_geom_ctx.add_res = RES_MEM_ERR;
ME(sg3_geometry_add(geom, nvertices, ntriangles, &callbacks, &ctx));
CHK(add_geom_ctx.add_cpt == 0);
CHK(count == 0);
- OK(sg3_geometry_get_added_primitives_count(geom, &count));
+ OK(sg3_geometry_get_added_triangles_count(geom, &count));
CHK(count == 2 * ntriangles);
- OK(sg3_geometry_get_unique_primitives_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_count(geom, &count));
CHK(count == 0);
- OK(sg3_geometry_get_unique_primitives_with_unspecified_side_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_unspecified_side_count(geom, &count));
CHK(count == 0);
- OK(sg3_geometry_get_unique_primitives_with_unspecified_interface_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_unspecified_interface_count(geom, &count));
CHK(count == 0);
- OK(sg3_geometry_get_unique_primitives_with_merge_conflict_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_merge_conflict_count(geom, &count));
CHK(count == 0);
- OK(sg3_geometry_get_unique_primitives_with_properties_conflict_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_properties_conflict_count(geom, &count));
CHK(count == 0);
/* Successful add geometry with add callback */
@@ -162,17 +162,17 @@ main(int argc, char** argv)
CHK(add_geom_ctx.merge_cpt == 0);
OK(sg3_geometry_get_unique_vertices_count(geom, &count));
CHK(count == nvertices);
- OK(sg3_geometry_get_added_primitives_count(geom, &count));
+ OK(sg3_geometry_get_added_triangles_count(geom, &count));
CHK(count == 3 * ntriangles);
- OK(sg3_geometry_get_unique_primitives_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_count(geom, &count));
CHK(count == ntriangles);
- OK(sg3_geometry_get_unique_primitives_with_unspecified_side_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_unspecified_side_count(geom, &count));
CHK(count == ntriangles);
- OK(sg3_geometry_get_unique_primitives_with_unspecified_interface_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_unspecified_interface_count(geom, &count));
CHK(count == ntriangles);
- OK(sg3_geometry_get_unique_primitives_with_merge_conflict_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_merge_conflict_count(geom, &count));
CHK(count == 0);
- OK(sg3_geometry_get_unique_primitives_with_properties_conflict_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_properties_conflict_count(geom, &count));
CHK(count == 0);
OK(sg3_geometry_dump_as_c_code(geom, stdout, "test_unspecified",
@@ -190,17 +190,17 @@ main(int argc, char** argv)
CHK(add_geom_ctx.merge_cpt == 0);
OK(sg3_geometry_get_unique_vertices_count(geom, &count));
CHK(count == nvertices);
- OK(sg3_geometry_get_added_primitives_count(geom, &count));
+ OK(sg3_geometry_get_added_triangles_count(geom, &count));
CHK(count == ntriangles);
- OK(sg3_geometry_get_unique_primitives_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_count(geom, &count));
CHK(count == ntriangles);
- OK(sg3_geometry_get_unique_primitives_with_unspecified_side_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_unspecified_side_count(geom, &count));
CHK(count == ntriangles);
- OK(sg3_geometry_get_unique_primitives_with_unspecified_interface_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_unspecified_interface_count(geom, &count));
CHK(count == ntriangles);
- OK(sg3_geometry_get_unique_primitives_with_merge_conflict_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_merge_conflict_count(geom, &count));
CHK(count == 0);
- OK(sg3_geometry_get_unique_primitives_with_properties_conflict_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_properties_conflict_count(geom, &count));
CHK(count == 0);
/* If merge fails, add geometry fails the same way */
@@ -208,24 +208,24 @@ main(int argc, char** argv)
callbacks.add_triangle = add_trg;
BA(sg3_geometry_add(geom, nvertices, ntriangles, &callbacks, &ctx));
CHK(add_geom_ctx.merge_cpt == 0);
- OK(sg3_geometry_get_added_primitives_count(geom, &count));
+ OK(sg3_geometry_get_added_triangles_count(geom, &count));
CHK(count == 2 * ntriangles);
add_geom_ctx.merge_res = RES_MEM_ERR;
ME(sg3_geometry_add(geom, nvertices, ntriangles, &callbacks, &ctx));
CHK(add_geom_ctx.merge_cpt == 0);
- OK(sg3_geometry_get_added_primitives_count(geom, &count));
+ OK(sg3_geometry_get_added_triangles_count(geom, &count));
CHK(count == 3 * ntriangles);
OK(sg3_geometry_get_unique_vertices_count(geom, &count));
CHK(count == nvertices);
- OK(sg3_geometry_get_unique_primitives_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_count(geom, &count));
CHK(count == ntriangles);
- OK(sg3_geometry_get_unique_primitives_with_unspecified_side_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_unspecified_side_count(geom, &count));
CHK(count == ntriangles);
- OK(sg3_geometry_get_unique_primitives_with_unspecified_interface_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_unspecified_interface_count(geom, &count));
CHK(count == ntriangles);
- OK(sg3_geometry_get_unique_primitives_with_merge_conflict_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_merge_conflict_count(geom, &count));
CHK(count == 0); /* merge failed but with a no-conflict status */
- OK(sg3_geometry_get_unique_primitives_with_properties_conflict_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_properties_conflict_count(geom, &count));
CHK(count == 0);
/* Successful add geometry without merge callback */
@@ -234,17 +234,17 @@ main(int argc, char** argv)
CHK(add_geom_ctx.merge_cpt == 0);
OK(sg3_geometry_get_unique_vertices_count(geom, &count));
CHK(count == nvertices);
- OK(sg3_geometry_get_added_primitives_count(geom, &count));
+ OK(sg3_geometry_get_added_triangles_count(geom, &count));
CHK(count == 4 * ntriangles);
- OK(sg3_geometry_get_unique_primitives_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_count(geom, &count));
CHK(count == ntriangles);
- OK(sg3_geometry_get_unique_primitives_with_unspecified_side_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_unspecified_side_count(geom, &count));
CHK(count == ntriangles);
- OK(sg3_geometry_get_unique_primitives_with_unspecified_interface_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_unspecified_interface_count(geom, &count));
CHK(count == ntriangles);
- OK(sg3_geometry_get_unique_primitives_with_merge_conflict_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_merge_conflict_count(geom, &count));
CHK(count == 0);
- OK(sg3_geometry_get_unique_primitives_with_properties_conflict_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_properties_conflict_count(geom, &count));
CHK(count == 0);
/* Successful add geometry with merge callback */
@@ -255,17 +255,17 @@ main(int argc, char** argv)
add_geom_ctx.merge_cpt = 0;
OK(sg3_geometry_get_unique_vertices_count(geom, &count));
CHK(count == nvertices);
- OK(sg3_geometry_get_added_primitives_count(geom, &count));
+ OK(sg3_geometry_get_added_triangles_count(geom, &count));
CHK(count == 5 * ntriangles);
- OK(sg3_geometry_get_unique_primitives_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_count(geom, &count));
CHK(count == ntriangles);
- OK(sg3_geometry_get_unique_primitives_with_unspecified_side_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_unspecified_side_count(geom, &count));
CHK(count == ntriangles);
- OK(sg3_geometry_get_unique_primitives_with_unspecified_interface_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_unspecified_interface_count(geom, &count));
CHK(count == ntriangles);
- OK(sg3_geometry_get_unique_primitives_with_merge_conflict_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_merge_conflict_count(geom, &count));
CHK(count == 0); /* merge failed but with a no-conflict status */
- OK(sg3_geometry_get_unique_primitives_with_properties_conflict_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_properties_conflict_count(geom, &count));
CHK(count == 0);
/* Geometry with media information on both sides */
@@ -280,31 +280,31 @@ main(int argc, char** argv)
* First half of the triangles, then all of them */
add_geom_ctx.add_res = RES_OK;
OK(sg3_geometry_add(geom, nvertices, ntriangles / 2, &callbacks, &ctx));
- OK(sg3_geometry_get_added_primitives_count(geom, &count));
+ OK(sg3_geometry_get_added_triangles_count(geom, &count));
CHK(count == ntriangles / 2);
OK(sg3_geometry_add(geom, nvertices, ntriangles, &callbacks, &ctx));
CHK(add_geom_ctx.add_cpt == ntriangles);
CHK(add_geom_ctx.merge_cpt == ntriangles / 2);
add_geom_ctx.add_cpt = 0;
- OK(sg3_geometry_get_added_primitives_count(geom, &count));
+ OK(sg3_geometry_get_added_triangles_count(geom, &count));
CHK(count == ntriangles + ntriangles / 2);
OK(sg3_geometry_get_unique_vertices_count(geom, &count));
CHK(count == nvertices);
- OK(sg3_geometry_get_unique_primitives_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_count(geom, &count));
CHK(count == ntriangles);
- OK(sg3_geometry_get_unique_primitives_with_unspecified_side_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_unspecified_side_count(geom, &count));
CHK(count == 0); /* media where defined */
- OK(sg3_geometry_get_unique_primitives_with_unspecified_interface_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_unspecified_interface_count(geom, &count));
CHK(count == ntriangles); /* interfaces where unspecified */
- OK(sg3_geometry_get_unique_primitives_with_merge_conflict_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_merge_conflict_count(geom, &count));
CHK(count == 0);
- OK(sg3_geometry_get_unique_primitives_with_properties_conflict_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_properties_conflict_count(geom, &count));
CHK(count == 0);
OK(sg3_geometry_dump_as_vtk(geom, stdout));
/* Second add was half duplicated, so numbering is shifted */
FOR_EACH(i, 0, ntriangles) {
unsigned id;
- OK(sg3_geometry_get_unique_primitive_user_id(geom, i, &id));
+ OK(sg3_geometry_get_unique_triangle_user_id(geom, i, &id));
CHK(i < ntriangles / 2 ? id == i : id == i + ntriangles / 2);
}
@@ -322,17 +322,17 @@ main(int argc, char** argv)
add_geom_ctx.add_cpt = 0;
OK(sg3_geometry_get_unique_vertices_count(geom, &count));
CHK(count == nvertices);
- OK(sg3_geometry_get_added_primitives_count(geom, &count));
+ OK(sg3_geometry_get_added_triangles_count(geom, &count));
CHK(count == ntriangles);
- OK(sg3_geometry_get_unique_primitives_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_count(geom, &count));
CHK(count == ntriangles);
- OK(sg3_geometry_get_unique_primitives_with_unspecified_side_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_unspecified_side_count(geom, &count));
CHK(count == ntriangles); /* media where unspecified */
- OK(sg3_geometry_get_unique_primitives_with_unspecified_interface_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_unspecified_interface_count(geom, &count));
CHK(count == ntriangles); /* interfaces where unspecified */
- OK(sg3_geometry_get_unique_primitives_with_merge_conflict_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_merge_conflict_count(geom, &count));
CHK(count == 0);
- OK(sg3_geometry_get_unique_primitives_with_properties_conflict_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_properties_conflict_count(geom, &count));
CHK(count == 0);
/* Define interface */
@@ -346,17 +346,17 @@ main(int argc, char** argv)
add_geom_ctx.merge_cpt = 0;
OK(sg3_geometry_get_unique_vertices_count(geom, &count));
CHK(count == nvertices);
- OK(sg3_geometry_get_added_primitives_count(geom, &count));
+ OK(sg3_geometry_get_added_triangles_count(geom, &count));
CHK(count == 2 * ntriangles);
- OK(sg3_geometry_get_unique_primitives_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_count(geom, &count));
CHK(count == ntriangles);
- OK(sg3_geometry_get_unique_primitives_with_unspecified_side_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_unspecified_side_count(geom, &count));
CHK(count == 0); /* media where defined */
- OK(sg3_geometry_get_unique_primitives_with_unspecified_interface_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_unspecified_interface_count(geom, &count));
CHK(count == 0); /* interfaces where defined */
- OK(sg3_geometry_get_unique_primitives_with_merge_conflict_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_merge_conflict_count(geom, &count));
CHK(count == 0);
- OK(sg3_geometry_get_unique_primitives_with_properties_conflict_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_properties_conflict_count(geom, &count));
CHK(count == 0);
/* Geometry with incompatible media information on both sides */
@@ -369,17 +369,17 @@ main(int argc, char** argv)
CHK(add_geom_ctx.merge_cpt == 0);
OK(sg3_geometry_get_unique_vertices_count(geom, &count));
CHK(count == nvertices);
- OK(sg3_geometry_get_added_primitives_count(geom, &count));
+ OK(sg3_geometry_get_added_triangles_count(geom, &count));
CHK(count == 3 * ntriangles);
- OK(sg3_geometry_get_unique_primitives_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_count(geom, &count));
CHK(count == ntriangles);
- OK(sg3_geometry_get_unique_primitives_with_unspecified_side_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_unspecified_side_count(geom, &count));
CHK(count == 0); /* media where defined */
- OK(sg3_geometry_get_unique_primitives_with_unspecified_interface_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_unspecified_interface_count(geom, &count));
CHK(count == 0); /* interfaces where defined */
- OK(sg3_geometry_get_unique_primitives_with_merge_conflict_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_merge_conflict_count(geom, &count));
CHK(count == ntriangles);
- OK(sg3_geometry_get_unique_primitives_with_properties_conflict_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_properties_conflict_count(geom, &count));
CHK(count == 0);
/* Incompatible interface */
@@ -393,17 +393,17 @@ main(int argc, char** argv)
add_geom_ctx.merge_cpt = 0;
OK(sg3_geometry_get_unique_vertices_count(geom, &count));
CHK(count == nvertices);
- OK(sg3_geometry_get_added_primitives_count(geom, &count));
+ OK(sg3_geometry_get_added_triangles_count(geom, &count));
CHK(count == 4 * ntriangles);
- OK(sg3_geometry_get_unique_primitives_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_count(geom, &count));
CHK(count == ntriangles);
- OK(sg3_geometry_get_unique_primitives_with_unspecified_side_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_unspecified_side_count(geom, &count));
CHK(count == 0); /* media where defined */
- OK(sg3_geometry_get_unique_primitives_with_unspecified_interface_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_unspecified_interface_count(geom, &count));
CHK(count == 0); /* interfaces where defined */
- OK(sg3_geometry_get_unique_primitives_with_merge_conflict_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_merge_conflict_count(geom, &count));
CHK(count == ntriangles);
- OK(sg3_geometry_get_unique_primitives_with_properties_conflict_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_properties_conflict_count(geom, &count));
CHK(count == 0);
/* Clear geometry */
@@ -412,20 +412,20 @@ main(int argc, char** argv)
/* Successful add geometry with merge callback */
OK(sg3_geometry_add(geom, nvertices, ntriangles, &callbacks, &ctx));
- OK(sg3_geometry_get_unique_primitives_with_merge_conflict_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_merge_conflict_count(geom, &count));
CHK(count == 0);
OK(sg3_geometry_validate_properties(geom, validate, NULL));
- OK(sg3_geometry_get_unique_primitives_with_properties_conflict_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_properties_conflict_count(geom, &count));
CHK(count == 0);
OK(sg3_geometry_dump_as_obj(geom, stdout, SG3_OBJ_DUMP_ALL));
OK(sg3_geometry_validate_properties(geom, validate, NULL));
- OK(sg3_geometry_get_unique_primitives_with_properties_conflict_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_properties_conflict_count(geom, &count));
CHK(count == 0);
OK(sg3_geometry_validate_properties(geom, validate2, NULL));
- OK(sg3_geometry_get_unique_primitives_with_properties_conflict_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_properties_conflict_count(geom, &count));
CHK(count == ntriangles / 2);
OK(sg3_geometry_ref_put(geom));
diff --git a/src/test_sg3_many_enclosures.c b/src/test_sg3_many_enclosures.c
@@ -88,11 +88,11 @@ main(int argc, char** argv)
}
S3DUT(mesh_ref_put(cyl));
- OK(sg3_geometry_get_unique_primitives_with_merge_conflict_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_merge_conflict_count(geom, &count));
CHK(count == 0);
- OK(sg3_geometry_get_unique_primitives_with_unspecified_interface_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_unspecified_interface_count(geom, &count));
CHK(count == 0);
- OK(sg3_geometry_get_unique_primitives_with_unspecified_side_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_unspecified_side_count(geom, &count));
CHK(count == 0);
OK(sg3_geometry_dump_as_obj(geom, stdout, SG3_OBJ_DUMP_ALL));
diff --git a/src/test_sg3_many_triangles.c b/src/test_sg3_many_triangles.c
@@ -69,11 +69,11 @@ main(int argc, char** argv)
}
S3DUT(mesh_ref_put(cyl));
- OK(sg3_geometry_get_unique_primitives_with_merge_conflict_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_merge_conflict_count(geom, &count));
CHK(count == 0);
- OK(sg3_geometry_get_unique_primitives_with_unspecified_interface_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_unspecified_interface_count(geom, &count));
CHK(count == 0);
- OK(sg3_geometry_get_unique_primitives_with_unspecified_side_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_unspecified_side_count(geom, &count));
CHK(count == 0);
OK(sg3_geometry_dump_as_obj(geom, stdout, SG3_OBJ_DUMP_ALL));
diff --git a/src/test_sg3_some_enclosures.c b/src/test_sg3_some_enclosures.c
@@ -88,11 +88,11 @@ main(int argc, char** argv)
}
S3DUT(mesh_ref_put(cyl));
- OK(sg3_geometry_get_unique_primitives_with_merge_conflict_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_merge_conflict_count(geom, &count));
CHK(count == 0);
- OK(sg3_geometry_get_unique_primitives_with_unspecified_interface_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_unspecified_interface_count(geom, &count));
CHK(count == 0);
- OK(sg3_geometry_get_unique_primitives_with_unspecified_side_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_unspecified_side_count(geom, &count));
CHK(count == 0);
OK(sg3_geometry_dump_as_c_code(geom, stdout, "some_enclosures",
SG3_C_DUMP_CONST | SG3_C_DUMP_STATIC));
diff --git a/src/test_sg3_some_triangles.c b/src/test_sg3_some_triangles.c
@@ -69,11 +69,11 @@ main(int argc, char** argv)
}
S3DUT(mesh_ref_put(cyl));
- OK(sg3_geometry_get_unique_primitives_with_merge_conflict_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_merge_conflict_count(geom, &count));
CHK(count == 0);
- OK(sg3_geometry_get_unique_primitives_with_unspecified_interface_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_unspecified_interface_count(geom, &count));
CHK(count == 0);
- OK(sg3_geometry_get_unique_primitives_with_unspecified_side_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_unspecified_side_count(geom, &count));
CHK(count == 0);
OK(sg3_geometry_dump_as_c_code(geom, stdout, "some_triangles",
diff --git a/src/test_sg3_unspecified_properties.c b/src/test_sg3_unspecified_properties.c
@@ -52,17 +52,17 @@ main(int argc, char** argv)
ctx.back_media = medium1;
ctx.intface = property;
OK(sg3_geometry_add(geom, nvertices, ntriangles, &callbacks, &ctx));
- OK(sg3_geometry_get_unique_primitives_with_unspecified_side_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_unspecified_side_count(geom, &count));
CHK(count == ntriangles);
- OK(sg3_geometry_get_added_primitives_count(geom, &count));
+ OK(sg3_geometry_get_added_triangles_count(geom, &count));
CHK(count == ntriangles);
/* Add same geometry with no properties on front/intface */
callbacks.get_properties = get_properties;
OK(sg3_geometry_add(geom, nvertices, ntriangles, &callbacks, &ctx));
- OK(sg3_geometry_get_unique_primitives_with_unspecified_side_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_unspecified_side_count(geom, &count));
CHK(count == ntriangles);
- OK(sg3_geometry_get_added_primitives_count(geom, &count));
+ OK(sg3_geometry_get_added_triangles_count(geom, &count));
CHK(count == 2 * ntriangles);
OK(sg3_geometry_dump_as_c_code(geom, stdout, "front_unspecified",
@@ -72,17 +72,17 @@ main(int argc, char** argv)
FOR_EACH(i, 0, sizeof(property) / sizeof(*property))
property[i] = (i % 2) ? 0 : SG3_UNSPECIFIED_PROPERTY;
OK(sg3_geometry_add(geom, nvertices, ntriangles, &callbacks, &ctx));
- OK(sg3_geometry_get_unique_primitives_with_unspecified_side_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_unspecified_side_count(geom, &count));
CHK(count == ntriangles / 2);
OK(sg3_geometry_get_unique_vertices_count(geom, &count));
CHK(count == nvertices);
- OK(sg3_geometry_get_added_primitives_count(geom, &count));
+ OK(sg3_geometry_get_added_triangles_count(geom, &count));
CHK(count == 3 * ntriangles);
- OK(sg3_geometry_get_unique_primitives_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_count(geom, &count));
CHK(count == ntriangles);
FOR_EACH(i, 0, count) {
unsigned prop[SG3_PROP_TYPES_COUNT__];
- OK(sg3_geometry_get_unique_primitive_properties(geom, i, prop));
+ OK(sg3_geometry_get_unique_triangle_properties(geom, i, prop));
CHK(prop[SG3_FRONT] == ((i % 2) ? 0 : SG3_UNSPECIFIED_PROPERTY)
&& prop[SG3_BACK] == 1
&& prop[SG3_INTFACE] == ((i % 2) ? 0 : SG3_UNSPECIFIED_PROPERTY));
@@ -92,9 +92,9 @@ main(int argc, char** argv)
ctx.reverse_vrtx = 1;
SWAP(const unsigned*, ctx.front_media, ctx.back_media);
OK(sg3_geometry_add(geom, nvertices, ntriangles, &callbacks, &ctx));
- OK(sg3_geometry_get_unique_primitives_with_unspecified_side_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_unspecified_side_count(geom, &count));
CHK(count == ntriangles / 2);
- OK(sg3_geometry_get_added_primitives_count(geom, &count));
+ OK(sg3_geometry_get_added_triangles_count(geom, &count));
CHK(count == 4 * ntriangles);
OK(sg3_geometry_dump_as_c_code(geom, stdout, "front_half_unspecified",
@@ -104,17 +104,17 @@ main(int argc, char** argv)
FOR_EACH(i, 0, sizeof(property) / sizeof(*property))
property[i] = (i % 2) ? SG3_UNSPECIFIED_PROPERTY : 0;
OK(sg3_geometry_add(geom, nvertices, ntriangles, &callbacks, &ctx));
- OK(sg3_geometry_get_unique_primitives_with_unspecified_side_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_unspecified_side_count(geom, &count));
CHK(count == 0);
OK(sg3_geometry_get_unique_vertices_count(geom, &count));
CHK(count == nvertices);
- OK(sg3_geometry_get_added_primitives_count(geom, &count));
+ OK(sg3_geometry_get_added_triangles_count(geom, &count));
CHK(count == 5 * ntriangles);
- OK(sg3_geometry_get_unique_primitives_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_count(geom, &count));
CHK(count == ntriangles);
FOR_EACH(i, 0, count) {
unsigned prop[3];
- OK(sg3_geometry_get_unique_primitive_properties(geom, i, prop));
+ OK(sg3_geometry_get_unique_triangle_properties(geom, i, prop));
CHK(prop[SG3_FRONT] == 0 && prop[SG3_BACK] == 1
&& prop[SG3_INTFACE] == 0);
}
@@ -126,11 +126,11 @@ main(int argc, char** argv)
FOR_EACH(i, 0, sizeof(property) / sizeof(*property))
property[i] = (i % 2);
OK(sg3_geometry_add(geom, nvertices, ntriangles, &callbacks, &ctx));
- OK(sg3_geometry_get_unique_primitives_with_merge_conflict_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_merge_conflict_count(geom, &count));
CHK(count == ntriangles / 2);
- OK(sg3_geometry_get_unique_primitives_with_properties_conflict_count(geom, &count));
+ OK(sg3_geometry_get_unique_triangles_with_properties_conflict_count(geom, &count));
CHK(count == 0);
- OK(sg3_geometry_get_added_primitives_count(geom, &count));
+ OK(sg3_geometry_get_added_triangles_count(geom, &count));
CHK(count == 6 * ntriangles);
OK(sg3_geometry_ref_put(geom));
