UnrealXR/raylib
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Do not free model mesh

Browse source
This commit is contained in:
raysan5 2016-03-01 15:37:01 +01:00
parent 04caf1c262
commit 8ca6f8c6ec
1 changed files with 19 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/models.c
View file

@ -575,7 +575,7 @@ Model LoadModel(const char *fileName)
// NOTE: model properties (transform, texture, shader) are initialized inside rlglLoadModel() // NOTE: model properties (transform, texture, shader) are initialized inside rlglLoadModel()
model = rlglLoadModel(mesh); // Upload vertex data to GPU model = rlglLoadModel(mesh); // Upload vertex data to GPU
// Now that vertex data is uploaded to GPU, we can free arrays // Now that vertex data is uploaded to GPU VRAM, we can free arrays from CPU RAM
// NOTE 1: We don't need CPU vertex data on OpenGL 3.3 or ES2... for static meshes... // NOTE 1: We don't need CPU vertex data on OpenGL 3.3 or ES2... for static meshes...
// NOTE 2: ...but we could keep CPU vertex data in case we need to update the mesh // NOTE 2: ...but we could keep CPU vertex data in case we need to update the mesh
@ -718,15 +718,8 @@ Model LoadHeightmap(Image heightmap, Vector3 size)
Model model = rlglLoadModel(mesh); Model model = rlglLoadModel(mesh);
// Now that vertex data is uploaded to GPU, we can free arrays // Now that vertex data is uploaded to GPU VRAM, we can free arrays from CPU RAM...
// NOTE: We don't need CPU vertex data on OpenGL 3.3 or ES2 // ...but we keep CPU RAM vertex data in case we need to update the mesh
if (rlGetVersion() != OPENGL_11)
{
free(mesh.vertices);
free(mesh.texcoords);
free(mesh.normals);
free(mesh.colors);
}
return model; return model;
} }
@ -1093,15 +1086,8 @@ Model LoadCubicmap(Image cubicmap)
Model model = rlglLoadModel(mesh); Model model = rlglLoadModel(mesh);
// Now that vertex data is uploaded to GPU, we can free arrays // Now that vertex data is uploaded to GPU VRAM, we can free arrays from CPU RAM...
// NOTE: We don't need CPU vertex data on OpenGL 3.3 or ES2 // ...but we keep CPU RAM vertex data in case we need to update the mesh
if (rlGetVersion() != OPENGL_11)
{
free(mesh.vertices);
free(mesh.texcoords);
free(mesh.normals);
free(mesh.colors);
}
return model; return model;
} }
@ -1109,16 +1095,20 @@ Model LoadCubicmap(Image cubicmap)
// Unload 3d model from memory // Unload 3d model from memory
void UnloadModel(Model model) void UnloadModel(Model model)
{ {
if (rlGetVersion() == OPENGL_11) // Unload mesh data
{ free(model.mesh.vertices);
free(model.mesh.vertices); free(model.mesh.texcoords);
free(model.mesh.texcoords); free(model.mesh.normals);
free(model.mesh.normals); if (model.mesh.texcoords2 != NULL) free(model.mesh.texcoords2);
} if (model.mesh.tangents != NULL) free(model.mesh.tangents);
if (model.mesh.colors != NULL) free(model.mesh.colors);
rlDeleteBuffers(model.mesh.vboId[0]);
rlDeleteBuffers(model.mesh.vboId[1]); rlDeleteBuffers(model.mesh.vboId[0]); // vertex
rlDeleteBuffers(model.mesh.vboId[2]); rlDeleteBuffers(model.mesh.vboId[1]); // texcoords
rlDeleteBuffers(model.mesh.vboId[2]); // normals
rlDeleteBuffers(model.mesh.vboId[3]); // texcoords2
rlDeleteBuffers(model.mesh.vboId[4]); // tangents
rlDeleteBuffers(model.mesh.vboId[5]); // colors
rlDeleteVertexArrays(model.mesh.vaoId); rlDeleteVertexArrays(model.mesh.vaoId);