#include "image.h"
#include "r_shadow.h"
-cvar_t r_mipskins = {CVAR_SAVE, "r_mipskins", "0", "mipmaps skins (so they become blurrier in the distance), disabled by default because it tends to blur with strange border colors from the skin"};
+cvar_t r_mipskins = {CVAR_SAVE, "r_mipskins", "0", "mipmaps model skins so they render faster in the distance and do not display noise artifacts, can cause discoloration of skins if they contain undesirable border colors"};
model_t *loadmodel;
-#if 0
-// LordHavoc: was 512
-static int mod_numknown = 0;
-static int mod_maxknown = 0;
-static model_t *mod_known = NULL;
-#else
-// LordHavoc: was 512
-#define MAX_MOD_KNOWN (MAX_MODELS + 256)
-static int mod_numknown = 0;
-static int mod_maxknown = MAX_MOD_KNOWN;
-static model_t mod_known[MAX_MOD_KNOWN];
-#endif
+static mempool_t *mod_mempool;
+static memexpandablearray_t models;
static void mod_start(void)
{
int i;
+ int nummodels = Mem_ExpandableArray_IndexRange(&models);
model_t *mod;
- for (i = 0, mod = mod_known;i < mod_numknown;i++, mod++)
- if (mod->name[0] && mod->name[0] != '*')
+ for (i = 0;i < nummodels;i++)
+ if ((mod = Mem_ExpandableArray_RecordAtIndex(&models, i)) && mod->name[0] && mod->name[0] != '*')
if (mod->used)
Mod_LoadModel(mod, true, false, mod->isworldmodel);
}
static void mod_shutdown(void)
{
int i;
+ int nummodels = Mem_ExpandableArray_IndexRange(&models);
model_t *mod;
- for (i = 0, mod = mod_known;i < mod_numknown;i++, mod++)
- if (mod->loaded || mod->mempool)
+ for (i = 0;i < nummodels;i++)
+ if ((mod = Mem_ExpandableArray_RecordAtIndex(&models, i)) && (mod->loaded || mod->mempool))
Mod_UnloadModel(mod);
}
static void mod_newmap(void)
{
msurface_t *surface;
- int i, j, k, numtextures, surfacenum, ssize, tsize;
+ int i, j, k, surfacenum, ssize, tsize;
+ int nummodels = Mem_ExpandableArray_IndexRange(&models);
+ model_t *mod;
R_SkinFrame_PrepareForPurge();
- for (i = 0;i < mod_numknown;i++)
+ for (i = 0;i < nummodels;i++)
{
- if (mod_known[i].mempool && mod_known[i].data_textures)
+ if ((mod = Mem_ExpandableArray_RecordAtIndex(&models, i)) && mod->mempool && mod->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->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]);
- for (k = 0;k < mod_known[i].data_textures[j].backgroundnumskinframes;k++)
- R_SkinFrame_MarkUsed(mod_known[i].data_textures[j].backgroundskinframes[k]);
+ for (k = 0;k < mod->data_textures[j].numskinframes;k++)
+ R_SkinFrame_MarkUsed(mod->data_textures[j].skinframes[k]);
+ for (k = 0;k < mod->data_textures[j].backgroundnumskinframes;k++)
+ R_SkinFrame_MarkUsed(mod->data_textures[j].backgroundskinframes[k]);
}
}
}
if (!cl_stainmaps_clearonload.integer)
return;
- for (i = 0;i < mod_numknown;i++)
+ for (i = 0;i < nummodels;i++)
{
- if (mod_known[i].mempool && mod_known[i].data_surfaces)
+ if ((mod = Mem_ExpandableArray_RecordAtIndex(&models, i)) && mod->mempool && mod->data_surfaces)
{
- for (surfacenum = 0, surface = mod_known[i].data_surfaces;surfacenum < mod_known[i].num_surfaces;surfacenum++, surface++)
+ for (surfacenum = 0, surface = mod->data_surfaces;surfacenum < mod->num_surfaces;surfacenum++, surface++)
{
if (surface->lightmapinfo && surface->lightmapinfo->stainsamples)
{
static void Mod_BuildVBOs(void);
void Mod_Init (void)
{
+ mod_mempool = Mem_AllocPool("modelinfo", 0, NULL);
+ Mem_ExpandableArray_NewArray(&models, mod_mempool, sizeof(model_t), 16);
+
Mod_BrushInit();
Mod_AliasInit();
Mod_SpriteInit();
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);
void Mod_ClearUsed(void)
{
-#if 0
int i;
+ int nummodels = Mem_ExpandableArray_IndexRange(&models);
model_t *mod;
-
- for (i = 0, mod = mod_known;i < mod_numknown;i++, mod++)
- if (mod->name[0])
+ for (i = 0;i < nummodels;i++)
+ if ((mod = Mem_ExpandableArray_RecordAtIndex(&models, i)) && mod->name[0])
mod->used = false;
-#endif
}
void Mod_PurgeUnused(void)
{
int i;
+ int nummodels = Mem_ExpandableArray_IndexRange(&models);
model_t *mod;
-
- for (i = 0, mod = mod_known;i < mod_numknown;i++, mod++)
- if (mod->name[0])
- if (!mod->used)
- Mod_UnloadModel(mod);
+ for (i = 0;i < nummodels;i++)
+ {
+ if ((mod = Mem_ExpandableArray_RecordAtIndex(&models, i)) && mod->name[0] && !mod->used)
+ {
+ Mod_UnloadModel(mod);
+ Mem_ExpandableArray_FreeRecord(&models, mod);
+ }
+ }
}
// only used during loading!
void Mod_RemoveStaleWorldModels(model_t *skip)
{
int i;
+ int nummodels = Mem_ExpandableArray_IndexRange(&models);
model_t *mod;
-
- for (i = 0, mod = mod_known;i < mod_numknown;i++, mod++)
+ for (i = 0;i < nummodels;i++)
{
- if (mod->isworldmodel && mod->loaded && skip != mod)
+ if ((mod = Mem_ExpandableArray_RecordAtIndex(&models, i)) && mod->isworldmodel && mod->loaded && skip != mod)
{
Mod_UnloadModel(mod);
mod->isworldmodel = false;
model_t *Mod_FindName(const char *name)
{
int i;
+ int nummodels = Mem_ExpandableArray_IndexRange(&models);
model_t *mod;
if (!name[0])
Host_Error ("Mod_ForName: NULL name");
-// search the currently loaded models
- for (i = 0, mod = mod_known;i < mod_numknown;i++, mod++)
+ // search the currently loaded models
+ for (i = 0;i < nummodels;i++)
{
- if (mod->name[0] && !strcmp(mod->name, name))
+ if ((mod = Mem_ExpandableArray_RecordAtIndex(&models, i)) && mod->name[0] && !strcmp(mod->name, name))
{
mod->used = true;
return mod;
}
}
- // no match found, find room for a new one
- for (i = 0;i < mod_numknown;i++)
- if (!mod_known[i].name[0])
- break;
-
- if (mod_maxknown == i)
- {
-#if 0
- model_t *old;
- mod_maxknown += 256;
- old = mod_known;
- mod_known = Mem_Alloc(mod_mempool, mod_maxknown * sizeof(model_t));
- if (old)
- {
- memcpy(mod_known, old, mod_numknown * sizeof(model_t));
- Mem_Free(old);
- }
-#else
- Host_Error ("Mod_FindName: ran out of models");
-#endif
- }
- if (mod_numknown == i)
- mod_numknown++;
- mod = mod_known + i;
- strlcpy (mod->name, name, sizeof(mod->name));
+ // no match found, create a new one
+ mod = Mem_ExpandableArray_AllocRecord(&models);
+ strlcpy(mod->name, name, sizeof(mod->name));
mod->loaded = false;
mod->used = true;
return mod;
Reloads all models if they have changed
==================
*/
-void Mod_Reload()
+void Mod_Reload(void)
{
int i;
+ int nummodels = Mem_ExpandableArray_IndexRange(&models);
model_t *mod;
-
- for (i = 0, mod = mod_known;i < mod_numknown;i++, mod++)
- if (mod->name[0] && mod->name[0] != '*')
- if (mod->used)
- Mod_LoadModel(mod, true, true, mod->isworldmodel);
+ for (i = 0;i < nummodels;i++)
+ if ((mod = Mem_ExpandableArray_RecordAtIndex(&models, i)) && mod->name[0] && mod->name[0] != '*' && mod->used)
+ Mod_LoadModel(mod, true, true, mod->isworldmodel);
}
unsigned char *mod_base;
*/
static void Mod_Print(void)
{
- int i;
- model_t *mod;
+ int i;
+ int nummodels = Mem_ExpandableArray_IndexRange(&models);
+ model_t *mod;
Con_Print("Loaded models:\n");
- for (i = 0, mod = mod_known;i < mod_numknown;i++, mod++)
- if (mod->name[0])
+ for (i = 0;i < nummodels;i++)
+ if ((mod = Mem_ExpandableArray_RecordAtIndex(&models, i)) && mod->name[0])
Con_Printf("%4iK %s\n", mod->mempool ? (int)((mod->mempool->totalsize + 1023) / 1024) : 0, mod->name);
}
// 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
//
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);
}
}
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);
}
for(line = 0;;line++)
{
// parse line
- if (!COM_ParseToken(&data, true))
+ if (!COM_ParseToken_QuakeC(&data, true))
break;
if (!strcmp(com_token, "\n"))
continue;
else
wordsoverflow = true;
}
- while (COM_ParseToken(&data, true) && strcmp(com_token, "\n"));
+ while (COM_ParseToken_QuakeC(&data, true) && strcmp(com_token, "\n"));
if (wordsoverflow)
{
Con_Printf("Mod_LoadSkinFiles: parsing error in file \"%s_%i.skin\" on line #%i: line with too many statements, skipping\n", loadmodel->name, i, line);
// 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
//
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);
}
}
projects / xonotic / darkplaces.git / blobdiff