X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=model_shared.c;h=369802d5a76536b3eff49993dddc6f97ab2d8039;hb=f3e79d752a76a9d6329759a83ec9800a5e4cc92b;hp=766ab18f260087d8aca9941bce53b077cf22b8d4;hpb=90e103b9a849d31939ae99d6914f38dbe2345498;p=xonotic%2Fdarkplaces.git diff --git a/model_shared.c b/model_shared.c index 766ab18f..369802d5 100644 --- a/model_shared.c +++ b/model_shared.c @@ -201,7 +201,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 +260,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); // 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", mod->name); + } // no errors occurred mod->needload = false; @@ -343,8 +337,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 +470,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 +486,7 @@ 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"); } #if 1 @@ -625,7 +619,13 @@ void Mod_BuildBumpVectors(const float *v0, const float *v1, const float *v2, con f = -DotProduct(tvector3f, normal3f); VectorMA(tvector3f, f, normal3f, tvector3f); VectorNormalize(tvector3f); - CrossProduct(normal3f, tvector3f, svector3f); + // 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); + VectorNormalize(svector3f); } // warning: this is an expensive function! @@ -805,7 +805,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; @@ -1101,7 +1101,7 @@ 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));