lpnf
/
lovr
mirror of https://github.com/bjornbytes/lovr.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ModelFace always has 3 indices;

This commit is contained in:
bjorn 2016-11-25 03:16:11 -08:00
parent 83af2cacd7
commit 9602a3af2f
3 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/graphics/model.c
View File

@ -50,10 +50,9 @@ static void visitNode(ModelData* modelData, ModelNode* node, mat4 transform, vec
// Face vertex indices
for (int f = 0; f < mesh->faces.length; f++) {
ModelFace face = mesh->faces.data[f];
for (int v = 0; v < face.indices.length; v++) {
vec_push(indices, face.indices.data[v] + indexOffset);
}
vec_push(indices, face.indices[0] + indexOffset);
vec_push(indices, face.indices[1] + indexOffset);
vec_push(indices, face.indices[2] + indexOffset);
}
}

11
src/model/modelData.c
View File

@ -50,13 +50,9 @@ ModelData* lovrModelDataCreateFromFile(void* data, int size) {
}
ModelFace face;
vec_init(&face.indices);
// Indices
for (unsigned int i = 0; i < assimpFace.mNumIndices; i++) {
vec_push(&face.indices, assimpFace.mIndices[i]);
face.indices[i] = assimpFace.mIndices[i];
}
vec_push(&mesh->faces, face);
}
@ -114,11 +110,6 @@ void lovrModelDataDestroy(const Ref* ref) {
for (int i = 0; i < modelData->meshes.length; i++) {
ModelMesh* mesh = modelData->meshes.data[i];
for (int f = 0; f < mesh->faces.length; f++) {
vec_deinit(&mesh->faces.data[f].indices);
}
vec_deinit(&mesh->faces);
vec_deinit(&mesh->vertices);
vec_deinit(&mesh->normals);

2
src/model/modelData.h
View File

@ -19,7 +19,7 @@ typedef struct {
typedef vec_t(ModelVertex) vec_model_vertex_t;
typedef struct {
vec_uint_t indices;
unsigned int indices[3];
} ModelFace;
typedef vec_t(ModelFace) vec_model_face_t;