commit 788fdfee10de11d63a0e0ebe92b807b58bbd7dfb
parent eca71d51fce720def244960c2b98aa3d07035cb9
Author: Christophe Coustet <christophe.coustet@meso-star.com>
Date: Mon, 3 Feb 2020 15:54:29 +0100
Rename some API calls
Diffstat:
15 files changed, 259 insertions(+), 255 deletions(-)
diff --git a/src/sg2.h b/src/sg2.h
@@ -52,14 +52,14 @@ struct mem_allocator;
struct sg2_device;
struct sg2_geometry;
-/*******************************************************************************
- * Some defines to introduce dimensions in use in the library.
- ******************************************************************************/
+/******************************************************************************
+ * The dimension of the geometry used in the library.
+ *****************************************************************************/
#define SG2_GEOMETRY_DIMENSION 2
-/*******************************************************************************
+/******************************************************************************
* A type to list the different user properties attached to segments.
- ******************************************************************************/
+ *****************************************************************************/
enum sg2_property_type {
SG2_FRONT,
SG2_BACK,
@@ -67,9 +67,9 @@ enum sg2_property_type {
SG2_PROP_TYPES_COUNT__
};
-/*******************************************************************************
+/******************************************************************************
* A type to list the different possible partitions of segments.
- ******************************************************************************/
+ *****************************************************************************/
enum sg2_obj_dump_content {
SG2_OBJ_DUMP_MERGE_CONFLICTS = BIT(0),
SG2_OBJ_DUMP_PROPERTY_CONFLICTS = BIT(1),
@@ -80,25 +80,25 @@ enum sg2_obj_dump_content {
| SG2_OBJ_DUMP_VALID_PRIMITIVE
};
-/*******************************************************************************
+/******************************************************************************
* A type to list the different qualifiers of C code variable output.
- ******************************************************************************/
-enum sg2_cdump_qualifiers {
+ *****************************************************************************/
+enum sg2_c_dump_qualifiers {
SG2_C_DUMP_CONST = BIT(0),
SG2_C_DUMP_STATIC = BIT(1)
};
-/*******************************************************************************
+/******************************************************************************
* The value that should be used for properties attached to segments (i.e.
* media or interface) when let unspecified.
* SG2_UNSPECIFIED_PROPERTY can be used for a property that has already been
* defined; in this case the previous value will remain.
- ******************************************************************************/
+ *****************************************************************************/
#define SG2_UNSPECIFIED_PROPERTY UINT_MAX
- /*******************************************************************************
+ /*****************************************************************************
* A type to hold callbacks for sg2_geometry_add.
- ******************************************************************************/
+ ****************************************************************************/
struct sg2_geometry_add_callbacks {
/* User function that provides vertices ids for added segments */
void(*get_indices)
@@ -149,9 +149,9 @@ struct sg2_geometry_add_callbacks {
BEGIN_DECLS
-/*******************************************************************************
+/******************************************************************************
* A helper function on properties compatibility.
- ******************************************************************************/
+ *****************************************************************************/
static INLINE int
sg2_compatible_property
(const unsigned p1,
@@ -161,10 +161,10 @@ sg2_compatible_property
return (p1 == p2);
}
-/*******************************************************************************
+/******************************************************************************
* star-geometry device. It is an handle toward the star-geometry library.
* It manages the star-geometry resources.
- ******************************************************************************/
+ *****************************************************************************/
SG2_API res_T
sg2_device_create
(struct logger* logger, /* Can be NULL <=> use default logger */
@@ -180,12 +180,12 @@ SG2_API res_T
sg2_device_ref_put
(struct sg2_device* dev);
-/*******************************************************************************
+/******************************************************************************
* star-geometry geometry.
* It stores decorated geometry accumulated through calls to sg2_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 segments
* decorated with properties. */
SG2_API res_T
@@ -222,8 +222,8 @@ sg2_geometry_reserve
* merge_conflict_status, the callback can change the properties of the
* segment before the SG2_UNSPECIFIED_PROPERTY overwriting step;
* - if not, a non-SG2_UNSPECIFIED_PROPERTY is only consistent with itself and
- * with SG2_UNSPECIFIED_PROPERTY (if inconsistent, merge_conflict_status is set
- * to 1 and recorded) ; regardless of merge_conflict_status, a
+ * with SG2_UNSPECIFIED_PROPERTY (if inconsistent, merge_conflict_status is
+ * set to 1 and recorded) ; regardless of merge_conflict_status, a
* non-SG2_UNSPECIFIED_PROPERTY property is never overridden.
* When deduplicating segments, the first occurence remains (with its
* original index in user world). After consistency being computed, a final
@@ -271,26 +271,26 @@ sg2_geometry_get_unique_vertex
/* Get the number of segments added to the geometry, regardless of unicity. */
SG2_API res_T
-sg2_geometry_get_added_primitives_count
+sg2_geometry_get_added_segments_count
(const struct sg2_geometry* geometry,
unsigned* count);
/* Get the number of unique segments. */
SG2_API res_T
-sg2_geometry_get_unique_primitives_count
+sg2_geometry_get_unique_segments_count
(const struct sg2_geometry* geometry,
unsigned* count);
/* Get the vertex indices of the iseg_th unique segment. */
SG2_API res_T
-sg2_geometry_get_unique_primitive_vertices
+sg2_geometry_get_unique_segment_vertices
(const struct sg2_geometry* geometry,
const unsigned iseg,
unsigned indices[SG2_GEOMETRY_DIMENSION]);
/* Get the properties of the iseg_th unique segment. */
SG2_API res_T
-sg2_geometry_get_unique_primitive_properties
+sg2_geometry_get_unique_segment_properties
(const struct sg2_geometry* geometry,
const unsigned iseg,
unsigned properties[SG2_PROP_TYPES_COUNT__]);
@@ -301,33 +301,33 @@ sg2_geometry_get_unique_primitive_properties
* submitted to sg2_geometry_add calls, regardless of duplication or
* sg2_geometry_add failures (non-RES_OK return value). */
SG2_API res_T
-sg2_geometry_get_unique_primitive_user_id
+sg2_geometry_get_unique_segment_user_id
(const struct sg2_geometry* geometry,
const unsigned iseg,
unsigned* user_id);
/* Get the number of segments with (at least) one unspecified side. */
SG2_API res_T
-sg2_geometry_get_unique_primitives_with_unspecified_side_count
+sg2_geometry_get_unique_segments_with_unspecified_side_count
(const struct sg2_geometry* geometry,
unsigned* count);
/* Get the number of segments with unspecified interface. */
SG2_API res_T
-sg2_geometry_get_unique_primitives_with_unspecified_interface_count
+sg2_geometry_get_unique_segments_with_unspecified_interface_count
(const struct sg2_geometry* geometry,
unsigned* count);
/* Get the number of segments flagged with a merge conflict. */
SG2_API res_T
-sg2_geometry_get_unique_primitives_with_merge_conflict_count
+sg2_geometry_get_unique_segments_with_merge_conflict_count
(const struct sg2_geometry* geometry,
unsigned* count);
/* Get the number of segments flagged with a property conflict. Only meaningful
* after sg2_geometry_validate_properties has been called. */
SG2_API res_T
-sg2_geometry_get_unique_primitives_with_properties_conflict_count
+sg2_geometry_get_unique_segments_with_properties_conflict_count
(const struct sg2_geometry* geometry,
unsigned* count);
@@ -377,7 +377,7 @@ sg2_geometry_dump_as_vtk
* Where <N1> is 2 * vertices_count, <N2> is 2 * segments_count and <N3> is
* 3 * segments_count.
* The two qualifiers static and const are output or not according to flags;
- * flags must be ORed enum sg2_cdump_qualifiers values. */
+ * flags must be ORed enum sg2_c_dump_qualifiers values. */
SG2_API res_T
sg2_geometry_dump_as_c_code
(const struct sg2_geometry* geometry,
diff --git a/src/sg2_geometry.c b/src/sg2_geometry.c
@@ -592,7 +592,7 @@ error:
}
res_T
-sg2_geometry_get_added_primitives_count
+sg2_geometry_get_added_segments_count
(const struct sg2_geometry* geom,
unsigned* count)
{
@@ -609,7 +609,7 @@ error:
}
res_T
-sg2_geometry_get_unique_primitives_count
+sg2_geometry_get_unique_segments_count
(const struct sg2_geometry* geom,
unsigned* count)
{
@@ -629,7 +629,7 @@ error:
}
res_T
-sg2_geometry_get_unique_primitive_vertices
+sg2_geometry_get_unique_segment_vertices
(const struct sg2_geometry* geom,
const unsigned iseg,
unsigned indices[2])
@@ -652,7 +652,7 @@ error:
}
res_T
-sg2_geometry_get_unique_primitive_properties
+sg2_geometry_get_unique_segment_properties
(const struct sg2_geometry* geom,
const unsigned iseg,
unsigned properties[SG2_PROP_TYPES_COUNT__])
@@ -676,7 +676,7 @@ error:
}
res_T
-sg2_geometry_get_unique_primitive_user_id
+sg2_geometry_get_unique_segment_user_id
(const struct sg2_geometry* geom,
const unsigned iseg,
unsigned* user_id)
@@ -698,7 +698,7 @@ error:
}
res_T
-sg2_geometry_get_unique_primitives_with_unspecified_side_count
+sg2_geometry_get_unique_segments_with_unspecified_side_count
(const struct sg2_geometry* geom,
unsigned* count)
{
@@ -715,7 +715,7 @@ error:
}
res_T
-sg2_geometry_get_unique_primitives_with_unspecified_interface_count
+sg2_geometry_get_unique_segments_with_unspecified_interface_count
(const struct sg2_geometry* geom,
unsigned* count)
{
@@ -732,7 +732,7 @@ error:
}
res_T
-sg2_geometry_get_unique_primitives_with_merge_conflict_count
+sg2_geometry_get_unique_segments_with_merge_conflict_count
(const struct sg2_geometry* geom,
unsigned* count)
{
@@ -749,7 +749,7 @@ error:
}
res_T
-sg2_geometry_get_unique_primitives_with_properties_conflict_count
+sg2_geometry_get_unique_segments_with_properties_conflict_count
(const struct sg2_geometry* geom,
unsigned* count)
{
diff --git a/src/sg2_s2d_helper.h b/src/sg2_s2d_helper.h
@@ -34,7 +34,7 @@ sg2_s2d_geometry_get_indices__
const struct sg2_geometry* geometry = ctx;
res_T r;
ASSERT(indices && geometry);
- r = sg2_geometry_get_unique_primitive_vertices(geometry, iseg, indices);
+ r = sg2_geometry_get_unique_segment_vertices(geometry, iseg, indices);
ASSERT(r == RES_OK); (void)r;
}
diff --git a/src/sg2_senc2d_helper.h b/src/sg2_senc2d_helper.h
@@ -32,7 +32,7 @@ sg2_senc_geometry_get_indices__
const struct sg2_geometry* geometry = ctx;
res_T r;
ASSERT(indices && geometry);
- r = sg2_geometry_get_unique_primitive_vertices(geometry, iseg, indices);
+ r = sg2_geometry_get_unique_segment_vertices(geometry, iseg, indices);
ASSERT(r == RES_OK); (void)r;
}
@@ -48,7 +48,7 @@ sg2_senc_geometry_get_media__
unsigned tmp[SG2_PROP_TYPES_COUNT__];
res_T r;
ASSERT(media && geometry);
- r = sg2_geometry_get_unique_primitive_properties(geometry, iseg, tmp);
+ r = sg2_geometry_get_unique_segment_properties(geometry, iseg, tmp);
ASSERT(r == RES_OK); (void)r;
media[SENC2D_FRONT] = (tmp[SG2_FRONT] == SG2_UNSPECIFIED_PROPERTY)
? SENC2D_UNSPECIFIED_MEDIUM : tmp[SG2_FRONT];
diff --git a/src/sgX2.h b/src/sgX2.h
@@ -36,6 +36,10 @@
* Then use the sgX_... types and functions in your code.
*/
+ /* Forward declaration of external opaque data types */
+struct logger;
+struct mem_allocator;
+
/* Forward declaration of the star-geometry-2D opaque data types. These data
* types are ref counted. Once created the caller implicitly owns the created
* data, i.e. its reference counter is set to 1. The sdis_<TYPE>_ref_<get|put>
@@ -45,14 +49,14 @@
typedef struct sg2_device sgX_device;
typedef struct sg2_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 SG2_GEOMETRY_DIMENSION
-/*******************************************************************************
+/******************************************************************************
* A type to list the different user properties attached to segments.
- ******************************************************************************/
+ *****************************************************************************/
enum sgX_property_type {
SGX_FRONT = SG2_FRONT,
SGX_BACK = SG2_BACK,
@@ -60,9 +64,9 @@ enum sgX_property_type {
SGX_PROP_TYPES_COUNT__ = SG2_PROP_TYPES_COUNT__
};
-/*******************************************************************************
+/******************************************************************************
* A type to list the different possible partitions of segments.
- ******************************************************************************/
+ *****************************************************************************/
enum sgX_obj_dump_content {
SGX_OBJ_DUMP_MERGE_CONFLICTS = SG2_OBJ_DUMP_MERGE_CONFLICTS,
SGX_OBJ_DUMP_PROPERTY_CONFLICTS = SG2_OBJ_DUMP_PROPERTY_CONFLICTS,
@@ -70,33 +74,33 @@ enum sgX_obj_dump_content {
SGX_OBJ_DUMP_ALL = SG2_OBJ_DUMP_ALL
};
-/*******************************************************************************
+/******************************************************************************
* A type to list the different qualifiers of C code variable output.
- ******************************************************************************/
+ *****************************************************************************/
enum sgX_c_dump_qualifiers {
SGX_C_DUMP_CONST = SG2_C_DUMP_CONST,
SGX_C_DUMP_STATIC = SG2_C_DUMP_STATIC
};
-/*******************************************************************************
+/******************************************************************************
* The value that should be used for properties attached to segments (i.e.
* media or interface) when let unspecified.
* SG2_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 SG2_UNSPECIFIED_PROPERTY
- /*******************************************************************************
+ /*****************************************************************************
* A type to hold callbacks for sg2_geometry_add.
- ******************************************************************************/
+ ****************************************************************************/
typedef struct sg2_geometry_add_callbacks sgX_geometry_add_callbacks;
#define SGX_ADD_CALLBACKS_NULL__ SG2_ADD_CALLBACKS_NULL__
BEGIN_DECLS
-/*******************************************************************************
+/******************************************************************************
* A helper function on properties compatibility.
- ******************************************************************************/
+ *****************************************************************************/
static FINLINE int
sgX_compatible_property
(const unsigned p1,
@@ -105,10 +109,10 @@ sgX_compatible_property
return sg2_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 */
@@ -133,12 +137,12 @@ sgX_device_ref_put
return sg2_device_ref_put(dev);
}
-/*******************************************************************************
+/******************************************************************************
* star-geometry geometry.
* It stores decorated geometry accumulated through calls to sg2_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 segments
* decorated with properties. */
static FINLINE res_T
@@ -182,8 +186,8 @@ sgX_geometry_reserve
* merge_conflict_status, the callback can change the properties of the
* segment before the SG2_UNSPECIFIED_PROPERTY overwriting step;
* - if not, a non-SG2_UNSPECIFIED_PROPERTY is only consistent with itself and
- * with SG2_UNSPECIFIED_PROPERTY (if inconsistent, merge_conflict_status is set
- * to 1 and recorded) ; regardless of merge_conflict_status, a
+ * with SG2_UNSPECIFIED_PROPERTY (if inconsistent, merge_conflict_status is
+ * set to 1 and recorded) ; regardless of merge_conflict_status, a
* non-SG2_UNSPECIFIED_PROPERTY property is never overridden.
* When deduplicating segments, the first occurence remains (with its
* original index in user world). After consistency being computed, a final
@@ -248,7 +252,7 @@ sgX_geometry_get_added_primitives_count
(const sgX_geometry* geometry,
unsigned* count)
{
- return sg2_geometry_get_added_primitives_count(geometry, count);
+ return sg2_geometry_get_added_segments_count(geometry, count);
}
/* Get the number of unique segments. */
@@ -257,7 +261,7 @@ sgX_geometry_get_unique_primitives_count
(const sgX_geometry* geometry,
unsigned* count)
{
- return sg2_geometry_get_unique_primitives_count(geometry, count);
+ return sg2_geometry_get_unique_segments_count(geometry, count);
}
/* Get the vertex indices of the iseg_th unique segment. */
@@ -267,7 +271,7 @@ sgX_geometry_get_unique_primitive_vertices
const unsigned iseg,
unsigned indices[SGX_GEOMETRY_DIMENSION])
{
- return sg2_geometry_get_unique_primitive_vertices(geometry, iseg, indices);
+ return sg2_geometry_get_unique_segment_vertices(geometry, iseg, indices);
}
/* Get the properties of the iseg_th unique segment. */
@@ -277,7 +281,7 @@ sgX_geometry_get_unique_primitive_properties
const unsigned iseg,
unsigned properties[SG2_PROP_TYPES_COUNT__])
{
- return sg2_geometry_get_unique_primitive_properties(
+ return sg2_geometry_get_unique_segment_properties(
geometry, iseg, properties);
}
@@ -292,7 +296,7 @@ sgX_geometry_get_unique_primitive_user_id
const unsigned iseg,
unsigned* user_id)
{
- return sg2_geometry_get_unique_primitive_user_id(geometry, iseg, user_id);
+ return sg2_geometry_get_unique_segment_user_id(geometry, iseg, user_id);
}
/* Get the number of segments with (at least) one unspecified side. */
@@ -301,7 +305,7 @@ sgX_geometry_get_unique_primitives_with_unspecified_side_count
(const sgX_geometry* geometry,
unsigned* count)
{
- return sg2_geometry_get_unique_primitives_with_unspecified_side_count(
+ return sg2_geometry_get_unique_segments_with_unspecified_side_count(
geometry, count);
}
@@ -311,7 +315,7 @@ sgX_geometry_get_unique_primitives_with_unspecified_interface_count
(const sgX_geometry* geometry,
unsigned* count)
{
- return sg2_geometry_get_unique_primitives_with_unspecified_interface_count(
+ return sg2_geometry_get_unique_segments_with_unspecified_interface_count(
geometry, count);
}
@@ -321,7 +325,7 @@ sgX_geometry_get_unique_primitives_with_merge_conflict_count
(const sgX_geometry* geometry,
unsigned* count)
{
- return sg2_geometry_get_unique_primitives_with_merge_conflict_count(
+ return sg2_geometry_get_unique_segments_with_merge_conflict_count(
geometry, count);
}
@@ -332,7 +336,7 @@ sgX_geometry_get_unique_primitives_with_properties_conflict_count
(const sgX_geometry* geometry,
unsigned* count)
{
- return sg2_geometry_get_unique_primitives_with_properties_conflict_count(
+ return sg2_geometry_get_unique_segments_with_properties_conflict_count(
geometry, count);
}
diff --git a/src/test_sg2_geometry.c b/src/test_sg2_geometry.c
@@ -102,35 +102,35 @@ main(int argc, char** argv)
BA(sg2_geometry_get_unique_vertices_count(NULL, &count));
OK(sg2_geometry_get_unique_vertices_count(geom, &count));
- BA(sg2_geometry_get_added_primitives_count(NULL, NULL));
- BA(sg2_geometry_get_added_primitives_count(geom, NULL));
- BA(sg2_geometry_get_added_primitives_count(NULL, &count));
- OK(sg2_geometry_get_added_primitives_count(geom, &count));
-
- BA(sg2_geometry_get_unique_primitives_count(NULL, NULL));
- BA(sg2_geometry_get_unique_primitives_count(geom, NULL));
- BA(sg2_geometry_get_unique_primitives_count(NULL, &count));
- OK(sg2_geometry_get_unique_primitives_count(geom, &count));
-
- BA(sg2_geometry_get_unique_primitives_with_unspecified_side_count(NULL, NULL));
- BA(sg2_geometry_get_unique_primitives_with_unspecified_side_count(geom, NULL));
- BA(sg2_geometry_get_unique_primitives_with_unspecified_side_count(NULL, &count));
- OK(sg2_geometry_get_unique_primitives_with_unspecified_side_count(geom, &count));
-
- BA(sg2_geometry_get_unique_primitives_with_unspecified_interface_count(NULL, NULL));
- BA(sg2_geometry_get_unique_primitives_with_unspecified_interface_count(geom, NULL));
- BA(sg2_geometry_get_unique_primitives_with_unspecified_interface_count(NULL, &count));
- OK(sg2_geometry_get_unique_primitives_with_unspecified_interface_count(geom, &count));
-
- BA(sg2_geometry_get_unique_primitives_with_merge_conflict_count(NULL, NULL));
- BA(sg2_geometry_get_unique_primitives_with_merge_conflict_count(geom, NULL));
- BA(sg2_geometry_get_unique_primitives_with_merge_conflict_count(NULL, &count));
- OK(sg2_geometry_get_unique_primitives_with_merge_conflict_count(geom, &count));
-
- BA(sg2_geometry_get_unique_primitives_with_properties_conflict_count(NULL, NULL));
- BA(sg2_geometry_get_unique_primitives_with_properties_conflict_count(geom, NULL));
- BA(sg2_geometry_get_unique_primitives_with_properties_conflict_count(NULL, &count));
- OK(sg2_geometry_get_unique_primitives_with_properties_conflict_count(geom, &count));
+ BA(sg2_geometry_get_added_segments_count(NULL, NULL));
+ BA(sg2_geometry_get_added_segments_count(geom, NULL));
+ BA(sg2_geometry_get_added_segments_count(NULL, &count));
+ OK(sg2_geometry_get_added_segments_count(geom, &count));
+
+ BA(sg2_geometry_get_unique_segments_count(NULL, NULL));
+ BA(sg2_geometry_get_unique_segments_count(geom, NULL));
+ BA(sg2_geometry_get_unique_segments_count(NULL, &count));
+ OK(sg2_geometry_get_unique_segments_count(geom, &count));
+
+ BA(sg2_geometry_get_unique_segments_with_unspecified_side_count(NULL, NULL));
+ BA(sg2_geometry_get_unique_segments_with_unspecified_side_count(geom, NULL));
+ BA(sg2_geometry_get_unique_segments_with_unspecified_side_count(NULL, &count));
+ OK(sg2_geometry_get_unique_segments_with_unspecified_side_count(geom, &count));
+
+ BA(sg2_geometry_get_unique_segments_with_unspecified_interface_count(NULL, NULL));
+ BA(sg2_geometry_get_unique_segments_with_unspecified_interface_count(geom, NULL));
+ BA(sg2_geometry_get_unique_segments_with_unspecified_interface_count(NULL, &count));
+ OK(sg2_geometry_get_unique_segments_with_unspecified_interface_count(geom, &count));
+
+ BA(sg2_geometry_get_unique_segments_with_merge_conflict_count(NULL, NULL));
+ BA(sg2_geometry_get_unique_segments_with_merge_conflict_count(geom, NULL));
+ BA(sg2_geometry_get_unique_segments_with_merge_conflict_count(NULL, &count));
+ OK(sg2_geometry_get_unique_segments_with_merge_conflict_count(geom, &count));
+
+ BA(sg2_geometry_get_unique_segments_with_properties_conflict_count(NULL, NULL));
+ BA(sg2_geometry_get_unique_segments_with_properties_conflict_count(geom, NULL));
+ BA(sg2_geometry_get_unique_segments_with_properties_conflict_count(NULL, &count));
+ OK(sg2_geometry_get_unique_segments_with_properties_conflict_count(geom, &count));
BA(sg2_geometry_dump_as_obj(NULL, NULL, 0));
BA(sg2_geometry_dump_as_obj(geom, NULL, 0));
@@ -159,10 +159,10 @@ main(int argc, char** argv)
BA(sg2_geometry_dump_as_c_code(geom, stdout, "test", 0));
BA(sg2_geometry_add(NULL, 0, 0, &callbacks, NULL));
- OK(sg2_geometry_get_added_primitives_count(geom, &count));
+ OK(sg2_geometry_get_added_segments_count(geom, &count));
CHK(count == 0);
BA(sg2_geometry_add(geom, nvertices, nsegments, NULL, NULL));
- OK(sg2_geometry_get_added_primitives_count(geom, &count));
+ OK(sg2_geometry_get_added_segments_count(geom, &count));
CHK(count == nsegments);
/* 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(sg2_geometry_add(geom, 0, 0, &callbacks, NULL));
- OK(sg2_geometry_get_added_primitives_count(geom, &count));
+ OK(sg2_geometry_get_added_segments_count(geom, &count));
CHK(count == nsegments);
/* A 2D square.
@@ -210,36 +210,36 @@ main(int argc, char** argv)
BA(sg2_geometry_get_unique_vertex(NULL, 0, coord));
OK(sg2_geometry_get_unique_vertex(geom, 0, coord));
- BA(sg2_geometry_get_unique_primitive_vertices(NULL, nsegments, NULL));
- BA(sg2_geometry_get_unique_primitive_vertices(geom, nsegments, NULL));
- BA(sg2_geometry_get_unique_primitive_vertices(NULL, 0, NULL));
- BA(sg2_geometry_get_unique_primitive_vertices(NULL, nsegments, indices));
- BA(sg2_geometry_get_unique_primitive_vertices(geom, 0, NULL));
- BA(sg2_geometry_get_unique_primitive_vertices(geom, nsegments, indices));
- BA(sg2_geometry_get_unique_primitive_vertices(NULL, 0, indices));
- OK(sg2_geometry_get_unique_primitive_vertices(geom, 0, indices));
+ BA(sg2_geometry_get_unique_segment_vertices(NULL, nsegments, NULL));
+ BA(sg2_geometry_get_unique_segment_vertices(geom, nsegments, NULL));
+ BA(sg2_geometry_get_unique_segment_vertices(NULL, 0, NULL));
+ BA(sg2_geometry_get_unique_segment_vertices(NULL, nsegments, indices));
+ BA(sg2_geometry_get_unique_segment_vertices(geom, 0, NULL));
+ BA(sg2_geometry_get_unique_segment_vertices(geom, nsegments, indices));
+ BA(sg2_geometry_get_unique_segment_vertices(NULL, 0, indices));
+ OK(sg2_geometry_get_unique_segment_vertices(geom, 0, indices));
FOR_EACH(i, 0 , 2) CHK(indices[i] == box_indices[i]);
- BA(sg2_geometry_get_unique_primitive_properties(NULL, nsegments, NULL));
- BA(sg2_geometry_get_unique_primitive_properties(geom, nsegments, NULL));
- BA(sg2_geometry_get_unique_primitive_properties(NULL, 0, NULL));
- BA(sg2_geometry_get_unique_primitive_properties(NULL, nsegments, properties));
- BA(sg2_geometry_get_unique_primitive_properties(geom, 0, NULL));
- BA(sg2_geometry_get_unique_primitive_properties(geom, nsegments, properties));
- BA(sg2_geometry_get_unique_primitive_properties(NULL, 0, properties));
- OK(sg2_geometry_get_unique_primitive_properties(geom, 0, properties));
+ BA(sg2_geometry_get_unique_segment_properties(NULL, nsegments, NULL));
+ BA(sg2_geometry_get_unique_segment_properties(geom, nsegments, NULL));
+ BA(sg2_geometry_get_unique_segment_properties(NULL, 0, NULL));
+ BA(sg2_geometry_get_unique_segment_properties(NULL, nsegments, properties));
+ BA(sg2_geometry_get_unique_segment_properties(geom, 0, NULL));
+ BA(sg2_geometry_get_unique_segment_properties(geom, nsegments, properties));
+ BA(sg2_geometry_get_unique_segment_properties(NULL, 0, properties));
+ OK(sg2_geometry_get_unique_segment_properties(geom, 0, properties));
CHK(medium0[0] == properties[SG2_FRONT]);
CHK(medium1[0] == properties[SG2_BACK]);
CHK(intface0[0] == properties[SG2_INTFACE]);
- BA(sg2_geometry_get_unique_primitive_user_id(NULL, nsegments, NULL));
- BA(sg2_geometry_get_unique_primitive_user_id(geom, nsegments, NULL));
- BA(sg2_geometry_get_unique_primitive_user_id(NULL, 0, NULL));
- BA(sg2_geometry_get_unique_primitive_user_id(NULL, nsegments, &user_id));
- BA(sg2_geometry_get_unique_primitive_user_id(geom, 0, NULL));
- BA(sg2_geometry_get_unique_primitive_user_id(geom, nsegments, &user_id));
- BA(sg2_geometry_get_unique_primitive_user_id(NULL, 0, &user_id));
- OK(sg2_geometry_get_unique_primitive_user_id(geom, 0, &user_id));
+ BA(sg2_geometry_get_unique_segment_user_id(NULL, nsegments, NULL));
+ BA(sg2_geometry_get_unique_segment_user_id(geom, nsegments, NULL));
+ BA(sg2_geometry_get_unique_segment_user_id(NULL, 0, NULL));
+ BA(sg2_geometry_get_unique_segment_user_id(NULL, nsegments, &user_id));
+ BA(sg2_geometry_get_unique_segment_user_id(geom, 0, NULL));
+ BA(sg2_geometry_get_unique_segment_user_id(geom, nsegments, &user_id));
+ BA(sg2_geometry_get_unique_segment_user_id(NULL, 0, &user_id));
+ OK(sg2_geometry_get_unique_segment_user_id(geom, 0, &user_id));
/* Due to a failed attempt to add nsegments segments, user_id for the
* first successfully added segment is shifted */
CHK(user_id == nsegments);
@@ -247,7 +247,7 @@ main(int argc, char** argv)
/* Conflicts with merge_seg callback */
callbacks.merge_segment = merge_seg;
OK(sg2_geometry_add(geom, nvertices, nsegments, &callbacks, &ctx));
- OK(sg2_geometry_get_unique_primitives_with_merge_conflict_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_merge_conflict_count(geom, &count));
/* Due to merge_seg internals, all but the first segment have conflict */
CHK(count == nsegments - 1);
OK(sg2_geometry_dump_as_obj(geom, stdout, SG2_OBJ_DUMP_ALL));
@@ -262,7 +262,7 @@ main(int argc, char** argv)
OK(sg2_geometry_add(geom, nvertices, nsegments, &callbacks, &ctx));
ctx.front_media = medium1_top0;
OK(sg2_geometry_add(geom, nvertices, nsegments, &callbacks, &ctx));
- OK(sg2_geometry_get_unique_primitives_with_merge_conflict_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_merge_conflict_count(geom, &count));
FOR_EACH(i, 0, nsegments) if(medium0[i] != medium1_top0[i]) count--;
CHK(count == 0);
OK(sg2_geometry_dump_as_obj(geom, stdout, SG2_OBJ_DUMP_ALL));
diff --git a/src/test_sg2_geometry_2.c b/src/test_sg2_geometry_2.c
@@ -134,25 +134,25 @@ main(int argc, char** argv)
CHK(add_geom_ctx.add_cpt == 0);
OK(sg2_geometry_get_unique_vertices_count(geom, &count));
CHK(count == nvertices);
- OK(sg2_geometry_get_added_primitives_count(geom, &count));
+ OK(sg2_geometry_get_added_segments_count(geom, &count));
CHK(count == nsegments);
- OK(sg2_geometry_get_unique_primitives_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_count(geom, &count));
CHK(count == 0);
add_geom_ctx.add_res = RES_MEM_ERR;
ME(sg2_geometry_add(geom, nvertices, nsegments, &callbacks, &ctx));
CHK(add_geom_ctx.add_cpt == 0);
CHK(count == 0);
- OK(sg2_geometry_get_added_primitives_count(geom, &count));
+ OK(sg2_geometry_get_added_segments_count(geom, &count));
CHK(count == 2 * nsegments);
- OK(sg2_geometry_get_unique_primitives_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_count(geom, &count));
CHK(count == 0);
- OK(sg2_geometry_get_unique_primitives_with_unspecified_side_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_unspecified_side_count(geom, &count));
CHK(count == 0);
- OK(sg2_geometry_get_unique_primitives_with_unspecified_interface_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_unspecified_interface_count(geom, &count));
CHK(count == 0);
- OK(sg2_geometry_get_unique_primitives_with_merge_conflict_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_merge_conflict_count(geom, &count));
CHK(count == 0);
- OK(sg2_geometry_get_unique_primitives_with_properties_conflict_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_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(sg2_geometry_get_unique_vertices_count(geom, &count));
CHK(count == nvertices);
- OK(sg2_geometry_get_added_primitives_count(geom, &count));
+ OK(sg2_geometry_get_added_segments_count(geom, &count));
CHK(count == 3 * nsegments);
- OK(sg2_geometry_get_unique_primitives_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_count(geom, &count));
CHK(count == nsegments);
- OK(sg2_geometry_get_unique_primitives_with_unspecified_side_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_unspecified_side_count(geom, &count));
CHK(count == nsegments);
- OK(sg2_geometry_get_unique_primitives_with_unspecified_interface_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_unspecified_interface_count(geom, &count));
CHK(count == nsegments);
- OK(sg2_geometry_get_unique_primitives_with_merge_conflict_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_merge_conflict_count(geom, &count));
CHK(count == 0);
- OK(sg2_geometry_get_unique_primitives_with_properties_conflict_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_properties_conflict_count(geom, &count));
CHK(count == 0);
OK(sg2_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(sg2_geometry_get_unique_vertices_count(geom, &count));
CHK(count == nvertices);
- OK(sg2_geometry_get_added_primitives_count(geom, &count));
+ OK(sg2_geometry_get_added_segments_count(geom, &count));
CHK(count == nsegments);
- OK(sg2_geometry_get_unique_primitives_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_count(geom, &count));
CHK(count == nsegments);
- OK(sg2_geometry_get_unique_primitives_with_unspecified_side_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_unspecified_side_count(geom, &count));
CHK(count == nsegments);
- OK(sg2_geometry_get_unique_primitives_with_unspecified_interface_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_unspecified_interface_count(geom, &count));
CHK(count == nsegments);
- OK(sg2_geometry_get_unique_primitives_with_merge_conflict_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_merge_conflict_count(geom, &count));
CHK(count == 0);
- OK(sg2_geometry_get_unique_primitives_with_properties_conflict_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_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_segment = add_seg;
BA(sg2_geometry_add(geom, nvertices, nsegments, &callbacks, &ctx));
CHK(add_geom_ctx.merge_cpt == 0);
- OK(sg2_geometry_get_added_primitives_count(geom, &count));
+ OK(sg2_geometry_get_added_segments_count(geom, &count));
CHK(count == 2 * nsegments);
add_geom_ctx.merge_res = RES_MEM_ERR;
ME(sg2_geometry_add(geom, nvertices, nsegments, &callbacks, &ctx));
CHK(add_geom_ctx.merge_cpt == 0);
- OK(sg2_geometry_get_added_primitives_count(geom, &count));
+ OK(sg2_geometry_get_added_segments_count(geom, &count));
CHK(count == 3 * nsegments);
OK(sg2_geometry_get_unique_vertices_count(geom, &count));
CHK(count == nvertices);
- OK(sg2_geometry_get_unique_primitives_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_count(geom, &count));
CHK(count == nsegments);
- OK(sg2_geometry_get_unique_primitives_with_unspecified_side_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_unspecified_side_count(geom, &count));
CHK(count == nsegments);
- OK(sg2_geometry_get_unique_primitives_with_unspecified_interface_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_unspecified_interface_count(geom, &count));
CHK(count == nsegments);
- OK(sg2_geometry_get_unique_primitives_with_merge_conflict_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_merge_conflict_count(geom, &count));
CHK(count == 0); /* merge failed but with a no-conflict status */
- OK(sg2_geometry_get_unique_primitives_with_properties_conflict_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_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(sg2_geometry_get_unique_vertices_count(geom, &count));
CHK(count == nvertices);
- OK(sg2_geometry_get_added_primitives_count(geom, &count));
+ OK(sg2_geometry_get_added_segments_count(geom, &count));
CHK(count == 4 * nsegments);
- OK(sg2_geometry_get_unique_primitives_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_count(geom, &count));
CHK(count == nsegments);
- OK(sg2_geometry_get_unique_primitives_with_unspecified_side_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_unspecified_side_count(geom, &count));
CHK(count == nsegments);
- OK(sg2_geometry_get_unique_primitives_with_unspecified_interface_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_unspecified_interface_count(geom, &count));
CHK(count == nsegments);
- OK(sg2_geometry_get_unique_primitives_with_merge_conflict_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_merge_conflict_count(geom, &count));
CHK(count == 0);
- OK(sg2_geometry_get_unique_primitives_with_properties_conflict_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_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(sg2_geometry_get_unique_vertices_count(geom, &count));
CHK(count == nvertices);
- OK(sg2_geometry_get_added_primitives_count(geom, &count));
+ OK(sg2_geometry_get_added_segments_count(geom, &count));
CHK(count == 5 * nsegments);
- OK(sg2_geometry_get_unique_primitives_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_count(geom, &count));
CHK(count == nsegments);
- OK(sg2_geometry_get_unique_primitives_with_unspecified_side_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_unspecified_side_count(geom, &count));
CHK(count == nsegments);
- OK(sg2_geometry_get_unique_primitives_with_unspecified_interface_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_unspecified_interface_count(geom, &count));
CHK(count == nsegments);
- OK(sg2_geometry_get_unique_primitives_with_merge_conflict_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_merge_conflict_count(geom, &count));
CHK(count == 0); /* merge failed but with a no-conflict status */
- OK(sg2_geometry_get_unique_primitives_with_properties_conflict_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_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 segments, then all of them */
add_geom_ctx.add_res = RES_OK;
OK(sg2_geometry_add(geom, nvertices, nsegments / 2, &callbacks, &ctx));
- OK(sg2_geometry_get_added_primitives_count(geom, &count));
+ OK(sg2_geometry_get_added_segments_count(geom, &count));
CHK(count == nsegments / 2);
OK(sg2_geometry_add(geom, nvertices, nsegments, &callbacks, &ctx));
CHK(add_geom_ctx.add_cpt == nsegments);
CHK(add_geom_ctx.merge_cpt == nsegments / 2);
add_geom_ctx.add_cpt = 0;
- OK(sg2_geometry_get_added_primitives_count(geom, &count));
+ OK(sg2_geometry_get_added_segments_count(geom, &count));
CHK(count == nsegments + nsegments / 2);
OK(sg2_geometry_get_unique_vertices_count(geom, &count));
CHK(count == nvertices);
- OK(sg2_geometry_get_unique_primitives_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_count(geom, &count));
CHK(count == nsegments);
- OK(sg2_geometry_get_unique_primitives_with_unspecified_side_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_unspecified_side_count(geom, &count));
CHK(count == 0); /* media where defined */
- OK(sg2_geometry_get_unique_primitives_with_unspecified_interface_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_unspecified_interface_count(geom, &count));
CHK(count == nsegments); /* interfaces where unspecified */
- OK(sg2_geometry_get_unique_primitives_with_merge_conflict_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_merge_conflict_count(geom, &count));
CHK(count == 0);
- OK(sg2_geometry_get_unique_primitives_with_properties_conflict_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_properties_conflict_count(geom, &count));
CHK(count == 0);
OK(sg2_geometry_dump_as_vtk(geom, stdout));
/* Second add was half duplicated, so numbering is shifted */
FOR_EACH(i, 0, nsegments) {
unsigned id;
- OK(sg2_geometry_get_unique_primitive_user_id(geom, i, &id));
+ OK(sg2_geometry_get_unique_segment_user_id(geom, i, &id));
CHK(i < nsegments / 2 ? id == i : id == i + nsegments / 2);
}
@@ -322,17 +322,17 @@ main(int argc, char** argv)
add_geom_ctx.add_cpt = 0;
OK(sg2_geometry_get_unique_vertices_count(geom, &count));
CHK(count == nvertices);
- OK(sg2_geometry_get_added_primitives_count(geom, &count));
+ OK(sg2_geometry_get_added_segments_count(geom, &count));
CHK(count == nsegments);
- OK(sg2_geometry_get_unique_primitives_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_count(geom, &count));
CHK(count == nsegments);
- OK(sg2_geometry_get_unique_primitives_with_unspecified_side_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_unspecified_side_count(geom, &count));
CHK(count == nsegments); /* media where unspecified */
- OK(sg2_geometry_get_unique_primitives_with_unspecified_interface_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_unspecified_interface_count(geom, &count));
CHK(count == nsegments); /* interfaces where unspecified */
- OK(sg2_geometry_get_unique_primitives_with_merge_conflict_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_merge_conflict_count(geom, &count));
CHK(count == 0);
- OK(sg2_geometry_get_unique_primitives_with_properties_conflict_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_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(sg2_geometry_get_unique_vertices_count(geom, &count));
CHK(count == nvertices);
- OK(sg2_geometry_get_added_primitives_count(geom, &count));
+ OK(sg2_geometry_get_added_segments_count(geom, &count));
CHK(count == 2 * nsegments);
- OK(sg2_geometry_get_unique_primitives_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_count(geom, &count));
CHK(count == nsegments);
- OK(sg2_geometry_get_unique_primitives_with_unspecified_side_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_unspecified_side_count(geom, &count));
CHK(count == 0); /* media where defined */
- OK(sg2_geometry_get_unique_primitives_with_unspecified_interface_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_unspecified_interface_count(geom, &count));
CHK(count == 0); /* interfaces where defined */
- OK(sg2_geometry_get_unique_primitives_with_merge_conflict_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_merge_conflict_count(geom, &count));
CHK(count == 0);
- OK(sg2_geometry_get_unique_primitives_with_properties_conflict_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_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(sg2_geometry_get_unique_vertices_count(geom, &count));
CHK(count == nvertices);
- OK(sg2_geometry_get_added_primitives_count(geom, &count));
+ OK(sg2_geometry_get_added_segments_count(geom, &count));
CHK(count == 3 * nsegments);
- OK(sg2_geometry_get_unique_primitives_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_count(geom, &count));
CHK(count == nsegments);
- OK(sg2_geometry_get_unique_primitives_with_unspecified_side_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_unspecified_side_count(geom, &count));
CHK(count == 0); /* media where defined */
- OK(sg2_geometry_get_unique_primitives_with_unspecified_interface_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_unspecified_interface_count(geom, &count));
CHK(count == 0); /* interfaces where defined */
- OK(sg2_geometry_get_unique_primitives_with_merge_conflict_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_merge_conflict_count(geom, &count));
CHK(count == nsegments);
- OK(sg2_geometry_get_unique_primitives_with_properties_conflict_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_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(sg2_geometry_get_unique_vertices_count(geom, &count));
CHK(count == nvertices);
- OK(sg2_geometry_get_added_primitives_count(geom, &count));
+ OK(sg2_geometry_get_added_segments_count(geom, &count));
CHK(count == 4 * nsegments);
- OK(sg2_geometry_get_unique_primitives_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_count(geom, &count));
CHK(count == nsegments);
- OK(sg2_geometry_get_unique_primitives_with_unspecified_side_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_unspecified_side_count(geom, &count));
CHK(count == 0); /* media where defined */
- OK(sg2_geometry_get_unique_primitives_with_unspecified_interface_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_unspecified_interface_count(geom, &count));
CHK(count == 0); /* interfaces where defined */
- OK(sg2_geometry_get_unique_primitives_with_merge_conflict_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_merge_conflict_count(geom, &count));
CHK(count == nsegments);
- OK(sg2_geometry_get_unique_primitives_with_properties_conflict_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_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(sg2_geometry_add(geom, nvertices, nsegments, &callbacks, &ctx));
- OK(sg2_geometry_get_unique_primitives_with_merge_conflict_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_merge_conflict_count(geom, &count));
CHK(count == 0);
OK(sg2_geometry_validate_properties(geom, validate, NULL));
- OK(sg2_geometry_get_unique_primitives_with_properties_conflict_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_properties_conflict_count(geom, &count));
CHK(count == 0);
OK(sg2_geometry_dump_as_obj(geom, stdout, SG2_OBJ_DUMP_ALL));
OK(sg2_geometry_validate_properties(geom, validate, NULL));
- OK(sg2_geometry_get_unique_primitives_with_properties_conflict_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_properties_conflict_count(geom, &count));
CHK(count == 0);
OK(sg2_geometry_validate_properties(geom, validate2, NULL));
- OK(sg2_geometry_get_unique_primitives_with_properties_conflict_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_properties_conflict_count(geom, &count));
CHK(count == nsegments / 2);
OK(sg2_geometry_ref_put(geom));
diff --git a/src/test_sg2_many_enclosures.c b/src/test_sg2_many_enclosures.c
@@ -86,11 +86,11 @@ main(int argc, char** argv)
}
circle_release(&ctx);
- OK(sg2_geometry_get_unique_primitives_with_merge_conflict_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_merge_conflict_count(geom, &count));
CHK(count == 0);
- OK(sg2_geometry_get_unique_primitives_with_unspecified_interface_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_unspecified_interface_count(geom, &count));
CHK(count == 0);
- OK(sg2_geometry_get_unique_primitives_with_unspecified_side_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_unspecified_side_count(geom, &count));
CHK(count == 0);
OK(sg2_geometry_dump_as_obj(geom, stdout, SG2_OBJ_DUMP_ALL));
diff --git a/src/test_sg2_many_segments.c b/src/test_sg2_many_segments.c
@@ -67,11 +67,11 @@ main(int argc, char** argv)
}
circle_release(&ctx);
- OK(sg2_geometry_get_unique_primitives_with_merge_conflict_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_merge_conflict_count(geom, &count));
CHK(count == 0);
- OK(sg2_geometry_get_unique_primitives_with_unspecified_interface_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_unspecified_interface_count(geom, &count));
CHK(count == 0);
- OK(sg2_geometry_get_unique_primitives_with_unspecified_side_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_unspecified_side_count(geom, &count));
CHK(count == 0);
OK(sg2_geometry_dump_as_obj(geom, stdout, SG2_OBJ_DUMP_ALL));
diff --git a/src/test_sg2_some_enclosures.c b/src/test_sg2_some_enclosures.c
@@ -86,11 +86,11 @@ main(int argc, char** argv)
}
circle_release(&ctx);
- OK(sg2_geometry_get_unique_primitives_with_merge_conflict_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_merge_conflict_count(geom, &count));
CHK(count == 0);
- OK(sg2_geometry_get_unique_primitives_with_unspecified_interface_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_unspecified_interface_count(geom, &count));
CHK(count == 0);
- OK(sg2_geometry_get_unique_primitives_with_unspecified_side_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_unspecified_side_count(geom, &count));
CHK(count == 0);
OK(sg2_geometry_dump_as_c_code(geom, stdout, "some_enclosures",
SG2_C_DUMP_CONST | SG2_C_DUMP_STATIC));
diff --git a/src/test_sg2_some_segments.c b/src/test_sg2_some_segments.c
@@ -68,11 +68,11 @@ main(int argc, char** argv)
}
circle_release(&ctx);
- OK(sg2_geometry_get_unique_primitives_with_merge_conflict_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_merge_conflict_count(geom, &count));
CHK(count == 0);
- OK(sg2_geometry_get_unique_primitives_with_unspecified_interface_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_unspecified_interface_count(geom, &count));
CHK(count == 0);
- OK(sg2_geometry_get_unique_primitives_with_unspecified_side_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_unspecified_side_count(geom, &count));
CHK(count == 0);
OK(sg2_geometry_dump_as_c_code(geom, stdout, "some_segments",
diff --git a/src/test_sg2_square_behind_square.c b/src/test_sg2_square_behind_square.c
@@ -82,11 +82,11 @@ main(int argc, char** argv)
/* Second square (front: 0, back: 1), right-handed normal outside */
OK(sg2_geometry_add(geom, nvertices, nsegments, &callbacks, &ctx));
- OK(sg2_geometry_get_unique_primitives_with_merge_conflict_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_merge_conflict_count(geom, &count));
CHK(count == 0);
- OK(sg2_geometry_get_unique_primitives_with_unspecified_interface_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_unspecified_interface_count(geom, &count));
CHK(count == 0);
- OK(sg2_geometry_get_unique_primitives_with_unspecified_side_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_unspecified_side_count(geom, &count));
CHK(count == 0);
OK(sg2_geometry_dump_as_c_code(geom, stdout, "square_behind_square_2",
SG2_C_DUMP_CONST | SG2_C_DUMP_STATIC));
@@ -99,11 +99,11 @@ main(int argc, char** argv)
/* Third square (front: 1, back: 0), right-handed normal outside */
OK(sg2_geometry_add(geom, nvertices, nsegments, &callbacks, &ctx));
- OK(sg2_geometry_get_unique_primitives_with_merge_conflict_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_merge_conflict_count(geom, &count));
CHK(count == 0);
- OK(sg2_geometry_get_unique_primitives_with_unspecified_interface_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_unspecified_interface_count(geom, &count));
CHK(count == 0);
- OK(sg2_geometry_get_unique_primitives_with_unspecified_side_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_unspecified_side_count(geom, &count));
CHK(count == 0);
OK(sg2_geometry_dump_as_c_code(geom, stdout, "square_behind_square_3",
SG2_C_DUMP_CONST | SG2_C_DUMP_STATIC));
diff --git a/src/test_sg2_square_in_square.c b/src/test_sg2_square_in_square.c
@@ -73,11 +73,11 @@ main(int argc, char** argv)
/* Second square (front: 0, back: 1), right-handed normal inside */
OK(sg2_geometry_add(geom, nvertices, nsegments, &callbacks, &ctx));
- OK(sg2_geometry_get_unique_primitives_with_merge_conflict_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_merge_conflict_count(geom, &count));
CHK(count == 0);
- OK(sg2_geometry_get_unique_primitives_with_unspecified_interface_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_unspecified_interface_count(geom, &count));
CHK(count == 0);
- OK(sg2_geometry_get_unique_primitives_with_unspecified_side_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_unspecified_side_count(geom, &count));
CHK(count == 0);
OK(sg2_geometry_dump_as_c_code(geom, stdout, "square_in_square_2",
SG2_C_DUMP_CONST | SG2_C_DUMP_STATIC));
@@ -92,11 +92,11 @@ main(int argc, char** argv)
/* Third square (front: 0, back: 1), right-handed normal inside */
OK(sg2_geometry_add(geom, nvertices, nsegments, &callbacks, &ctx));
- OK(sg2_geometry_get_unique_primitives_with_merge_conflict_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_merge_conflict_count(geom, &count));
CHK(count == 0);
- OK(sg2_geometry_get_unique_primitives_with_unspecified_interface_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_unspecified_interface_count(geom, &count));
CHK(count == 0);
- OK(sg2_geometry_get_unique_primitives_with_unspecified_side_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_unspecified_side_count(geom, &count));
CHK(count == 0);
OK(sg2_geometry_dump_as_c_code(geom, stdout, "square_in_square_3",
SG2_C_DUMP_CONST | SG2_C_DUMP_STATIC));
diff --git a/src/test_sg2_square_on_square.c b/src/test_sg2_square_on_square.c
@@ -83,11 +83,11 @@ main(int argc, char** argv)
/* Third square (front: 2, back: 1), right-handed normal inside */
OK(sg2_geometry_add(geom, nvertices, nsegments, &callbacks, &ctx));
- OK(sg2_geometry_get_unique_primitives_with_merge_conflict_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_merge_conflict_count(geom, &count));
CHK(count == 0);
- OK(sg2_geometry_get_unique_primitives_with_unspecified_interface_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_unspecified_interface_count(geom, &count));
CHK(count == 0);
- OK(sg2_geometry_get_unique_primitives_with_unspecified_side_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_unspecified_side_count(geom, &count));
CHK(count == 0);
OK(sg2_geometry_dump_as_c_code(geom, stdout, "square_on_square",
SG2_C_DUMP_CONST | SG2_C_DUMP_STATIC));
diff --git a/src/test_sg2_unspecified_properties.c b/src/test_sg2_unspecified_properties.c
@@ -52,17 +52,17 @@ main(int argc, char** argv)
ctx.back_media = medium1;
ctx.intface = property;
OK(sg2_geometry_add(geom, nvertices, nsegments, &callbacks, &ctx));
- OK(sg2_geometry_get_unique_primitives_with_unspecified_side_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_unspecified_side_count(geom, &count));
CHK(count == nsegments);
- OK(sg2_geometry_get_added_primitives_count(geom, &count));
+ OK(sg2_geometry_get_added_segments_count(geom, &count));
CHK(count == nsegments);
/* Add same geometry with no properties on front/intface */
callbacks.get_properties = get_properties;
OK(sg2_geometry_add(geom, nvertices, nsegments, &callbacks, &ctx));
- OK(sg2_geometry_get_unique_primitives_with_unspecified_side_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_unspecified_side_count(geom, &count));
CHK(count == nsegments);
- OK(sg2_geometry_get_added_primitives_count(geom, &count));
+ OK(sg2_geometry_get_added_segments_count(geom, &count));
CHK(count == 2 * nsegments);
OK(sg2_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 : SG2_UNSPECIFIED_PROPERTY;
OK(sg2_geometry_add(geom, nvertices, nsegments, &callbacks, &ctx));
- OK(sg2_geometry_get_unique_primitives_with_unspecified_side_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_unspecified_side_count(geom, &count));
CHK(count == nsegments / 2);
OK(sg2_geometry_get_unique_vertices_count(geom, &count));
CHK(count == nvertices);
- OK(sg2_geometry_get_added_primitives_count(geom, &count));
+ OK(sg2_geometry_get_added_segments_count(geom, &count));
CHK(count == 3 * nsegments);
- OK(sg2_geometry_get_unique_primitives_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_count(geom, &count));
CHK(count == nsegments);
FOR_EACH(i, 0, count) {
unsigned prop[SG2_PROP_TYPES_COUNT__];
- OK(sg2_geometry_get_unique_primitive_properties(geom, i, prop));
+ OK(sg2_geometry_get_unique_segment_properties(geom, i, prop));
CHK(prop[SG2_FRONT] == ((i % 2) ? 0 : SG2_UNSPECIFIED_PROPERTY)
&& prop[SG2_BACK] == 1
&& prop[SG2_INTFACE] == ((i % 2) ? 0 : SG2_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(sg2_geometry_add(geom, nvertices, nsegments, &callbacks, &ctx));
- OK(sg2_geometry_get_unique_primitives_with_unspecified_side_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_unspecified_side_count(geom, &count));
CHK(count == nsegments / 2);
- OK(sg2_geometry_get_added_primitives_count(geom, &count));
+ OK(sg2_geometry_get_added_segments_count(geom, &count));
CHK(count == 4 * nsegments);
OK(sg2_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) ? SG2_UNSPECIFIED_PROPERTY : 0;
OK(sg2_geometry_add(geom, nvertices, nsegments, &callbacks, &ctx));
- OK(sg2_geometry_get_unique_primitives_with_unspecified_side_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_unspecified_side_count(geom, &count));
CHK(count == 0);
OK(sg2_geometry_get_unique_vertices_count(geom, &count));
CHK(count == nvertices);
- OK(sg2_geometry_get_added_primitives_count(geom, &count));
+ OK(sg2_geometry_get_added_segments_count(geom, &count));
CHK(count == 5 * nsegments);
- OK(sg2_geometry_get_unique_primitives_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_count(geom, &count));
CHK(count == nsegments);
FOR_EACH(i, 0, count) {
unsigned prop[SG2_PROP_TYPES_COUNT__];
- OK(sg2_geometry_get_unique_primitive_properties(geom, i, prop));
+ OK(sg2_geometry_get_unique_segment_properties(geom, i, prop));
CHK(prop[SG2_FRONT] == 0 && prop[SG2_BACK] == 1
&& prop[SG2_INTFACE] == 0);
}
@@ -126,11 +126,11 @@ main(int argc, char** argv)
FOR_EACH(i, 0, sizeof(property) / sizeof(*property))
property[i] = (i % 2);
OK(sg2_geometry_add(geom, nvertices, nsegments, &callbacks, &ctx));
- OK(sg2_geometry_get_unique_primitives_with_merge_conflict_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_merge_conflict_count(geom, &count));
CHK(count == nsegments / 2);
- OK(sg2_geometry_get_unique_primitives_with_properties_conflict_count(geom, &count));
+ OK(sg2_geometry_get_unique_segments_with_properties_conflict_count(geom, &count));
CHK(count == 0);
- OK(sg2_geometry_get_added_primitives_count(geom, &count));
+ OK(sg2_geometry_get_added_segments_count(geom, &count));
CHK(count == 6 * nsegments);
OK(sg2_geometry_ref_put(geom));
