X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=model_shared.c;h=6b3a8e798c6e7411f570f8228391c37ecf88cee0;hb=6824d8ddc8a43cae0609be5bbe8bee01fa1a4225;hp=913d3bb5bcb7fdd83cd5f7665e5d7e346a81eeda;hpb=c434819cf7768231f60ad231b529cf21243c4ef9;p=xonotic%2Fdarkplaces.git diff --git a/model_shared.c b/model_shared.c index 913d3bb5..6b3a8e79 100644 --- a/model_shared.c +++ b/model_shared.c @@ -30,194 +30,51 @@ cvar_t r_mipskins = {CVAR_SAVE, "r_mipskins", "0"}; model_t *loadmodel; -// LordHavoc: increased from 512 to 2048 -#define MAX_MOD_KNOWN 2048 +// LordHavoc: was 512 +#define MAX_MOD_KNOWN (MAX_MODELS + 256) static model_t mod_known[MAX_MOD_KNOWN]; -rtexturepool_t *mod_shared_texturepool; -rtexture_t *r_notexture; -rtexture_t *mod_shared_detailtextures[NUM_DETAILTEXTURES]; -rtexture_t *mod_shared_distorttexture[64]; - -void Mod_BuildDetailTextures (void) -{ - int i, x, y, light; - float vc[3], vx[3], vy[3], vn[3], lightdir[3]; -#define DETAILRESOLUTION 256 - qbyte data[DETAILRESOLUTION][DETAILRESOLUTION][4], noise[DETAILRESOLUTION][DETAILRESOLUTION]; - lightdir[0] = 0.5; - lightdir[1] = 1; - lightdir[2] = -0.25; - VectorNormalize(lightdir); - for (i = 0;i < NUM_DETAILTEXTURES;i++) - { - fractalnoise(&noise[0][0], DETAILRESOLUTION, DETAILRESOLUTION >> 4); - for (y = 0;y < DETAILRESOLUTION;y++) - { - for (x = 0;x < DETAILRESOLUTION;x++) - { - vc[0] = x; - vc[1] = y; - vc[2] = noise[y][x] * (1.0f / 32.0f); - vx[0] = x + 1; - vx[1] = y; - vx[2] = noise[y][(x + 1) % DETAILRESOLUTION] * (1.0f / 32.0f); - vy[0] = x; - vy[1] = y + 1; - vy[2] = noise[(y + 1) % DETAILRESOLUTION][x] * (1.0f / 32.0f); - VectorSubtract(vx, vc, vx); - VectorSubtract(vy, vc, vy); - CrossProduct(vx, vy, vn); - VectorNormalize(vn); - light = 128 - DotProduct(vn, lightdir) * 128; - light = bound(0, light, 255); - data[y][x][0] = data[y][x][1] = data[y][x][2] = light; - data[y][x][3] = 255; - } - } - mod_shared_detailtextures[i] = R_LoadTexture2D(mod_shared_texturepool, va("detailtexture%i", i), DETAILRESOLUTION, DETAILRESOLUTION, &data[0][0][0], TEXTYPE_RGBA, TEXF_MIPMAP | TEXF_PRECACHE, NULL); - } -} - -qbyte Mod_MorphDistortTexture (double y0, double y1, double y2, double y3, double morph) -{ - int value = (int)(((y1 + y3 - (y0 + y2)) * morph * morph * morph) + - ((2 * (y0 - y1) + y2 - y3) * morph * morph) + - ((y2 - y0) * morph) + - (y1)); - - if (value > 255) - value = 255; - if (value < 0) - value = 0; - - return (qbyte)value; -} - -void Mod_BuildDistortTexture (void) -{ - int x, y, i, j; -#define DISTORTRESOLUTION 32 - qbyte data[5][DISTORTRESOLUTION][DISTORTRESOLUTION][2]; - - for (i=0; i<4; i++) - { - for (y=0; yname[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; - R_FreeTexturePool(&mod_shared_texturepool); + for (i = 0, mod = mod_known;i < MAX_MOD_KNOWN;i++, mod++) + if (mod->loaded) + Mod_UnloadModel(mod); } static void mod_newmap(void) { - msurface_t *surf; - int i, surfnum, ssize, tsize; + msurface_t *surface; + int i, surfacenum, ssize, tsize; if (!cl_stainmaps_clearonload.integer) return; - for (i=0; itexinfo->texture->flags & SURF_LIGHTMAP) + if (surface->lightmapinfo && surface->lightmapinfo->stainsamples) { - 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; + ssize = (surface->lightmapinfo->extents[0] >> 4) + 1; + tsize = (surface->lightmapinfo->extents[1] >> 4) + 1; + memset(surface->lightmapinfo->stainsamples, 255, ssize * tsize * 3); + surface->cached_dlight = true; } } } @@ -247,24 +104,23 @@ void Mod_RenderInit(void) 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]; qboolean isworldmodel; + qboolean used; strcpy(name, mod->name); isworldmodel = mod->isworldmodel; - Mod_FreeModel(mod); + used = mod->used; + // 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; mod->loaded = false; } @@ -275,7 +131,7 @@ Mod_LoadModel Loads a model ================== */ -static model_t *Mod_LoadModel(model_t *mod, qboolean crash, qboolean checkdisk, qboolean isworldmodel) +model_t *Mod_LoadModel(model_t *mod, qboolean crash, qboolean checkdisk, qboolean isworldmodel) { int num; unsigned int crc; @@ -297,7 +153,7 @@ static model_t *Mod_LoadModel(model_t *mod, qboolean crash, qboolean checkdisk, 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; } @@ -307,15 +163,8 @@ static model_t *Mod_LoadModel(model_t *mod, qboolean crash, qboolean checkdisk, Con_DPrintf("loading model %s\n", mod->name); // LordHavoc: unload the existing model in this slot (if there is one) - Mod_UnloadModel(mod); - if (isworldmodel) - { - // clear out any stale submodels lying around, as well as the old world model itself - int i; - for (i = 0;i < MAX_MOD_KNOWN;i++) - if (mod_known[i].isworldmodel) - Mod_UnloadModel(mod_known + i); - } + if (mod->loaded) + Mod_UnloadModel(mod); // load the model mod->isworldmodel = isworldmodel; @@ -341,18 +190,23 @@ static model_t *Mod_LoadModel(model_t *mod, qboolean crash, qboolean checkdisk, if (buf) { + char *bufend = (char *)buf + fs_filesize; 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); + if (!memcmp(buf, "IDPO", 4)) Mod_IDP0_Load(mod, buf, bufend); + else if (!memcmp(buf, "IDP2", 4)) Mod_IDP2_Load(mod, buf, bufend); + else if (!memcmp(buf, "IDP3", 4)) Mod_IDP3_Load(mod, buf, bufend); + else if (!memcmp(buf, "IDSP", 4)) Mod_IDSP_Load(mod, buf, bufend); + else if (!memcmp(buf, "IDS2", 4)) Mod_IDS2_Load(mod, buf, bufend); + 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); } else if (crash) @@ -366,22 +220,6 @@ static model_t *Mod_LoadModel(model_t *mod, qboolean crash, qboolean checkdisk, return mod; } -void Mod_CheckLoaded(model_t *mod) -{ - if (mod) - { - if (!mod->loaded) - Mod_LoadModel(mod, true, true, mod->isworldmodel); - else - { - //if (mod->type == mod_invalid) - // Host_Error("Mod_CheckLoaded: invalid model\n"); - mod->used = true; - return; - } - } -} - /* =================== Mod_ClearAll @@ -393,12 +231,14 @@ 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++) if (mod->name[0]) mod->used = false; +#endif } void Mod_PurgeUnused(void) @@ -409,18 +249,24 @@ 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); } -void Mod_LoadModels(void) +// only used during loading! +void Mod_RemoveStaleWorldModels(model_t *skip) { 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; + } + } } /* @@ -475,10 +321,14 @@ Loads in a model for the given name */ 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; //============================================================================= @@ -515,8 +365,8 @@ static void Mod_Precache(void) 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; @@ -528,7 +378,7 @@ int Mod_BuildVertexRemapTableFromElements(int numelements, const int *elements, #if 1 // fast way, using an edge hash -#define TRIANGLEEDGEHASH 16384 +#define TRIANGLEEDGEHASH 8192 void Mod_BuildTriangleNeighbors(int *neighbors, const int *elements, int numtriangles) { int i, j, p, e1, e2, *n, hashindex, count, match; @@ -545,7 +395,7 @@ void Mod_BuildTriangleNeighbors(int *neighbors, const int *elements, int numtria 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) { @@ -635,51 +485,69 @@ void Mod_BuildTriangleNeighbors(int *neighbors, const int *elements, int numtria } #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! -void Mod_BuildNormals(int numverts, int numtriangles, const float *vertex3f, const int *elements, float *normal3f) +void Mod_BuildNormals(int firstvertex, int numvertices, int numtriangles, const float *vertex3f, const int *elements, float *normal3f, qboolean areaweighting) { - int i, tnum; - float normal[3], *v; - const int *e; + int i, j; + const int *element; + float *vectorNormal; + float areaNormal[3]; // clear the vectors - memset(normal3f, 0, numverts * sizeof(float[3])); + memset(normal3f + 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) + // use area-averaging, to make triangles with a big area have a bigger + // weighting on the vertex normal than triangles with a small area + // to do so, just add the 'normals' together (the bigger the area + // the greater the length of the normal is + element = elements; + for (i = 0; i < numtriangles; i++, element += 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]; + TriangleNormal( + vertex3f + element[0] * 3, + vertex3f + element[1] * 3, + vertex3f + element[2] * 3, + areaNormal + ); + + if (!areaweighting) + VectorNormalize(areaNormal); + + for (j = 0;j < 3;j++) + { + vectorNormal = normal3f + element[j] * 3; + vectorNormal[0] += areaNormal[0]; + vectorNormal[1] += areaNormal[1]; + vectorNormal[2] += areaNormal[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); + // and just normalize the accumulated vertex normal in the end + vectorNormal = normal3f + 3 * firstvertex; + for (i = 0; i < numvertices; i++, vectorNormal += 3) + VectorNormalize(vectorNormal); } 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, 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 + // 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 // 6 multiply, 9 subtract VectorSubtract(v1, v0, v10); @@ -687,8 +555,6 @@ void Mod_BuildBumpVectors(const float *v0, const float *v1, const float *v2, con 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); // 12 multiply, 10 subtract tc10[1] = tc1[1] - tc0[1]; tc20[1] = tc2[1] - tc0[1]; @@ -709,9 +575,6 @@ void Mod_BuildBumpVectors(const float *v0, const float *v1, const float *v2, con 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 @@ -725,76 +588,62 @@ void Mod_BuildBumpVectors(const float *v0, const float *v1, const float *v2, con } // 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) +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) { int i, tnum; float sdir[3], tdir[3], normal[3], *v; const int *e; // clear the vectors if (svector3f) - memset(svector3f, 0, numverts * sizeof(float[3])); + memset(svector3f + 3 * firstvertex, 0, numvertices * sizeof(float[3])); if (tvector3f) - memset(tvector3f, 0, numverts * sizeof(float[3])); + memset(tvector3f + 3 * firstvertex, 0, numvertices * sizeof(float[3])); if (normal3f) - memset(normal3f, 0, numverts * sizeof(float[3])); + memset(normal3f + 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); - if (svector3f) + if (!areaweighting) { - for (i = 0;i < 3;i++) - { - svector3f[e[i]*3 ] += sdir[0]; - svector3f[e[i]*3+1] += sdir[1]; - svector3f[e[i]*3+2] += sdir[2]; - } + 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++) - { - tvector3f[e[i]*3 ] += tdir[0]; - tvector3f[e[i]*3+1] += tdir[1]; - tvector3f[e[i]*3+2] += tdir[2]; - } - } + VectorAdd(tvector3f + e[i]*3, tdir, tvector3f + e[i]*3); if (normal3f) - { for (i = 0;i < 3;i++) - { - normal3f[e[i]*3 ] += normal[0]; - normal3f[e[i]*3+1] += normal[1]; - normal3f[e[i]*3+2] += normal[2]; - } - } + VectorAdd(normal3f + e[i]*3, normal, normal3f + e[i]*3); } // 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;i < numverts;i++, v += 3) + 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;i < numverts;i++, v += 3) + 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;i < numverts;i++, v += 3) + 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, int numcollisionvertices, int numcollisiontriangles, qboolean detailtexcoords, qboolean lightmapoffsets, qboolean vertexcolors) +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 + 1 + 2 + 2 + (detailtexcoords ? 2 : 0) + (vertexcolors ? 4 : 0)) * sizeof(float) + numtriangles * sizeof(int) * (3 + 3 + (lightmapoffsets ? 1 : 0)) + numcollisionvertices * sizeof(float[3]) + numcollisiontriangles * sizeof(int[3])); + 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; - mesh->num_collisionvertices = numcollisionvertices; - mesh->num_collisiontriangles = numcollisiontriangles; - 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; @@ -803,8 +652,6 @@ surfmesh_t *Mod_AllocSurfMesh(mempool_t *mempool, int numvertices, int numtriang 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) @@ -812,20 +659,17 @@ surfmesh_t *Mod_AllocSurfMesh(mempool_t *mempool, int numvertices, int numtriang } if (mesh->num_triangles) { - mesh->data_element3i = (int *)data, data += sizeof(int[3]) * mesh->num_vertices; - mesh->data_neighbor3i = (int *)data, data += sizeof(int[3]) * mesh->num_vertices; + 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; } - if (mesh->num_collisionvertices) - mesh->data_collisionvertex3f = (float *)data, data += sizeof(float[3]) * mesh->num_collisionvertices; - if (mesh->num_collisiontriangles) - mesh->data_collisionelement3i = (int *)data, data += sizeof(int[3]) * mesh->num_collisiontriangles; 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) { shadowmesh_t *newmesh; - qbyte *data; + unsigned char *data; int size; size = sizeof(shadowmesh_t); size += maxverts * sizeof(float[3]); @@ -836,8 +680,8 @@ shadowmesh_t *Mod_ShadowMesh_Alloc(mempool_t *mempool, int maxverts, int maxtria 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; @@ -846,23 +690,23 @@ shadowmesh_t *Mod_ShadowMesh_Alloc(mempool_t *mempool, int maxverts, int maxtria 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; } @@ -1011,6 +855,8 @@ void Mod_ShadowMesh_CalcBBox(shadowmesh_t *firstmesh, vec3_t mins, vec3_t maxs, 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) { @@ -1062,24 +908,21 @@ void Mod_ShadowMesh_Free(shadowmesh_t *mesh) } } -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 = mod_shared_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); @@ -1096,21 +939,23 @@ int Mod_LoadSkinFrame(skinframe_t *skinframe, char *basename, int textureflags, 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 = mod_shared_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); @@ -1140,10 +985,12 @@ int Mod_LoadSkinFrame_Internal(skinframe_t *skinframe, char *basename, int textu 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; @@ -1158,7 +1005,7 @@ void Mod_GetTerrainVertex3fTexCoord2fFromRGBA(const qbyte *imagepixels, int imag 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]; @@ -1183,7 +1030,7 @@ void Mod_GetTerrainVertexFromRGBA(const qbyte *imagepixels, int imagewidth, int 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; @@ -1234,19 +1081,19 @@ 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), 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; @@ -1279,7 +1126,7 @@ tag_torso, 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)); @@ -1300,7 +1147,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 = 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)); @@ -1316,14 +1163,14 @@ tag_torso, 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)