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

added support for colored vertices (issue #28)

Browse source
This commit is contained in:
Max Rigout 2023-07-31 21:23:40 -04:00
parent 1a8060257a
commit a511f60249
1 changed files with 25 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
fast_obj.h
View file

@ -90,6 +90,7 @@ typedef struct
fastObjUInt p;
fastObjUInt t;
fastObjUInt n;
fastObjUInt c;
} fastObjIndex;
@ -123,6 +124,9 @@ typedef struct
unsigned int normal_count;
float* normals;
unsigned int color_count;
float* colors;
/* Face data: one element for each face */
unsigned int face_count;
unsigned int* face_vertices;
@ -655,6 +659,19 @@ const char* parse_vertex(fastObjData* data, const char* ptr)
array_push(data->mesh->positions, v);
}
// extract color data
for (ii = 0; ii < 3; ii++)
{
const char* tmp = parse_float(ptr, &v);
// if there's no data, we default to white
if (tmp == ptr)
{
v = 1.0f;
}
ptr = tmp;
array_push(data->mesh->colors, v);
}
return ptr;
}
@ -745,6 +762,8 @@ const char* parse_face(fastObjData* data, const char* ptr)
else
vn.n = 0;
vn.c = vn.p;
array_push(data->mesh->indices, vn);
count++;
@ -1346,6 +1365,7 @@ void fast_obj_destroy(fastObjMesh* m)
array_clean(m->positions);
array_clean(m->texcoords);
array_clean(m->normals);
array_clean(m->colors);
array_clean(m->face_vertices);
array_clean(m->face_materials);
array_clean(m->indices);
@ -1400,6 +1420,7 @@ fastObjMesh* fast_obj_read_with_callbacks(const char* path, const fastObjCallbac
m->positions = 0;
m->texcoords = 0;
m->normals = 0;
m->colors = 0;
m->face_vertices = 0;
m->face_materials = 0;
m->indices = 0;
@ -1420,6 +1441,9 @@ fastObjMesh* fast_obj_read_with_callbacks(const char* path, const fastObjCallbac
array_push(m->normals, 0.0f);
array_push(m->normals, 1.0f);
array_push(m->colors, 0.0f);
array_push(m->colors, 0.0f);
array_push(m->colors, 0.0f);
/* Data needed during parsing */
data.mesh = m;
@ -1507,6 +1531,7 @@ fastObjMesh* fast_obj_read_with_callbacks(const char* path, const fastObjCallbac
m->position_count = array_size(m->positions) / 3;
m->texcoord_count = array_size(m->texcoords) / 2;
m->normal_count = array_size(m->normals) / 3;
m->color_count = array_size(m->colors) / 3;
m->face_count = array_size(m->face_vertices);
m->index_count = array_size(m->indices);
m->material_count = array_size(m->materials);