X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=model_brush.c;h=28aa2d240ff69717b7a9383da55a96a77234893a;hb=ddf29ee760ff83c108fb9c13cdf27d17dca6ac8e;hp=d417326f79e8813d09a4c972183cd452a3cb2024;hpb=8468ffaf8162a4fe8361127385c40141c375661d;p=xonotic%2Fdarkplaces.git diff --git a/model_brush.c b/model_brush.c index d417326f..28aa2d24 100644 --- a/model_brush.c +++ b/model_brush.c @@ -20,13 +20,22 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "quakedef.h" -byte mod_novis[MAX_MAP_LEAFS/8]; +// note: model_shared.c sets up r_notexture, and r_surf_notexture -qboolean hlbsp; // LordHavoc: true if it is a HalfLife BSP file (version 30) +qbyte mod_novis[(MAX_MAP_LEAFS + 7)/ 8]; -cvar_t gl_subdivide_size = {CVAR_SAVE, "gl_subdivide_size", "128"}; +//cvar_t r_subdivide_size = {CVAR_SAVE, "r_subdivide_size", "128"}; cvar_t halflifebsp = {0, "halflifebsp", "0"}; cvar_t r_novis = {0, "r_novis", "0"}; +cvar_t r_miplightmaps = {CVAR_SAVE, "r_miplightmaps", "0"}; +cvar_t r_lightmaprgba = {0, "r_lightmaprgba", "1"}; +cvar_t r_vertexsurfacesthreshold = {CVAR_SAVE, "r_vertexsurfacesthreshold", "0"}; +cvar_t r_nosurftextures = {0, "r_nosurftextures", "0"}; +cvar_t r_sortsurfaces = {0, "r_sortsurfaces", "0"}; + +#define NUM_DETAILTEXTURES 1 +static rtexture_t *detailtextures[NUM_DETAILTEXTURES]; +static rtexturepool_t *detailtexturepool; /* =============== @@ -35,10 +44,64 @@ Mod_BrushInit */ void Mod_BrushInit (void) { - Cvar_RegisterVariable (&gl_subdivide_size); - Cvar_RegisterVariable (&halflifebsp); - Cvar_RegisterVariable (&r_novis); - memset (mod_novis, 0xff, sizeof(mod_novis)); +// Cvar_RegisterVariable(&r_subdivide_size); + Cvar_RegisterVariable(&halflifebsp); + Cvar_RegisterVariable(&r_novis); + Cvar_RegisterVariable(&r_miplightmaps); + Cvar_RegisterVariable(&r_lightmaprgba); + Cvar_RegisterVariable(&r_vertexsurfacesthreshold); + Cvar_RegisterVariable(&r_nosurftextures); + Cvar_RegisterVariable(&r_sortsurfaces); + memset(mod_novis, 0xff, sizeof(mod_novis)); +} + +void Mod_BrushStartup (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]; + detailtexturepool = R_AllocTexturePool(); + 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; + } + } + detailtextures[i] = R_LoadTexture(detailtexturepool, va("detailtexture%i", i), DETAILRESOLUTION, DETAILRESOLUTION, &data[0][0][0], TEXTYPE_RGBA, TEXF_MIPMAP | TEXF_PRECACHE); + } +} + +void Mod_BrushShutdown (void) +{ + int i; + for (i = 0;i < NUM_DETAILTEXTURES;i++) + R_FreeTexture(detailtextures[i]); + R_FreeTexturePool(&detailtexturepool); } /* @@ -46,74 +109,72 @@ void Mod_BrushInit (void) Mod_PointInLeaf =============== */ -mleaf_t *Mod_PointInLeaf (vec3_t p, model_t *model) +mleaf_t *Mod_PointInLeaf (const vec3_t p, model_t *model) { - mnode_t *node; - -// if (!model || !model->nodes) -// Sys_Error ("Mod_PointInLeaf: bad model"); + mnode_t *node; - node = model->nodes; - do + if (model == NULL) + return NULL; + + Mod_CheckLoaded(model); + + // LordHavoc: modified to start at first clip node, + // in other words: first node of the (sub)model + node = model->nodes + model->hulls[0].firstclipnode; + while (node->contents == 0) node = node->children[(node->plane->type < 3 ? p[node->plane->type] : DotProduct (p,node->plane->normal)) < node->plane->dist]; - while (node->contents == 0); return (mleaf_t *)node; } -/* -mleaf_t *Mod_PointInLeaf (vec3_t p, model_t *model) + +int Mod_PointContents (const vec3_t p, model_t *model) { - mnode_t *node; - float d; - mplane_t *plane; - - if (!model || !model->nodes) - Sys_Error ("Mod_PointInLeaf: bad model"); - - node = model->nodes; - while (1) - { - if (node->contents < 0) - return (mleaf_t *)node; - plane = node->plane; - d = DotProduct (p,plane->normal) - plane->dist; - if (d > 0) - node = node->children[0]; - else - node = node->children[1]; - } - - return NULL; // never reached + mnode_t *node; + + if (model == NULL) + return CONTENTS_EMPTY; + + Mod_CheckLoaded(model); + + // LordHavoc: modified to start at first clip node, + // in other words: first node of the (sub)model + node = model->nodes + model->hulls[0].firstclipnode; + while (node->contents == 0) + node = node->children[(node->plane->type < 3 ? p[node->plane->type] : DotProduct (p,node->plane->normal)) < node->plane->dist]; + + return ((mleaf_t *)node)->contents; } -*/ + +void Mod_FindNonSolidLocation(vec3_t pos, model_t *mod) +{ + if (Mod_PointContents(pos, mod) != CONTENTS_SOLID) return; + pos[0]-=1;if (Mod_PointContents(pos, mod) != CONTENTS_SOLID) return; + pos[0]+=2;if (Mod_PointContents(pos, mod) != CONTENTS_SOLID) return; + pos[0]-=1; + pos[1]-=1;if (Mod_PointContents(pos, mod) != CONTENTS_SOLID) return; + pos[1]+=2;if (Mod_PointContents(pos, mod) != CONTENTS_SOLID) return; + pos[1]-=1; + pos[2]-=1;if (Mod_PointContents(pos, mod) != CONTENTS_SOLID) return; + pos[2]+=2;if (Mod_PointContents(pos, mod) != CONTENTS_SOLID) return; + pos[2]-=1; +} + /* =================== Mod_DecompressVis =================== */ -byte *Mod_DecompressVis (byte *in, model_t *model) +static qbyte *Mod_DecompressVis (qbyte *in, model_t *model) { - static byte decompressed[MAX_MAP_LEAFS/8]; - int c; - byte *out; - int row; + static qbyte decompressed[MAX_MAP_LEAFS/8]; + int c; + qbyte *out; + int row; row = (model->numleafs+7)>>3; out = decompressed; - /* - if (!in) - { // no vis info, so make all visible - while (row) - { - *out++ = 0xff; - row--; - } - return decompressed; - } - */ - do { if (*in) @@ -121,7 +182,7 @@ byte *Mod_DecompressVis (byte *in, model_t *model) *out++ = *in++; continue; } - + c = in[1]; in += 2; while (c) @@ -130,92 +191,70 @@ byte *Mod_DecompressVis (byte *in, model_t *model) c--; } } while (out - decompressed < row); - + return decompressed; } -byte *Mod_LeafPVS (mleaf_t *leaf, model_t *model) +qbyte *Mod_LeafPVS (mleaf_t *leaf, model_t *model) { - if (r_novis.value || leaf == model->leafs || leaf->compressed_vis == NULL) + if (r_novis.integer || leaf == model->leafs || leaf->compressed_vis == NULL) return mod_novis; return Mod_DecompressVis (leaf->compressed_vis, model); } -rtexture_t *r_notexture; -texture_t r_notexture_mip; - -void Mod_SetupNoTexture(void) -{ - int x, y; - byte pix[16][16][4]; - - // create a simple checkerboard texture for the default - // LordHavoc: redesigned this to remove reliance on the palette and texture_t - 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_LoadTexture("notexture", 16, 16, &pix[0][0][0], TEXF_MIPMAP | TEXF_RGBA); - - strcpy(r_notexture_mip.name, "notexture"); - r_notexture_mip.width = 16; - r_notexture_mip.height = 16; - r_notexture_mip.transparent = false; - r_notexture_mip.texture = r_notexture; - r_notexture_mip.glowtexture = NULL; -} - /* ================= Mod_LoadTextures ================= */ -void Mod_LoadTextures (lump_t *l) +static void Mod_LoadTextures (lump_t *l) { - int i, j, k, num, max, altmax, mtwidth, mtheight, *dofs; - miptex_t *dmiptex; - texture_t *tx, *tx2, *anims[10], *altanims[10]; - dmiptexlump_t *m; - byte *data, *mtdata; + int i, j, k, num, max, altmax, mtwidth, mtheight, *dofs, incomplete; + miptex_t *dmiptex; + texture_t *tx, *tx2, *anims[10], *altanims[10]; + dmiptexlump_t *m; + qbyte *data, *mtdata, *data2; + char name[256]; + + loadmodel->textures = NULL; if (!l->filelen) - { - loadmodel->textures = NULL; return; - } m = (dmiptexlump_t *)(mod_base + l->fileofs); - + m->nummiptex = LittleLong (m->nummiptex); - - loadmodel->numtextures = m->nummiptex; - loadmodel->textures = Hunk_AllocName (m->nummiptex * sizeof(*loadmodel->textures), va("%s texture headers", loadname)); + + // add two slots for notexture walls and notexture liquids + loadmodel->numtextures = m->nummiptex + 2; + loadmodel->textures = Mem_Alloc(loadmodel->mempool, loadmodel->numtextures * sizeof(*loadmodel->textures)); + + // fill out all slots with notexture + for (i = 0;i < loadmodel->numtextures;i++) + { + loadmodel->textures[i] = tx = Mem_Alloc(loadmodel->mempool, sizeof(texture_t)); + tx->width = 16; + tx->height = 16; + tx->texture = r_notexture; + if (i == loadmodel->numtextures - 1) + tx->flags = SURF_DRAWTURB | SURF_DRAWFULLBRIGHT | SURF_DRAWNOALPHA | SURF_CLIPSOLID; + } // just to work around bounds checking when debugging with it (array index out of bounds error thing) dofs = m->dataofs; + // LordHavoc: mostly rewritten map texture loader for (i = 0;i < m->nummiptex;i++) { dofs[i] = LittleLong(dofs[i]); - if (dofs[i] == -1) + if (dofs[i] == -1 || r_nosurftextures.integer) continue; - dmiptex = (miptex_t *)((byte *)m + dofs[i]); + dmiptex = (miptex_t *)((qbyte *)m + dofs[i]); + + // make sure name is no more than 15 characters + for (j = 0;dmiptex->name[j] && j < 15;j++) + name[j] = dmiptex->name[j]; + name[j] = 0; + mtwidth = LittleLong (dmiptex->width); mtheight = LittleLong (dmiptex->height); mtdata = NULL; @@ -224,245 +263,272 @@ void Mod_LoadTextures (lump_t *l) { // texture included if (j < 40 || j + mtwidth * mtheight > l->filelen) - Host_Error ("Texture %s is corrupt or incomplete\n", dmiptex->name); - mtdata = (byte *)dmiptex + j; + { + Con_Printf ("Texture \"%s\" in \"%s\"is corrupt or incomplete\n", dmiptex->name, loadmodel->name); + continue; + } + mtdata = (qbyte *)dmiptex + j; } - + if ((mtwidth & 15) || (mtheight & 15)) - Host_Error ("Texture %s is not 16 aligned", dmiptex->name); - // LordHavoc: rewriting the map texture loader for GLQuake - tx = Hunk_AllocName (sizeof(texture_t), va("%s textures", loadname)); - loadmodel->textures[i] = tx; + Con_Printf ("warning: texture \"%s\" in \"%s\" is not 16 aligned", dmiptex->name, loadmodel->name); - // LordHavoc: force all names to lowercase and make sure they are terminated while copying - for (j = 0;dmiptex->name[j] && j < 15;j++) - { - if (dmiptex->name[j] >= 'A' && dmiptex->name[j] <= 'Z') - tx->name[j] = dmiptex->name[j] + ('a' - 'A'); - else - tx->name[j] = dmiptex->name[j]; - } - for (;j < 16;j++) - tx->name[j] = 0; + // LordHavoc: force all names to lowercase + for (j = 0;name[j];j++) + if (name[j] >= 'A' && name[j] <= 'Z') + name[j] += 'a' - 'A'; + + tx = loadmodel->textures[i]; + strcpy(tx->name, name); + tx->width = mtwidth; + tx->height = mtheight; + tx->texture = NULL; + tx->glowtexture = NULL; + tx->fogtexture = NULL; if (!tx->name[0]) { - Con_Printf("warning: unnamed texture in %s\n", loadname); sprintf(tx->name, "unnamed%i", i); + Con_Printf("warning: unnamed texture in %s, renaming to %s\n", loadmodel->name, tx->name); } - tx->transparent = false; - data = loadimagepixels(tx->name, false, 0, 0); - if (data) + // LordHavoc: HL sky textures are entirely different than quake + if (!loadmodel->ishlbsp && !strncmp(tx->name, "sky", 3) && mtwidth == 256 && mtheight == 128) { - if (!hlbsp && !strncmp(tx->name,"sky",3) && image_width == 256 && image_height == 128) // LordHavoc: HL sky textures are entirely unrelated - { - tx->width = 0; - tx->height = 0; - tx->transparent = false; - tx->texture = NULL; - tx->glowtexture = NULL; - R_InitSky (data, 4); - } - else + if (loadmodel->isworldmodel) { - tx->width = mtwidth; - tx->height = mtheight; - tx->transparent = Image_CheckAlpha(data, image_width * image_height, true); - tx->texture = R_LoadTexture (tx->name, image_width, image_height, data, TEXF_MIPMAP | (tx->transparent ? TEXF_ALPHA : 0) | TEXF_RGBA | TEXF_PRECACHE); - tx->glowtexture = NULL; + data = loadimagepixels(tx->name, false, 0, 0); + if (data) + { + if (image_width == 256 && image_height == 128) + { + R_InitSky (data, 4); + Mem_Free(data); + } + else + { + Mem_Free(data); + Con_Printf ("Invalid replacement texture for sky \"%s\" in %\"%s\", must be 256x128 pixels\n", tx->name, loadmodel->name); + if (mtdata != NULL) + R_InitSky (mtdata, 1); + } + } + else if (mtdata != NULL) + R_InitSky (mtdata, 1); } - qfree(data); + } + else if ((tx->texture = loadtextureimagewithmask(loadmodel->texturepool, tx->name, 0, 0, false, true, true))) + { + tx->fogtexture = image_masktex; + strcpy(name, tx->name); + strcat(name, "_glow"); + tx->glowtexture = loadtextureimage(loadmodel->texturepool, name, 0, 0, false, true, true); } else { - if (hlbsp) + if (loadmodel->ishlbsp) { - if (mtdata) // texture included + if (mtdata && (data = W_ConvertWAD3Texture(dmiptex))) { - data = W_ConvertWAD3Texture(dmiptex); - if (data) + // texture included + tx->texture = R_LoadTexture (loadmodel->texturepool, tx->name, image_width, image_height, data, TEXTYPE_RGBA, TEXF_MIPMAP | TEXF_ALPHA | TEXF_PRECACHE); + if (R_TextureHasAlpha(tx->texture)) { - tx->width = mtwidth; - tx->height = mtheight; - tx->transparent = Image_CheckAlpha(data, mtwidth * mtheight, true); - tx->texture = R_LoadTexture (tx->name, mtwidth, mtheight, data, TEXF_MIPMAP | (tx->transparent ? TEXF_ALPHA : 0) | TEXF_RGBA | TEXF_PRECACHE); - tx->glowtexture = NULL; - qfree(data); + // make mask texture + for (j = 0;j < image_width * image_height;j++) + data[j*4+0] = data[j*4+1] = data[j*4+2] = 255; + strcpy(name, tx->name); + strcat(name, "_fog"); + tx->fogtexture = R_LoadTexture (loadmodel->texturepool, name, image_width, image_height, data, TEXTYPE_RGBA, TEXF_MIPMAP | TEXF_ALPHA | TEXF_PRECACHE); } + Mem_Free(data); } - if (!data) + else if ((data = W_GetTexture(tx->name))) { - data = W_GetTexture(tx->name); // get the size from the wad texture - if (data) + tx->width = image_width; + tx->height = image_height; + tx->texture = R_LoadTexture (loadmodel->texturepool, tx->name, image_width, image_height, data, TEXTYPE_RGBA, TEXF_MIPMAP | TEXF_ALPHA | TEXF_PRECACHE); + if (R_TextureHasAlpha(tx->texture)) { - tx->width = image_width; - tx->height = image_height; - tx->transparent = Image_CheckAlpha(data, image_width * image_height, true); - tx->texture = R_LoadTexture (tx->name, image_width, image_height, data, TEXF_MIPMAP | (tx->transparent ? TEXF_ALPHA : 0) | TEXF_RGBA | TEXF_PRECACHE); - tx->glowtexture = NULL; - qfree(data); + // make mask texture + for (j = 0;j < image_width * image_height;j++) + data[j*4+0] = data[j*4+1] = data[j*4+2] = 255; + strcpy(name, tx->name); + strcat(name, "_fog"); + tx->fogtexture = R_LoadTexture (loadmodel->texturepool, name, image_width, image_height, data, TEXTYPE_RGBA, TEXF_MIPMAP | TEXF_ALPHA | TEXF_PRECACHE); } + Mem_Free(data); } - if (!data) + else { tx->width = 16; tx->height = 16; - tx->transparent = false; tx->texture = r_notexture; - tx->glowtexture = NULL; } } else { - if (!strncmp(tx->name,"sky",3) && mtwidth == 256 && mtheight == 128) - { - tx->width = mtwidth; - tx->height = mtheight; - tx->transparent = false; - tx->texture = NULL; - tx->glowtexture = NULL; - R_InitSky (mtdata, 1); - } - else + if (mtdata) // texture included { - if (mtdata) // texture included + int fullbrights; + data = mtdata; + fullbrights = false; + if (r_fullbrights.value && tx->name[0] != '*') { - int fullbrights; - data = mtdata; - tx->width = mtwidth; - tx->height = mtheight; - tx->transparent = false; - fullbrights = false; - if (r_fullbrights.value && tx->name[0] != '*') + for (j = 0;j < tx->width*tx->height;j++) { - for (j = 0;j < tx->width*tx->height;j++) + if (data[j] >= 224) // fullbright { - if (data[j] >= 224) // fullbright - { - fullbrights = true; - break; - } + fullbrights = true; + break; } } - if (fullbrights) - { - char name[64]; - byte *data2; - data2 = qmalloc(tx->width*tx->height); - for (j = 0;j < tx->width*tx->height;j++) - data2[j] = data[j] >= 224 ? 0 : data[j]; // no fullbrights - tx->texture = R_LoadTexture (tx->name, tx->width, tx->height, data2, TEXF_MIPMAP | TEXF_PRECACHE); - strcpy(name, tx->name); - strcat(name, "_glow"); - for (j = 0;j < tx->width*tx->height;j++) - data2[j] = data[j] >= 224 ? data[j] : 0; // only fullbrights - tx->glowtexture = R_LoadTexture (name, tx->width, tx->height, data2, TEXF_MIPMAP | TEXF_PRECACHE); - qfree(data2); - } - else - { - tx->texture = R_LoadTexture (tx->name, tx->width, tx->height, data, TEXF_MIPMAP | TEXF_PRECACHE); - tx->glowtexture = NULL; - } } - else // no texture, and no external replacement texture was found + if (fullbrights) { - tx->width = 16; - tx->height = 16; - tx->transparent = false; - tx->texture = r_notexture; - tx->glowtexture = NULL; + data2 = Mem_Alloc(loadmodel->mempool, tx->width*tx->height); + for (j = 0;j < tx->width*tx->height;j++) + data2[j] = data[j] >= 224 ? 0 : data[j]; // no fullbrights + tx->texture = R_LoadTexture (loadmodel->texturepool, tx->name, tx->width, tx->height, data2, TEXTYPE_QPALETTE, TEXF_MIPMAP | TEXF_PRECACHE); + strcpy(name, tx->name); + strcat(name, "_glow"); + for (j = 0;j < tx->width*tx->height;j++) + data2[j] = data[j] >= 224 ? data[j] : 0; // only fullbrights + tx->glowtexture = R_LoadTexture (loadmodel->texturepool, name, tx->width, tx->height, data2, TEXTYPE_QPALETTE, TEXF_MIPMAP | TEXF_PRECACHE); + Mem_Free(data2); } + else + tx->texture = R_LoadTexture (loadmodel->texturepool, tx->name, tx->width, tx->height, data, TEXTYPE_QPALETTE, TEXF_MIPMAP | TEXF_PRECACHE); + } + else // no texture, and no external replacement texture was found + { + tx->width = 16; + tx->height = 16; + tx->texture = r_notexture; } } } + + if (tx->name[0] == '*') + { + tx->flags |= (SURF_DRAWTURB | SURF_LIGHTBOTHSIDES); + // LordHavoc: some turbulent textures should be fullbright and solid + if (!strncmp(tx->name,"*lava",5) + || !strncmp(tx->name,"*teleport",9) + || !strncmp(tx->name,"*rift",5)) // Scourge of Armagon texture + tx->flags |= (SURF_DRAWFULLBRIGHT | SURF_DRAWNOALPHA | SURF_CLIPSOLID); + } + else if (tx->name[0] == 's' && tx->name[1] == 'k' && tx->name[2] == 'y') + tx->flags |= (SURF_DRAWSKY | SURF_CLIPSOLID); + else + { + tx->flags |= SURF_LIGHTMAP; + if (!R_TextureHasAlpha(tx->texture)) + tx->flags |= SURF_CLIPSOLID; + } + + tx->detailtexture = detailtextures[i % NUM_DETAILTEXTURES]; } -// -// sequence the animations -// + // sequence the animations for (i = 0;i < m->nummiptex;i++) { tx = loadmodel->textures[i]; - if (!tx || tx->name[0] != '+') + if (!tx || tx->name[0] != '+' || tx->name[1] == 0 || tx->name[2] == 0) continue; - if (tx->anim_total) + if (tx->anim_total[0] || tx->anim_total[1]) continue; // already sequenced // find the number of frames in the animation memset (anims, 0, sizeof(anims)); memset (altanims, 0, sizeof(altanims)); - max = tx->name[1]; - altmax = 0; - if (max >= '0' && max <= '9') - { - max -= '0'; - altmax = 0; - anims[max] = tx; - max++; - } - else if (max >= 'a' && max <= 'j') - { - altmax = max - 'a'; - max = 0; - altanims[altmax] = tx; - altmax++; - } - else - Host_Error ("Bad animating texture %s", tx->name); - - for (j = i + 1;j < m->nummiptex;j++) + for (j = i;j < m->nummiptex;j++) { tx2 = loadmodel->textures[j]; - if (!tx2 || tx2->name[0] != '+') - continue; - if (strcmp (tx2->name+2, tx->name+2)) + if (!tx2 || tx2->name[0] != '+' || strcmp (tx2->name+2, tx->name+2)) continue; num = tx2->name[1]; if (num >= '0' && num <= '9') + anims[num - '0'] = tx2; + else if (num >= 'a' && num <= 'j') + altanims[num - 'a'] = tx2; + else + Con_Printf ("Bad animating texture %s\n", tx->name); + } + + max = altmax = 0; + for (j = 0;j < 10;j++) + { + if (anims[j]) + max = j + 1; + if (altanims[j]) + altmax = j + 1; + } + //Con_Printf("linking animation %s (%i:%i frames)\n\n", tx->name, max, altmax); + + incomplete = false; + for (j = 0;j < max;j++) + { + if (!anims[j]) { - num -= '0'; - anims[num] = tx2; - if (num+1 > max) - max = num + 1; + Con_Printf ("Missing frame %i of %s\n", j, tx->name); + incomplete = true; } - else if (num >= 'a' && num <= 'j') + } + for (j = 0;j < altmax;j++) + { + if (!altanims[j]) { - num = num - 'a'; - altanims[num] = tx2; - if (num+1 > altmax) - altmax = num+1; + Con_Printf ("Missing altframe %i of %s\n", j, tx->name); + incomplete = true; } - else - Host_Error ("Bad animating texture %s", tx->name); + } + if (incomplete) + continue; + + if (altmax < 1) + { + // if there is no alternate animation, duplicate the primary + // animation into the alternate + altmax = max; + for (k = 0;k < 10;k++) + altanims[k] = anims[k]; } - // link them all together + // link together the primary animation for (j = 0;j < max;j++) { tx2 = anims[j]; - if (!tx2) - Host_Error ("Missing frame %i of %s", j, tx->name); - tx2->anim_total = max; - if (altmax) - tx2->alternate_anims = altanims[0]; + tx2->animated = true; + tx2->anim_total[0] = max; + tx2->anim_total[1] = altmax; for (k = 0;k < 10;k++) - tx2->anim_frames[k] = anims[j]; + { + tx2->anim_frames[0][k] = anims[k]; + tx2->anim_frames[1][k] = altanims[k]; + } } - for (j = 0;j < altmax;j++) + + // if there really is an alternate anim... + if (anims[0] != altanims[0]) { - tx2 = altanims[j]; - if (!tx2) - Host_Error ("Missing frame %i of %s", j, tx->name); - tx2->anim_total = altmax; - if (max) - tx2->alternate_anims = anims[0]; - for (k = 0;k < 10;k++) - tx2->anim_frames[k] = altanims[j]; + // link together the alternate animation + for (j = 0;j < altmax;j++) + { + tx2 = altanims[j]; + tx2->animated = true; + // the primary/alternate are reversed here + tx2->anim_total[0] = altmax; + tx2->anim_total[1] = max; + for (k = 0;k < 10;k++) + { + tx2->anim_frames[0][k] = altanims[k]; + tx2->anim_frames[1][k] = anims[k]; + } + } } } } @@ -472,16 +538,15 @@ void Mod_LoadTextures (lump_t *l) Mod_LoadLighting ================= */ -void Mod_LoadLighting (lump_t *l) +static void Mod_LoadLighting (lump_t *l) { int i; - byte *in, *out, *data; - byte d; + qbyte *in, *out, *data, d; char litfilename[1024]; loadmodel->lightdata = NULL; - if (hlbsp) // LordHavoc: load the colored lighting data straight + if (loadmodel->ishlbsp) // LordHavoc: load the colored lighting data straight { - loadmodel->lightdata = Hunk_AllocName ( l->filelen, va("%s lightmaps", loadname)); + loadmodel->lightdata = Mem_Alloc(loadmodel->mempool, l->filelen); memcpy (loadmodel->lightdata, mod_base + l->fileofs, l->filelen); } else // LordHavoc: bsp version 29 (normal white lighting) @@ -490,28 +555,39 @@ void Mod_LoadLighting (lump_t *l) strcpy(litfilename, loadmodel->name); COM_StripExtension(litfilename, litfilename); strcat(litfilename, ".lit"); - data = (byte*) COM_LoadHunkFile (litfilename, false); + data = (qbyte*) COM_LoadFile (litfilename, false); if (data) { - if (data[0] == 'Q' && data[1] == 'L' && data[2] == 'I' && data[3] == 'T') + if (loadsize > 8 && data[0] == 'Q' && data[1] == 'L' && data[2] == 'I' && data[3] == 'T') { i = LittleLong(((int *)data)[1]); if (i == 1) { Con_DPrintf("%s loaded", litfilename); - loadmodel->lightdata = data + 8; + loadmodel->lightdata = Mem_Alloc(loadmodel->mempool, loadsize - 8); + memcpy(loadmodel->lightdata, data + 8, loadsize - 8); + Mem_Free(data); return; } else + { Con_Printf("Unknown .lit file version (%d)\n", i); + Mem_Free(data); + } } else - Con_Printf("Corrupt .lit file (old version?), ignoring\n"); + { + if (loadsize == 8) + Con_Printf("Empty .lit file, ignoring\n"); + else + Con_Printf("Corrupt .lit file (old version?), ignoring\n"); + Mem_Free(data); + } } // LordHavoc: oh well, expand the white lighting data if (!l->filelen) return; - loadmodel->lightdata = Hunk_AllocName ( l->filelen*3, va("%s lightmaps", loadname)); + loadmodel->lightdata = Mem_Alloc(loadmodel->mempool, l->filelen*3); in = loadmodel->lightdata + l->filelen*2; // place the file at the end, so it will not be overwritten until the very last write out = loadmodel->lightdata; memcpy (in, mod_base + l->fileofs, l->filelen); @@ -525,40 +601,158 @@ void Mod_LoadLighting (lump_t *l) } } +void Mod_LoadLightList(void) +{ + int a, n, numlights; + char lightsfilename[1024], *s, *t, *lightsstring; + mlight_t *e; + + strcpy(lightsfilename, loadmodel->name); + COM_StripExtension(lightsfilename, lightsfilename); + strcat(lightsfilename, ".lights"); + s = lightsstring = (char *) COM_LoadFile (lightsfilename, false); + if (s) + { + numlights = 0; + while (*s) + { + while (*s && *s != '\n') + s++; + if (!*s) + { + Mem_Free(lightsstring); + Host_Error("lights file must end with a newline\n"); + } + s++; + numlights++; + } + loadmodel->lights = Mem_Alloc(loadmodel->mempool, numlights * sizeof(mlight_t)); + s = lightsstring; + n = 0; + while (*s && n < numlights) + { + t = s; + while (*s && *s != '\n') + s++; + if (!*s) + { + Mem_Free(lightsstring); + Host_Error("misparsed lights file!\n"); + } + e = loadmodel->lights + n; + *s = 0; + a = sscanf(t, "%f %f %f %f %f %f %f %f %f %f %f %f %f %d", &e->origin[0], &e->origin[1], &e->origin[2], &e->falloff, &e->light[0], &e->light[1], &e->light[2], &e->subtract, &e->spotdir[0], &e->spotdir[1], &e->spotdir[2], &e->spotcone, &e->distbias, &e->style); + *s = '\n'; + if (a != 14) + { + Mem_Free(lightsstring); + Host_Error("invalid lights file, found %d parameters on line %i, should be 13 parameters (origin[0] origin[1] origin[2] falloff light[0] light[1] light[2] subtract spotdir[0] spotdir[1] spotdir[2] spotcone style)\n", a, n + 1); + } + s++; + n++; + } + if (*s) + { + Mem_Free(lightsstring); + Host_Error("misparsed lights file!\n"); + } + loadmodel->numlights = numlights; + Mem_Free(lightsstring); + } +} + /* ================= Mod_LoadVisibility ================= */ -void Mod_LoadVisibility (lump_t *l) +static void Mod_LoadVisibility (lump_t *l) { + loadmodel->visdata = NULL; if (!l->filelen) - { - loadmodel->visdata = NULL; return; - } - loadmodel->visdata = Hunk_AllocName ( l->filelen, va("%s visdata", loadname)); + loadmodel->visdata = Mem_Alloc(loadmodel->mempool, l->filelen); memcpy (loadmodel->visdata, mod_base + l->fileofs, l->filelen); } +// used only for HalfLife maps +void Mod_ParseWadsFromEntityLump(char *data) +{ + char key[128], value[4096]; + char wadname[128]; + int i, j, k; + if (!data) + return; + data = COM_Parse(data); + if (!data) + return; // error + if (com_token[0] != '{') + return; // error + while (1) + { + data = COM_Parse(data); + if (!data) + return; // error + if (com_token[0] == '}') + break; // end of worldspawn + if (com_token[0] == '_') + strcpy(key, com_token + 1); + else + strcpy(key, com_token); + while (key[strlen(key)-1] == ' ') // remove trailing spaces + key[strlen(key)-1] = 0; + data = COM_Parse(data); + if (!data) + return; // error + strcpy(value, com_token); + if (!strcmp("wad", key)) // for HalfLife maps + { + if (loadmodel->ishlbsp) + { + j = 0; + for (i = 0;i < 4096;i++) + if (value[i] != ';' && value[i] != '\\' && value[i] != '/' && value[i] != ':') + break; + if (value[i]) + { + for (;i < 4096;i++) + { + // ignore path - the \\ check is for HalfLife... stupid windoze 'programmers'... + if (value[i] == '\\' || value[i] == '/' || value[i] == ':') + j = i+1; + else if (value[i] == ';' || value[i] == 0) + { + k = value[i]; + value[i] = 0; + strcpy(wadname, "textures/"); + strcat(wadname, &value[j]); + W_LoadTextureWadFile (wadname, false); + j = i+1; + if (!k) + break; + } + } + } + } + } + } +} + /* ================= Mod_LoadEntities ================= */ -void Mod_LoadEntities (lump_t *l) +static void Mod_LoadEntities (lump_t *l) { + loadmodel->entities = NULL; if (!l->filelen) - { - loadmodel->entities = NULL; return; - } - loadmodel->entities = Hunk_AllocName ( l->filelen, va("%s entities", loadname)); + loadmodel->entities = Mem_Alloc(loadmodel->mempool, l->filelen); memcpy (loadmodel->entities, mod_base + l->fileofs, l->filelen); - - if (isworldmodel) - CL_ParseEntityLump(loadmodel->entities); + if (loadmodel->ishlbsp) + Mod_ParseWadsFromEntityLump(loadmodel->entities); } @@ -567,7 +761,7 @@ void Mod_LoadEntities (lump_t *l) Mod_LoadVertexes ================= */ -void Mod_LoadVertexes (lump_t *l) +static void Mod_LoadVertexes (lump_t *l) { dvertex_t *in; mvertex_t *out; @@ -577,7 +771,7 @@ void Mod_LoadVertexes (lump_t *l) if (l->filelen % sizeof(*in)) Host_Error ("MOD_LoadBmodel: funny lump size in %s",loadmodel->name); count = l->filelen / sizeof(*in); - out = Hunk_AllocName ( count*sizeof(*out), va("%s vertices", loadname)); + out = Mem_Alloc(loadmodel->mempool, count*sizeof(*out)); loadmodel->vertexes = out; loadmodel->numvertexes = count; @@ -595,7 +789,7 @@ void Mod_LoadVertexes (lump_t *l) Mod_LoadSubmodels ================= */ -void Mod_LoadSubmodels (lump_t *l) +static void Mod_LoadSubmodels (lump_t *l) { dmodel_t *in; dmodel_t *out; @@ -605,7 +799,7 @@ void Mod_LoadSubmodels (lump_t *l) if (l->filelen % sizeof(*in)) Host_Error ("MOD_LoadBmodel: funny lump size in %s",loadmodel->name); count = l->filelen / sizeof(*in); - out = Hunk_AllocName ( count*sizeof(*out), va("%s submodels", loadname)); + out = Mem_Alloc(loadmodel->mempool, count*sizeof(*out)); loadmodel->submodels = out; loadmodel->numsubmodels = count; @@ -613,7 +807,8 @@ void Mod_LoadSubmodels (lump_t *l) for ( i=0 ; imins[j] = LittleFloat (in->mins[j]) - 1; out->maxs[j] = LittleFloat (in->maxs[j]) + 1; out->origin[j] = LittleFloat (in->origin[j]); @@ -631,7 +826,7 @@ void Mod_LoadSubmodels (lump_t *l) Mod_LoadEdges ================= */ -void Mod_LoadEdges (lump_t *l) +static void Mod_LoadEdges (lump_t *l) { dedge_t *in; medge_t *out; @@ -641,7 +836,7 @@ void Mod_LoadEdges (lump_t *l) if (l->filelen % sizeof(*in)) Host_Error ("MOD_LoadBmodel: funny lump size in %s",loadmodel->name); count = l->filelen / sizeof(*in); - out = Hunk_AllocName ( (count + 1) * sizeof(*out), va("%s edges", loadname)); + out = Mem_Alloc(loadmodel->mempool, count * sizeof(*out)); loadmodel->edges = out; loadmodel->numedges = count; @@ -658,46 +853,45 @@ void Mod_LoadEdges (lump_t *l) Mod_LoadTexinfo ================= */ -void Mod_LoadTexinfo (lump_t *l) +static void Mod_LoadTexinfo (lump_t *l) { texinfo_t *in; mtexinfo_t *out; - int i, j, k, count; - int miptex; + int i, j, k, count, miptex; in = (void *)(mod_base + l->fileofs); if (l->filelen % sizeof(*in)) Host_Error ("MOD_LoadBmodel: funny lump size in %s",loadmodel->name); count = l->filelen / sizeof(*in); - out = Hunk_AllocName ( count*sizeof(*out), va("%s texinfo", loadname)); + out = Mem_Alloc(loadmodel->mempool, count * sizeof(*out)); loadmodel->texinfo = out; loadmodel->numtexinfo = count; - for ( i=0 ; ivecs[k][j] = LittleFloat (in->vecs[k][j]); miptex = LittleLong (in->miptex); out->flags = LittleLong (in->flags); - - if (!loadmodel->textures) + + out->texture = NULL; + if (loadmodel->textures) { - out->texture = &r_notexture_mip; // checkerboard texture - out->flags = 0; + if ((unsigned int) miptex >= (unsigned int) loadmodel->numtextures) + Con_Printf ("error in model \"%s\": invalid miptex index %i (of %i)\n", loadmodel->name, miptex, loadmodel->numtextures); + else + out->texture = loadmodel->textures[miptex]; } - else + if (out->texture == NULL) { - if (miptex >= loadmodel->numtextures) - Host_Error ("miptex >= loadmodel->numtextures"); - out->texture = loadmodel->textures[miptex]; - if (!out->texture) - { - out->texture = &r_notexture_mip; // checkerboard texture - out->flags = 0; - } + // choose either the liquid notexture, or the normal notexture + if (out->flags & TEX_SPECIAL) + out->texture = loadmodel->textures[loadmodel->numtextures - 1]; + else + out->texture = loadmodel->textures[loadmodel->numtextures - 2]; } } } @@ -709,7 +903,7 @@ CalcSurfaceExtents Fills in s->texturemins[] and s->extents[] ================ */ -void CalcSurfaceExtents (msurface_t *s) +static void CalcSurfaceExtents (msurface_t *s) { float mins[2], maxs[2], val; int i,j, e; @@ -717,11 +911,11 @@ void CalcSurfaceExtents (msurface_t *s) mtexinfo_t *tex; int bmins[2], bmaxs[2]; - mins[0] = mins[1] = 999999; - maxs[0] = maxs[1] = -99999; + mins[0] = mins[1] = 999999999; + maxs[0] = maxs[1] = -999999999; tex = s->texinfo; - + for (i=0 ; inumedges ; i++) { e = loadmodel->surfedges[s->firstedge+i]; @@ -729,10 +923,10 @@ void CalcSurfaceExtents (msurface_t *s) v = &loadmodel->vertexes[loadmodel->edges[e].v[0]]; else v = &loadmodel->vertexes[loadmodel->edges[-e].v[1]]; - + for (j=0 ; j<2 ; j++) { - val = v->position[0] * tex->vecs[j][0] + + val = v->position[0] * tex->vecs[j][0] + v->position[1] * tex->vecs[j][1] + v->position[2] * tex->vecs[j][2] + tex->vecs[j][3]; @@ -744,113 +938,482 @@ void CalcSurfaceExtents (msurface_t *s) } for (i=0 ; i<2 ; i++) - { + { bmins[i] = floor(mins[i]/16); bmaxs[i] = ceil(maxs[i]/16); s->texturemins[i] = bmins[i] * 16; s->extents[i] = (bmaxs[i] - bmins[i]) * 16; -// if ( !(tex->flags & TEX_SPECIAL) && s->extents[i] > 512) - if ((tex->flags & TEX_SPECIAL) == 0 && (s->extents[i]+1) > (256*16)) - Host_Error ("Bad surface extents"); } } -void GL_SubdivideSurface (msurface_t *fa); + +void BoundPoly (int numverts, float *verts, vec3_t mins, vec3_t maxs) +{ + int i, j; + float *v; + + mins[0] = mins[1] = mins[2] = 9999; + maxs[0] = maxs[1] = maxs[2] = -9999; + v = verts; + for (i = 0;i < numverts;i++) + { + for (j = 0;j < 3;j++, v++) + { + if (*v < mins[j]) + mins[j] = *v; + if (*v > maxs[j]) + maxs[j] = *v; + } + } +} + +#if 0 +#define MAX_SUBDIVPOLYTRIANGLES 4096 +#define MAX_SUBDIVPOLYVERTS (MAX_SUBDIVPOLYTRIANGLES * 3) + +static int subdivpolyverts, subdivpolytriangles; +static int subdivpolyindex[MAX_SUBDIVPOLYTRIANGLES][3]; +static float subdivpolyvert[MAX_SUBDIVPOLYVERTS][3]; + +static int subdivpolylookupvert(vec3_t v) +{ + int i; + for (i = 0;i < subdivpolyverts;i++) + if (subdivpolyvert[i][0] == v[0] + && subdivpolyvert[i][1] == v[1] + && subdivpolyvert[i][2] == v[2]) + return i; + if (subdivpolyverts >= MAX_SUBDIVPOLYVERTS) + Host_Error("SubDividePolygon: ran out of vertices in buffer, please increase your r_subdivide_size"); + VectorCopy(v, subdivpolyvert[subdivpolyverts]); + return subdivpolyverts++; +} + +static void SubdividePolygon (int numverts, float *verts) +{ + int i, i1, i2, i3, f, b, c, p; + vec3_t mins, maxs, front[256], back[256]; + float m, *pv, *cv, dist[256], frac; + + if (numverts > 250) + Host_Error ("SubdividePolygon: ran out of verts in buffer"); + + BoundPoly (numverts, verts, mins, maxs); + + for (i = 0;i < 3;i++) + { + m = (mins[i] + maxs[i]) * 0.5; + m = r_subdivide_size.value * floor (m/r_subdivide_size.value + 0.5); + if (maxs[i] - m < 8) + continue; + if (m - mins[i] < 8) + continue; + + // cut it + for (cv = verts, c = 0;c < numverts;c++, cv += 3) + dist[c] = cv[i] - m; + + f = b = 0; + for (p = numverts - 1, c = 0, pv = verts + p * 3, cv = verts;c < numverts;p = c, c++, pv = cv, cv += 3) + { + if (dist[p] >= 0) + { + VectorCopy (pv, front[f]); + f++; + } + if (dist[p] <= 0) + { + VectorCopy (pv, back[b]); + b++; + } + if (dist[p] == 0 || dist[c] == 0) + continue; + if ( (dist[p] > 0) != (dist[c] > 0) ) + { + // clip point + frac = dist[p] / (dist[p] - dist[c]); + front[f][0] = back[b][0] = pv[0] + frac * (cv[0] - pv[0]); + front[f][1] = back[b][1] = pv[1] + frac * (cv[1] - pv[1]); + front[f][2] = back[b][2] = pv[2] + frac * (cv[2] - pv[2]); + f++; + b++; + } + } + + SubdividePolygon (f, front[0]); + SubdividePolygon (b, back[0]); + return; + } + + i1 = subdivpolylookupvert(verts); + i2 = subdivpolylookupvert(verts + 3); + for (i = 2;i < numverts;i++) + { + if (subdivpolytriangles >= MAX_SUBDIVPOLYTRIANGLES) + { + Con_Printf("SubdividePolygon: ran out of triangles in buffer, please increase your r_subdivide_size\n"); + return; + } + + i3 = subdivpolylookupvert(verts + i * 3); + subdivpolyindex[subdivpolytriangles][0] = i1; + subdivpolyindex[subdivpolytriangles][1] = i2; + subdivpolyindex[subdivpolytriangles][2] = i3; + i2 = i3; + subdivpolytriangles++; + } +} + +/* +================ +Mod_GenerateWarpMesh + +Breaks a polygon up along axial 64 unit +boundaries so that turbulent and sky warps +can be done reasonably. +================ +*/ +void Mod_GenerateWarpMesh (msurface_t *surf) +{ + int i, j; + surfvertex_t *v; + surfmesh_t *mesh; + + subdivpolytriangles = 0; + subdivpolyverts = 0; + SubdividePolygon (surf->poly_numverts, surf->poly_verts); + if (subdivpolytriangles < 1) + Host_Error("Mod_GenerateWarpMesh: no triangles?\n"); + + surf->mesh = mesh = Mem_Alloc(loadmodel->mempool, sizeof(surfmesh_t) + subdivpolytriangles * sizeof(int[3]) + subdivpolyverts * sizeof(surfvertex_t)); + mesh->numverts = subdivpolyverts; + mesh->numtriangles = subdivpolytriangles; + mesh->vertex = (surfvertex_t *)(mesh + 1); + mesh->index = (int *)(mesh->vertex + mesh->numverts); + memset(mesh->vertex, 0, mesh->numverts * sizeof(surfvertex_t)); + + for (i = 0;i < mesh->numtriangles;i++) + for (j = 0;j < 3;j++) + mesh->index[i*3+j] = subdivpolyindex[i][j]; + + for (i = 0, v = mesh->vertex;i < subdivpolyverts;i++, v++) + { + VectorCopy(subdivpolyvert[i], v->v); + v->st[0] = DotProduct (v->v, surf->texinfo->vecs[0]); + v->st[1] = DotProduct (v->v, surf->texinfo->vecs[1]); + } +} +#endif + +void Mod_GenerateWallMesh (msurface_t *surf, int vertexonly) +{ + int i, iu, iv, *index, smax, tmax; + float *in, s, t, u, v, ubase, vbase, uscale, vscale; + surfmesh_t *mesh; + + smax = surf->extents[0] >> 4; + tmax = surf->extents[1] >> 4; + + if (vertexonly) + { + surf->lightmaptexturestride = 0; + surf->lightmaptexture = NULL; + uscale = 0; + vscale = 0; + ubase = 0; + vbase = 0; + } + else + { + surf->flags |= SURF_LIGHTMAP; + if (r_miplightmaps.integer) + { + surf->lightmaptexturestride = (surf->extents[0]>>4)+1; + surf->lightmaptexture = R_LoadTexture(loadmodel->texturepool, NULL, surf->lightmaptexturestride, (surf->extents[1]>>4)+1, NULL, loadmodel->lightmaprgba ? TEXTYPE_RGBA : TEXTYPE_RGB, TEXF_MIPMAP | TEXF_PRECACHE); + } + else + { + surf->lightmaptexturestride = R_CompatibleFragmentWidth((surf->extents[0]>>4)+1, loadmodel->lightmaprgba ? TEXTYPE_RGBA : TEXTYPE_RGB, 0); + surf->lightmaptexture = R_LoadTexture(loadmodel->texturepool, NULL, surf->lightmaptexturestride, (surf->extents[1]>>4)+1, NULL, loadmodel->lightmaprgba ? TEXTYPE_RGBA : TEXTYPE_RGB, TEXF_FRAGMENT | TEXF_PRECACHE); + } + R_FragmentLocation(surf->lightmaptexture, NULL, NULL, &ubase, &vbase, &uscale, &vscale); + uscale = (uscale - ubase) * 16.0 / ((surf->extents[0] & ~15) + 16); + vscale = (vscale - vbase) * 16.0 / ((surf->extents[1] & ~15) + 16); + } + + surf->mesh = mesh = Mem_Alloc(loadmodel->mempool, sizeof(surfmesh_t) + (surf->poly_numverts - 2) * sizeof(int[3]) + surf->poly_numverts * (4 + 2 + 2 + 2 + 1) * sizeof(float)); + mesh->numverts = surf->poly_numverts; + mesh->numtriangles = surf->poly_numverts - 2; + mesh->verts = (float *)(mesh + 1); + mesh->st = mesh->verts + mesh->numverts * 4; + mesh->uv = mesh->st + mesh->numverts * 2; + mesh->ab = mesh->uv + mesh->numverts * 2; + mesh->lightmapoffsets = (int *)(mesh->ab + mesh->numverts * 2); + mesh->index = mesh->lightmapoffsets + mesh->numverts; + + index = mesh->index; + for (i = 0;i < mesh->numtriangles;i++) + { + *index++ = 0; + *index++ = i + 1; + *index++ = i + 2; + } + + for (i = 0, in = surf->poly_verts;i < mesh->numverts;i++, in += 3) + { + s = DotProduct (in, surf->texinfo->vecs[0]) + surf->texinfo->vecs[0][3]; + t = DotProduct (in, surf->texinfo->vecs[1]) + surf->texinfo->vecs[1][3]; + u = (s + 8 - surf->texturemins[0]) * (1.0 / 16.0) * uscale + ubase; + v = (t + 8 - surf->texturemins[1]) * (1.0 / 16.0) * vscale + vbase; + // LordHavoc: calc lightmap data offset for vertex lighting to use + iu = (int) u; + iv = (int) v; + iu = bound(0, iu, smax); + iv = bound(0, iv, tmax); + + mesh->verts[i * 4 + 0] = in[0]; + mesh->verts[i * 4 + 1] = in[1]; + mesh->verts[i * 4 + 2] = in[2]; + mesh->st[i * 2 + 0] = s / surf->texinfo->texture->width; + mesh->st[i * 2 + 1] = t / surf->texinfo->texture->height; + mesh->uv[i * 2 + 0] = u; + mesh->uv[i * 2 + 1] = v; + mesh->ab[i * 2 + 0] = s * (1.0f / 16.0f); + mesh->ab[i * 2 + 1] = t * (1.0f / 16.0f); + mesh->lightmapoffsets[i] = ((iv * (smax+1) + iu) * 3); + } +} + +void Mod_GenerateVertexMesh (msurface_t *surf) +{ + int i, *index; + float *in, s, t; + surfmesh_t *mesh; + + surf->lightmaptexturestride = 0; + surf->lightmaptexture = NULL; + + surf->mesh = mesh = Mem_Alloc(loadmodel->mempool, sizeof(surfmesh_t) + (surf->poly_numverts - 2) * sizeof(int[3]) + surf->poly_numverts * (4 + 2 + 2) * sizeof(float)); + mesh->numverts = surf->poly_numverts; + mesh->numtriangles = surf->poly_numverts - 2; + mesh->verts = (float *)(mesh + 1); + mesh->st = mesh->verts + mesh->numverts * 4; + mesh->ab = mesh->st + mesh->numverts * 2; + mesh->index = (int *)(mesh->ab + mesh->numverts * 2); + + index = mesh->index; + for (i = 0;i < mesh->numtriangles;i++) + { + *index++ = 0; + *index++ = i + 1; + *index++ = i + 2; + } + + for (i = 0, in = surf->poly_verts;i < mesh->numverts;i++, in += 3) + { + s = (DotProduct (in, surf->texinfo->vecs[0]) + surf->texinfo->vecs[0][3]); + t = (DotProduct (in, surf->texinfo->vecs[1]) + surf->texinfo->vecs[1][3]); + mesh->verts[i * 4 + 0] = in[0]; + mesh->verts[i * 4 + 1] = in[1]; + mesh->verts[i * 4 + 2] = in[2]; + mesh->st[i * 2 + 0] = s / surf->texinfo->texture->width; + mesh->st[i * 2 + 1] = t / surf->texinfo->texture->height; + mesh->ab[i * 2 + 0] = s * (1.0f / 16.0f); + mesh->ab[i * 2 + 1] = t * (1.0f / 16.0f); + } +} + +void Mod_GenerateSurfacePolygon (msurface_t *surf) +{ + int i, lindex; + float *vec, *vert, mins[3], maxs[3]; + + // convert edges back to a normal polygon + surf->poly_numverts = surf->numedges; + vert = surf->poly_verts = Mem_Alloc(loadmodel->mempool, sizeof(float[3]) * surf->numedges); + for (i = 0;i < surf->numedges;i++) + { + lindex = loadmodel->surfedges[surf->firstedge + i]; + if (lindex > 0) + vec = loadmodel->vertexes[loadmodel->edges[lindex].v[0]].position; + else + vec = loadmodel->vertexes[loadmodel->edges[-lindex].v[1]].position; + VectorCopy (vec, vert); + vert += 3; + } + vert = surf->poly_verts; + VectorCopy(vert, mins); + VectorCopy(vert, maxs); + vert += 3; + for (i = 1;i < surf->poly_numverts;i++) + { + if (mins[0] > vert[0]) mins[0] = vert[0];if (maxs[0] < vert[0]) maxs[0] = vert[0]; + if (mins[1] > vert[1]) mins[1] = vert[1];if (maxs[1] < vert[1]) maxs[1] = vert[1]; + if (mins[2] > vert[2]) mins[2] = vert[2];if (maxs[2] < vert[2]) maxs[2] = vert[2]; + vert += 3; + } + VectorCopy(mins, surf->poly_mins); + VectorCopy(maxs, surf->poly_maxs); + surf->poly_center[0] = (mins[0] + maxs[0]) * 0.5f; + surf->poly_center[1] = (mins[1] + maxs[1]) * 0.5f; + surf->poly_center[2] = (mins[2] + maxs[2]) * 0.5f; +} /* ================= Mod_LoadFaces ================= */ -void Mod_LoadFaces (lump_t *l) +static void Mod_LoadFaces (lump_t *l) { - dface_t *in; + dface_t *in; msurface_t *out; - int i, count, surfnum; - int planenum, side; + int i, count, surfnum, planenum, ssize, tsize; in = (void *)(mod_base + l->fileofs); if (l->filelen % sizeof(*in)) Host_Error ("MOD_LoadBmodel: funny lump size in %s",loadmodel->name); count = l->filelen / sizeof(*in); - out = Hunk_AllocName ( count*sizeof(*out), va("%s faces", loadname)); + out = Mem_Alloc(loadmodel->mempool, count*sizeof(*out)); loadmodel->surfaces = out; loadmodel->numsurfaces = count; - for ( surfnum=0 ; surfnumfirstedge = LittleLong(in->firstedge); - out->numedges = LittleShort(in->numedges); - out->flags = 0; + out->numedges = LittleShort(in->numedges); + if ((unsigned int) out->firstedge + (unsigned int) out->numedges > (unsigned int) loadmodel->numsurfedges) + Host_Error("Mod_LoadFaces: invalid edge range (firstedge %i, numedges %i, model edges %i)\n", out->firstedge, out->numedges, loadmodel->numsurfedges); + + i = LittleShort (in->texinfo); + if ((unsigned int) i >= (unsigned int) loadmodel->numtexinfo) + Host_Error("Mod_LoadFaces: invalid texinfo index %i (model has %i texinfos)\n", i, loadmodel->numtexinfo); + out->texinfo = loadmodel->texinfo + i; + out->flags = out->texinfo->texture->flags; planenum = LittleShort(in->planenum); - side = LittleShort(in->side); - if (side) - out->flags |= SURF_PLANEBACK; + if ((unsigned int) planenum >= (unsigned int) loadmodel->numplanes) + Host_Error("Mod_LoadFaces: invalid plane index %i (model has %i planes)\n", planenum, loadmodel->numplanes); + + if (LittleShort(in->side)) + out->flags |= SURF_PLANEBACK; out->plane = loadmodel->planes + planenum; - out->texinfo = loadmodel->texinfo + LittleShort (in->texinfo); + // clear lightmap (filled in later) + out->lightmaptexture = NULL; + + // force lightmap upload on first time seeing the surface + out->cached_dlight = true; + out->cached_ambient = -1000; + out->cached_lightscalebit = -1000; CalcSurfaceExtents (out); - - // lighting info - for (i=0 ; iextents[0] >> 4) + 1; + tsize = (out->extents[1] >> 4) + 1; + + // lighting info + for (i = 0;i < MAXLIGHTMAPS;i++) out->styles[i] = in->styles[i]; i = LittleLong(in->lightofs); if (i == -1) out->samples = NULL; - else if (hlbsp) // LordHavoc: HalfLife map (bsp version 30) + else if (loadmodel->ishlbsp) // LordHavoc: HalfLife map (bsp version 30) out->samples = loadmodel->lightdata + i; else // LordHavoc: white lighting (bsp version 29) - out->samples = loadmodel->lightdata + (i * 3); - - // set the drawing flags flag - -// if (!strncmp(out->texinfo->texture->name,"sky",3)) // sky - // LordHavoc: faster check - if ((out->texinfo->texture->name[0] == 's' || out->texinfo->texture->name[0] == 'S') - && (out->texinfo->texture->name[1] == 'k' || out->texinfo->texture->name[1] == 'K') - && (out->texinfo->texture->name[2] == 'y' || out->texinfo->texture->name[2] == 'Y')) + out->samples = loadmodel->lightdata + (i * 3); + + Mod_GenerateSurfacePolygon(out); + + if (out->texinfo->texture->flags & SURF_DRAWSKY) { - // LordHavoc: for consistency reasons, mark sky as fullbright and solid as well - out->flags |= (SURF_DRAWSKY | SURF_DRAWTILED | SURF_DRAWFULLBRIGHT | SURF_DRAWNOALPHA | SURF_CLIPSOLID); - GL_SubdivideSurface (out); // cut up polygon for warps - continue; + out->shader = &Cshader_sky; + out->samples = NULL; + Mod_GenerateVertexMesh (out); } - -// if (!strncmp(out->texinfo->texture->name,"*",1)) // turbulent - if (out->texinfo->texture->name[0] == '*') // LordHavoc: faster check + else if (out->texinfo->texture->flags & SURF_DRAWTURB) { - out->flags |= (SURF_DRAWTURB | SURF_DRAWTILED | SURF_LIGHTBOTHSIDES); - // LordHavoc: some turbulent textures should be fullbright and solid - if (!strncmp(out->texinfo->texture->name,"*lava",5) - || !strncmp(out->texinfo->texture->name,"*teleport",9) - || !strncmp(out->texinfo->texture->name,"*rift",5)) // Scourge of Armagon texture - out->flags |= (SURF_DRAWFULLBRIGHT | SURF_DRAWNOALPHA); - for (i=0 ; i<2 ; i++) + out->shader = &Cshader_water; + out->samples = NULL; + Mod_GenerateVertexMesh (out); + } + else + { + if (!R_TextureHasAlpha(out->texinfo->texture->texture)) + out->flags |= SURF_CLIPSOLID; + if (out->texinfo->flags & TEX_SPECIAL) { - out->extents[i] = 16384; - out->texturemins[i] = -8192; + // qbsp couldn't find the texture for this surface, but it was either turb or sky... assume turb + out->shader = &Cshader_water; + out->shader = &Cshader_water; + out->samples = NULL; + Mod_GenerateVertexMesh (out); + } + else if ((out->extents[0] >> 4) + 1 > (256) || (out->extents[1] >> 4) + 1 > (256)) + { + Con_Printf ("Bad surface extents, converting to fullbright polygon"); + out->shader = &Cshader_wall_fullbright; + out->samples = NULL; + Mod_GenerateVertexMesh(out); + } + else + { + // stainmap for permanent marks on walls + out->stainsamples = Mem_Alloc(loadmodel->mempool, ssize * tsize * 3); + // clear to white + memset(out->stainsamples, 255, ssize * tsize * 3); + if (out->extents[0] < r_vertexsurfacesthreshold.integer && out->extents[1] < r_vertexsurfacesthreshold.integer) + { + out->shader = &Cshader_wall_vertex; + Mod_GenerateWallMesh (out, true); + } + else + { + out->shader = &Cshader_wall_lightmap; + Mod_GenerateWallMesh (out, false); + } } - GL_SubdivideSurface (out); // cut up polygon for warps - continue; } - - out->flags |= SURF_CLIPSOLID; } } +static model_t *sortmodel; + +static int Mod_SurfaceQSortCompare(const void *voida, const void *voidb) +{ + const msurface_t *a, *b; + a = *((const msurface_t **)voida); + b = *((const msurface_t **)voidb); + if (a->shader != b->shader) + return (qbyte *) a->shader - (qbyte *) b->shader; + if (a->texinfo->texture != b->texinfo->texture); + return a->texinfo->texture - b->texinfo->texture; + return 0; +} + +static void Mod_BrushSortedSurfaces(model_t *model, mempool_t *pool) +{ + int surfnum; + sortmodel = model; + sortmodel->modelsortedsurfaces = Mem_Alloc(pool, sortmodel->nummodelsurfaces * sizeof(msurface_t *)); + for (surfnum = 0;surfnum < sortmodel->nummodelsurfaces;surfnum++) + sortmodel->modelsortedsurfaces[surfnum] = &sortmodel->surfaces[surfnum + sortmodel->firstmodelsurface]; + + if (r_sortsurfaces.integer) + qsort(sortmodel->modelsortedsurfaces, sortmodel->nummodelsurfaces, sizeof(msurface_t *), Mod_SurfaceQSortCompare); +} + /* ================= Mod_SetParent ================= */ -void Mod_SetParent (mnode_t *node, mnode_t *parent) +static void Mod_SetParent (mnode_t *node, mnode_t *parent) { node->parent = parent; if (node->contents < 0) @@ -864,7 +1427,7 @@ void Mod_SetParent (mnode_t *node, mnode_t *parent) Mod_LoadNodes ================= */ -void Mod_LoadNodes (lump_t *l) +static void Mod_LoadNodes (lump_t *l) { int i, j, count, p; dnode_t *in; @@ -874,25 +1437,25 @@ void Mod_LoadNodes (lump_t *l) if (l->filelen % sizeof(*in)) Host_Error ("MOD_LoadBmodel: funny lump size in %s",loadmodel->name); count = l->filelen / sizeof(*in); - out = Hunk_AllocName ( count*sizeof(*out), va("%s nodes", loadname)); + out = Mem_Alloc(loadmodel->mempool, count*sizeof(*out)); loadmodel->nodes = out; loadmodel->numnodes = count; for ( i=0 ; imins[j] = LittleShort (in->mins[j]); -// out->maxs[j] = LittleShort (in->maxs[j]); -// } - + for (j=0 ; j<3 ; j++) + { + out->mins[j] = LittleShort (in->mins[j]); + out->maxs[j] = LittleShort (in->maxs[j]); + } + p = LittleLong(in->planenum); out->plane = loadmodel->planes + p; out->firstsurface = LittleShort (in->firstface); out->numsurfaces = LittleShort (in->numfaces); - + for (j=0 ; j<2 ; j++) { p = LittleShort (in->children[j]); @@ -902,7 +1465,7 @@ void Mod_LoadNodes (lump_t *l) out->children[j] = (mnode_t *)(loadmodel->leafs + (-1 - p)); } } - + Mod_SetParent (loadmodel->nodes, NULL); // sets nodes and leafs } @@ -911,7 +1474,7 @@ void Mod_LoadNodes (lump_t *l) Mod_LoadLeafs ================= */ -void Mod_LoadLeafs (lump_t *l) +static void Mod_LoadLeafs (lump_t *l) { dleaf_t *in; mleaf_t *out; @@ -921,7 +1484,7 @@ void Mod_LoadLeafs (lump_t *l) if (l->filelen % sizeof(*in)) Host_Error ("MOD_LoadBmodel: funny lump size in %s",loadmodel->name); count = l->filelen / sizeof(*in); - out = Hunk_AllocName ( count*sizeof(*out), va("%s leafs", loadname)); + out = Mem_Alloc(loadmodel->mempool, count*sizeof(*out)); loadmodel->leafs = out; loadmodel->numleafs = count; @@ -940,26 +1503,18 @@ void Mod_LoadLeafs (lump_t *l) out->firstmarksurface = loadmodel->marksurfaces + LittleShort(in->firstmarksurface); out->nummarksurfaces = LittleShort(in->nummarksurfaces); - + p = LittleLong(in->visofs); if (p == -1) out->compressed_vis = NULL; else out->compressed_vis = loadmodel->visdata + p; - + for (j=0 ; j<4 ; j++) out->ambient_sound_level[j] = in->ambient_level[j]; - // gl underwater warp - // LordHavoc: disabled underwater warping - /* - if (out->contents != CONTENTS_EMPTY) - { - for (j=0 ; jnummarksurfaces ; j++) - out->firstmarksurface[j]->flags |= SURF_UNDERWATER; - } - */ - } + // FIXME: Insert caustics here + } } /* @@ -967,7 +1522,7 @@ void Mod_LoadLeafs (lump_t *l) Mod_LoadClipnodes ================= */ -void Mod_LoadClipnodes (lump_t *l) +static void Mod_LoadClipnodes (lump_t *l) { dclipnode_t *in, *out; int i, count; @@ -977,12 +1532,12 @@ void Mod_LoadClipnodes (lump_t *l) if (l->filelen % sizeof(*in)) Host_Error ("MOD_LoadBmodel: funny lump size in %s",loadmodel->name); count = l->filelen / sizeof(*in); - out = Hunk_AllocName ( count*sizeof(*out), va("%s clipnodes", loadname)); + out = Mem_Alloc(loadmodel->mempool, count*sizeof(*out)); loadmodel->clipnodes = out; loadmodel->numclipnodes = count; - if (hlbsp) + if (loadmodel->ishlbsp) { hull = &loadmodel->hulls[1]; hull->clipnodes = out; @@ -995,6 +1550,7 @@ void Mod_LoadClipnodes (lump_t *l) hull->clip_maxs[0] = 16; hull->clip_maxs[1] = 16; hull->clip_maxs[2] = 36; + VectorSubtract(hull->clip_maxs, hull->clip_mins, hull->clip_size); hull = &loadmodel->hulls[2]; hull->clipnodes = out; @@ -1007,6 +1563,7 @@ void Mod_LoadClipnodes (lump_t *l) hull->clip_maxs[0] = 32; hull->clip_maxs[1] = 32; hull->clip_maxs[2] = 32; + VectorSubtract(hull->clip_maxs, hull->clip_mins, hull->clip_size); hull = &loadmodel->hulls[3]; hull->clipnodes = out; @@ -1019,6 +1576,7 @@ void Mod_LoadClipnodes (lump_t *l) hull->clip_maxs[0] = 16; hull->clip_maxs[1] = 16; hull->clip_maxs[2] = 18; + VectorSubtract(hull->clip_maxs, hull->clip_mins, hull->clip_size); } else { @@ -1033,6 +1591,7 @@ void Mod_LoadClipnodes (lump_t *l) hull->clip_maxs[0] = 16; hull->clip_maxs[1] = 16; hull->clip_maxs[2] = 32; + VectorSubtract(hull->clip_maxs, hull->clip_mins, hull->clip_size); hull = &loadmodel->hulls[2]; hull->clipnodes = out; @@ -1045,6 +1604,7 @@ void Mod_LoadClipnodes (lump_t *l) hull->clip_maxs[0] = 32; hull->clip_maxs[1] = 32; hull->clip_maxs[2] = 64; + VectorSubtract(hull->clip_maxs, hull->clip_mins, hull->clip_size); } for (i=0 ; ihulls[0]; - + + hull = &loadmodel->hulls[0]; + in = loadmodel->nodes; - count = loadmodel->numnodes; - out = Hunk_AllocName ( count*sizeof(*out), va("%s hull0", loadname)); + out = Mem_Alloc(loadmodel->mempool, loadmodel->numnodes * sizeof(dclipnode_t)); hull->clipnodes = out; hull->firstclipnode = 0; - hull->lastclipnode = count - 1; + hull->lastclipnode = loadmodel->numnodes - 1; hull->planes = loadmodel->planes; - for (i = 0;i < count;i++, out++, in++) + for (i = 0;i < loadmodel->numnodes;i++, out++, in++) { out->planenum = in->plane - loadmodel->planes; out->children[0] = in->children[0]->contents < 0 ? in->children[0]->contents : in->children[0] - loadmodel->nodes; @@ -1095,27 +1654,23 @@ void Mod_MakeHull0 (void) Mod_LoadMarksurfaces ================= */ -void Mod_LoadMarksurfaces (lump_t *l) -{ - int i, j, count; - short *in; - msurface_t **out; - +static void Mod_LoadMarksurfaces (lump_t *l) +{ + int i, j; + short *in; + in = (void *)(mod_base + l->fileofs); if (l->filelen % sizeof(*in)) Host_Error ("MOD_LoadBmodel: funny lump size in %s",loadmodel->name); - count = l->filelen / sizeof(*in); - out = Hunk_AllocName ( count*sizeof(*out), va("%s marksurfaces", loadname)); - - loadmodel->marksurfaces = out; - loadmodel->nummarksurfaces = count; + loadmodel->nummarksurfaces = l->filelen / sizeof(*in); + loadmodel->marksurfaces = Mem_Alloc(loadmodel->mempool, loadmodel->nummarksurfaces * sizeof(msurface_t *)); - for ( i=0 ; inummarksurfaces;i++) { - j = LittleShort(in[i]); + j = (unsigned) LittleShort(in[i]); if (j >= loadmodel->numsurfaces) Host_Error ("Mod_ParseMarksurfaces: bad surface number"); - out[i] = loadmodel->surfaces + j; + loadmodel->marksurfaces[i] = loadmodel->surfaces + j; } } @@ -1124,22 +1679,19 @@ void Mod_LoadMarksurfaces (lump_t *l) Mod_LoadSurfedges ================= */ -void Mod_LoadSurfedges (lump_t *l) -{ - int i, count; - int *in, *out; - +static void Mod_LoadSurfedges (lump_t *l) +{ + int i; + int *in; + in = (void *)(mod_base + l->fileofs); if (l->filelen % sizeof(*in)) Host_Error ("MOD_LoadBmodel: funny lump size in %s",loadmodel->name); - count = l->filelen / sizeof(*in); - out = Hunk_AllocName ( count*sizeof(*out), va("%s surfedges", loadname)); + loadmodel->numsurfedges = l->filelen / sizeof(*in); + loadmodel->surfedges = Mem_Alloc(loadmodel->mempool, loadmodel->numsurfedges * sizeof(int)); - loadmodel->surfedges = out; - loadmodel->numsurfedges = count; - - for ( i=0 ; inumsurfedges;i++) + loadmodel->surfedges[i] = LittleLong (in[i]); } @@ -1148,30 +1700,26 @@ void Mod_LoadSurfedges (lump_t *l) Mod_LoadPlanes ================= */ -void Mod_LoadPlanes (lump_t *l) +static void Mod_LoadPlanes (lump_t *l) { - int i, j; + int i; mplane_t *out; dplane_t *in; - int count; - + in = (void *)(mod_base + l->fileofs); if (l->filelen % sizeof(*in)) - Host_Error ("MOD_LoadBmodel: funny lump size in %s",loadmodel->name); - count = l->filelen / sizeof(*in); - out = Hunk_AllocName ( count*2*sizeof(*out), va("%s planes", loadname)); + Host_Error ("MOD_LoadBmodel: funny lump size in %s", loadmodel->name); - loadmodel->planes = out; - loadmodel->numplanes = count; + loadmodel->numplanes = l->filelen / sizeof(*in); + loadmodel->planes = out = Mem_Alloc(loadmodel->mempool, loadmodel->numplanes * sizeof(*out)); - for ( i=0 ; inumplanes;i++, in++, out++) { - for (j=0 ; j<3 ; j++) - out->normal[j] = LittleFloat (in->normal[j]); - + out->normal[0] = LittleFloat (in->normal[0]); + out->normal[1] = LittleFloat (in->normal[1]); + out->normal[2] = LittleFloat (in->normal[2]); out->dist = LittleFloat (in->dist); - // LordHavoc: recalculated by PlaneClassify, FIXME: validate type and report error if type does not match normal? -// out->type = LittleLong (in->type); + PlaneClassify(out); } } @@ -1181,7 +1729,8 @@ void Mod_LoadPlanes (lump_t *l) typedef struct { int numpoints; - vec3_t points[8]; // variable sized + int padding; + double points[8][3]; // variable sized } winding_t; @@ -1190,24 +1739,24 @@ winding_t; NewWinding ================== */ -winding_t *NewWinding (int points) +static winding_t *NewWinding (int points) { winding_t *w; int size; if (points > MAX_POINTS_ON_WINDING) - Host_Error("NewWinding: too many points\n"); + Sys_Error("NewWinding: too many points\n"); - size = (int)((winding_t *)0)->points[points]; - w = qmalloc (size); + size = sizeof(winding_t) + sizeof(double[3]) * (points - 8); + w = Mem_Alloc(loadmodel->mempool, size); memset (w, 0, size); return w; } -void FreeWinding (winding_t *w) +static void FreeWinding (winding_t *w) { - qfree (w); + Mem_Free(w); } /* @@ -1215,15 +1764,16 @@ void FreeWinding (winding_t *w) BaseWindingForPlane ================= */ -winding_t *BaseWindingForPlane (mplane_t *p) +static winding_t *BaseWindingForPlane (mplane_t *p) { - vec3_t org, vright, vup; - winding_t *w; + double org[3], vright[3], vup[3], normal[3]; + winding_t *w; - VectorVectors(p->normal, vright, vup); + VectorCopy(p->normal, normal); + VectorVectorsDouble(normal, vright, vup); - VectorScale (vup, 65536, vup); - VectorScale (vright, 65536, vright); + VectorScale (vup, 1024.0*1024.0*1024.0, vup); + VectorScale (vright, 1024.0*1024.0*1024.0, vright); // project a really big axis aligned box onto the plane w = NewWinding (4); @@ -1244,7 +1794,7 @@ winding_t *BaseWindingForPlane (mplane_t *p) w->numpoints = 4; - return w; + return w; } /* @@ -1257,15 +1807,15 @@ If keepon is true, an exactly on-plane winding will be saved, otherwise it will be clipped away. ================== */ -winding_t *ClipWinding (winding_t *in, mplane_t *split, int keepon) +static winding_t *ClipWinding (winding_t *in, mplane_t *split, int keepon) { - vec_t dists[MAX_POINTS_ON_WINDING + 1]; + double dists[MAX_POINTS_ON_WINDING + 1]; int sides[MAX_POINTS_ON_WINDING + 1]; int counts[3]; - vec_t dot; + double dot; int i, j; - vec_t *p1, *p2; - vec3_t mid; + double *p1, *p2; + double mid[3]; winding_t *neww; int maxpts; @@ -1298,10 +1848,16 @@ winding_t *ClipWinding (winding_t *in, mplane_t *split, int keepon) return in; maxpts = in->numpoints+4; // can't use counts[0]+2 because of fp grouping errors + if (maxpts > MAX_POINTS_ON_WINDING) + Sys_Error ("ClipWinding: maxpts > MAX_POINTS_ON_WINDING"); + neww = NewWinding (maxpts); for (i = 0;i < in->numpoints;i++) { + if (neww->numpoints >= maxpts) + Sys_Error ("ClipWinding: points exceeded estimate"); + p1 = in->points[i]; if (sides[i] == SIDE_ON) @@ -1338,9 +1894,6 @@ winding_t *ClipWinding (winding_t *in, mplane_t *split, int keepon) neww->numpoints++; } - if (neww->numpoints > maxpts) - Host_Error ("ClipWinding: points exceeded estimate"); - // free the original winding FreeWinding (in); @@ -1358,15 +1911,15 @@ returned winding will be the input winding. If on both sides, two new windings will be created. ================== */ -void DivideWinding (winding_t *in, mplane_t *split, winding_t **front, winding_t **back) +static void DivideWinding (winding_t *in, mplane_t *split, winding_t **front, winding_t **back) { - vec_t dists[MAX_POINTS_ON_WINDING + 1]; + double dists[MAX_POINTS_ON_WINDING + 1]; int sides[MAX_POINTS_ON_WINDING + 1]; int counts[3]; - vec_t dot; + double dot; int i, j; - vec_t *p1, *p2; - vec3_t mid; + double *p1, *p2; + double mid[3]; winding_t *f, *b; int maxpts; @@ -1401,11 +1954,17 @@ void DivideWinding (winding_t *in, mplane_t *split, winding_t **front, winding_t maxpts = in->numpoints+4; // can't use counts[0]+2 because of fp grouping errors + if (maxpts > MAX_POINTS_ON_WINDING) + Sys_Error ("ClipWinding: maxpts > MAX_POINTS_ON_WINDING"); + *front = f = NewWinding (maxpts); *back = b = NewWinding (maxpts); for (i = 0;i < in->numpoints;i++) { + if (f->numpoints >= maxpts || b->numpoints >= maxpts) + Sys_Error ("DivideWinding: points exceeded estimate"); + p1 = in->points[i]; if (sides[i] == SIDE_ON) @@ -1450,16 +2009,13 @@ void DivideWinding (winding_t *in, mplane_t *split, winding_t **front, winding_t VectorCopy (mid, b->points[b->numpoints]); b->numpoints++; } - - if (f->numpoints > maxpts || b->numpoints > maxpts) - Host_Error ("DivideWinding: points exceeded estimate"); } typedef struct portal_s { mplane_t plane; mnode_t *nodes[2]; // [0] = front side of plane - struct portal_s *next[2]; + struct portal_s *next[2]; winding_t *winding; struct portal_s *chain; // all portals are linked into a list } @@ -1472,17 +2028,38 @@ static portal_t *portalchain; AllocPortal =========== */ -portal_t *AllocPortal (void) +static portal_t *AllocPortal (void) { portal_t *p; - p = qmalloc(sizeof(portal_t)); - memset(p, 0, sizeof(portal_t)); + p = Mem_Alloc(loadmodel->mempool, sizeof(portal_t)); p->chain = portalchain; portalchain = p; return p; } -void Mod_FinalizePortals(void) +static void FreePortal(portal_t *p) +{ + Mem_Free(p); +} + +static void Mod_RecursiveRecalcNodeBBox(mnode_t *node) +{ + // calculate children first + if (node->children[0]->contents >= 0) + Mod_RecursiveRecalcNodeBBox(node->children[0]); + if (node->children[1]->contents >= 0) + Mod_RecursiveRecalcNodeBBox(node->children[1]); + + // make combined bounding box from children + node->mins[0] = min(node->children[0]->mins[0], node->children[1]->mins[0]); + node->mins[1] = min(node->children[0]->mins[1], node->children[1]->mins[1]); + node->mins[2] = min(node->children[0]->mins[2], node->children[1]->mins[2]); + node->maxs[0] = max(node->children[0]->maxs[0], node->children[1]->maxs[0]); + node->maxs[1] = max(node->children[0]->maxs[1], node->children[1]->maxs[1]); + node->maxs[2] = max(node->children[0]->maxs[2], node->children[1]->maxs[2]); +} + +static void Mod_FinalizePortals(void) { int i, j, numportals, numpoints; portal_t *p, *pnext; @@ -1496,8 +2073,8 @@ void Mod_FinalizePortals(void) endleaf = leaf + loadmodel->numleafs; for (;leaf < endleaf;leaf++) { - VectorSet( 2000000000, 2000000000, 2000000000, leaf->mins); - VectorSet(-2000000000, -2000000000, -2000000000, leaf->maxs); + VectorSet(leaf->mins, 2000000000, 2000000000, 2000000000); + VectorSet(leaf->maxs, -2000000000, -2000000000, -2000000000); } p = portalchain; while(p) @@ -1522,22 +2099,28 @@ void Mod_FinalizePortals(void) p = p->chain; } + Mod_RecursiveRecalcNodeBBox(loadmodel->nodes); + // tally up portal and point counts p = portalchain; numportals = 0; numpoints = 0; while(p) { - if (p->winding && p->nodes[0] != p->nodes[1] && p->nodes[0]->contents != CONTENTS_SOLID && p->nodes[1]->contents != CONTENTS_SOLID) + // note: this check must match the one below or it will usually corrupt memory + // the nodes[0] != nodes[1] check is because leaf 0 is the shared solid leaf, it can have many portals inside with leaf 0 on both sides + if (p->winding && p->nodes[0] != p->nodes[1] + && p->nodes[0]->contents != CONTENTS_SOLID && p->nodes[1]->contents != CONTENTS_SOLID + && p->nodes[0]->contents != CONTENTS_SKY && p->nodes[1]->contents != CONTENTS_SKY) { numportals += 2; numpoints += p->winding->numpoints * 2; } p = p->chain; } - loadmodel->portals = Hunk_AllocName(numportals * sizeof(mportal_t), va("%s portals", loadmodel->name)); + loadmodel->portals = Mem_Alloc(loadmodel->mempool, numportals * sizeof(mportal_t) + numpoints * sizeof(mvertex_t)); loadmodel->numportals = numportals; - loadmodel->portalpoints = Hunk_AllocName(numpoints * sizeof(mvertex_t), va("%s portals", loadmodel->name)); + loadmodel->portalpoints = (void *) ((qbyte *) loadmodel->portals + numportals * sizeof(mportal_t)); loadmodel->numportalpoints = numpoints; // clear all leaf portal chains for (i = 0;i < loadmodel->numleafs;i++) @@ -1553,8 +2136,11 @@ void Mod_FinalizePortals(void) if (p->winding) { + // note: this check must match the one above or it will usually corrupt memory // the nodes[0] != nodes[1] check is because leaf 0 is the shared solid leaf, it can have many portals inside with leaf 0 on both sides - if (p->nodes[0] != p->nodes[1] && p->nodes[0]->contents != CONTENTS_SOLID && p->nodes[1]->contents != CONTENTS_SOLID) + if (p->nodes[0] != p->nodes[1] + && p->nodes[0]->contents != CONTENTS_SOLID && p->nodes[1]->contents != CONTENTS_SOLID + && p->nodes[0]->contents != CONTENTS_SKY && p->nodes[1]->contents != CONTENTS_SKY) { // first make the back to front portal (forward portal) portal->points = point; @@ -1602,7 +2188,7 @@ void Mod_FinalizePortals(void) } FreeWinding(p->winding); } - qfree(p); + FreePortal(p); p = pnext; } } @@ -1612,7 +2198,7 @@ void Mod_FinalizePortals(void) AddPortalToNodes ============= */ -void AddPortalToNodes (portal_t *p, mnode_t *front, mnode_t *back) +static void AddPortalToNodes (portal_t *p, mnode_t *front, mnode_t *back) { if (!front) Host_Error ("AddPortalToNodes: NULL front node"); @@ -1636,7 +2222,7 @@ void AddPortalToNodes (portal_t *p, mnode_t *front, mnode_t *back) RemovePortalFromNode ============= */ -void RemovePortalFromNodes(portal_t *portal) +static void RemovePortalFromNodes(portal_t *portal) { int i; mnode_t *node; @@ -1662,7 +2248,7 @@ void RemovePortalFromNodes(portal_t *portal) } else if (portal->nodes[1] == node) { - *portalpointer = portal->next[1]; + *portalpointer = portal->next[1]; portal->nodes[1] = NULL; } else @@ -1680,7 +2266,7 @@ void RemovePortalFromNodes(portal_t *portal) } } -void Mod_RecursiveNodePortals (mnode_t *node) +static void Mod_RecursiveNodePortals (mnode_t *node) { int side; mnode_t *front, *back, *other_node; @@ -1688,8 +2274,6 @@ void Mod_RecursiveNodePortals (mnode_t *node) portal_t *portal, *nextportal, *nodeportal, *splitportal, *temp; winding_t *nodeportalwinding, *frontwinding, *backwinding; - // CheckLeafPortalConsistancy (node); - // if a leaf, we're done if (node->contents) return; @@ -1708,7 +2292,7 @@ void Mod_RecursiveNodePortals (mnode_t *node) nodeportalwinding = BaseWindingForPlane (node->plane); side = 0; // shut up compiler warning - for (portal = (portal_t *)node->portals;portal;portal = portal->next[side]) + for (portal = (portal_t *)node->portals;portal;portal = portal->next[side]) { clipplane = portal->plane; if (portal->nodes[0] == portal->nodes[1]) @@ -1801,52 +2385,10 @@ void Mod_RecursiveNodePortals (mnode_t *node) Mod_RecursiveNodePortals(back); } -/* -void Mod_MakeOutsidePortals(mnode_t *node) -{ - int i, j; - portal_t *p, *portals[6]; - mnode_t *outside_node; - - outside_node = Hunk_AllocName(sizeof(mnode_t), loadmodel->name); - outside_node->contents = CONTENTS_SOLID; - outside_node->portals = NULL; - for (i = 0;i < 3;i++) - { - for (j = 0;j < 2;j++) - { - portals[j*3 + i] = p = AllocPortal (); - memset (&p->plane, 0, sizeof(mplane_t)); - p->plane.normal[i] = j ? -1 : 1; - p->plane.dist = -65536; - p->winding = BaseWindingForPlane (&p->plane); - if (j) - AddPortalToNodes (p, outside_node, node); - else - AddPortalToNodes (p, node, outside_node); - } - } - - // clip the basewindings by all the other planes - for (i = 0;i < 6;i++) - { - for (j = 0;j < 6;j++) - { - if (j == i) - continue; - portals[i]->winding = ClipWinding (portals[i]->winding, &portals[j]->plane, true); - } - } -} -*/ - -void Mod_MakePortals(void) +static void Mod_MakePortals(void) { -// Con_Printf("building portals for %s\n", loadmodel->name); - portalchain = NULL; -// Mod_MakeOutsidePortals (loadmodel->nodes); Mod_RecursiveNodePortals (loadmodel->nodes); Mod_FinalizePortals(); } @@ -1861,28 +2403,36 @@ void Mod_LoadBrushModel (model_t *mod, void *buffer) int i, j; dheader_t *header; dmodel_t *bm; - - loadmodel->type = mod_brush; - + mempool_t *mainmempool; + char *loadname; + + mod->type = mod_brush; + header = (dheader_t *)buffer; i = LittleLong (header->version); if (i != BSPVERSION && i != 30) - Host_Error ("Mod_LoadBrushModel: %s has wrong version number (%i should be %i or 30 (HalfLife))", mod->name, i, BSPVERSION); - hlbsp = i == 30; - halflifebsp.value = hlbsp; + Host_Error ("Mod_LoadBrushModel: %s has wrong version number (%i should be %i (Quake) or 30 (HalfLife))", mod->name, i, BSPVERSION); + mod->ishlbsp = i == 30; + if (loadmodel->isworldmodel) + { + Cvar_SetValue("halflifebsp", mod->ishlbsp); + // until we get a texture for it... + R_ResetQuakeSky(); + } // swap all the lumps - mod_base = (byte *)header; + mod_base = (qbyte *)header; for (i=0 ; ilumps[LUMP_ENTITIES]); + // store which lightmap format to use + mod->lightmaprgba = r_lightmaprgba.integer; + + Mod_LoadEntities (&header->lumps[LUMP_ENTITIES]); Mod_LoadVertexes (&header->lumps[LUMP_VERTEXES]); Mod_LoadEdges (&header->lumps[LUMP_EDGES]); Mod_LoadSurfedges (&header->lumps[LUMP_SURFEDGES]); @@ -1896,20 +2446,32 @@ void Mod_LoadBrushModel (model_t *mod, void *buffer) Mod_LoadLeafs (&header->lumps[LUMP_LEAFS]); Mod_LoadNodes (&header->lumps[LUMP_NODES]); Mod_LoadClipnodes (&header->lumps[LUMP_CLIPNODES]); -// Mod_LoadEntities (&header->lumps[LUMP_ENTITIES]); Mod_LoadSubmodels (&header->lumps[LUMP_MODELS]); Mod_MakeHull0 (); - Mod_MakePortals(); - + mod->numframes = 2; // regular and alternate animation - + + mainmempool = mod->mempool; + loadname = mod->name; + + Mod_LoadLightList (); + // // set up the submodels (FIXME: this is confusing) // for (i = 0;i < mod->numsubmodels;i++) { + int k, l; + float dist, modelyawradius, modelradius, *vec; + msurface_t *surf; + + mod->normalmins[0] = mod->normalmins[1] = mod->normalmins[2] = 1000000000.0f; + mod->normalmaxs[0] = mod->normalmaxs[1] = mod->normalmaxs[2] = -1000000000.0f; + modelyawradius = 0; + modelradius = 0; + bm = &mod->submodels[i]; mod->hulls[0].firstclipnode = bm->headnode[0]; @@ -1918,26 +2480,79 @@ void Mod_LoadBrushModel (model_t *mod, void *buffer) mod->hulls[j].firstclipnode = bm->headnode[j]; mod->hulls[j].lastclipnode = mod->numclipnodes - 1; } - + mod->firstmodelsurface = bm->firstface; mod->nummodelsurfaces = bm->numfaces; - - VectorCopy (bm->maxs, mod->maxs); - VectorCopy (bm->mins, mod->mins); - mod->radius = RadiusFromBounds (mod->mins, mod->maxs); + mod->DrawSky = NULL; + // LordHavoc: calculate bmodel bounding box rather than trusting what it says + for (j = 0, surf = &mod->surfaces[mod->firstmodelsurface];j < mod->nummodelsurfaces;j++, surf++) + { + // we only need to have a drawsky function if it is used (usually only on world model) + if (surf->shader == &Cshader_sky) + mod->DrawSky = R_DrawBrushModelSky; + for (k = 0;k < surf->numedges;k++) + { + l = mod->surfedges[k + surf->firstedge]; + if (l > 0) + vec = mod->vertexes[mod->edges[l].v[0]].position; + else + vec = mod->vertexes[mod->edges[-l].v[1]].position; + if (mod->normalmins[0] > vec[0]) mod->normalmins[0] = vec[0]; + if (mod->normalmins[1] > vec[1]) mod->normalmins[1] = vec[1]; + if (mod->normalmins[2] > vec[2]) mod->normalmins[2] = vec[2]; + if (mod->normalmaxs[0] < vec[0]) mod->normalmaxs[0] = vec[0]; + if (mod->normalmaxs[1] < vec[1]) mod->normalmaxs[1] = vec[1]; + if (mod->normalmaxs[2] < vec[2]) mod->normalmaxs[2] = vec[2]; + 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] = mod->yawmins[1] = -(mod->yawmaxs[0] = mod->yawmaxs[1] = modelyawradius); + mod->yawmins[2] = mod->normalmins[2]; + 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; + // LordHavoc: check for empty submodels (lacrima.bsp has such a glitch) + if (mod->normalmins[0] > mod->normalmaxs[0] || mod->normalmins[1] > mod->normalmaxs[1] || mod->normalmins[2] > mod->normalmaxs[2]) + { + Con_Printf("warning: empty submodel *%i in %s\n", i+1, loadname); + VectorClear(mod->normalmins); + VectorClear(mod->normalmaxs); + VectorClear(mod->yawmins); + VectorClear(mod->yawmaxs); + VectorClear(mod->rotatedmins); + VectorClear(mod->rotatedmaxs); + } mod->numleafs = bm->visleafs; - if (isworldmodel && i < (mod->numsubmodels - 1)) // LordHavoc: only register submodels if it is the world (prevents bsp models from replacing world submodels) - { // duplicate the basic information - char name[10]; + mod->Draw = R_DrawBrushModelNormal; + mod->DrawShadow = NULL; + + Mod_BrushSortedSurfaces(mod, mainmempool); + // LordHavoc: only register submodels if it is the world + // (prevents bsp models from replacing world submodels) + if (loadmodel->isworldmodel && i < (mod->numsubmodels - 1)) + { + char name[10]; + // duplicate the basic information sprintf (name, "*%i", i+1); loadmodel = Mod_FindName (name); *loadmodel = *mod; strcpy (loadmodel->name, name); + // textures and memory belong to the main model + loadmodel->texturepool = NULL; + loadmodel->mempool = NULL; mod = loadmodel; } } } +