X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=model_brush.c;h=874892a93ddf07298a4c6c4d17f432c39e034453;hb=c4e92b9982882076e7b35e55fb43bd1a0dbd340d;hp=465844e94821a025dbd5dbc02bfb483ccd27f5df;hpb=8042e27aa7a0da652a96d6bc203a45e5a2d5a2df;p=xonotic%2Fdarkplaces.git diff --git a/model_brush.c b/model_brush.c index 465844e9..874892a9 100644 --- a/model_brush.c +++ b/model_brush.c @@ -1358,7 +1358,6 @@ static void Mod_Q1BSP_LoadTextures(lump_t *l) tx->skinframerate = 1; tx->skinframes[0] = skinframe; tx->currentskinframe = tx->skinframes[0]; - tx->basematerialflags = 0; } tx->basematerialflags = MATERIALFLAG_WALL; if (i == loadmodel->num_textures - 1) @@ -1502,9 +1501,9 @@ static void Mod_Q1BSP_LoadTextures(lump_t *l) } else { - skinframe = R_SkinFrame_LoadExternal(gamemode == GAME_TENEBRAE ? tx->name : va("textures/%s/%s", mapname, tx->name), TEXF_MIPMAP | TEXF_PRECACHE | (r_picmipworld.integer ? TEXF_PICMIP : 0) | TEXF_COMPRESS, false); + skinframe = R_SkinFrame_LoadExternal(gamemode == GAME_TENEBRAE ? tx->name : va("textures/%s/%s", mapname, tx->name), TEXF_ALPHA | TEXF_MIPMAP | TEXF_PRECACHE | (r_picmipworld.integer ? TEXF_PICMIP : 0) | TEXF_COMPRESS, false); if (!skinframe) - skinframe = R_SkinFrame_LoadExternal(gamemode == GAME_TENEBRAE ? tx->name : va("textures/%s", tx->name), TEXF_MIPMAP | TEXF_PRECACHE | (r_picmipworld.integer ? TEXF_PICMIP : 0) | TEXF_COMPRESS, false); + skinframe = R_SkinFrame_LoadExternal(gamemode == GAME_TENEBRAE ? tx->name : va("textures/%s", tx->name), TEXF_ALPHA | TEXF_MIPMAP | TEXF_PRECACHE | (r_picmipworld.integer ? TEXF_PICMIP : 0) | TEXF_COMPRESS, false); if (!skinframe) { // did not find external texture, load it from the bsp or wad3 @@ -1521,13 +1520,13 @@ static void Mod_Q1BSP_LoadTextures(lump_t *l) { tx->width = image_width; tx->height = image_height; - skinframe = R_SkinFrame_LoadInternalBGRA(tx->name, TEXF_MIPMAP | TEXF_PRECACHE | (r_picmipworld.integer ? TEXF_PICMIP : 0), pixels, image_width, image_height); + skinframe = R_SkinFrame_LoadInternalBGRA(tx->name, TEXF_ALPHA | TEXF_MIPMAP | TEXF_PRECACHE | (r_picmipworld.integer ? TEXF_PICMIP : 0), pixels, image_width, image_height); } if (freepixels) Mem_Free(freepixels); } else if (mtdata) // texture included - skinframe = R_SkinFrame_LoadInternalQuake(tx->name, TEXF_MIPMAP | TEXF_PRECACHE | (r_picmipworld.integer ? TEXF_PICMIP : 0), false, r_fullbrights.integer, mtdata, tx->width, tx->height); + skinframe = R_SkinFrame_LoadInternalQuake(tx->name, TEXF_ALPHA | TEXF_MIPMAP | TEXF_PRECACHE | (r_picmipworld.integer ? TEXF_PICMIP : 0), false, r_fullbrights.integer, mtdata, tx->width, tx->height); } // if skinframe is still NULL the "missing" texture will be used if (skinframe) @@ -1563,7 +1562,7 @@ static void Mod_Q1BSP_LoadTextures(lump_t *l) else if (!strncmp(tx->name, "sky", 3)) tx->basematerialflags = MATERIALFLAG_SKY | MATERIALFLAG_NOSHADOW; else if (!strcmp(tx->name, "caulk")) - tx->basematerialflags = MATERIALFLAG_NODRAW; + tx->basematerialflags = MATERIALFLAG_NODRAW | MATERIALFLAG_NOSHADOW; else if (tx->skinframes[0] && tx->skinframes[0]->fog) tx->basematerialflags |= MATERIALFLAG_ALPHA | MATERIALFLAG_BLENDED | MATERIALFLAG_NOSHADOW; @@ -1774,7 +1773,6 @@ static void Mod_Q1BSP_LoadVisibility(lump_t *l) static void Mod_Q1BSP_ParseWadsFromEntityLump(const char *data) { char key[128], value[4096]; - char wadname[128]; int i, j, k; if (!data) return; @@ -1816,9 +1814,7 @@ static void Mod_Q1BSP_ParseWadsFromEntityLump(const char *data) { k = value[i]; value[i] = 0; - strlcpy(wadname, "textures/", sizeof(wadname)); - strlcat(wadname, &value[j], sizeof(wadname)); - W_LoadTextureWadFile(wadname, false); + W_LoadTextureWadFile(&value[j], false); j = i+1; if (!k) break; @@ -1835,8 +1831,9 @@ static void Mod_Q1BSP_LoadEntities(lump_t *l) loadmodel->brush.entities = NULL; if (!l->filelen) return; - loadmodel->brush.entities = (char *)Mem_Alloc(loadmodel->mempool, l->filelen); + loadmodel->brush.entities = (char *)Mem_Alloc(loadmodel->mempool, l->filelen + 1); memcpy(loadmodel->brush.entities, mod_base + l->fileofs, l->filelen); + loadmodel->brush.entities[l->filelen] = 0; if (loadmodel->brush.ishlbsp) Mod_Q1BSP_ParseWadsFromEntityLump(loadmodel->brush.entities); } @@ -3382,7 +3379,7 @@ void Mod_Q1BSP_Load(dp_model_t *mod, void *buffer, void *bufferend) dheader_t *header; dmodel_t *bm; mempool_t *mainmempool; - float dist, modelyawradius, modelradius, *vec; + float dist, modelyawradius, modelradius; msurface_t *surface; int numshadowmeshtriangles; hullinfo_t hullinfo; @@ -3619,17 +3616,31 @@ void Mod_Q1BSP_Load(dp_model_t *mod, void *buffer, void *bufferend) mod->brush.LightPoint = NULL; mod->brush.AmbientSoundLevelsForPoint = NULL; } + // copy the submodel bounds, then enlarge the yaw and rotated bounds according to radius + // (previously this code measured the radius of the vertices of surfaces in the submodel, but that broke submodels that contain only CLIP brushes, which do not produce surfaces) VectorCopy(bm->mins, mod->normalmins); VectorCopy(bm->maxs, mod->normalmaxs); - VectorCopy(bm->mins, mod->yawmins); - VectorCopy(bm->maxs, mod->yawmaxs); - VectorCopy(bm->mins, mod->rotatedmins); - VectorCopy(bm->maxs, mod->rotatedmaxs); + dist = max(fabs(mod->normalmins[0]), fabs(mod->normalmaxs[0])); + modelyawradius = max(fabs(mod->normalmins[1]), fabs(mod->normalmaxs[1])); + modelyawradius = dist*dist+modelyawradius*modelyawradius; + modelradius = max(fabs(mod->normalmins[2]), fabs(mod->normalmaxs[2])); + modelradius = modelyawradius + modelradius * modelradius; + modelyawradius = sqrt(modelyawradius); + modelradius = sqrt(modelradius); + mod->yawmins[0] = mod->yawmins[1] = -modelyawradius; + mod->yawmins[2] = mod->normalmins[2]; + mod->yawmaxs[0] = mod->yawmaxs[1] = modelyawradius; + mod->yawmaxs[2] = mod->normalmaxs[2]; + mod->rotatedmins[0] = mod->rotatedmins[1] = mod->rotatedmins[2] = -modelradius; + mod->rotatedmaxs[0] = mod->rotatedmaxs[1] = mod->rotatedmaxs[2] = modelradius; + mod->radius = modelradius; + mod->radius2 = modelradius * modelradius; + + // scan surfaces for sky and water and flag the submodel as possessing these features or not + // build lightstyle lists for quick marking of dirty lightmaps when lightstyles flicker if (mod->nummodelsurfaces) { - modelyawradius = 0; - modelradius = 0; for (j = 0, surface = &mod->data_surfaces[mod->firstmodelsurface];j < mod->nummodelsurfaces;j++, surface++) { // we only need to have a drawsky function if it is used(usually only on world model) @@ -3637,31 +3648,7 @@ void Mod_Q1BSP_Load(dp_model_t *mod, void *buffer, void *bufferend) mod->DrawSky = R_Q1BSP_DrawSky; if (surface->texture->basematerialflags & (MATERIALFLAG_WATERSHADER | MATERIALFLAG_REFRACTION | MATERIALFLAG_REFLECTION)) mod->DrawAddWaterPlanes = R_Q1BSP_DrawAddWaterPlanes; - // calculate bounding shapes - for (k = 0, vec = (loadmodel->surfmesh.data_vertex3f + 3 * surface->num_firstvertex);k < surface->num_vertices;k++, vec += 3) - { - dist = vec[0]*vec[0]+vec[1]*vec[1]; - if (modelyawradius < dist) - modelyawradius = dist; - dist += vec[2]*vec[2]; - if (modelradius < dist) - modelradius = dist; - } } - modelyawradius = sqrt(modelyawradius); - modelradius = sqrt(modelradius); - mod->yawmins[0] = min(mod->yawmins[0], -modelyawradius); - mod->yawmaxs[0] = min(mod->yawmaxs[0], -modelyawradius); - mod->yawmins[1] = min(mod->yawmins[1], modelyawradius); - mod->yawmaxs[1] = min(mod->yawmaxs[1], modelyawradius); - mod->rotatedmins[0] = min(mod->rotatedmins[0], -modelradius); - mod->rotatedmaxs[0] = min(mod->rotatedmaxs[0], modelradius); - mod->rotatedmins[1] = min(mod->rotatedmins[1], -modelradius); - mod->rotatedmaxs[1] = min(mod->rotatedmaxs[1], modelradius); - mod->rotatedmins[2] = min(mod->rotatedmins[2], -modelradius); - mod->rotatedmaxs[2] = min(mod->rotatedmaxs[2], modelradius); - mod->radius = modelradius; - mod->radius2 = modelradius * modelradius; // build lightstyle update chains // (used to rapidly mark lightmapupdateflags on many surfaces @@ -4167,8 +4154,9 @@ static void Mod_Q3BSP_LoadEntities(lump_t *l) loadmodel->brushq3.num_lightgrid_cellsize[2] = 128; if (!l->filelen) return; - loadmodel->brush.entities = (char *)Mem_Alloc(loadmodel->mempool, l->filelen); + loadmodel->brush.entities = (char *)Mem_Alloc(loadmodel->mempool, l->filelen + 1); memcpy(loadmodel->brush.entities, mod_base + l->fileofs, l->filelen); + loadmodel->brush.entities[l->filelen] = 0; data = loadmodel->brush.entities; // some Q3 maps override the lightgrid_cellsize with a worldspawn key if (data && COM_ParseToken_Simple(&data, false, false) && com_token[0] == '{') @@ -4534,7 +4522,7 @@ static void Mod_Q3BSP_LoadLightmaps(lump_t *l, lump_t *faceslump) } } - convertedpixels = Mem_Alloc(tempmempool, size*size*4); + convertedpixels = (unsigned char *) Mem_Alloc(tempmempool, size*size*4); loadmodel->brushq3.lightmapsize = size; loadmodel->brushq3.num_originallightmaps = count; @@ -4682,11 +4670,33 @@ static void Mod_Q3BSP_LoadLightmaps(lump_t *l, lump_t *faceslump) } } +typedef struct patchtess_s +{ + qboolean grouped; + int surface_id; + int xtess, ytess; + int xsize, ysize; + int cxtess, cytess; + int cxsize, cysize; + float lodgroup[6]; +} +patchtess_t; + +#define PATCHTESS_SAME_LODGROUP(a,b) \ + ( \ + (a).lodgroup[0] == (b).lodgroup[0] && \ + (a).lodgroup[1] == (b).lodgroup[1] && \ + (a).lodgroup[2] == (b).lodgroup[2] && \ + (a).lodgroup[3] == (b).lodgroup[3] && \ + (a).lodgroup[4] == (b).lodgroup[4] && \ + (a).lodgroup[5] == (b).lodgroup[5] \ + ) + static void Mod_Q3BSP_LoadFaces(lump_t *l) { q3dface_t *in, *oldin; msurface_t *out, *oldout; - int i, oldi, j, n, count, invalidelements, patchsize[2], finalwidth, finalheight, xtess, ytess, finalvertices, finaltriangles, firstvertex, firstelement, type, oldnumtriangles, oldnumtriangles2, meshvertices, meshtriangles, numvertices, numtriangles; + int i, oldi, j, n, count, invalidelements, patchsize[2], finalwidth, finalheight, xtess, ytess, finalvertices, finaltriangles, firstvertex, firstelement, type, oldnumtriangles, oldnumtriangles2, meshvertices, meshtriangles, numvertices, numtriangles, groupsize, cxtess, cytess; float lightmaptcbase[2], lightmaptcscale[2]; //int *originalelement3i; //int *originalneighbor3i; @@ -4698,6 +4708,8 @@ static void Mod_Q3BSP_LoadFaces(lump_t *l) float *originaltexcoordtexture2f; float *originaltexcoordlightmap2f; float *v; + patchtess_t *patchtess = NULL; + int patchtesscount = 0; in = (q3dface_t *)(mod_base + l->fileofs); if (l->filelen % sizeof(*in)) @@ -4708,6 +4720,9 @@ static void Mod_Q3BSP_LoadFaces(lump_t *l) loadmodel->data_surfaces = out; loadmodel->num_surfaces = count; + if(count > 0) + patchtess = (patchtess_t*) Mem_Alloc(tempmempool, count * sizeof(*patchtess)); + i = 0; oldi = i; oldin = in; @@ -4801,6 +4816,7 @@ static void Mod_Q3BSP_LoadFaces(lump_t *l) continue; } originalvertex3f = loadmodel->brushq3.data_vertex3f + firstvertex * 3; + // convert patch to Q3FACETYPE_MESH xtess = Q3PatchTesselationOnX(patchsize[0], patchsize[1], 3, originalvertex3f, r_subdivisions_tolerance.value); ytess = Q3PatchTesselationOnY(patchsize[0], patchsize[1], 3, originalvertex3f, r_subdivisions_tolerance.value); @@ -4810,18 +4826,35 @@ static void Mod_Q3BSP_LoadFaces(lump_t *l) // bound to sanity settings xtess = bound(1, xtess, 1024); ytess = bound(1, ytess, 1024); - // bound to user limit on vertices - while ((xtess > 1 || ytess > 1) && (((patchsize[0] - 1) * xtess) + 1) * (((patchsize[1] - 1) * ytess) + 1) > min(r_subdivisions_maxvertices.integer, 262144)) - { - if (xtess > ytess) - xtess--; - else - ytess--; - } - finalwidth = ((patchsize[0] - 1) * xtess) + 1; - finalheight = ((patchsize[1] - 1) * ytess) + 1; - numvertices = finalwidth * finalheight; - numtriangles = (finalwidth - 1) * (finalheight - 1) * 2; + + // lower quality collision patches! Same procedure as before, but different cvars + // convert patch to Q3FACETYPE_MESH + cxtess = Q3PatchTesselationOnX(patchsize[0], patchsize[1], 3, originalvertex3f, r_subdivisions_collision_tolerance.value); + cytess = Q3PatchTesselationOnY(patchsize[0], patchsize[1], 3, originalvertex3f, r_subdivisions_collision_tolerance.value); + // bound to user settings + cxtess = bound(r_subdivisions_collision_mintess.integer, cxtess, r_subdivisions_collision_maxtess.integer); + cytess = bound(r_subdivisions_collision_mintess.integer, cytess, r_subdivisions_collision_maxtess.integer); + // bound to sanity settings + cxtess = bound(1, cxtess, 1024); + cytess = bound(1, cytess, 1024); + + // store it for the LOD grouping step + patchtess[patchtesscount].surface_id = i; + patchtess[patchtesscount].grouped = false; + patchtess[patchtesscount].xtess = xtess; + patchtess[patchtesscount].ytess = ytess; + patchtess[patchtesscount].xsize = patchsize[0]; + patchtess[patchtesscount].ysize = patchsize[1]; + patchtess[patchtesscount].lodgroup[0] = in->specific.patch.mins[0]; + patchtess[patchtesscount].lodgroup[1] = in->specific.patch.mins[1]; + patchtess[patchtesscount].lodgroup[2] = in->specific.patch.mins[2]; + patchtess[patchtesscount].lodgroup[3] = in->specific.patch.maxs[0]; + patchtess[patchtesscount].lodgroup[4] = in->specific.patch.maxs[1]; + patchtess[patchtesscount].lodgroup[5] = in->specific.patch.maxs[2]; + + patchtess[patchtesscount].cxtess = cxtess; + patchtess[patchtesscount].cytess = cytess; + ++patchtesscount; break; case Q3FACETYPE_FLARE: if (developer.integer >= 100) @@ -4835,6 +4868,131 @@ static void Mod_Q3BSP_LoadFaces(lump_t *l) meshtriangles += out->num_triangles; } + for(i = 0; i < patchtesscount; ++i) + { + if(patchtess[i].grouped) // already grouped + continue; + + // get the highest required tess parameters for this group + groupsize = 0; + xtess = ytess = 0; + cxtess = cytess = 0; + for(j = 0; j < patchtesscount; ++j) + { + if(patchtess[j].grouped) // already grouped + continue; + if(!PATCHTESS_SAME_LODGROUP(patchtess[i], patchtess[j])) + continue; + if(patchtess[j].xtess > xtess) + xtess = patchtess[j].xtess; + if(patchtess[j].ytess > ytess) + ytess = patchtess[j].ytess; + if(patchtess[j].cxtess > cxtess) + cxtess = patchtess[j].cxtess; + if(patchtess[j].cytess > cytess) + cytess = patchtess[j].cytess; + ++groupsize; + } + + if(groupsize == 0) + { + Con_Printf("ERROR: patch %d isn't in any LOD group (1)?!?\n", patchtess[i].surface_id); + continue; + } + + // bound to user limit on vertices + for(;;) + { + numvertices = 0; + numtriangles = 0; + + for(j = 0; j < patchtesscount; ++j) + { + if(patchtess[j].grouped) // already grouped + continue; + if(!PATCHTESS_SAME_LODGROUP(patchtess[i], patchtess[j])) + continue; + + finalwidth = (patchtess[j].xsize - 1) * xtess + 1; + finalheight = (patchtess[j].ysize - 1) * ytess + 1; + numvertices += finalwidth * finalheight; + numtriangles += (finalwidth - 1) * (finalheight - 1) * 2; + } + + if(xtess <= 1 && ytess <= 1) + break; + + if(numvertices > min(r_subdivisions_maxvertices.integer, 262144) * groupsize) + { + if (xtess > ytess) + xtess--; + else + ytess--; + continue; // try again + } + + break; + } + + // bound to user limit on vertices (collision) + for(;;) + { + numvertices = 0; + numtriangles = 0; + + for(j = 0; j < patchtesscount; ++j) + { + if(patchtess[j].grouped) // already grouped + continue; + if(!PATCHTESS_SAME_LODGROUP(patchtess[i], patchtess[j])) + continue; + + finalwidth = (patchtess[j].xsize - 1) * cxtess + 1; + finalheight = (patchtess[j].ysize - 1) * cytess + 1; + numvertices += finalwidth * finalheight; + numtriangles += (finalwidth - 1) * (finalheight - 1) * 2; + } + + if(cxtess <= 1 && cytess <= 1) + break; + + if(numvertices > min(r_subdivisions_collision_maxvertices.integer, 262144) * groupsize) + { + if (cxtess > cytess) + cxtess--; + else + cytess--; + continue; // try again + } + + break; + } + + for(j = 0; j < patchtesscount; ++j) + { + if(patchtess[j].grouped) // already grouped + continue; + if(!PATCHTESS_SAME_LODGROUP(patchtess[i], patchtess[j])) + continue; + + finalwidth = (patchtess[j].xsize - 1) * xtess + 1; + finalheight = (patchtess[j].ysize - 1) * ytess + 1; + numvertices = finalwidth * finalheight; + numtriangles = (finalwidth - 1) * (finalheight - 1) * 2; + + oldout[patchtess[j].surface_id].num_vertices = numvertices; + oldout[patchtess[j].surface_id].num_triangles = numtriangles; + meshvertices += oldout[patchtess[j].surface_id].num_vertices; + meshtriangles += oldout[patchtess[j].surface_id].num_triangles; + + patchtess[j].grouped = true; + patchtess[j].xtess = xtess; + patchtess[j].ytess = ytess; + patchtess[j].cxtess = cxtess; + patchtess[j].cytess = cytess; + } + } + i = oldi; in = oldin; out = oldout; @@ -4884,23 +5042,23 @@ static void Mod_Q3BSP_LoadFaces(lump_t *l) originaltexcoordtexture2f = loadmodel->brushq3.data_texcoordtexture2f + firstvertex * 2; originaltexcoordlightmap2f = loadmodel->brushq3.data_texcoordlightmap2f + firstvertex * 2; originalcolor4f = loadmodel->brushq3.data_color4f + firstvertex * 4; - // convert patch to Q3FACETYPE_MESH - xtess = Q3PatchTesselationOnX(patchsize[0], patchsize[1], 3, originalvertex3f, r_subdivisions_tolerance.value); - ytess = Q3PatchTesselationOnY(patchsize[0], patchsize[1], 3, originalvertex3f, r_subdivisions_tolerance.value); - // bound to user settings - xtess = bound(r_subdivisions_mintess.integer, xtess, r_subdivisions_maxtess.integer); - ytess = bound(r_subdivisions_mintess.integer, ytess, r_subdivisions_maxtess.integer); - // bound to sanity settings - xtess = bound(1, xtess, 1024); - ytess = bound(1, ytess, 1024); - // bound to user limit on vertices - while ((xtess > 1 || ytess > 1) && (((patchsize[0] - 1) * xtess) + 1) * (((patchsize[1] - 1) * ytess) + 1) > min(r_subdivisions_maxvertices.integer, 262144)) + + xtess = ytess = cxtess = cytess = 0; + for(j = 0; j < patchtesscount; ++j) + if(patchtess[j].grouped && patchtess[j].surface_id == i) + { + xtess = patchtess[j].xtess; + ytess = patchtess[j].ytess; + cxtess = patchtess[j].cxtess; + cytess = patchtess[j].cytess; + break; + } + if(xtess == 0) { - if (xtess > ytess) - xtess--; - else - ytess--; + Con_Printf("ERROR: patch %d isn't in any LOD group (2)?!?\n", i); + xtess = ytess = cxtess = cytess = 1; } + finalwidth = ((patchsize[0] - 1) * xtess) + 1; finalheight = ((patchsize[1] - 1) * ytess) + 1; finalvertices = finalwidth * finalheight; @@ -4924,24 +5082,8 @@ static void Mod_Q3BSP_LoadFaces(lump_t *l) } // q3map does not put in collision brushes for curves... ugh // build the lower quality collision geometry - xtess = Q3PatchTesselationOnX(patchsize[0], patchsize[1], 3, originalvertex3f, r_subdivisions_collision_tolerance.value); - ytess = Q3PatchTesselationOnY(patchsize[0], patchsize[1], 3, originalvertex3f, r_subdivisions_collision_tolerance.value); - // bound to user settings - xtess = bound(r_subdivisions_collision_mintess.integer, xtess, r_subdivisions_collision_maxtess.integer); - ytess = bound(r_subdivisions_collision_mintess.integer, ytess, r_subdivisions_collision_maxtess.integer); - // bound to sanity settings - xtess = bound(1, xtess, 1024); - ytess = bound(1, ytess, 1024); - // bound to user limit on vertices - while ((xtess > 1 || ytess > 1) && (((patchsize[0] - 1) * xtess) + 1) * (((patchsize[1] - 1) * ytess) + 1) > min(r_subdivisions_collision_maxvertices.integer, 262144)) - { - if (xtess > ytess) - xtess--; - else - ytess--; - } - finalwidth = ((patchsize[0] - 1) * xtess) + 1; - finalheight = ((patchsize[1] - 1) * ytess) + 1; + finalwidth = ((patchsize[0] - 1) * cxtess) + 1; + finalheight = ((patchsize[1] - 1) * cytess) + 1; finalvertices = finalwidth * finalheight; finaltriangles = (finalwidth - 1) * (finalheight - 1) * 2; @@ -4949,7 +5091,7 @@ static void Mod_Q3BSP_LoadFaces(lump_t *l) out->data_collisionelement3i = (int *)Mem_Alloc(loadmodel->mempool, sizeof(int[3]) * finaltriangles); out->num_collisionvertices = finalvertices; out->num_collisiontriangles = finaltriangles; - Q3PatchTesselateFloat(3, sizeof(float[3]), out->data_collisionvertex3f, patchsize[0], patchsize[1], sizeof(float[3]), originalvertex3f, xtess, ytess); + Q3PatchTesselateFloat(3, sizeof(float[3]), out->data_collisionvertex3f, patchsize[0], patchsize[1], sizeof(float[3]), originalvertex3f, cxtess, cytess); Q3PatchTriangleElements(out->data_collisionelement3i, finalwidth, finalheight, 0); //Mod_SnapVertices(3, out->num_vertices, (loadmodel->surfmesh.data_vertex3f + 3 * out->num_firstvertex), 0.25); @@ -5028,6 +5170,18 @@ static void Mod_Q3BSP_LoadFaces(lump_t *l) //out->lightmapinfo->styles[3] = 255; } + i = oldi; + out = oldout; + for (;i < count;i++, out++) + { + if(out->num_vertices && out->num_triangles) + continue; + if(out->num_vertices == 0) + Con_Printf("Mod_Q3BSP_LoadFaces: surface %d has no vertices, ignoring\n", i); + if(out->num_triangles == 0) + Con_Printf("Mod_Q3BSP_LoadFaces: surface %d has no triangles, ignoring\n", i); + } + // for per pixel lighting Mod_BuildTextureVectorsFromNormals(0, loadmodel->surfmesh.num_vertices, loadmodel->surfmesh.num_triangles, loadmodel->surfmesh.data_vertex3f, loadmodel->surfmesh.data_texcoordtexture2f, loadmodel->surfmesh.data_normal3f, loadmodel->surfmesh.data_element3i, loadmodel->surfmesh.data_svector3f, loadmodel->surfmesh.data_tvector3f, true); @@ -5050,6 +5204,9 @@ static void Mod_Q3BSP_LoadFaces(lump_t *l) if (loadmodel->brushq3.data_element3i) Mem_Free(loadmodel->brushq3.data_element3i); loadmodel->brushq3.data_element3i = NULL; + + if(patchtess) + Mem_Free(patchtess); } static void Mod_Q3BSP_LoadModels(lump_t *l)