commit 424fc386ebc694abc21faf113cf9ed5aaf228898
parent dd8bc3a16870a0d8a8176cb0746a8ee6c7bbaf76
Author: Christophe Coustet <christophe.coustet@meso-star.com>
Date: Fri, 6 Jun 2025 10:42:07 +0200
Fix API
Put enum members in CAPITAL
Diffstat:
10 files changed, 119 insertions(+), 119 deletions(-)
diff --git a/src/scad.c b/src/scad.c
@@ -509,7 +509,7 @@ scad_stl_sort_orientation
res = RES_BAD_ARG;
goto error;
}
- if(coord_n == 0 || orientation == Scad_keep_normals_unchanged) {
+ if(coord_n == 0 || orientation == SCAD_KEEP_NORMALS_UNCHANGED) {
goto exit;
}
@@ -534,7 +534,7 @@ scad_stl_sort_orientation
"Triangles duplicates found when sorting out normals (%u / %u) in set '%s'.\n",
tcount_in - utcount_in, tcount_in, set_name);
}
- if(orientation == Scad_force_normals_outward)
+ if(orientation == SCAD_FORCE_NORMALS_OUTWARD)
convention = SENC3D_CONVENTION_NORMAL_BACK | SENC3D_CONVENTION_NORMAL_OUTSIDE;
else
convention = SENC3D_CONVENTION_NORMAL_BACK | SENC3D_CONVENTION_NORMAL_INSIDE;
@@ -642,7 +642,7 @@ scad_stl_sort_orientation
str_set(&dbl_name, set_name);
str_insert(&dbl_name, idx - 4, "_double_sided_triangles");
r = scad_stl_data_write(&dblsided, str_cget(&dbl_name),
- Scad_keep_normals_unchanged, 0);
+ SCAD_KEEP_NORMALS_UNCHANGED, 0);
if(r == RES_OK) {
log_error(get_device(),
"Saved double sided triangles to file '%s'.\n",
diff --git a/src/scad.h b/src/scad.h
@@ -47,51 +47,51 @@ struct scad_geometry; /* Wrapping of dimTags gmsh description */
/* Verbosity levels */
enum scad_verbosity_levels {
- scad_verbosity_fatal_errors = 0,
- Scad_verbosity_errors = 1,
- Scad_verbosity_warnings = 2,
- Scad_verbosity_direct = 3,
- Scad_verbosity_information = 4,
- Scad_verbosity_status = 5,
- Scad_verbosity_debug = 99
+ SCAD_VERBOSITY_FATAL_ERRORS = 0,
+ SCAD_VERBOSITY_ERRORS = 1,
+ SCAD_VERBOSITY_WARNINGS = 2,
+ SCAD_VERBOSITY_DIRECT = 3,
+ SCAD_VERBOSITY_INFORMATION = 4,
+ SCAD_VERBOSITY_STATUS = 5,
+ SCAD_VERBOSITY_DEBUG = 99
};
/* Mesh algorithms */
enum scad_mesh_algorithm {
- Scad_meshAdapt = 1,
- Scad_Automatic = 2, /* Delaunay on planes, meshAdapt elsewhere */
- Scad_Initial_Mesh_Only = 3, /* Avoid new point creation */
- Scad_Delaunay = 5,
- Scad_frontal_Delaunay = 6,
- Scad_Quasi_Structured = 11
+ SCAD_MESHADAPT = 1,
+ SCAD_AUTOMATIC = 2, /* Delaunay on planes, meshAdapt elsewhere */
+ SCAD_INITIAL_MESH_ONLY = 3, /* Avoid new point creation */
+ SCAD_DELAUNAY = 5,
+ SCAD_FRONTAL_DELAUNAY = 6,
+ SCAD_QUASI_STRUCTURED = 11
};
enum scad_sizes_extend_from_boundary {
- Scad_never = 0,
- Scad_surfaces_and_volumes = 1,
- Scad_surfaces_and_volumes_smallest = 2,
- Scad_surfaces_only = -2,
- Scad_volumes_only = -3
+ SCAD_NEVER = 0,
+ SCAD_SURFACES_AND_VOLUMES = 1,
+ SCAD_SURFACES_AND_VOLUMES_SMALLEST = 2,
+ SCAD_SURFACES_ONLY = -2,
+ SCAD_VOLUMES_ONLY = -3
};
enum scad_stl_solids {
- Scad_single_solid = 0,
- Scad_one_solid_per_surface = 1,
- Scad_one_solid_per_physical_surface = 2
+ SCAD_SINGLE_SOLID = 0,
+ SCAD_ONE_SOLID_PER_SURFACE = 1,
+ SCAD_ONE_SOLID_PER_PHYSICAL_SURFACE = 2
};
enum scad_log_refcounting {
- Scad_log_none = 0,
- Scad_log_dimTags_only_undeleted = BIT(0),
- Scad_log_dimTags_all = BIT(1),
- Scad_log_geometry = BIT(2)
+ SCAD_LOG_NONE = 0,
+ SCAD_LOG_DIMTAGS_ONLY_UNDELETED = BIT(0),
+ SCAD_LOG_DIMTAGS_ALL = BIT(1),
+ SCAD_LOG_GEOMETRY = BIT(2)
};
/* A type to specify the kind of mesh size specification set by a call to the
* scad_geometries_set_mesh_size_modifier API call */
enum scad_size_modifier_type {
- Scad_absolute_size,
- Scad_size_factor
+ SCAD_ABSOLUTE_SIZE,
+ SCAD_SIZE_FACTOR
};
/* A type to specify options for the gmsh library */
@@ -125,33 +125,33 @@ struct scad_options {
#define SCAD_DEFAULT_OPTIONS__ \
{ { 1, 36, 1e+22, 1e-6, 1, 1, 1, \
- Scad_frontal_Delaunay, \
- Scad_surfaces_and_volumes, \
- Scad_one_solid_per_physical_surface }, \
- { Scad_verbosity_errors, 1 }, \
+ SCAD_FRONTAL_DELAUNAY, \
+ SCAD_SURFACES_AND_VOLUMES, \
+ SCAD_ONE_SOLID_PER_PHYSICAL_SURFACE }, \
+ { SCAD_VERBOSITY_ERRORS, 1 }, \
{ 1 }, \
- { 0, 0, Scad_log_none, 0 } \
+ { 0, 0, SCAD_LOG_NONE, 0 } \
}
static const struct scad_options SCAD_DEFAULT_OPTIONS = SCAD_DEFAULT_OPTIONS__;
/* A type to specify what to swap in geometries_swap calls */
enum scad_swap_elements {
- Scad_swap_name = BIT(0),
- Scad_swap_geometry = BIT(1)
+ SCAD_SWAP_NAME = BIT(0),
+ SCAD_SWAP_GEOMETRY = BIT(1)
};
/* A type to specify normals' orientation when writing STL files. */
enum scad_normals_orientation {
- Scad_keep_normals_unchanged, /* The only one allowed with non closed shapes */
- Scad_force_normals_outward,
- Scad_force_normals_inward
+ SCAD_KEEP_NORMALS_UNCHANGED, /* The only one allowed with non closed shapes */
+ SCAD_FORCE_NORMALS_OUTWARD,
+ SCAD_FORCE_NORMALS_INWARD
};
/* A type to specify how partitioning is done. */
enum scad_partition_flags {
- Scad_allow_overlapping = BIT(0),
- Scad_dump_on_overlapping_error = BIT(1)
+ SCAD_ALLOW_OVERLAPPING = BIT(0),
+ SCAD_DUMP_ON_OVERLAPPING_ERROR = BIT(1)
};
BEGIN_DECLS
diff --git a/src/scad_device.c b/src/scad_device.c
@@ -97,8 +97,8 @@ device_release(struct scad_device* dev)
option = dev->options.Misc.LogRefCounting;
empty = htable_geometries_is_empty(&dev->allgeom);
log_type = empty ? LOG_OUTPUT : LOG_WARNING;
- log = (option & Scad_log_dimTags_all)
- || (!empty && (option & Scad_log_dimTags_only_undeleted));
+ log = (option & SCAD_LOG_DIMTAGS_ALL)
+ || (!empty && (option & SCAD_LOG_DIMTAGS_ONLY_UNDELETED));
dev->log = log;
dev->log_type = log_type;
@@ -218,7 +218,7 @@ device_register_tags
{
res_T res = RES_OK;
struct scad_device* dev = get_device();
- int log = (dev->options.Misc.LogRefCounting & Scad_log_dimTags_all);
+ int log = (dev->options.Misc.LogRefCounting & SCAD_LOG_DIMTAGS_ALL);
ASSERT(geom);
@@ -355,7 +355,7 @@ do_device_tags_ref_get
res_T res = RES_OK;
size_t i;
struct scad_device* dev = get_device();
- int log = (dev->options.Misc.LogRefCounting & Scad_log_dimTags_all);
+ int log = (dev->options.Misc.LogRefCounting & SCAD_LOG_DIMTAGS_ALL);
enum log_type log_type = dev->log_type;
ASSERT(dimTags || count == 0);
@@ -597,7 +597,7 @@ scad_initialize
g_device->need_synchro = g_device->options.Misc.DebugOpenCascadeSync;
g_device->verbose = verbose;
g_device->log_type = LOG_OUTPUT;
- g_device->log = (g_device->options.Misc.LogRefCounting != Scad_log_none);
+ g_device->log = (g_device->options.Misc.LogRefCounting != SCAD_LOG_NONE);
htable_names_init(allocator, &g_device->geometry_names);
htable_geometries_init(allocator, &g_device->allgeom);
htable_tags2desc_init(allocator, &g_device->tags2desc[0]);
@@ -635,8 +635,8 @@ scad_finalize
empty = htable_geometries_is_empty(&dev->allgeom);
log_type = empty ? LOG_OUTPUT : LOG_WARNING;
- log = (option & Scad_log_dimTags_all)
- || (!empty && (option & Scad_log_dimTags_only_undeleted));
+ log = (option & SCAD_LOG_DIMTAGS_ALL)
+ || (!empty && (option & SCAD_LOG_DIMTAGS_ONLY_UNDELETED));
if(log) {
logger_print(dev->logger, log_type,
"Finalizing scad; undeleted tags will be automatically unregistered.\n");
@@ -716,7 +716,7 @@ scad_set_options
/* Update logging policy */
dev->log
- = (dev->options.Misc.LogRefCounting & Scad_log_dimTags_all);
+ = (dev->options.Misc.LogRefCounting & SCAD_LOG_DIMTAGS_ALL);
exit:
return res;
diff --git a/src/scad_geometry.c b/src/scad_geometry.c
@@ -156,7 +156,7 @@ geometry_create
ERR(geom_set_name(geom, name));
dev->need_synchro = 1;
- if(dev->options.Misc.LogRefCounting & Scad_log_geometry) {
+ if(dev->options.Misc.LogRefCounting & SCAD_LOG_GEOMETRY) {
if(str_is_empty(&geom->name)) {
logger_print(dev->logger, dev->log_type,
"Creating unnamed geometry %p (count set to 1).\n", (void*)geom);
@@ -435,7 +435,7 @@ scad_geometry_ref_get
ERR(check_device(FUNC_NAME));
ref_get(&geom->ref);
- if(dev->options.Misc.LogRefCounting & Scad_log_geometry) {
+ if(dev->options.Misc.LogRefCounting & SCAD_LOG_GEOMETRY) {
if(str_is_empty(&geom->name)) {
logger_print(dev->logger, dev->log_type,
"Getting a reference on unnamed geometry %p (count set to %lu).\n",
@@ -463,7 +463,7 @@ scad_geometry_ref_put
if(!geom) return RES_BAD_ARG;
ERR(check_device(FUNC_NAME));
- if(dev->options.Misc.LogRefCounting & Scad_log_geometry) {
+ if(dev->options.Misc.LogRefCounting & SCAD_LOG_GEOMETRY) {
if(str_is_empty(&geom->name)) {
logger_print(dev->logger, dev->log_type,
"Putting a reference on unnamed geometry %p (count set to %lu).\n",
@@ -506,8 +506,8 @@ scad_scene_clear
htable_geometries_end(&tmp, &end);
empty = htable_geometries_is_empty(&dev->allgeom);
log_type = empty ? LOG_OUTPUT : LOG_WARNING;
- log = (option & Scad_log_dimTags_all)
- || (!empty && (option & Scad_log_dimTags_only_undeleted));
+ log = (option & SCAD_LOG_DIMTAGS_ALL)
+ || (!empty && (option & SCAD_LOG_DIMTAGS_ONLY_UNDELETED));
SWAP(int, dev->log, log);
SWAP(enum log_type, dev->log_type, log_type);
if(dev->log) {
@@ -736,8 +736,8 @@ error:
res_T
scad_geometry_get_closest_point
(struct scad_geometry* geom,
- const double* from,
- double* closest,
+ const double from[3],
+ double closest[3],
double* closest_distance)
{
res_T res = RES_OK;
@@ -1591,7 +1591,7 @@ scad_geometries_common_boundaries
struct scad_geometry* geom = NULL;
struct mem_allocator* allocator = NULL;
struct scad_device* dev = get_device();
- int log = (dev->options.Misc.LogRefCounting & Scad_log_dimTags_all);
+ int log = (dev->options.Misc.LogRefCounting & SCAD_LOG_DIMTAGS_ALL);
enum log_type log_type = dev->log_type;
size_t i;
struct str msg;
@@ -1763,7 +1763,7 @@ scad_geometry_extrude
int ierr = 0;
struct scad_geometry* extrude_geom = NULL;
struct scad_device* dev = get_device();
- int log = (dev->options.Misc.LogRefCounting & Scad_log_dimTags_all);
+ int log = (dev->options.Misc.LogRefCounting & SCAD_LOG_DIMTAGS_ALL);
enum log_type log_type = dev->log_type;
struct mem_allocator* allocator = NULL;
struct str msg;
@@ -2094,8 +2094,8 @@ scad_geometries_partition
int dont_call_fragment = 0;
char* overlap = NULL;
const int invalid_flags =
- ~(Scad_allow_overlapping | Scad_dump_on_overlapping_error);
- const int dump_overlapping_err = flags & Scad_dump_on_overlapping_error;
+ ~(SCAD_ALLOW_OVERLAPPING | SCAD_DUMP_ON_OVERLAPPING_ERROR);
+ const int dump_overlapping_err = flags & SCAD_DUMP_ON_OVERLAPPING_ERROR;
static size_t err_cpt = 0;
struct str tmp;
@@ -2147,7 +2147,7 @@ scad_geometries_partition
get_device()->need_synchro = 1;
/* Check first if there was an overlapping problem */
- if(!(flags & Scad_allow_overlapping)) {
+ if(!(flags & SCAD_ALLOW_OVERLAPPING)) {
/* No overlapping means that each tag in geometries is translated into a
* single tag in map */
size_t ov = 0;
@@ -2185,7 +2185,7 @@ scad_geometries_partition
str_printf(&tmp, "unamed_partition_error_%lu_%lu",
err_cpt, (long unsigned)item_cpt++);
tmp_err =
- scad_stl_export(g, str_cget(&tmp), Scad_keep_normals_unchanged, 0);
+ scad_stl_export(g, str_cget(&tmp), SCAD_KEEP_NORMALS_UNCHANGED, 0);
if(tmp_err == RES_OK) {
log_error(get_device(),
"Unnamed geometry '%p' overlapping (dumped in '%s).\n",
@@ -2197,7 +2197,7 @@ scad_geometries_partition
str_printf(&tmp, "%s_partition_error_%lu_%lu",
str_cget(&g->name), err_cpt, (long unsigned)item_cpt++);
tmp_err =
- scad_stl_export(g, str_cget(&tmp), Scad_keep_normals_unchanged, 0);
+ scad_stl_export(g, str_cget(&tmp), SCAD_KEEP_NORMALS_UNCHANGED, 0);
if(tmp_err == RES_OK) {
log_error(get_device(),
"Geometry '%s' overlapping (dumped in '%s).\n",
@@ -2349,8 +2349,8 @@ scad_geometries_swap
}
allocator = dev->allocator;
- if(flags & Scad_swap_name) str_init(allocator, &tmp);
- if(flags & Scad_swap_geometry && dev->log) str_init(allocator, &msg);
+ if(flags & SCAD_SWAP_NAME) str_init(allocator, &tmp);
+ if(flags & SCAD_SWAP_GEOMETRY && dev->log) str_init(allocator, &msg);
for(i = 0; i < count; i++) {
struct scad_geometry *g1 = pool1[i], *g2 = pool2[i];
size_t c1 = g1->gmsh_dimTags_n, c2 = g2->gmsh_dimTags_n;
@@ -2358,7 +2358,7 @@ scad_geometries_swap
if(pool1[i] == pool2[i])
continue;
/* Swap content according to flags. Don't swap refcount! */
- if(flags & Scad_swap_name) {
+ if(flags & SCAD_SWAP_NAME) {
if(dev->log) {
if(str_is_empty(&g1->name) && str_is_empty(&g2->name)) {
/* Do nothing */
@@ -2396,7 +2396,7 @@ scad_geometries_swap
ERR(str_copy(&g2->name, &tmp));
}
}
- if(flags & Scad_swap_geometry) {
+ if(flags & SCAD_SWAP_GEOMETRY) {
/* Swap in tag2geom tables */
size_t n;
if(dev->log) {
@@ -2457,8 +2457,8 @@ scad_geometries_swap
}
exit:
- if(flags & Scad_swap_name) str_release(&tmp);
- if(flags & Scad_swap_geometry && dev->log) str_release(&msg);
+ if(flags & SCAD_SWAP_NAME) str_release(&tmp);
+ if(flags & SCAD_SWAP_GEOMETRY && dev->log) str_release(&msg);
return res;
error:
goto exit;
@@ -2479,7 +2479,7 @@ scad_geometry_boundary
struct scad_geometry* geom = NULL;
struct mem_allocator* allocator = NULL;
struct scad_device* dev = get_device();
- int log = (dev->options.Misc.LogRefCounting & Scad_log_dimTags_all);
+ int log = (dev->options.Misc.LogRefCounting & SCAD_LOG_DIMTAGS_ALL);
enum log_type log_type = dev->log_type;
size_t i;
struct str msg;
@@ -2654,7 +2654,7 @@ scad_geometry_normal
size_t sz = 0;
struct scad_geometry* out = NULL;
struct scad_device* dev = get_device();
- int log = (dev->options.Misc.LogRefCounting & Scad_log_dimTags_all);
+ int log = (dev->options.Misc.LogRefCounting & SCAD_LOG_DIMTAGS_ALL);
enum log_type log_type = dev->log_type;
struct mem_allocator* allocator = NULL;
double* coord = NULL;
@@ -2810,7 +2810,7 @@ scad_geometries_set_mesh_size_modifier
ERR(check_device(FUNC_NAME));
- if(type == Scad_absolute_size) modifier = -modifier;
+ if(type == SCAD_ABSOLUTE_SIZE) modifier = -modifier;
ERR(gather_tags_recursive(geometries, geometries_count, 0, tagout, tagoutn));
for(dim = 0; dim < 4; dim++) {
for(i = 0; i < tagoutn[dim]; i += 2) {
diff --git a/src/test_api.c b/src/test_api.c
@@ -267,25 +267,25 @@ main(int argc, char* argv[])
BAD(scad_stl_get_data(NULL, NULL));
BAD(scad_stl_get_data(geom2, NULL));
OK(scad_stl_get_data(geom2, &trg));
- BAD(scad_stl_data_write(NULL, NULL, Scad_keep_normals_unchanged, 0));
- BAD(scad_stl_data_write(&trg, NULL, Scad_keep_normals_unchanged, 0));
- BAD(scad_stl_data_write(NULL, "/tmp/test", Scad_keep_normals_unchanged, 0));
- OK(scad_stl_data_write(&trg, "/tmp/test", Scad_keep_normals_unchanged, 0));
- OK(scad_stl_data_write(&trg, "/tmp/test", Scad_keep_normals_unchanged, 1));
+ BAD(scad_stl_data_write(NULL, NULL, SCAD_KEEP_NORMALS_UNCHANGED, 0));
+ BAD(scad_stl_data_write(&trg, NULL, SCAD_KEEP_NORMALS_UNCHANGED, 0));
+ BAD(scad_stl_data_write(NULL, "/tmp/test", SCAD_KEEP_NORMALS_UNCHANGED, 0));
+ OK(scad_stl_data_write(&trg, "/tmp/test", SCAD_KEEP_NORMALS_UNCHANGED, 0));
+ OK(scad_stl_data_write(&trg, "/tmp/test", SCAD_KEEP_NORMALS_UNCHANGED, 1));
darray_double_release(&trg);
- BAD(scad_stl_export(NULL, NULL, Scad_keep_normals_unchanged, 0));
- BAD(scad_stl_export(geom2, NULL, Scad_keep_normals_unchanged, 0)); /* geom2 has no name */
- OK(scad_stl_export(geom2, "/tmp/test", Scad_keep_normals_unchanged, 0));
- OK(scad_stl_export(geom2, "/tmp/test", Scad_force_normals_inward, 1));
- OK(scad_stl_export(geom1, NULL, Scad_force_normals_outward, 1));
-
- BAD(scad_stl_export_split(NULL, NULL, Scad_keep_normals_unchanged, 0));
- BAD(scad_stl_export_split(geom2, NULL, Scad_keep_normals_unchanged, 0)); /* geom2 has no name */
- OK(scad_stl_export_split(geom2, "/tmp/test", Scad_keep_normals_unchanged, 0));
- OK(scad_stl_export_split(geom2, "/tmp/testb", Scad_keep_normals_unchanged, 1));
- OK(scad_stl_export_split(geom1, NULL, Scad_keep_normals_unchanged, 0));
- OK(scad_stl_export_split(geom1, "different_names", Scad_keep_normals_unchanged, 1));
+ BAD(scad_stl_export(NULL, NULL, SCAD_KEEP_NORMALS_UNCHANGED, 0));
+ BAD(scad_stl_export(geom2, NULL, SCAD_KEEP_NORMALS_UNCHANGED, 0)); /* geom2 has no name */
+ OK(scad_stl_export(geom2, "/tmp/test", SCAD_KEEP_NORMALS_UNCHANGED, 0));
+ OK(scad_stl_export(geom2, "/tmp/test", SCAD_FORCE_NORMALS_INWARD, 1));
+ OK(scad_stl_export(geom1, NULL, SCAD_FORCE_NORMALS_OUTWARD, 1));
+
+ BAD(scad_stl_export_split(NULL, NULL, SCAD_KEEP_NORMALS_UNCHANGED, 0));
+ BAD(scad_stl_export_split(geom2, NULL, SCAD_KEEP_NORMALS_UNCHANGED, 0)); /* geom2 has no name */
+ OK(scad_stl_export_split(geom2, "/tmp/test", SCAD_KEEP_NORMALS_UNCHANGED, 0));
+ OK(scad_stl_export_split(geom2, "/tmp/testb", SCAD_KEEP_NORMALS_UNCHANGED, 1));
+ OK(scad_stl_export_split(geom1, NULL, SCAD_KEEP_NORMALS_UNCHANGED, 0));
+ OK(scad_stl_export_split(geom1, "different_names", SCAD_KEEP_NORMALS_UNCHANGED, 1));
BAD(scad_geometry_get_name(NULL, &name));
BAD(scad_geometry_get_name(geom1, NULL));
diff --git a/src/test_export.c b/src/test_export.c
@@ -51,23 +51,23 @@ main(int argc, char* argv[])
OK(scad_scene_mesh());
/* Do not define a volume */
- BAD(scad_stl_export(rectangle, "not-a-volume.stl", Scad_force_normals_outward, 0));
+ BAD(scad_stl_export(rectangle, "not-a-volume.stl", SCAD_FORCE_NORMALS_OUTWARD, 0));
- OK(scad_stl_export(rectangle, NULL, Scad_keep_normals_unchanged, 0));
- OK(scad_stl_export(rectangle, "bin_rectangle", Scad_keep_normals_unchanged, 1));
+ OK(scad_stl_export(rectangle, NULL, SCAD_KEEP_NORMALS_UNCHANGED, 0));
+ OK(scad_stl_export(rectangle, "bin_rectangle", SCAD_KEEP_NORMALS_UNCHANGED, 1));
- OK(scad_stl_export(cube, NULL, Scad_force_normals_outward, 0));
- OK(scad_stl_export(cube, "bin_cube", Scad_force_normals_outward, 1));
+ OK(scad_stl_export(cube, NULL, SCAD_FORCE_NORMALS_OUTWARD, 0));
+ OK(scad_stl_export(cube, "bin_cube", SCAD_FORCE_NORMALS_OUTWARD, 1));
- OK(scad_stl_export(fused, NULL, Scad_force_normals_outward, 0));
- OK(scad_stl_export(fused, "bin_fused", Scad_force_normals_outward, 1));
+ OK(scad_stl_export(fused, NULL, SCAD_FORCE_NORMALS_OUTWARD, 0));
+ OK(scad_stl_export(fused, "bin_fused", SCAD_FORCE_NORMALS_OUTWARD, 1));
/* New meshing algorithm */
- OK(scad_geometries_set_mesh_algorithm(geoms, 2, Scad_Quasi_Structured));
+ OK(scad_geometries_set_mesh_algorithm(geoms, 2, SCAD_QUASI_STRUCTURED));
OK(scad_scene_mesh());
- OK(scad_stl_export(rectangle, "rectangle_quasi", Scad_keep_normals_unchanged, 0));
- OK(scad_stl_export(cube, "cube_quasi", Scad_force_normals_outward, 0));
- OK(scad_stl_export(fused, "fused_quasi", Scad_force_normals_outward, 0));
+ OK(scad_stl_export(rectangle, "rectangle_quasi", SCAD_KEEP_NORMALS_UNCHANGED, 0));
+ OK(scad_stl_export(cube, "cube_quasi", SCAD_FORCE_NORMALS_OUTWARD, 0));
+ OK(scad_stl_export(fused, "fused_quasi", SCAD_FORCE_NORMALS_OUTWARD, 0));
OK(scad_finalize());
diff --git a/src/test_export2.c b/src/test_export2.c
@@ -69,24 +69,24 @@ main(int argc, char* argv[])
OK(scad_scene_mesh());
/* Check that all three cubes can be exported whith forced normals */
- OK(scad_stl_export(cube1, NULL, Scad_force_normals_outward, 0));
- OK(scad_stl_export(cube2, NULL, Scad_force_normals_outward, 0));
- OK(scad_stl_export(cube3, "bin_cube3", Scad_force_normals_outward, 1));
+ OK(scad_stl_export(cube1, NULL, SCAD_FORCE_NORMALS_OUTWARD, 0));
+ OK(scad_stl_export(cube2, NULL, SCAD_FORCE_NORMALS_OUTWARD, 0));
+ OK(scad_stl_export(cube3, "bin_cube3", SCAD_FORCE_NORMALS_OUTWARD, 1));
/* Check that 2 cubes as a single model can be exported whith forced normals */
OK(scad_stl_get_data(cube1, &array));
OK(scad_stl_get_data(cube2, &array));
- OK(scad_stl_data_write(&array, "2cubes.stl", Scad_force_normals_outward, 0));
+ OK(scad_stl_data_write(&array, "2cubes.stl", SCAD_FORCE_NORMALS_OUTWARD, 0));
/* Check that with 3 cubes as a single model, the model cannot be exported
* whith forced normals... */
OK(scad_stl_get_data(cube3, &array));
- BAD(scad_stl_data_write(&array, "3cubes.stl", Scad_force_normals_outward, 0));
+ BAD(scad_stl_data_write(&array, "3cubes.stl", SCAD_FORCE_NORMALS_OUTWARD, 0));
/* ...but can be exported anyway without forcing normals... */
- OK(scad_stl_data_write(&array, "3cubes.stl", Scad_keep_normals_unchanged, 0));
+ OK(scad_stl_data_write(&array, "3cubes.stl", SCAD_KEEP_NORMALS_UNCHANGED, 0));
/* ...and can still be exported if some triangles are duplicated */
OK(scad_stl_get_data(cube1, &array));
- OK(scad_stl_data_write(&array, "3cubesd.stl", Scad_keep_normals_unchanged, 0));
+ OK(scad_stl_data_write(&array, "3cubesd.stl", SCAD_KEEP_NORMALS_UNCHANGED, 0));
OK(scad_geometry_ref_put(cube1));
OK(scad_geometry_ref_put(cube2));
diff --git a/src/test_lifetime.c b/src/test_lifetime.c
@@ -72,7 +72,7 @@ main(int argc, char* argv[])
OK(mem_init_proxy_allocator(&allocator, &mem_default_allocator));
OK(scad_initialize(NULL, &allocator, 3));
- options.Misc.LogRefCounting = Scad_log_dimTags_all | Scad_log_geometry;
+ options.Misc.LogRefCounting = SCAD_LOG_DIMTAGS_ALL | SCAD_LOG_GEOMETRY;
OK(scad_set_options(&options));
/* Check that 2D constituants of a deleted 3D object are alive and well */
diff --git a/src/test_partition.c b/src/test_partition.c
@@ -75,23 +75,23 @@ two_geoms
* geometry of both cubes does not define and inside/outside and the
* partitioned geometry cannot have its normals forced */
if(x == 0.9) {
- BAD(scad_stl_export(out_geoms[0], name, Scad_force_normals_outward, 0));
- OK(scad_stl_export(out_geoms[0], name, Scad_keep_normals_unchanged, 0));
+ BAD(scad_stl_export(out_geoms[0], name, SCAD_FORCE_NORMALS_OUTWARD, 0));
+ OK(scad_stl_export(out_geoms[0], name, SCAD_KEEP_NORMALS_UNCHANGED, 0));
} else {
- OK(scad_stl_export(out_geoms[0], name, Scad_force_normals_outward, 1));
+ OK(scad_stl_export(out_geoms[0], name, SCAD_FORCE_NORMALS_OUTWARD, 1));
}
snprintf(name, sizeof(name), "part_%g_2o", x);
if(x == 0.9) {
- BAD(scad_stl_export(out_geoms[1], name, Scad_force_normals_outward, 1));
- OK(scad_stl_export(out_geoms[1], name, Scad_keep_normals_unchanged, 1));
+ BAD(scad_stl_export(out_geoms[1], name, SCAD_FORCE_NORMALS_OUTWARD, 1));
+ OK(scad_stl_export(out_geoms[1], name, SCAD_KEEP_NORMALS_UNCHANGED, 1));
} else {
- OK(scad_stl_export(out_geoms[1], name, Scad_force_normals_outward, 1));
+ OK(scad_stl_export(out_geoms[1], name, SCAD_FORCE_NORMALS_OUTWARD, 1));
}
} else {
snprintf(name, sizeof(name), "part_%g_1", x);
- OK(scad_stl_export(geoms[0], name, Scad_force_normals_outward, 0));
+ OK(scad_stl_export(geoms[0], name, SCAD_FORCE_NORMALS_OUTWARD, 0));
snprintf(name, sizeof(name), "part_%g_2", x);
- OK(scad_stl_export(geoms[1], name, Scad_force_normals_outward, 1));
+ OK(scad_stl_export(geoms[1], name, SCAD_FORCE_NORMALS_OUTWARD, 1));
}
end:
diff --git a/src/test_periodic.c b/src/test_periodic.c
@@ -86,13 +86,13 @@ main(int argc, char* argv[])
}
ASSERT(lat[0] && lat[1] && internal && external);
scad_geometries_set_periodic(&internal, 1, &external, 1, cyl_affine);
- scad_geometries_set_mesh_algorithm(lat, 1, Scad_Initial_Mesh_Only);
+ scad_geometries_set_mesh_algorithm(lat, 1, SCAD_INITIAL_MESH_ONLY);
for(i = 0; i < facesn; i++) {
scad_geometry_ref_put(faces[i]);
}
MEM_RM(&allocator, faces);
scad_scene_mesh();
- scad_stl_export(cyl, "periodic", Scad_force_normals_outward, 1);
+ scad_stl_export(cyl, "periodic", SCAD_FORCE_NORMALS_OUTWARD, 1);
scad_geometry_ref_put(cyl);
scad_finalize();
#undef XR
