static void mod_start(void)
{
int i;
- for (i = 0;i < MAX_MOD_KNOWN;i++)
- if (mod_known[i].name[0])
- Mod_UnloadModel(&mod_known[i]);
- Mod_LoadModels();
+ model_t *mod;
+
+ for (i = 0, mod = mod_known;i < MAX_MOD_KNOWN;i++, mod++)
+ if (mod->name[0])
+ if (mod->used)
+ Mod_LoadModel(mod, true, false, mod->isworldmodel);
}
static void mod_shutdown(void)
{
int i;
- for (i = 0;i < MAX_MOD_KNOWN;i++)
- if (mod_known[i].name[0])
- Mod_UnloadModel(&mod_known[i]);
+ model_t *mod;
+
+ for (i = 0, mod = mod_known;i < MAX_MOD_KNOWN;i++, mod++)
+ if (mod->loaded)
+ Mod_UnloadModel(mod);
}
static void mod_newmap(void)
for (i = 0;i < MAX_MOD_KNOWN;i++)
{
- if (mod_known[i].name[0])
+ if (mod_known[i].mempool && mod_known[i].data_surfaces)
{
for (surfacenum = 0, surface = mod_known[i].data_surfaces;surfacenum < mod_known[i].num_surfaces;surfacenum++, surface++)
{
R_RegisterModule("Models", mod_start, mod_shutdown, mod_newmap);
}
-void Mod_FreeModel (model_t *mod)
-{
- R_FreeTexturePool(&mod->texturepool);
- Mem_FreePool(&mod->mempool);
-
- // clear the struct to make it available
- memset(mod, 0, sizeof(model_t));
-}
-
void Mod_UnloadModel (model_t *mod)
{
char name[MAX_QPATH];
strcpy(name, mod->name);
isworldmodel = mod->isworldmodel;
used = mod->used;
- Mod_FreeModel(mod);
+ // free textures/memory attached to the model
+ R_FreeTexturePool(&mod->texturepool);
+ Mem_FreePool(&mod->mempool);
+ // clear the struct to make it available
+ memset(mod, 0, sizeof(model_t));
+ // restore the fields we want to preserve
strcpy(mod->name, name);
mod->isworldmodel = isworldmodel;
mod->used = used;
buf = FS_LoadFile (mod->name, tempmempool, false);
if (buf)
{
- crc = CRC_Block(buf, fs_filesize);
+ crc = CRC_Block((unsigned char *)buf, fs_filesize);
if (mod->crc != crc)
mod->loaded = false;
}
Con_DPrintf("loading model %s\n", mod->name);
// LordHavoc: unload the existing model in this slot (if there is one)
- Mod_UnloadModel(mod);
+ if (mod->loaded)
+ Mod_UnloadModel(mod);
// load the model
mod->isworldmodel = isworldmodel;
if (buf)
{
- char *bufend = buf + fs_filesize;
+ char *bufend = (char *)buf + fs_filesize;
num = LittleLong(*((int *)buf));
// call the apropriate loader
loadmodel = mod;
else if (!memcmp(buf, "IBSP", 4)) Mod_IBSP_Load(mod, buf, bufend);
else if (!memcmp(buf, "ZYMOTICMODEL", 12)) Mod_ZYMOTICMODEL_Load(mod, buf, bufend);
else if (!memcmp(buf, "DARKPLACESMODEL", 16)) Mod_DARKPLACESMODEL_Load(mod, buf, bufend);
+ else if (!memcmp(buf, "ACTRHEAD", 8)) Mod_PSKMODEL_Load(mod, buf, bufend);
else if (strlen(mod->name) >= 4 && !strcmp(mod->name - 4, ".map")) Mod_MAP_Load(mod, buf, bufend);
+ else if (!memcmp(buf, "MCBSPpad", 8)) Mod_Q1BSP_Load(mod, buf, bufend);
else if (num == BSPVERSION || num == 30) Mod_Q1BSP_Load(mod, buf, bufend);
else Con_Printf("Mod_LoadModel: model \"%s\" is of unknown/unsupported type\n", mod->name);
Mem_Free(buf);
void Mod_ClearUsed(void)
{
+#if 0
int i;
model_t *mod;
for (i = 0, mod = mod_known;i < MAX_MOD_KNOWN;i++, mod++)
if (mod->name[0])
mod->used = false;
+#endif
}
void Mod_PurgeUnused(void)
for (i = 0, mod = mod_known;i < MAX_MOD_KNOWN;i++, mod++)
if (mod->name[0])
if (!mod->used)
- Mod_FreeModel(mod);
+ Mod_UnloadModel(mod);
}
// only used during loading!
void Mod_RemoveStaleWorldModels(model_t *skip)
-{
- int i;
- for (i = 0;i < MAX_MOD_KNOWN;i++)
- if (mod_known[i].isworldmodel && skip != &mod_known[i])
- Mod_UnloadModel(mod_known + i);
-}
-
-void Mod_LoadModels(void)
{
int i;
model_t *mod;
for (i = 0, mod = mod_known;i < MAX_MOD_KNOWN;i++, mod++)
- if (mod->name[0])
- if (mod->used)
- Mod_CheckLoaded(mod);
+ {
+ if (mod->isworldmodel && mod->loaded && skip != mod)
+ {
+ Mod_UnloadModel(mod);
+ mod->isworldmodel = false;
+ mod->used = false;
+ }
+ }
}
/*
*/
model_t *Mod_ForName(const char *name, qboolean crash, qboolean checkdisk, qboolean isworldmodel)
{
- return Mod_LoadModel(Mod_FindName(name), crash, checkdisk, isworldmodel);
+ model_t *model;
+ model = Mod_FindName(name);
+ if (model->name[0] != '*' && (!model->loaded || checkdisk))
+ Mod_LoadModel(model, crash, checkdisk, isworldmodel);
+ return model;
}
-qbyte *mod_base;
+unsigned char *mod_base;
//=============================================================================
int Mod_BuildVertexRemapTableFromElements(int numelements, const int *elements, int numvertices, int *remapvertices)
{
int i, count;
- qbyte *used;
- used = Mem_Alloc(tempmempool, numvertices);
+ unsigned char *used;
+ used = (unsigned char *)Mem_Alloc(tempmempool, numvertices);
memset(used, 0, numvertices);
for (i = 0;i < numelements;i++)
used[elements[i]] = 1;
edgehashentries = edgehashentriesbuffer;
// if there are too many triangles for the stack array, allocate larger buffer
if (numtriangles > TRIANGLEEDGEHASH)
- edgehashentries = Mem_Alloc(tempmempool, numtriangles * 3 * sizeof(edgehashentry_t));
+ edgehashentries = (edgehashentry_t *)Mem_Alloc(tempmempool, numtriangles * 3 * sizeof(edgehashentry_t));
// find neighboring triangles
for (i = 0, e = elements, n = neighbors;i < numtriangles;i++, e += 3, n += 3)
{
}
#endif
-void Mod_ValidateElements(const int *elements, int numtriangles, int numverts, const char *filename, int fileline)
+void Mod_ValidateElements(int *elements, int numtriangles, int numverts, const char *filename, int fileline)
{
- int i;
+ int i, warned = false;
for (i = 0;i < numtriangles * 3;i++)
+ {
if ((unsigned int)elements[i] >= (unsigned int)numverts)
- Con_Printf("Mod_ValidateElements: out of bounds element detected at %s:%d\n", filename, fileline);
+ {
+ if (!warned)
+ {
+ warned = true;
+ Con_Printf("Mod_ValidateElements: out of bounds elements detected at %s:%d\n", filename, fileline);
+ }
+ elements[i] = 0;
+ }
+ }
}
// warning: this is an expensive function!
VectorNormalize(v);
}
-surfmesh_t *Mod_AllocSurfMesh(mempool_t *mempool, int numvertices, int numtriangles, qboolean detailtexcoords, qboolean lightmapoffsets, qboolean vertexcolors, qboolean neighbors)
+surfmesh_t *Mod_AllocSurfMesh(mempool_t *mempool, int numvertices, int numtriangles, qboolean lightmapoffsets, qboolean vertexcolors, qboolean neighbors)
{
surfmesh_t *mesh;
- qbyte *data;
- mesh = Mem_Alloc(mempool, sizeof(surfmesh_t) + numvertices * (3 + 3 + 3 + 3 + 2 + 2 + (detailtexcoords ? 2 : 0) + (vertexcolors ? 4 : 0)) * sizeof(float) + numvertices * (lightmapoffsets ? 1 : 0) * sizeof(int) + numtriangles * (3 + 3 + (neighbors ? 3 : 0)) * sizeof(int));
+ unsigned char *data;
+ mesh = (surfmesh_t *)Mem_Alloc(mempool, sizeof(surfmesh_t) + numvertices * (3 + 3 + 3 + 3 + 2 + 2 + (vertexcolors ? 4 : 0)) * sizeof(float) + numvertices * (lightmapoffsets ? 1 : 0) * sizeof(int) + numtriangles * (3 + (neighbors ? 3 : 0)) * sizeof(int));
mesh->num_vertices = numvertices;
mesh->num_triangles = numtriangles;
- data = (qbyte *)(mesh + 1);
+ data = (unsigned char *)(mesh + 1);
if (mesh->num_vertices)
{
mesh->data_vertex3f = (float *)data, data += sizeof(float[3]) * mesh->num_vertices;
mesh->data_normal3f = (float *)data, data += sizeof(float[3]) * mesh->num_vertices;
mesh->data_texcoordtexture2f = (float *)data, data += sizeof(float[2]) * mesh->num_vertices;
mesh->data_texcoordlightmap2f = (float *)data, data += sizeof(float[2]) * mesh->num_vertices;
- if (detailtexcoords)
- mesh->data_texcoorddetail2f = (float *)data, data += sizeof(float[2]) * mesh->num_vertices;
if (vertexcolors)
mesh->data_lightmapcolor4f = (float *)data, data += sizeof(float[4]) * mesh->num_vertices;
if (lightmapoffsets)
}
if (mesh->num_triangles)
{
- mesh->data_element3i = (int *)data, data += sizeof(int[3]) * mesh->num_triangles;
mesh->data_element3i = (int *)data, data += sizeof(int[3]) * mesh->num_triangles;
if (neighbors)
mesh->data_neighbor3i = (int *)data, data += sizeof(int[3]) * mesh->num_triangles;
shadowmesh_t *Mod_ShadowMesh_Alloc(mempool_t *mempool, int maxverts, int maxtriangles, rtexture_t *map_diffuse, rtexture_t *map_specular, rtexture_t *map_normal, int light, int neighbors, int expandable)
{
shadowmesh_t *newmesh;
- qbyte *data;
+ unsigned char *data;
int size;
size = sizeof(shadowmesh_t);
size += maxverts * sizeof(float[3]);
size += maxtriangles * sizeof(int[3]);
if (expandable)
size += SHADOWMESHVERTEXHASH * sizeof(shadowmeshvertexhash_t *) + maxverts * sizeof(shadowmeshvertexhash_t);
- data = Mem_Alloc(mempool, size);
- newmesh = (void *)data;data += sizeof(*newmesh);
+ data = (unsigned char *)Mem_Alloc(mempool, size);
+ newmesh = (shadowmesh_t *)data;data += sizeof(*newmesh);
newmesh->map_diffuse = map_diffuse;
newmesh->map_specular = map_specular;
newmesh->map_normal = map_normal;
newmesh->numverts = 0;
newmesh->numtriangles = 0;
- newmesh->vertex3f = (void *)data;data += maxverts * sizeof(float[3]);
+ newmesh->vertex3f = (float *)data;data += maxverts * sizeof(float[3]);
if (light)
{
- newmesh->svector3f = (void *)data;data += maxverts * sizeof(float[3]);
- newmesh->tvector3f = (void *)data;data += maxverts * sizeof(float[3]);
- newmesh->normal3f = (void *)data;data += maxverts * sizeof(float[3]);
- newmesh->texcoord2f = (void *)data;data += maxverts * sizeof(float[2]);
+ newmesh->svector3f = (float *)data;data += maxverts * sizeof(float[3]);
+ newmesh->tvector3f = (float *)data;data += maxverts * sizeof(float[3]);
+ newmesh->normal3f = (float *)data;data += maxverts * sizeof(float[3]);
+ newmesh->texcoord2f = (float *)data;data += maxverts * sizeof(float[2]);
}
- newmesh->element3i = (void *)data;data += maxtriangles * sizeof(int[3]);
+ newmesh->element3i = (int *)data;data += maxtriangles * sizeof(int[3]);
if (neighbors)
{
- newmesh->neighbor3i = (void *)data;data += maxtriangles * sizeof(int[3]);
+ newmesh->neighbor3i = (int *)data;data += maxtriangles * sizeof(int[3]);
}
if (expandable)
{
- newmesh->vertexhashtable = (void *)data;data += SHADOWMESHVERTEXHASH * sizeof(shadowmeshvertexhash_t *);
- newmesh->vertexhashentries = (void *)data;data += maxverts * sizeof(shadowmeshvertexhash_t);
+ newmesh->vertexhashtable = (shadowmeshvertexhash_t **)data;data += SHADOWMESHVERTEXHASH * sizeof(shadowmeshvertexhash_t *);
+ newmesh->vertexhashentries = (shadowmeshvertexhash_t *)data;data += maxverts * sizeof(shadowmeshvertexhash_t);
}
return newmesh;
}
shadowmesh_t *mesh;
vec3_t nmins, nmaxs, ncenter, temp;
float nradius2, dist2, *v;
+ VectorClear(nmins);
+ VectorClear(nmaxs);
// calculate bbox
for (mesh = firstmesh;mesh;mesh = mesh->next)
{
}
}
-static rtexture_t *GL_TextureForSkinLayer(const qbyte *in, int width, int height, const char *name, const unsigned int *palette, int textureflags)
+static rtexture_t *GL_TextureForSkinLayer(const unsigned char *in, int width, int height, const char *name, const unsigned int *palette, int textureflags)
{
int i;
for (i = 0;i < width*height;i++)
- if (((qbyte *)&palette[in[i]])[3] > 0)
+ if (((unsigned char *)&palette[in[i]])[3] > 0)
return R_LoadTexture2D (loadmodel->texturepool, name, width, height, in, TEXTYPE_PALETTE, textureflags, palette);
return NULL;
}
-static int detailtexturecycle = 0;
-int Mod_LoadSkinFrame(skinframe_t *skinframe, char *basename, int textureflags, int loadpantsandshirt, int usedetailtexture, int loadglowtexture)
+int Mod_LoadSkinFrame(skinframe_t *skinframe, char *basename, int textureflags, int loadpantsandshirt, int loadglowtexture)
{
imageskin_t s;
memset(skinframe, 0, sizeof(*skinframe));
if (!image_loadskin(&s, basename))
return false;
- if (usedetailtexture)
- skinframe->detail = r_texture_detailtextures[(detailtexturecycle++) % NUM_DETAILTEXTURES];
skinframe->base = R_LoadTexture2D (loadmodel->texturepool, basename, s.basepixels_width, s.basepixels_height, s.basepixels, TEXTYPE_RGBA, textureflags, NULL);
if (s.nmappixels != NULL)
skinframe->nmap = R_LoadTexture2D (loadmodel->texturepool, va("%s_nmap", basename), s.nmappixels_width, s.nmappixels_height, s.nmappixels, TEXTYPE_RGBA, textureflags, NULL);
if (s.shirtpixels != NULL)
skinframe->shirt = R_LoadTexture2D (loadmodel->texturepool, va("%s_shirt", basename), s.shirtpixels_width, s.shirtpixels_height, s.shirtpixels, TEXTYPE_RGBA, textureflags, NULL);
}
+ if (!skinframe->base)
+ skinframe->base = r_texture_notexture;
+ if (!skinframe->nmap)
+ skinframe->nmap = r_texture_blanknormalmap;
image_freeskin(&s);
return true;
}
-int Mod_LoadSkinFrame_Internal(skinframe_t *skinframe, char *basename, int textureflags, int loadpantsandshirt, int usedetailtexture, int loadglowtexture, qbyte *skindata, int width, int height)
+int Mod_LoadSkinFrame_Internal(skinframe_t *skinframe, char *basename, int textureflags, int loadpantsandshirt, int loadglowtexture, unsigned char *skindata, int width, int height)
{
- qbyte *temp1, *temp2;
+ unsigned char *temp1, *temp2;
memset(skinframe, 0, sizeof(*skinframe));
if (!skindata)
return false;
- if (usedetailtexture)
- skinframe->detail = r_texture_detailtextures[(detailtexturecycle++) % NUM_DETAILTEXTURES];
if (r_shadow_bumpscale_basetexture.value > 0)
{
- temp1 = Mem_Alloc(loadmodel->mempool, width * height * 8);
+ temp1 = (unsigned char *)Mem_Alloc(loadmodel->mempool, width * height * 8);
temp2 = temp1 + width * height * 4;
Image_Copy8bitRGBA(skindata, temp1, width * height, palette_nofullbrights);
Image_HeightmapToNormalmap(temp1, temp2, width, height, false, r_shadow_bumpscale_basetexture.value);
skinframe->base = GL_TextureForSkinLayer(skindata, width, height, va("%s_nospecial", basename), palette_nocolormap, textureflags); // no pants or shirt
}
}
+ if (!skinframe->nmap)
+ skinframe->nmap = r_texture_blanknormalmap;
return true;
}
-void Mod_GetTerrainVertex3fTexCoord2fFromRGBA(const qbyte *imagepixels, int imagewidth, int imageheight, int ix, int iy, float *vertex3f, float *texcoord2f, matrix4x4_t *pixelstepmatrix, matrix4x4_t *pixeltexturestepmatrix)
+void Mod_GetTerrainVertex3fTexCoord2fFromRGBA(const unsigned char *imagepixels, int imagewidth, int imageheight, int ix, int iy, float *vertex3f, float *texcoord2f, matrix4x4_t *pixelstepmatrix, matrix4x4_t *pixeltexturestepmatrix)
{
float v[3], tc[3];
v[0] = ix;
texcoord2f[1] = tc[1];
}
-void Mod_GetTerrainVertexFromRGBA(const qbyte *imagepixels, int imagewidth, int imageheight, int ix, int iy, float *vertex3f, float *svector3f, float *tvector3f, float *normal3f, float *texcoord2f, matrix4x4_t *pixelstepmatrix, matrix4x4_t *pixeltexturestepmatrix)
+void Mod_GetTerrainVertexFromRGBA(const unsigned char *imagepixels, int imagewidth, int imageheight, int ix, int iy, float *vertex3f, float *svector3f, float *tvector3f, float *normal3f, float *texcoord2f, matrix4x4_t *pixelstepmatrix, matrix4x4_t *pixeltexturestepmatrix)
{
float vup[3], vdown[3], vleft[3], vright[3];
float tcup[3], tcdown[3], tcleft[3], tcright[3];
VectorAdd(normal3f, nl, normal3f);
}
-void Mod_ConstructTerrainPatchFromRGBA(const qbyte *imagepixels, int imagewidth, int imageheight, int x1, int y1, int width, int height, int *element3i, int *neighbor3i, float *vertex3f, float *svector3f, float *tvector3f, float *normal3f, float *texcoord2f, matrix4x4_t *pixelstepmatrix, matrix4x4_t *pixeltexturestepmatrix)
+void Mod_ConstructTerrainPatchFromRGBA(const unsigned char *imagepixels, int imagewidth, int imageheight, int x1, int y1, int width, int height, int *element3i, int *neighbor3i, float *vertex3f, float *svector3f, float *tvector3f, float *normal3f, float *texcoord2f, matrix4x4_t *pixelstepmatrix, matrix4x4_t *pixeltexturestepmatrix)
{
int x, y, ix, iy, *e;
e = element3i;
*/
memset(tagsets, 0, sizeof(tagsets));
memset(word, 0, sizeof(word));
- for (i = 0;i < MAX_SKINS && (data = text = FS_LoadFile(va("%s_%i.skin", loadmodel->name, i), tempmempool, true));i++)
+ for (i = 0;i < MAX_SKINS && (data = text = (char *)FS_LoadFile(va("%s_%i.skin", loadmodel->name, i), tempmempool, true));i++)
{
numtags = 0;
// If it's the first file we parse
if (skinfile == NULL)
{
- skinfile = Mem_Alloc(tempmempool, sizeof(skinfile_t));
+ skinfile = (skinfile_t *)Mem_Alloc(tempmempool, sizeof(skinfile_t));
first = skinfile;
}
else
{
- skinfile->next = Mem_Alloc(tempmempool, sizeof(skinfile_t));
+ skinfile->next = (skinfile_t *)Mem_Alloc(tempmempool, sizeof(skinfile_t));
skinfile = skinfile->next;
}
skinfile->next = NULL;
if (words == 3)
{
Con_DPrintf("Mod_LoadSkinFiles: parsed mesh \"%s\" shader replacement \"%s\"\n", word[1], word[2]);
- skinfileitem = Mem_Alloc(tempmempool, sizeof(skinfileitem_t));
+ skinfileitem = (skinfileitem_t *)Mem_Alloc(tempmempool, sizeof(skinfileitem_t));
skinfileitem->next = skinfile->items;
skinfile->items = skinfileitem;
strlcpy (skinfileitem->name, word[1], sizeof (skinfileitem->name));
{
// mesh shader name, like "U_RArm,models/players/Legoman/BikerA1.tga"
Con_DPrintf("Mod_LoadSkinFiles: parsed mesh \"%s\" shader replacement \"%s\"\n", word[0], word[2]);
- skinfileitem = Mem_Alloc(tempmempool, sizeof(skinfileitem_t));
+ skinfileitem = (skinfileitem_t *)Mem_Alloc(tempmempool, sizeof(skinfileitem_t));
skinfileitem->next = skinfile->items;
skinfile->items = skinfileitem;
strlcpy (skinfileitem->name, word[0], sizeof (skinfileitem->name));
overridetagnameset_t *t;
t = tagsets + i;
t->num_overridetagnames = numtags;
- t->data_overridetagnames = Mem_Alloc(loadmodel->mempool, t->num_overridetagnames * sizeof(overridetagname_t));
+ t->data_overridetagnames = (overridetagname_t *)Mem_Alloc(loadmodel->mempool, t->num_overridetagnames * sizeof(overridetagname_t));
memcpy(t->data_overridetagnames, tags, t->num_overridetagnames * sizeof(overridetagname_t));
tagsetsused = true;
}
}
if (tagsetsused)
{
- loadmodel->data_overridetagnamesforskin = Mem_Alloc(loadmodel->mempool, i * sizeof(overridetagnameset_t));
+ loadmodel->data_overridetagnamesforskin = (overridetagnameset_t *)Mem_Alloc(loadmodel->mempool, i * sizeof(overridetagnameset_t));
memcpy(loadmodel->data_overridetagnamesforskin, tagsets, i * sizeof(overridetagnameset_t));
}
if (i)
projects / xonotic / darkplaces.git / blobdiff