X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=gl_rsurf.c;h=ad2b93f350a95c224415e45eb38e719fe21eaf6f;hb=038ff8d79bb5044145cc2f87a8df1ce732209e4d;hp=7e7a3b93f8201aa75cd87f942134cac88b39c534;hpb=a705475ac0c27969d45c9db1e4330f59e448fbdd;p=xonotic%2Fdarkplaces.git diff --git a/gl_rsurf.c b/gl_rsurf.c index 7e7a3b93..ad2b93f3 100644 --- a/gl_rsurf.c +++ b/gl_rsurf.c @@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // r_surf.c: surface-related refresh code #include "quakedef.h" +#include "r_shadow.h" #define MAX_LIGHTMAP_SIZE 256 @@ -34,22 +35,17 @@ cvar_t r_dlightmap = {CVAR_SAVE, "r_dlightmap", "1"}; cvar_t r_drawportals = {0, "r_drawportals", "0"}; cvar_t r_testvis = {0, "r_testvis", "0"}; cvar_t r_floatbuildlightmap = {0, "r_floatbuildlightmap", "0"}; +cvar_t r_detailtextures = {CVAR_SAVE, "r_detailtextures", "1"}; +cvar_t r_surfaceworldnode = {0, "r_surfaceworldnode", "1"}; static int dlightdivtable[32768]; -static int R_IntAddDynamicLights (msurface_t *surf) +static int R_IntAddDynamicLights (const matrix4x4_t *matrix, msurface_t *surf) { - int sdtable[256], lnum, td, maxdist, maxdist2, maxdist3, i, s, t, smax, tmax, smax3, red, green, blue, lit, dist2, impacts, impactt, subtract; + int sdtable[256], lnum, td, maxdist, maxdist2, maxdist3, i, s, t, smax, tmax, smax3, red, green, blue, lit, dist2, impacts, impactt, subtract, k; unsigned int *bl; float dist, impact[3], local[3]; - // LordHavoc: use 64bit integer... shame it's not very standardized... -#if _MSC_VER || __BORLANDC__ - __int64 k; -#else - long long k; -#endif - lit = false; smax = (surf->extents[0] >> 4) + 1; @@ -61,7 +57,7 @@ static int R_IntAddDynamicLights (msurface_t *surf) if (!(surf->dlightbits[lnum >> 5] & (1 << (lnum & 31)))) continue; // not lit by this light - softwareuntransform(r_dlight[lnum].origin, local); + Matrix4x4_Transform(matrix, r_dlight[lnum].origin, local); dist = DotProduct (local, surf->plane->normal) - surf->plane->dist; // for comparisons to minimum acceptable light @@ -101,10 +97,10 @@ static int R_IntAddDynamicLights (msurface_t *surf) maxdist3 = maxdist - dist2; // convert to 8.8 blocklights format - red = r_dlight[lnum].light[0]; - green = r_dlight[lnum].light[1]; - blue = r_dlight[lnum].light[2]; - subtract = (int) (r_dlight[lnum].lightsubtract * 4194304.0f); + red = r_dlight[lnum].light[0] * (1.0f / 128.0f); + green = r_dlight[lnum].light[1] * (1.0f / 128.0f); + blue = r_dlight[lnum].light[2] * (1.0f / 128.0f); + subtract = (int) (r_dlight[lnum].subtract * 4194304.0f); bl = intblocklights; i = impactt; @@ -122,9 +118,9 @@ static int R_IntAddDynamicLights (msurface_t *surf) k = dlightdivtable[(sdtable[s] + td) >> 7] - subtract; if (k > 0) { - bl[0] += (red * k) >> 8; - bl[1] += (green * k) >> 8; - bl[2] += (blue * k) >> 8; + bl[0] += (red * k); + bl[1] += (green * k); + bl[2] += (blue * k); lit = true; } } @@ -138,7 +134,7 @@ static int R_IntAddDynamicLights (msurface_t *surf) return lit; } -static int R_FloatAddDynamicLights (msurface_t *surf) +static int R_FloatAddDynamicLights (const matrix4x4_t *matrix, msurface_t *surf) { int lnum, s, t, smax, tmax, smax3, lit, impacts, impactt; float sdtable[256], *bl, k, dist, dist2, maxdist, maxdist2, maxdist3, td1, td, red, green, blue, impact[3], local[3], subtract; @@ -154,7 +150,7 @@ static int R_FloatAddDynamicLights (msurface_t *surf) if (!(surf->dlightbits[lnum >> 5] & (1 << (lnum & 31)))) continue; // not lit by this light - softwareuntransform(r_dlight[lnum].origin, local); + Matrix4x4_Transform(matrix, r_dlight[lnum].origin, local); dist = DotProduct (local, surf->plane->normal) - surf->plane->dist; // for comparisons to minimum acceptable light @@ -197,7 +193,7 @@ static int R_FloatAddDynamicLights (msurface_t *surf) red = r_dlight[lnum].light[0]; green = r_dlight[lnum].light[1]; blue = r_dlight[lnum].light[2]; - subtract = r_dlight[lnum].lightsubtract * 16384.0f; + subtract = r_dlight[lnum].subtract * 32768.0f; bl = floatblocklights; td1 = impactt; @@ -212,7 +208,7 @@ static int R_FloatAddDynamicLights (msurface_t *surf) { if (sdtable[s] < maxdist2) { - k = (16384.0f / (sdtable[s] + td)) - subtract; + k = (32768.0f / (sdtable[s] + td)) - subtract; bl[0] += red * k; bl[1] += green * k; bl[2] += blue * k; @@ -235,7 +231,7 @@ R_BuildLightMap Combine and scale multiple lightmaps into the 8.8 format in blocklights =============== */ -static void R_BuildLightMap (msurface_t *surf, int dlightchanged) +static void R_BuildLightMap (const entity_render_t *ent, msurface_t *surf) { if (!r_floatbuildlightmap.integer) { @@ -245,12 +241,6 @@ static void R_BuildLightMap (msurface_t *surf, int dlightchanged) // update cached lighting info surf->cached_dlight = 0; - surf->cached_lightscalebit = lightscalebit; - surf->cached_ambient = r_ambient.value; - surf->cached_light[0] = d_lightstylevalue[surf->styles[0]]; - surf->cached_light[1] = d_lightstylevalue[surf->styles[1]]; - surf->cached_light[2] = d_lightstylevalue[surf->styles[2]]; - surf->cached_light[3] = d_lightstylevalue[surf->styles[3]]; smax = (surf->extents[0]>>4)+1; tmax = (surf->extents[1]>>4)+1; @@ -260,7 +250,7 @@ static void R_BuildLightMap (msurface_t *surf, int dlightchanged) // set to full bright if no light data bl = intblocklights; - if ((currentrenderentity->effects & EF_FULLBRIGHT) || !currentrenderentity->model->lightdata) + if ((ent->effects & EF_FULLBRIGHT) || !ent->model->lightdata) { for (i = 0;i < size3;i++) bl[i] = 255*256; @@ -279,11 +269,9 @@ static void R_BuildLightMap (msurface_t *surf, int dlightchanged) if (surf->dlightframe == r_framecount && r_dlightmap.integer) { - surf->cached_dlight = R_IntAddDynamicLights(surf); + surf->cached_dlight = R_IntAddDynamicLights(&ent->inversematrix, surf); if (surf->cached_dlight) c_light_polys++; - else if (dlightchanged) - return; // don't upload if only updating dlights and none mattered } // add all the lightmaps @@ -300,8 +288,8 @@ static void R_BuildLightMap (msurface_t *surf, int dlightchanged) bl = intblocklights; out = templight; // deal with lightmap brightness scale - shift = 7 + lightscalebit + 8; - if (currentrenderentity->model->lightmaprgba) + shift = 7 + r_lightmapscalebit + 8; + if (ent->model->lightmaprgba) { stride = (surf->lightmaptexturestride - smax) * 4; for (i = 0;i < tmax;i++, out += stride) @@ -339,12 +327,6 @@ static void R_BuildLightMap (msurface_t *surf, int dlightchanged) // update cached lighting info surf->cached_dlight = 0; - surf->cached_lightscalebit = lightscalebit; - surf->cached_ambient = r_ambient.value; - surf->cached_light[0] = d_lightstylevalue[surf->styles[0]]; - surf->cached_light[1] = d_lightstylevalue[surf->styles[1]]; - surf->cached_light[2] = d_lightstylevalue[surf->styles[2]]; - surf->cached_light[3] = d_lightstylevalue[surf->styles[3]]; smax = (surf->extents[0]>>4)+1; tmax = (surf->extents[1]>>4)+1; @@ -354,7 +336,7 @@ static void R_BuildLightMap (msurface_t *surf, int dlightchanged) // set to full bright if no light data bl = floatblocklights; - if ((currentrenderentity->effects & EF_FULLBRIGHT) || !currentrenderentity->model->lightdata) + if ((ent->effects & EF_FULLBRIGHT) || !ent->model->lightdata) j = 255*256; else j = r_ambient.value * 512.0f; // would be 128.0f logically, but using 512.0f to match winquake style @@ -370,11 +352,9 @@ static void R_BuildLightMap (msurface_t *surf, int dlightchanged) if (surf->dlightframe == r_framecount && r_dlightmap.integer) { - surf->cached_dlight = R_FloatAddDynamicLights(surf); + surf->cached_dlight = R_FloatAddDynamicLights(&ent->inversematrix, surf); if (surf->cached_dlight) c_light_polys++; - else if (dlightchanged) - return; // don't upload if only updating dlights and none mattered } // add all the lightmaps @@ -390,8 +370,8 @@ static void R_BuildLightMap (msurface_t *surf, int dlightchanged) bl = floatblocklights; out = templight; // deal with lightmap brightness scale - scale = 1.0f / (1 << (7 + lightscalebit + 8)); - if (currentrenderentity->model->lightmaprgba) + scale = 1.0f / (1 << (7 + r_lightmapscalebit + 8)); + if (ent->model->lightmaprgba) { stride = (surf->lightmaptexturestride - smax) * 4; for (i = 0;i < tmax;i++, out += stride) @@ -423,30 +403,16 @@ static void R_BuildLightMap (msurface_t *surf, int dlightchanged) } } -void R_StainNode (mnode_t *node, model_t *model, vec3_t origin, float radius, int icolor[8]) +void R_StainNode (mnode_t *node, model_t *model, const vec3_t origin, float radius, const float fcolor[8]) { - float ndist; + float ndist, a, ratio, maxdist, maxdist2, maxdist3, invradius, sdtable[256], td, dist2; msurface_t *surf, *endsurf; - int sdtable[256], td, maxdist, maxdist2, maxdist3, i, s, t, smax, tmax, smax3, dist2, impacts, impactt, subtract, a, stained, cr, cg, cb, ca, ratio; + int i, s, t, smax, tmax, smax3, impacts, impactt, stained; qbyte *bl; vec3_t impact; - // LordHavoc: use 64bit integer... shame it's not very standardized... -#if _MSC_VER || __BORLANDC__ - __int64 k; -#else - long long k; -#endif - - // for comparisons to minimum acceptable light - // compensate for 4096 offset - maxdist = radius * radius + 4096; - - // clamp radius to avoid exceeding 32768 entry division table - if (maxdist > 4194304) - maxdist = 4194304; - - subtract = (int) ((1.0f / maxdist) * 4194304.0f); + maxdist = radius * radius; + invradius = 1.0f / radius; loc0: if (node->contents < 0) @@ -464,89 +430,77 @@ loc0: } dist2 = ndist * ndist; - dist2 += 4096.0f; - if (dist2 < maxdist) - { - maxdist3 = maxdist - dist2; + maxdist3 = maxdist - dist2; - if (node->plane->type < 3) - { - VectorCopy(origin, impact); - impact[node->plane->type] -= ndist; - } - else - { - impact[0] = origin[0] - node->plane->normal[0] * ndist; - impact[1] = origin[1] - node->plane->normal[1] * ndist; - impact[2] = origin[2] - node->plane->normal[2] * ndist; - } + if (node->plane->type < 3) + { + VectorCopy(origin, impact); + impact[node->plane->type] -= ndist; + } + else + { + impact[0] = origin[0] - node->plane->normal[0] * ndist; + impact[1] = origin[1] - node->plane->normal[1] * ndist; + impact[2] = origin[2] - node->plane->normal[2] * ndist; + } - for (surf = model->surfaces + node->firstsurface, endsurf = surf + node->numsurfaces;surf < endsurf;surf++) + for (surf = model->surfaces + node->firstsurface, endsurf = surf + node->numsurfaces;surf < endsurf;surf++) + { + if (surf->stainsamples) { - if (surf->stainsamples) - { - smax = (surf->extents[0] >> 4) + 1; - tmax = (surf->extents[1] >> 4) + 1; + smax = (surf->extents[0] >> 4) + 1; + tmax = (surf->extents[1] >> 4) + 1; - impacts = DotProduct (impact, surf->texinfo->vecs[0]) + surf->texinfo->vecs[0][3] - surf->texturemins[0]; - impactt = DotProduct (impact, surf->texinfo->vecs[1]) + surf->texinfo->vecs[1][3] - surf->texturemins[1]; + impacts = DotProduct (impact, surf->texinfo->vecs[0]) + surf->texinfo->vecs[0][3] - surf->texturemins[0]; + impactt = DotProduct (impact, surf->texinfo->vecs[1]) + surf->texinfo->vecs[1][3] - surf->texturemins[1]; - s = bound(0, impacts, smax * 16) - impacts; - t = bound(0, impactt, tmax * 16) - impactt; - i = s * s + t * t + dist2; - if (i > maxdist) - continue; + s = bound(0, impacts, smax * 16) - impacts; + t = bound(0, impactt, tmax * 16) - impactt; + i = s * s + t * t + dist2; + if (i > maxdist) + continue; - // reduce calculations - for (s = 0, i = impacts; s < smax; s++, i -= 16) - sdtable[s] = i * i + dist2; + // reduce calculations + for (s = 0, i = impacts; s < smax; s++, i -= 16) + sdtable[s] = i * i + dist2; - // convert to 8.8 blocklights format - bl = surf->stainsamples; - smax3 = smax * 3; - stained = false; + bl = surf->stainsamples; + smax3 = smax * 3; + stained = false; - i = impactt; - for (t = 0;t < tmax;t++, i -= 16) + i = impactt; + for (t = 0;t < tmax;t++, i -= 16) + { + td = i * i; + // make sure some part of it is visible on this line + if (td < maxdist3) { - td = i * i; - // make sure some part of it is visible on this line - if (td < maxdist3) + maxdist2 = maxdist - td; + for (s = 0;s < smax;s++) { - maxdist2 = maxdist - td; - for (s = 0;s < smax;s++) + if (sdtable[s] < maxdist2) { - if (sdtable[s] < maxdist2) + ratio = lhrandom(0.0f, 1.0f); + a = (fcolor[3] + ratio * fcolor[7]) * (1.0f - sqrt(sdtable[s] + td) * invradius); + if (a >= (1.0f / 64.0f)) { - k = dlightdivtable[(sdtable[s] + td) >> 7] - subtract; - if (k > 0) - { - ratio = rand() & 255; - ca = (((icolor[7] - icolor[3]) * ratio) >> 8) + icolor[3]; - a = (ca * k) >> 8; - if (a > 0) - { - a = bound(0, a, 256); - cr = (((icolor[4] - icolor[0]) * ratio) >> 8) + icolor[0]; - cg = (((icolor[5] - icolor[1]) * ratio) >> 8) + icolor[1]; - cb = (((icolor[6] - icolor[2]) * ratio) >> 8) + icolor[2]; - bl[0] = (qbyte) ((((cr - (int) bl[0]) * a) >> 8) + (int) bl[0]); - bl[1] = (qbyte) ((((cg - (int) bl[1]) * a) >> 8) + (int) bl[1]); - bl[2] = (qbyte) ((((cb - (int) bl[2]) * a) >> 8) + (int) bl[2]); - stained = true; - } - } + if (a > 1) + a = 1; + bl[0] = (qbyte) ((float) bl[0] + a * ((fcolor[0] + ratio * fcolor[4]) - (float) bl[0])); + bl[1] = (qbyte) ((float) bl[1] + a * ((fcolor[1] + ratio * fcolor[5]) - (float) bl[1])); + bl[2] = (qbyte) ((float) bl[2] + a * ((fcolor[2] + ratio * fcolor[6]) - (float) bl[2])); + stained = true; } - bl += 3; } + bl += 3; } - else // skip line - bl += smax3; } - // force lightmap upload - if (stained) - surf->cached_dlight = true; + else // skip line + bl += smax3; } + // force lightmap upload + if (stained) + surf->cached_dlight = true; } } @@ -554,7 +508,7 @@ loc0: { if (node->children[1]->contents >= 0) { - R_StainNode(node->children[0], model, origin, radius, icolor); + R_StainNode(node->children[0], model, origin, radius, fcolor); node = node->children[1]; goto loc0; } @@ -571,24 +525,25 @@ loc0: } } -void R_Stain (vec3_t origin, float radius, int cr1, int cg1, int cb1, int ca1, int cr2, int cg2, int cb2, int ca2) +void R_Stain (const vec3_t origin, float radius, int cr1, int cg1, int cb1, int ca1, int cr2, int cg2, int cb2, int ca2) { - int n, icolor[8]; + int n; + float fcolor[8]; entity_render_t *ent; model_t *model; vec3_t org; - icolor[0] = cr1; - icolor[1] = cg1; - icolor[2] = cb1; - icolor[3] = ca1; - icolor[4] = cr2; - icolor[5] = cg2; - icolor[6] = cb2; - icolor[7] = ca2; - - model = cl.worldmodel; - softwaretransformidentity(); - R_StainNode(model->nodes + model->hulls[0].firstclipnode, model, origin, radius, icolor); + if (cl.worldmodel == NULL) + return; + fcolor[0] = cr1; + fcolor[1] = cg1; + fcolor[2] = cb1; + fcolor[3] = ca1 * (1.0f / 64.0f); + fcolor[4] = cr2 - cr1; + fcolor[5] = cg2 - cg1; + fcolor[6] = cb2 - cb1; + fcolor[7] = (ca2 - ca1) * (1.0f / 64.0f); + + R_StainNode(cl.worldmodel->nodes + cl.worldmodel->hulls[0].firstclipnode, cl.worldmodel, origin, radius, fcolor); // look for embedded bmodels for (n = 0;n < cl_num_brushmodel_entities;n++) @@ -600,9 +555,8 @@ void R_Stain (vec3_t origin, float radius, int cr1, int cg1, int cb1, int ca1, i Mod_CheckLoaded(model); if (model->type == mod_brush) { - softwaretransformforentity(ent); - softwareuntransform(origin, org); - R_StainNode(model->nodes + model->hulls[0].firstclipnode, model, org, radius, icolor); + Matrix4x4_Transform(&ent->inversematrix, origin, org); + R_StainNode(model->nodes + model->hulls[0].firstclipnode, model, org, radius, fcolor); } } } @@ -617,226 +571,128 @@ void R_Stain (vec3_t origin, float radius, int cr1, int cg1, int cb1, int ca1, i ============================================================= */ - -static float turbsin[256] = -{ - #include "gl_warp_sin.h" -}; -#define TURBSCALE (256.0 / (2 * M_PI)) - -// only need to hold as many verts as the mesh splitter will allow in model_brush.c -#define MAX_SURFVERTS 3072 -typedef struct +static void RSurf_AddLightmapToVertexColors_Color4f(const int *lightmapoffsets, float *c, int numverts, const qbyte *samples, int size3, const qbyte *styles) { - float v[4]; - float st[2]; - float uv[2]; - float c[4]; -} -surfvert_t; -static surfvert_t svert[MAX_SURFVERTS]; // used by the following functions - -static void RSurfShader_Sky(msurface_t *firstsurf) -{ - msurface_t *surf; int i; - float number, length, dir[3], speedscale; - surfvertex_t *v; - surfvert_t *sv; - surfmesh_t *mesh; - rmeshinfo_t m; - - // LordHavoc: HalfLife maps have freaky skypolys... - if (currentrenderentity->model->ishlbsp) - return; - - if (skyrendermasked) + float scale; + const qbyte *lm; + if (styles[0] != 255) { - if (skyrendernow) - { - skyrendernow = false; - R_Sky(); - } - for (surf = firstsurf;surf;surf = surf->chain) + for (i = 0;i < numverts;i++, c += 4) { - // draw depth-only polys - memset(&m, 0, sizeof(m)); - m.transparent = false; - m.blendfunc1 = GL_ZERO; - m.blendfunc2 = GL_ONE; - m.depthwrite = true; - for (mesh = surf->mesh;mesh;mesh = mesh->chain) + lm = samples + lightmapoffsets[i]; + scale = d_lightstylevalue[styles[0]] * (1.0f / 32768.0f); + VectorMA(c, scale, lm, c); + if (styles[1] != 255) { - m.numtriangles = mesh->numtriangles; - m.numverts = mesh->numverts; - m.index = mesh->index; - if (softwaretransform_complexity) - { - m.vertex = &svert[0].v[0]; - m.vertexstep = sizeof(surfvert_t); - for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++) - softwaretransform(v->v, sv->v); - } - else + lm += size3; + scale = d_lightstylevalue[styles[1]] * (1.0f / 32768.0f); + VectorMA(c, scale, lm, c); + if (styles[2] != 255) { - m.vertex = &mesh->vertex[0].v[0]; - m.vertexstep = sizeof(surfvertex_t); + lm += size3; + scale = d_lightstylevalue[styles[2]] * (1.0f / 32768.0f); + VectorMA(c, scale, lm, c); + if (styles[3] != 255) + { + lm += size3; + scale = d_lightstylevalue[styles[3]] * (1.0f / 32768.0f); + VectorMA(c, scale, lm, c); + } } - R_Mesh_Draw(&m); } } } - else if (skyrenderglquake) +} + +static void RSurf_FogColors_Vertex3f_Color4f(const float *v, float *c, float colorscale, int numverts, const float *modelorg) +{ + int i; + float diff[3], f; + if (fogenabled) { - for (surf = firstsurf;surf;surf = surf->chain) + for (i = 0;i < numverts;i++, v += 3, c += 4) { - memset(&m, 0, sizeof(m)); - m.transparent = false; - m.blendfunc1 = GL_ONE; - m.blendfunc2 = GL_ZERO; - m.vertex = &svert[0].v[0]; - m.vertexstep = sizeof(surfvert_t); - m.cr = 1; - m.cg = 1; - m.cb = 1; - m.ca = 1; - m.tex[0] = R_GetTexture(solidskytexture); - m.texcoords[0] = &svert[0].st[0]; - m.texcoordstep[0] = sizeof(surfvert_t); - speedscale = cl.time * (8.0/128.0); - speedscale -= (int)speedscale; - for (mesh = surf->mesh;mesh;mesh = mesh->chain) - { - m.numtriangles = mesh->numtriangles; - m.numverts = mesh->numverts; - m.index = mesh->index; - for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++) - { - softwaretransform(v->v, sv->v); - VectorSubtract (sv->v, r_origin, dir); - // flatten the sphere - dir[2] *= 3; - - number = DotProduct(dir, dir); - #if SLOWMATH - length = 3.0f / sqrt(number); - #else - *((int *)&length) = 0x5f3759df - ((* (int *) &number) >> 1); - length = 3.0f * (length * (1.5f - (number * 0.5f * length * length))); - #endif - - sv->st[0] = speedscale + dir[0] * length; - sv->st[1] = speedscale + dir[1] * length; - } - R_Mesh_Draw(&m); - } + VectorSubtract(v, modelorg, diff); + f = colorscale * (1 - exp(fogdensity/DotProduct(diff, diff))); + VectorScale(c, f, c); } } - else + else if (colorscale != 1) + for (i = 0;i < numverts;i++, c += 4) + VectorScale(c, colorscale, c); +} + +static void RSurf_FoggedColors_Vertex3f_Color4f(const float *v, float *c, float r, float g, float b, float a, float colorscale, int numverts, const float *modelorg) +{ + int i; + float diff[3], f; + r *= colorscale; + g *= colorscale; + b *= colorscale; + if (fogenabled) { - for (surf = firstsurf;surf;surf = surf->chain) + for (i = 0;i < numverts;i++, v += 3, c += 4) { - // flat color - memset(&m, 0, sizeof(m)); - m.transparent = false; - m.blendfunc1 = GL_ONE; - m.blendfunc2 = GL_ZERO; - m.cr = fogcolor[0]; - m.cg = fogcolor[1]; - m.cb = fogcolor[2]; - m.ca = 1; - for (mesh = surf->mesh;mesh;mesh = mesh->chain) - { - m.numtriangles = mesh->numtriangles; - m.numverts = mesh->numverts; - m.index = mesh->index; - if (softwaretransform_complexity) - { - m.vertex = &svert[0].v[0]; - m.vertexstep = sizeof(surfvert_t); - for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++) - softwaretransform(v->v, sv->v); - } - else - { - m.vertex = &mesh->vertex[0].v[0]; - m.vertexstep = sizeof(surfvertex_t); - } - R_Mesh_Draw(&m); - } + VectorSubtract(v, modelorg, diff); + f = 1 - exp(fogdensity/DotProduct(diff, diff)); + c[0] = r * f; + c[1] = g * f; + c[2] = b * f; + c[3] = a; } } - if (skyrenderglquake) + else { - for (surf = firstsurf;surf;surf = surf->chain) + for (i = 0;i < numverts;i++, c += 4) { - memset(&m, 0, sizeof(m)); - m.transparent = false; - m.blendfunc1 = GL_SRC_ALPHA; - m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA; - m.vertex = &svert[0].v[0]; - m.vertexstep = sizeof(surfvert_t); - m.cr = 1; - m.cg = 1; - m.cb = 1; - m.ca = 1; - m.tex[0] = R_GetTexture(alphaskytexture); - m.texcoords[0] = &svert[0].st[0]; - m.texcoordstep[0] = sizeof(surfvert_t); - speedscale = cl.time * (16.0/128.0); - speedscale -= (int)speedscale; - for (mesh = surf->mesh;mesh;mesh = mesh->chain) - { - m.numtriangles = mesh->numtriangles; - m.numverts = mesh->numverts; - m.index = mesh->index; - for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++) - { - softwaretransform(v->v, sv->v); - VectorSubtract (sv->v, r_origin, dir); - // flatten the sphere - dir[2] *= 3; - - number = DotProduct(dir, dir); - #if SLOWMATH - length = 3.0f / sqrt(number); - #else - *((int *)&length) = 0x5f3759df - ((* (int *) &number) >> 1); - length = 3.0f * (length * (1.5f - (number * 0.5f * length * length))); - #endif - - sv->st[0] = speedscale + dir[0] * length; - sv->st[1] = speedscale + dir[1] * length; - } - R_Mesh_Draw(&m); - } + c[0] = r; + c[1] = g; + c[2] = b; + c[3] = a; } } } -static int RSurf_Light(int *dlightbits, int numverts) +static void RSurf_FogPassColors_Vertex3f_Color4f(const float *v, float *c, float r, float g, float b, float a, float colorscale, int numverts, const float *modelorg) +{ + int i; + float diff[3], f; + r *= colorscale; + g *= colorscale; + b *= colorscale; + for (i = 0;i < numverts;i++, v += 3, c += 4) + { + VectorSubtract(v, modelorg, diff); + f = exp(fogdensity/DotProduct(diff, diff)); + c[0] = r; + c[1] = g; + c[2] = b; + c[3] = a * f; + } +} + +static int RSurf_LightSeparate_Vertex3f_Color4f(const matrix4x4_t *matrix, const int *dlightbits, int numverts, const float *vert, float *color, float scale) { - float f; - int i, l, lit = false; - rdlight_t *rd; - vec3_t lightorigin; - surfvert_t *sv; + float f; + const float *v; + float *c; + int i, l, lit = false; + const rdlight_t *rd; + vec3_t lightorigin; for (l = 0;l < r_numdlights;l++) { if (dlightbits[l >> 5] & (1 << (l & 31))) { rd = &r_dlight[l]; - // FIXME: support softwareuntransform here and make bmodels use hardware transform? - VectorCopy(rd->origin, lightorigin); - for (i = 0, sv = svert;i < numverts;i++, sv++) + Matrix4x4_Transform(matrix, rd->origin, lightorigin); + for (i = 0, v = vert, c = color;i < numverts;i++, v += 3, c += 4) { - f = VectorDistance2(sv->v, lightorigin) + LIGHTOFFSET; + f = VectorDistance2(v, lightorigin) + LIGHTOFFSET; if (f < rd->cullradius2) { - f = (1.0f / f) - rd->lightsubtract; - sv->c[0] += rd->light[0] * f; - sv->c[1] += rd->light[1] * f; - sv->c[2] += rd->light[2] * f; + f = ((1.0f / f) - rd->subtract) * scale; + VectorMA(c, f, rd->light, c); lit = true; } } @@ -845,1472 +701,1242 @@ static int RSurf_Light(int *dlightbits, int numverts) return lit; } -static void RSurfShader_Water_Pass_Base(msurface_t *surf) +// note: this untransforms lights to do the checking +static int RSurf_LightCheck(const matrix4x4_t *matrix, const int *dlightbits, const surfmesh_t *mesh) { - int i; - float diff[3], alpha, ifog; - surfvertex_t *v; - surfvert_t *sv; - surfmesh_t *mesh; - rmeshinfo_t m; - alpha = currentrenderentity->alpha * (surf->flags & SURF_DRAWNOALPHA ? 1 : r_wateralpha.value); + int i, l; + const rdlight_t *rd; + vec3_t lightorigin; + const float *v; + for (l = 0;l < r_numdlights;l++) + { + if (dlightbits[l >> 5] & (1 << (l & 31))) + { + rd = &r_dlight[l]; + Matrix4x4_Transform(matrix, rd->origin, lightorigin); + for (i = 0, v = mesh->vertex3f;i < mesh->numverts;i++, v += 3) + if (VectorDistance2(v, lightorigin) < rd->cullradius2) + return true; + } + } + return false; +} + +static void RSurfShader_Sky(const entity_render_t *ent, const texture_t *texture, msurface_t **surfchain) +{ + const msurface_t *surf; + const surfmesh_t *mesh; + rmeshstate_t m; + + // LordHavoc: HalfLife maps have freaky skypolys... + if (ent->model->ishlbsp) + return; + + if (skyrendernow) + { + skyrendernow = false; + if (skyrendermasked) + R_Sky(); + } + + R_Mesh_Matrix(&ent->matrix); + // draw depth-only polys memset(&m, 0, sizeof(m)); - if (alpha != 1 || surf->currenttexture->fogtexture != NULL) + if (skyrendermasked) { - m.transparent = true; - m.blendfunc1 = GL_SRC_ALPHA; - m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA; + qglColorMask(0,0,0,0); + // just to make sure that braindead drivers don't draw anything + // despite that colormask... + m.blendfunc1 = GL_ZERO; + m.blendfunc2 = GL_ONE; } else { - m.transparent = false; + // fog sky m.blendfunc1 = GL_ONE; m.blendfunc2 = GL_ZERO; } - m.vertex = &svert[0].v[0]; - m.vertexstep = sizeof(surfvert_t); - m.color = &svert[0].c[0]; - m.colorstep = sizeof(surfvert_t); - m.tex[0] = R_GetTexture(surf->currenttexture->texture); - m.texcoords[0] = &svert[0].st[0]; - m.texcoordstep[0] = sizeof(surfvert_t); - for (mesh = surf->mesh;mesh;mesh = mesh->chain) + m.depthwrite = true; + R_Mesh_State(&m); + while((surf = *surfchain++) != NULL) { - m.numtriangles = mesh->numtriangles; - m.numverts = mesh->numverts; - m.index = mesh->index; - for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++) - { - softwaretransform(v->v, sv->v); - if (r_waterripple.value) - sv->v[2] += r_waterripple.value * (1.0f / 64.0f) * turbsin[(int)((v->v[0]*(1.0f/32.0f)+cl.time) * TURBSCALE) & 255] * turbsin[(int)((v->v[1]*(1.0f/32.0f)+cl.time) * TURBSCALE) & 255]; - if (surf->flags & SURF_DRAWFULLBRIGHT) - { - sv->c[0] = 1; - sv->c[1] = 1; - sv->c[2] = 1; - sv->c[3] = alpha; - } - else - { - sv->c[0] = 0.5f; - sv->c[1] = 0.5f; - sv->c[2] = 0.5f; - sv->c[3] = alpha; - } - sv->st[0] = (v->st[0] + turbsin[(int)((v->st[1]*0.125f+cl.time) * TURBSCALE) & 255]) * (1.0f / 64.0f); - sv->st[1] = (v->st[1] + turbsin[(int)((v->st[0]*0.125f+cl.time) * TURBSCALE) & 255]) * (1.0f / 64.0f); - } - if (surf->dlightframe == r_framecount && !(surf->flags & SURF_DRAWFULLBRIGHT)) - RSurf_Light(surf->dlightbits, m.numverts); - if (fogenabled && (surf->flags & SURF_DRAWNOALPHA)) + if (surf->visframe == r_framecount) { - for (i = 0, sv = svert;i < m.numverts;i++, sv++) + for (mesh = surf->mesh;mesh;mesh = mesh->chain) { - VectorSubtract(sv->v, r_origin, diff); - ifog = 1 - exp(fogdensity/DotProduct(diff, diff)); - sv->c[0] *= ifog; - sv->c[1] *= ifog; - sv->c[2] *= ifog; + GL_Color(fogcolor[0] * r_colorscale, fogcolor[1] * r_colorscale, fogcolor[2] * r_colorscale, 1); + R_Mesh_GetSpace(mesh->numverts); + R_Mesh_CopyVertex3f(mesh->vertex3f, mesh->numverts); + R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->element3i); } } - R_Mesh_Draw(&m); } + qglColorMask(1,1,1,1); } -static void RSurfShader_Water_Pass_Glow(msurface_t *surf) +static void RSurfShader_Water_Callback(const void *calldata1, int calldata2) { int i; - float diff[3], alpha, ifog; - surfvertex_t *v; - surfvert_t *sv; - surfmesh_t *mesh; - rmeshinfo_t m; - alpha = currentrenderentity->alpha * (surf->flags & SURF_DRAWNOALPHA ? 1 : r_wateralpha.value); + const entity_render_t *ent = calldata1; + const msurface_t *surf = ent->model->surfaces + calldata2; + float f, colorscale, scroll[2], *v, *tc; + const surfmesh_t *mesh; + rmeshstate_t m; + float alpha; + float modelorg[3]; + texture_t *texture; + Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg); + + R_Mesh_Matrix(&ent->matrix); memset(&m, 0, sizeof(m)); - m.transparent = alpha != 1 || surf->currenttexture->fogtexture != NULL; - m.blendfunc1 = GL_SRC_ALPHA; - m.blendfunc2 = GL_ONE; - m.vertex = &svert[0].v[0]; - m.vertexstep = sizeof(surfvert_t); - m.cr = 1; - m.cg = 1; - m.cb = 1; - m.ca = alpha; - m.tex[0] = R_GetTexture(surf->currenttexture->glowtexture); - m.texcoords[0] = &svert[0].st[0]; - m.texcoordstep[0] = sizeof(surfvert_t); + texture = surf->texinfo->texture->currentframe; + alpha = texture->currentalpha; + if (texture->rendertype == SURFRENDER_ADD) + { + m.blendfunc1 = GL_SRC_ALPHA; + m.blendfunc2 = GL_ONE; + } + else if (texture->rendertype == SURFRENDER_ALPHA) + { + m.blendfunc1 = GL_SRC_ALPHA; + m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA; + } + else + { + m.blendfunc1 = GL_ONE; + m.blendfunc2 = GL_ZERO; + } + m.tex[0] = R_GetTexture(texture->skin.base); + colorscale = r_colorscale; + if (gl_combine.integer) + { + m.texrgbscale[0] = 4; + colorscale *= 0.25f; + } + R_Mesh_State(&m); + GL_UseColorArray(); for (mesh = surf->mesh;mesh;mesh = mesh->chain) { - m.numtriangles = mesh->numtriangles; - m.numverts = mesh->numverts; - m.index = mesh->index; - if (fogenabled) - { - m.color = &svert[0].c[0]; - m.colorstep = sizeof(surfvert_t); - for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++) - { - softwaretransform(v->v, sv->v); - if (r_waterripple.value) - sv->v[2] += r_waterripple.value * (1.0f / 64.0f) * turbsin[(int)((v->v[0]*(1.0f/32.0f)+cl.time) * TURBSCALE) & 255] * turbsin[(int)((v->v[1]*(1.0f/32.0f)+cl.time) * TURBSCALE) & 255]; - sv->st[0] = (v->st[0] + turbsin[(int)((v->st[1]*0.125f+cl.time) * TURBSCALE) & 255]) * (1.0f / 64.0f); - sv->st[1] = (v->st[1] + turbsin[(int)((v->st[0]*0.125f+cl.time) * TURBSCALE) & 255]) * (1.0f / 64.0f); - VectorSubtract(sv->v, r_origin, diff); - ifog = 1 - exp(fogdensity/DotProduct(diff, diff)); - sv->c[0] = m.cr * ifog; - sv->c[1] = m.cg * ifog; - sv->c[2] = m.cb * ifog; - sv->c[3] = m.ca; - } - } - else + R_Mesh_GetSpace(mesh->numverts); + R_Mesh_CopyVertex3f(mesh->vertex3f, mesh->numverts); + scroll[0] = sin(cl.time) * 0.125f; + scroll[1] = sin(cl.time * 0.8f) * 0.125f; + for (i = 0, v = varray_texcoord2f[0], tc = mesh->texcoordtexture2f;i < mesh->numverts;i++, v += 2, tc += 2) + { + v[0] = tc[0] + scroll[0]; + v[1] = tc[1] + scroll[1]; + } + f = surf->flags & SURF_DRAWFULLBRIGHT ? 1.0f : ((surf->flags & SURF_LIGHTMAP) ? 0 : 0.5f); + R_FillColors(varray_color4f, mesh->numverts, f, f, f, alpha); + if (!(surf->flags & SURF_DRAWFULLBRIGHT || ent->effects & EF_FULLBRIGHT)) + { + if (surf->dlightframe == r_framecount) + RSurf_LightSeparate_Vertex3f_Color4f(&ent->inversematrix, surf->dlightbits, mesh->numverts, mesh->vertex3f, varray_color4f, 1); + if (surf->flags & SURF_LIGHTMAP) + RSurf_AddLightmapToVertexColors_Color4f(mesh->lightmapoffsets, varray_color4f, mesh->numverts, surf->samples, ((surf->extents[0]>>4)+1)*((surf->extents[1]>>4)+1)*3, surf->styles); + } + RSurf_FogColors_Vertex3f_Color4f(mesh->vertex3f, varray_color4f, colorscale, mesh->numverts, modelorg); + R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->element3i); + } + + if (fogenabled) + { + memset(&m, 0, sizeof(m)); + m.blendfunc1 = GL_SRC_ALPHA; + m.blendfunc2 = GL_ONE; + m.tex[0] = R_GetTexture(texture->skin.fog); + R_Mesh_State(&m); + for (mesh = surf->mesh;mesh;mesh = mesh->chain) { - for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++) - { - softwaretransform(v->v, sv->v); - if (r_waterripple.value) - sv->v[2] += r_waterripple.value * (1.0f / 64.0f) * turbsin[(int)((v->v[0]*(1.0f/32.0f)+cl.time) * TURBSCALE) & 255] * turbsin[(int)((v->v[1]*(1.0f/32.0f)+cl.time) * TURBSCALE) & 255]; - sv->st[0] = (v->st[0] + turbsin[(int)((v->st[1]*0.125f+cl.time) * TURBSCALE) & 255]) * (1.0f / 64.0f); - sv->st[1] = (v->st[1] + turbsin[(int)((v->st[0]*0.125f+cl.time) * TURBSCALE) & 255]) * (1.0f / 64.0f); - } + R_Mesh_GetSpace(mesh->numverts); + R_Mesh_CopyVertex3f(mesh->vertex3f, mesh->numverts); + if (m.tex[0]) + R_Mesh_CopyTexCoord2f(0, mesh->texcoordtexture2f, mesh->numverts); + RSurf_FogPassColors_Vertex3f_Color4f(mesh->vertex3f, varray_color4f, fogcolor[0], fogcolor[1], fogcolor[2], alpha, r_colorscale, mesh->numverts, modelorg); + R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->element3i); } - R_Mesh_Draw(&m); } } -static void RSurfShader_Water_Pass_Fog(msurface_t *surf) +static void RSurfShader_Water(const entity_render_t *ent, const texture_t *texture, msurface_t **surfchain) { - int i; - float alpha; - surfvertex_t *v; - surfvert_t *sv; - surfmesh_t *mesh; - rmeshinfo_t m; - vec3_t diff; - alpha = currentrenderentity->alpha * (surf->flags & SURF_DRAWNOALPHA ? 1 : r_wateralpha.value); - - memset(&m, 0, sizeof(m)); - m.transparent = alpha != 1 || surf->currenttexture->fogtexture != NULL; - m.blendfunc1 = GL_SRC_ALPHA; - m.blendfunc2 = GL_ONE; - m.vertex = &svert[0].v[0]; - m.vertexstep = sizeof(surfvert_t); - m.color = &svert[0].c[0]; - m.colorstep = sizeof(surfvert_t); - m.tex[0] = R_GetTexture(surf->currenttexture->fogtexture); - m.texcoords[0] = &svert[0].st[0]; - m.texcoordstep[0] = sizeof(surfvert_t); - - for (mesh = surf->mesh;mesh;mesh = mesh->chain) + const msurface_t *surf; + msurface_t **chain; + vec3_t center; + if (texture->rendertype != SURFRENDER_OPAQUE) { - m.numtriangles = mesh->numtriangles; - m.numverts = mesh->numverts; - m.index = mesh->index; - for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++) + for (chain = surfchain;(surf = *chain) != NULL;chain++) { - softwaretransform(v->v, sv->v); - if (r_waterripple.value) - sv->v[2] += r_waterripple.value * (1.0f / 64.0f) * turbsin[(int)((v->v[0]*(1.0f/32.0f)+cl.time) * TURBSCALE) & 255] * turbsin[(int)((v->v[1]*(1.0f/32.0f)+cl.time) * TURBSCALE) & 255]; - if (m.tex[0]) + if (surf->visframe == r_framecount) { - sv->st[0] = (v->st[0] + turbsin[(int)((v->st[1]*0.125f+cl.time) * TURBSCALE) & 255]) * (1.0f / 64.0f); - sv->st[1] = (v->st[1] + turbsin[(int)((v->st[0]*0.125f+cl.time) * TURBSCALE) & 255]) * (1.0f / 64.0f); + Matrix4x4_Transform(&ent->matrix, surf->poly_center, center); + R_MeshQueue_AddTransparent(center, RSurfShader_Water_Callback, ent, surf - ent->model->surfaces); } - VectorSubtract(sv->v, r_origin, diff); - sv->c[0] = fogcolor[0]; - sv->c[1] = fogcolor[1]; - sv->c[2] = fogcolor[2]; - sv->c[3] = alpha * exp(fogdensity/DotProduct(diff, diff)); } - R_Mesh_Draw(&m); } + else + for (chain = surfchain;(surf = *chain) != NULL;chain++) + if (surf->visframe == r_framecount) + RSurfShader_Water_Callback(ent, surf - ent->model->surfaces); } -static void RSurfShader_Water(msurface_t *firstsurf) -{ - msurface_t *surf; - for (surf = firstsurf;surf;surf = surf->chain) - RSurfShader_Water_Pass_Base(surf); - for (surf = firstsurf;surf;surf = surf->chain) - if (surf->currenttexture->glowtexture) - RSurfShader_Water_Pass_Glow(surf); - if (fogenabled) - for (surf = firstsurf;surf;surf = surf->chain) - RSurfShader_Water_Pass_Fog(surf); -} - -static void RSurfShader_Wall_Pass_BaseMTex(msurface_t *surf) +static void RSurfShader_Wall_Pass_BaseVertex(const entity_render_t *ent, const msurface_t *surf, const texture_t *texture, int rendertype, float currentalpha) { - int i; - float diff[3], ifog; - surfvertex_t *v; - surfvert_t *sv; - surfmesh_t *mesh; - rmeshinfo_t m; - + float base, colorscale; + const surfmesh_t *mesh; + rmeshstate_t m; + float modelorg[3]; + Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg); memset(&m, 0, sizeof(m)); - if (currentrenderentity->effects & EF_ADDITIVE) + if (rendertype == SURFRENDER_ADD) { - m.transparent = true; m.blendfunc1 = GL_SRC_ALPHA; m.blendfunc2 = GL_ONE; } - else if (surf->currenttexture->fogtexture != NULL || currentrenderentity->alpha != 1) + else if (rendertype == SURFRENDER_ALPHA) { - m.transparent = true; m.blendfunc1 = GL_SRC_ALPHA; m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA; } else { - m.transparent = false; m.blendfunc1 = GL_ONE; m.blendfunc2 = GL_ZERO; } - m.cr = m.cg = m.cb = (float) (1 << lightscalebit); - m.ca = currentrenderentity->alpha; - m.tex[0] = R_GetTexture(surf->currenttexture->texture); - m.tex[1] = R_GetTexture(surf->lightmaptexture); - m.texcoordstep[0] = sizeof(surfvertex_t); - m.texcoordstep[1] = sizeof(surfvertex_t); + m.tex[0] = R_GetTexture(texture->skin.base); + colorscale = r_colorscale; + if (gl_combine.integer) + { + m.texrgbscale[0] = 4; + colorscale *= 0.25f; + } + base = ent->effects & EF_FULLBRIGHT ? 2.0f : r_ambient.value * (1.0f / 64.0f); + R_Mesh_State(&m); + GL_UseColorArray(); for (mesh = surf->mesh;mesh;mesh = mesh->chain) { - m.numtriangles = mesh->numtriangles; - m.numverts = mesh->numverts; - m.index = mesh->index; - m.texcoords[0] = &mesh->vertex->st[0]; - m.texcoords[1] = &mesh->vertex->uv[0]; - if (fogenabled) + R_Mesh_GetSpace(mesh->numverts); + R_Mesh_CopyVertex3f(mesh->vertex3f, mesh->numverts); + R_Mesh_CopyTexCoord2f(0, mesh->texcoordtexture2f, mesh->numverts); + R_FillColors(varray_color4f, mesh->numverts, base, base, base, currentalpha); + if (!(ent->effects & EF_FULLBRIGHT)) + { + if (surf->dlightframe == r_framecount) + RSurf_LightSeparate_Vertex3f_Color4f(&ent->inversematrix, surf->dlightbits, mesh->numverts, mesh->vertex3f, varray_color4f, 1); + if (surf->flags & SURF_LIGHTMAP) + RSurf_AddLightmapToVertexColors_Color4f(mesh->lightmapoffsets, varray_color4f, mesh->numverts, surf->samples, ((surf->extents[0]>>4)+1)*((surf->extents[1]>>4)+1)*3, surf->styles); + } + RSurf_FogColors_Vertex3f_Color4f(mesh->vertex3f, varray_color4f, colorscale, mesh->numverts, modelorg); + R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->element3i); + } +} + +static void RSurfShader_Wall_Pass_Glow(const entity_render_t *ent, const msurface_t *surf, const texture_t *texture, int rendertype, float currentalpha) +{ + const surfmesh_t *mesh; + rmeshstate_t m; + float modelorg[3]; + Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg); + memset(&m, 0, sizeof(m)); + m.blendfunc1 = GL_SRC_ALPHA; + m.blendfunc2 = GL_ONE; + m.tex[0] = R_GetTexture(texture->skin.glow); + R_Mesh_State(&m); + GL_UseColorArray(); + for (mesh = surf->mesh;mesh;mesh = mesh->chain) + { + R_Mesh_GetSpace(mesh->numverts); + R_Mesh_CopyVertex3f(mesh->vertex3f, mesh->numverts); + R_Mesh_CopyTexCoord2f(0, mesh->texcoordtexture2f, mesh->numverts); + RSurf_FoggedColors_Vertex3f_Color4f(mesh->vertex3f, varray_color4f, 1, 1, 1, currentalpha, r_colorscale, mesh->numverts, modelorg); + R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->element3i); + } +} + +static void RSurfShader_Wall_Pass_Fog(const entity_render_t *ent, const msurface_t *surf, const texture_t *texture, int rendertype, float currentalpha) +{ + const surfmesh_t *mesh; + rmeshstate_t m; + float modelorg[3]; + Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg); + memset(&m, 0, sizeof(m)); + m.blendfunc1 = GL_SRC_ALPHA; + m.blendfunc2 = GL_ONE; + m.tex[0] = R_GetTexture(texture->skin.fog); + R_Mesh_State(&m); + GL_UseColorArray(); + for (mesh = surf->mesh;mesh;mesh = mesh->chain) + { + R_Mesh_GetSpace(mesh->numverts); + R_Mesh_CopyVertex3f(mesh->vertex3f, mesh->numverts); + if (m.tex[0]) + R_Mesh_CopyTexCoord2f(0, mesh->texcoordtexture2f, mesh->numverts); + RSurf_FogPassColors_Vertex3f_Color4f(mesh->vertex3f, varray_color4f, fogcolor[0], fogcolor[1], fogcolor[2], currentalpha, r_colorscale, mesh->numverts, modelorg); + R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->element3i); + } +} + +static void RSurfShader_OpaqueWall_Pass_BaseTripleTexCombine(const entity_render_t *ent, const texture_t *texture, msurface_t **surfchain) +{ + const msurface_t *surf; + const surfmesh_t *mesh; + rmeshstate_t m; + int lightmaptexturenum; + float cl; + memset(&m, 0, sizeof(m)); + m.blendfunc1 = GL_ONE; + m.blendfunc2 = GL_ZERO; + m.tex[0] = R_GetTexture(texture->skin.base); + m.tex[1] = R_GetTexture((**surfchain).lightmaptexture); + m.tex[2] = R_GetTexture(texture->skin.detail); + m.texrgbscale[0] = 1; + m.texrgbscale[1] = 4; + m.texrgbscale[2] = 2; + R_Mesh_State(&m); + cl = (float) (1 << r_lightmapscalebit) * r_colorscale; + GL_Color(cl, cl, cl, 1); + while((surf = *surfchain++) != NULL) + { + if (surf->visframe == r_framecount) { - m.color = &svert[0].c[0]; - m.colorstep = sizeof(surfvert_t); - if (softwaretransform_complexity) + lightmaptexturenum = R_GetTexture(surf->lightmaptexture); + if (m.tex[1] != lightmaptexturenum) { - m.vertex = &svert[0].v[0]; - m.vertexstep = sizeof(surfvert_t); - for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++) - { - softwaretransform(v->v, sv->v); - VectorSubtract(sv->v, r_origin, diff); - ifog = 1 - exp(fogdensity/DotProduct(diff, diff)); - sv->c[0] = m.cr * ifog; - sv->c[1] = m.cg * ifog; - sv->c[2] = m.cb * ifog; - sv->c[3] = m.ca; - } + m.tex[1] = lightmaptexturenum; + R_Mesh_State(&m); } - else + for (mesh = surf->mesh;mesh;mesh = mesh->chain) { - m.vertex = &mesh->vertex->v[0]; - m.vertexstep = sizeof(surfvertex_t); - for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++) - { - VectorSubtract(v->v, r_origin, diff); - ifog = 1 - exp(fogdensity/DotProduct(diff, diff)); - sv->c[0] = m.cr * ifog; - sv->c[1] = m.cg * ifog; - sv->c[2] = m.cb * ifog; - sv->c[3] = m.ca; - } + R_Mesh_GetSpace(mesh->numverts); + R_Mesh_CopyVertex3f(mesh->vertex3f, mesh->numverts); + R_Mesh_CopyTexCoord2f(0, mesh->texcoordtexture2f, mesh->numverts); + R_Mesh_CopyTexCoord2f(1, mesh->texcoordlightmap2f, mesh->numverts); + R_Mesh_CopyTexCoord2f(2, mesh->texcoorddetail2f, mesh->numverts); + R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->element3i); } } - else + } +} + +static void RSurfShader_OpaqueWall_Pass_BaseDoubleTex(const entity_render_t *ent, const texture_t *texture, msurface_t **surfchain) +{ + const msurface_t *surf; + const surfmesh_t *mesh; + rmeshstate_t m; + int lightmaptexturenum; + memset(&m, 0, sizeof(m)); + m.blendfunc1 = GL_ONE; + m.blendfunc2 = GL_ZERO; + m.tex[0] = R_GetTexture(texture->skin.base); + m.tex[1] = R_GetTexture((**surfchain).lightmaptexture); + if (gl_combine.integer) + m.texrgbscale[1] = 4; + R_Mesh_State(&m); + GL_Color(r_colorscale, r_colorscale, r_colorscale, 1); + while((surf = *surfchain++) != NULL) + { + if (surf->visframe == r_framecount) { - if (softwaretransform_complexity) + lightmaptexturenum = R_GetTexture(surf->lightmaptexture); + if (m.tex[1] != lightmaptexturenum) { - m.vertex = &svert[0].v[0]; - m.vertexstep = sizeof(surfvert_t); - for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++) - softwaretransform(v->v, sv->v); + m.tex[1] = lightmaptexturenum; + R_Mesh_State(&m); } - else + for (mesh = surf->mesh;mesh;mesh = mesh->chain) { - m.vertex = &mesh->vertex->v[0]; - m.vertexstep = sizeof(surfvertex_t); + R_Mesh_GetSpace(mesh->numverts); + R_Mesh_CopyVertex3f(mesh->vertex3f, mesh->numverts); + R_Mesh_CopyTexCoord2f(0, mesh->texcoordtexture2f, mesh->numverts); + R_Mesh_CopyTexCoord2f(1, mesh->texcoordlightmap2f, mesh->numverts); + R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->element3i); } } - R_Mesh_Draw(&m); } } -static void RSurfShader_Wall_Pass_BaseTexture(msurface_t *surf) +static void RSurfShader_OpaqueWall_Pass_BaseTexture(const entity_render_t *ent, const texture_t *texture, msurface_t **surfchain) { - int i; - surfvertex_t *v; - surfvert_t *sv; - surfmesh_t *mesh; - rmeshinfo_t m; - + const msurface_t *surf; + const surfmesh_t *mesh; + rmeshstate_t m; memset(&m, 0, sizeof(m)); - m.transparent = false; m.blendfunc1 = GL_ONE; m.blendfunc2 = GL_ZERO; - m.cr = m.cg = m.cb = (float) (1 << v_overbrightbits.integer); - m.ca = 1; - m.tex[0] = R_GetTexture(surf->currenttexture->texture); - m.texcoordstep[0] = sizeof(surfvertex_t); - for (mesh = surf->mesh;mesh;mesh = mesh->chain) + m.tex[0] = R_GetTexture(texture->skin.base); + R_Mesh_State(&m); + GL_Color(1, 1, 1, 1); + while((surf = *surfchain++) != NULL) { - m.numtriangles = mesh->numtriangles; - m.numverts = mesh->numverts; - m.index = mesh->index; - m.texcoords[0] = &mesh->vertex->st[0]; - if (softwaretransform_complexity) - { - m.vertex = &svert[0].v[0]; - m.vertexstep = sizeof(surfvert_t); - for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++) - softwaretransform(v->v, sv->v); - } - else + if (surf->visframe == r_framecount) { - m.vertex = &mesh->vertex->v[0]; - m.vertexstep = sizeof(surfvertex_t); + for (mesh = surf->mesh;mesh;mesh = mesh->chain) + { + R_Mesh_GetSpace(mesh->numverts); + R_Mesh_CopyVertex3f(mesh->vertex3f, mesh->numverts); + R_Mesh_CopyTexCoord2f(0, mesh->texcoordtexture2f, mesh->numverts); + R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->element3i); + } } - R_Mesh_Draw(&m); } } -static void RSurfShader_Wall_Pass_BaseLightmap(msurface_t *surf) +static void RSurfShader_OpaqueWall_Pass_BaseLightmap(const entity_render_t *ent, const texture_t *texture, msurface_t **surfchain) { - int i; - float diff[3], ifog; - surfvertex_t *v; - surfvert_t *sv; - surfmesh_t *mesh; - rmeshinfo_t m; - + const msurface_t *surf; + const surfmesh_t *mesh; + rmeshstate_t m; + int lightmaptexturenum; memset(&m, 0, sizeof(m)); - m.transparent = false; m.blendfunc1 = GL_ZERO; m.blendfunc2 = GL_SRC_COLOR; - m.cr = m.cg = m.cb = (float) (1 << v_overbrightbits.integer); - m.ca = 1; - m.tex[0] = R_GetTexture(surf->lightmaptexture); - m.texcoordstep[0] = sizeof(surfvertex_t); - for (mesh = surf->mesh;mesh;mesh = mesh->chain) + m.tex[0] = R_GetTexture((**surfchain).lightmaptexture); + if (gl_combine.integer) + m.texrgbscale[0] = 4; + R_Mesh_State(&m); + GL_Color(r_colorscale, r_colorscale, r_colorscale, 1); + while((surf = *surfchain++) != NULL) { - m.numtriangles = mesh->numtriangles; - m.numverts = mesh->numverts; - m.index = mesh->index; - m.texcoords[0] = &mesh->vertex->uv[0]; - if (fogenabled) + if (surf->visframe == r_framecount) { - m.color = &svert[0].c[0]; - m.colorstep = sizeof(surfvert_t); - if (softwaretransform_complexity) + lightmaptexturenum = R_GetTexture(surf->lightmaptexture); + if (m.tex[0] != lightmaptexturenum) { - m.vertex = &svert[0].v[0]; - m.vertexstep = sizeof(surfvert_t); - for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++) - { - softwaretransform(v->v, sv->v); - VectorSubtract(sv->v, r_origin, diff); - ifog = 1 - exp(fogdensity/DotProduct(diff, diff)); - sv->c[0] = m.cr * ifog; - sv->c[1] = m.cg * ifog; - sv->c[2] = m.cb * ifog; - sv->c[3] = m.ca; - } + m.tex[0] = lightmaptexturenum; + R_Mesh_State(&m); } - else + for (mesh = surf->mesh;mesh;mesh = mesh->chain) { - m.vertex = &mesh->vertex->v[0]; - m.vertexstep = sizeof(surfvertex_t); - for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++) - { - VectorSubtract(v->v, r_origin, diff); - ifog = 1 - exp(fogdensity/DotProduct(diff, diff)); - sv->c[0] = m.cr * ifog; - sv->c[1] = m.cg * ifog; - sv->c[2] = m.cb * ifog; - sv->c[3] = m.ca; - } + R_Mesh_GetSpace(mesh->numverts); + R_Mesh_CopyVertex3f(mesh->vertex3f, mesh->numverts); + R_Mesh_CopyTexCoord2f(0, mesh->texcoordlightmap2f, mesh->numverts); + R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->element3i); } } - else - { - if (softwaretransform_complexity) - { - m.vertex = &svert[0].v[0]; - m.vertexstep = sizeof(surfvert_t); - for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++) - softwaretransform(v->v, sv->v); - } - else - { - m.vertex = &mesh->vertex->v[0]; - m.vertexstep = sizeof(surfvertex_t); - } - } - R_Mesh_Draw(&m); } } -static void RSurfShader_Wall_Pass_BaseVertex(msurface_t *surf) +static void RSurfShader_OpaqueWall_Pass_Light(const entity_render_t *ent, const texture_t *texture, msurface_t **surfchain) { - int i, size3; - float c[3], base[3], scale, diff[3], ifog; - surfvertex_t *v; - surfvert_t *sv; - surfmesh_t *mesh; - rmeshinfo_t m; - qbyte *lm; - - size3 = ((surf->extents[0]>>4)+1)*((surf->extents[1]>>4)+1)*3; - - base[0] = base[1] = base[2] = r_ambient.value * (1.0f / 128.0f); + const msurface_t *surf; + const surfmesh_t *mesh; + float colorscale; + rmeshstate_t m; memset(&m, 0, sizeof(m)); - if (currentrenderentity->effects & EF_ADDITIVE) - { - m.transparent = true; - m.blendfunc1 = GL_SRC_ALPHA; - m.blendfunc2 = GL_ONE; - } - else if (surf->currenttexture->fogtexture != NULL || currentrenderentity->alpha != 1) - { - m.transparent = true; - m.blendfunc1 = GL_SRC_ALPHA; - m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA; - } - else + m.blendfunc1 = GL_SRC_ALPHA; + m.blendfunc2 = GL_ONE; + m.tex[0] = R_GetTexture(texture->skin.base); + colorscale = r_colorscale; + if (gl_combine.integer) { - m.transparent = false; - m.blendfunc1 = GL_ONE; - m.blendfunc2 = GL_ZERO; + m.texrgbscale[0] = 4; + colorscale *= 0.25f; } - m.vertex = &svert[0].v[0]; - m.vertexstep = sizeof(surfvert_t); - m.color = &svert[0].c[0]; - m.colorstep = sizeof(surfvert_t); - m.tex[0] = R_GetTexture(surf->currenttexture->texture); - m.texcoordstep[0] = sizeof(surfvertex_t); - for (mesh = surf->mesh;mesh;mesh = mesh->chain) + R_Mesh_State(&m); + GL_UseColorArray(); + while((surf = *surfchain++) != NULL) { - m.numtriangles = mesh->numtriangles; - m.numverts = mesh->numverts; - m.index = mesh->index; - m.texcoords[0] = &mesh->vertex->st[0]; - for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++) + if (surf->visframe == r_framecount && surf->dlightframe == r_framecount) { - softwaretransform(v->v, sv->v); - VectorCopy(base, c); - if (surf->styles[0] != 255) + for (mesh = surf->mesh;mesh;mesh = mesh->chain) { - lm = surf->samples + v->lightmapoffset; - scale = d_lightstylevalue[surf->styles[0]] * (1.0f / 32768.0f); - VectorMA(c, scale, lm, c); - if (surf->styles[1] != 255) + if (RSurf_LightCheck(&ent->inversematrix, surf->dlightbits, mesh)) { - lm += size3; - scale = d_lightstylevalue[surf->styles[1]] * (1.0f / 32768.0f); - VectorMA(c, scale, lm, c); - if (surf->styles[2] != 255) - { - lm += size3; - scale = d_lightstylevalue[surf->styles[2]] * (1.0f / 32768.0f); - VectorMA(c, scale, lm, c); - if (surf->styles[3] != 255) - { - lm += size3; - scale = d_lightstylevalue[surf->styles[3]] * (1.0f / 32768.0f); - VectorMA(c, scale, lm, c); - } - } + R_Mesh_GetSpace(mesh->numverts); + R_Mesh_CopyVertex3f(mesh->vertex3f, mesh->numverts); + R_Mesh_CopyTexCoord2f(0, mesh->texcoordtexture2f, mesh->numverts); + R_FillColors(varray_color4f, mesh->numverts, 0, 0, 0, 1); + RSurf_LightSeparate_Vertex3f_Color4f(&ent->inversematrix, surf->dlightbits, mesh->numverts, mesh->vertex3f, varray_color4f, colorscale); + R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->element3i); } } - sv->c[0] = c[0]; - sv->c[1] = c[1]; - sv->c[2] = c[2]; - sv->c[3] = currentrenderentity->alpha; } - if (surf->dlightframe == r_framecount) - RSurf_Light(surf->dlightbits, m.numverts); - if (fogenabled) + } +} + +static void RSurfShader_OpaqueWall_Pass_Fog(const entity_render_t *ent, const texture_t *texture, msurface_t **surfchain) +{ + const msurface_t *surf; + const surfmesh_t *mesh; + rmeshstate_t m; + float modelorg[3]; + Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg); + memset(&m, 0, sizeof(m)); + m.blendfunc1 = GL_SRC_ALPHA; + m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA; + R_Mesh_State(&m); + GL_UseColorArray(); + while((surf = *surfchain++) != NULL) + { + if (surf->visframe == r_framecount) { - for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++) + for (mesh = surf->mesh;mesh;mesh = mesh->chain) { - VectorSubtract(sv->v, r_origin, diff); - ifog = 1 - exp(fogdensity/DotProduct(diff, diff)); - sv->c[0] *= ifog; - sv->c[1] *= ifog; - sv->c[2] *= ifog; + R_Mesh_GetSpace(mesh->numverts); + R_Mesh_CopyVertex3f(mesh->vertex3f, mesh->numverts); + if (m.tex[0]) + R_Mesh_CopyTexCoord2f(0, mesh->texcoordtexture2f, mesh->numverts); + RSurf_FogPassColors_Vertex3f_Color4f(mesh->vertex3f, varray_color4f, fogcolor[0], fogcolor[1], fogcolor[2], 1, r_colorscale, mesh->numverts, modelorg); + R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->element3i); } } - R_Mesh_Draw(&m); } } -static void RSurfShader_Wall_Pass_BaseFullbright(msurface_t *surf) +static void RSurfShader_OpaqueWall_Pass_BaseDetail(const entity_render_t *ent, const texture_t *texture, msurface_t **surfchain) { - int i; - float diff[3], ifog; - surfvertex_t *v; - surfvert_t *sv; - surfmesh_t *mesh; - rmeshinfo_t m; - + const msurface_t *surf; + const surfmesh_t *mesh; + rmeshstate_t m; memset(&m, 0, sizeof(m)); - if (currentrenderentity->effects & EF_ADDITIVE) - { - m.transparent = true; - m.blendfunc1 = GL_SRC_ALPHA; - m.blendfunc2 = GL_ONE; - } - else if (surf->currenttexture->fogtexture != NULL || currentrenderentity->alpha != 1) - { - m.transparent = true; - m.blendfunc1 = GL_SRC_ALPHA; - m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA; - } - else - { - m.transparent = false; - m.blendfunc1 = GL_ONE; - m.blendfunc2 = GL_ZERO; - } - m.vertex = &svert[0].v[0]; - m.vertexstep = sizeof(surfvert_t); - m.tex[0] = R_GetTexture(surf->currenttexture->texture); - m.texcoordstep[0] = sizeof(surfvertex_t); - for (mesh = surf->mesh;mesh;mesh = mesh->chain) + m.blendfunc1 = GL_DST_COLOR; + m.blendfunc2 = GL_SRC_COLOR; + m.tex[0] = R_GetTexture(texture->skin.detail); + R_Mesh_State(&m); + GL_Color(1, 1, 1, 1); + while((surf = *surfchain++) != NULL) { - m.numtriangles = mesh->numtriangles; - m.numverts = mesh->numverts; - m.index = mesh->index; - m.texcoords[0] = &mesh->vertex->st[0]; - if (fogenabled) + if (surf->visframe == r_framecount) { - m.color = &svert[0].c[0]; - m.colorstep = sizeof(surfvert_t); - for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++) + for (mesh = surf->mesh;mesh;mesh = mesh->chain) { - softwaretransform(v->v, sv->v); - VectorSubtract(sv->v, r_origin, diff); - ifog = 1 - exp(fogdensity/DotProduct(diff, diff)); - sv->c[0] = ifog; - sv->c[1] = ifog; - sv->c[2] = ifog; - sv->c[3] = currentrenderentity->alpha; + R_Mesh_GetSpace(mesh->numverts); + R_Mesh_CopyVertex3f(mesh->vertex3f, mesh->numverts); + R_Mesh_CopyTexCoord2f(0, mesh->texcoorddetail2f, mesh->numverts); + R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->element3i); } } - else - { - m.cr = m.cg = m.cb = 1; - m.ca = currentrenderentity->alpha; - for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++) - softwaretransform(v->v, sv->v); - } - R_Mesh_Draw(&m); } } -static void RSurfShader_Wall_Pass_Light(msurface_t *surf) +static void RSurfShader_OpaqueWall_Pass_Glow(const entity_render_t *ent, const texture_t *texture, msurface_t **surfchain) { - int i; - float diff[3], ifog; - surfvertex_t *v; - surfvert_t *sv; - surfmesh_t *mesh; - rmeshinfo_t m; - + const msurface_t *surf; + const surfmesh_t *mesh; + rmeshstate_t m; memset(&m, 0, sizeof(m)); - if (currentrenderentity->effects & EF_ADDITIVE) - m.transparent = true; - else if (surf->currenttexture->fogtexture != NULL || currentrenderentity->alpha != 1) - m.transparent = true; - else - m.transparent = false; m.blendfunc1 = GL_SRC_ALPHA; m.blendfunc2 = GL_ONE; - m.vertex = &svert[0].v[0]; - m.vertexstep = sizeof(surfvert_t); - m.color = &svert[0].c[0]; - m.colorstep = sizeof(surfvert_t); - m.tex[0] = R_GetTexture(surf->currenttexture->texture); - m.texcoordstep[0] = sizeof(surfvertex_t); - for (mesh = surf->mesh;mesh;mesh = mesh->chain) + m.tex[0] = R_GetTexture(texture->skin.glow); + R_Mesh_State(&m); + GL_Color(r_colorscale, r_colorscale, r_colorscale, 1); + while((surf = *surfchain++) != NULL) { - m.numtriangles = mesh->numtriangles; - m.numverts = mesh->numverts; - m.index = mesh->index; - m.texcoords[0] = &mesh->vertex->st[0]; - for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++) - { - softwaretransform(v->v, sv->v); - sv->c[0] = 0; - sv->c[1] = 0; - sv->c[2] = 0; - sv->c[3] = currentrenderentity->alpha; - } - if (RSurf_Light(surf->dlightbits, m.numverts)) + if (surf->visframe == r_framecount) { - if (fogenabled) + for (mesh = surf->mesh;mesh;mesh = mesh->chain) { - for (i = 0, sv = svert;i < m.numverts;i++, sv++) - { - VectorSubtract(sv->v, r_origin, diff); - ifog = 1 - exp(fogdensity/DotProduct(diff, diff)); - sv->c[0] *= ifog; - sv->c[1] *= ifog; - sv->c[2] *= ifog; - } + R_Mesh_GetSpace(mesh->numverts); + R_Mesh_CopyVertex3f(mesh->vertex3f, mesh->numverts); + R_Mesh_CopyTexCoord2f(0, mesh->texcoordtexture2f, mesh->numverts); + R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->element3i); } - R_Mesh_Draw(&m); } } } -static void RSurfShader_Wall_Pass_Glow(msurface_t *surf) +static void RSurfShader_OpaqueWall_Pass_OpaqueGlow(const entity_render_t *ent, const texture_t *texture, msurface_t **surfchain) { - int i; - float diff[3], ifog; - surfvertex_t *v; - surfvert_t *sv; - surfmesh_t *mesh; - rmeshinfo_t m; - + const msurface_t *surf; + const surfmesh_t *mesh; + rmeshstate_t m; memset(&m, 0, sizeof(m)); - if (currentrenderentity->effects & EF_ADDITIVE) - m.transparent = true; - else if (surf->currenttexture->fogtexture != NULL || currentrenderentity->alpha != 1) - m.transparent = true; - else - m.transparent = false; m.blendfunc1 = GL_SRC_ALPHA; - m.blendfunc2 = GL_ONE; - m.cr = 1; - m.cg = 1; - m.cb = 1; - m.ca = currentrenderentity->alpha; - m.tex[0] = R_GetTexture(surf->currenttexture->glowtexture); - m.texcoordstep[0] = sizeof(surfvertex_t); - for (mesh = surf->mesh;mesh;mesh = mesh->chain) + m.blendfunc2 = GL_ZERO; + m.tex[0] = R_GetTexture(texture->skin.glow); + R_Mesh_State(&m); + if (m.tex[0]) + GL_Color(r_colorscale, r_colorscale, r_colorscale, 1); + else + GL_Color(0, 0, 0, 1); + while((surf = *surfchain++) != NULL) { - m.numtriangles = mesh->numtriangles; - m.numverts = mesh->numverts; - m.index = mesh->index; - m.texcoords[0] = &mesh->vertex->st[0]; - if (fogenabled) + if (surf->visframe == r_framecount) { - m.color = &svert[0].c[0]; - m.colorstep = sizeof(surfvert_t); - if (softwaretransform_complexity) - { - m.vertex = &svert[0].v[0]; - m.vertexstep = sizeof(surfvert_t); - for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++) - { - softwaretransform(v->v, sv->v); - VectorSubtract(sv->v, r_origin, diff); - ifog = 1 - exp(fogdensity/DotProduct(diff, diff)); - sv->c[0] = m.cr * ifog; - sv->c[1] = m.cg * ifog; - sv->c[2] = m.cb * ifog; - sv->c[3] = m.ca; - } - } - else + for (mesh = surf->mesh;mesh;mesh = mesh->chain) { - m.vertex = &mesh->vertex->v[0]; - m.vertexstep = sizeof(surfvertex_t); - for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++) - { - VectorSubtract(v->v, r_origin, diff); - ifog = 1 - exp(fogdensity/DotProduct(diff, diff)); - sv->c[0] = m.cr * ifog; - sv->c[1] = m.cg * ifog; - sv->c[2] = m.cb * ifog; - sv->c[3] = m.ca; - } + R_Mesh_GetSpace(mesh->numverts); + R_Mesh_CopyVertex3f(mesh->vertex3f, mesh->numverts); + R_Mesh_CopyTexCoord2f(0, mesh->texcoordtexture2f, mesh->numverts); + R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->element3i); } } - else + } +} + +static void RSurfShader_Wall_Vertex_Callback(const void *calldata1, int calldata2) +{ + const entity_render_t *ent = calldata1; + const msurface_t *surf = ent->model->surfaces + calldata2; + int rendertype; + float currentalpha; + texture_t *texture; + R_Mesh_Matrix(&ent->matrix); + + texture = surf->texinfo->texture; + if (texture->animated) + texture = texture->anim_frames[ent->frame != 0][(texture->anim_total[ent->frame != 0] >= 2) ? ((int) (cl.time * 5.0f) % texture->anim_total[ent->frame != 0]) : 0]; + + currentalpha = ent->alpha; + if (texture->flags & SURF_WATERALPHA) + currentalpha *= r_wateralpha.value; + if (ent->effects & EF_ADDITIVE) + rendertype = SURFRENDER_ADD; + else if (currentalpha < 1 || texture->skin.fog != NULL) + rendertype = SURFRENDER_ALPHA; + else + rendertype = SURFRENDER_OPAQUE; + + RSurfShader_Wall_Pass_BaseVertex(ent, surf, texture, rendertype, currentalpha); + if (texture->skin.glow) + RSurfShader_Wall_Pass_Glow(ent, surf, texture, rendertype, currentalpha); + if (fogenabled) + RSurfShader_Wall_Pass_Fog(ent, surf, texture, rendertype, currentalpha); +} + +static void RSurfShader_Wall_Lightmap(const entity_render_t *ent, const texture_t *texture, msurface_t **surfchain) +{ + const msurface_t *surf; + msurface_t **chain; + vec3_t center; + if (texture->rendertype != SURFRENDER_OPAQUE) + { + // transparent vertex shaded from lightmap + for (chain = surfchain;(surf = *chain) != NULL;chain++) { - if (softwaretransform_complexity) + if (surf->visframe == r_framecount) { - m.vertex = &svert[0].v[0]; - m.vertexstep = sizeof(surfvert_t); - for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++) - softwaretransform(v->v, sv->v); + Matrix4x4_Transform(&ent->matrix, surf->poly_center, center); + R_MeshQueue_AddTransparent(center, RSurfShader_Wall_Vertex_Callback, ent, surf - ent->model->surfaces); } + } + } + else if (r_shadow_realtime_world.integer) + { + // opaque base lighting + RSurfShader_OpaqueWall_Pass_OpaqueGlow(ent, texture, surfchain); + if (fogenabled) + RSurfShader_OpaqueWall_Pass_Fog(ent, texture, surfchain); + } + else if (r_vertexsurfaces.integer) + { + // opaque vertex shaded from lightmap + for (chain = surfchain;(surf = *chain) != NULL;chain++) + if (surf->visframe == r_framecount) + RSurfShader_Wall_Pass_BaseVertex(ent, surf, texture, texture->rendertype, texture->currentalpha); + if (texture->skin.glow) + for (chain = surfchain;(surf = *chain) != NULL;chain++) + if (surf->visframe == r_framecount) + RSurfShader_Wall_Pass_Glow(ent, surf, texture, texture->rendertype, texture->currentalpha); + if (fogenabled) + for (chain = surfchain;(surf = *chain) != NULL;chain++) + if (surf->visframe == r_framecount) + RSurfShader_Wall_Pass_Fog(ent, surf, texture, texture->rendertype, texture->currentalpha); + } + else + { + // opaque lightmapped + if (r_textureunits.integer >= 2) + { + if (r_textureunits.integer >= 3 && gl_combine.integer && r_detailtextures.integer) + RSurfShader_OpaqueWall_Pass_BaseTripleTexCombine(ent, texture, surfchain); else { - m.vertex = &mesh->vertex->v[0]; - m.vertexstep = sizeof(surfvertex_t); + RSurfShader_OpaqueWall_Pass_BaseDoubleTex(ent, texture, surfchain); + if (r_detailtextures.integer) + RSurfShader_OpaqueWall_Pass_BaseDetail(ent, texture, surfchain); } } - R_Mesh_Draw(&m); + else + { + RSurfShader_OpaqueWall_Pass_BaseTexture(ent, texture, surfchain); + RSurfShader_OpaqueWall_Pass_BaseLightmap(ent, texture, surfchain); + if (r_detailtextures.integer) + RSurfShader_OpaqueWall_Pass_BaseDetail(ent, texture, surfchain); + } + if (!r_dlightmap.integer && !(ent->effects & EF_FULLBRIGHT)) + RSurfShader_OpaqueWall_Pass_Light(ent, texture, surfchain); + if (texture->skin.glow) + RSurfShader_OpaqueWall_Pass_Glow(ent, texture, surfchain); + if (fogenabled) + RSurfShader_OpaqueWall_Pass_Fog(ent, texture, surfchain); } } -static void RSurfShader_Wall_Pass_Fog(msurface_t *surf) +Cshader_t Cshader_wall_lightmap = {{NULL, RSurfShader_Wall_Lightmap}, SHADERFLAGS_NEEDLIGHTMAP}; +Cshader_t Cshader_water = {{NULL, RSurfShader_Water}, 0}; +Cshader_t Cshader_sky = {{RSurfShader_Sky, NULL}, 0}; + +int Cshader_count = 3; +Cshader_t *Cshaders[3] = { - int i; - surfvertex_t *v; - surfvert_t *sv; - rmeshinfo_t m; - surfmesh_t *mesh; - vec3_t diff; + &Cshader_wall_lightmap, + &Cshader_water, + &Cshader_sky +}; - memset(&m, 0, sizeof(m)); - if (currentrenderentity->effects & EF_ADDITIVE) - m.transparent = true; - else if (surf->currenttexture->fogtexture != NULL || currentrenderentity->alpha != 1) - m.transparent = true; +void R_UpdateTextureInfo(entity_render_t *ent) +{ + int i, texframe, alttextures; + texture_t *t; + + if (!ent->model) + return; + + alttextures = ent->frame != 0; + texframe = (int)(cl.time * 5.0f); + for (i = 0;i < ent->model->numtextures;i++) + { + t = ent->model->textures + i; + t->currentalpha = ent->alpha; + if (t->flags & SURF_WATERALPHA) + t->currentalpha *= r_wateralpha.value; + if (ent->effects & EF_ADDITIVE) + t->rendertype = SURFRENDER_ADD; + else if (t->currentalpha < 1 || t->skin.fog != NULL) + t->rendertype = SURFRENDER_ALPHA; + else + t->rendertype = SURFRENDER_OPAQUE; + // we don't need to set currentframe if t->animated is false because + // it was already set up by the texture loader for non-animating + if (t->animated) + t->currentframe = t->anim_frames[alttextures][(t->anim_total[alttextures] >= 2) ? (texframe % t->anim_total[alttextures]) : 0]; + } +} + +void R_PrepareSurfaces(entity_render_t *ent) +{ + int i, numsurfaces, *surfacevisframes; + model_t *model; + msurface_t *surf, *surfaces, **surfchain; + vec3_t modelorg; + + if (!ent->model) + return; + + model = ent->model; + Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg); + numsurfaces = model->nummodelsurfaces; + surfaces = model->surfaces + model->firstmodelsurface; + surfacevisframes = model->surfacevisframes + model->firstmodelsurface; + + R_UpdateTextureInfo(ent); + + if (r_dynamic.integer && !r_shadow_realtime_dlight.integer) + R_MarkLights(ent); + + if (model->light_ambient != r_ambient.value || model->light_scalebit != r_lightmapscalebit) + { + model->light_ambient = r_ambient.value; + model->light_scalebit = r_lightmapscalebit; + for (i = 0;i < model->nummodelsurfaces;i++) + model->surfaces[i + model->firstmodelsurface].cached_dlight = true; + } else - m.transparent = false; - m.blendfunc1 = GL_SRC_ALPHA; - m.blendfunc2 = GL_ONE; - m.color = &svert[0].c[0]; - m.colorstep = sizeof(surfvert_t); - m.tex[0] = R_GetTexture(surf->currenttexture->fogtexture); - m.texcoordstep[0] = sizeof(surfvertex_t); - for (mesh = surf->mesh;mesh;mesh = mesh->chain) { - m.numtriangles = mesh->numtriangles; - m.numverts = mesh->numverts; - m.index = mesh->index; - m.texcoords[0] = &mesh->vertex->st[0]; - if (softwaretransform_complexity) + for (i = 0;i < model->light_styles;i++) { - m.vertex = &svert[0].v[0]; - m.vertexstep = sizeof(surfvert_t); - for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++) + if (model->light_stylevalue[i] != d_lightstylevalue[model->light_style[i]]) { - softwaretransform(v->v, sv->v); - VectorSubtract(sv->v, r_origin, diff); - sv->c[0] = fogcolor[0]; - sv->c[1] = fogcolor[1]; - sv->c[2] = fogcolor[2]; - sv->c[3] = currentrenderentity->alpha * exp(fogdensity/DotProduct(diff,diff)); + model->light_stylevalue[i] = d_lightstylevalue[model->light_style[i]]; + for (surfchain = model->light_styleupdatechains[i];*surfchain;surfchain++) + (**surfchain).cached_dlight = true; } } - else + } + + for (i = 0, surf = surfaces;i < numsurfaces;i++, surf++) + { + if (surfacevisframes[i] == r_framecount) { - m.vertex = &mesh->vertex->v[0]; - m.vertexstep = sizeof(surfvertex_t); - for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++) +#if !WORLDNODECULLBACKFACES + // mark any backface surfaces as not visible + if (PlaneDist(modelorg, surf->plane) < surf->plane->dist) + { + if (!(surf->flags & SURF_PLANEBACK)) + surfacevisframes[i] = -1; + } + else + { + if ((surf->flags & SURF_PLANEBACK)) + surfacevisframes[i] = -1; + } + if (surfacevisframes[i] == r_framecount) +#endif { - VectorSubtract(v->v, r_origin, diff); - sv->c[0] = fogcolor[0]; - sv->c[1] = fogcolor[1]; - sv->c[2] = fogcolor[2]; - sv->c[3] = currentrenderentity->alpha * exp(fogdensity/DotProduct(diff,diff)); + c_faces++; + surf->visframe = r_framecount; + if (surf->cached_dlight && surf->lightmaptexture != NULL && !r_vertexsurfaces.integer) + R_BuildLightMap(ent, surf); } } - R_Mesh_Draw(&m); } } -static void RSurfShader_Wall_Fullbright(msurface_t *firstsurf) +void R_DrawSurfaces(entity_render_t *ent, int type, msurface_t ***chains) { - msurface_t *surf; - for (surf = firstsurf;surf;surf = surf->chain) - { - c_brush_polys++; - RSurfShader_Wall_Pass_BaseFullbright(surf); - } - for (surf = firstsurf;surf;surf = surf->chain) - if (surf->currenttexture->glowtexture) - RSurfShader_Wall_Pass_Glow(surf); - if (fogenabled) - for (surf = firstsurf;surf;surf = surf->chain) - RSurfShader_Wall_Pass_Fog(surf); + int i; + texture_t *t; + if (ent->model == NULL) + return; + R_Mesh_Matrix(&ent->matrix); + for (i = 0, t = ent->model->textures;i < ent->model->numtextures;i++, t++) + if (t->shader->shaderfunc[type] && t->currentframe && chains[i] != NULL) + t->shader->shaderfunc[type](ent, t->currentframe, chains[i]); } -static void RSurfShader_Wall_Vertex(msurface_t *firstsurf) +static void R_DrawPortal_Callback(const void *calldata1, int calldata2) { - msurface_t *surf; - for (surf = firstsurf;surf;surf = surf->chain) + int i; + float *v; + rmeshstate_t m; + const entity_render_t *ent = calldata1; + const mportal_t *portal = ent->model->portals + calldata2; + memset(&m, 0, sizeof(m)); + m.blendfunc1 = GL_SRC_ALPHA; + m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA; + R_Mesh_Matrix(&ent->matrix); + R_Mesh_State(&m); + R_Mesh_GetSpace(portal->numpoints); + i = portal - ent->model->portals; + GL_Color(((i & 0x0007) >> 0) * (1.0f / 7.0f) * r_colorscale, + ((i & 0x0038) >> 3) * (1.0f / 7.0f) * r_colorscale, + ((i & 0x01C0) >> 6) * (1.0f / 7.0f) * r_colorscale, + 0.125f); + if (PlaneDiff(r_origin, (&portal->plane)) > 0) { - c_brush_polys++; - RSurfShader_Wall_Pass_BaseVertex(surf); + for (i = portal->numpoints - 1, v = varray_vertex3f;i >= 0;i--, v += 3) + VectorCopy(portal->points[i].position, v); } - for (surf = firstsurf;surf;surf = surf->chain) - if (surf->currenttexture->glowtexture) - RSurfShader_Wall_Pass_Glow(surf); - if (fogenabled) - for (surf = firstsurf;surf;surf = surf->chain) - RSurfShader_Wall_Pass_Fog(surf); + else + for (i = 0, v = varray_vertex3f;i < portal->numpoints;i++, v += 3) + VectorCopy(portal->points[i].position, v); + R_Mesh_Draw(portal->numpoints, portal->numpoints - 2, polygonelements); } -static void RSurfShader_Wall_Lightmap(msurface_t *firstsurf) +static void R_DrawPortals(entity_render_t *ent) { - msurface_t *surf; - if (r_vertexsurfaces.integer) + int i; + mportal_t *portal, *endportal; + float temp[3], center[3], f; + if (ent->model == NULL) + return; + for (portal = ent->model->portals, endportal = portal + ent->model->numportals;portal < endportal;portal++) { - for (surf = firstsurf;surf;surf = surf->chain) + if ((portal->here->pvsframe == ent->model->pvsframecount || portal->past->pvsframe == ent->model->pvsframecount) && portal->numpoints <= POLYGONELEMENTS_MAXPOINTS) { - c_brush_polys++; - RSurfShader_Wall_Pass_BaseVertex(surf); + VectorClear(temp); + for (i = 0;i < portal->numpoints;i++) + VectorAdd(temp, portal->points[i].position, temp); + f = ixtable[portal->numpoints]; + VectorScale(temp, f, temp); + Matrix4x4_Transform(&ent->matrix, temp, center); + R_MeshQueue_AddTransparent(center, R_DrawPortal_Callback, ent, portal - ent->model->portals); } - for (surf = firstsurf;surf;surf = surf->chain) - if (surf->currenttexture->glowtexture) - RSurfShader_Wall_Pass_Glow(surf); - if (fogenabled) - for (surf = firstsurf;surf;surf = surf->chain) - RSurfShader_Wall_Pass_Fog(surf); } - else if (r_multitexture.integer) +} + +void R_PrepareBrushModel(entity_render_t *ent) +{ + int i, numsurfaces, *surfacevisframes, *surfacepvsframes; + msurface_t *surf; + model_t *model; +#if WORLDNODECULLBACKFACES + vec3_t modelorg; +#endif + + // because bmodels can be reused, we have to decide which things to render + // from scratch every time + model = ent->model; + if (model == NULL) + return; +#if WORLDNODECULLBACKFACES + Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg); +#endif + numsurfaces = model->nummodelsurfaces; + surf = model->surfaces + model->firstmodelsurface; + surfacevisframes = model->surfacevisframes + model->firstmodelsurface; + surfacepvsframes = model->surfacepvsframes + model->firstmodelsurface; + for (i = 0;i < numsurfaces;i++, surf++) { - if (r_dlightmap.integer) +#if WORLDNODECULLBACKFACES + // mark any backface surfaces as not visible + if (PlaneDist(modelorg, surf->plane) < surf->plane->dist) { - for (surf = firstsurf;surf;surf = surf->chain) - { - c_brush_polys++; - RSurfShader_Wall_Pass_BaseMTex(surf); - } - for (surf = firstsurf;surf;surf = surf->chain) - if (surf->currenttexture->glowtexture) - RSurfShader_Wall_Pass_Glow(surf); - if (fogenabled) - for (surf = firstsurf;surf;surf = surf->chain) - RSurfShader_Wall_Pass_Fog(surf); - } - else - { - for (surf = firstsurf;surf;surf = surf->chain) - { - c_brush_polys++; - RSurfShader_Wall_Pass_BaseMTex(surf); - } - for (surf = firstsurf;surf;surf = surf->chain) - if (surf->dlightframe == r_framecount) - RSurfShader_Wall_Pass_Light(surf); - for (surf = firstsurf;surf;surf = surf->chain) - if (surf->currenttexture->glowtexture) - RSurfShader_Wall_Pass_Glow(surf); - if (fogenabled) - for (surf = firstsurf;surf;surf = surf->chain) - RSurfShader_Wall_Pass_Fog(surf); + if ((surf->flags & SURF_PLANEBACK)) + surfacevisframes[i] = r_framecount; } + else if (!(surf->flags & SURF_PLANEBACK)) + surfacevisframes[i] = r_framecount; +#else + surfacevisframes[i] = r_framecount; +#endif + surf->dlightframe = -1; } - else if (firstsurf->currenttexture->fogtexture != NULL || currentrenderentity->alpha != 1 || currentrenderentity->effects & EF_ADDITIVE) + R_PrepareSurfaces(ent); +} + +void R_SurfaceWorldNode (entity_render_t *ent) +{ + int i, *surfacevisframes, *surfacepvsframes, surfnum; + msurface_t *surf; + mleaf_t *leaf; + model_t *model; + vec3_t modelorg; + + // equivilant to quake's RecursiveWorldNode but faster and more effective + model = ent->model; + if (model == NULL) + return; + surfacevisframes = model->surfacevisframes + model->firstmodelsurface; + surfacepvsframes = model->surfacepvsframes + model->firstmodelsurface; + Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg); + + for (leaf = model->pvsleafchain;leaf;leaf = leaf->pvschain) { - for (surf = firstsurf;surf;surf = surf->chain) + if (!R_CullBox (leaf->mins, leaf->maxs)) { - c_brush_polys++; - RSurfShader_Wall_Pass_BaseVertex(surf); + c_leafs++; + leaf->visframe = r_framecount; } - for (surf = firstsurf;surf;surf = surf->chain) - if (surf->currenttexture->glowtexture) - RSurfShader_Wall_Pass_Glow(surf); - if (fogenabled) - for (surf = firstsurf;surf;surf = surf->chain) - RSurfShader_Wall_Pass_Fog(surf); } - else + + for (i = 0;i < model->pvssurflistlength;i++) { - if (r_dlightmap.integer) + surfnum = model->pvssurflist[i]; + surf = model->surfaces + surfnum; +#if WORLDNODECULLBACKFACES + if (PlaneDist(modelorg, surf->plane) < surf->plane->dist) { - for (surf = firstsurf;surf;surf = surf->chain) - { - c_brush_polys++; - RSurfShader_Wall_Pass_BaseTexture(surf); - } - for (surf = firstsurf;surf;surf = surf->chain) - RSurfShader_Wall_Pass_BaseLightmap(surf); - for (surf = firstsurf;surf;surf = surf->chain) - if (surf->currenttexture->glowtexture) - RSurfShader_Wall_Pass_Glow(surf); - if (fogenabled) - for (surf = firstsurf;surf;surf = surf->chain) - RSurfShader_Wall_Pass_Fog(surf); + if ((surf->flags & SURF_PLANEBACK) && !R_CullBox (surf->poly_mins, surf->poly_maxs)) + surfacevisframes[surfnum] = r_framecount; } else { - for (surf = firstsurf;surf;surf = surf->chain) - { - c_brush_polys++; - RSurfShader_Wall_Pass_BaseTexture(surf); - } - for (surf = firstsurf;surf;surf = surf->chain) - RSurfShader_Wall_Pass_BaseLightmap(surf); - for (surf = firstsurf;surf;surf = surf->chain) - if (surf->dlightframe == r_framecount) - RSurfShader_Wall_Pass_Light(surf); - for (surf = firstsurf;surf;surf = surf->chain) - if (surf->currenttexture->glowtexture) - RSurfShader_Wall_Pass_Glow(surf); - if (fogenabled) - for (surf = firstsurf;surf;surf = surf->chain) - RSurfShader_Wall_Pass_Fog(surf); + if (!(surf->flags & SURF_PLANEBACK) && !R_CullBox (surf->poly_mins, surf->poly_maxs)) + surfacevisframes[surfnum] = r_framecount; } +#else + if (!R_CullBox (surf->poly_mins, surf->poly_maxs)) + surfacevisframes[surfnum] = r_framecount; +#endif } } -/* -============================================================= - - WORLD MODEL - -============================================================= -*/ - -static void RSurf_Callback(void *data, void *junk) -{ - ((msurface_t *)data)->visframe = r_framecount; -} - -static void R_SolidWorldNode (void) +static void R_PortalWorldNode(entity_render_t *ent, mleaf_t *viewleaf) { - if (r_viewleaf->contents != CONTENTS_SOLID) - { - int portalstack; - mportal_t *p, *pstack[8192]; - msurface_t *surf, **mark, **endmark; - mleaf_t *leaf; - tinyplane_t plane; - // LordHavoc: portal-passage worldnode; follows portals leading - // outward from viewleaf, if a portal leads offscreen it is not - // followed, in indoor maps this can often cull a great deal of - // geometry away when pvs data is not present (useful with pvs as well) - - leaf = r_viewleaf; - leaf->worldnodeframe = r_framecount; - portalstack = 0; - loc0: + int c, leafstackpos, *mark, *surfacevisframes; +#if WORLDNODECULLBACKFACES + int n; + msurface_t *surf; +#endif + mleaf_t *leaf, *leafstack[8192]; + mportal_t *p; + vec3_t modelorg; + msurface_t *surfaces; + if (ent->model == NULL) + return; + // LordHavoc: portal-passage worldnode with PVS; + // follows portals leading outward from viewleaf, does not venture + // offscreen or into leafs that are not visible, faster than Quake's + // RecursiveWorldNode + surfaces = ent->model->surfaces; + surfacevisframes = ent->model->surfacevisframes; + Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg); + viewleaf->worldnodeframe = r_framecount; + leafstack[0] = viewleaf; + leafstackpos = 1; + while (leafstackpos) + { c_leafs++; - + leaf = leafstack[--leafstackpos]; leaf->visframe = r_framecount; - + // draw any surfaces bounding this leaf if (leaf->nummarksurfaces) { - mark = leaf->firstmarksurface; - endmark = mark + leaf->nummarksurfaces; - if (r_ser.integer) - { - do - { - surf = *mark++; - // make sure surfaces are only processed once - if (surf->worldnodeframe == r_framecount) - continue; - surf->worldnodeframe = r_framecount; - if (PlaneDist(r_origin, surf->plane) < surf->plane->dist) - { - if (surf->flags & SURF_PLANEBACK) - { - VectorNegate(surf->plane->normal, plane.normal); - plane.dist = -surf->plane->dist; - R_Clip_AddPolygon((float *)surf->poly_verts, surf->poly_numverts, sizeof(float[3]), (surf->flags & SURF_CLIPSOLID) != 0, RSurf_Callback, surf, NULL, &plane); - } - } - else - { - if (!(surf->flags & SURF_PLANEBACK)) - R_Clip_AddPolygon((float *)surf->poly_verts, surf->poly_numverts, sizeof(float[3]), (surf->flags & SURF_CLIPSOLID) != 0, RSurf_Callback, surf, NULL, (tinyplane_t *)surf->plane); - } - } - while (mark < endmark); - } - else + for (c = leaf->nummarksurfaces, mark = leaf->firstmarksurface;c;c--) { - do +#if WORLDNODECULLBACKFACES + n = *mark++; + if (surfacevisframes[n] != r_framecount) { - surf = *mark++; - // make sure surfaces are only processed once - if (surf->worldnodeframe == r_framecount) - continue; - surf->worldnodeframe = r_framecount; - if (PlaneDist(r_origin, surf->plane) < surf->plane->dist) + surf = surfaces + n; + if (PlaneDist(modelorg, surf->plane) < surf->plane->dist) { - if (surf->flags & SURF_PLANEBACK) - surf->visframe = r_framecount; + if ((surf->flags & SURF_PLANEBACK)) + surfacevisframes[n] = r_framecount; } else { if (!(surf->flags & SURF_PLANEBACK)) - surf->visframe = r_framecount; + surfacevisframes[n] = r_framecount; } } - while (mark < endmark); +#else + surfacevisframes[*mark++] = r_framecount; +#endif } } - // follow portals into other leafs - p = leaf->portals; - for (;p;p = p->next) + for (p = leaf->portals;p;p = p->next) { - if (DotProduct(r_origin, p->plane.normal) < p->plane.dist) + // LordHavoc: this DotProduct hurts less than a cache miss + // (which is more likely to happen if backflowing through leafs) + if (DotProduct(modelorg, p->plane.normal) < (p->plane.dist + 1)) { leaf = p->past; if (leaf->worldnodeframe != r_framecount) { leaf->worldnodeframe = r_framecount; - if (leaf->contents != CONTENTS_SOLID) - { - if (R_NotCulledBox(leaf->mins, leaf->maxs)) - { - p->visframe = r_framecount; - pstack[portalstack++] = p; - goto loc0; - - loc1: - p = pstack[--portalstack]; - } - } + // FIXME: R_CullBox is absolute, should be done relative + if (leaf->pvsframe == ent->model->pvsframecount && !R_CullBox(leaf->mins, leaf->maxs)) + leafstack[leafstackpos++] = leaf; } } } - - if (portalstack) - goto loc1; } - else - { - mnode_t *nodestack[8192], *node = cl.worldmodel->nodes; - int nodestackpos = 0; - // LordHavoc: recursive descending worldnode; if portals are not - // available, this is a good last resort, can cull large amounts of - // geometry, but is more time consuming than portal-passage and renders - // things behind walls +} -loc2: - if (R_NotCulledBox(node->mins, node->maxs)) - { - if (node->numsurfaces) +void R_PVSUpdate (entity_render_t *ent, mleaf_t *viewleaf) +{ + int i, j, l, c, bits, *surfacepvsframes, *mark; + mleaf_t *leaf; + qbyte *vis; + model_t *model; + + model = ent->model; + if (model && (model->pvsviewleaf != viewleaf || model->pvsviewleafnovis != r_novis.integer)) + { + model->pvsframecount++; + model->pvsviewleaf = viewleaf; + model->pvsviewleafnovis = r_novis.integer; + model->pvsleafchain = NULL; + model->pvssurflistlength = 0; + if (viewleaf) + { + surfacepvsframes = model->surfacepvsframes; + vis = Mod_LeafPVS (viewleaf, model); + for (j = 0;j < model->numleafs;j += 8) { - if (r_ser.integer) + bits = *vis++; + if (bits) { - msurface_t *surf = cl.worldmodel->surfaces + node->firstsurface, *surfend = surf + node->numsurfaces; - tinyplane_t plane; - if (PlaneDiff (r_origin, node->plane) < 0) - { - for (;surf < surfend;surf++) - { - if (surf->flags & SURF_PLANEBACK) - { - VectorNegate(surf->plane->normal, plane.normal); - plane.dist = -surf->plane->dist; - R_Clip_AddPolygon((float *)surf->poly_verts, surf->poly_numverts, sizeof(float[3]), surf->flags & SURF_CLIPSOLID, RSurf_Callback, surf, NULL, &plane); - } - } - } - else + l = model->numleafs - j; + if (l > 8) + l = 8; + for (i = 0;i < l;i++) { - for (;surf < surfend;surf++) + if (bits & (1 << i)) { - if (!(surf->flags & SURF_PLANEBACK)) - R_Clip_AddPolygon((float *)surf->poly_verts, surf->poly_numverts, sizeof(float[3]), surf->flags & SURF_CLIPSOLID, RSurf_Callback, surf, NULL, (tinyplane_t *)surf->plane); + leaf = &model->leafs[j + i + 1]; + leaf->pvschain = model->pvsleafchain; + model->pvsleafchain = leaf; + leaf->pvsframe = model->pvsframecount; + // mark surfaces bounding this leaf as visible + for (c = leaf->nummarksurfaces, mark = leaf->firstmarksurface;c;c--, mark++) + surfacepvsframes[*mark] = model->pvsframecount; } } } - else - { - msurface_t *surf = cl.worldmodel->surfaces + node->firstsurface, *surfend = surf + node->numsurfaces; - if (PlaneDiff (r_origin, node->plane) < 0) - { - for (;surf < surfend;surf++) - { - if (surf->flags & SURF_PLANEBACK) - surf->visframe = r_framecount; - } - } - else - { - for (;surf < surfend;surf++) - { - if (!(surf->flags & SURF_PLANEBACK)) - surf->visframe = r_framecount; - } - } - } - } - - // recurse down the children - if (node->children[0]->contents >= 0) - { - if (node->children[1]->contents >= 0) - { - if (nodestackpos < 8192) - nodestack[nodestackpos++] = node->children[1]; - node = node->children[0]; - goto loc2; - } - else - ((mleaf_t *)node->children[1])->visframe = r_framecount; - node = node->children[0]; - goto loc2; - } - else - { - ((mleaf_t *)node->children[0])->visframe = r_framecount; - if (node->children[1]->contents >= 0) - { - node = node->children[1]; - goto loc2; - } - else if (nodestackpos > 0) - { - ((mleaf_t *)node->children[1])->visframe = r_framecount; - node = nodestack[--nodestackpos]; - goto loc2; - } } - } - else if (nodestackpos > 0) - { - node = nodestack[--nodestackpos]; - goto loc2; + Mod_BuildPVSTextureChains(model); } } } -static int r_portalframecount = 0; - -static void R_PVSWorldNode() +void R_WorldVisibility (entity_render_t *ent) { - int portalstack, i; - mportal_t *p, *pstack[8192]; - msurface_t *surf, **mark, **endmark; - mleaf_t *leaf; - tinyplane_t plane; - qbyte *worldvis; + vec3_t modelorg; + mleaf_t *viewleaf; - worldvis = Mod_LeafPVS (r_viewleaf, cl.worldmodel); + Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg); + viewleaf = Mod_PointInLeaf (modelorg, ent->model); + R_PVSUpdate(ent, viewleaf); - leaf = r_viewleaf; - leaf->worldnodeframe = r_framecount; - portalstack = 0; -loc0: - c_leafs++; + if (!viewleaf) + return; - leaf->visframe = r_framecount; + if (r_surfaceworldnode.integer || viewleaf->contents == CONTENTS_SOLID) + R_SurfaceWorldNode (ent); + else + R_PortalWorldNode (ent, viewleaf); +} - if (leaf->nummarksurfaces) - { - mark = leaf->firstmarksurface; - endmark = mark + leaf->nummarksurfaces; - if (r_ser.integer) - { - do - { - surf = *mark++; - // make sure surfaces are only processed once - if (surf->worldnodeframe == r_framecount) - continue; - surf->worldnodeframe = r_framecount; - if (PlaneDist(r_origin, surf->plane) < surf->plane->dist) - { - if (surf->flags & SURF_PLANEBACK) - { - VectorNegate(surf->plane->normal, plane.normal); - plane.dist = -surf->plane->dist; - R_Clip_AddPolygon((float *)surf->poly_verts, surf->poly_numverts, sizeof(float[3]), (surf->flags & SURF_CLIPSOLID) != 0, RSurf_Callback, surf, NULL, &plane); - } - } - else - { - if (!(surf->flags & SURF_PLANEBACK)) - R_Clip_AddPolygon((float *)surf->poly_verts, surf->poly_numverts, sizeof(float[3]), (surf->flags & SURF_CLIPSOLID) != 0, RSurf_Callback, surf, NULL, (tinyplane_t *)surf->plane); - } - } - while (mark < endmark); - } - else - { - do - { - surf = *mark++; - // make sure surfaces are only processed once - if (surf->worldnodeframe == r_framecount) - continue; - surf->worldnodeframe = r_framecount; - if (PlaneDist(r_origin, surf->plane) < surf->plane->dist) - { - if (surf->flags & SURF_PLANEBACK) - surf->visframe = r_framecount; - } - else - { - if (!(surf->flags & SURF_PLANEBACK)) - surf->visframe = r_framecount; - } - } - while (mark < endmark); - } - } +void R_DrawWorld (entity_render_t *ent) +{ + if (ent->model == NULL) + return; + R_PrepareSurfaces(ent); + R_DrawSurfaces(ent, SHADERSTAGE_SKY, ent->model->pvstexturechains); + R_DrawSurfaces(ent, SHADERSTAGE_NORMAL, ent->model->pvstexturechains); + if (r_drawportals.integer) + R_DrawPortals(ent); +} + +void R_Model_Brush_DrawSky (entity_render_t *ent) +{ + if (ent->model == NULL) + return; + if (ent != &cl_entities[0].render) + R_PrepareBrushModel(ent); + R_DrawSurfaces(ent, SHADERSTAGE_SKY, ent->model->pvstexturechains); +} - // follow portals into other leafs - for (p = leaf->portals;p;p = p->next) +void R_Model_Brush_Draw (entity_render_t *ent) +{ + if (ent->model == NULL) + return; + c_bmodels++; + if (ent != &cl_entities[0].render) + R_PrepareBrushModel(ent); + R_DrawSurfaces(ent, SHADERSTAGE_NORMAL, ent->model->pvstexturechains); +} + +void R_Model_Brush_DrawShadowVolume (entity_render_t *ent, vec3_t relativelightorigin, float lightradius) +{ + int i; + msurface_t *surf; + float projectdistance, f, temp[3], lightradius2; + surfmesh_t *mesh; + if (ent->model == NULL) + return; + R_Mesh_Matrix(&ent->matrix); + lightradius2 = lightradius * lightradius; + R_UpdateTextureInfo(ent); + projectdistance = 1000000000.0f;//lightradius + ent->model->radius; + for (i = 0, surf = ent->model->surfaces + ent->model->firstmodelsurface;i < ent->model->nummodelsurfaces;i++, surf++) { - if (DotProduct(r_origin, p->plane.normal) < p->plane.dist) + if (surf->texinfo->texture->rendertype == SURFRENDER_OPAQUE && surf->flags & SURF_SHADOWCAST) { - leaf = p->past; - if (leaf->worldnodeframe != r_framecount) + f = PlaneDiff(relativelightorigin, surf->plane); + if (surf->flags & SURF_PLANEBACK) + f = -f; + // draw shadows only for frontfaces and only if they are close + if (f >= 0.1 && f < lightradius) { - leaf->worldnodeframe = r_framecount; - if (leaf->contents != CONTENTS_SOLID) + temp[0] = bound(surf->poly_mins[0], relativelightorigin[0], surf->poly_maxs[0]) - relativelightorigin[0]; + temp[1] = bound(surf->poly_mins[1], relativelightorigin[1], surf->poly_maxs[1]) - relativelightorigin[1]; + temp[2] = bound(surf->poly_mins[2], relativelightorigin[2], surf->poly_maxs[2]) - relativelightorigin[2]; + if (DotProduct(temp, temp) < lightradius2) { - i = (leaf - cl.worldmodel->leafs) - 1; - if (worldvis[i>>3] & (1<<(i&7))) + for (mesh = surf->mesh;mesh;mesh = mesh->chain) { - if (R_NotCulledBox(leaf->mins, leaf->maxs)) - { - pstack[portalstack++] = p; - goto loc0; - -loc1: - p = pstack[--portalstack]; - } + R_Mesh_GetSpace(mesh->numverts); + R_Mesh_CopyVertex3f(mesh->vertex3f, mesh->numverts); + R_Shadow_Volume(mesh->numverts, mesh->numtriangles, mesh->element3i, mesh->neighbor3i, relativelightorigin, lightradius, projectdistance); } } } } } - - if (portalstack) - goto loc1; } -Cshader_t Cshader_wall_vertex = {{NULL, RSurfShader_Wall_Vertex}, NULL}; -Cshader_t Cshader_wall_lightmap = {{NULL, RSurfShader_Wall_Lightmap}, NULL}; -Cshader_t Cshader_wall_fullbright = {{NULL, RSurfShader_Wall_Fullbright}, NULL}; -Cshader_t Cshader_water = {{NULL, RSurfShader_Water}, NULL}; -Cshader_t Cshader_sky = {{RSurfShader_Sky, NULL}, NULL}; - -int Cshader_count = 5; -Cshader_t *Cshaders[5] = -{ - &Cshader_wall_vertex, - &Cshader_wall_lightmap, - &Cshader_wall_fullbright, - &Cshader_water, - &Cshader_sky -}; - -void R_PrepareSurfaces(void) +void R_Model_Brush_DrawLightForSurfaceList(entity_render_t *ent, vec3_t relativelightorigin, vec3_t relativeeyeorigin, float lightradius, float *lightcolor, msurface_t **surflist, int numsurfaces, const matrix4x4_t *matrix_modeltofilter, const matrix4x4_t *matrix_modeltoattenuationxyz, const matrix4x4_t *matrix_modeltoattenuationz) { - int i, alttextures, texframe, framecount; - texture_t *t; - model_t *model; + int surfnum; msurface_t *surf; - - for (i = 0;i < Cshader_count;i++) - Cshaders[i]->chain = NULL; - - model = currentrenderentity->model; - alttextures = currentrenderentity->frame != 0; - texframe = (int)(cl.time * 5.0f); - - for (i = 0;i < model->nummodelsurfaces;i++) + texture_t *t; + surfmesh_t *mesh; + if (ent->model == NULL) + return; + R_Mesh_Matrix(&ent->matrix); + R_UpdateTextureInfo(ent); + for (surfnum = 0;surfnum < numsurfaces;surfnum++) { - surf = model->modelsortedsurfaces[i]; + surf = surflist[surfnum]; if (surf->visframe == r_framecount) { - if (surf->insertframe != r_framecount) + t = surf->texinfo->texture->currentframe; + if (t->rendertype == SURFRENDER_OPAQUE && t->flags & SURF_SHADOWLIGHT) { - surf->insertframe = r_framecount; - c_faces++; - t = surf->texinfo->texture; - if (t->animated) + for (mesh = surf->mesh;mesh;mesh = mesh->chain) { - framecount = t->anim_total[alttextures]; - if (framecount >= 2) - surf->currenttexture = t->anim_frames[alttextures][texframe % framecount]; - else - surf->currenttexture = t->anim_frames[alttextures][0]; + R_Shadow_DiffuseLighting(mesh->numverts, mesh->numtriangles, mesh->element3i, mesh->vertex3f, mesh->svector3f, mesh->tvector3f, mesh->normal3f, mesh->texcoordtexture2f, relativelightorigin, lightradius, lightcolor, matrix_modeltofilter, matrix_modeltoattenuationxyz, matrix_modeltoattenuationz, t->skin.base, t->skin.nmap, NULL); + R_Shadow_SpecularLighting(mesh->numverts, mesh->numtriangles, mesh->element3i, mesh->vertex3f, mesh->svector3f, mesh->tvector3f, mesh->normal3f, mesh->texcoordtexture2f, relativelightorigin, relativeeyeorigin, lightradius, lightcolor, matrix_modeltofilter, matrix_modeltoattenuationxyz, matrix_modeltoattenuationz, t->skin.gloss, t->skin.nmap, NULL); } - else - surf->currenttexture = t; } - - surf->chain = surf->shader->chain; - surf->shader->chain = surf; } } } -void R_DrawSurfaces (int type) -{ - int i; - Cshader_t *shader; - - for (i = 0;i < Cshader_count;i++) - { - shader = Cshaders[i]; - if (shader->chain && shader->shaderfunc[type]) - shader->shaderfunc[type](shader->chain); - } -} - -static float portalpointbuffer[256][3]; - -void R_DrawPortals(void) +void R_Model_Brush_DrawLight(entity_render_t *ent, vec3_t relativelightorigin, vec3_t relativeeyeorigin, float lightradius, float *lightcolor, const matrix4x4_t *matrix_modeltofilter, const matrix4x4_t *matrix_modeltoattenuationxyz, const matrix4x4_t *matrix_modeltoattenuationz) { - int drawportals, i; - mportal_t *portal, *endportal; - mvertex_t *point; - rmeshinfo_t m; - drawportals = r_drawportals.integer; - - if (drawportals < 1) + int surfnum; + msurface_t *surf; + texture_t *t; + float f, lightmins[3], lightmaxs[3]; + surfmesh_t *mesh; + if (ent->model == NULL) return; - - memset(&m, 0, sizeof(m)); - m.transparent = true; - m.blendfunc1 = GL_SRC_ALPHA; - m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA; - m.vertex = &portalpointbuffer[0][0]; - m.vertexstep = sizeof(float[3]); - m.ca = 0.125; - for (portal = cl.worldmodel->portals, endportal = portal + cl.worldmodel->numportals;portal < endportal;portal++) + R_Mesh_Matrix(&ent->matrix); + lightmins[0] = relativelightorigin[0] - lightradius; + lightmins[1] = relativelightorigin[1] - lightradius; + lightmins[2] = relativelightorigin[2] - lightradius; + lightmaxs[0] = relativelightorigin[0] + lightradius; + lightmaxs[1] = relativelightorigin[1] + lightradius; + lightmaxs[2] = relativelightorigin[2] + lightradius; + R_UpdateTextureInfo(ent); + if (ent != &cl_entities[0].render) { - if (portal->visframe == r_portalframecount) + // bmodel, cull crudely to view and light + for (surfnum = 0, surf = ent->model->surfaces + ent->model->firstmodelsurface;surfnum < ent->model->nummodelsurfaces;surfnum++, surf++) { - if (portal->numpoints <= 256) + if (BoxesOverlap(surf->poly_mins, surf->poly_maxs, lightmins, lightmaxs)) { - i = portal - cl.worldmodel->portals; - m.cr = ((i & 0x0007) >> 0) * (1.0f / 7.0f); - m.cg = ((i & 0x0038) >> 3) * (1.0f / 7.0f); - m.cb = ((i & 0x01C0) >> 6) * (1.0f / 7.0f); - point = portal->points; - if (PlaneDiff(r_origin, (&portal->plane)) > 0) - { - for (i = portal->numpoints - 1;i >= 0;i--) - VectorCopy(point[i].position, portalpointbuffer[i]); - } - else + f = PlaneDiff(relativelightorigin, surf->plane); + if (surf->flags & SURF_PLANEBACK) + f = -f; + if (f >= -0.1 && f < lightradius) { - for (i = 0;i < portal->numpoints;i++) - VectorCopy(point[i].position, portalpointbuffer[i]); + f = PlaneDiff(relativeeyeorigin, surf->plane); + if (surf->flags & SURF_PLANEBACK) + f = -f; + if (f > 0) + { + t = surf->texinfo->texture->currentframe; + if (t->rendertype == SURFRENDER_OPAQUE && t->flags & SURF_SHADOWLIGHT) + { + for (mesh = surf->mesh;mesh;mesh = mesh->chain) + { + R_Shadow_DiffuseLighting(mesh->numverts, mesh->numtriangles, mesh->element3i, mesh->vertex3f, mesh->svector3f, mesh->tvector3f, mesh->normal3f, mesh->texcoordtexture2f, relativelightorigin, lightradius, lightcolor, matrix_modeltofilter, matrix_modeltoattenuationxyz, matrix_modeltoattenuationz, t->skin.base, t->skin.nmap, NULL); + R_Shadow_SpecularLighting(mesh->numverts, mesh->numtriangles, mesh->element3i, mesh->vertex3f, mesh->svector3f, mesh->tvector3f, mesh->normal3f, mesh->texcoordtexture2f, relativelightorigin, relativeeyeorigin, lightradius, lightcolor, matrix_modeltofilter, matrix_modeltoattenuationxyz, matrix_modeltoattenuationz, t->skin.gloss, t->skin.nmap, NULL); + } + } + } } - R_Mesh_DrawPolygon(&m, portal->numpoints); } } } -} - -void R_SetupForBModelRendering(void) -{ - int i; - msurface_t *surf; - model_t *model; - vec3_t modelorg; - - // because bmodels can be reused, we have to decide which things to render - // from scratch every time - - model = currentrenderentity->model; - - softwaretransformforentity (currentrenderentity); - softwareuntransform(r_origin, modelorg); - - for (i = 0;i < model->nummodelsurfaces;i++) - { - surf = model->modelsortedsurfaces[i]; - if (((surf->flags & SURF_PLANEBACK) == 0) == (PlaneDiff(modelorg, surf->plane) >= 0)) - surf->visframe = r_framecount; - else - surf->visframe = -1; - surf->worldnodeframe = -1; - surf->lightframe = -1; - surf->dlightframe = -1; - surf->insertframe = -1; - } -} - -void R_SetupForWorldRendering(void) -{ - // there is only one instance of the world, but it can be rendered in - // multiple stages - - currentrenderentity = &cl_entities[0].render; - softwaretransformidentity(); -} - -static void R_SurfMarkLights (void) -{ - int i; - msurface_t *surf; - - if (r_dynamic.integer) - R_MarkLights(); - - if (!r_vertexsurfaces.integer) + else { - for (i = 0;i < currentrenderentity->model->nummodelsurfaces;i++) + // world, already culled to view, just cull to light + for (surfnum = 0, surf = ent->model->surfaces + ent->model->firstmodelsurface;surfnum < ent->model->nummodelsurfaces;surfnum++, surf++) { - surf = currentrenderentity->model->modelsortedsurfaces[i]; - if (surf->visframe == r_framecount && surf->lightmaptexture != NULL) + if (surf->visframe == r_framecount && BoxesOverlap(surf->poly_mins, surf->poly_maxs, lightmins, lightmaxs)) { - if (surf->cached_dlight - || surf->cached_ambient != r_ambient.value - || surf->cached_lightscalebit != lightscalebit) - R_BuildLightMap(surf, false); // base lighting changed - else if (r_dynamic.integer) + f = PlaneDiff(relativelightorigin, surf->plane); + if (surf->flags & SURF_PLANEBACK) + f = -f; + if (f >= -0.1 && f < lightradius) { - if (surf->styles[0] != 255 && (d_lightstylevalue[surf->styles[0]] != surf->cached_light[0] - || (surf->styles[1] != 255 && (d_lightstylevalue[surf->styles[1]] != surf->cached_light[1] - || (surf->styles[2] != 255 && (d_lightstylevalue[surf->styles[2]] != surf->cached_light[2] - || (surf->styles[3] != 255 && (d_lightstylevalue[surf->styles[3]] != surf->cached_light[3])))))))) - R_BuildLightMap(surf, false); // base lighting changed - else if (surf->dlightframe == r_framecount && r_dlightmap.integer) - R_BuildLightMap(surf, true); // only dlights + t = surf->texinfo->texture->currentframe; + if (t->rendertype == SURFRENDER_OPAQUE && t->flags & SURF_SHADOWLIGHT) + { + for (mesh = surf->mesh;mesh;mesh = mesh->chain) + { + R_Shadow_DiffuseLighting(mesh->numverts, mesh->numtriangles, mesh->element3i, mesh->vertex3f, mesh->svector3f, mesh->tvector3f, mesh->normal3f, mesh->texcoordtexture2f, relativelightorigin, lightradius, lightcolor, matrix_modeltofilter, matrix_modeltoattenuationxyz, matrix_modeltoattenuationz, t->skin.base, t->skin.nmap, NULL); + R_Shadow_SpecularLighting(mesh->numverts, mesh->numtriangles, mesh->element3i, mesh->vertex3f, mesh->svector3f, mesh->tvector3f, mesh->normal3f, mesh->texcoordtexture2f, relativelightorigin, relativeeyeorigin, lightradius, lightcolor, matrix_modeltofilter, matrix_modeltoattenuationxyz, matrix_modeltoattenuationz, t->skin.gloss, t->skin.nmap, NULL); + } + } } } } } } -void R_MarkWorldLights(void) -{ - R_SetupForWorldRendering(); - R_SurfMarkLights(); -} - -/* -============= -R_DrawWorld -============= -*/ -void R_DrawWorld (void) -{ - R_SetupForWorldRendering(); - - if (r_viewleaf->contents == CONTENTS_SOLID || r_novis.integer || r_viewleaf->compressed_vis == NULL) - R_SolidWorldNode (); - else - R_PVSWorldNode (); -} - -/* -================= -R_DrawBrushModel -================= -*/ -void R_DrawBrushModelSky (void) -{ - R_SetupForBModelRendering(); - - R_PrepareSurfaces(); - R_DrawSurfaces(SHADERSTAGE_SKY); -} - -void R_DrawBrushModelNormal (void) -{ - c_bmodels++; - - // have to flush queue because of possible lightmap reuse - R_Mesh_Render(); - - R_SetupForBModelRendering(); - - R_SurfMarkLights(); - - R_PrepareSurfaces(); - - if (!skyrendermasked) - R_DrawSurfaces(SHADERSTAGE_SKY); - R_DrawSurfaces(SHADERSTAGE_NORMAL); -} - static void gl_surf_start(void) { } @@ -2336,6 +1962,8 @@ void GL_Surf_Init(void) Cvar_RegisterVariable(&r_drawportals); Cvar_RegisterVariable(&r_testvis); Cvar_RegisterVariable(&r_floatbuildlightmap); + Cvar_RegisterVariable(&r_detailtextures); + Cvar_RegisterVariable(&r_surfaceworldnode); R_RegisterModule("GL_Surf", gl_surf_start, gl_surf_shutdown, gl_surf_newmap); }