X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=model_shared.c;h=34859f8c8ad611ab30ef73a06c0fcca25c0c6171;hb=ea1a30a140048d0ef4c9023d4804bfa57eba9fa8;hp=e0b55c800b57085c641391b40b11cac410c3a725;hpb=cd42525225ee0da0923555e44a27221b92d6e103;p=xonotic%2Fdarkplaces.git diff --git a/model_shared.c b/model_shared.c index e0b55c80..34859f8c 100644 --- a/model_shared.c +++ b/model_shared.c @@ -35,7 +35,7 @@ model_t *loadmodel; static model_t mod_known[MAX_MOD_KNOWN]; rtexturepool_t *mod_shared_texturepool; -rtexture_t *r_notexture; +rtexture_t *r_texture_notexture; rtexture_t *mod_shared_detailtextures[NUM_DETAILTEXTURES]; rtexture_t *mod_shared_distorttexture[64]; @@ -136,36 +136,8 @@ void Mod_BuildDistortTexture (void) return; } -texture_t r_surf_notexture; - void Mod_SetupNoTexture(void) { - int x, y; - qbyte pix[16][16][4]; - - // this makes a light grey/dark grey checkerboard texture - for (y = 0;y < 16;y++) - { - for (x = 0;x < 16;x++) - { - if ((y < 8) ^ (x < 8)) - { - pix[y][x][0] = 128; - pix[y][x][1] = 128; - pix[y][x][2] = 128; - pix[y][x][3] = 255; - } - else - { - pix[y][x][0] = 64; - pix[y][x][1] = 64; - pix[y][x][2] = 64; - pix[y][x][3] = 255; - } - } - } - - r_notexture = R_LoadTexture2D(mod_shared_texturepool, "notexture", 16, 16, &pix[0][0][0], TEXTYPE_RGBA, TEXF_MIPMAP, NULL); } static void mod_start(void) @@ -194,30 +166,30 @@ static void mod_shutdown(void) static void mod_newmap(void) { - msurface_t *surf; - int i, surfnum, ssize, tsize; + msurface_t *surface; + int i, surfacenum, ssize, tsize; - if (!cl_stainmapsclearonload.integer) + if (!cl_stainmaps_clearonload.integer) return; - for (i=0; itexinfo->texture->flags & SURF_LIGHTMAP) + if (surface->stainsamples) { - ssize = (surf->extents[0] >> 4) + 1; - tsize = (surf->extents[1] >> 4) + 1; - + ssize = (surface->extents[0] >> 4) + 1; + tsize = (surface->extents[1] >> 4) + 1; + if (ssize > 256 || tsize > 256) Host_Error("Bad surface extents"); - if (surf->stainsamples) - memset(surf->stainsamples, 255, ssize * tsize * 3); + if (surface->stainsamples) + memset(surface->stainsamples, 255, ssize * tsize * 3); - surf->cached_dlight = true; + surface->cached_dlight = true; } } } @@ -265,7 +237,7 @@ void Mod_UnloadModel (model_t *mod) Mod_FreeModel(mod); strcpy(mod->name, name); mod->isworldmodel = isworldmodel; - mod->needload = true; + mod->loaded = false; } /* @@ -289,31 +261,40 @@ static model_t *Mod_LoadModel(model_t *mod, qboolean crash, qboolean checkdisk, crc = 0; buf = NULL; if (mod->isworldmodel != isworldmodel) - mod->needload = true; - if (mod->needload || checkdisk) + mod->loaded = false; + if (!mod->loaded || checkdisk) { - if (checkdisk && !mod->needload) + if (checkdisk && mod->loaded) Con_DPrintf("checking model %s\n", mod->name); buf = FS_LoadFile (mod->name, tempmempool, false); if (buf) { crc = CRC_Block(buf, fs_filesize); if (mod->crc != crc) - mod->needload = true; + mod->loaded = false; } } - if (!mod->needload) + if (mod->loaded) return mod; // already loaded 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); + } + // load the model mod->isworldmodel = isworldmodel; mod->used = true; mod->crc = crc; - // errors can prevent the corresponding mod->needload = false; - mod->needload = true; + // errors can prevent the corresponding mod->loaded = true; + mod->loaded = false; // default model radius and bounding box (mainly for missing models) mod->radius = 16; @@ -353,7 +334,7 @@ static model_t *Mod_LoadModel(model_t *mod, qboolean crash, qboolean checkdisk, } // no errors occurred - mod->needload = false; + mod->loaded = true; return mod; } @@ -361,7 +342,7 @@ void Mod_CheckLoaded(model_t *mod) { if (mod) { - if (mod->needload) + if (!mod->loaded) Mod_LoadModel(mod, true, true, mod->isworldmodel); else { @@ -448,7 +429,7 @@ model_t *Mod_FindName(const char *name) { mod = freemod; strcpy (mod->name, name); - mod->needload = true; + mod->loaded = false; mod->used = true; return mod; } @@ -457,20 +438,6 @@ model_t *Mod_FindName(const char *name) return NULL; } -/* -================== -Mod_TouchModel - -================== -*/ -void Mod_TouchModel(const char *name) -{ - model_t *mod; - - mod = Mod_FindName(name); - mod->used = true; -} - /* ================== Mod_ForName @@ -533,7 +500,7 @@ int Mod_BuildVertexRemapTableFromElements(int numelements, const int *elements, #if 1 // fast way, using an edge hash -#define TRIANGLEEDGEHASH 1024 +#define TRIANGLEEDGEHASH 16384 void Mod_BuildTriangleNeighbors(int *neighbors, const int *elements, int numtriangles) { int i, j, p, e1, e2, *n, hashindex, count, match; @@ -648,18 +615,53 @@ 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, 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 - // 18 multiply, 19 subtract + // 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); + // 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]; @@ -670,8 +672,6 @@ void Mod_BuildBumpVectors(const float *v0, const float *v1, const float *v2, con 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]; - // 1 sqrt, 1 divide, 6 multiply, 2 add, 1 compare - VectorNormalize(normal3f); // 12 multiply, 4 add, 6 subtract f = DotProduct(svector3f, normal3f); svector3f[0] -= f * normal3f[0]; @@ -696,7 +696,7 @@ void Mod_BuildBumpVectors(const float *v0, const float *v1, const float *v2, con } } -// 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; @@ -757,6 +757,43 @@ void Mod_BuildTextureVectorsAndNormals(int numverts, int numtriangles, const flo 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 *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) * sizeof(int) + numcollisionvertices * sizeof(float[3]) + numcollisiontriangles * sizeof(int[3])); + mesh->num_vertices = numvertices; + mesh->num_triangles = numtriangles; + mesh->num_collisionvertices = numcollisionvertices; + mesh->num_collisiontriangles = numcollisiontriangles; + data = (qbyte *)(mesh + 1); + if (mesh->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; + 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) + mesh->data_lightmapoffsets = (int *)data, data += sizeof(int) * mesh->num_vertices; + } + if (mesh->num_triangles) + { + mesh->data_element3i = (int *)data, data += sizeof(int[3]) * mesh->num_triangles; + 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; @@ -1289,6 +1326,14 @@ int Mod_CountSkinFiles(skinfile_t *skinfile) return i; } +void Mod_SnapVertices(int numcomponents, int numvertices, float *vertices, float snap) +{ + int i; + double isnap = 1.0 / snap; + for (i = 0;i < numvertices*numcomponents;i++) + vertices[i] = floor(vertices[i]*isnap)*snap; +} + int Mod_RemoveDegenerateTriangles(int numtriangles, const int *inelement3i, int *outelement3i, const float *vertex3f) { int i, outtriangles;