X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=model_shared.c;h=ad05c4e496f1b6ab1947df4f7270371b56730081;hb=0d69d44e91a3d878e74e6ae7640792bfde38fc68;hp=bbed73d4c9fa2b1c8a6245d2e3b2f409270666af;hpb=fab6eb344365652bd53d03faa1ea43e14fbe1d7f;p=xonotic%2Fdarkplaces.git diff --git a/model_shared.c b/model_shared.c index bbed73d4..ad05c4e4 100644 --- a/model_shared.c +++ b/model_shared.c @@ -26,21 +26,30 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "image.h" #include "r_shadow.h" -cvar_t r_mipskins = {CVAR_SAVE, "r_mipskins", "0"}; +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"}; 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 void mod_start(void) { int i; model_t *mod; - for (i = 0, mod = mod_known;i < MAX_MOD_KNOWN;i++, mod++) - if (mod->name[0]) + 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, false, mod->isworldmodel); } @@ -50,8 +59,8 @@ static void mod_shutdown(void) int i; model_t *mod; - for (i = 0, mod = mod_known;i < MAX_MOD_KNOWN;i++, mod++) - if (mod->loaded) + for (i = 0, mod = mod_known;i < mod_numknown;i++, mod++) + if (mod->loaded || mod->mempool) Mod_UnloadModel(mod); } @@ -63,7 +72,7 @@ static void mod_newmap(void) if (!cl_stainmaps_clearonload.integer) return; - for (i = 0;i < MAX_MOD_KNOWN;i++) + for (i = 0;i < mod_numknown;i++) { if (mod_known[i].mempool && mod_known[i].data_surfaces) { @@ -95,8 +104,8 @@ void Mod_Init (void) Mod_SpriteInit(); Cvar_RegisterVariable(&r_mipskins); - Cmd_AddCommand ("modellist", Mod_Print); - Cmd_AddCommand ("modelprecache", Mod_Precache); + Cmd_AddCommand ("modellist", Mod_Print, "prints a list of loaded models"); + Cmd_AddCommand ("modelprecache", Mod_Precache, "load a model"); } void Mod_RenderInit(void) @@ -109,7 +118,7 @@ void Mod_UnloadModel (model_t *mod) char name[MAX_QPATH]; qboolean isworldmodel; qboolean used; - strcpy(name, mod->name); + strlcpy(name, mod->name, sizeof(name)); isworldmodel = mod->isworldmodel; used = mod->used; // free textures/memory attached to the model @@ -118,7 +127,7 @@ void Mod_UnloadModel (model_t *mod) // clear the struct to make it available memset(mod, 0, sizeof(model_t)); // restore the fields we want to preserve - strcpy(mod->name, name); + strlcpy(mod->name, name, sizeof(mod->name)); mod->isworldmodel = isworldmodel; mod->used = used; mod->loaded = false; @@ -160,11 +169,16 @@ model_t *Mod_LoadModel(model_t *mod, qboolean crash, qboolean checkdisk, qboolea } } if (mod->loaded) - return mod; // already loaded + { + // already loaded + if (buf) + Mem_Free(buf); + return mod; + } Con_DPrintf("loading model %s\n", mod->name); // LordHavoc: unload the existing model in this slot (if there is one) - if (mod->loaded) + if (mod->loaded || mod->mempool) Mod_UnloadModel(mod); // load the model @@ -183,15 +197,16 @@ model_t *Mod_LoadModel(model_t *mod, qboolean crash, qboolean checkdisk, qboolea VectorSet(mod->rotatedmins, -mod->radius, -mod->radius, -mod->radius); VectorSet(mod->rotatedmaxs, mod->radius, mod->radius, mod->radius); - // all models use memory, so allocate a memory pool - mod->mempool = Mem_AllocPool(mod->name, 0, NULL); - // all models load textures, so allocate a texture pool - if (cls.state != ca_dedicated) - mod->texturepool = R_AllocTexturePool(); - if (buf) { char *bufend = (char *)buf + filesize; + + // all models use memory, so allocate a memory pool + mod->mempool = Mem_AllocPool(mod->name, 0, NULL); + // all models load textures, so allocate a texture pool + if (cls.state != ca_dedicated) + mod->texturepool = R_AllocTexturePool(); + num = LittleLong(*((int *)buf)); // call the apropriate loader loadmodel = mod; @@ -209,34 +224,24 @@ model_t *Mod_LoadModel(model_t *mod, qboolean crash, qboolean checkdisk, qboolea 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); + // no fatal errors occurred, so this model is ready to use. + mod->loaded = true; } else if (crash) { // LordHavoc: Sys_Error was *ANNOYING* Con_Printf ("Mod_LoadModel: %s not found\n", mod->name); } - - // no errors occurred - mod->loaded = true; return mod; } -/* -=================== -Mod_ClearAll -=================== -*/ -void Mod_ClearAll(void) -{ -} - void Mod_ClearUsed(void) { #if 0 int i; model_t *mod; - for (i = 0, mod = mod_known;i < MAX_MOD_KNOWN;i++, mod++) + for (i = 0, mod = mod_known;i < mod_numknown;i++, mod++) if (mod->name[0]) mod->used = false; #endif @@ -247,7 +252,7 @@ void Mod_PurgeUnused(void) int i; model_t *mod; - for (i = 0, mod = mod_known;i < MAX_MOD_KNOWN;i++, mod++) + for (i = 0, mod = mod_known;i < mod_numknown;i++, mod++) if (mod->name[0]) if (!mod->used) Mod_UnloadModel(mod); @@ -259,7 +264,7 @@ void Mod_RemoveStaleWorldModels(model_t *skip) int i; model_t *mod; - for (i = 0, mod = mod_known;i < MAX_MOD_KNOWN;i++, mod++) + for (i = 0, mod = mod_known;i < mod_numknown;i++, mod++) { if (mod->isworldmodel && mod->loaded && skip != mod) { @@ -279,38 +284,49 @@ Mod_FindName model_t *Mod_FindName(const char *name) { int i; - model_t *mod, *freemod; + model_t *mod; if (!name[0]) Host_Error ("Mod_ForName: NULL name"); // search the currently loaded models - freemod = NULL; - for (i = 0, mod = mod_known;i < MAX_MOD_KNOWN;i++, mod++) + for (i = 0, mod = mod_known;i < mod_numknown;i++, mod++) { - if (mod->name[0]) + if (mod->name[0] && !strcmp(mod->name, name)) { - if (!strcmp (mod->name, name)) - { - mod->used = true; - return mod; - } + mod->used = true; + return mod; } - else if (freemod == NULL) - freemod = mod; } - if (freemod) + // 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) { - mod = freemod; - strcpy (mod->name, name); - mod->loaded = false; - mod->used = true; - return mod; +#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 } - - Host_Error ("Mod_FindName: ran out of models"); - return NULL; + if (mod_numknown == i) + mod_numknown++; + mod = mod_known + i; + strlcpy (mod->name, name, sizeof(mod->name)); + mod->loaded = false; + mod->used = true; + return mod; } /* @@ -329,6 +345,24 @@ model_t *Mod_ForName(const char *name, qboolean crash, qboolean checkdisk, qbool return model; } +/* +================== +Mod_Reload + +Reloads all models if they have changed +================== +*/ +void Mod_Reload() +{ + int i; + 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); +} + unsigned char *mod_base; @@ -345,7 +379,7 @@ static void Mod_Print(void) model_t *mod; Con_Print("Loaded models:\n"); - for (i = 0, mod = mod_known;i < MAX_MOD_KNOWN;i++, mod++) + for (i = 0, mod = mod_known;i < mod_numknown;i++, mod++) if (mod->name[0]) Con_Printf("%4iK %s\n", mod->mempool ? (mod->mempool->totalsize + 1023) / 1024 : 0, mod->name); } @@ -486,19 +520,19 @@ void Mod_BuildTriangleNeighbors(int *neighbors, const int *elements, int numtria } #endif -void Mod_ValidateElements(int *elements, int numtriangles, int numverts, const char *filename, int fileline) +void Mod_ValidateElements(int *elements, int numtriangles, int firstvertex, int numverts, const char *filename, int fileline) { - int i, warned = false; + int i, warned = false, endvertex = firstvertex + numverts; for (i = 0;i < numtriangles * 3;i++) { - if ((unsigned int)elements[i] >= (unsigned int)numverts) + if (elements[i] < firstvertex || elements[i] >= endvertex) { if (!warned) { warned = true; Con_Printf("Mod_ValidateElements: out of bounds elements detected at %s:%d\n", filename, fileline); } - elements[i] = 0; + elements[i] = firstvertex; } } } @@ -553,9 +587,9 @@ void Mod_BuildBumpVectors(const float *v0, const float *v1, const float *v2, con // 6 multiply, 9 subtract VectorSubtract(v1, v0, v10); VectorSubtract(v2, v0, v20); - normal3f[0] = v10[1] * v20[2] - v10[2] * v20[1]; - normal3f[1] = v10[2] * v20[0] - v10[0] * v20[2]; - normal3f[2] = v10[0] * v20[1] - v10[1] * v20[0]; + normal3f[0] = v20[1] * v10[2] - v20[2] * v10[1]; + normal3f[1] = v20[2] * v10[0] - v20[0] * v10[2]; + normal3f[2] = v20[0] * v10[1] - v20[1] * v10[0]; // 12 multiply, 10 subtract tc10[1] = tc1[1] - tc0[1]; tc20[1] = tc2[1] - tc0[1]; @@ -589,82 +623,111 @@ void Mod_BuildBumpVectors(const float *v0, const float *v1, const float *v2, con } // warning: this is a very expensive function! -void Mod_BuildTextureVectorsAndNormals(int firstvertex, int numvertices, int numtriangles, const float *vertex3f, const float *texcoord2f, const int *elements, float *svector3f, float *tvector3f, float *normal3f, qboolean areaweighting) +void Mod_BuildTextureVectorsFromNormals(int firstvertex, int numvertices, int numtriangles, const float *vertex3f, const float *texcoord2f, const float *normal3f, const int *elements, float *svector3f, float *tvector3f, qboolean areaweighting) { int i, tnum; - float sdir[3], tdir[3], normal[3], *v; + float sdir[3], tdir[3], normal[3], *sv, *tv; + const float *v0, *v1, *v2, *tc0, *tc1, *tc2, *n; + float f, tangentcross[3], v10[3], v20[3], tc10[2], tc20[2]; const int *e; // clear the vectors - if (svector3f) - memset(svector3f + 3 * firstvertex, 0, numvertices * sizeof(float[3])); - if (tvector3f) - memset(tvector3f + 3 * firstvertex, 0, numvertices * sizeof(float[3])); - if (normal3f) - memset(normal3f + 3 * firstvertex, 0, numvertices * sizeof(float[3])); + memset(svector3f + 3 * firstvertex, 0, numvertices * sizeof(float[3])); + memset(tvector3f + 3 * firstvertex, 0, numvertices * sizeof(float[3])); // process each vertex of each triangle and accumulate the results for (tnum = 0, e = elements;tnum < numtriangles;tnum++, e += 3) { - Mod_BuildBumpVectors(vertex3f + e[0] * 3, vertex3f + e[1] * 3, vertex3f + e[2] * 3, texcoord2f + e[0] * 2, texcoord2f + e[1] * 2, texcoord2f + e[2] * 2, sdir, tdir, normal); + v0 = vertex3f + e[0] * 3; + v1 = vertex3f + e[1] * 3; + v2 = vertex3f + e[2] * 3; + tc0 = texcoord2f + e[0] * 2; + tc1 = texcoord2f + e[1] * 2; + tc2 = texcoord2f + e[2] * 2; + + // 79 add/sub/negate/multiply (1 cycle), 1 compare (3 cycle?), total cycles not counting load/store/exchange roughly 82 cycles + // 6 add, 28 subtract, 39 multiply, 1 compare, 50% chance of 6 negates + + // calculate the edge directions and surface normal + // 6 multiply, 9 subtract + VectorSubtract(v1, v0, v10); + VectorSubtract(v2, v0, v20); + normal[0] = v20[1] * v10[2] - v20[2] * v10[1]; + normal[1] = v20[2] * v10[0] - v20[0] * v10[2]; + normal[2] = v20[0] * v10[1] - v20[1] * v10[0]; + + // calculate the tangents + // 12 multiply, 10 subtract + tc10[1] = tc1[1] - tc0[1]; + tc20[1] = tc2[1] - tc0[1]; + sdir[0] = tc10[1] * v20[0] - tc20[1] * v10[0]; + sdir[1] = tc10[1] * v20[1] - tc20[1] * v10[1]; + sdir[2] = tc10[1] * v20[2] - tc20[1] * v10[2]; + tc10[0] = tc1[0] - tc0[0]; + tc20[0] = tc2[0] - tc0[0]; + tdir[0] = tc10[0] * v20[0] - tc20[0] * v10[0]; + tdir[1] = tc10[0] * v20[1] - tc20[0] * v10[1]; + tdir[2] = tc10[0] * v20[2] - tc20[0] * v10[2]; + + // if texture is mapped the wrong way (counterclockwise), the tangents + // have to be flipped, this is detected by calculating a normal from the + // two tangents, and seeing if it is opposite the surface normal + // 9 multiply, 2 add, 3 subtract, 1 compare, 50% chance of: 6 negates + CrossProduct(tdir, sdir, tangentcross); + if (DotProduct(tangentcross, normal) < 0) + { + VectorNegate(sdir, sdir); + VectorNegate(tdir, tdir); + } + if (!areaweighting) { VectorNormalize(sdir); VectorNormalize(tdir); - VectorNormalize(normal); } - if (svector3f) - for (i = 0;i < 3;i++) - VectorAdd(svector3f + e[i]*3, sdir, svector3f + e[i]*3); - if (tvector3f) - for (i = 0;i < 3;i++) - VectorAdd(tvector3f + e[i]*3, tdir, tvector3f + e[i]*3); - if (normal3f) - for (i = 0;i < 3;i++) - VectorAdd(normal3f + e[i]*3, normal, normal3f + e[i]*3); + for (i = 0;i < 3;i++) + { + VectorAdd(svector3f + e[i]*3, sdir, svector3f + e[i]*3); + VectorAdd(tvector3f + e[i]*3, tdir, tvector3f + e[i]*3); + } + } + // make the tangents completely perpendicular to the surface normal, and + // then normalize them + // 16 assignments, 2 divide, 2 sqrt, 2 negates, 14 adds, 24 multiplies + for (i = 0, sv = svector3f + 3 * firstvertex, tv = tvector3f + 3 * firstvertex, n = normal3f + 3 * firstvertex;i < numvertices;i++, sv += 3, tv += 3, n += 3) + { + f = -DotProduct(sv, n); + VectorMA(sv, f, n, sv); + VectorNormalize(sv); + f = -DotProduct(tv, n); + VectorMA(tv, f, n, tv); + VectorNormalize(tv); } - // now we could divide the vectors by the number of averaged values on - // each vertex... but instead normalize them - // 4 assignments, 1 divide, 1 sqrt, 2 adds, 6 multiplies - if (svector3f) - for (i = 0, v = svector3f + 3 * firstvertex;i < numvertices;i++, v += 3) - VectorNormalize(v); - // 4 assignments, 1 divide, 1 sqrt, 2 adds, 6 multiplies - if (tvector3f) - for (i = 0, v = tvector3f + 3 * firstvertex;i < numvertices;i++, v += 3) - VectorNormalize(v); - // 4 assignments, 1 divide, 1 sqrt, 2 adds, 6 multiplies - if (normal3f) - for (i = 0, v = normal3f + 3 * firstvertex;i < numvertices;i++, v += 3) - VectorNormalize(v); } -surfmesh_t *Mod_AllocSurfMesh(mempool_t *mempool, int numvertices, int numtriangles, qboolean lightmapoffsets, qboolean vertexcolors, qboolean neighbors) +void Mod_AllocSurfMesh(mempool_t *mempool, int numvertices, int numtriangles, qboolean lightmapoffsets, qboolean vertexcolors, qboolean neighbors) { - surfmesh_t *mesh; 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 = (unsigned char *)(mesh + 1); - if (mesh->num_vertices) + data = (unsigned char *)Mem_Alloc(mempool, 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)); + loadmodel->surfmesh.num_vertices = numvertices; + loadmodel->surfmesh.num_triangles = numtriangles; + if (loadmodel->surfmesh.num_vertices) { - mesh->data_vertex3f = (float *)data, data += sizeof(float[3]) * mesh->num_vertices; - mesh->data_svector3f = (float *)data, data += sizeof(float[3]) * mesh->num_vertices; - mesh->data_tvector3f = (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; + loadmodel->surfmesh.data_vertex3f = (float *)data, data += sizeof(float[3]) * loadmodel->surfmesh.num_vertices; + loadmodel->surfmesh.data_svector3f = (float *)data, data += sizeof(float[3]) * loadmodel->surfmesh.num_vertices; + loadmodel->surfmesh.data_tvector3f = (float *)data, data += sizeof(float[3]) * loadmodel->surfmesh.num_vertices; + loadmodel->surfmesh.data_normal3f = (float *)data, data += sizeof(float[3]) * loadmodel->surfmesh.num_vertices; + loadmodel->surfmesh.data_texcoordtexture2f = (float *)data, data += sizeof(float[2]) * loadmodel->surfmesh.num_vertices; + loadmodel->surfmesh.data_texcoordlightmap2f = (float *)data, data += sizeof(float[2]) * loadmodel->surfmesh.num_vertices; if (vertexcolors) - mesh->data_lightmapcolor4f = (float *)data, data += sizeof(float[4]) * mesh->num_vertices; + loadmodel->surfmesh.data_lightmapcolor4f = (float *)data, data += sizeof(float[4]) * loadmodel->surfmesh.num_vertices; if (lightmapoffsets) - mesh->data_lightmapoffsets = (int *)data, data += sizeof(int) * mesh->num_vertices; + loadmodel->surfmesh.data_lightmapoffsets = (int *)data, data += sizeof(int) * loadmodel->surfmesh.num_vertices; } - if (mesh->num_triangles) + if (loadmodel->surfmesh.num_triangles) { - mesh->data_element3i = (int *)data, data += sizeof(int[3]) * mesh->num_triangles; + loadmodel->surfmesh.data_element3i = (int *)data, data += sizeof(int[3]) * loadmodel->surfmesh.num_triangles; if (neighbors) - mesh->data_neighbor3i = (int *)data, data += sizeof(int[3]) * mesh->num_triangles; + loadmodel->surfmesh.data_neighbor3i = (int *)data, data += sizeof(int[3]) * loadmodel->surfmesh.num_triangles; } - return mesh; } 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) @@ -909,19 +972,26 @@ void Mod_ShadowMesh_Free(shadowmesh_t *mesh) } } -static rtexture_t *GL_TextureForSkinLayer(const unsigned char *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, qboolean force) { int i; - for (i = 0;i < width*height;i++) - if (((unsigned char *)&palette[in[i]])[3] > 0) - return R_LoadTexture2D (loadmodel->texturepool, name, width, height, in, TEXTYPE_PALETTE, textureflags, palette); - return NULL; + if (!force) + { + for (i = 0;i < width*height;i++) + if (((unsigned char *)&palette[in[i]])[3] > 0) + break; + if (i == width*height) + return NULL; + } + return R_LoadTexture2D (loadmodel->texturepool, name, width, height, in, TEXTYPE_PALETTE, textureflags, palette); } -int Mod_LoadSkinFrame(skinframe_t *skinframe, char *basename, int textureflags, int loadpantsandshirt, int loadglowtexture) +int Mod_LoadSkinFrame(skinframe_t *skinframe, const char *basename, int textureflags, int loadpantsandshirt, int loadglowtexture) { imageskin_t s; memset(skinframe, 0, sizeof(*skinframe)); + if (cls.state == ca_dedicated) + return false; if (!image_loadskin(&s, basename)) return false; skinframe->base = R_LoadTexture2D (loadmodel->texturepool, basename, s.basepixels_width, s.basepixels_height, s.basepixels, TEXTYPE_RGBA, textureflags, NULL); @@ -948,44 +1018,84 @@ int Mod_LoadSkinFrame(skinframe_t *skinframe, char *basename, int textureflags, return true; } -int Mod_LoadSkinFrame_Internal(skinframe_t *skinframe, char *basename, int textureflags, int loadpantsandshirt, int loadglowtexture, unsigned char *skindata, int width, int height) +int Mod_LoadSkinFrame_Internal(skinframe_t *skinframe, const char *basename, int textureflags, int loadpantsandshirt, int loadglowtexture, const unsigned char *skindata, int width, int height, int bitsperpixel, const unsigned int *palette, const unsigned int *alphapalette) { + int i; unsigned char *temp1, *temp2; memset(skinframe, 0, sizeof(*skinframe)); + if (cls.state == ca_dedicated) + return false; if (!skindata) return false; - if (r_shadow_bumpscale_basetexture.value > 0) - { - 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->nmap = R_LoadTexture2D(loadmodel->texturepool, va("%s_nmap", basename), width, height, temp2, TEXTYPE_RGBA, textureflags, NULL); - Mem_Free(temp1); - } - if (loadglowtexture) + if (bitsperpixel == 32) { - skinframe->glow = GL_TextureForSkinLayer(skindata, width, height, va("%s_glow", basename), palette_onlyfullbrights, textureflags); // glow - skinframe->base = skinframe->merged = GL_TextureForSkinLayer(skindata, width, height, va("%s_merged", basename), palette_nofullbrights, textureflags); // all but fullbrights - if (loadpantsandshirt) + if (r_shadow_bumpscale_basetexture.value > 0) { - skinframe->pants = GL_TextureForSkinLayer(skindata, width, height, va("%s_pants", basename), palette_pantsaswhite, textureflags); // pants - skinframe->shirt = GL_TextureForSkinLayer(skindata, width, height, va("%s_shirt", basename), palette_shirtaswhite, textureflags); // shirt - if (skinframe->pants || skinframe->shirt) - skinframe->base = GL_TextureForSkinLayer(skindata, width, height, va("%s_nospecial", basename), palette_nocolormapnofullbrights, textureflags); // no special colors + temp1 = (unsigned char *)Mem_Alloc(loadmodel->mempool, width * height * 8); + temp2 = temp1 + width * height * 4; + Image_HeightmapToNormalmap(skindata, temp2, width, height, false, r_shadow_bumpscale_basetexture.value); + skinframe->nmap = R_LoadTexture2D(loadmodel->texturepool, va("%s_nmap", basename), width, height, temp2, TEXTYPE_RGBA, textureflags | TEXF_ALPHA, NULL); + Mem_Free(temp1); + } + skinframe->base = skinframe->merged = R_LoadTexture2D(loadmodel->texturepool, basename, width, height, skindata, TEXTYPE_RGBA, textureflags, NULL); + if (textureflags & TEXF_ALPHA) + { + for (i = 3;i < width * height * 4;i += 4) + if (skindata[i] < 255) + break; + if (i < width * height * 4) + { + unsigned char *fogpixels = (unsigned char *)Mem_Alloc(loadmodel->mempool, width * height * 4); + memcpy(fogpixels, skindata, width * height * 4); + for (i = 0;i < width * height * 4;i += 4) + fogpixels[i] = fogpixels[i+1] = fogpixels[i+2] = 255; + skinframe->fog = R_LoadTexture2D(loadmodel->texturepool, va("%s_fog", basename), width, height, fogpixels, TEXTYPE_RGBA, textureflags, NULL); + Mem_Free(fogpixels); + } } } - else + else if (bitsperpixel == 8) { - skinframe->base = skinframe->merged = GL_TextureForSkinLayer(skindata, width, height, va("%s_merged", basename), palette_complete, textureflags); // all - if (loadpantsandshirt) + if (r_shadow_bumpscale_basetexture.value > 0) { - skinframe->pants = GL_TextureForSkinLayer(skindata, width, height, va("%s_pants", basename), palette_pantsaswhite, textureflags); // pants - skinframe->shirt = GL_TextureForSkinLayer(skindata, width, height, va("%s_shirt", basename), palette_shirtaswhite, textureflags); // shirt - if (skinframe->pants || skinframe->shirt) - skinframe->base = GL_TextureForSkinLayer(skindata, width, height, va("%s_nospecial", basename), palette_nocolormap, textureflags); // no pants or shirt + temp1 = (unsigned char *)Mem_Alloc(loadmodel->mempool, width * height * 8); + temp2 = temp1 + width * height * 4; + if (bitsperpixel == 32) + Image_HeightmapToNormalmap(skindata, temp2, width, height, false, r_shadow_bumpscale_basetexture.value); + else + { + // use either a custom palette or the quake palette + Image_Copy8bitRGBA(skindata, temp1, width * height, palette ? palette : palette_complete); + Image_HeightmapToNormalmap(temp1, temp2, width, height, false, r_shadow_bumpscale_basetexture.value); + } + skinframe->nmap = R_LoadTexture2D(loadmodel->texturepool, va("%s_nmap", basename), width, height, temp2, TEXTYPE_RGBA, textureflags | TEXF_ALPHA, NULL); + Mem_Free(temp1); + } + // use either a custom palette, or the quake palette + skinframe->base = skinframe->merged = GL_TextureForSkinLayer(skindata, width, height, va("%s_merged", basename), palette ? palette : (loadglowtexture ? palette_nofullbrights : ((textureflags & TEXF_ALPHA) ? palette_transparent : palette_complete)), textureflags, true); // all + if (!palette && loadglowtexture) + skinframe->glow = GL_TextureForSkinLayer(skindata, width, height, va("%s_glow", basename), palette_onlyfullbrights, textureflags, false); // glow + if (!palette && loadpantsandshirt) + { + skinframe->pants = GL_TextureForSkinLayer(skindata, width, height, va("%s_pants", basename), palette_pantsaswhite, textureflags, false); // pants + skinframe->shirt = GL_TextureForSkinLayer(skindata, width, height, va("%s_shirt", basename), palette_shirtaswhite, textureflags, false); // shirt + } + if (skinframe->pants || skinframe->shirt) + skinframe->base = GL_TextureForSkinLayer(skindata, width, height, va("%s_nospecial", basename),loadglowtexture ? palette_nocolormapnofullbrights : palette_nocolormap, textureflags, false); // no special colors + if (textureflags & TEXF_ALPHA) + { + // if not using a custom alphapalette, use the quake one + if (!alphapalette) + alphapalette = palette_alpha; + for (i = 0;i < width * height;i++) + if (((unsigned char *)alphapalette)[skindata[i]*4+3] < 255) + break; + if (i < width * height) + skinframe->fog = GL_TextureForSkinLayer(skindata, width, height, va("%s_fog", basename), alphapalette, textureflags, true); // fog mask } } + else + return false; if (!skinframe->nmap) skinframe->nmap = r_texture_blanknormalmap; return true; @@ -1089,12 +1199,12 @@ tag_torso, // If it's the first file we parse if (skinfile == NULL) { - skinfile = (skinfile_t *)Mem_Alloc(tempmempool, sizeof(skinfile_t)); + skinfile = (skinfile_t *)Mem_Alloc(loadmodel->mempool, sizeof(skinfile_t)); first = skinfile; } else { - skinfile->next = (skinfile_t *)Mem_Alloc(tempmempool, sizeof(skinfile_t)); + skinfile->next = (skinfile_t *)Mem_Alloc(loadmodel->mempool, sizeof(skinfile_t)); skinfile = skinfile->next; } skinfile->next = NULL; @@ -1127,7 +1237,7 @@ tag_torso, if (words == 3) { Con_DPrintf("Mod_LoadSkinFiles: parsed mesh \"%s\" shader replacement \"%s\"\n", word[1], word[2]); - skinfileitem = (skinfileitem_t *)Mem_Alloc(tempmempool, sizeof(skinfileitem_t)); + skinfileitem = (skinfileitem_t *)Mem_Alloc(loadmodel->mempool, sizeof(skinfileitem_t)); skinfileitem->next = skinfile->items; skinfile->items = skinfileitem; strlcpy (skinfileitem->name, word[1], sizeof (skinfileitem->name)); @@ -1148,7 +1258,7 @@ tag_torso, { // 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 = (skinfileitem_t *)Mem_Alloc(tempmempool, sizeof(skinfileitem_t)); + skinfileitem = (skinfileitem_t *)Mem_Alloc(loadmodel->mempool, sizeof(skinfileitem_t)); skinfileitem->next = skinfile->items; skinfile->items = skinfileitem; strlcpy (skinfileitem->name, word[0], sizeof (skinfileitem->name));