X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=model_brush.c;h=ad1d484c4a658040589c6fbef82e4788f06f4fce;hb=2d55895c59ebeaff8c2a1e1f33a1c8cd9bc5c714;hp=bc788a3a77a762c4ead51fc8bfd3f82058e07535;hpb=6ccde0dc042d5f25cbc58f9d0ca1b0b6b76a43e1;p=xonotic%2Fdarkplaces.git diff --git a/model_brush.c b/model_brush.c index bc788a3a..ad1d484c 100644 --- a/model_brush.c +++ b/model_brush.c @@ -31,6 +31,7 @@ cvar_t halflifebsp = {0, "halflifebsp", "0", "indicates the current map is hlbsp cvar_t mcbsp = {0, "mcbsp", "0", "indicates the current map is mcbsp format (useful to know because of different bounding box sizes)"}; cvar_t r_novis = {0, "r_novis", "0", "draws whole level, see also sv_cullentities_pvs 0"}; cvar_t r_lightmaprgba = {0, "r_lightmaprgba", "1", "whether to use RGBA (32bit) or RGB (24bit) lightmaps"}; +cvar_t r_picmipworld = {CVAR_SAVE, "r_picmipworld", "1", "whether gl_picmip shall apply to world textures too"}; cvar_t r_nosurftextures = {0, "r_nosurftextures", "0", "pretends there was no texture lump found in the q1bsp/hlbsp loading (useful for debugging this rare case)"}; cvar_t r_subdivisions_tolerance = {0, "r_subdivisions_tolerance", "4", "maximum error tolerance on curve subdivision for rendering purposes (in other words, the curves will be given as many polygons as necessary to represent curves at this quality)"}; cvar_t r_subdivisions_mintess = {0, "r_subdivisions_mintess", "1", "minimum number of subdivisions (values above 1 will smooth curves that don't need it)"}; @@ -43,6 +44,7 @@ cvar_t r_subdivisions_collision_maxvertices = {0, "r_subdivisions_collision_maxv cvar_t mod_q3bsp_curves_collisions = {0, "mod_q3bsp_curves_collisions", "1", "enables collisions with curves (SLOW)"}; cvar_t mod_q3bsp_optimizedtraceline = {0, "mod_q3bsp_optimizedtraceline", "1", "whether to use optimized traceline code for line traces (as opposed to tracebox code)"}; cvar_t mod_q3bsp_debugtracebrush = {0, "mod_q3bsp_debugtracebrush", "0", "selects different tracebrush bsp recursion algorithms (for debugging purposes only)"}; +cvar_t mod_q3bsp_lightmapmergepower = {CVAR_SAVE, "mod_q3bsp_lightmapmergepower", "4", "merges the quake3 128x128 lightmap textures into larger lightmap group textures to speed up rendering, 1 = 256x256, 2 = 512x512, 3 = 1024x1024, 4 = 2048x2048, 5 = 4096x4096, ..."}; static texture_t mod_q1bsp_texture_solid; static texture_t mod_q1bsp_texture_sky; @@ -57,6 +59,7 @@ void Mod_BrushInit(void) Cvar_RegisterVariable(&mcbsp); Cvar_RegisterVariable(&r_novis); Cvar_RegisterVariable(&r_lightmaprgba); + Cvar_RegisterVariable(&r_picmipworld); Cvar_RegisterVariable(&r_nosurftextures); Cvar_RegisterVariable(&r_subdivisions_tolerance); Cvar_RegisterVariable(&r_subdivisions_mintess); @@ -69,6 +72,7 @@ void Mod_BrushInit(void) Cvar_RegisterVariable(&mod_q3bsp_curves_collisions); Cvar_RegisterVariable(&mod_q3bsp_optimizedtraceline); Cvar_RegisterVariable(&mod_q3bsp_debugtracebrush); + Cvar_RegisterVariable(&mod_q3bsp_lightmapmergepower); memset(&mod_q1bsp_texture_solid, 0, sizeof(mod_q1bsp_texture_solid)); strlcpy(mod_q1bsp_texture_solid.name, "solid" , sizeof(mod_q1bsp_texture_solid.name)); @@ -579,7 +583,7 @@ int Mod_Q1BSP_SuperContentsFromNativeContents(model_t *model, int nativecontents int Mod_Q1BSP_NativeContentsFromSuperContents(model_t *model, int supercontents) { - if (supercontents & SUPERCONTENTS_SOLID) + if (supercontents & (SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY)) return CONTENTS_SOLID; if (supercontents & SUPERCONTENTS_SKY) return CONTENTS_SKY; @@ -614,6 +618,7 @@ RecursiveHullCheckTraceInfo_t; #define HULLCHECKSTATE_SOLID 1 #define HULLCHECKSTATE_DONE 2 +extern cvar_t collision_prefernudgedfraction; static int Mod_Q1BSP_RecursiveHullCheck(RecursiveHullCheckTraceInfo_t *t, int num, double p1f, double p2f, double p1[3], double p2[3]) { // status variables, these don't need to be saved on the stack when @@ -768,13 +773,16 @@ loc0: midf = (t1 - DIST_EPSILON) / (t1 - t2); t->trace->fraction = bound(0, midf, 1); + if (collision_prefernudgedfraction.integer) + t->trace->realfraction = t->trace->fraction; + #if COLLISIONPARANOID >= 3 Con_Print("D"); #endif return HULLCHECKSTATE_DONE; } -#if COLLISIONPARANOID < 2 +//#if COLLISIONPARANOID < 2 static int Mod_Q1BSP_RecursiveHullCheckPoint(RecursiveHullCheckTraceInfo_t *t, int num) { while (num >= 0) @@ -796,7 +804,7 @@ static int Mod_Q1BSP_RecursiveHullCheckPoint(RecursiveHullCheckTraceInfo_t *t, i return HULLCHECKSTATE_EMPTY; } } -#endif +//#endif static void Mod_Q1BSP_TraceBox(struct model_s *model, int frame, trace_t *trace, const vec3_t start, const vec3_t boxmins, const vec3_t boxmaxs, const vec3_t end, int hitsupercontentsmask) { @@ -850,6 +858,25 @@ static void Mod_Q1BSP_TraceBox(struct model_s *model, int frame, trace_t *trace, #if COLLISIONPARANOID >= 2 Con_Printf("t(%f %f %f,%f %f %f,%i %f %f %f)", rhc.start[0], rhc.start[1], rhc.start[2], rhc.end[0], rhc.end[1], rhc.end[2], rhc.hull - model->brushq1.hulls, rhc.hull->clip_mins[0], rhc.hull->clip_mins[1], rhc.hull->clip_mins[2]); Mod_Q1BSP_RecursiveHullCheck(&rhc, rhc.hull->firstclipnode, 0, 1, rhc.start, rhc.end); + { + + double test[3]; + trace_t testtrace; + VectorLerp(rhc.start, rhc.trace->fraction, rhc.end, test); + memset(&testtrace, 0, sizeof(trace_t)); + rhc.trace = &testtrace; + rhc.trace->hitsupercontentsmask = hitsupercontentsmask; + rhc.trace->fraction = 1; + rhc.trace->realfraction = 1; + rhc.trace->allsolid = true; + VectorCopy(test, rhc.start); + VectorCopy(test, rhc.end); + VectorClear(rhc.dist); + Mod_Q1BSP_RecursiveHullCheckPoint(&rhc, rhc.hull->firstclipnode); + //Mod_Q1BSP_RecursiveHullCheck(&rhc, rhc.hull->firstclipnode, 0, 1, test, test); + if (!trace->startsolid && testtrace.startsolid) + Con_Printf(" - ended in solid!\n"); + } Con_Print("\n"); #else if (VectorLength2(rhc.dist)) @@ -857,12 +884,6 @@ static void Mod_Q1BSP_TraceBox(struct model_s *model, int frame, trace_t *trace, else Mod_Q1BSP_RecursiveHullCheckPoint(&rhc, rhc.hull->firstclipnode); #endif - if (trace->fraction == 1) - { - trace->hitsupercontents = 0; - trace->hitq3surfaceflags = 0; - trace->hittexture = NULL; - } } void Collision_ClipTrace_Box(trace_t *trace, const vec3_t cmins, const vec3_t cmaxs, const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int hitsupercontentsmask, int boxsupercontents, int boxq3surfaceflags, texture_t *boxtexture) @@ -890,12 +911,12 @@ void Collision_ClipTrace_Box(trace_t *trace, const vec3_t cmins, const vec3_t cm cbox_planes[3].normal[0] = 0;cbox_planes[3].normal[1] = -1;cbox_planes[3].normal[2] = 0;cbox_planes[3].dist = maxs[1] - cmins[1]; cbox_planes[4].normal[0] = 0;cbox_planes[4].normal[1] = 0;cbox_planes[4].normal[2] = 1;cbox_planes[4].dist = cmaxs[2] - mins[2]; cbox_planes[5].normal[0] = 0;cbox_planes[5].normal[1] = 0;cbox_planes[5].normal[2] = -1;cbox_planes[5].dist = maxs[2] - cmins[2]; - cbox_planes[0].supercontents = boxsupercontents;cbox_planes[0].q3surfaceflags = boxq3surfaceflags;cbox_planes[0].texture = boxtexture; - cbox_planes[1].supercontents = boxsupercontents;cbox_planes[1].q3surfaceflags = boxq3surfaceflags;cbox_planes[1].texture = boxtexture; - cbox_planes[2].supercontents = boxsupercontents;cbox_planes[2].q3surfaceflags = boxq3surfaceflags;cbox_planes[2].texture = boxtexture; - cbox_planes[3].supercontents = boxsupercontents;cbox_planes[3].q3surfaceflags = boxq3surfaceflags;cbox_planes[3].texture = boxtexture; - cbox_planes[4].supercontents = boxsupercontents;cbox_planes[4].q3surfaceflags = boxq3surfaceflags;cbox_planes[4].texture = boxtexture; - cbox_planes[5].supercontents = boxsupercontents;cbox_planes[5].q3surfaceflags = boxq3surfaceflags;cbox_planes[5].texture = boxtexture; + cbox_planes[0].q3surfaceflags = boxq3surfaceflags;cbox_planes[0].texture = boxtexture; + cbox_planes[1].q3surfaceflags = boxq3surfaceflags;cbox_planes[1].texture = boxtexture; + cbox_planes[2].q3surfaceflags = boxq3surfaceflags;cbox_planes[2].texture = boxtexture; + cbox_planes[3].q3surfaceflags = boxq3surfaceflags;cbox_planes[3].texture = boxtexture; + cbox_planes[4].q3surfaceflags = boxq3surfaceflags;cbox_planes[4].texture = boxtexture; + cbox_planes[5].q3surfaceflags = boxq3surfaceflags;cbox_planes[5].texture = boxtexture; memset(trace, 0, sizeof(trace_t)); trace->hitsupercontentsmask = hitsupercontentsmask; trace->fraction = 1; @@ -969,11 +990,81 @@ void Collision_ClipTrace_Box(trace_t *trace, const vec3_t cmins, const vec3_t cm #endif } +static int Mod_Q1BSP_TraceLineOfSight_RecursiveNodeCheck(mnode_t *node, double p1[3], double p2[3]) +{ + double t1, t2; + double midf, mid[3]; + int ret, side; + + // check for empty + while (node->plane) + { + // find the point distances + mplane_t *plane = node->plane; + if (plane->type < 3) + { + t1 = p1[plane->type] - plane->dist; + t2 = p2[plane->type] - plane->dist; + } + else + { + t1 = DotProduct (plane->normal, p1) - plane->dist; + t2 = DotProduct (plane->normal, p2) - plane->dist; + } + + if (t1 < 0) + { + if (t2 < 0) + { + node = node->children[1]; + continue; + } + side = 1; + } + else + { + if (t2 >= 0) + { + node = node->children[0]; + continue; + } + side = 0; + } + + midf = t1 / (t1 - t2); + VectorLerp(p1, midf, p2, mid); + + // recurse both sides, front side first + // return 2 if empty is followed by solid (hit something) + // do not return 2 if both are solid or both empty, + // or if start is solid and end is empty + // as these degenerate cases usually indicate the eye is in solid and + // should see the target point anyway + ret = Mod_Q1BSP_TraceLineOfSight_RecursiveNodeCheck(node->children[side ], p1, mid); + if (ret != 0) + return ret; + ret = Mod_Q1BSP_TraceLineOfSight_RecursiveNodeCheck(node->children[side ^ 1], mid, p2); + if (ret != 1) + return ret; + return 2; + } + return ((mleaf_t *)node)->clusterindex < 0; +} + +static qboolean Mod_Q1BSP_TraceLineOfSight(struct model_s *model, const vec3_t start, const vec3_t end) +{ + // this function currently only supports same size start and end + double tracestart[3], traceend[3]; + VectorCopy(start, tracestart); + VectorCopy(end, traceend); + return Mod_Q1BSP_TraceLineOfSight_RecursiveNodeCheck(model->brush.data_nodes, tracestart, traceend) != 2; +} + static int Mod_Q1BSP_LightPoint_RecursiveBSPNode(model_t *model, vec3_t ambientcolor, vec3_t diffusecolor, vec3_t diffusenormal, const mnode_t *node, float x, float y, float startz, float endz) { - int side, distz = endz - startz; + int side; float front, back; - float mid; + float mid, distz = endz - startz; loc0: if (!node->plane) @@ -1104,8 +1195,17 @@ middle sample (the one which was requested) void Mod_Q1BSP_LightPoint(model_t *model, const vec3_t p, vec3_t ambientcolor, vec3_t diffusecolor, vec3_t diffusenormal) { - Mod_Q1BSP_LightPoint_RecursiveBSPNode(model, ambientcolor, diffusecolor, diffusenormal, model->brush.data_nodes + model->brushq1.hulls[0].firstclipnode, p[0], p[1], p[2], p[2] - 65536); - VectorSet(diffusenormal, 0, 0, -1); + // pretend lighting is coming down from above (due to lack of a lightgrid to know primary lighting direction) + VectorSet(diffusenormal, 0, 0, 1); + + if (!model->brushq1.lightdata) + { + VectorSet(ambientcolor, 1, 1, 1); + VectorSet(diffusecolor, 0, 0, 0); + return; + } + + Mod_Q1BSP_LightPoint_RecursiveBSPNode(model, ambientcolor, diffusecolor, diffusenormal, model->brush.data_nodes + model->brushq1.hulls[0].firstclipnode, p[0], p[1], p[2] + 0.125, p[2] - 65536); } static void Mod_Q1BSP_DecompressVis(const unsigned char *in, const unsigned char *inend, unsigned char *out, unsigned char *outend) @@ -1116,7 +1216,7 @@ static void Mod_Q1BSP_DecompressVis(const unsigned char *in, const unsigned char { if (in == inend) { - Con_Printf("Mod_Q1BSP_DecompressVis: input underrun on model \"%s\" (decompressed %i of %i output bytes)\n", loadmodel->name, out - outstart, outend - outstart); + Con_Printf("Mod_Q1BSP_DecompressVis: input underrun on model \"%s\" (decompressed %i of %i output bytes)\n", loadmodel->name, (int)(out - outstart), (int)(outend - outstart)); return; } c = *in++; @@ -1126,14 +1226,14 @@ static void Mod_Q1BSP_DecompressVis(const unsigned char *in, const unsigned char { if (in == inend) { - Con_Printf("Mod_Q1BSP_DecompressVis: input underrun (during zero-run) on model \"%s\" (decompressed %i of %i output bytes)\n", loadmodel->name, out - outstart, outend - outstart); + Con_Printf("Mod_Q1BSP_DecompressVis: input underrun (during zero-run) on model \"%s\" (decompressed %i of %i output bytes)\n", loadmodel->name, (int)(out - outstart), (int)(outend - outstart)); return; } for (c = *in++;c > 0;c--) { if (out == outend) { - Con_Printf("Mod_Q1BSP_DecompressVis: output overrun on model \"%s\" (decompressed %i of %i output bytes)\n", loadmodel->name, out - outstart, outend - outstart); + Con_Printf("Mod_Q1BSP_DecompressVis: output overrun on model \"%s\" (decompressed %i of %i output bytes)\n", loadmodel->name, (int)(out - outstart), (int)(outend - outstart)); return; } *out++ = 0; @@ -1154,6 +1254,10 @@ void R_Q1BSP_LoadSplitSky (unsigned char *src, int width, int height, int bytesp int i, j; unsigned solidpixels[128*128], alphapixels[128*128]; + // allocate a texture pool if we need it + if (loadmodel->texturepool == NULL && cls.state != ca_dedicated) + loadmodel->texturepool = R_AllocTexturePool(); + // if sky isn't the right size, just use it as a solid layer if (width != 256 || height != 128) { @@ -1216,11 +1320,13 @@ void R_Q1BSP_LoadSplitSky (unsigned char *src, int width, int height, int bytesp static void Mod_Q1BSP_LoadTextures(lump_t *l) { int i, j, k, num, max, altmax, mtwidth, mtheight, *dofs, incomplete; + skinframe_t *skinframe; miptex_t *dmiptex; texture_t *tx, *tx2, *anims[10], *altanims[10]; dmiptexlump_t *m; unsigned char *data, *mtdata; - char name[MAX_QPATH]; + const char *s; + char mapname[MAX_QPATH], name[MAX_QPATH]; loadmodel->data_textures = NULL; @@ -1230,26 +1336,38 @@ static void Mod_Q1BSP_LoadTextures(lump_t *l) m = (dmiptexlump_t *)(mod_base + l->fileofs); m->nummiptex = LittleLong (m->nummiptex); loadmodel->num_textures = m->nummiptex + 2; + loadmodel->num_texturesperskin = loadmodel->num_textures; } else { m = NULL; loadmodel->num_textures = 2; + loadmodel->num_texturesperskin = loadmodel->num_textures; } loadmodel->data_textures = (texture_t *)Mem_Alloc(loadmodel->mempool, loadmodel->num_textures * sizeof(texture_t)); // fill out all slots with notexture + if (cls.state != ca_dedicated) + skinframe = R_SkinFrame_LoadMissing(); + else + skinframe = NULL; for (i = 0, tx = loadmodel->data_textures;i < loadmodel->num_textures;i++, tx++) { - strcpy(tx->name, "NO TEXTURE FOUND"); + strlcpy(tx->name, "NO TEXTURE FOUND", sizeof(tx->name)); tx->width = 16; tx->height = 16; - tx->skin.base = r_texture_notexture; - tx->basematerialflags = 0; + if (cls.state != ca_dedicated) + { + tx->numskinframes = 1; + tx->skinframerate = 1; + tx->skinframes[0] = skinframe; + tx->currentskinframe = tx->skinframes[0]; + tx->basematerialflags = 0; + } if (i == loadmodel->num_textures - 1) { - tx->basematerialflags |= MATERIALFLAG_WATER | MATERIALFLAG_LIGHTBOTHSIDES; + tx->basematerialflags |= MATERIALFLAG_WATER | MATERIALFLAG_LIGHTBOTHSIDES | MATERIALFLAG_NOSHADOW; tx->supercontents = mod_q1bsp_texture_water.supercontents; tx->surfaceflags = mod_q1bsp_texture_water.surfaceflags; } @@ -1263,7 +1381,15 @@ static void Mod_Q1BSP_LoadTextures(lump_t *l) } if (!m) + { + Con_Printf("%s: no miptex lump to load textures from\n", loadmodel->name); return; + } + + s = loadmodel->name; + if (!strncasecmp(s, "maps/", 5)) + s += 5; + FS_StripExtension(s, mapname, sizeof(mapname)); // just to work around bounds checking when debugging with it (array index out of bounds error thing) dofs = m->dataofs; @@ -1271,15 +1397,28 @@ static void Mod_Q1BSP_LoadTextures(lump_t *l) for (i = 0;i < m->nummiptex;i++) { dofs[i] = LittleLong(dofs[i]); - if (dofs[i] == -1 || r_nosurftextures.integer) + if (r_nosurftextures.integer) continue; + if (dofs[i] == -1) + { + Con_DPrintf("%s: miptex #%i missing\n", loadmodel->name, i); + continue; + } dmiptex = (miptex_t *)((unsigned char *)m + dofs[i]); - // make sure name is no more than 15 characters - for (j = 0;dmiptex->name[j] && j < 15;j++) + // copy name, but only up to 16 characters + // (the output buffer can hold more than this, but the input buffer is + // only 16) + for (j = 0;dmiptex->name[j] && j < 16;j++) name[j] = dmiptex->name[j]; name[j] = 0; + if (!name[0]) + { + sprintf(name, "unnamed%i", i); + Con_DPrintf("%s: warning: renaming unnamed texture to %s\n", loadmodel->name, name); + } + mtwidth = LittleLong(dmiptex->width); mtheight = LittleLong(dmiptex->height); mtdata = NULL; @@ -1289,29 +1428,55 @@ static void Mod_Q1BSP_LoadTextures(lump_t *l) // texture included if (j < 40 || j + mtwidth * mtheight > l->filelen) { - Con_Printf("Texture \"%s\" in \"%s\"is corrupt or incomplete\n", dmiptex->name, loadmodel->name); + Con_Printf("%s: Texture \"%s\" is corrupt or incomplete\n", loadmodel->name, dmiptex->name); continue; } mtdata = (unsigned char *)dmiptex + j; } if ((mtwidth & 15) || (mtheight & 15)) - Con_Printf("warning: texture \"%s\" in \"%s\" is not 16 aligned\n", dmiptex->name, loadmodel->name); + Con_DPrintf("%s: warning: texture \"%s\" is not 16 aligned\n", loadmodel->name, dmiptex->name); // LordHavoc: force all names to lowercase for (j = 0;name[j];j++) if (name[j] >= 'A' && name[j] <= 'Z') name[j] += 'a' - 'A'; + if (dmiptex->name[0] && Mod_LoadTextureFromQ3Shader(loadmodel->data_textures + i, name, true, false, false)) + continue; + tx = loadmodel->data_textures + i; - strcpy(tx->name, name); + strlcpy(tx->name, name, sizeof(tx->name)); tx->width = mtwidth; tx->height = mtheight; - if (!tx->name[0]) + if (tx->name[0] == '*') + { + if (!strncmp(tx->name, "*lava", 5)) + { + tx->supercontents = mod_q1bsp_texture_lava.supercontents; + tx->surfaceflags = mod_q1bsp_texture_lava.surfaceflags; + } + else if (!strncmp(tx->name, "*slime", 6)) + { + tx->supercontents = mod_q1bsp_texture_slime.supercontents; + tx->surfaceflags = mod_q1bsp_texture_slime.surfaceflags; + } + else + { + tx->supercontents = mod_q1bsp_texture_water.supercontents; + tx->surfaceflags = mod_q1bsp_texture_water.surfaceflags; + } + } + else if (!strncmp(tx->name, "sky", 3)) { - sprintf(tx->name, "unnamed%i", i); - Con_Printf("warning: unnamed texture in %s, renaming to %s\n", loadmodel->name, tx->name); + tx->supercontents = mod_q1bsp_texture_sky.supercontents; + tx->surfaceflags = mod_q1bsp_texture_sky.surfaceflags; + } + else + { + tx->supercontents = mod_q1bsp_texture_solid.supercontents; + tx->surfaceflags = mod_q1bsp_texture_solid.surfaceflags; } if (cls.state != ca_dedicated) @@ -1333,7 +1498,10 @@ static void Mod_Q1BSP_LoadTextures(lump_t *l) } else { - if (!Mod_LoadSkinFrame(&tx->skin, gamemode == GAME_TENEBRAE ? tx->name : va("textures/%s", tx->name), TEXF_MIPMAP | TEXF_ALPHA | TEXF_PRECACHE | TEXF_PICMIP, false, true)) + skinframe = R_SkinFrame_LoadExternal(gamemode == GAME_TENEBRAE ? tx->name : va("textures/%s/%s", mapname, tx->name), TEXF_MIPMAP | TEXF_ALPHA | TEXF_PRECACHE | (r_picmipworld.integer ? TEXF_PICMIP : 0), false); + if (!skinframe) + skinframe = R_SkinFrame_LoadExternal(gamemode == GAME_TENEBRAE ? tx->name : va("textures/%s", tx->name), TEXF_MIPMAP | TEXF_ALPHA | TEXF_PRECACHE | (r_picmipworld.integer ? TEXF_PICMIP : 0), false); + if (!skinframe) { // did not find external texture, load it from the bsp or wad3 if (loadmodel->brush.ishlbsp) @@ -1349,66 +1517,40 @@ static void Mod_Q1BSP_LoadTextures(lump_t *l) { tx->width = image_width; tx->height = image_height; - Mod_LoadSkinFrame_Internal(&tx->skin, tx->name, TEXF_MIPMAP | TEXF_ALPHA | TEXF_PRECACHE | TEXF_PICMIP, false, false, pixels, image_width, image_height, 32, NULL, NULL); + skinframe = R_SkinFrame_LoadInternal(tx->name, TEXF_MIPMAP | TEXF_ALPHA | TEXF_PRECACHE | (r_picmipworld.integer ? TEXF_PICMIP : 0), false, false, pixels, image_width, image_height, 32, NULL, NULL); } if (freepixels) Mem_Free(freepixels); } else if (mtdata) // texture included - Mod_LoadSkinFrame_Internal(&tx->skin, tx->name, TEXF_MIPMAP | TEXF_PRECACHE | TEXF_PICMIP, false, r_fullbrights.integer, mtdata, tx->width, tx->height, 8, NULL, NULL); + skinframe = R_SkinFrame_LoadInternal(tx->name, TEXF_MIPMAP | TEXF_PRECACHE | (r_picmipworld.integer ? TEXF_PICMIP : 0), false, r_fullbrights.integer, mtdata, tx->width, tx->height, 8, NULL, NULL); } + // if skinframe is still NULL the "missing" texture will be used + if (skinframe) + tx->skinframes[0] = skinframe; } - if (tx->skin.base == NULL) - { - // no texture found - tx->width = 16; - tx->height = 16; - tx->skin.base = r_texture_notexture; - } - } - tx->basematerialflags = 0; - if (tx->name[0] == '*') - { - // LordHavoc: some turbulent textures should not be affected by wateralpha - if (strncmp(tx->name,"*lava",5) - && strncmp(tx->name,"*teleport",9) - && strncmp(tx->name,"*rift",5)) // Scourge of Armagon texture - tx->basematerialflags |= MATERIALFLAG_WATERALPHA; - if (!strncmp(tx->name, "*lava", 5)) - { - tx->supercontents = mod_q1bsp_texture_lava.supercontents; - tx->surfaceflags = mod_q1bsp_texture_lava.surfaceflags; - } - else if (!strncmp(tx->name, "*slime", 6)) + tx->basematerialflags = 0; + if (tx->name[0] == '*') { - tx->supercontents = mod_q1bsp_texture_slime.supercontents; - tx->surfaceflags = mod_q1bsp_texture_slime.surfaceflags; + // LordHavoc: some turbulent textures should not be affected by wateralpha + if (strncmp(tx->name,"*lava",5) + && strncmp(tx->name,"*teleport",9) + && strncmp(tx->name,"*rift",5)) // Scourge of Armagon texture + tx->basematerialflags |= MATERIALFLAG_WATERALPHA | MATERIALFLAG_NOSHADOW; + tx->basematerialflags |= MATERIALFLAG_WATER | MATERIALFLAG_LIGHTBOTHSIDES | MATERIALFLAG_NOSHADOW; } + else if (!strncmp(tx->name, "sky", 3)) + tx->basematerialflags |= MATERIALFLAG_SKY | MATERIALFLAG_NOSHADOW; else - { - tx->supercontents = mod_q1bsp_texture_water.supercontents; - tx->surfaceflags = mod_q1bsp_texture_water.surfaceflags; - } - tx->basematerialflags |= MATERIALFLAG_WATER | MATERIALFLAG_LIGHTBOTHSIDES; - } - else if (tx->name[0] == 's' && tx->name[1] == 'k' && tx->name[2] == 'y') - { - tx->supercontents = mod_q1bsp_texture_sky.supercontents; - tx->surfaceflags = mod_q1bsp_texture_sky.surfaceflags; - tx->basematerialflags |= MATERIALFLAG_SKY; - } - else - { - tx->supercontents = mod_q1bsp_texture_solid.supercontents; - tx->surfaceflags = mod_q1bsp_texture_solid.surfaceflags; - tx->basematerialflags |= MATERIALFLAG_WALL; - } - if (tx->skin.fog) - tx->basematerialflags |= MATERIALFLAG_ALPHA | MATERIALFLAG_TRANSPARENT; + tx->basematerialflags |= MATERIALFLAG_WALL; + if (tx->skinframes[0] && tx->skinframes[0]->fog) + tx->basematerialflags |= MATERIALFLAG_ALPHA | MATERIALFLAG_BLENDED | MATERIALFLAG_NOSHADOW; - // start out with no animation - tx->currentframe = tx; + // start out with no animation + tx->currentframe = tx; + tx->currentskinframe = tx->skinframes[0]; + } } // sequence the animations @@ -1577,7 +1719,7 @@ static void Mod_Q1BSP_LoadLighting(lump_t *l) else if (filesize == 8) Con_Print("Empty .lit file, ignoring\n"); else - Con_Printf("Corrupt .lit file (file size %i bytes, should be %i bytes), ignoring\n", filesize, 8 + l->filelen * 3); + Con_Printf("Corrupt .lit file (file size %i bytes, should be %i bytes), ignoring\n", (int) filesize, (int) (8 + l->filelen * 3)); if (data) { Mem_Free(data); @@ -1619,23 +1761,23 @@ static void Mod_Q1BSP_ParseWadsFromEntityLump(const char *data) int i, j, k; if (!data) return; - if (!COM_ParseToken(&data, false)) + if (!COM_ParseToken_Simple(&data, false)) return; // error if (com_token[0] != '{') return; // error while (1) { - if (!COM_ParseToken(&data, false)) + if (!COM_ParseToken_Simple(&data, false)) return; // error if (com_token[0] == '}') break; // end of worldspawn if (com_token[0] == '_') - strcpy(key, com_token + 1); + strlcpy(key, com_token + 1, sizeof(key)); else - strcpy(key, com_token); + strlcpy(key, com_token, sizeof(key)); while (key[strlen(key)-1] == ' ') // remove trailing spaces key[strlen(key)-1] = 0; - if (!COM_ParseToken(&data, false)) + if (!COM_ParseToken_Simple(&data, false)) return; // error dpsnprintf(value, sizeof(value), "%s", com_token); if (!strcmp("wad", key)) // for HalfLife maps @@ -1657,8 +1799,8 @@ static void Mod_Q1BSP_ParseWadsFromEntityLump(const char *data) { k = value[i]; value[i] = 0; - strcpy(wadname, "textures/"); - strcat(wadname, &value[j]); + strlcpy(wadname, "textures/", sizeof(wadname)); + strlcat(wadname, &value[j], sizeof(wadname)); W_LoadTextureWadFile(wadname, false); j = i+1; if (!k) @@ -2119,7 +2261,8 @@ static void Mod_Q1BSP_LoadFaces(lump_t *l) } // compile additional data about the surface geometry - Mod_BuildTextureVectorsAndNormals(surface->num_firstvertex, surface->num_vertices, surface->num_triangles, loadmodel->surfmesh.data_vertex3f, loadmodel->surfmesh.data_texcoordtexture2f, (loadmodel->surfmesh.data_element3i + 3 * surface->num_firsttriangle), loadmodel->surfmesh.data_svector3f, loadmodel->surfmesh.data_tvector3f, loadmodel->surfmesh.data_normal3f, true); + Mod_BuildNormals(surface->num_firstvertex, surface->num_vertices, surface->num_triangles, loadmodel->surfmesh.data_vertex3f, (loadmodel->surfmesh.data_element3i + 3 * surface->num_firsttriangle), loadmodel->surfmesh.data_normal3f, true); + Mod_BuildTextureVectorsFromNormals(surface->num_firstvertex, surface->num_vertices, surface->num_triangles, loadmodel->surfmesh.data_vertex3f, loadmodel->surfmesh.data_texcoordtexture2f, loadmodel->surfmesh.data_normal3f, (loadmodel->surfmesh.data_element3i + 3 * surface->num_firsttriangle), loadmodel->surfmesh.data_svector3f, loadmodel->surfmesh.data_tvector3f, true); BoxFromPoints(surface->mins, surface->maxs, surface->num_vertices, (loadmodel->surfmesh.data_vertex3f + 3 * surface->num_firstvertex)); // generate surface extents information @@ -2189,6 +2332,9 @@ static void Mod_Q1BSP_LoadFaces(lump_t *l) // find a place for this lightmap if (!lightmaptexture || !Mod_Q1BSP_AllocLightmapBlock(lightmap_lineused, LIGHTMAPSIZE, LIGHTMAPSIZE, ssize, tsize, &lightmapx, &lightmapy)) { + // allocate a texture pool if we need it + if (loadmodel->texturepool == NULL && cls.state != ca_dedicated) + loadmodel->texturepool = R_AllocTexturePool(); // could not find room, make a new lightmap lightmaptexture = R_LoadTexture2D(loadmodel->texturepool, va("lightmap%i", lightmapnumber), LIGHTMAPSIZE, LIGHTMAPSIZE, NULL, loadmodel->brushq1.lightmaprgba ? TEXTYPE_RGBA : TEXTYPE_RGB, TEXF_FORCELINEAR | TEXF_PRECACHE, NULL); if (loadmodel->brushq1.nmaplightdata) @@ -2230,8 +2376,33 @@ static void Mod_Q1BSP_LoadNodes_RecursiveSetParent(mnode_t *node, mnode_t *paren node->parent = parent; if (node->plane) { + // this is a node, recurse to children Mod_Q1BSP_LoadNodes_RecursiveSetParent(node->children[0], node); Mod_Q1BSP_LoadNodes_RecursiveSetParent(node->children[1], node); + // combine supercontents of children + node->combinedsupercontents = node->children[0]->combinedsupercontents | node->children[1]->combinedsupercontents; + } + else + { + int j; + mleaf_t *leaf = (mleaf_t *)node; + // if this is a leaf, calculate supercontents mask from all collidable + // primitives in the leaf (brushes and collision surfaces) + // also flag if the leaf contains any collision surfaces + leaf->combinedsupercontents = 0; + // combine the supercontents values of all brushes in this leaf + for (j = 0;j < leaf->numleafbrushes;j++) + leaf->combinedsupercontents |= loadmodel->brush.data_brushes[leaf->firstleafbrush[j]].texture->supercontents; + // check if this leaf contains any collision surfaces (q3 patches) + for (j = 0;j < leaf->numleafsurfaces;j++) + { + msurface_t *surface = loadmodel->data_surfaces + leaf->firstleafsurface[j]; + if (surface->num_collisiontriangles) + { + leaf->containscollisionsurfaces = true; + leaf->combinedsupercontents |= surface->texture->supercontents; + } + } } } @@ -2313,7 +2484,7 @@ static void Mod_Q1BSP_LoadLeafs(lump_t *l) out->numleafsurfaces = LittleShort(in->nummarksurfaces); if (out->firstleafsurface < 0 || LittleShort(in->firstmarksurface) + out->numleafsurfaces > loadmodel->brush.num_leafsurfaces) { - Con_Printf("Mod_Q1BSP_LoadLeafs: invalid leafsurface range %i:%i outside range %i:%i\n", out->firstleafsurface, out->firstleafsurface + out->numleafsurfaces, 0, loadmodel->brush.num_leafsurfaces); + Con_Printf("Mod_Q1BSP_LoadLeafs: invalid leafsurface range %i:%i outside range %i:%i\n", (int)(out->firstleafsurface - loadmodel->brush.data_leafsurfaces), (int)(out->firstleafsurface + out->numleafsurfaces - loadmodel->brush.data_leafsurfaces), 0, loadmodel->brush.num_leafsurfaces); out->firstleafsurface = NULL; out->numleafsurfaces = 0; } @@ -2339,6 +2510,26 @@ static void Mod_Q1BSP_LoadLeafs(lump_t *l) } } +qboolean Mod_Q1BSP_CheckWaterAlphaSupport(void) +{ + int i, j; + mleaf_t *leaf; + const unsigned char *pvs; + // check all liquid leafs to see if they can see into empty leafs, if any + // can we can assume this map supports r_wateralpha + for (i = 0, leaf = loadmodel->brush.data_leafs;i < loadmodel->brush.num_leafs;i++, leaf++) + { + if ((leaf->contents == CONTENTS_WATER || leaf->contents == CONTENTS_SLIME) && (leaf->clusterindex >= 0 && loadmodel->brush.data_pvsclusters)) + { + pvs = loadmodel->brush.data_pvsclusters + leaf->clusterindex * loadmodel->brush.num_pvsclusterbytes; + for (j = 0;j < loadmodel->brush.num_leafs;j++) + if (CHECKPVSBIT(pvs, loadmodel->brush.data_leafs[j].clusterindex) && loadmodel->brush.data_leafs[j].contents == CONTENTS_EMPTY) + return true; + } + } + return false; +} + static void Mod_Q1BSP_LoadClipnodes(lump_t *l, hullinfo_t *hullinfo) { dclipnode_t *in, *out; @@ -2482,12 +2673,12 @@ static void Mod_Q1BSP_LoadMapBrushes(void) if (!maptext) return; text = maptext; - if (!COM_ParseToken(&data, false)) + if (!COM_ParseToken_Simple(&data, false)) return; // error submodel = 0; for (;;) { - if (!COM_ParseToken(&data, false)) + if (!COM_ParseToken_Simple(&data, false)) break; if (com_token[0] != '{') return; // error @@ -2498,7 +2689,7 @@ static void Mod_Q1BSP_LoadMapBrushes(void) brushes = Mem_Alloc(loadmodel->mempool, maxbrushes * sizeof(mbrush_t)); for (;;) { - if (!COM_ParseToken(&data, false)) + if (!COM_ParseToken_Simple(&data, false)) return; // error if (com_token[0] == '}') break; // end of entity @@ -2522,7 +2713,7 @@ static void Mod_Q1BSP_LoadMapBrushes(void) } for (;;) { - if (!COM_ParseToken(&data, false)) + if (!COM_ParseToken_Simple(&data, false)) return; // error if (com_token[0] == '}') break; // end of brush @@ -2531,25 +2722,25 @@ static void Mod_Q1BSP_LoadMapBrushes(void) // FIXME: support hl .map format for (pointnum = 0;pointnum < 3;pointnum++) { - COM_ParseToken(&data, false); + COM_ParseToken_Simple(&data, false); for (componentnum = 0;componentnum < 3;componentnum++) { - COM_ParseToken(&data, false); + COM_ParseToken_Simple(&data, false); point[pointnum][componentnum] = atof(com_token); } - COM_ParseToken(&data, false); + COM_ParseToken_Simple(&data, false); } - COM_ParseToken(&data, false); + COM_ParseToken_Simple(&data, false); strlcpy(facetexture, com_token, sizeof(facetexture)); - COM_ParseToken(&data, false); + COM_ParseToken_Simple(&data, false); //scroll_s = atof(com_token); - COM_ParseToken(&data, false); + COM_ParseToken_Simple(&data, false); //scroll_t = atof(com_token); - COM_ParseToken(&data, false); + COM_ParseToken_Simple(&data, false); //rotate = atof(com_token); - COM_ParseToken(&data, false); + COM_ParseToken_Simple(&data, false); //scale_s = atof(com_token); - COM_ParseToken(&data, false); + COM_ParseToken_Simple(&data, false); //scale_t = atof(com_token); TriangleNormal(point[0], point[1], point[2], planenormal); VectorNormalizeDouble(planenormal); @@ -2811,6 +3002,7 @@ static void RemovePortalFromNodes(portal_t *portal) } } +#define PORTAL_DIST_EPSILON (1.0 / 32.0) static void Mod_Q1BSP_RecursiveNodePortals(mnode_t *node) { int i, side; @@ -2836,6 +3028,7 @@ static void Mod_Q1BSP_RecursiveNodePortals(mnode_t *node) nodeportal = AllocPortal(); nodeportal->plane = *plane; + // TODO: calculate node bounding boxes during recursion and calculate a maximum plane size accordingly to improve precision (as most maps do not need 1 billion unit plane polygons) PolygonD_QuadForPlane(nodeportal->points, nodeportal->plane.normal[0], nodeportal->plane.normal[1], nodeportal->plane.normal[2], nodeportal->plane.dist, 1024.0*1024.0*1024.0); nodeportal->numpoints = 4; side = 0; // shut up compiler warning @@ -2857,7 +3050,7 @@ static void Mod_Q1BSP_RecursiveNodePortals(mnode_t *node) for (i = 0;i < nodeportal->numpoints*3;i++) frontpoints[i] = nodeportal->points[i]; - PolygonD_Divide(nodeportal->numpoints, frontpoints, clipplane.normal[0], clipplane.normal[1], clipplane.normal[2], clipplane.dist, 1.0/32.0, MAX_PORTALPOINTS, nodeportal->points, &nodeportal->numpoints, 0, NULL, NULL, NULL); + PolygonD_Divide(nodeportal->numpoints, frontpoints, clipplane.normal[0], clipplane.normal[1], clipplane.normal[2], clipplane.dist, PORTAL_DIST_EPSILON, MAX_PORTALPOINTS, nodeportal->points, &nodeportal->numpoints, 0, NULL, NULL, NULL); if (nodeportal->numpoints <= 0 || nodeportal->numpoints >= MAX_PORTALPOINTS) break; } @@ -2895,7 +3088,7 @@ static void Mod_Q1BSP_RecursiveNodePortals(mnode_t *node) RemovePortalFromNodes(portal); // cut the portal into two portals, one on each side of the node plane - PolygonD_Divide(portal->numpoints, portal->points, plane->normal[0], plane->normal[1], plane->normal[2], plane->dist, 1.0/32.0, MAX_PORTALPOINTS, frontpoints, &numfrontpoints, MAX_PORTALPOINTS, backpoints, &numbackpoints, NULL); + PolygonD_Divide(portal->numpoints, portal->points, plane->normal[0], plane->normal[1], plane->normal[2], plane->dist, PORTAL_DIST_EPSILON, MAX_PORTALPOINTS, frontpoints, &numfrontpoints, MAX_PORTALPOINTS, backpoints, &numbackpoints, NULL); if (!numfrontpoints) { @@ -3199,6 +3392,7 @@ void Mod_Q1BSP_Load(model_t *mod, void *buffer, void *bufferend) mod->soundfromcenter = true; mod->TraceBox = Mod_Q1BSP_TraceBox; + mod->brush.TraceLineOfSight = Mod_Q1BSP_TraceLineOfSight; mod->brush.SuperContentsFromNativeContents = Mod_Q1BSP_SuperContentsFromNativeContents; mod->brush.NativeContentsFromSuperContents = Mod_Q1BSP_NativeContentsFromSuperContents; mod->brush.GetPVS = Mod_Q1BSP_GetPVS; @@ -3253,8 +3447,8 @@ void Mod_Q1BSP_Load(model_t *mod, void *buffer, void *bufferend) Mod_Q1BSP_LoadNodes(&header->lumps[LUMP_NODES]); Mod_Q1BSP_LoadClipnodes(&header->lumps[LUMP_CLIPNODES], &hullinfo); - if (!mod->brushq1.lightdata) - mod->brush.LightPoint = NULL; + // check if the map supports transparent water rendering + loadmodel->brush.supportwateralpha = Mod_Q1BSP_CheckWaterAlphaSupport(); if (mod->brushq1.data_compressedpvs) Mem_Free(mod->brushq1.data_compressedpvs); @@ -3279,7 +3473,7 @@ void Mod_Q1BSP_Load(model_t *mod, void *buffer, void *bufferend) loadmodel->brush.shadowmesh = Mod_ShadowMesh_Begin(loadmodel->mempool, numshadowmeshtriangles * 3, numshadowmeshtriangles, NULL, NULL, NULL, false, false, true); for (j = 0, surface = loadmodel->data_surfaces;j < loadmodel->num_surfaces;j++, surface++) Mod_ShadowMesh_AddMesh(loadmodel->mempool, loadmodel->brush.shadowmesh, NULL, NULL, NULL, loadmodel->surfmesh.data_vertex3f, NULL, NULL, NULL, NULL, surface->num_triangles, (loadmodel->surfmesh.data_element3i + 3 * surface->num_firsttriangle)); - loadmodel->brush.shadowmesh = Mod_ShadowMesh_Finish(loadmodel->mempool, loadmodel->brush.shadowmesh, false, true); + loadmodel->brush.shadowmesh = Mod_ShadowMesh_Finish(loadmodel->mempool, loadmodel->brush.shadowmesh, false, true, false); Mod_BuildTriangleNeighbors(loadmodel->brush.shadowmesh->neighbor3i, loadmodel->brush.shadowmesh->element3i, loadmodel->brush.shadowmesh->numtriangles); if (loadmodel->brush.numsubmodels) @@ -3326,7 +3520,7 @@ void Mod_Q1BSP_Load(model_t *mod, void *buffer, void *bufferend) // copy the base model to this one *mod = *loadmodel; // rename the clone back to its proper name - strcpy(mod->name, name); + strlcpy(mod->name, name, sizeof(mod->name)); // textures and memory belong to the main model mod->texturepool = NULL; mod->mempool = NULL; @@ -3357,12 +3551,14 @@ void Mod_Q1BSP_Load(model_t *mod, void *buffer, void *bufferend) // this gets altered below if sky is used mod->DrawSky = NULL; mod->Draw = R_Q1BSP_Draw; + mod->DrawDepth = R_Q1BSP_DrawDepth; mod->GetLightInfo = R_Q1BSP_GetLightInfo; mod->CompileShadowVolume = R_Q1BSP_CompileShadowVolume; mod->DrawShadowVolume = R_Q1BSP_DrawShadowVolume; mod->DrawLight = R_Q1BSP_DrawLight; if (i != 0) { + mod->brush.TraceLineOfSight = NULL; mod->brush.GetPVS = NULL; mod->brush.FatPVS = NULL; mod->brush.BoxTouchingPVS = NULL; @@ -3887,23 +4083,23 @@ static void Mod_Q3BSP_LoadEntities(lump_t *l) memcpy(loadmodel->brush.entities, mod_base + l->fileofs, l->filelen); data = loadmodel->brush.entities; // some Q3 maps override the lightgrid_cellsize with a worldspawn key - if (data && COM_ParseToken(&data, false) && com_token[0] == '{') + if (data && COM_ParseToken_Simple(&data, false) && com_token[0] == '{') { while (1) { - if (!COM_ParseToken(&data, false)) + if (!COM_ParseToken_Simple(&data, false)) break; // error if (com_token[0] == '}') break; // end of worldspawn if (com_token[0] == '_') - strcpy(key, com_token + 1); + strlcpy(key, com_token + 1, sizeof(key)); else - strcpy(key, com_token); + strlcpy(key, com_token, sizeof(key)); while (key[strlen(key)-1] == ' ') // remove trailing spaces key[strlen(key)-1] = 0; - if (!COM_ParseToken(&data, false)) + if (!COM_ParseToken_Simple(&data, false)) break; // error - strcpy(value, com_token); + strlcpy(value, com_token, sizeof(value)); if (!strcmp("gridsize", key)) { if (sscanf(value, "%f %f %f", &v[0], &v[1], &v[2]) == 3 && v[0] != 0 && v[1] != 0 && v[2] != 0) @@ -3917,16 +4113,7 @@ static void Mod_Q3BSP_LoadTextures(lump_t *l) { q3dtexture_t *in; texture_t *out; - int i, count; - int j, c; - fssearch_t *search; - char *f; - const char *text; - int flags, flags2, numparameters, passnumber; - char shadername[Q3PATHLENGTH]; - char sky[Q3PATHLENGTH]; - char firstpasstexturename[Q3PATHLENGTH]; - char parameter[4][Q3PATHLENGTH]; + int i, count, c; in = (q3dtexture_t *)(mod_base + l->fileofs); if (l->filelen % sizeof(*in)) @@ -3936,277 +4123,22 @@ static void Mod_Q3BSP_LoadTextures(lump_t *l) loadmodel->data_textures = out; loadmodel->num_textures = count; + loadmodel->num_texturesperskin = loadmodel->num_textures; - for (i = 0;i < count;i++, in++, out++) + for (i = 0;i < count;i++) { - strlcpy (out->name, in->name, sizeof (out->name)); - out->surfaceflags = LittleLong(in->surfaceflags); - out->supercontents = Mod_Q3BSP_SuperContentsFromNativeContents(loadmodel, LittleLong(in->contents)); - out->surfaceparms = -1; + strlcpy (out[i].name, in[i].name, sizeof (out[i].name)); + out[i].surfaceflags = LittleLong(in[i].surfaceflags); + out[i].supercontents = Mod_Q3BSP_SuperContentsFromNativeContents(loadmodel, LittleLong(in[i].contents)); } - // do a quick parse of shader files to get surfaceparms - if ((search = FS_Search("scripts/*.shader", true, false))) - { - for (i = 0;i < search->numfilenames;i++) - { - if ((f = (char *)FS_LoadFile(search->filenames[i], tempmempool, false, NULL))) - { - text = f; - while (COM_ParseToken(&text, false)) - { - strlcpy (shadername, com_token, sizeof (shadername)); - flags = 0; - flags2 = 0; - sky[0] = 0; - passnumber = 0; - firstpasstexturename[0] = 0; - if (COM_ParseToken(&text, false) && !strcasecmp(com_token, "{")) - { - while (COM_ParseToken(&text, false)) - { - if (!strcasecmp(com_token, "}")) - break; - else if (!strcasecmp(com_token, "{")) - { - while (COM_ParseToken(&text, false)) - { - if (!strcasecmp(com_token, "}")) - break; - if (!strcasecmp(com_token, "\n")) - continue; - numparameters = 0; - for (j = 0;strcasecmp(com_token, "\n") && strcasecmp(com_token, "}");j++) - { - if (j < 4) - { - strlcpy(parameter[j], com_token, sizeof(parameter[j])); - numparameters = j + 1; - } - if (!COM_ParseToken(&text, true)) - break; - } - if (developer.integer >= 100) - { - Con_Printf("%s %i: ", shadername, passnumber); - for (j = 0;j < numparameters;j++) - Con_Printf(" %s", parameter[j]); - Con_Print("\n"); - } - if (passnumber == 0 && numparameters >= 1) - { - if (!strcasecmp(parameter[0], "blendfunc") && (flags & Q3SURFACEPARM_TRANS)) - { - if (numparameters == 2 && !strcasecmp(parameter[1], "add")) - flags2 |= Q3TEXTUREFLAG_ADDITIVE; - else if (numparameters == 3 && !strcasecmp(parameter[1], "gl_one") && !strcasecmp(parameter[2], "gl_one")) - flags2 |= Q3TEXTUREFLAG_ADDITIVE; - else if (numparameters == 3 && !strcasecmp(parameter[1], "gl_src_alpha") && !strcasecmp(parameter[2], "gl_one")) - flags2 |= Q3TEXTUREFLAG_ADDITIVE; - } - else if (numparameters >= 2 && (!strcasecmp(parameter[0], "map") || !strcasecmp(parameter[0], "clampmap"))) - strlcpy(firstpasstexturename, parameter[1], sizeof(firstpasstexturename)); - else if (numparameters >= 3 && !strcasecmp(parameter[0], "animmap")) - strlcpy(firstpasstexturename, parameter[2], sizeof(firstpasstexturename)); - else if (numparameters >= 2 && !strcasecmp(parameter[0], "alphafunc")) - flags2 |= Q3TEXTUREFLAG_ALPHATEST; - } - // break out a level if it was } - if (!strcasecmp(com_token, "}")) - break; - } - passnumber++; - continue; - } - numparameters = 0; - for (j = 0;strcasecmp(com_token, "\n") && strcasecmp(com_token, "}");j++) - { - if (j < 4) - { - strlcpy(parameter[j], com_token, sizeof(parameter[j])); - numparameters = j + 1; - } - if (!COM_ParseToken(&text, true)) - break; - } - if (i == 0 && !strcasecmp(com_token, "}")) - break; - if (developer.integer >= 100) - { - Con_Printf("%s: ", shadername); - for (j = 0;j < numparameters;j++) - Con_Printf(" %s", parameter[j]); - Con_Print("\n"); - } - if (numparameters < 1) - continue; - if (!strcasecmp(parameter[0], "surfaceparm") && numparameters >= 2) - { - if (!strcasecmp(parameter[1], "alphashadow")) - flags |= Q3SURFACEPARM_ALPHASHADOW; - else if (!strcasecmp(parameter[1], "areaportal")) - flags |= Q3SURFACEPARM_AREAPORTAL; - else if (!strcasecmp(parameter[1], "clusterportal")) - flags |= Q3SURFACEPARM_CLUSTERPORTAL; - else if (!strcasecmp(parameter[1], "detail")) - flags |= Q3SURFACEPARM_DETAIL; - else if (!strcasecmp(parameter[1], "donotenter")) - flags |= Q3SURFACEPARM_DONOTENTER; - else if (!strcasecmp(parameter[1], "fog")) - flags |= Q3SURFACEPARM_FOG; - else if (!strcasecmp(parameter[1], "lava")) - flags |= Q3SURFACEPARM_LAVA; - else if (!strcasecmp(parameter[1], "lightfilter")) - flags |= Q3SURFACEPARM_LIGHTFILTER; - else if (!strcasecmp(parameter[1], "metalsteps")) - flags |= Q3SURFACEPARM_METALSTEPS; - else if (!strcasecmp(parameter[1], "nodamage")) - flags |= Q3SURFACEPARM_NODAMAGE; - else if (!strcasecmp(parameter[1], "nodlight")) - flags |= Q3SURFACEPARM_NODLIGHT; - else if (!strcasecmp(parameter[1], "nodraw")) - flags |= Q3SURFACEPARM_NODRAW; - else if (!strcasecmp(parameter[1], "nodrop")) - flags |= Q3SURFACEPARM_NODROP; - else if (!strcasecmp(parameter[1], "noimpact")) - flags |= Q3SURFACEPARM_NOIMPACT; - else if (!strcasecmp(parameter[1], "nolightmap")) - flags |= Q3SURFACEPARM_NOLIGHTMAP; - else if (!strcasecmp(parameter[1], "nomarks")) - flags |= Q3SURFACEPARM_NOMARKS; - else if (!strcasecmp(parameter[1], "nomipmaps")) - flags |= Q3SURFACEPARM_NOMIPMAPS; - else if (!strcasecmp(parameter[1], "nonsolid")) - flags |= Q3SURFACEPARM_NONSOLID; - else if (!strcasecmp(parameter[1], "origin")) - flags |= Q3SURFACEPARM_ORIGIN; - else if (!strcasecmp(parameter[1], "playerclip")) - flags |= Q3SURFACEPARM_PLAYERCLIP; - else if (!strcasecmp(parameter[1], "sky")) - flags |= Q3SURFACEPARM_SKY; - else if (!strcasecmp(parameter[1], "slick")) - flags |= Q3SURFACEPARM_SLICK; - else if (!strcasecmp(parameter[1], "slime")) - flags |= Q3SURFACEPARM_SLIME; - else if (!strcasecmp(parameter[1], "structural")) - flags |= Q3SURFACEPARM_STRUCTURAL; - else if (!strcasecmp(parameter[1], "trans")) - flags |= Q3SURFACEPARM_TRANS; - else if (!strcasecmp(parameter[1], "water")) - flags |= Q3SURFACEPARM_WATER; - else if (!strcasecmp(parameter[1], "pointlight")) - flags |= Q3SURFACEPARM_POINTLIGHT; - else - Con_Printf("%s parsing warning: unknown surfaceparm \"%s\"\n", search->filenames[i], parameter[1]); - } - else if (!strcasecmp(parameter[0], "sky") && numparameters >= 2) - strlcpy(sky, parameter[1], sizeof(sky)); - else if (!strcasecmp(parameter[0], "skyparms") && numparameters >= 2) - { - if (!atoi(parameter[1]) && strcasecmp(parameter[1], "-")) - strlcpy(sky, parameter[1], sizeof(sky)); - } - else if (!strcasecmp(parameter[0], "cull") && numparameters >= 2) - { - if (!strcasecmp(parameter[1], "disable") || !strcasecmp(parameter[1], "none") || !strcasecmp(parameter[1], "twosided")) - flags2 |= Q3TEXTUREFLAG_TWOSIDED; - } - else if (!strcasecmp(parameter[0], "nomipmaps")) - flags2 |= Q3TEXTUREFLAG_NOMIPMAPS; - else if (!strcasecmp(parameter[0], "nopicmip")) - flags2 |= Q3TEXTUREFLAG_NOPICMIP; - else if (!strcasecmp(parameter[0], "deformvertexes") && numparameters >= 2) - { - if (!strcasecmp(parameter[1], "autosprite") && numparameters == 2) - flags2 |= Q3TEXTUREFLAG_AUTOSPRITE; - if (!strcasecmp(parameter[1], "autosprite2") && numparameters == 2) - flags2 |= Q3TEXTUREFLAG_AUTOSPRITE2; - } - } - // add shader to list (shadername and flags) - // actually here we just poke into the texture settings - for (j = 0, out = loadmodel->data_textures;j < loadmodel->num_textures;j++, out++) - { - if (!strcasecmp(out->name, shadername)) - { - out->surfaceparms = flags; - out->textureflags = flags2; - out->basematerialflags = 0; - if (out->surfaceparms & Q3SURFACEPARM_NODRAW) - out->basematerialflags |= MATERIALFLAG_NODRAW; - else if (out->surfaceparms & Q3SURFACEPARM_SKY) - out->basematerialflags |= MATERIALFLAG_SKY; - else if (out->surfaceparms & Q3SURFACEPARM_LAVA) - out->basematerialflags |= MATERIALFLAG_WATER | MATERIALFLAG_FULLBRIGHT; - else if (out->surfaceparms & Q3SURFACEPARM_SLIME) - out->basematerialflags |= MATERIALFLAG_WATER | MATERIALFLAG_WATERALPHA; - else if (out->surfaceparms & Q3SURFACEPARM_WATER) - out->basematerialflags |= MATERIALFLAG_WATER | MATERIALFLAG_WATERALPHA; - else - out->basematerialflags |= MATERIALFLAG_WALL; - if (out->textureflags & Q3TEXTUREFLAG_ALPHATEST) - { - // FIXME: support alpha test? - out->basematerialflags |= MATERIALFLAG_ALPHA | MATERIALFLAG_TRANSPARENT; - } - else if (out->surfaceparms & Q3SURFACEPARM_TRANS) - { - if (out->textureflags & Q3TEXTUREFLAG_ADDITIVE) - out->basematerialflags |= MATERIALFLAG_ADD | MATERIALFLAG_TRANSPARENT; - else - out->basematerialflags |= MATERIALFLAG_ALPHA | MATERIALFLAG_TRANSPARENT; - } - strlcpy(out->firstpasstexturename, firstpasstexturename, sizeof(out->firstpasstexturename)); - if ((flags & Q3SURFACEPARM_SKY) && sky[0]) - { - // quake3 seems to append a _ to the skybox name, so this must do so as well - dpsnprintf(loadmodel->brush.skybox, sizeof(loadmodel->brush.skybox), "%s_", sky); - } - } - } - } - else - { - Con_Printf("%s parsing error - expected \"{\", found \"%s\"\n", search->filenames[i], com_token); - goto parseerror; - } - } -parseerror: - Mem_Free(f); - } - } - } + if (cls.state == ca_dedicated) + return; c = 0; - for (j = 0, out = loadmodel->data_textures;j < loadmodel->num_textures;j++, out++) - { - if (out->surfaceparms == -1) - { + for (i = 0;i < count;i++, in++, out++) + if (Mod_LoadTextureFromQ3Shader(out, out->name, false, true, false)) c++; - Con_DPrintf("%s: No shader found for texture \"%s\"\n", loadmodel->name, out->name); - out->surfaceparms = 0; - if (out->surfaceflags & Q3SURFACEFLAG_NODRAW) - out->basematerialflags |= MATERIALFLAG_NODRAW; - else if (out->surfaceflags & Q3SURFACEFLAG_SKY) - out->basematerialflags |= MATERIALFLAG_SKY; - else - out->basematerialflags |= MATERIALFLAG_WALL; - // these are defaults - //if (!strncmp(out->name, "textures/skies/", 15)) - // out->surfaceparms |= Q3SURFACEPARM_SKY; - //if (!strcmp(out->name, "caulk") || !strcmp(out->name, "common/caulk") || !strcmp(out->name, "textures/common/caulk") - // || !strcmp(out->name, "nodraw") || !strcmp(out->name, "common/nodraw") || !strcmp(out->name, "textures/common/nodraw")) - // out->surfaceparms |= Q3SURFACEPARM_NODRAW; - //if (R_TextureHasAlpha(out->skin.base)) - // out->surfaceparms |= Q3SURFACEPARM_TRANS; - } - if (cls.state != ca_dedicated) - if (!Mod_LoadSkinFrame(&out->skin, out->name, (((out->textureflags & Q3TEXTUREFLAG_NOMIPMAPS) || (out->surfaceparms & Q3SURFACEPARM_NOMIPMAPS)) ? 0 : TEXF_MIPMAP) | TEXF_ALPHA | TEXF_PRECACHE | (out->textureflags & Q3TEXTUREFLAG_NOPICMIP ? 0 : TEXF_PICMIP), false, true)) - if (!Mod_LoadSkinFrame(&out->skin, out->firstpasstexturename, (((out->textureflags & Q3TEXTUREFLAG_NOMIPMAPS) || (out->surfaceparms & Q3SURFACEPARM_NOMIPMAPS)) ? 0 : TEXF_MIPMAP) | TEXF_ALPHA | TEXF_PRECACHE | (out->textureflags & Q3TEXTUREFLAG_NOPICMIP ? 0 : TEXF_PICMIP), false, true)) - Con_Printf("%s: texture loading for shader \"%s\" failed (first layer \"%s\" not found either)\n", loadmodel->name, out->name, out->firstpasstexturename); - // no animation - out->currentframe = out; - } if (c) Con_DPrintf("%s: %i textures missing shaders\n", loadmodel->name, c); } @@ -4308,12 +4240,11 @@ static void Mod_Q3BSP_LoadBrushes(lump_t *l) { VectorCopy(out->firstbrushside[j].plane->normal, planes[j].normal); planes[j].dist = out->firstbrushside[j].plane->dist; - planes[j].supercontents = out->firstbrushside[j].texture->supercontents; planes[j].q3surfaceflags = out->firstbrushside[j].texture->surfaceflags; planes[j].texture = out->firstbrushside[j].texture; } // make the colbrush from the planes - out->colbrushf = Collision_NewBrushFromPlanes(loadmodel->mempool, out->numbrushsides, planes); + out->colbrushf = Collision_NewBrushFromPlanes(loadmodel->mempool, out->numbrushsides, planes, out->texture->supercontents); } if (planes) Mem_Free(planes); @@ -4357,8 +4288,9 @@ static void Mod_Q3BSP_LoadVertices(lump_t *l) if (l->filelen % sizeof(*in)) Host_Error("Mod_Q3BSP_LoadVertices: funny lump size in %s",loadmodel->name); loadmodel->brushq3.num_vertices = count = l->filelen / sizeof(*in); - loadmodel->brushq3.data_vertex3f = (float *)Mem_Alloc(loadmodel->mempool, count * (sizeof(float) * (3 + 2 + 2 + 4))); - loadmodel->brushq3.data_texcoordtexture2f = loadmodel->brushq3.data_vertex3f + count * 3; + loadmodel->brushq3.data_vertex3f = (float *)Mem_Alloc(loadmodel->mempool, count * (sizeof(float) * (3 + 3 + 2 + 2 + 4))); + loadmodel->brushq3.data_normal3f = loadmodel->brushq3.data_vertex3f + count * 3; + loadmodel->brushq3.data_texcoordtexture2f = loadmodel->brushq3.data_normal3f + count * 3; loadmodel->brushq3.data_texcoordlightmap2f = loadmodel->brushq3.data_texcoordtexture2f + count * 2; loadmodel->brushq3.data_color4f = loadmodel->brushq3.data_texcoordlightmap2f + count * 2; @@ -4367,6 +4299,9 @@ static void Mod_Q3BSP_LoadVertices(lump_t *l) loadmodel->brushq3.data_vertex3f[i * 3 + 0] = LittleFloat(in->origin3f[0]); loadmodel->brushq3.data_vertex3f[i * 3 + 1] = LittleFloat(in->origin3f[1]); loadmodel->brushq3.data_vertex3f[i * 3 + 2] = LittleFloat(in->origin3f[2]); + loadmodel->brushq3.data_normal3f[i * 3 + 0] = LittleFloat(in->normal3f[0]); + loadmodel->brushq3.data_normal3f[i * 3 + 1] = LittleFloat(in->normal3f[1]); + loadmodel->brushq3.data_normal3f[i * 3 + 2] = LittleFloat(in->normal3f[2]); loadmodel->brushq3.data_texcoordtexture2f[i * 2 + 0] = LittleFloat(in->texcoord2f[0]); loadmodel->brushq3.data_texcoordtexture2f[i * 2 + 1] = LittleFloat(in->texcoord2f[1]); loadmodel->brushq3.data_texcoordlightmap2f[i * 2 + 0] = LittleFloat(in->lightmap2f[0]); @@ -4405,44 +4340,137 @@ static void Mod_Q3BSP_LoadTriangles(lump_t *l) } } -static void Mod_Q3BSP_LoadLightmaps(lump_t *l) +static void Mod_Q3BSP_LoadLightmaps(lump_t *l, lump_t *faceslump) { q3dlightmap_t *in; - rtexture_t **out; - int i, count; + int i, j, count, power, power2, mask, endlightmap, mergewidth, mergeheight; + unsigned char *c; if (!l->filelen) return; + if (cls.state == ca_dedicated) + return; in = (q3dlightmap_t *)(mod_base + l->fileofs); if (l->filelen % sizeof(*in)) Host_Error("Mod_Q3BSP_LoadLightmaps: funny lump size in %s",loadmodel->name); count = l->filelen / sizeof(*in); - out = (rtexture_t **)Mem_Alloc(loadmodel->mempool, count * sizeof(*out)); + loadmodel->brushq3.num_originallightmaps = count; + + // now check the surfaces to see if any of them index an odd numbered + // lightmap, if so this is not a deluxemapped bsp file + // + // also check what lightmaps are actually used, because q3map2 sometimes + // (always?) makes an unused one at the end, which + // q3map2 sometimes (or always?) makes a second blank lightmap for no + // reason when only one lightmap is used, which can throw off the + // deluxemapping detection method, so check 2-lightmap bsp's specifically + // to see if the second lightmap is blank, if so it is not deluxemapped. + loadmodel->brushq3.deluxemapping = !(count & 1); + loadmodel->brushq3.deluxemapping_modelspace = true; + endlightmap = 0; + if (loadmodel->brushq3.deluxemapping) + { + int facecount = faceslump->filelen / sizeof(q3dface_t); + q3dface_t *faces = (q3dface_t *)(mod_base + faceslump->fileofs); + for (i = 0;i < facecount;i++) + { + j = LittleLong(faces[i].lightmapindex); + if (j >= 0) + { + endlightmap = max(endlightmap, j + 1); + if ((j & 1) || j + 1 >= count) + { + loadmodel->brushq3.deluxemapping = false; + break; + } + } + } + } + if (endlightmap < 2) + loadmodel->brushq3.deluxemapping = false; - loadmodel->brushq3.data_lightmaps = out; - loadmodel->brushq3.num_lightmaps = count; + // q3map2 sometimes (or always?) makes a second blank lightmap for no + // reason when only one lightmap is used, which can throw off the + // deluxemapping detection method, so check 2-lightmap bsp's specifically + // to see if the second lightmap is blank, if so it is not deluxemapped. + if (endlightmap == 1 && count == 2) + { + c = in[1].rgb; + for (i = 0;i < 128*128*3;i++) + if (c[i]) + break; + if (i == 128*128*3) + { + // all pixels in the unused lightmap were black... + loadmodel->brushq3.deluxemapping = false; + } + } - loadmodel->brushq3.deluxemapping_modelspace = false; - for (i = 0;i < count;i++, in++, out++) + Con_DPrintf("%s is %sdeluxemapped\n", loadmodel->name, loadmodel->brushq3.deluxemapping ? "" : "not "); + + // figure out what the most reasonable merge power is within limits + loadmodel->brushq3.num_lightmapmergepower = 0; + for (power = 1;power <= mod_q3bsp_lightmapmergepower.integer && (128 << power) <= gl_max_texture_size && (1 << (power * 2)) < 4 * (count >> loadmodel->brushq3.deluxemapping);power++) + loadmodel->brushq3.num_lightmapmergepower = power; + loadmodel->brushq3.num_lightmapmerge = 1 << loadmodel->brushq3.num_lightmapmergepower; + + loadmodel->brushq3.num_mergedlightmaps = ((count >> loadmodel->brushq3.deluxemapping) + (1 << (loadmodel->brushq3.num_lightmapmergepower * 2)) - 1) >> (loadmodel->brushq3.num_lightmapmergepower * 2); + loadmodel->brushq3.data_lightmaps = (rtexture_t **)Mem_Alloc(loadmodel->mempool, loadmodel->brushq3.num_mergedlightmaps * sizeof(rtexture_t *)); + if (loadmodel->brushq3.deluxemapping) + loadmodel->brushq3.data_deluxemaps = (rtexture_t **)Mem_Alloc(loadmodel->mempool, loadmodel->brushq3.num_mergedlightmaps * sizeof(rtexture_t *)); + + // allocate a texture pool if we need it + if (loadmodel->texturepool == NULL && cls.state != ca_dedicated) + loadmodel->texturepool = R_AllocTexturePool(); + + if (loadmodel->brushq3.num_lightmapmergepower > 0) { - // if this may be a deluxemap, check if it's in modelspace or not - if ((i & 1) && !loadmodel->brushq3.deluxemapping_modelspace) + power = loadmodel->brushq3.num_lightmapmergepower; + power2 = power * 2; + mask = (1 << power) - 1; + for (i = 0;i < count;i++) { - int j; - unsigned char *b = in->rgb; - for (j = 2;j < 128*128*3;j += 3) + // figure out which merged lightmap texture this fits into + int lightmapindex = i >> (loadmodel->brushq3.deluxemapping + power2); + // if the lightmap has not been allocated yet, create it + if (!loadmodel->brushq3.data_lightmaps[lightmapindex]) { - // if this is definitely negative Z, it is not facing outward, - // and thus must be in modelspace, as negative Z would never - // occur in tangentspace - if (b[j] < 120) - { - loadmodel->brushq3.deluxemapping_modelspace = true; - break; - } + // create a lightmap only as large as necessary to hold the + // remaining 128x128 blocks + // if there are multiple merged lightmap textures then they will + // all be full size except the last one which may be smaller + // because it only needs to the remaining blocks, and it will often + // be odd sizes like 2048x512 due to only being 25% full or so. + j = (count >> loadmodel->brushq3.deluxemapping) - (lightmapindex << power2); + for (mergewidth = 1;mergewidth < j && mergewidth < (1 << power);mergewidth *= 2) + ; + for (mergeheight = 1;mergewidth*mergeheight < j && mergeheight < (1 << power);mergeheight *= 2) + ; + Con_DPrintf("lightmap merge texture #%i is %ix%i (%i of %i used)\n", lightmapindex, mergewidth*128, mergeheight*128, min(j, mergewidth*mergeheight), mergewidth*mergeheight); + loadmodel->brushq3.data_lightmaps[lightmapindex] = R_LoadTexture2D(loadmodel->texturepool, va("lightmap%04i", lightmapindex), mergewidth * 128, mergeheight * 128, NULL, TEXTYPE_RGB, TEXF_FORCELINEAR | TEXF_PRECACHE, NULL); + if (loadmodel->brushq3.data_deluxemaps) + loadmodel->brushq3.data_deluxemaps[lightmapindex] = R_LoadTexture2D(loadmodel->texturepool, va("deluxemap%04i", lightmapindex), mergewidth * 128, mergeheight * 128, NULL, TEXTYPE_RGB, TEXF_FORCELINEAR | TEXF_PRECACHE, NULL); } + mergewidth = R_TextureWidth(loadmodel->brushq3.data_lightmaps[lightmapindex]) / 128; + mergeheight = R_TextureHeight(loadmodel->brushq3.data_lightmaps[lightmapindex]) / 128; + j = (i >> loadmodel->brushq3.deluxemapping) & ((1 << power2) - 1); + if (loadmodel->brushq3.deluxemapping && (i & 1)) + R_UpdateTexture(loadmodel->brushq3.data_deluxemaps[lightmapindex], in[i].rgb, (j % mergewidth) * 128, (j / mergewidth) * 128, 128, 128); + else + R_UpdateTexture(loadmodel->brushq3.data_lightmaps [lightmapindex], in[i].rgb, (j % mergewidth) * 128, (j / mergewidth) * 128, 128, 128); + } + } + else + { + for (i = 0;i < count;i++) + { + // figure out which merged lightmap texture this fits into + int lightmapindex = i >> loadmodel->brushq3.deluxemapping; + if (loadmodel->brushq3.deluxemapping && (i & 1)) + loadmodel->brushq3.data_deluxemaps[lightmapindex] = R_LoadTexture2D(loadmodel->texturepool, va("deluxemap%04i", lightmapindex), 128, 128, in[i].rgb, TEXTYPE_RGB, TEXF_FORCELINEAR | TEXF_PRECACHE, NULL); + else + loadmodel->brushq3.data_lightmaps[lightmapindex] = R_LoadTexture2D(loadmodel->texturepool, va("lightmap%04i", lightmapindex), 128, 128, in[i].rgb, TEXTYPE_RGB, TEXF_FORCELINEAR | TEXF_PRECACHE, NULL); } - *out = R_LoadTexture2D(loadmodel->texturepool, va("lightmap%04i", i), 128, 128, in->rgb, TEXTYPE_RGB, TEXF_FORCELINEAR | TEXF_PRECACHE, NULL); } } @@ -4451,12 +4479,13 @@ 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; + float lightmaptcbase[2], lightmaptcscale[2]; //int *originalelement3i; //int *originalneighbor3i; float *originalvertex3f; //float *originalsvector3f; //float *originaltvector3f; - //float *originalnormal3f; + float *originalnormal3f; float *originalcolor4f; float *originaltexcoordtexture2f; float *originaltexcoordlightmap2f; @@ -4471,29 +4500,6 @@ static void Mod_Q3BSP_LoadFaces(lump_t *l) loadmodel->data_surfaces = out; loadmodel->num_surfaces = count; - // deluxemapped q3bsp files have an even number of lightmaps, and surfaces - // always index even numbered ones (0, 2, 4, ...), the odd numbered - // lightmaps are the deluxemaps (light direction textures), so if we - // encounter any odd numbered lightmaps it is not a deluxemapped bsp, it - // is also not a deluxemapped bsp if it has an odd number of lightmaps or - // less than 2 - loadmodel->brushq3.deluxemapping = true; - if (loadmodel->brushq3.num_lightmaps >= 2 && !(loadmodel->brushq3.num_lightmaps & 1)) - { - for (i = 0;i < count;i++) - { - n = LittleLong(in[i].lightmapindex); - if (n >= 0 && ((n & 1) || n + 1 >= loadmodel->brushq3.num_lightmaps)) - { - loadmodel->brushq3.deluxemapping = false; - break; - } - } - } - else - loadmodel->brushq3.deluxemapping = false; - Con_DPrintf("%s is %sdeluxemapped\n", loadmodel->name, loadmodel->brushq3.deluxemapping ? "" : "not "); - i = 0; oldi = i; oldin = in; @@ -4531,26 +4537,25 @@ static void Mod_Q3BSP_LoadFaces(lump_t *l) out->effect = NULL; else out->effect = loadmodel->brushq3.data_effects + n; - n = LittleLong(in->lightmapindex); - if (n >= loadmodel->brushq3.num_lightmaps) - { - Con_Printf("Mod_Q3BSP_LoadFaces: face #%i (texture \"%s\"): invalid lightmapindex %i (%i lightmaps)\n", i, out->texture->name, n, loadmodel->brushq3.num_lightmaps); - n = -1; - } - else if (n < 0) - n = -1; - if (n == -1) + + if (cls.state != ca_dedicated) { out->lightmaptexture = NULL; out->deluxemaptexture = r_texture_blanknormalmap; - } - else - { - out->lightmaptexture = loadmodel->brushq3.data_lightmaps[n]; - if (loadmodel->brushq3.deluxemapping) - out->deluxemaptexture = loadmodel->brushq3.data_lightmaps[n+1]; + n = LittleLong(in->lightmapindex); + if (n < 0) + n = -1; + else if (n >= loadmodel->brushq3.num_originallightmaps) + { + Con_Printf("Mod_Q3BSP_LoadFaces: face #%i (texture \"%s\"): invalid lightmapindex %i (%i lightmaps)\n", i, out->texture->name, n, loadmodel->brushq3.num_originallightmaps); + n = -1; + } else - out->deluxemaptexture = r_texture_blanknormalmap; + { + out->lightmaptexture = loadmodel->brushq3.data_lightmaps[n >> (loadmodel->brushq3.num_lightmapmergepower * 2 + loadmodel->brushq3.deluxemapping)]; + if (loadmodel->brushq3.deluxemapping) + out->deluxemaptexture = loadmodel->brushq3.data_deluxemaps[n >> (loadmodel->brushq3.num_lightmapmergepower * 2 + loadmodel->brushq3.deluxemapping)]; + } } firstvertex = LittleLong(in->firstvertex); @@ -4641,12 +4646,15 @@ static void Mod_Q3BSP_LoadFaces(lump_t *l) { case Q3FACETYPE_POLYGON: case Q3FACETYPE_MESH: - // no processing necessary + // no processing necessary, except for lightmap merging for (j = 0;j < out->num_vertices;j++) { (loadmodel->surfmesh.data_vertex3f + 3 * out->num_firstvertex)[j * 3 + 0] = loadmodel->brushq3.data_vertex3f[(firstvertex + j) * 3 + 0]; (loadmodel->surfmesh.data_vertex3f + 3 * out->num_firstvertex)[j * 3 + 1] = loadmodel->brushq3.data_vertex3f[(firstvertex + j) * 3 + 1]; (loadmodel->surfmesh.data_vertex3f + 3 * out->num_firstvertex)[j * 3 + 2] = loadmodel->brushq3.data_vertex3f[(firstvertex + j) * 3 + 2]; + (loadmodel->surfmesh.data_normal3f + 3 * out->num_firstvertex)[j * 3 + 0] = loadmodel->brushq3.data_normal3f[(firstvertex + j) * 3 + 0]; + (loadmodel->surfmesh.data_normal3f + 3 * out->num_firstvertex)[j * 3 + 1] = loadmodel->brushq3.data_normal3f[(firstvertex + j) * 3 + 1]; + (loadmodel->surfmesh.data_normal3f + 3 * out->num_firstvertex)[j * 3 + 2] = loadmodel->brushq3.data_normal3f[(firstvertex + j) * 3 + 2]; (loadmodel->surfmesh.data_texcoordtexture2f + 2 * out->num_firstvertex)[j * 2 + 0] = loadmodel->brushq3.data_texcoordtexture2f[(firstvertex + j) * 2 + 0]; (loadmodel->surfmesh.data_texcoordtexture2f + 2 * out->num_firstvertex)[j * 2 + 1] = loadmodel->brushq3.data_texcoordtexture2f[(firstvertex + j) * 2 + 1]; (loadmodel->surfmesh.data_texcoordlightmap2f + 2 * out->num_firstvertex)[j * 2 + 0] = loadmodel->brushq3.data_texcoordlightmap2f[(firstvertex + j) * 2 + 0]; @@ -4663,6 +4671,7 @@ static void Mod_Q3BSP_LoadFaces(lump_t *l) patchsize[0] = LittleLong(in->specific.patch.patchsize[0]); patchsize[1] = LittleLong(in->specific.patch.patchsize[1]); originalvertex3f = loadmodel->brushq3.data_vertex3f + firstvertex * 3; + originalnormal3f = loadmodel->brushq3.data_normal3f + firstvertex * 3; originaltexcoordtexture2f = loadmodel->brushq3.data_texcoordtexture2f + firstvertex * 2; originaltexcoordlightmap2f = loadmodel->brushq3.data_texcoordlightmap2f + firstvertex * 2; originalcolor4f = loadmodel->brushq3.data_color4f + firstvertex * 4; @@ -4691,6 +4700,7 @@ static void Mod_Q3BSP_LoadFaces(lump_t *l) // generate geometry // (note: normals are skipped because they get recalculated) Q3PatchTesselateFloat(3, sizeof(float[3]), (loadmodel->surfmesh.data_vertex3f + 3 * out->num_firstvertex), patchsize[0], patchsize[1], sizeof(float[3]), originalvertex3f, xtess, ytess); + Q3PatchTesselateFloat(3, sizeof(float[3]), (loadmodel->surfmesh.data_normal3f + 3 * out->num_firstvertex), patchsize[0], patchsize[1], sizeof(float[3]), originalnormal3f, xtess, ytess); Q3PatchTesselateFloat(2, sizeof(float[2]), (loadmodel->surfmesh.data_texcoordtexture2f + 2 * out->num_firstvertex), patchsize[0], patchsize[1], sizeof(float[2]), originaltexcoordtexture2f, xtess, ytess); Q3PatchTesselateFloat(2, sizeof(float[2]), (loadmodel->surfmesh.data_texcoordlightmap2f + 2 * out->num_firstvertex), patchsize[0], patchsize[1], sizeof(float[2]), originaltexcoordlightmap2f, xtess, ytess); Q3PatchTesselateFloat(4, sizeof(float[4]), (loadmodel->surfmesh.data_lightmapcolor4f + 4 * out->num_firstvertex), patchsize[0], patchsize[1], sizeof(float[4]), originalcolor4f, xtess, ytess); @@ -4761,13 +4771,29 @@ static void Mod_Q3BSP_LoadFaces(lump_t *l) } Con_Print("\n"); } - // for per pixel lighting - Mod_BuildTextureVectorsAndNormals(out->num_firstvertex, out->num_vertices, out->num_triangles, loadmodel->surfmesh.data_vertex3f, loadmodel->surfmesh.data_texcoordtexture2f, (loadmodel->surfmesh.data_element3i + 3 * out->num_firsttriangle), loadmodel->surfmesh.data_svector3f, loadmodel->surfmesh.data_tvector3f, loadmodel->surfmesh.data_normal3f, true); // calculate a bounding box VectorClear(out->mins); VectorClear(out->maxs); if (out->num_vertices) { + if (cls.state != ca_dedicated && out->lightmaptexture) + { + // figure out which part of the merged lightmap this fits into + int lightmapindex = LittleLong(in->lightmapindex) >> loadmodel->brushq3.deluxemapping; + int mergewidth = R_TextureWidth(out->lightmaptexture) / 128; + int mergeheight = R_TextureHeight(out->lightmaptexture) / 128; + lightmapindex &= mergewidth * mergeheight - 1; + lightmaptcscale[0] = 1.0f / mergewidth; + lightmaptcscale[1] = 1.0f / mergeheight; + lightmaptcbase[0] = (lightmapindex % mergewidth) * lightmaptcscale[0]; + lightmaptcbase[1] = (lightmapindex / mergewidth) * lightmaptcscale[1]; + // modify the lightmap texcoords to match this region of the merged lightmap + for (j = 0, v = loadmodel->surfmesh.data_texcoordlightmap2f + 2 * out->num_firstvertex;j < out->num_vertices;j++, v += 2) + { + v[0] = v[0] * lightmaptcscale[0] + lightmaptcbase[0]; + v[1] = v[1] * lightmaptcscale[1] + lightmaptcbase[1]; + } + } VectorCopy((loadmodel->surfmesh.data_vertex3f + 3 * out->num_firstvertex), out->mins); VectorCopy((loadmodel->surfmesh.data_vertex3f + 3 * out->num_firstvertex), out->maxs); for (j = 1, v = (loadmodel->surfmesh.data_vertex3f + 3 * out->num_firstvertex) + 3;j < out->num_vertices;j++, v += 3) @@ -4793,16 +4819,22 @@ static void Mod_Q3BSP_LoadFaces(lump_t *l) //out->lightmapinfo->styles[3] = 255; } + // 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); + // free the no longer needed vertex data loadmodel->brushq3.num_vertices = 0; - Mem_Free(loadmodel->brushq3.data_vertex3f); + if (loadmodel->brushq3.data_vertex3f) + Mem_Free(loadmodel->brushq3.data_vertex3f); loadmodel->brushq3.data_vertex3f = NULL; + loadmodel->brushq3.data_normal3f = NULL; loadmodel->brushq3.data_texcoordtexture2f = NULL; loadmodel->brushq3.data_texcoordlightmap2f = NULL; loadmodel->brushq3.data_color4f = NULL; // free the no longer needed triangle data loadmodel->brushq3.num_triangles = 0; - Mem_Free(loadmodel->brushq3.data_element3i); + if (loadmodel->brushq3.data_element3i) + Mem_Free(loadmodel->brushq3.data_element3i); loadmodel->brushq3.data_element3i = NULL; } @@ -4996,12 +5028,12 @@ static void Mod_Q3BSP_LoadLightGrid(lump_t *l) loadmodel->brushq3.num_lightgrid_scale[0] = 1.0f / loadmodel->brushq3.num_lightgrid_cellsize[0]; loadmodel->brushq3.num_lightgrid_scale[1] = 1.0f / loadmodel->brushq3.num_lightgrid_cellsize[1]; loadmodel->brushq3.num_lightgrid_scale[2] = 1.0f / loadmodel->brushq3.num_lightgrid_cellsize[2]; - loadmodel->brushq3.num_lightgrid_imins[0] = ceil(loadmodel->brushq3.data_models->mins[0] * loadmodel->brushq3.num_lightgrid_scale[0]); - loadmodel->brushq3.num_lightgrid_imins[1] = ceil(loadmodel->brushq3.data_models->mins[1] * loadmodel->brushq3.num_lightgrid_scale[1]); - loadmodel->brushq3.num_lightgrid_imins[2] = ceil(loadmodel->brushq3.data_models->mins[2] * loadmodel->brushq3.num_lightgrid_scale[2]); - loadmodel->brushq3.num_lightgrid_imaxs[0] = floor(loadmodel->brushq3.data_models->maxs[0] * loadmodel->brushq3.num_lightgrid_scale[0]); - loadmodel->brushq3.num_lightgrid_imaxs[1] = floor(loadmodel->brushq3.data_models->maxs[1] * loadmodel->brushq3.num_lightgrid_scale[1]); - loadmodel->brushq3.num_lightgrid_imaxs[2] = floor(loadmodel->brushq3.data_models->maxs[2] * loadmodel->brushq3.num_lightgrid_scale[2]); + loadmodel->brushq3.num_lightgrid_imins[0] = (int)ceil(loadmodel->brushq3.data_models->mins[0] * loadmodel->brushq3.num_lightgrid_scale[0]); + loadmodel->brushq3.num_lightgrid_imins[1] = (int)ceil(loadmodel->brushq3.data_models->mins[1] * loadmodel->brushq3.num_lightgrid_scale[1]); + loadmodel->brushq3.num_lightgrid_imins[2] = (int)ceil(loadmodel->brushq3.data_models->mins[2] * loadmodel->brushq3.num_lightgrid_scale[2]); + loadmodel->brushq3.num_lightgrid_imaxs[0] = (int)floor(loadmodel->brushq3.data_models->maxs[0] * loadmodel->brushq3.num_lightgrid_scale[0]); + loadmodel->brushq3.num_lightgrid_imaxs[1] = (int)floor(loadmodel->brushq3.data_models->maxs[1] * loadmodel->brushq3.num_lightgrid_scale[1]); + loadmodel->brushq3.num_lightgrid_imaxs[2] = (int)floor(loadmodel->brushq3.data_models->maxs[2] * loadmodel->brushq3.num_lightgrid_scale[2]); loadmodel->brushq3.num_lightgrid_isize[0] = loadmodel->brushq3.num_lightgrid_imaxs[0] - loadmodel->brushq3.num_lightgrid_imins[0] + 1; loadmodel->brushq3.num_lightgrid_isize[1] = loadmodel->brushq3.num_lightgrid_imaxs[1] - loadmodel->brushq3.num_lightgrid_imins[1] + 1; loadmodel->brushq3.num_lightgrid_isize[2] = loadmodel->brushq3.num_lightgrid_imaxs[2] - loadmodel->brushq3.num_lightgrid_imins[2] + 1; @@ -5013,9 +5045,9 @@ static void Mod_Q3BSP_LoadLightGrid(lump_t *l) if (l->filelen) { if (l->filelen < count * (int)sizeof(*in)) - Host_Error("Mod_Q3BSP_LoadLightGrid: invalid lightgrid lump size %i bytes, should be %i bytes (%ix%ix%i)", l->filelen, count * sizeof(*in), loadmodel->brushq3.num_lightgrid_dimensions[0], loadmodel->brushq3.num_lightgrid_dimensions[1], loadmodel->brushq3.num_lightgrid_dimensions[2]); + Host_Error("Mod_Q3BSP_LoadLightGrid: invalid lightgrid lump size %i bytes, should be %i bytes (%ix%ix%i)", l->filelen, (int)(count * sizeof(*in)), loadmodel->brushq3.num_lightgrid_dimensions[0], loadmodel->brushq3.num_lightgrid_dimensions[1], loadmodel->brushq3.num_lightgrid_dimensions[2]); if (l->filelen != count * (int)sizeof(*in)) - Con_Printf("Mod_Q3BSP_LoadLightGrid: Warning: calculated lightgrid size %i bytes does not match lump size %i", count * sizeof(*in), l->filelen); + Con_Printf("Mod_Q3BSP_LoadLightGrid: Warning: calculated lightgrid size %i bytes does not match lump size %i\n", (int)(count * sizeof(*in)), l->filelen); out = (q3dlightgrid_t *)Mem_Alloc(loadmodel->mempool, count * sizeof(*out)); loadmodel->brushq3.data_lightgrid = out; loadmodel->brushq3.num_lightgrid = count; @@ -5056,7 +5088,7 @@ static void Mod_Q3BSP_LoadPVS(lump_t *l) Host_Error("Mod_Q3BSP_LoadPVS: (chainlength = %i) < ((numclusters = %i) + 7) / 8", loadmodel->brush.num_pvsclusterbytes, loadmodel->brush.num_pvsclusters); totalchains = loadmodel->brush.num_pvsclusterbytes * loadmodel->brush.num_pvsclusters; if (l->filelen < totalchains + (int)sizeof(*in)) - Host_Error("Mod_Q3BSP_LoadPVS: lump too small ((numclusters = %i) * (chainlength = %i) + sizeof(q3dpvs_t) == %i bytes, lump is %i bytes)", loadmodel->brush.num_pvsclusters, loadmodel->brush.num_pvsclusterbytes, totalchains + sizeof(*in), l->filelen); + Host_Error("Mod_Q3BSP_LoadPVS: lump too small ((numclusters = %i) * (chainlength = %i) + sizeof(q3dpvs_t) == %i bytes, lump is %i bytes)", loadmodel->brush.num_pvsclusters, loadmodel->brush.num_pvsclusterbytes, (int)(totalchains + sizeof(*in)), l->filelen); loadmodel->brush.data_pvsclusters = (unsigned char *)Mem_Alloc(loadmodel->mempool, totalchains); memcpy(loadmodel->brush.data_pvsclusters, (unsigned char *)(in + 1), totalchains); @@ -5065,15 +5097,20 @@ static void Mod_Q3BSP_LoadPVS(lump_t *l) static void Mod_Q3BSP_LightPoint(model_t *model, const vec3_t p, vec3_t ambientcolor, vec3_t diffusecolor, vec3_t diffusenormal) { int i, j, k, index[3]; - float transformed[3], blend1, blend2, blend, yaw, pitch, sinpitch; + float transformed[3], blend1, blend2, blend, stylescale; q3dlightgrid_t *a, *s; + + // scale lighting by lightstyle[0] so that darkmode in dpmod works properly + stylescale = r_refdef.lightstylevalue[0] * (1.0f / 264.0f); + if (!model->brushq3.num_lightgrid) { - ambientcolor[0] = 1; - ambientcolor[1] = 1; - ambientcolor[2] = 1; + ambientcolor[0] = stylescale; + ambientcolor[1] = stylescale; + ambientcolor[2] = stylescale; return; } + Matrix4x4_Transform(&model->brushq3.num_lightgrid_indexfromworld, p, transformed); //Matrix4x4_Print(&model->brushq3.num_lightgrid_indexfromworld); //Con_Printf("%f %f %f transformed %f %f %f clamped ", p[0], p[1], p[2], transformed[0], transformed[1], transformed[2]); @@ -5084,6 +5121,7 @@ static void Mod_Q3BSP_LightPoint(model_t *model, const vec3_t p, vec3_t ambientc index[1] = (int)floor(transformed[1]); index[2] = (int)floor(transformed[2]); //Con_Printf("%f %f %f index %i %i %i:\n", transformed[0], transformed[1], transformed[2], index[0], index[1], index[2]); + // now lerp the values VectorClear(diffusenormal); a = &model->brushq3.data_lightgrid[(index[2] * model->brushq3.num_lightgrid_isize[1] + index[1]) * model->brushq3.num_lightgrid_isize[0] + index[0]]; @@ -5099,22 +5137,24 @@ static void Mod_Q3BSP_LightPoint(model_t *model, const vec3_t p, vec3_t ambientc continue; for (i = 0;i < 2;i++) { - blend = blend2 * (i ? (transformed[0] - index[0]) : (1 - (transformed[0] - index[0]))); + blend = blend2 * (i ? (transformed[0] - index[0]) : (1 - (transformed[0] - index[0]))) * stylescale; if (blend < 0.001f || index[0] + i >= model->brushq3.num_lightgrid_isize[0]) continue; s = a + (k * model->brushq3.num_lightgrid_isize[1] + j) * model->brushq3.num_lightgrid_isize[0] + i; VectorMA(ambientcolor, blend * (1.0f / 128.0f), s->ambientrgb, ambientcolor); VectorMA(diffusecolor, blend * (1.0f / 128.0f), s->diffusergb, diffusecolor); - pitch = s->diffusepitch * M_PI / 128; - yaw = s->diffuseyaw * M_PI / 128; - sinpitch = sin(pitch); - diffusenormal[0] += blend * (cos(yaw) * sinpitch); - diffusenormal[1] += blend * (sin(yaw) * sinpitch); - diffusenormal[2] += blend * (cos(pitch)); + // this uses the mod_md3_sin table because the values are + // already in the 0-255 range, the 64+ bias fetches a cosine + // instead of a sine value + diffusenormal[0] += blend * (mod_md3_sin[64 + s->diffuseyaw] * mod_md3_sin[s->diffusepitch]); + diffusenormal[1] += blend * (mod_md3_sin[ s->diffuseyaw] * mod_md3_sin[s->diffusepitch]); + diffusenormal[2] += blend * (mod_md3_sin[64 + s->diffusepitch]); //Con_Printf("blend %f: ambient %i %i %i, diffuse %i %i %i, diffusepitch %i diffuseyaw %i (%f %f, normal %f %f %f)\n", blend, s->ambientrgb[0], s->ambientrgb[1], s->ambientrgb[2], s->diffusergb[0], s->diffusergb[1], s->diffusergb[2], s->diffusepitch, s->diffuseyaw, pitch, yaw, (cos(yaw) * cospitch), (sin(yaw) * cospitch), (-sin(pitch))); } } } + + // normalize the light direction before turning VectorNormalize(diffusenormal); //Con_Printf("result: ambient %f %f %f diffuse %f %f %f diffusenormal %f %f %f\n", ambientcolor[0], ambientcolor[1], ambientcolor[2], diffusecolor[0], diffusecolor[1], diffusecolor[2], diffusenormal[0], diffusenormal[1], diffusenormal[2]); } @@ -5152,6 +5192,9 @@ static void Mod_Q3BSP_TraceLine_RecursiveBSPNode(trace_t *trace, model_t *model, // walk the tree until we hit a leaf, recursing for any split cases while (node->plane) { + // abort if this part of the bsp tree can not be hit by this trace +// if (!(node->combinedsupercontents & trace->hitsupercontentsmask)) +// return; plane = node->plane; // axial planes are much more common than non-axial, so an optimized // axial case pays off here @@ -5188,6 +5231,9 @@ static void Mod_Q3BSP_TraceLine_RecursiveBSPNode(trace_t *trace, model_t *model, return; } } + // abort if this part of the bsp tree can not be hit by this trace +// if (!(node->combinedsupercontents & trace->hitsupercontentsmask)) +// return; // hit a leaf nodesegmentmins[0] = min(start[0], end[0]) - 1; nodesegmentmins[1] = min(start[1], end[1]) - 1; @@ -5207,7 +5253,7 @@ static void Mod_Q3BSP_TraceLine_RecursiveBSPNode(trace_t *trace, model_t *model, } } // can't do point traces on curves (they have no thickness) - if (mod_q3bsp_curves_collisions.integer && !VectorCompare(start, end)) + if (leaf->containscollisionsurfaces && mod_q3bsp_curves_collisions.integer && !VectorCompare(start, end)) { // line trace the curves for (i = 0;i < leaf->numleafsurfaces;i++) @@ -5234,6 +5280,9 @@ static void Mod_Q3BSP_TraceBrush_RecursiveBSPNode(trace_t *trace, model_t *model // walk the tree until we hit a leaf, recursing for any split cases while (node->plane) { + // abort if this part of the bsp tree can not be hit by this trace +// if (!(node->combinedsupercontents & trace->hitsupercontentsmask)) +// return; plane = node->plane; // axial planes are much more common than non-axial, so an optimized // axial case pays off here @@ -5266,6 +5315,9 @@ static void Mod_Q3BSP_TraceBrush_RecursiveBSPNode(trace_t *trace, model_t *model // take whichever side the segment box is on node = node->children[sides - 1]; } + // abort if this part of the bsp tree can not be hit by this trace +// if (!(node->combinedsupercontents & trace->hitsupercontentsmask)) +// return; nodesegmentmins[0] = max(segmentmins[0], node->mins[0] - 1); nodesegmentmins[1] = max(segmentmins[1], node->mins[1] - 1); nodesegmentmins[2] = max(segmentmins[2], node->mins[2] - 1); @@ -5283,7 +5335,7 @@ static void Mod_Q3BSP_TraceBrush_RecursiveBSPNode(trace_t *trace, model_t *model Collision_TraceBrushBrushFloat(trace, thisbrush_start, thisbrush_end, brush, brush); } } - if (mod_q3bsp_curves_collisions.integer) + if (leaf->containscollisionsurfaces && mod_q3bsp_curves_collisions.integer) { for (i = 0;i < leaf->numleafsurfaces;i++) { @@ -5468,6 +5520,7 @@ void Mod_Q3BSP_Load(model_t *mod, void *buffer, void *bufferend) mod->soundfromcenter = true; mod->TraceBox = Mod_Q3BSP_TraceBox; + mod->brush.TraceLineOfSight = Mod_Q1BSP_TraceLineOfSight; mod->brush.SuperContentsFromNativeContents = Mod_Q3BSP_SuperContentsFromNativeContents; mod->brush.NativeContentsFromSuperContents = Mod_Q3BSP_NativeContentsFromSuperContents; mod->brush.GetPVS = Mod_Q1BSP_GetPVS; @@ -5480,6 +5533,7 @@ void Mod_Q3BSP_Load(model_t *mod, void *buffer, void *bufferend) mod->brush.FindNonSolidLocation = Mod_Q1BSP_FindNonSolidLocation; mod->brush.PointInLeaf = Mod_Q1BSP_PointInLeaf; mod->Draw = R_Q1BSP_Draw; + mod->DrawDepth = R_Q1BSP_DrawDepth; mod->GetLightInfo = R_Q1BSP_GetLightInfo; mod->CompileShadowVolume = R_Q1BSP_CompileShadowVolume; mod->DrawShadowVolume = R_Q1BSP_DrawShadowVolume; @@ -5516,7 +5570,7 @@ void Mod_Q3BSP_Load(model_t *mod, void *buffer, void *bufferend) Mod_Q3BSP_LoadEffects(&header->lumps[Q3LUMP_EFFECTS]); Mod_Q3BSP_LoadVertices(&header->lumps[Q3LUMP_VERTICES]); Mod_Q3BSP_LoadTriangles(&header->lumps[Q3LUMP_TRIANGLES]); - Mod_Q3BSP_LoadLightmaps(&header->lumps[Q3LUMP_LIGHTMAPS]); + Mod_Q3BSP_LoadLightmaps(&header->lumps[Q3LUMP_LIGHTMAPS], &header->lumps[Q3LUMP_FACES]); Mod_Q3BSP_LoadFaces(&header->lumps[Q3LUMP_FACES]); Mod_Q3BSP_LoadModels(&header->lumps[Q3LUMP_MODELS]); Mod_Q3BSP_LoadLeafBrushes(&header->lumps[Q3LUMP_LEAFBRUSHES]); @@ -5530,6 +5584,9 @@ void Mod_Q3BSP_Load(model_t *mod, void *buffer, void *bufferend) // the MakePortals code works fine on the q3bsp data as well Mod_Q1BSP_MakePortals(); + // FIXME: shader alpha should replace r_wateralpha support in q3bsp + loadmodel->brush.supportwateralpha = true; + // make a single combined shadow mesh to allow optimized shadow volume creation numshadowmeshtriangles = 0; for (j = 0, surface = loadmodel->data_surfaces;j < loadmodel->num_surfaces;j++, surface++) @@ -5541,7 +5598,7 @@ void Mod_Q3BSP_Load(model_t *mod, void *buffer, void *bufferend) for (j = 0, surface = loadmodel->data_surfaces;j < loadmodel->num_surfaces;j++, surface++) if (surface->num_triangles > 0) Mod_ShadowMesh_AddMesh(loadmodel->mempool, loadmodel->brush.shadowmesh, NULL, NULL, NULL, loadmodel->surfmesh.data_vertex3f, NULL, NULL, NULL, NULL, surface->num_triangles, (loadmodel->surfmesh.data_element3i + 3 * surface->num_firsttriangle)); - loadmodel->brush.shadowmesh = Mod_ShadowMesh_Finish(loadmodel->mempool, loadmodel->brush.shadowmesh, false, true); + loadmodel->brush.shadowmesh = Mod_ShadowMesh_Finish(loadmodel->mempool, loadmodel->brush.shadowmesh, false, true, false); Mod_BuildTriangleNeighbors(loadmodel->brush.shadowmesh->neighbor3i, loadmodel->brush.shadowmesh->element3i, loadmodel->brush.shadowmesh->numtriangles); loadmodel->brush.num_leafs = 0; @@ -5570,10 +5627,11 @@ void Mod_Q3BSP_Load(model_t *mod, void *buffer, void *bufferend) sprintf(name, "*%i", i); mod = Mod_FindName(name); *mod = *loadmodel; - strcpy(mod->name, name); + strlcpy(mod->name, name, sizeof(mod->name)); // textures and memory belong to the main model mod->texturepool = NULL; mod->mempool = NULL; + mod->brush.TraceLineOfSight = NULL; mod->brush.GetPVS = NULL; mod->brush.FatPVS = NULL; mod->brush.BoxTouchingPVS = NULL; @@ -5615,6 +5673,8 @@ void Mod_Q3BSP_Load(model_t *mod, void *buffer, void *bufferend) break; if (j < mod->nummodelsurfaces) mod->DrawSky = R_Q1BSP_DrawSky; + else + mod->DrawSky = NULL; } } @@ -5634,3 +5694,39 @@ void Mod_MAP_Load(model_t *mod, void *buffer, void *bufferend) Host_Error("Mod_MAP_Load: not yet implemented"); } +qboolean Mod_CanSeeBox_Trace(int numsamples, float t, model_t *model, vec3_t eye, vec3_t minsX, vec3_t maxsX) +{ + // we already have done PVS culling at this point... + // so we don't need to do it again. + + int i; + vec3_t testorigin, mins, maxs; + + testorigin[0] = (minsX[0] + maxsX[0]) * 0.5; + testorigin[1] = (minsX[1] + maxsX[1]) * 0.5; + testorigin[2] = (minsX[2] + maxsX[2]) * 0.5; + + if(model->brush.TraceLineOfSight(model, eye, testorigin)) + return 1; + + // expand the box a little + mins[0] = (t+1) * minsX[0] - t * maxsX[0]; + maxs[0] = (t+1) * maxsX[0] - t * minsX[0]; + mins[1] = (t+1) * minsX[1] - t * maxsX[1]; + maxs[1] = (t+1) * maxsX[1] - t * minsX[1]; + mins[2] = (t+1) * minsX[2] - t * maxsX[2]; + maxs[2] = (t+1) * maxsX[2] - t * minsX[2]; + + for(i = 0; i != numsamples; ++i) + { + testorigin[0] = lhrandom(mins[0], maxs[0]); + testorigin[1] = lhrandom(mins[1], maxs[1]); + testorigin[2] = lhrandom(mins[2], maxs[2]); + + if(model->brush.TraceLineOfSight(model, eye, testorigin)) + return 1; + } + + return 0; +} +