===============
*/
static void Mod_Print (void);
-static void Mod_Flush (void);
void Mod_Init (void)
{
Mod_BrushInit();
Mod_SpriteInit();
Cmd_AddCommand ("modellist", Mod_Print);
- Cmd_AddCommand ("modelflush", Mod_Flush);
}
void Mod_RenderInit(void)
*/
static model_t *Mod_LoadModel (model_t *mod, qboolean crash, qboolean checkdisk, qboolean isworldmodel)
{
- int crc;
+ unsigned int crc;
void *buf;
mod->used = true;
mod->needload = false;
mod->used = true;
mod->crc = crc;
+ // errors can prevent the corresponding mod->error = false;
+ mod->error = true;
// all models use memory, so allocate a memory pool
mod->mempool = Mem_AllocPool(mod->name);
Mem_Free(buf);
+ // no errors occurred
+ mod->error = false;
return mod;
}
{
}
+void Mod_ClearErrorModels (void)
+{
+ int i;
+ model_t *mod;
+
+ for (i = 0, mod = mod_known;i < MAX_MOD_KNOWN;i++, mod++)
+ if (mod->error)
+ Mod_FreeModel(mod);
+}
+
void Mod_ClearUsed(void)
{
int i;
Con_Printf ("%4iK %s\n", mod->mempool ? (mod->mempool->totalsize + 1023) / 1024 : 0, mod->name);
}
-static void Mod_Flush (void)
-{
- int i;
-
- Con_Printf ("Unloading models\n");
- for (i = 0;i < MAX_MOD_KNOWN;i++)
- if (mod_known[i].name[0])
- Mod_UnloadModel(&mod_known[i]);
- Mod_LoadModels();
-}
-
-int Mod_FindTriangleWithEdge(const int *elements, int numtriangles, int start, int end)
+int Mod_FindTriangleWithEdge(const int *elements, int numtriangles, int start, int end, int ignore)
{
- int i;
+ int i, match, count;
+ count = 0;
+ match = -1;
for (i = 0;i < numtriangles;i++, elements += 3)
{
- if (elements[0] == start && elements[1] == end)
- return i;
- if (elements[1] == start && elements[2] == end)
- return i;
- if (elements[2] == start && elements[0] == end)
- return i;
+ if ((elements[0] == start && elements[1] == end)
+ || (elements[1] == start && elements[2] == end)
+ || (elements[2] == start && elements[0] == end))
+ {
+ if (i != ignore)
+ match = i;
+ count++;
+ }
+ else if ((elements[1] == start && elements[0] == end)
+ || (elements[2] == start && elements[1] == end)
+ || (elements[0] == start && elements[2] == end))
+ count++;
}
- return -1;
+ // detect edges shared by three triangles and make them seams
+ if (count > 2)
+ match = -1;
+ return match;
}
void Mod_BuildTriangleNeighbors(int *neighbors, const int *elements, int numtriangles)
const int *e;
for (i = 0, e = elements, n = neighbors;i < numtriangles;i++, e += 3, n += 3)
{
- n[0] = Mod_FindTriangleWithEdge(elements, numtriangles, e[1], e[0]);
- n[1] = Mod_FindTriangleWithEdge(elements, numtriangles, e[2], e[1]);
- n[2] = Mod_FindTriangleWithEdge(elements, numtriangles, e[0], e[2]);
+ n[0] = Mod_FindTriangleWithEdge(elements, numtriangles, e[1], e[0], i);
+ n[1] = Mod_FindTriangleWithEdge(elements, numtriangles, e[2], e[1], i);
+ n[2] = Mod_FindTriangleWithEdge(elements, numtriangles, e[0], e[2], i);
}
}
{
int i;
for (i = 0;i < numtriangles * 3;i++)
- if ((unsigned int)elements[i] >= numverts)
+ if ((unsigned int)elements[i] >= (unsigned int)numverts)
Con_Printf("Mod_ValidateElements: out of bounds element detected at %s:%d\n", filename, fileline);
}
shadowmesh_t *Mod_ShadowMesh_Alloc(mempool_t *mempool, int maxverts)
{
shadowmesh_t *mesh;
-#define ALLOCMESHINPIECES 0
-#if ALLOCMESHINPIECES
- mesh = Mem_Alloc(mempool, sizeof(shadowmesh_t));
-#else
- mesh = Mem_Alloc(mempool, sizeof(shadowmesh_t) + maxverts * sizeof(float[4]) + maxverts * sizeof(int[3]) + maxverts * sizeof(int[3]));
-#endif
+ mesh = Mem_Alloc(mempool, sizeof(shadowmesh_t) + maxverts * sizeof(float[4]) + maxverts * sizeof(int[3]) + maxverts * sizeof(int[3]) + SHADOWMESHVERTEXHASH * sizeof(shadowmeshvertexhash_t *) + maxverts * sizeof(shadowmeshvertexhash_t));
mesh->maxverts = maxverts;
mesh->maxtriangles = maxverts;
mesh->numverts = 0;
mesh->numtriangles = 0;
-#if ALLOCMESHINPIECES
- mesh->verts = Mem_Alloc(mempool, maxverts * sizeof(float[4]));
- mesh->elements = Mem_Alloc(mempool, maxverts * sizeof(int[3]));
- mesh->neighbors = Mem_Alloc(mempool, maxverts * sizeof(int[3]));
-#else
mesh->verts = (float *)(mesh + 1);
mesh->elements = (int *)(mesh->verts + mesh->maxverts * 4);
mesh->neighbors = (int *)(mesh->elements + mesh->maxtriangles * 3);
-#endif
+ mesh->vertexhashtable = (shadowmeshvertexhash_t **)(mesh->neighbors + mesh->maxtriangles * 3);
+ mesh->vertexhashentries = (shadowmeshvertexhash_t *)(mesh->vertexhashtable + SHADOWMESHVERTEXHASH);
return mesh;
}
shadowmesh_t *Mod_ShadowMesh_ReAlloc(mempool_t *mempool, shadowmesh_t *oldmesh)
{
shadowmesh_t *newmesh;
-#if ALLOCMESHINPIECES
- newmesh = Mem_Alloc(mempool, sizeof(shadowmesh_t));
-#else
newmesh = Mem_Alloc(mempool, sizeof(shadowmesh_t) + oldmesh->numverts * sizeof(float[4]) + oldmesh->numtriangles * sizeof(int[3]) + oldmesh->numtriangles * sizeof(int[3]));
-#endif
newmesh->maxverts = newmesh->numverts = oldmesh->numverts;
newmesh->maxtriangles = newmesh->numtriangles = oldmesh->numtriangles;
-#if ALLOCMESHINPIECES
- newmesh->verts = Mem_Alloc(mempool, newmesh->maxverts * sizeof(float[4]));
- newmesh->elements = Mem_Alloc(mempool, newmesh->numtriangles * sizeof(int[3]));
- newmesh->neighbors = Mem_Alloc(mempool, newmesh->numtriangles * sizeof(int[3]));
-#else
newmesh->verts = (float *)(newmesh + 1);
newmesh->elements = (int *)(newmesh->verts + newmesh->maxverts * 4);
newmesh->neighbors = (int *)(newmesh->elements + newmesh->maxtriangles * 3);
-#endif
memcpy(newmesh->verts, oldmesh->verts, newmesh->numverts * sizeof(float[4]));
memcpy(newmesh->elements, oldmesh->elements, newmesh->numtriangles * sizeof(int[3]));
memcpy(newmesh->neighbors, oldmesh->neighbors, newmesh->numtriangles * sizeof(int[3]));
int Mod_ShadowMesh_AddVertex(shadowmesh_t *mesh, float *v)
{
- int j;
- float *m, temp[3];
- for (j = 0, m = mesh->verts;j < mesh->numverts;j++, m += 4)
+ int hashindex;
+ float *m;
+ shadowmeshvertexhash_t *hash;
+ // this uses prime numbers intentionally
+ hashindex = (int) (v[0] * 3 + v[1] * 5 + v[2] * 7) % SHADOWMESHVERTEXHASH;
+ for (hash = mesh->vertexhashtable[hashindex];hash;hash = hash->next)
{
- VectorSubtract(v, m, temp);
- if (DotProduct(temp, temp) < 0.1)
- return j;
+ m = mesh->verts + (hash - mesh->vertexhashentries) * 4;
+ if (m[0] == v[0] && m[1] == v[1] && m[2] == v[2])
+ return hash - mesh->vertexhashentries;
}
- mesh->numverts++;
+ hash = mesh->vertexhashentries + mesh->numverts;
+ hash->next = mesh->vertexhashtable[hashindex];
+ mesh->vertexhashtable[hashindex] = hash;
+ m = mesh->verts + (hash - mesh->vertexhashentries) * 4;
VectorCopy(v, m);
- return j;
+ mesh->numverts++;
+ return mesh->numverts - 1;
}
void Mod_ShadowMesh_AddTriangle(mempool_t *mempool, shadowmesh_t *mesh, float *vert0, float *vert1, float *vert2)
//Con_Printf("mesh\n");
//for (i = 0;i < newmesh->numtriangles;i++)
// Con_Printf("tri %d %d %d\n", newmesh->elements[i * 3 + 0], newmesh->elements[i * 3 + 1], newmesh->elements[i * 3 + 2]);
+ Mod_ValidateElements(newmesh->elements, newmesh->numtriangles, newmesh->numverts, __FILE__, __LINE__);
Mod_BuildTriangleNeighbors(newmesh->neighbors, newmesh->elements, newmesh->numtriangles);
}
Mem_Free(mesh);
#else
shadowmesh_t *mesh;
for (mesh = firstmesh;mesh;mesh = mesh->next)
+ {
+ Mod_ValidateElements(mesh->elements, mesh->numtriangles, mesh->numverts, __FILE__, __LINE__);
Mod_BuildTriangleNeighbors(mesh->neighbors, mesh->elements, mesh->numtriangles);
+ }
#endif
return firstmesh;
}
for (;mesh;mesh = nextmesh)
{
nextmesh = mesh->next;
-#if ALLOCMESHINPIECES
- Mem_Free(mesh->verts);
- Mem_Free(mesh->elements);
- Mem_Free(mesh->neighbors);
-#endif
Mem_Free(mesh);
}
}
projects / xonotic / darkplaces.git / blobdiff