mirror of
https://github.com/bjornbytes/lovr.git
synced 2024-07-05 05:53:33 +00:00
ModelFace always has 3 indices;
This commit is contained in:
parent
83af2cacd7
commit
9602a3af2f
|
@ -50,10 +50,9 @@ static void visitNode(ModelData* modelData, ModelNode* node, mat4 transform, vec
|
||||||
// Face vertex indices
|
// Face vertex indices
|
||||||
for (int f = 0; f < mesh->faces.length; f++) {
|
for (int f = 0; f < mesh->faces.length; f++) {
|
||||||
ModelFace face = mesh->faces.data[f];
|
ModelFace face = mesh->faces.data[f];
|
||||||
|
vec_push(indices, face.indices[0] + indexOffset);
|
||||||
for (int v = 0; v < face.indices.length; v++) {
|
vec_push(indices, face.indices[1] + indexOffset);
|
||||||
vec_push(indices, face.indices.data[v] + indexOffset);
|
vec_push(indices, face.indices[2] + indexOffset);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -50,13 +50,9 @@ ModelData* lovrModelDataCreateFromFile(void* data, int size) {
|
||||||
}
|
}
|
||||||
|
|
||||||
ModelFace face;
|
ModelFace face;
|
||||||
vec_init(&face.indices);
|
|
||||||
|
|
||||||
// Indices
|
|
||||||
for (unsigned int i = 0; i < assimpFace.mNumIndices; i++) {
|
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);
|
vec_push(&mesh->faces, face);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -114,11 +110,6 @@ void lovrModelDataDestroy(const Ref* ref) {
|
||||||
|
|
||||||
for (int i = 0; i < modelData->meshes.length; i++) {
|
for (int i = 0; i < modelData->meshes.length; i++) {
|
||||||
ModelMesh* mesh = modelData->meshes.data[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->faces);
|
||||||
vec_deinit(&mesh->vertices);
|
vec_deinit(&mesh->vertices);
|
||||||
vec_deinit(&mesh->normals);
|
vec_deinit(&mesh->normals);
|
||||||
|
|
|
@ -19,7 +19,7 @@ typedef struct {
|
||||||
typedef vec_t(ModelVertex) vec_model_vertex_t;
|
typedef vec_t(ModelVertex) vec_model_vertex_t;
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
vec_uint_t indices;
|
unsigned int indices[3];
|
||||||
} ModelFace;
|
} ModelFace;
|
||||||
|
|
||||||
typedef vec_t(ModelFace) vec_model_face_t;
|
typedef vec_t(ModelFace) vec_model_face_t;
|
||||||
|
|
Loading…
Reference in a new issue