X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=model_shared.c;h=d4948b4af60fc37d9f3413cefa34f5f7c3fec288;hb=b7338b0c6963da7c4cabb004dce018dc786edd20;hp=1eb8d34e7f4d50f0e8d6d5ae99c3c7dbaf6de89e;hpb=3906ee88f870a0d0f8cd95eac2c7f80c624aea86;p=xonotic%2Fdarkplaces.git diff --git a/model_shared.c b/model_shared.c index 1eb8d34e..d4948b4a 100644 --- a/model_shared.c +++ b/model_shared.c @@ -194,6 +194,34 @@ static void mod_shutdown(void) static void mod_newmap(void) { + msurface_t *surf; + int i, surfnum, ssize, tsize; + + if (!cl_stainmapsclearonload.integer) + return; + + for (i=0; itexinfo->texture->flags & SURF_LIGHTMAP) + { + ssize = (surf->extents[0] >> 4) + 1; + tsize = (surf->extents[1] >> 4) + 1; + + if (ssize > 256 || tsize > 256) + Host_Error("Bad surface extents"); + + if (surf->stainsamples) + memset(surf->stainsamples, 255, ssize * tsize * 3); + + surf->cached_dlight = true; + } + } + } + } } /* @@ -201,7 +229,7 @@ static void mod_newmap(void) Mod_Init =============== */ -static void Mod_Print (void); +static void Mod_Print(void); static void Mod_Precache (void); void Mod_Init (void) { @@ -260,75 +288,69 @@ static model_t *Mod_LoadModel(model_t *mod, qboolean crash, qboolean checkdisk, crc = 0; buf = NULL; - if (!mod->needload) + if (mod->isworldmodel != isworldmodel) + mod->needload = true; + if (mod->needload || checkdisk) { - if (checkdisk) + if (checkdisk && !mod->needload) + Con_DPrintf("checking model %s\n", mod->name); + buf = FS_LoadFile (mod->name, tempmempool, false); + if (buf) { - buf = FS_LoadFile (mod->name, false); - if (!buf) - { - if (crash) - Host_Error ("Mod_LoadModel: %s not found", mod->name); // LordHavoc: Sys_Error was *ANNOYING* - return NULL; - } - crc = CRC_Block(buf, fs_filesize); - } - else - crc = mod->crc; - - if (mod->crc == crc && mod->isworldmodel == isworldmodel) - { - if (buf) - Mem_Free(buf); - return mod; // already loaded + if (mod->crc != crc) + mod->needload = true; } } + if (!mod->needload) + return mod; // already loaded Con_DPrintf("loading model %s\n", mod->name); - - if (!buf) - { - buf = FS_LoadFile (mod->name, false); - if (!buf) - { - if (crash) - Host_Error ("Mod_LoadModel: %s not found", mod->name); - return NULL; - } - crc = CRC_Block(buf, fs_filesize); - } - - // allocate a new model - loadmodel = mod; - // LordHavoc: unload the existing model in this slot (if there is one) Mod_UnloadModel(mod); + // load the model mod->isworldmodel = isworldmodel; mod->used = true; mod->crc = crc; // errors can prevent the corresponding mod->needload = false; mod->needload = true; + // default model radius and bounding box (mainly for missing models) + mod->radius = 16; + VectorSet(mod->normalmins, -mod->radius, -mod->radius, -mod->radius); + VectorSet(mod->normalmaxs, mod->radius, mod->radius, mod->radius); + VectorSet(mod->yawmins, -mod->radius, -mod->radius, -mod->radius); + VectorSet(mod->yawmaxs, mod->radius, mod->radius, mod->radius); + 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); + 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(); - // call the apropriate loader - num = LittleLong(*((int *)buf)); - if (!memcmp(buf, "IDPO", 4)) Mod_IDP0_Load(mod, buf); - else if (!memcmp(buf, "IDP2", 4)) Mod_IDP2_Load(mod, buf); - else if (!memcmp(buf, "IDP3", 4)) Mod_IDP3_Load(mod, buf); - else if (!memcmp(buf, "IDSP", 4)) Mod_IDSP_Load(mod, buf); - else if (!memcmp(buf, "IBSP", 4)) Mod_IBSP_Load(mod, buf); - else if (!memcmp(buf, "ZYMOTICMODEL", 12)) Mod_ZYMOTICMODEL_Load(mod, buf); - else if (strlen(mod->name) >= 4 && !strcmp(mod->name - 4, ".map")) Mod_MAP_Load(mod, buf); - else if (num == BSPVERSION || num == 30) Mod_Q1BSP_Load(mod, buf); - else Host_Error("Mod_LoadModel: model \"%s\" is of unknown/unsupported type\n", mod->name); - - Mem_Free(buf); + if (buf) + { + num = LittleLong(*((int *)buf)); + // call the apropriate loader + loadmodel = mod; + if (!memcmp(buf, "IDPO", 4)) Mod_IDP0_Load(mod, buf); + else if (!memcmp(buf, "IDP2", 4)) Mod_IDP2_Load(mod, buf); + else if (!memcmp(buf, "IDP3", 4)) Mod_IDP3_Load(mod, buf); + else if (!memcmp(buf, "IDSP", 4)) Mod_IDSP_Load(mod, buf); + else if (!memcmp(buf, "IBSP", 4)) Mod_IBSP_Load(mod, buf); + else if (!memcmp(buf, "ZYMOTICMODEL", 12)) Mod_ZYMOTICMODEL_Load(mod, buf); + else if (strlen(mod->name) >= 4 && !strcmp(mod->name - 4, ".map")) Mod_MAP_Load(mod, buf); + else if (num == BSPVERSION || num == 30) Mod_Q1BSP_Load(mod, buf); + else Host_Error("Mod_LoadModel: model \"%s\" is of unknown/unsupported type\n", mod->name); + Mem_Free(buf); + } + else if (crash) + { + // LordHavoc: Sys_Error was *ANNOYING* + Con_Printf ("Mod_LoadModel: %s not found\n", mod->name); + } // no errors occurred mod->needload = false; @@ -343,8 +365,8 @@ void Mod_CheckLoaded(model_t *mod) Mod_LoadModel(mod, true, true, mod->isworldmodel); else { - if (mod->type == mod_invalid) - Host_Error("Mod_CheckLoaded: invalid model\n"); + //if (mod->type == mod_invalid) + // Host_Error("Mod_CheckLoaded: invalid model\n"); mod->used = true; return; } @@ -476,10 +498,10 @@ static void Mod_Print(void) int i; model_t *mod; - Con_Printf ("Loaded models:\n"); + Con_Print("Loaded models:\n"); for (i = 0, mod = mod_known;i < MAX_MOD_KNOWN;i++, mod++) if (mod->name[0]) - Con_Printf ("%4iK %s\n", mod->mempool ? (mod->mempool->totalsize + 1023) / 1024 : 0, mod->name); + Con_Printf("%4iK %s\n", mod->mempool ? (mod->mempool->totalsize + 1023) / 1024 : 0, mod->name); } /* @@ -492,7 +514,21 @@ static void Mod_Precache(void) if (Cmd_Argc() == 2) Mod_ForName(Cmd_Argv(1), false, true, cl.worldmodel && !strcasecmp(Cmd_Argv(1), cl.worldmodel->name)); else - Con_Printf("usage: modelprecache \n"); + Con_Print("usage: modelprecache \n"); +} + +int Mod_BuildVertexRemapTableFromElements(int numelements, const int *elements, int numvertices, int *remapvertices) +{ + int i, count; + qbyte *used; + used = Mem_Alloc(tempmempool, numvertices); + memset(used, 0, numvertices); + for (i = 0;i < numelements;i++) + used[elements[i]] = 1; + for (i = 0, count = 0;i < numvertices;i++) + remapvertices[i] = used[i] ? count++ : -1; + Mem_Free(used); + return count; } #if 1 @@ -612,29 +648,88 @@ void Mod_ValidateElements(const int *elements, int numtriangles, int numverts, c Con_Printf("Mod_ValidateElements: out of bounds element detected at %s:%d\n", filename, fileline); } +// warning: this is an expensive function! +void Mod_BuildNormals(int numverts, int numtriangles, const float *vertex3f, const int *elements, float *normal3f) +{ + int i, tnum; + float normal[3], *v; + const int *e; + // clear the vectors + memset(normal3f, 0, numverts * sizeof(float[3])); + // process each vertex of each triangle and accumulate the results + for (tnum = 0, e = elements;tnum < numtriangles;tnum++, e += 3) + { + TriangleNormal(vertex3f + e[0] * 3, vertex3f + e[1] * 3, vertex3f + e[2] * 3, normal); + VectorNormalize(normal); + v = normal3f + e[0] * 3; + v[0] += normal[0]; + v[1] += normal[1]; + v[2] += normal[2]; + v = normal3f + e[1] * 3; + v[0] += normal[0]; + v[1] += normal[1]; + v[2] += normal[2]; + v = normal3f + e[2] * 3; + v[0] += normal[0]; + v[1] += normal[1]; + v[2] += normal[2]; + } + // now we could divide the vectors by the number of averaged values on + // each vertex... but instead normalize them + for (i = 0, v = normal3f;i < numverts;i++, v += 3) + VectorNormalize(v); +} + void Mod_BuildBumpVectors(const float *v0, const float *v1, const float *v2, const float *tc0, const float *tc1, const float *tc2, float *svector3f, float *tvector3f, float *normal3f) { - float f; - normal3f[0] = (v1[1] - v0[1]) * (v2[2] - v0[2]) - (v1[2] - v0[2]) * (v2[1] - v0[1]); - normal3f[1] = (v1[2] - v0[2]) * (v2[0] - v0[0]) - (v1[0] - v0[0]) * (v2[2] - v0[2]); - normal3f[2] = (v1[0] - v0[0]) * (v2[1] - v0[1]) - (v1[1] - v0[1]) * (v2[0] - v0[0]); + float f, tangentcross[3], v10[3], v20[3], tc10[2], tc20[2]; + // 103 add/sub/negate/multiply (1 cycle), 3 divide (20 cycle), 3 sqrt (22 cycle), 4 compare (3 cycle?), total cycles not counting load/store/exchange roughly 241 cycles + // 12 add, 28 subtract, 57 multiply, 3 divide, 3 sqrt, 4 compare, 50% chance of 6 negates + + // 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]; + // 1 sqrt, 1 divide, 6 multiply, 2 add, 1 compare VectorNormalize(normal3f); - tvector3f[0] = ((tc1[0] - tc0[0]) * (v2[0] - v0[0]) - (tc2[0] - tc0[0]) * (v1[0] - v0[0])); - tvector3f[1] = ((tc1[0] - tc0[0]) * (v2[1] - v0[1]) - (tc2[0] - tc0[0]) * (v1[1] - v0[1])); - tvector3f[2] = ((tc1[0] - tc0[0]) * (v2[2] - v0[2]) - (tc2[0] - tc0[0]) * (v1[2] - v0[2])); - f = -DotProduct(tvector3f, normal3f); - VectorMA(tvector3f, f, normal3f, tvector3f); - VectorNormalize(tvector3f); - // note: can't be a CrossProduct as that sometimes flips the texture - svector3f[0] = ((tc1[1] - tc0[1]) * (v2[0] - v0[0]) - (tc2[1] - tc0[1]) * (v1[0] - v0[0])); - svector3f[1] = ((tc1[1] - tc0[1]) * (v2[1] - v0[1]) - (tc2[1] - tc0[1]) * (v1[1] - v0[1])); - svector3f[2] = ((tc1[1] - tc0[1]) * (v2[2] - v0[2]) - (tc2[1] - tc0[1]) * (v1[2] - v0[2])); - f = -DotProduct(svector3f, normal3f); - VectorMA(svector3f, f, normal3f, svector3f); + // 12 multiply, 10 subtract + tc10[1] = tc1[1] - tc0[1]; + tc20[1] = tc2[1] - tc0[1]; + svector3f[0] = tc10[1] * v20[0] - tc20[1] * v10[0]; + svector3f[1] = tc10[1] * v20[1] - tc20[1] * v10[1]; + svector3f[2] = tc10[1] * v20[2] - tc20[1] * v10[2]; + tc10[0] = tc1[0] - tc0[0]; + tc20[0] = tc2[0] - tc0[0]; + tvector3f[0] = tc10[0] * v20[0] - tc20[0] * v10[0]; + tvector3f[1] = tc10[0] * v20[1] - tc20[0] * v10[1]; + tvector3f[2] = tc10[0] * v20[2] - tc20[0] * v10[2]; + // 12 multiply, 4 add, 6 subtract + f = DotProduct(svector3f, normal3f); + svector3f[0] -= f * normal3f[0]; + svector3f[1] -= f * normal3f[1]; + svector3f[2] -= f * normal3f[2]; + f = DotProduct(tvector3f, normal3f); + tvector3f[0] -= f * normal3f[0]; + tvector3f[1] -= f * normal3f[1]; + tvector3f[2] -= f * normal3f[2]; + // 2 sqrt, 2 divide, 12 multiply, 4 add, 2 compare VectorNormalize(svector3f); + VectorNormalize(tvector3f); + // 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(tvector3f, svector3f, tangentcross); + if (DotProduct(tangentcross, normal3f) < 0) + { + VectorNegate(svector3f, svector3f); + VectorNegate(tvector3f, tvector3f); + } } -// warning: this is an expensive function! +// warning: this is a very expensive function! void Mod_BuildTextureVectorsAndNormals(int numverts, int numtriangles, const float *vertex3f, const float *texcoord2f, const int *elements, float *svector3f, float *tvector3f, float *normal3f) { int i, tnum; @@ -811,7 +906,7 @@ void Mod_ShadowMesh_AddTriangle(mempool_t *mempool, shadowmesh_t *mesh, rtexture mesh->numtriangles++; } -void Mod_ShadowMesh_AddMesh(mempool_t *mempool, shadowmesh_t *mesh, rtexture_t *map_diffuse, rtexture_t *map_specular, rtexture_t *map_normal, float *vertex3f, float *svector3f, float *tvector3f, float *normal3f, float *texcoord2f, int numtris, int *element3i) +void Mod_ShadowMesh_AddMesh(mempool_t *mempool, shadowmesh_t *mesh, rtexture_t *map_diffuse, rtexture_t *map_specular, rtexture_t *map_normal, const float *vertex3f, const float *svector3f, const float *tvector3f, const float *normal3f, const float *texcoord2f, int numtris, const int *element3i) { int i, j, e; float vbuf[3*14], *v; @@ -1084,7 +1179,7 @@ skinfile_t *Mod_LoadSkinFiles(void) int i, words, numtags, line, tagsetsused = false, wordsoverflow; char *text; const char *data; - skinfile_t *skinfile, *first = NULL; + skinfile_t *skinfile = NULL, *first = NULL; skinfileitem_t *skinfileitem; char word[10][MAX_QPATH]; overridetagnameset_t tagsets[MAX_SKINS]; @@ -1107,12 +1202,23 @@ tag_torso, */ 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), true));i++) + for (i = 0;i < MAX_SKINS && (data = text = FS_LoadFile(va("%s_%i.skin", loadmodel->name, i), tempmempool, true));i++) { numtags = 0; - skinfile = Mem_Alloc(tempmempool, sizeof(skinfile_t)); - skinfile->next = first; - first = skinfile; + + // If it's the first file we parse + if (skinfile == NULL) + { + skinfile = Mem_Alloc(tempmempool, sizeof(skinfile_t)); + first = skinfile; + } + else + { + skinfile->next = Mem_Alloc(tempmempool, sizeof(skinfile_t)); + skinfile = skinfile->next; + } + skinfile->next = NULL; + for(line = 0;;line++) { // parse line