lpnf/lovr
1
0
Fork 0
mirror of https://github.com/bjornbytes/lovr.git synced 2024-07-02 12:33:52 +00:00
Code Issues Projects Releases Wiki Activity

Fix Mesh unmapping;

Browse source
This commit is contained in:
bjorn 2017-04-09 13:40:20 -07:00
parent 30647c97c5
commit 25e6f3ce4e
3 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/api/graphics.c
View file

@ -637,6 +637,8 @@ int l_lovrGraphicsNewMesh(lua_State* L) {
lua_pop(L, 1); lua_pop(L, 1);
} }
lovrMeshUnmap(mesh);
} }
vec_deinit(&format); vec_deinit(&format);

1
src/graphics/model.c
View file

@ -93,6 +93,7 @@ Model* lovrModelCreate(ModelData* modelData) {
model->mesh = lovrMeshCreate(vertices.length / components, &format, MESH_TRIANGLES, MESH_STATIC); model->mesh = lovrMeshCreate(vertices.length / components, &format, MESH_TRIANGLES, MESH_STATIC);
void* data = lovrMeshMap(model->mesh, 0, vertices.length / components); void* data = lovrMeshMap(model->mesh, 0, vertices.length / components);
memcpy(data, vertices.data, vertices.length * sizeof(float)); memcpy(data, vertices.data, vertices.length * sizeof(float));
lovrMeshUnmap(model->mesh);
lovrMeshSetVertexMap(model->mesh, indices.data, indices.length); lovrMeshSetVertexMap(model->mesh, indices.data, indices.length);
model->texture = NULL; model->texture = NULL;

2
src/loaders/model.c
View file

@ -32,7 +32,7 @@ ModelData* lovrModelDataCreate(Blob* blob) {
modelData->hasNormals = 0; modelData->hasNormals = 0;
modelData->hasTexCoords = 0; modelData->hasTexCoords = 0;
unsigned int flags = aiProcessPreset_TargetRealtime_MaxQuality | aiProcess_OptimizeGraph; unsigned int flags = aiProcessPreset_TargetRealtime_MaxQuality | aiProcess_OptimizeGraph | aiProcess_FlipUVs;
const struct aiScene* scene = aiImportFileFromMemory(blob->data, blob->size, flags, NULL); const struct aiScene* scene = aiImportFileFromMemory(blob->data, blob->size, flags, NULL);
// Meshes // Meshes