fixed bug where animated mdl skins (such as Tomaz's health box and

[xonotic/darkplaces.git] / model_shared.c

diff --git a/model_shared.c b/model_shared.c
index 792987814315b8eb5a44431cce23bd3944a5247b..9c63e458bea43b4251615a07248c3faef00edf61 100644 (file)
--- a/model_shared.c
+++ b/model_shared.c
@@ -67,18 +67,14 @@ static void mod_shutdown(void)
 static void mod_newmap(void)
 {
        msurface_t *surface;
-       int i, j, k, numtextures, surfacenum, ssize, tsize;
+       int i, j, k, surfacenum, ssize, tsize;
 
        R_SkinFrame_PrepareForPurge();
        for (i = 0;i < mod_numknown;i++)
        {
                if (mod_known[i].mempool && mod_known[i].data_textures)
                {
-                       numtextures = mod_known[i].num_textures;
-                       // models can have multiple sets of textures
-                       if (mod_known[i].numskins > 1)
-                               numtextures *= mod_known[i].numskins;
-                       for (j = 0;j < numtextures;j++)
+                       for (j = 0;j < mod_known[i].num_textures;j++)
                        {
                                for (k = 0;k < mod_known[i].data_textures[j].numskinframes;k++)
                                        R_SkinFrame_MarkUsed(mod_known[i].data_textures[j].skinframes[k]);
@@ -143,9 +139,9 @@ void Mod_UnloadModel (model_t *mod)
        isworldmodel = mod->isworldmodel;
        used = mod->used;
        if (mod->surfmesh.ebo)
-               R_Mesh_DestroyEBO(mod->surfmesh.ebo);
+               R_Mesh_DestroyBufferObject(mod->surfmesh.ebo);
        if (mod->surfmesh.vbo)
-               R_Mesh_DestroyVBO(mod->surfmesh.vbo);
+               R_Mesh_DestroyBufferObject(mod->surfmesh.vbo);
        // free textures/memory attached to the model
        R_FreeTexturePool(&mod->texturepool);
        Mem_FreePool(&mod->mempool);
@@ -937,7 +933,7 @@ static void Mod_ShadowMesh_CreateVBOs(shadowmesh_t *mesh)
 
        // element buffer is easy because it's just one array
        if (mesh->numtriangles)
-               mesh->ebo = R_Mesh_CreateStaticEBO(mesh->element3i, mesh->numtriangles * sizeof(int[3]));
+               mesh->ebo = R_Mesh_CreateStaticBufferObject(GL_ELEMENT_ARRAY_BUFFER_ARB, mesh->element3i, mesh->numtriangles * sizeof(int[3]), "shadowmesh");
 
        // vertex buffer is several arrays and we put them in the same buffer
        //
@@ -960,7 +956,7 @@ static void Mod_ShadowMesh_CreateVBOs(shadowmesh_t *mesh)
                if (mesh->tvector3f         ) memcpy(mem + mesh->vbooffset_tvector3f         , mesh->tvector3f         , mesh->numverts * sizeof(float[3]));
                if (mesh->normal3f          ) memcpy(mem + mesh->vbooffset_normal3f          , mesh->normal3f          , mesh->numverts * sizeof(float[3]));
                if (mesh->texcoord2f        ) memcpy(mem + mesh->vbooffset_texcoord2f        , mesh->texcoord2f        , mesh->numverts * sizeof(float[2]));
-               mesh->vbo = R_Mesh_CreateStaticVBO(mem, size);
+               mesh->vbo = R_Mesh_CreateStaticBufferObject(GL_ARRAY_BUFFER_ARB, mem, size, "shadowmesh");
                Mem_Free(mem);
        }
 }
@@ -1040,9 +1036,9 @@ void Mod_ShadowMesh_Free(shadowmesh_t *mesh)
        for (;mesh;mesh = nextmesh)
        {
                if (mesh->ebo)
-                       R_Mesh_DestroyEBO(mesh->ebo);
+                       R_Mesh_DestroyBufferObject(mesh->ebo);
                if (mesh->vbo)
-                       R_Mesh_DestroyVBO(mesh->vbo);
+                       R_Mesh_DestroyBufferObject(mesh->vbo);
                nextmesh = mesh->next;
                Mem_Free(mesh);
        }
@@ -1323,7 +1319,7 @@ static void Mod_BuildVBOs(void)
 
        // element buffer is easy because it's just one array
        if (loadmodel->surfmesh.num_triangles)
-               loadmodel->surfmesh.ebo = R_Mesh_CreateStaticEBO(loadmodel->surfmesh.data_element3i, loadmodel->surfmesh.num_triangles * sizeof(int[3]));
+               loadmodel->surfmesh.ebo = R_Mesh_CreateStaticBufferObject(GL_ELEMENT_ARRAY_BUFFER_ARB, loadmodel->surfmesh.data_element3i, loadmodel->surfmesh.num_triangles * sizeof(int[3]), loadmodel->name);
 
        // vertex buffer is several arrays and we put them in the same buffer
        //
@@ -1350,7 +1346,7 @@ static void Mod_BuildVBOs(void)
                if (loadmodel->surfmesh.data_texcoordtexture2f ) memcpy(mem + loadmodel->surfmesh.vbooffset_texcoordtexture2f , loadmodel->surfmesh.data_texcoordtexture2f , loadmodel->surfmesh.num_vertices * sizeof(float[2]));
                if (loadmodel->surfmesh.data_texcoordlightmap2f) memcpy(mem + loadmodel->surfmesh.vbooffset_texcoordlightmap2f, loadmodel->surfmesh.data_texcoordlightmap2f, loadmodel->surfmesh.num_vertices * sizeof(float[2]));
                if (loadmodel->surfmesh.data_lightmapcolor4f   ) memcpy(mem + loadmodel->surfmesh.vbooffset_lightmapcolor4f   , loadmodel->surfmesh.data_lightmapcolor4f   , loadmodel->surfmesh.num_vertices * sizeof(float[4]));
-               loadmodel->surfmesh.vbo = R_Mesh_CreateStaticVBO(mem, size);
+               loadmodel->surfmesh.vbo = R_Mesh_CreateStaticBufferObject(GL_ARRAY_BUFFER_ARB, mem, size, loadmodel->name);
                Mem_Free(mem);
        }
 }