diff --git a/tinyobj_loader_c.h b/tinyobj_loader_c.h index cbfa301..5a8aaa9 100644 --- a/tinyobj_loader_c.h +++ b/tinyobj_loader_c.h @@ -24,9 +24,6 @@ #ifndef TINOBJ_LOADER_C_H_ #define TINOBJ_LOADER_C_H_ -/* @todo { Remove stddef dependency. size_t? } */ -#include - #ifdef __cplusplus extern "C" { #endif @@ -103,7 +100,7 @@ typedef struct { * @param[out] buf Content of loaded file * @param[out] len Size of content(file) */ -typedef void (*file_reader_callback)(void *ctx, const char *filename, int is_mtl, const char *obj_filename, char **buf, size_t *len); +typedef void (*file_reader_callback)(void *ctx, const char *filename, int is_mtl, const char *obj_filename, char **buf, unsigned long *len); /* Parse wavefront .obj * @param[out] attrib Attibutes @@ -120,8 +117,8 @@ typedef void (*file_reader_callback)(void *ctx, const char *filename, int is_mtl * Returns TINYOBJ_ERR_*** when there is an error. */ extern int tinyobj_parse_obj(tinyobj_attrib_t *attrib, tinyobj_shape_t **shapes, - size_t *num_shapes, tinyobj_material_t **materials, - size_t *num_materials, const char *file_name, file_reader_callback file_reader, + unsigned long *num_shapes, tinyobj_material_t **materials, + unsigned long *num_materials, const char *file_name, file_reader_callback file_reader, void *ctx, unsigned int flags); /* Parse wavefront .mtl @@ -137,15 +134,15 @@ extern int tinyobj_parse_obj(tinyobj_attrib_t *attrib, tinyobj_shape_t **shapes, * Returns TINYOBJ_ERR_*** when there is an error. */ extern int tinyobj_parse_mtl_file(tinyobj_material_t **materials_out, - size_t *num_materials_out, + unsigned long *num_materials_out, const char *filename, const char *obj_filename, file_reader_callback file_reader, void *ctx); extern void tinyobj_attrib_init(tinyobj_attrib_t *attrib); extern void tinyobj_attrib_free(tinyobj_attrib_t *attrib); -extern void tinyobj_shapes_free(tinyobj_shape_t *shapes, size_t num_shapes); +extern void tinyobj_shapes_free(tinyobj_shape_t *shapes, unsigned long num_shapes); extern void tinyobj_materials_free(tinyobj_material_t *materials, - size_t num_materials); + unsigned long num_materials); #ifdef __cplusplus } @@ -205,8 +202,8 @@ static int until_space(const char *token) { return (int)(p - token); } -static size_t length_until_newline(const char *token, size_t n) { - size_t len = 0; +static unsigned long length_until_newline(const char *token, unsigned long n) { + unsigned long len = 0; /* Assume token[n-1] = '\0' */ for (len = 0; len < n - 1; len++) { @@ -221,8 +218,8 @@ static size_t length_until_newline(const char *token, size_t n) { return len; } -static size_t length_until_line_feed(const char *token, size_t n) { - size_t len = 0; +static unsigned long length_until_line_feed(const char *token, unsigned long n) { + unsigned long len = 0; /* Assume token[n-1] = '\0' */ for (len = 0; len < n; len++) { @@ -252,7 +249,7 @@ static int my_atoi(const char *c) { } /* Make index zero-base, and also support relative index. */ -static int fixIndex(int idx, size_t n) { +static int fixIndex(int idx, unsigned long n) { if (idx > 0) return idx - 1; if (idx == 0) return 0; return (int)n + idx; /* negative value = relative */ @@ -503,14 +500,14 @@ static void parseFloat3(float *x, float *y, float *z, const char **token) { (*z) = parseFloat(token); } -static size_t my_strnlen(const char *s, size_t n) { +static unsigned long my_strnlen(const char *s, unsigned long n) { const char *p = (char *)memchr(s, 0, n); - return p ? (size_t)(p - s) : n; + return p ? (unsigned long)(p - s) : n; } -static char *my_strdup(const char *s, size_t max_length) { +static char *my_strdup(const char *s, unsigned long max_length) { char *d; - size_t len; + unsigned long len; if (s == NULL) return NULL; @@ -520,15 +517,15 @@ static char *my_strdup(const char *s, size_t max_length) { /* trim line ending and append '\0' */ d = (char *)TINYOBJ_MALLOC(len + 1); /* + '\0' */ - memcpy(d, s, (size_t)(len)); + memcpy(d, s, (unsigned long)(len)); d[len] = '\0'; return d; } -static char *my_strndup(const char *s, size_t len) { +static char *my_strndup(const char *s, unsigned long len) { char *d; - size_t slen; + unsigned long slen; if (s == NULL) return NULL; if (len == 0) return NULL; @@ -544,10 +541,10 @@ static char *my_strndup(const char *s, size_t len) { return d; } -char *dynamic_fgets(char **buf, size_t *size, FILE *file) { +char *dynamic_fgets(char **buf, unsigned long *size, FILE *file) { char *offset; char *ret; - size_t old_size; + unsigned long old_size; if (!(ret = fgets(*buf, (int)*size, file))) { return ret; @@ -613,8 +610,8 @@ typedef struct { unsigned long* hashes; hash_table_entry_t* entries; - size_t capacity; - size_t n; + unsigned long capacity; + unsigned long n; } hash_table_t; static unsigned long hash_djb2(const unsigned char* str) @@ -629,7 +626,7 @@ static unsigned long hash_djb2(const unsigned char* str) return hash; } -static void create_hash_table(size_t start_capacity, hash_table_t* hash_table) +static void create_hash_table(unsigned long start_capacity, hash_table_t* hash_table) { if (start_capacity < 1) start_capacity = HASH_TABLE_DEFAULT_SIZE; @@ -649,10 +646,10 @@ static void destroy_hash_table(hash_table_t* hash_table) static int hash_table_insert_value(unsigned long hash, long value, hash_table_t* hash_table) { /* Insert value */ - size_t start_index = hash % hash_table->capacity; - size_t index = start_index; + unsigned long start_index = hash % hash_table->capacity; + unsigned long index = start_index; hash_table_entry_t* start_entry = hash_table->entries + start_index; - size_t i; + unsigned long i; hash_table_entry_t* entry; for (i = 1; hash_table->entries[index].filled; i++) @@ -701,11 +698,11 @@ static hash_table_entry_t* hash_table_find(unsigned long hash, hash_table_t* has return NULL; } -static void hash_table_maybe_grow(size_t new_n, hash_table_t* hash_table) +static void hash_table_maybe_grow(unsigned long new_n, hash_table_t* hash_table) { - size_t new_capacity; + unsigned long new_capacity; hash_table_t new_hash_table; - size_t i; + unsigned long i; if (new_n <= hash_table->capacity) { return; @@ -734,7 +731,7 @@ static int hash_table_exists(const char* name, hash_table_t* hash_table) return hash_table_find(hash_djb2((const unsigned char*)name), hash_table) != NULL; } -static void hash_table_set(const char* name, size_t val, hash_table_t* hash_table) +static void hash_table_set(const char* name, unsigned long val, hash_table_t* hash_table) { /* Hash name */ unsigned long hash = hash_djb2((const unsigned char *)name); @@ -763,10 +760,10 @@ static long hash_table_get(const char* name, hash_table_t* hash_table) } static tinyobj_material_t *tinyobj_material_add(tinyobj_material_t *prev, - size_t num_materials, + unsigned long num_materials, tinyobj_material_t *new_mat) { tinyobj_material_t *dst; - size_t num_bytes = sizeof(tinyobj_material_t) * num_materials; + unsigned long num_bytes = sizeof(tinyobj_material_t) * num_materials; dst = (tinyobj_material_t *)TINYOBJ_REALLOC_SIZED( prev, num_bytes, num_bytes + sizeof(tinyobj_material_t)); @@ -774,7 +771,7 @@ static tinyobj_material_t *tinyobj_material_add(tinyobj_material_t *prev, return dst; } -static int is_line_ending(const char *p, size_t i, size_t end_i) { +static int is_line_ending(const char *p, unsigned long i, unsigned long end_i) { if (p[i] == '\0') return 1; if (p[i] == '\n') return 1; /* this includes \r\n */ if (p[i] == '\r') { @@ -786,18 +783,18 @@ static int is_line_ending(const char *p, size_t i, size_t end_i) { } typedef struct { - size_t pos; - size_t len; + unsigned long pos; + unsigned long len; } LineInfo; /* Find '\n' and create line data. */ -static int get_line_infos(const char *buf, size_t buf_len, LineInfo **line_infos, size_t *num_lines) +static int get_line_infos(const char *buf, unsigned long buf_len, LineInfo **line_infos, unsigned long *num_lines) { - size_t i = 0; - size_t end_idx = buf_len; - size_t prev_pos = 0; - size_t line_no = 0; - size_t last_line_ending = 0; + unsigned long i = 0; + unsigned long end_idx = buf_len; + unsigned long prev_pos = 0; + unsigned long line_no = 0; + unsigned long last_line_ending = 0; /* Count # of lines. */ for (i = 0; i < end_idx; i++) { @@ -836,19 +833,19 @@ static int get_line_infos(const char *buf, size_t buf_len, LineInfo **line_infos } static int tinyobj_parse_and_index_mtl_file(tinyobj_material_t **materials_out, - size_t *num_materials_out, + unsigned long *num_materials_out, const char *mtl_filename, const char *obj_filename, file_reader_callback file_reader, void *ctx, hash_table_t* material_table) { tinyobj_material_t material; - size_t num_materials = 0; + unsigned long num_materials = 0; tinyobj_material_t *materials = NULL; int has_previous_material = 0; const char *line_end = NULL; - size_t num_lines = 0; + unsigned long num_lines = 0; LineInfo *line_infos = NULL; - size_t i = 0; + unsigned long i = 0; char *buf = NULL; - size_t len = 0; + unsigned long len = 0; if (materials_out == NULL) { return TINYOBJ_ERROR_INVALID_PARAMETER; @@ -875,7 +872,7 @@ static int tinyobj_parse_and_index_mtl_file(tinyobj_material_t **materials_out, for (i = 0; i < num_lines; i++) { const char *p = &buf[line_infos[i].pos]; - size_t p_len = line_infos[i].len; + unsigned long p_len = line_infos[i].len; char linebuf[4096]; const char *token; @@ -917,7 +914,7 @@ static int tinyobj_parse_and_index_mtl_file(tinyobj_material_t **materials_out, #else sscanf(token, "%s", namebuf); #endif - material.name = my_strdup(namebuf, (size_t) (line_end - token)); + material.name = my_strdup(namebuf, (unsigned long) (line_end - token)); /* Add material to material table */ if (material_table) @@ -1018,56 +1015,56 @@ static int tinyobj_parse_and_index_mtl_file(tinyobj_material_t **materials_out, /* ambient texture */ if ((0 == strncmp(token, "map_Ka", 6)) && IS_SPACE(token[6])) { token += 7; - material.ambient_texname = my_strdup(token, (size_t) (line_end - token)); + material.ambient_texname = my_strdup(token, (unsigned long) (line_end - token)); continue; } /* diffuse texture */ if ((0 == strncmp(token, "map_Kd", 6)) && IS_SPACE(token[6])) { token += 7; - material.diffuse_texname = my_strdup(token, (size_t) (line_end - token)); + material.diffuse_texname = my_strdup(token, (unsigned long) (line_end - token)); continue; } /* specular texture */ if ((0 == strncmp(token, "map_Ks", 6)) && IS_SPACE(token[6])) { token += 7; - material.specular_texname = my_strdup(token, (size_t) (line_end - token)); + material.specular_texname = my_strdup(token, (unsigned long) (line_end - token)); continue; } /* specular highlight texture */ if ((0 == strncmp(token, "map_Ns", 6)) && IS_SPACE(token[6])) { token += 7; - material.specular_highlight_texname = my_strdup(token, (size_t) (line_end - token)); + material.specular_highlight_texname = my_strdup(token, (unsigned long) (line_end - token)); continue; } /* bump texture */ if ((0 == strncmp(token, "map_bump", 8)) && IS_SPACE(token[8])) { token += 9; - material.bump_texname = my_strdup(token, (size_t) (line_end - token)); + material.bump_texname = my_strdup(token, (unsigned long) (line_end - token)); continue; } /* alpha texture */ if ((0 == strncmp(token, "map_d", 5)) && IS_SPACE(token[5])) { token += 6; - material.alpha_texname = my_strdup(token, (size_t) (line_end - token)); + material.alpha_texname = my_strdup(token, (unsigned long) (line_end - token)); continue; } /* bump texture */ if ((0 == strncmp(token, "bump", 4)) && IS_SPACE(token[4])) { token += 5; - material.bump_texname = my_strdup(token, (size_t) (line_end - token)); + material.bump_texname = my_strdup(token, (unsigned long) (line_end - token)); continue; } /* displacement texture */ if ((0 == strncmp(token, "disp", 4)) && IS_SPACE(token[4])) { token += 5; - material.displacement_texname = my_strdup(token, (size_t) (line_end - token)); + material.displacement_texname = my_strdup(token, (unsigned long) (line_end - token)); continue; } @@ -1089,7 +1086,7 @@ static int tinyobj_parse_and_index_mtl_file(tinyobj_material_t **materials_out, } int tinyobj_parse_mtl_file(tinyobj_material_t **materials_out, - size_t *num_materials_out, + unsigned long *num_materials_out, const char *mtl_filename, const char *obj_filename, file_reader_callback file_reader, void *ctx) { return tinyobj_parse_and_index_mtl_file(materials_out, num_materials_out, mtl_filename, obj_filename, file_reader, ctx, NULL); @@ -1116,10 +1113,10 @@ typedef struct { /* @todo { Use dynamic array } */ tinyobj_vertex_index_t f[TINYOBJ_MAX_FACES_PER_F_LINE]; - size_t num_f; + unsigned long num_f; int f_num_verts[TINYOBJ_MAX_FACES_PER_F_LINE]; - size_t num_f_num_verts; + unsigned long num_f_num_verts; const char *group_name; unsigned int group_name_len; @@ -1139,7 +1136,7 @@ typedef struct { CommandType type; } Command; -static int parseLine(Command *command, const char *p, size_t p_len, +static int parseLine(Command *command, const char *p, unsigned long p_len, int triangulate) { char linebuf[4096]; const char *token; @@ -1201,7 +1198,7 @@ static int parseLine(Command *command, const char *p, size_t p_len, /* face */ if (token[0] == 'f' && IS_SPACE((token[1]))) { - size_t num_f = 0; + unsigned long num_f = 0; tinyobj_vertex_index_t f[TINYOBJ_MAX_FACES_PER_F_LINE]; token += 2; @@ -1218,8 +1215,8 @@ static int parseLine(Command *command, const char *p, size_t p_len, command->type = COMMAND_F; if (triangulate) { - size_t k; - size_t n = 0; + unsigned long k; + unsigned long n = 0; tinyobj_vertex_index_t i0 = f[0]; tinyobj_vertex_index_t i1; @@ -1241,7 +1238,7 @@ static int parseLine(Command *command, const char *p, size_t p_len, command->num_f_num_verts = n; } else { - size_t k = 0; + unsigned long k = 0; assert(num_f < TINYOBJ_MAX_FACES_PER_F_LINE); for (k = 0; k < num_f; k++) { command->f[k] = f[k]; @@ -1262,7 +1259,7 @@ static int parseLine(Command *command, const char *p, size_t p_len, skip_space(&token); command->material_name = p + (token - linebuf); command->material_name_len = (unsigned int)length_until_newline( - token, (p_len - (size_t)(token - linebuf)) + 1); + token, (p_len - (unsigned long)(token - linebuf)) + 1); command->type = COMMAND_USEMTL; return 1; @@ -1276,7 +1273,7 @@ static int parseLine(Command *command, const char *p, size_t p_len, skip_space(&token); command->mtllib_name = p + (token - linebuf); command->mtllib_name_len = (unsigned int)length_until_newline( - token, p_len - (size_t)(token - linebuf)) + + token, p_len - (unsigned long)(token - linebuf)) + 1; command->type = COMMAND_MTLLIB; @@ -1290,7 +1287,7 @@ static int parseLine(Command *command, const char *p, size_t p_len, command->group_name = p + (token - linebuf); command->group_name_len = (unsigned int)length_until_newline( - token, p_len - (size_t)(token - linebuf)) + + token, p_len - (unsigned long)(token - linebuf)) + 1; command->type = COMMAND_G; @@ -1304,7 +1301,7 @@ static int parseLine(Command *command, const char *p, size_t p_len, command->object_name = p + (token - linebuf); command->object_name_len = (unsigned int)length_until_newline( - token, p_len - (size_t)(token - linebuf)) + + token, p_len - (unsigned long)(token - linebuf)) + 1; command->type = COMMAND_O; @@ -1314,10 +1311,10 @@ static int parseLine(Command *command, const char *p, size_t p_len, return 0; } -static size_t basename_len(const char *filename, size_t filename_length) { +static unsigned long basename_len(const char *filename, unsigned long filename_length) { /* Count includes NUL terminator. */ const char *p = &filename[filename_length - 1]; - size_t count = 1; + unsigned long count = 1; /* On Windows, the directory delimiter is '\' and both it and '/' is * reserved by the filesystem. On *nix platforms, only the '/' character @@ -1346,17 +1343,17 @@ static size_t basename_len(const char *filename, size_t filename_length) { } static char *generate_mtl_filename(const char *obj_filename, - size_t obj_filename_length, + unsigned long obj_filename_length, const char *mtllib_name, - size_t mtllib_name_length) { + unsigned long mtllib_name_length) { /* Create a dynamically-allocated material filename. This allows the material * and obj files to be separated, however the mtllib name in the OBJ file * must be a relative path to the material file from the OBJ's directory. * This does not support the matllib name as an absolute address. */ char *mtl_filename; char *p; - size_t mtl_filename_length; - size_t obj_basename_length; + unsigned long mtl_filename_length; + unsigned long obj_basename_length; /* Calculate required size of mtl_filename and allocate */ obj_basename_length = basename_len(obj_filename, obj_filename_length); @@ -1373,29 +1370,29 @@ static char *generate_mtl_filename(const char *obj_filename, } int tinyobj_parse_obj(tinyobj_attrib_t *attrib, tinyobj_shape_t **shapes, - size_t *num_shapes, tinyobj_material_t **materials_out, - size_t *num_materials_out, const char *obj_filename, + unsigned long *num_shapes, tinyobj_material_t **materials_out, + unsigned long *num_materials_out, const char *obj_filename, file_reader_callback file_reader, void *ctx, unsigned int flags) { LineInfo *line_infos = NULL; Command *commands = NULL; - size_t num_lines = 0; + unsigned long num_lines = 0; - size_t num_v = 0; - size_t num_vn = 0; - size_t num_vt = 0; - size_t num_f = 0; - size_t num_faces = 0; + unsigned long num_v = 0; + unsigned long num_vn = 0; + unsigned long num_vt = 0; + unsigned long num_f = 0; + unsigned long num_faces = 0; int mtllib_line_index = -1; tinyobj_material_t *materials = NULL; - size_t num_materials = 0; + unsigned long num_materials = 0; hash_table_t material_table; char *buf = NULL; - size_t len = 0; + unsigned long len = 0; file_reader(ctx, obj_filename, /* is_mtl */0, obj_filename, &buf, &len); if (len < 1) return TINYOBJ_ERROR_INVALID_PARAMETER; @@ -1419,7 +1416,7 @@ int tinyobj_parse_obj(tinyobj_attrib_t *attrib, tinyobj_shape_t **shapes, /* 2. parse each line */ { - size_t i = 0; + unsigned long i = 0; for (i = 0; i < num_lines; i++) { int ret = parseLine(&commands[i], &buf[line_infos[i].pos], line_infos[i].len, flags & TINYOBJ_FLAG_TRIANGULATE); @@ -1451,10 +1448,10 @@ int tinyobj_parse_obj(tinyobj_attrib_t *attrib, tinyobj_shape_t **shapes, if (mtllib_line_index >= 0 && commands[mtllib_line_index].mtllib_name && commands[mtllib_line_index].mtllib_name_len > 0) { /* Maximum length allowed by Linux - higher than Windows and macOS */ - size_t obj_filename_len = my_strnlen(obj_filename, 4096 + 255) + 1; + unsigned long obj_filename_len = my_strnlen(obj_filename, 4096 + 255) + 1; char *mtl_filename; char *mtllib_name; - size_t mtllib_name_len = 0; + unsigned long mtllib_name_len = 0; int ret; mtllib_name_len = length_until_line_feed(commands[mtllib_line_index].mtllib_name, @@ -1484,13 +1481,13 @@ int tinyobj_parse_obj(tinyobj_attrib_t *attrib, tinyobj_shape_t **shapes, /* Construct attributes */ { - size_t v_count = 0; - size_t n_count = 0; - size_t t_count = 0; - size_t f_count = 0; - size_t face_count = 0; + unsigned long v_count = 0; + unsigned long n_count = 0; + unsigned long t_count = 0; + unsigned long f_count = 0; + unsigned long face_count = 0; int material_id = -1; /* -1 = default unknown material. */ - size_t i = 0; + unsigned long i = 0; attrib->vertices = (float *)TINYOBJ_MALLOC(sizeof(float) * num_v * 3); attrib->num_vertices = (unsigned int)num_v; @@ -1553,7 +1550,7 @@ int tinyobj_parse_obj(tinyobj_attrib_t *attrib, tinyobj_shape_t **shapes, attrib->texcoords[2 * t_count + 1] = commands[i].ty; t_count++; } else if (commands[i].type == COMMAND_F) { - size_t k = 0; + unsigned long k = 0; for (k = 0; k < commands[i].num_f; k++) { tinyobj_vertex_index_t vi = commands[i].f[k]; int v_idx = fixIndex(vi.v_idx, v_count); @@ -1578,9 +1575,9 @@ int tinyobj_parse_obj(tinyobj_attrib_t *attrib, tinyobj_shape_t **shapes, /* 5. Construct shape information. */ { unsigned int face_count = 0; - size_t i = 0; - size_t n = 0; - size_t shape_idx = 0; + unsigned long i = 0; + unsigned long n = 0; + unsigned long shape_idx = 0; const char *shape_name = NULL; unsigned int shape_name_len = 0; @@ -1652,7 +1649,7 @@ int tinyobj_parse_obj(tinyobj_attrib_t *attrib, tinyobj_shape_t **shapes, } if ((face_count - prev_face_offset) > 0) { - size_t length = face_count - prev_shape_face_offset; + unsigned long length = face_count - prev_shape_face_offset; if (length > 0) { (*shapes)[shape_idx].name = my_strndup(prev_shape_name, prev_shape_name_len); @@ -1703,8 +1700,8 @@ void tinyobj_attrib_free(tinyobj_attrib_t *attrib) { if (attrib->material_ids) TINYOBJ_FREE(attrib->material_ids); } -void tinyobj_shapes_free(tinyobj_shape_t *shapes, size_t num_shapes) { - size_t i; +void tinyobj_shapes_free(tinyobj_shape_t *shapes, unsigned long num_shapes) { + unsigned long i; if (shapes == NULL) return; for (i = 0; i < num_shapes; i++) { @@ -1715,8 +1712,8 @@ void tinyobj_shapes_free(tinyobj_shape_t *shapes, size_t num_shapes) { } void tinyobj_materials_free(tinyobj_material_t *materials, - size_t num_materials) { - size_t i; + unsigned long num_materials) { + unsigned long i; if (materials == NULL) return; for (i = 0; i < num_materials; i++) {