organicmaps/fast_obj
13
Fork 0
mirror of https://github.com/thisistherk/fast_obj.git synced 2025-04-04 13:05:02 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions

Use the same struct definition for Object and Group.

Browse source
This commit is contained in:
Richard Knight 2021-10-19 08:54:00 +01:00
parent ed03b86e7f
commit d2c273248a
1 changed files with 7 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
fast_obj.h
View file

@ -94,23 +94,6 @@ typedef struct
} fastObjIndex;
typedef struct
{
/* Object name */
char* name;
/* Number of faces */
unsigned int face_count;
/* First face in fastObjMesh face_* arrays */
unsigned int face_offset;
/* First index in fastObjMesh indices array */
unsigned int index_offset;
} fastObjObject;
typedef struct
{
/* Group name */
@ -152,11 +135,11 @@ typedef struct
unsigned int material_count;
fastObjMaterial* materials;
/* Mesh objects */
/* Mesh objects ('o' tag in .obj file) */
unsigned int object_count;
fastObjObject* objects;
fastObjGroup* objects;
/* Mesh groups */
/* Mesh groups ('g' tag in .obj file) */
unsigned int group_count;
fastObjGroup* groups;
@ -219,7 +202,7 @@ typedef struct
fastObjMesh* mesh;
/* Current object/group */
fastObjObject object;
fastObjGroup object;
fastObjGroup group;
/* Current material index */
@ -475,9 +458,9 @@ const char* skip_line(const char* ptr)
static
fastObjObject object_default(void)
fastObjGroup object_default(void)
{
fastObjObject object;
fastObjGroup object;
object.name = 0;
object.face_count = 0;
@ -489,7 +472,7 @@ fastObjObject object_default(void)
static
void object_clean(fastObjObject* object)
void object_clean(fastObjGroup* object)
{
memory_dealloc(object->name);
}