caiyu/gmio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gmio_stl: simplify a bit by internally forcing non NULL read/write options

Browse Source
This commit is contained in:
Hugues Delorme 2016-11-28 10:35:16 +01:00
parent 07d7dd75be
commit 4a10787a0d
3 changed files with 45 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/gmio_stl/internal/stla_write.c
View File

@ -195,8 +195,7 @@ int gmio_stla_write(
const struct gmio_stl_write_options* opts) const struct gmio_stl_write_options* opts)
{ {
/* Constants */ /* Constants */
const bool check_lcnum = static const struct gmio_stl_write_options default_opts = {0};
opts != NULL ? !opts->stla_dont_check_lc_numeric : true;
const struct gmio_task_iface* task = opts != NULL ? &opts->task_iface : NULL; const struct gmio_task_iface* task = opts != NULL ? &opts->task_iface : NULL;
struct gmio_memblock_helper mblock_helper = struct gmio_memblock_helper mblock_helper =
gmio_memblock_helper(opts != NULL ? &opts->stream_memblock : NULL); gmio_memblock_helper(opts != NULL ? &opts->stream_memblock : NULL);
@ -204,10 +203,6 @@ int gmio_stla_write(
const uint32_t total_facet_count = mesh != NULL ? mesh->triangle_count : 0; const uint32_t total_facet_count = mesh != NULL ? mesh->triangle_count : 0;
const uint32_t buffer_facet_count = const uint32_t buffer_facet_count =
gmio_size_to_uint32(mblock_size / GMIO_STLA_FACET_SIZE_P2); gmio_size_to_uint32(mblock_size / GMIO_STLA_FACET_SIZE_P2);
const char* opt_solid_name = opts != NULL ? opts->stla_solid_name : NULL;
const char* solid_name = opt_solid_name != NULL ? opt_solid_name : "";
const bool write_triangles_only =
opts != NULL ? opts->stl_write_triangles_only : false;
/* Variables */ /* Variables */
struct gmio_memblock* const mblock = &mblock_helper.memblock; struct gmio_memblock* const mblock = &mblock_helper.memblock;
@ -216,33 +211,30 @@ int gmio_stla_write(
int error = GMIO_ERROR_OK; int error = GMIO_ERROR_OK;
struct gmio_vec3f_text_format vec_txtformat = {0}; struct gmio_vec3f_text_format vec_txtformat = {0};
/* Initialize helper data for text formatting of vec3f coords */ /* Make options non NULL */
{ opts = opts != NULL ? opts : &default_opts;
const uint8_t opt_f32_prec =
opts != NULL ? opts->stla_float32_prec : 9;
const enum gmio_float_text_format f32_format =
opts != NULL ?
opts->stla_float32_format :
GMIO_FLOAT_TEXT_FORMAT_DECIMAL_LOWERCASE;
vec_txtformat.coord_prec = opt_f32_prec != 0 ? opt_f32_prec : 9;
vec_txtformat.coord_format = f32_format;
/* Create XYZ coords format string (for normal and vertex coords) */ /* Initialize helper data for text formatting of vec3f coords */
{ vec_txtformat.coord_prec =
const uint8_t f32_prec = vec_txtformat.coord_prec; opts->stla_float32_prec != 0 ? opts->stla_float32_prec : 9;
const char f32_spec = gmio_float_text_format_to_specifier(f32_format); vec_txtformat.coord_format = opts->stla_float32_format;
char* buffpos = vec_txtformat.str_printf_format;
buffpos = gmio_write_stdio_format(buffpos, f32_spec, f32_prec); /* Create XYZ coords format string (for normal and vertex coords) */
buffpos = gmio_write_char(buffpos, ' '); {
buffpos = gmio_write_stdio_format(buffpos, f32_spec, f32_prec); const uint8_t f32_prec = vec_txtformat.coord_prec;
buffpos = gmio_write_char(buffpos, ' '); enum gmio_float_text_format f32_format = opts->stla_float32_format;
buffpos = gmio_write_stdio_format(buffpos, f32_spec, f32_prec); const char f32_spec = gmio_float_text_format_to_specifier(f32_format);
*buffpos = 0; char* buffpos = vec_txtformat.str_printf_format;
} buffpos = gmio_write_stdio_format(buffpos, f32_spec, f32_prec);
buffpos = gmio_write_char(buffpos, ' ');
buffpos = gmio_write_stdio_format(buffpos, f32_spec, f32_prec);
buffpos = gmio_write_char(buffpos, ' ');
buffpos = gmio_write_stdio_format(buffpos, f32_spec, f32_prec);
*buffpos = 0;
} }
/* Check validity of input parameters */ /* Check validity of input parameters */
if (check_lcnum && !gmio_check_lc_numeric(&error)) if (!opts->stla_dont_check_lc_numeric && !gmio_check_lc_numeric(&error))
goto label_end; goto label_end;
if (!gmio_check_memblock_size(&error, mblock, GMIO_STLA_FACET_SIZE_P2)) if (!gmio_check_memblock_size(&error, mblock, GMIO_STLA_FACET_SIZE_P2))
goto label_end; goto label_end;
@ -252,10 +244,11 @@ int gmio_stla_write(
goto label_end; goto label_end;
/* Write solid declaration */ /* Write solid declaration */
if (!write_triangles_only) { if (!opts->stl_write_triangles_only) {
char* buffpos = mblock_ptr; char* buffpos = mblock_ptr;
buffpos = gmio_write_rawstr(buffpos, "solid "); buffpos = gmio_write_rawstr(buffpos, "solid ");
buffpos = gmio_write_rawstr_eol(buffpos, solid_name); if (opts->stla_solid_name != NULL)
buffpos = gmio_write_rawstr_eol(buffpos, opts->stla_solid_name);
if (!gmio_stream_flush_buffer(stream, mblock_ptr, buffpos)) { if (!gmio_stream_flush_buffer(stream, mblock_ptr, buffpos)) {
error = GMIO_ERROR_STREAM; error = GMIO_ERROR_STREAM;
goto label_end; goto label_end;
@ -306,10 +299,11 @@ int gmio_stla_write(
} /* end for (ifacet) */ } /* end for (ifacet) */
/* Write end of solid */ /* Write end of solid */
if (gmio_no_error(error) && !write_triangles_only) { if (gmio_no_error(error) && !opts->stl_write_triangles_only) {
char* buffpos = mblock_ptr; char* buffpos = mblock_ptr;
buffpos = gmio_write_rawstr(buffpos, "endsolid "); buffpos = gmio_write_rawstr(buffpos, "endsolid ");
buffpos = gmio_write_rawstr_eol(buffpos, solid_name); if (opts->stla_solid_name != NULL)
buffpos = gmio_write_rawstr_eol(buffpos, opts->stla_solid_name);
if (!gmio_stream_flush_buffer(stream, mblock_ptr, buffpos)) if (!gmio_stream_flush_buffer(stream, mblock_ptr, buffpos))
error = GMIO_ERROR_STREAM; error = GMIO_ERROR_STREAM;
} }

13
src/gmio_stl/internal/stlb_write.c
View File

@ -107,6 +107,7 @@ int gmio_stlb_write(
const struct gmio_stl_write_options* opts) const struct gmio_stl_write_options* opts)
{ {
/* Constants */ /* Constants */
static const struct gmio_stl_write_options default_opts = {0};
const struct gmio_task_iface* task = opts != NULL ? &opts->task_iface : NULL; const struct gmio_task_iface* task = opts != NULL ? &opts->task_iface : NULL;
struct gmio_memblock_helper mblock_helper = struct gmio_memblock_helper mblock_helper =
gmio_memblock_helper(opts != NULL ? &opts->stream_memblock : NULL); gmio_memblock_helper(opts != NULL ? &opts->stream_memblock : NULL);
@ -116,10 +117,6 @@ int gmio_stlb_write(
byte_order != GMIO_ENDIANNESS_HOST ? byte_order != GMIO_ENDIANNESS_HOST ?
gmio_stlb_encode_facets_byteswap : gmio_stlb_encode_facets_byteswap :
gmio_stlb_encode_facets; gmio_stlb_encode_facets;
const bool write_triangles_only =
opts != NULL ? opts->stl_write_triangles_only : false;
const struct gmio_stlb_header* header =
opts != NULL ? &opts->stlb_header : NULL;
/* Variables */ /* Variables */
uint32_t i_facet = 0; /* Facet counter */ uint32_t i_facet = 0; /* Facet counter */
@ -128,6 +125,9 @@ int gmio_stlb_write(
void* const mblock_ptr = mblock_helper.memblock.ptr; void* const mblock_ptr = mblock_helper.memblock.ptr;
int error = GMIO_ERROR_OK; int error = GMIO_ERROR_OK;
/* Make options non NULL */
opts = opts != NULL ? opts : &default_opts;
/* Check validity of input parameters */ /* Check validity of input parameters */
if (!gmio_check_memblock(&error, &mblock_helper.memblock)) if (!gmio_check_memblock(&error, &mblock_helper.memblock))
goto label_end; goto label_end;
@ -136,8 +136,9 @@ int gmio_stlb_write(
if (!gmio_stlb_check_byteorder(&error, byte_order)) if (!gmio_stlb_check_byteorder(&error, byte_order))
goto label_end; goto label_end;
if (!write_triangles_only) { if (!opts->stl_write_triangles_only) {
error = gmio_stlb_header_write(stream, byte_order, header, facet_count); error = gmio_stlb_header_write(
stream, byte_order, &opts->stlb_header, facet_count);
if (gmio_error(error)) if (gmio_error(error))
goto label_end; goto label_end;
} }

16
src/gmio_stl/stla_read.c
View File

@ -129,8 +129,9 @@ int gmio_stla_read(
struct gmio_stl_mesh_creator* mesh_creator, struct gmio_stl_mesh_creator* mesh_creator,
const struct gmio_stl_read_options* opts) const struct gmio_stl_read_options* opts)
{ {
const bool check_lcnum = /* Constants */
opts != NULL ? !opts->stla_dont_check_lc_numeric : true; static const struct gmio_stl_read_options default_opts = {0};
/* Variables */
struct gmio_memblock_helper mblock_helper = struct gmio_memblock_helper mblock_helper =
gmio_memblock_helper(opts != NULL ? &opts->stream_memblock : NULL); gmio_memblock_helper(opts != NULL ? &opts->stream_memblock : NULL);
struct gmio_memblock* const mblock = &mblock_helper.memblock; struct gmio_memblock* const mblock = &mblock_helper.memblock;
@ -138,17 +139,22 @@ int gmio_stla_read(
struct gmio_stla_parse_data parse_data; struct gmio_stla_parse_data parse_data;
int error = GMIO_ERROR_OK; int error = GMIO_ERROR_OK;
if (check_lcnum && !gmio_check_lc_numeric(&error)) /* Make options non NULL */
opts = opts != NULL ? opts : &default_opts;
/* Check validity of input parameters */
if (!opts->stla_dont_check_lc_numeric && !gmio_check_lc_numeric(&error))
goto label_end; goto label_end;
/* Initialize helper gmio_stla_parse_data object */
parse_data.token = unknown_token; parse_data.token = unknown_token;
parse_data.error = false; parse_data.error = false;
parse_data.strstream_cookie.task = opts != NULL ? &opts->task_iface : NULL; parse_data.strstream_cookie.task = &opts->task_iface;
parse_data.strstream_cookie.stream_offset = 0; parse_data.strstream_cookie.stream_offset = 0;
parse_data.strstream_cookie.stream_size = parse_data.strstream_cookie.stream_size =
opts != NULL && opts->func_stla_get_streamsize != NULL ? opts->func_stla_get_streamsize != NULL ?
opts->func_stla_get_streamsize(stream, mblock) : opts->func_stla_get_streamsize(stream, mblock) :
gmio_stream_size(stream); gmio_stream_size(stream);
parse_data.strstream_cookie.is_stop_requested = false; parse_data.strstream_cookie.is_stop_requested = false;