X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=gl_rsurf.c;h=48440d944328f0eef8205eb12f3dffeb44e9ff67;hp=ca1d14d9ecab71ef49b950c6ef4302d8765f1731;hb=f7412a0c49465d916da5920d1132eeda9c3a4a3d;hpb=6a906fe49ae760f8a4096fd2171139e79ac3bf7a diff --git a/gl_rsurf.c b/gl_rsurf.c index ca1d14d9..48440d94 100644 --- a/gl_rsurf.c +++ b/gl_rsurf.c @@ -23,52 +23,34 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define MAX_LIGHTMAP_SIZE 256 -static signed int blocklights[MAX_LIGHTMAP_SIZE*MAX_LIGHTMAP_SIZE*3]; // LordHavoc: *3 for colored lighting +static unsigned int intblocklights[MAX_LIGHTMAP_SIZE*MAX_LIGHTMAP_SIZE*3]; // LordHavoc: *3 for colored lighting +static float floatblocklights[MAX_LIGHTMAP_SIZE*MAX_LIGHTMAP_SIZE*3]; // LordHavoc: *3 for colored lighting static qbyte templight[MAX_LIGHTMAP_SIZE*MAX_LIGHTMAP_SIZE*4]; cvar_t r_ambient = {0, "r_ambient", "0"}; cvar_t r_vertexsurfaces = {0, "r_vertexsurfaces", "0"}; cvar_t r_dlightmap = {CVAR_SAVE, "r_dlightmap", "1"}; -cvar_t r_drawportals = {0, "r_drawportals", "0"}; +//cvar_t r_drawportals = {0, "r_drawportals", "0"}; cvar_t r_testvis = {0, "r_testvis", "0"}; - -static void gl_surf_start(void) -{ -} - -static void gl_surf_shutdown(void) -{ -} - -static void gl_surf_newmap(void) -{ -} +cvar_t r_floatbuildlightmap = {0, "r_floatbuildlightmap", "0"}; +cvar_t r_detailtextures = {CVAR_SAVE, "r_detailtextures", "1"}; +cvar_t r_surfaceworldnode = {0, "r_surfaceworldnode", "0"}; +cvar_t r_cullsurface = {0, "r_cullsurface", "0"}; static int dlightdivtable[32768]; -void GL_Surf_Init(void) -{ - int i; - dlightdivtable[0] = 4194304; - for (i = 1;i < 32768;i++) - dlightdivtable[i] = 4194304 / (i << 7); - - Cvar_RegisterVariable(&r_ambient); - Cvar_RegisterVariable(&r_vertexsurfaces); - Cvar_RegisterVariable(&r_dlightmap); - Cvar_RegisterVariable(&r_drawportals); - Cvar_RegisterVariable(&r_testvis); - - R_RegisterModule("GL_Surf", gl_surf_start, gl_surf_shutdown, gl_surf_newmap); -} +// variables used by R_PVSUpdate +int r_pvsframecount = 0; +mleaf_t *r_pvsviewleaf = NULL; +int r_pvsviewleafnovis = 0; +msurface_t *r_pvsfirstsurface = NULL; -static int R_AddDynamicLights (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; unsigned int *bl; - float dist; - vec3_t impact, local; + float dist, impact[3], local[3]; // LordHavoc: use 64bit integer... shame it's not very standardized... #if _MSC_VER || __BORLANDC__ @@ -81,33 +63,36 @@ static int R_AddDynamicLights (msurface_t *surf) smax = (surf->extents[0] >> 4) + 1; tmax = (surf->extents[1] >> 4) + 1; + smax3 = smax * 3; for (lnum = 0; lnum < r_numdlights; lnum++) { if (!(surf->dlightbits[lnum >> 5] & (1 << (lnum & 31)))) continue; // not lit by this light - softwareuntransform(r_dlight[lnum].origin, local); -// VectorSubtract (r_dlight[lnum].origin, currentrenderentity->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 // compensate for LIGHTOFFSET maxdist = (int) r_dlight[lnum].cullradius2 + LIGHTOFFSET; - // already clamped, skip this - // clamp radius to avoid exceeding 32768 entry division table - //if (maxdist > 4194304) - // maxdist = 4194304; - dist2 = dist * dist; dist2 += LIGHTOFFSET; if (dist2 >= maxdist) continue; - impact[0] = local[0] - surf->plane->normal[0] * dist; - impact[1] = local[1] - surf->plane->normal[1] * dist; - impact[2] = local[2] - surf->plane->normal[2] * dist; + if (surf->plane->type < 3) + { + VectorCopy(local, impact); + impact[surf->plane->type] -= dist; + } + else + { + impact[0] = local[0] - surf->plane->normal[0] * dist; + impact[1] = local[1] - surf->plane->normal[1] * dist; + impact[2] = local[2] - surf->plane->normal[2] * dist; + } 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]; @@ -128,9 +113,8 @@ static int R_AddDynamicLights (msurface_t *surf) 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); - bl = blocklights; - smax3 = smax * 3; + subtract = (int) (r_dlight[lnum].subtract * 4194304.0f); + bl = intblocklights; i = impactt; for (t = 0;t < tmax;t++, i -= 16) @@ -147,9 +131,9 @@ static int R_AddDynamicLights (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) >> 7; + bl[1] += (green * k) >> 7; + bl[2] += (blue * k) >> 7; lit = true; } } @@ -163,6 +147,291 @@ static int R_AddDynamicLights (msurface_t *surf) return lit; } +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; + + lit = false; + + smax = (surf->extents[0] >> 4) + 1; + tmax = (surf->extents[1] >> 4) + 1; + smax3 = smax * 3; + + for (lnum = 0; lnum < r_numdlights; lnum++) + { + if (!(surf->dlightbits[lnum >> 5] & (1 << (lnum & 31)))) + continue; // not lit by this light + + Matrix4x4_Transform(matrix, r_dlight[lnum].origin, local); + dist = DotProduct (local, surf->plane->normal) - surf->plane->dist; + + // for comparisons to minimum acceptable light + // compensate for LIGHTOFFSET + maxdist = (int) r_dlight[lnum].cullradius2 + LIGHTOFFSET; + + dist2 = dist * dist; + dist2 += LIGHTOFFSET; + if (dist2 >= maxdist) + continue; + + if (surf->plane->type < 3) + { + VectorCopy(local, impact); + impact[surf->plane->type] -= dist; + } + else + { + impact[0] = local[0] - surf->plane->normal[0] * dist; + impact[1] = local[1] - surf->plane->normal[1] * dist; + impact[2] = local[2] - surf->plane->normal[2] * dist; + } + + 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]; + + td = bound(0, impacts, smax * 16) - impacts; + td1 = bound(0, impactt, tmax * 16) - impactt; + td = td * td + td1 * td1 + dist2; + if (td > maxdist) + continue; + + // reduce calculations + for (s = 0, td1 = impacts; s < smax; s++, td1 -= 16.0f) + sdtable[s] = td1 * td1 + dist2; + + 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 = r_dlight[lnum].subtract * 32768.0f; + bl = floatblocklights; + + td1 = impactt; + for (t = 0;t < tmax;t++, td1 -= 16.0f) + { + td = td1 * td1; + // make sure some part of it is visible on this line + if (td < maxdist3) + { + maxdist2 = maxdist - td; + for (s = 0;s < smax;s++) + { + if (sdtable[s] < maxdist2) + { + k = (32768.0f / (sdtable[s] + td)) - subtract; + bl[0] += red * k; + bl[1] += green * k; + bl[2] += blue * k; + lit = true; + } + bl += 3; + } + } + else // skip line + bl += smax3; + } + } + return lit; +} + +/* +=============== +R_BuildLightMap + +Combine and scale multiple lightmaps into the 8.8 format in blocklights +=============== +*/ +static void R_BuildLightMap (const entity_render_t *ent, msurface_t *surf, int dlightchanged) +{ + if (!r_floatbuildlightmap.integer) + { + int smax, tmax, i, j, size, size3, shift, maps, stride, l; + unsigned int *bl, scale; + qbyte *lightmap, *out, *stain; + + // 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; + size = smax*tmax; + size3 = size*3; + lightmap = surf->samples; + + // set to full bright if no light data + bl = intblocklights; + if ((ent->effects & EF_FULLBRIGHT) || !ent->model->lightdata) + { + for (i = 0;i < size3;i++) + bl[i] = 255*256; + } + else + { + // clear to no light + j = r_ambient.value * 512.0f; // would be 128.0f logically, but using 512.0f to match winquake style + if (j) + { + for (i = 0;i < size3;i++) + *bl++ = j; + } + else + memset(bl, 0, size*3*sizeof(unsigned int)); + + if (surf->dlightframe == r_framecount && r_dlightmap.integer) + { + 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 + if (lightmap) + { + bl = intblocklights; + for (maps = 0;maps < MAXLIGHTMAPS && surf->styles[maps] != 255;maps++, lightmap += size3) + for (scale = d_lightstylevalue[surf->styles[maps]], i = 0;i < size3;i++) + bl[i] += lightmap[i] * scale; + } + } + + stain = surf->stainsamples; + bl = intblocklights; + out = templight; + // deal with lightmap brightness scale + shift = 7 + lightscalebit + 8; + if (ent->model->lightmaprgba) + { + stride = (surf->lightmaptexturestride - smax) * 4; + for (i = 0;i < tmax;i++, out += stride) + { + for (j = 0;j < smax;j++) + { + l = (*bl++ * *stain++) >> shift;*out++ = min(l, 255); + l = (*bl++ * *stain++) >> shift;*out++ = min(l, 255); + l = (*bl++ * *stain++) >> shift;*out++ = min(l, 255); + *out++ = 255; + } + } + } + else + { + stride = (surf->lightmaptexturestride - smax) * 3; + for (i = 0;i < tmax;i++, out += stride) + { + for (j = 0;j < smax;j++) + { + l = (*bl++ * *stain++) >> shift;*out++ = min(l, 255); + l = (*bl++ * *stain++) >> shift;*out++ = min(l, 255); + l = (*bl++ * *stain++) >> shift;*out++ = min(l, 255); + } + } + } + + R_UpdateTexture(surf->lightmaptexture, templight); + } + else + { + int smax, tmax, i, j, size, size3, maps, stride, l; + float *bl, scale; + qbyte *lightmap, *out, *stain; + + // 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; + size = smax*tmax; + size3 = size*3; + lightmap = surf->samples; + + // set to full bright if no light data + bl = floatblocklights; + 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 + + // clear to no light + if (j) + { + for (i = 0;i < size3;i++) + *bl++ = j; + } + else + memset(bl, 0, size*3*sizeof(float)); + + if (surf->dlightframe == r_framecount && r_dlightmap.integer) + { + 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 + if (lightmap) + { + bl = floatblocklights; + for (maps = 0;maps < MAXLIGHTMAPS && surf->styles[maps] != 255;maps++, lightmap += size3) + for (scale = d_lightstylevalue[surf->styles[maps]], i = 0;i < size3;i++) + bl[i] += lightmap[i] * scale; + } + + stain = surf->stainsamples; + bl = floatblocklights; + out = templight; + // deal with lightmap brightness scale + scale = 1.0f / (1 << (7 + lightscalebit + 8)); + if (ent->model->lightmaprgba) + { + stride = (surf->lightmaptexturestride - smax) * 4; + for (i = 0;i < tmax;i++, out += stride) + { + for (j = 0;j < smax;j++) + { + l = *bl++ * *stain++ * scale;*out++ = min(l, 255); + l = *bl++ * *stain++ * scale;*out++ = min(l, 255); + l = *bl++ * *stain++ * scale;*out++ = min(l, 255); + *out++ = 255; + } + } + } + else + { + stride = (surf->lightmaptexturestride - smax) * 3; + for (i = 0;i < tmax;i++, out += stride) + { + for (j = 0;j < smax;j++) + { + l = *bl++ * *stain++ * scale;*out++ = min(l, 255); + l = *bl++ * *stain++ * scale;*out++ = min(l, 255); + l = *bl++ * *stain++ * scale;*out++ = min(l, 255); + } + } + } + + R_UpdateTexture(surf->lightmaptexture, templight); + } +} + void R_StainNode (mnode_t *node, model_t *model, vec3_t origin, float radius, int icolor[8]) { float ndist; @@ -179,8 +448,8 @@ void R_StainNode (mnode_t *node, model_t *model, vec3_t origin, float radius, in // for comparisons to minimum acceptable light - // compensate for 4096 offset - maxdist = radius * radius + 4096; + // compensate for 256 offset + maxdist = radius * radius + 256.0f; // clamp radius to avoid exceeding 32768 entry division table if (maxdist > 4194304) @@ -203,15 +472,22 @@ loc0: goto loc0; } - dist2 = ndist * ndist; - dist2 += 4096.0f; + dist2 = ndist * ndist + 256.0f; if (dist2 < maxdist) { maxdist3 = maxdist - dist2; - 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++) { @@ -319,373 +595,205 @@ void R_Stain (vec3_t origin, float radius, int cr1, int cg1, int cb1, int ca1, i icolor[7] = ca2; model = cl.worldmodel; - softwaretransformidentity(); - R_StainNode(model->nodes + model->hulls[0].firstclipnode, model, origin, radius, icolor); + if (model) + R_StainNode(model->nodes + model->hulls[0].firstclipnode, model, origin, radius, icolor); // look for embedded bmodels - for (n = 1;n < MAX_EDICTS;n++) + for (n = 0;n < cl_num_brushmodel_entities;n++) { - ent = &cl_entities[n].render; + ent = cl_brushmodel_entities[n]; model = ent->model; if (model && model->name[0] == '*') { Mod_CheckLoaded(model); if (model->type == mod_brush) { - softwaretransformforentity(ent); - softwareuntransform(origin, org); + Matrix4x4_Transform(&ent->inversematrix, origin, org); R_StainNode(model->nodes + model->hulls[0].firstclipnode, model, org, radius, icolor); } } } } + /* -=============== -R_BuildLightMap +============================================================= -Combine and scale multiple lightmaps into the 8.8 format in blocklights -=============== + BRUSH MODELS + +============================================================= */ -static void R_BuildLightMap (msurface_t *surf, int dlightchanged) + +static void RSurf_CopyXYZ(const surfvertex_t *in, float *out, int numverts) { - int smax, tmax, i, j, size, size3, shift, scale, maps, *bl, stride, l; - qbyte *lightmap, *out, *stain; - - // 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; - size = smax*tmax; - size3 = size*3; - lightmap = surf->samples; - -// set to full bright if no light data - if ((currentrenderentity->effects & EF_FULLBRIGHT) || !cl.worldmodel->lightdata) - { - bl = blocklights; - for (i = 0;i < size;i++) - { - *bl++ = 255*256; - *bl++ = 255*256; - *bl++ = 255*256; - } + int i; + for (i = 0;i < numverts;i++, in++, out += 4) + { + VectorCopy(in->v, out); + out[3] = 1; } - else +} + +static void RSurf_CopyST(const surfvertex_t *in, float *out, int numverts) +{ + int i; + for (i = 0;i < numverts;i++, in++, out += 2) { -// clear to no light - j = r_ambient.value * 512.0f; // would be 256.0f logically, but using 512.0f to match winquake style - if (j) + out[0] = in->st[0]; + out[1] = in->st[1]; + } +} + +static void RSurf_CopyUV(const surfvertex_t *in, float *out, int numverts) +{ + int i; + for (i = 0;i < numverts;i++, in++, out += 2) + { + out[0] = in->uv[0]; + out[1] = in->uv[1]; + } +} + +static void RSurf_CopyAB(const surfvertex_t *in, float *out, int numverts) +{ + int i; + for (i = 0;i < numverts;i++, in++, out += 2) + { + out[0] = in->ab[0]; + out[1] = in->ab[1]; + } +} + +static void RSurf_AddLightmapToVertexColors(const surfvertex_t *in, float *c, int numverts, const qbyte *samples, int size3, const qbyte *styles) +{ + int i; + float scale; + const qbyte *lm; + if (styles[0] != 255) + { + for (i = 0;i < numverts;i++, in++, c += 4) { - bl = blocklights; - for (i = 0;i < size3;i++) - *bl++ = j; + lm = samples + in->lightmapoffset; + scale = d_lightstylevalue[styles[0]] * (1.0f / 32768.0f); + VectorMA(c, scale, lm, c); + if (styles[1] != 255) + { + lm += size3; + scale = d_lightstylevalue[styles[1]] * (1.0f / 32768.0f); + VectorMA(c, scale, lm, c); + if (styles[2] != 255) + { + 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); + } + } + } } - else - memset(&blocklights[0], 0, size*3*sizeof(int)); + } +} - if (surf->dlightframe == r_framecount && r_dlightmap.integer) +static void RSurf_FogColors(const float *v, float *c, float colorscale, int numverts, const float *modelorg) +{ + int i; + float diff[3], f; + if (fogenabled) + { + for (i = 0;i < numverts;i++, v += 4, c += 4) { - surf->cached_dlight = R_AddDynamicLights(surf); - if (surf->cached_dlight) - c_light_polys++; - else if (dlightchanged) - return; // don't upload if only updating dlights and none mattered + VectorSubtract(v, modelorg, diff); + f = colorscale * (1 - exp(fogdensity/DotProduct(diff, diff))); + VectorScale(c, f, c); } - -// add all the lightmaps - if (lightmap) - for (maps = 0;maps < MAXLIGHTMAPS && surf->styles[maps] != 255;maps++) - for (scale = d_lightstylevalue[surf->styles[maps]], bl = blocklights, i = 0;i < size3;i++) - *bl++ += *lightmap++ * scale; } + else if (colorscale != 1) + for (i = 0;i < numverts;i++, c += 4) + VectorScale(c, colorscale, c); +} - stain = surf->stainsamples; - if (stain) - for (bl = blocklights, i = 0;i < size3;i++) - if (stain[i] < 255) - bl[i] = (bl[i] * stain[i]) >> 8; - - bl = blocklights; - out = templight; - // deal with lightmap brightness scale - shift = 7 + lightscalebit; - if (currentrenderentity->model->lightmaprgba) +static void RSurf_FoggedColors(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) { - stride = (surf->lightmaptexturestride - smax) * 4; - for (i = 0;i < tmax;i++, out += stride) + for (i = 0;i < numverts;i++, v += 4, c += 4) { - for (j = 0;j < smax;j++) - { - l = *bl++ >> shift;*out++ = min(l, 255); - l = *bl++ >> shift;*out++ = min(l, 255); - l = *bl++ >> shift;*out++ = min(l, 255); - *out++ = 255; - } + 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; } } else { - stride = (surf->lightmaptexturestride - smax) * 3; - for (i = 0;i < tmax;i++, out += stride) + for (i = 0;i < numverts;i++, c += 4) { - for (j = 0;j < smax;j++) - { - l = *bl++ >> shift;*out++ = min(l, 255); - l = *bl++ >> shift;*out++ = min(l, 255); - l = *bl++ >> shift;*out++ = min(l, 255); - } + c[0] = r; + c[1] = g; + c[2] = b; + c[3] = a; } } - - R_UpdateTexture(surf->lightmaptexture, templight); } -/* -=============== -R_TextureAnimation - -Returns the proper texture for a given time and base texture -=============== -*/ -/* -// note: this was manually inlined in R_PrepareSurfaces -static texture_t *R_TextureAnimation (texture_t *base) -{ - if (currentrenderentity->frame && base->alternate_anims != NULL) - base = base->alternate_anims; - - if (base->anim_total < 2) - return base; - - return base->anim_frames[(int)(cl.time * 5.0f) % base->anim_total]; -} -*/ - - -/* -============================================================= - - BRUSH MODELS - -============================================================= -*/ - - -static float turbsin[256] = -{ - #include "gl_warp_sin.h" -}; -#define TURBSCALE (256.0 / (2 * M_PI)) - -#define MAX_SURFVERTS 1024 -typedef struct +static void RSurf_FogPassColors(const float *v, float *c, float r, float g, float b, float a, float colorscale, int numverts, const float *modelorg) { - float v[4]; - float st[2]; - float uv[2]; - float c[4]; + int i; + float diff[3], f; + r *= colorscale; + g *= colorscale; + b *= colorscale; + for (i = 0;i < numverts;i++, v += 4, 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; + } } -surfvert_t; -static surfvert_t svert[MAX_SURFVERTS]; // used by the following functions -static int RSurfShader_Sky(int stage, msurface_t *s) +static void RSurf_ScaleColors(float *c, float scale, int numverts) { - int i; - float number, length, dir[3], speedscale; - surfvertex_t *v; - surfvert_t *sv; - rmeshinfo_t m; - - // LordHavoc: HalfLife maps have freaky skypolys... - if (currentrenderentity->model->ishlbsp) - return true; - - if (stage == 0) - { - if (skyrendermasked) - { - if (skyrendernow) - { - skyrendernow = false; - R_Sky(); - } - // draw depth-only polys - memset(&m, 0, sizeof(m)); - m.transparent = false; - m.blendfunc1 = GL_ZERO; - m.blendfunc2 = GL_ONE; - m.depthwrite = true; - m.numtriangles = s->mesh.numtriangles; - m.numverts = s->mesh.numverts; - m.index = s->mesh.index; - //m.cr = 0; - //m.cg = 0; - //m.cb = 0; - //m.ca = 0; - if (softwaretransform_complexity) - { - m.vertex = &svert[0].v[0]; - m.vertexstep = sizeof(surfvert_t); - for (i = 0, sv = svert, v = s->mesh.vertex;i < m.numverts;i++, sv++, v++) - softwaretransform(v->v, sv->v); - } - else - { - m.vertex = &s->mesh.vertex[0].v[0]; - m.vertexstep = sizeof(surfvertex_t); - } - R_Mesh_Draw(&m); - } - else if (skyrenderglquake) - { - memset(&m, 0, sizeof(m)); - m.transparent = false; - m.blendfunc1 = GL_ONE; - m.blendfunc2 = GL_ZERO; - m.numtriangles = s->mesh.numtriangles; - m.numverts = s->mesh.numverts; - m.index = s->mesh.index; - 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 (i = 0, sv = svert, v = s->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 - *((long *)&length) = 0x5f3759df - ((* (long *) &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); - } - else - { - // flat color - memset(&m, 0, sizeof(m)); - m.transparent = false; - m.blendfunc1 = GL_ONE; - m.blendfunc2 = GL_ZERO; - m.numtriangles = s->mesh.numtriangles; - m.numverts = s->mesh.numverts; - m.index = s->mesh.index; - m.cr = fogcolor[0]; - m.cg = fogcolor[1]; - m.cb = fogcolor[2]; - m.ca = 1; - if (softwaretransform_complexity) - { - m.vertex = &svert[0].v[0]; - m.vertexstep = sizeof(surfvert_t); - for (i = 0, sv = svert, v = s->mesh.vertex;i < m.numverts;i++, sv++, v++) - softwaretransform(v->v, sv->v); - } - else - { - m.vertex = &s->mesh.vertex[0].v[0]; - m.vertexstep = sizeof(surfvertex_t); - } - R_Mesh_Draw(&m); - } - return false; - } - else if (stage == 1) - { - if (skyrenderglquake) - { - memset(&m, 0, sizeof(m)); - m.transparent = false; - m.blendfunc1 = GL_SRC_ALPHA; - m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA; - m.numtriangles = s->mesh.numtriangles; - m.numverts = s->mesh.numverts; - m.index = s->mesh.index; - 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 (i = 0, sv = svert, v = s->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 - *((long *)&length) = 0x5f3759df - ((* (long *) &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); - return false; - } - return true; - } - else - return true; + int i; + if (scale != 1) + for (i = 0;i < numverts;i++, c += 4) + VectorScale(c, scale, c); } -static int RSurf_Light(int *dlightbits, int numverts) +static int RSurf_LightSeparate(const matrix4x4_t *matrix, const int *dlightbits, int numverts, const float *vert, float *color) { - 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; + 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 += 4, 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; + VectorMA(c, f, rd->light, c); lit = true; } } @@ -694,1298 +802,976 @@ static int RSurf_Light(int *dlightbits, int numverts) return lit; } -static void RSurfShader_Water_Pass_Base(msurface_t *s) +// note: this untransforms lights to do the checking, +// and takes surf->mesh->vertex data +static int RSurf_LightCheck(const matrix4x4_t *matrix, const int *dlightbits, surfmesh_t *mesh) { - int i; - float diff[3], alpha, ifog; - surfvertex_t *v; - surfvert_t *sv; - rmeshinfo_t m; - alpha = currentrenderentity->alpha * (s->flags & SURF_DRAWNOALPHA ? 1 : r_wateralpha.value); - - memset(&m, 0, sizeof(m)); - if (alpha != 1 || s->currenttexture->fogtexture != NULL) - { - 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.numtriangles = s->mesh.numtriangles; - m.numverts = s->mesh.numverts; - m.index = s->mesh.index; - 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(s->currenttexture->texture); - m.texcoords[0] = &svert[0].st[0]; - m.texcoordstep[0] = sizeof(surfvert_t); - for (i = 0, sv = svert, v = s->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 (s->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 (s->dlightframe == r_framecount && !(s->flags & SURF_DRAWFULLBRIGHT)) - RSurf_Light(s->dlightbits, m.numverts); - if (fogenabled && (s->flags & SURF_DRAWNOALPHA)) + int i, l; + rdlight_t *rd; + vec3_t lightorigin; + surfvertex_t *sv; + for (l = 0;l < r_numdlights;l++) { - for (i = 0, sv = svert;i < m.numverts;i++, sv++) + if (dlightbits[l >> 5] & (1 << (l & 31))) { - 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; + rd = &r_dlight[l]; + Matrix4x4_Transform(matrix, rd->origin, lightorigin); + for (i = 0, sv = mesh->vertex;i < mesh->numverts;i++, sv++) + if (VectorDistance2(sv->v, lightorigin) < rd->cullradius2) + return true; } } - R_Mesh_Draw(&m); + return false; } -static void RSurfShader_Water_Pass_Glow(msurface_t *s) +static void RSurfShader_Sky(const entity_render_t *ent, const msurface_t *firstsurf) { - int i; - float diff[3], alpha, ifog; - surfvertex_t *v; - surfvert_t *sv; - rmeshinfo_t m; - alpha = currentrenderentity->alpha * (s->flags & SURF_DRAWNOALPHA ? 1 : r_wateralpha.value); + const msurface_t *surf; + surfmesh_t *mesh; + rmeshbufferinfo_t m; - memset(&m, 0, sizeof(m)); - m.transparent = alpha != 1 || s->currenttexture->fogtexture != NULL; - m.blendfunc1 = GL_SRC_ALPHA; - m.blendfunc2 = GL_ONE; - m.numtriangles = s->mesh.numtriangles; - m.numverts = s->mesh.numverts; - m.index = s->mesh.index; - 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(s->currenttexture->glowtexture); - m.texcoords[0] = &svert[0].st[0]; - m.texcoordstep[0] = sizeof(surfvert_t); - if (fogenabled) - { - m.color = &svert[0].c[0]; - m.colorstep = sizeof(surfvert_t); - for (i = 0, sv = svert, v = s->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 + // LordHavoc: HalfLife maps have freaky skypolys... + if (ent->model->ishlbsp) + return; + + if (skyrendernow) { - for (i = 0, sv = svert, v = s->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); - } + skyrendernow = false; + if (skyrendermasked) + R_Sky(); } - R_Mesh_Draw(&m); -} - -static void RSurfShader_Water_Pass_Fog(msurface_t *s) -{ - int i; - float alpha; - surfvertex_t *v; - surfvert_t *sv; - rmeshinfo_t m; - vec3_t diff; - alpha = currentrenderentity->alpha * (s->flags & SURF_DRAWNOALPHA ? 1 : r_wateralpha.value); + // draw depth-only polys memset(&m, 0, sizeof(m)); - m.transparent = alpha != 1 || s->currenttexture->fogtexture != NULL; - m.blendfunc1 = GL_SRC_ALPHA; - m.blendfunc2 = GL_ONE; - m.numtriangles = s->mesh.numtriangles; - m.numverts = s->mesh.numverts; - m.index = s->mesh.index; - 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(s->currenttexture->fogtexture); - m.texcoords[0] = &svert[0].st[0]; - m.texcoordstep[0] = sizeof(surfvert_t); - - for (i = 0, sv = svert, v = s->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 (m.tex[0]) - { - 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); - sv->c[0] = fogcolor[0]; - sv->c[1] = fogcolor[1]; - sv->c[2] = fogcolor[2]; - sv->c[3] = alpha * exp(fogdensity/DotProduct(diff, diff)); + if (skyrendermasked) + { + m.blendfunc1 = GL_ZERO; + m.blendfunc2 = GL_ONE; } - R_Mesh_Draw(&m); -} - -static int RSurfShader_Water(int stage, msurface_t *s) -{ - switch(stage) + else { - case 0: - RSurfShader_Water_Pass_Base(s); - return false; - case 1: - if (fogenabled) - { - if (currentrenderentity->alpha * (s->flags & SURF_DRAWNOALPHA ? 1 : r_wateralpha.value) >= 1.0f) - RSurfShader_Water_Pass_Fog(s); - return false; - } - else - return true; - default: - return true; + // fog sky + m.blendfunc1 = GL_ONE; + m.blendfunc2 = GL_ZERO; } -} - -static int RSurfShader_Water_Glow(int stage, msurface_t *s) -{ - switch(stage) - { - case 0: - RSurfShader_Water_Pass_Base(s); - return false; - case 1: - RSurfShader_Water_Pass_Glow(s); - return false; - case 2: - if (fogenabled) + m.depthwrite = true; + m.matrix = ent->matrix; + for (surf = firstsurf;surf;surf = surf->chain) + { + for (mesh = surf->mesh;mesh;mesh = mesh->chain) { - if (currentrenderentity->alpha * (s->flags & SURF_DRAWNOALPHA ? 1 : r_wateralpha.value) >= 1.0f) - RSurfShader_Water_Pass_Fog(s); - return false; + m.numtriangles = mesh->numtriangles; + m.numverts = mesh->numverts; + if (R_Mesh_Draw_GetBuffer(&m, false)) + { + memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3])); + RSurf_CopyXYZ(mesh->vertex, m.vertex, m.numverts); + if (skyrendermasked) + memset(m.color, 0, m.numverts * sizeof(float[4])); + else + R_FillColors(m.color, m.numverts, fogcolor[0] * m.colorscale, fogcolor[1] * m.colorscale, fogcolor[2] * m.colorscale, 1); + R_Mesh_Render(); + } } - else - return true; - default: - return true; } } -static void RSurfShader_Wall_Pass_BaseMTex(msurface_t *s) +static void RSurfShader_Water_Callback(const void *calldata1, int calldata2) { - int i; - float diff[3], ifog; - surfvertex_t *v; - surfvert_t *sv; - rmeshinfo_t m; + const entity_render_t *ent = calldata1; + msurface_t *surf = ent->model->surfaces + calldata2; + float f; + surfmesh_t *mesh; + rmeshbufferinfo_t m; + float alpha = ent->alpha * (surf->flags & SURF_DRAWNOALPHA ? 1 : r_wateralpha.value); + float modelorg[3]; + Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg); memset(&m, 0, sizeof(m)); - if (currentrenderentity->effects & EF_ADDITIVE) + if (ent->effects & EF_ADDITIVE) { - m.transparent = true; m.blendfunc1 = GL_SRC_ALPHA; m.blendfunc2 = GL_ONE; } - else if (s->currenttexture->fogtexture != NULL || currentrenderentity->alpha != 1) + else if (surf->currenttexture->fogtexture != NULL || 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.numtriangles = s->mesh.numtriangles; - m.numverts = s->mesh.numverts; - m.index = s->mesh.index; - m.cr = m.cg = m.cb = (float) (1 << lightscalebit); - m.ca = currentrenderentity->alpha; - m.tex[0] = R_GetTexture(s->currenttexture->texture); - m.tex[1] = R_GetTexture(s->lightmaptexture); - m.texcoords[0] = &s->mesh.vertex->st[0]; - m.texcoords[1] = &s->mesh.vertex->uv[0]; - m.texcoordstep[0] = sizeof(surfvertex_t); - m.texcoordstep[1] = sizeof(surfvertex_t); - if (fogenabled) + m.tex[0] = R_GetTexture(surf->currenttexture->texture); + m.matrix = ent->matrix; + for (mesh = surf->mesh;mesh;mesh = mesh->chain) { - 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 = s->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 + m.numtriangles = mesh->numtriangles; + m.numverts = mesh->numverts; + if (R_Mesh_Draw_GetBuffer(&m, true)) { - m.vertex = &s->mesh.vertex->v[0]; - m.vertexstep = sizeof(surfvertex_t); - for (i = 0, sv = svert, v = s->mesh.vertex;i < m.numverts;i++, sv++, v++) + memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3])); + RSurf_CopyXYZ(mesh->vertex, m.vertex, m.numverts); + RSurf_CopyST(mesh->vertex, m.texcoords[0], m.numverts); + f = surf->flags & SURF_DRAWFULLBRIGHT ? 1.0f : ((surf->flags & SURF_LIGHTMAP) ? 0 : 0.5f); + R_FillColors(m.color, m.numverts, f, f, f, alpha); + if (!(surf->flags & SURF_DRAWFULLBRIGHT || ent->effects & EF_FULLBRIGHT)) { - 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; + if (surf->dlightframe == r_framecount) + RSurf_LightSeparate(&ent->inversematrix, surf->dlightbits, m.numverts, m.vertex, m.color); + if (surf->flags & SURF_LIGHTMAP) + RSurf_AddLightmapToVertexColors(mesh->vertex, m.color, m.numverts, surf->samples, ((surf->extents[0]>>4)+1)*((surf->extents[1]>>4)+1)*3, surf->styles); } + RSurf_FogColors(m.vertex, m.color, m.colorscale, m.numverts, modelorg); + R_Mesh_Render(); } } - else - { - if (softwaretransform_complexity) - { - m.vertex = &svert[0].v[0]; - m.vertexstep = sizeof(surfvert_t); - for (i = 0, sv = svert, v = s->mesh.vertex;i < m.numverts;i++, sv++, v++) - softwaretransform(v->v, sv->v); - } - else - { - m.vertex = &s->mesh.vertex->v[0]; - m.vertexstep = sizeof(surfvertex_t); - } - } - R_Mesh_Draw(&m); -} - -static void RSurfShader_Wall_Pass_BaseTexture(msurface_t *s) -{ - int i; - surfvertex_t *v; - surfvert_t *sv; - rmeshinfo_t m; - - memset(&m, 0, sizeof(m)); - m.transparent = false; - m.blendfunc1 = GL_ONE; - m.blendfunc2 = GL_ZERO; - m.numtriangles = s->mesh.numtriangles; - m.numverts = s->mesh.numverts; - m.index = s->mesh.index; - m.cr = m.cg = m.cb = (float) (1 << v_overbrightbits.integer); - m.ca = 1; - m.tex[0] = R_GetTexture(s->currenttexture->texture); - m.texcoords[0] = &s->mesh.vertex->st[0]; - m.texcoordstep[0] = sizeof(surfvertex_t); - if (softwaretransform_complexity) - { - m.vertex = &svert[0].v[0]; - m.vertexstep = sizeof(surfvert_t); - for (i = 0, sv = svert, v = s->mesh.vertex;i < m.numverts;i++, sv++, v++) - softwaretransform(v->v, sv->v); - } - else - { - m.vertex = &s->mesh.vertex->v[0]; - m.vertexstep = sizeof(surfvertex_t); - } - R_Mesh_Draw(&m); -} - -static void RSurfShader_Wall_Pass_BaseLightmap(msurface_t *s) -{ - int i; - float diff[3], ifog; - surfvertex_t *v; - surfvert_t *sv; - rmeshinfo_t m; - memset(&m, 0, sizeof(m)); - m.transparent = false; - m.blendfunc1 = GL_ZERO; - m.blendfunc2 = GL_SRC_COLOR; - m.numtriangles = s->mesh.numtriangles; - m.numverts = s->mesh.numverts; - m.index = s->mesh.index; - m.cr = m.cg = m.cb = (float) (1 << v_overbrightbits.integer); - m.ca = 1; - m.tex[0] = R_GetTexture(s->lightmaptexture); - m.texcoords[0] = &s->mesh.vertex->uv[0]; - m.texcoordstep[0] = sizeof(surfvertex_t); if (fogenabled) { - 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 = s->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 + memset(&m, 0, sizeof(m)); + m.blendfunc1 = GL_SRC_ALPHA; + m.blendfunc2 = GL_ONE; + m.tex[0] = R_GetTexture(surf->currenttexture->fogtexture); + m.matrix = ent->matrix; + for (mesh = surf->mesh;mesh;mesh = mesh->chain) { - m.vertex = &s->mesh.vertex->v[0]; - m.vertexstep = sizeof(surfvertex_t); - for (i = 0, sv = svert, v = s->mesh.vertex;i < m.numverts;i++, sv++, v++) + m.numtriangles = mesh->numtriangles; + m.numverts = mesh->numverts; + if (R_Mesh_Draw_GetBuffer(&m, false)) { - 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; + memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3])); + RSurf_CopyXYZ(mesh->vertex, m.vertex, m.numverts); + if (m.tex[0]) + RSurf_CopyST(mesh->vertex, m.texcoords[0], m.numverts); + RSurf_FogPassColors(m.vertex, m.color, fogcolor[0], fogcolor[1], fogcolor[2], alpha, m.colorscale, m.numverts, modelorg); + R_Mesh_Render(); } } } - else +} + +static void RSurfShader_Water(const entity_render_t *ent, const msurface_t *firstsurf) +{ + const msurface_t *surf; + vec3_t center; + for (surf = firstsurf;surf;surf = surf->chain) { - if (softwaretransform_complexity) + if ((r_wateralpha.value < 1 && !(surf->flags & SURF_DRAWNOALPHA)) || ent->effects & EF_ADDITIVE || surf->currenttexture->fogtexture) { - m.vertex = &svert[0].v[0]; - m.vertexstep = sizeof(surfvert_t); - for (i = 0, sv = svert, v = s->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_Water_Callback, ent, surf - ent->model->surfaces); } else - { - m.vertex = &s->mesh.vertex->v[0]; - m.vertexstep = sizeof(surfvertex_t); - } + R_MeshQueue_Add(RSurfShader_Water_Callback, ent, surf - ent->model->surfaces); } - R_Mesh_Draw(&m); } -static void RSurfShader_Wall_Pass_BaseVertex(msurface_t *s) +static void RSurfShader_Wall_Pass_BaseVertex(const entity_render_t *ent, const msurface_t *surf) { - int i, size3; - float c[3], base[3], scale, diff[3], ifog; - surfvertex_t *v; - surfvert_t *sv; - rmeshinfo_t m; - qbyte *lm; - - size3 = ((s->extents[0]>>4)+1)*((s->extents[1]>>4)+1)*3; - - base[0] = base[1] = base[2] = r_ambient.value * (1.0f / 128.0f); - + float base; + surfmesh_t *mesh; + rmeshbufferinfo_t m; + float modelorg[3]; + Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg); memset(&m, 0, sizeof(m)); - if (currentrenderentity->effects & EF_ADDITIVE) + if (ent->effects & EF_ADDITIVE) { - m.transparent = true; m.blendfunc1 = GL_SRC_ALPHA; m.blendfunc2 = GL_ONE; } - else if (s->currenttexture->fogtexture != NULL || currentrenderentity->alpha != 1) + else if (surf->currenttexture->fogtexture != NULL || ent->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.numtriangles = s->mesh.numtriangles; - m.numverts = s->mesh.numverts; - m.index = s->mesh.index; - 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(s->currenttexture->texture); - m.texcoords[0] = &s->mesh.vertex->st[0]; - m.texcoordstep[0] = sizeof(surfvertex_t); - for (i = 0, sv = svert, v = s->mesh.vertex;i < m.numverts;i++, sv++, v++) - { - softwaretransform(v->v, sv->v); - VectorCopy(base, c); - if (s->styles[0] != 255) + m.tex[0] = R_GetTexture(surf->currenttexture->texture); + base = ent->effects & EF_FULLBRIGHT ? 2.0f : r_ambient.value * (1.0f / 64.0f); + m.matrix = ent->matrix; + for (mesh = surf->mesh;mesh;mesh = mesh->chain) + { + m.numtriangles = mesh->numtriangles; + m.numverts = mesh->numverts; + if (R_Mesh_Draw_GetBuffer(&m, true)) { - lm = s->samples + v->lightmapoffset; - scale = d_lightstylevalue[s->styles[0]] * (1.0f / 32768.0f); - VectorMA(c, scale, lm, c); - if (s->styles[1] != 255) + memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3])); + RSurf_CopyXYZ(mesh->vertex, m.vertex, m.numverts); + RSurf_CopyST(mesh->vertex, m.texcoords[0], m.numverts); + R_FillColors(m.color, m.numverts, base, base, base, ent->alpha); + if (!(ent->effects & EF_FULLBRIGHT)) { - lm += size3; - scale = d_lightstylevalue[s->styles[1]] * (1.0f / 32768.0f); - VectorMA(c, scale, lm, c); - if (s->styles[2] != 255) - { - lm += size3; - scale = d_lightstylevalue[s->styles[2]] * (1.0f / 32768.0f); - VectorMA(c, scale, lm, c); - if (s->styles[3] != 255) - { - lm += size3; - scale = d_lightstylevalue[s->styles[3]] * (1.0f / 32768.0f); - VectorMA(c, scale, lm, c); - } - } + if (surf->dlightframe == r_framecount) + RSurf_LightSeparate(&ent->inversematrix, surf->dlightbits, m.numverts, m.vertex, m.color); + if (surf->flags & SURF_LIGHTMAP) + RSurf_AddLightmapToVertexColors(mesh->vertex, m.color, m.numverts, surf->samples, ((surf->extents[0]>>4)+1)*((surf->extents[1]>>4)+1)*3, surf->styles); } - } - sv->c[0] = c[0]; - sv->c[1] = c[1]; - sv->c[2] = c[2]; - sv->c[3] = currentrenderentity->alpha; - } - if (s->dlightframe == r_framecount) - RSurf_Light(s->dlightbits, m.numverts); - if (fogenabled) - { - for (i = 0, sv = svert, v = s->mesh.vertex;i < m.numverts;i++, 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; + RSurf_FogColors(m.vertex, m.color, m.colorscale, m.numverts, modelorg); + R_Mesh_Render(); } } - R_Mesh_Draw(&m); } -static void RSurfShader_Wall_Pass_BaseFullbright(msurface_t *s) +static void RSurfShader_Wall_Pass_BaseFullbright(const entity_render_t *ent, const msurface_t *surf) { - int i; - float diff[3], ifog; - surfvertex_t *v; - surfvert_t *sv; - rmeshinfo_t m; - + surfmesh_t *mesh; + rmeshbufferinfo_t m; + float modelorg[3]; + Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg); memset(&m, 0, sizeof(m)); - if (currentrenderentity->effects & EF_ADDITIVE) + if (ent->effects & EF_ADDITIVE) { - m.transparent = true; m.blendfunc1 = GL_SRC_ALPHA; m.blendfunc2 = GL_ONE; } - else if (s->currenttexture->fogtexture != NULL || currentrenderentity->alpha != 1) + else if (surf->currenttexture->fogtexture != NULL || ent->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.numtriangles = s->mesh.numtriangles; - m.numverts = s->mesh.numverts; - m.index = s->mesh.index; - m.vertex = &svert[0].v[0]; - m.vertexstep = sizeof(surfvert_t); - m.tex[0] = R_GetTexture(s->currenttexture->texture); - m.texcoords[0] = &s->mesh.vertex->st[0]; - m.texcoordstep[0] = sizeof(surfvertex_t); - if (fogenabled) + m.tex[0] = R_GetTexture(surf->currenttexture->texture); + m.matrix = ent->matrix; + for (mesh = surf->mesh;mesh;mesh = mesh->chain) { - m.color = &svert[0].c[0]; - m.colorstep = sizeof(surfvert_t); - for (i = 0, sv = svert, v = s->mesh.vertex;i < m.numverts;i++, sv++, v++) + m.numtriangles = mesh->numtriangles; + m.numverts = mesh->numverts; + if (R_Mesh_Draw_GetBuffer(&m, false)) { - 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; + memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3])); + RSurf_CopyXYZ(mesh->vertex, m.vertex, m.numverts); + RSurf_CopyST(mesh->vertex, m.texcoords[0], m.numverts); + RSurf_FoggedColors(m.vertex, m.color, 1, 1, 1, ent->alpha, m.colorscale, m.numverts, modelorg); + R_Mesh_Render(); } } - else - { - m.cr = m.cg = m.cb = 1; - m.ca = currentrenderentity->alpha; - for (i = 0, sv = svert, v = s->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 *s) +static void RSurfShader_Wall_Pass_Glow(const entity_render_t *ent, const msurface_t *surf) { - int i; - float diff[3], ifog; - surfvertex_t *v; - surfvert_t *sv; - rmeshinfo_t m; - + surfmesh_t *mesh; + rmeshbufferinfo_t m; + float modelorg[3]; + Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg); memset(&m, 0, sizeof(m)); - if (currentrenderentity->effects & EF_ADDITIVE) - m.transparent = true; - else if (s->currenttexture->fogtexture != NULL || currentrenderentity->alpha != 1) - m.transparent = true; - else - m.transparent = false; m.blendfunc1 = GL_SRC_ALPHA; m.blendfunc2 = GL_ONE; - m.numtriangles = s->mesh.numtriangles; - m.numverts = s->mesh.numverts; - m.index = s->mesh.index; - 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(s->currenttexture->texture); - m.texcoords[0] = &s->mesh.vertex->st[0]; - m.texcoordstep[0] = sizeof(surfvertex_t); - for (i = 0, sv = svert, v = s->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(s->dlightbits, m.numverts)) + m.tex[0] = R_GetTexture(surf->currenttexture->glowtexture); + m.matrix = ent->matrix; + for (mesh = surf->mesh;mesh;mesh = mesh->chain) { - if (fogenabled) + m.numtriangles = mesh->numtriangles; + m.numverts = mesh->numverts; + if (R_Mesh_Draw_GetBuffer(&m, false)) { - 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; - } + memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3])); + RSurf_CopyXYZ(mesh->vertex, m.vertex, m.numverts); + RSurf_CopyST(mesh->vertex, m.texcoords[0], m.numverts); + RSurf_FoggedColors(m.vertex, m.color, 1, 1, 1, ent->alpha, m.colorscale, m.numverts, modelorg); + R_Mesh_Render(); } - R_Mesh_Draw(&m); } } -static void RSurfShader_Wall_Pass_Glow(msurface_t *s) +static void RSurfShader_Wall_Pass_Fog(const entity_render_t *ent, const msurface_t *surf) { - int i; - float diff[3], ifog; - surfvertex_t *v; - surfvert_t *sv; - rmeshinfo_t m; - + surfmesh_t *mesh; + rmeshbufferinfo_t m; + float modelorg[3]; + Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg); memset(&m, 0, sizeof(m)); - if (currentrenderentity->effects & EF_ADDITIVE) - m.transparent = true; - else if (s->currenttexture->fogtexture != NULL || currentrenderentity->alpha != 1) - m.transparent = true; - else - m.transparent = false; m.blendfunc1 = GL_SRC_ALPHA; m.blendfunc2 = GL_ONE; - m.numtriangles = s->mesh.numtriangles; - m.numverts = s->mesh.numverts; - m.index = s->mesh.index; - m.cr = 1; - m.cg = 1; - m.cb = 1; - m.ca = currentrenderentity->alpha; - m.tex[0] = R_GetTexture(s->currenttexture->glowtexture); - m.texcoords[0] = &s->mesh.vertex->st[0]; - m.texcoordstep[0] = sizeof(surfvertex_t); - if (fogenabled) + m.matrix = ent->matrix; + m.tex[0] = R_GetTexture(surf->currenttexture->fogtexture); + for (mesh = surf->mesh;mesh;mesh = mesh->chain) { - 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 = s->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 + m.numtriangles = mesh->numtriangles; + m.numverts = mesh->numverts; + if (R_Mesh_Draw_GetBuffer(&m, false)) { - m.vertex = &s->mesh.vertex->v[0]; - m.vertexstep = sizeof(surfvertex_t); - for (i = 0, sv = svert, v = s->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; - } + memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3])); + RSurf_CopyXYZ(mesh->vertex, m.vertex, m.numverts); + if (m.tex[0]) + RSurf_CopyST(mesh->vertex, m.texcoords[0], m.numverts); + RSurf_FogPassColors(m.vertex, m.color, fogcolor[0], fogcolor[1], fogcolor[2], ent->alpha, m.colorscale, m.numverts, modelorg); + R_Mesh_Render(); } } - else - { - if (softwaretransform_complexity) - { - m.vertex = &svert[0].v[0]; - m.vertexstep = sizeof(surfvert_t); - for (i = 0, sv = svert, v = s->mesh.vertex;i < m.numverts;i++, sv++, v++) - softwaretransform(v->v, sv->v); - } - else - { - m.vertex = &s->mesh.vertex->v[0]; - m.vertexstep = sizeof(surfvertex_t); +} + +static void RSurfShader_OpaqueWall_Pass_TripleTexCombine(const entity_render_t *ent, const msurface_t *surf) +{ + surfmesh_t *mesh; + rmeshbufferinfo_t m; + float cl; + memset(&m, 0, sizeof(m)); + m.blendfunc1 = GL_ONE; + m.blendfunc2 = GL_ZERO; + m.tex[0] = R_GetTexture(surf->currenttexture->texture); + m.texrgbscale[0] = 1.0f; + m.tex[1] = R_GetTexture(surf->lightmaptexture); + m.texrgbscale[1] = 4.0f; + m.tex[2] = R_GetTexture(surf->currenttexture->detailtexture); + m.texrgbscale[2] = 2.0f; + m.matrix = ent->matrix; + for (mesh = surf->mesh;mesh;mesh = mesh->chain) + { + m.numtriangles = mesh->numtriangles; + m.numverts = mesh->numverts; + if (R_Mesh_Draw_GetBuffer(&m, false)) + { + memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3])); + RSurf_CopyXYZ(mesh->vertex, m.vertex, m.numverts); + cl = (float) (1 << lightscalebit) * m.colorscale; + R_FillColors(m.color, m.numverts, cl, cl, cl, 1); + RSurf_CopyST(mesh->vertex, m.texcoords[0], m.numverts); + RSurf_CopyUV(mesh->vertex, m.texcoords[1], m.numverts); + RSurf_CopyAB(mesh->vertex, m.texcoords[2], m.numverts); + R_Mesh_Render(); } } - R_Mesh_Draw(&m); } -static void RSurfShader_Wall_Pass_Fog(msurface_t *s) +static void RSurfShader_OpaqueWall_Pass_BaseMTex(const entity_render_t *ent, const msurface_t *surf) { - int i; - surfvertex_t *v; - surfvert_t *sv; - rmeshinfo_t m; - vec3_t diff; - + surfmesh_t *mesh; + rmeshbufferinfo_t m; + float cl; memset(&m, 0, sizeof(m)); - if (currentrenderentity->effects & EF_ADDITIVE) - m.transparent = true; - else if (s->currenttexture->fogtexture != NULL || currentrenderentity->alpha != 1) - m.transparent = true; - else - m.transparent = false; - m.blendfunc1 = GL_SRC_ALPHA; - m.blendfunc2 = GL_ONE; - m.numtriangles = s->mesh.numtriangles; - m.numverts = s->mesh.numverts; - m.index = s->mesh.index; - m.color = &svert[0].c[0]; - m.colorstep = sizeof(surfvert_t); - m.tex[0] = R_GetTexture(s->currenttexture->fogtexture); - m.texcoords[0] = &s->mesh.vertex->st[0]; - m.texcoordstep[0] = sizeof(surfvertex_t); - if (softwaretransform_complexity) - { - m.vertex = &svert[0].v[0]; - m.vertexstep = sizeof(surfvert_t); - for (i = 0, sv = svert, v = s->mesh.vertex;i < m.numverts;i++, sv++, v++) + m.blendfunc1 = GL_ONE; + m.blendfunc2 = GL_ZERO; + m.tex[0] = R_GetTexture(surf->currenttexture->texture); + m.tex[1] = R_GetTexture(surf->lightmaptexture); + m.matrix = ent->matrix; + for (mesh = surf->mesh;mesh;mesh = mesh->chain) + { + m.numtriangles = mesh->numtriangles; + m.numverts = mesh->numverts; + if (R_Mesh_Draw_GetBuffer(&m, true)) { - 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)); + memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3])); + RSurf_CopyXYZ(mesh->vertex, m.vertex, m.numverts); + cl = (float) (1 << lightscalebit) * m.colorscale; + R_FillColors(m.color, m.numverts, cl, cl, cl, 1); + RSurf_CopyST(mesh->vertex, m.texcoords[0], m.numverts); + RSurf_CopyUV(mesh->vertex, m.texcoords[1], m.numverts); + R_Mesh_Render(); } } - else +} + +static void RSurfShader_OpaqueWall_Pass_BaseTexture(const entity_render_t *ent, const msurface_t *surf) +{ + surfmesh_t *mesh; + rmeshbufferinfo_t m; + float cl; + memset(&m, 0, sizeof(m)); + m.blendfunc1 = GL_ONE; + m.blendfunc2 = GL_ZERO; + m.tex[0] = R_GetTexture(surf->currenttexture->texture); + m.matrix = ent->matrix; + for (mesh = surf->mesh;mesh;mesh = mesh->chain) { - m.vertex = &s->mesh.vertex->v[0]; - m.vertexstep = sizeof(surfvertex_t); - for (i = 0, sv = svert, v = s->mesh.vertex;i < m.numverts;i++, sv++, v++) + m.numtriangles = mesh->numtriangles; + m.numverts = mesh->numverts; + if (R_Mesh_Draw_GetBuffer(&m, false)) { - 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)); + memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3])); + RSurf_CopyXYZ(mesh->vertex, m.vertex, m.numverts); + cl = m.colorscale; + R_FillColors(m.color, m.numverts, cl, cl, cl, 1); + RSurf_CopyST(mesh->vertex, m.texcoords[0], m.numverts); + R_Mesh_Render(); } } - R_Mesh_Draw(&m); } -static int RSurfShader_Wall_Fullbright(int stage, msurface_t *s) +static void RSurfShader_OpaqueWall_Pass_BaseLightmap(const entity_render_t *ent, const msurface_t *surf) { - if (stage == 0) + surfmesh_t *mesh; + rmeshbufferinfo_t m; + float cl; + memset(&m, 0, sizeof(m)); + m.blendfunc1 = GL_ZERO; + m.blendfunc2 = GL_SRC_COLOR; + m.tex[0] = R_GetTexture(surf->lightmaptexture); + m.matrix = ent->matrix; + for (mesh = surf->mesh;mesh;mesh = mesh->chain) { - c_brush_polys++; - RSurfShader_Wall_Pass_BaseFullbright(s); - return false; + m.numtriangles = mesh->numtriangles; + m.numverts = mesh->numverts; + if (R_Mesh_Draw_GetBuffer(&m, true)) + { + memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3])); + RSurf_CopyXYZ(mesh->vertex, m.vertex, m.numverts); + cl = (float) (1 << lightscalebit) * m.colorscale; + R_FillColors(m.color, m.numverts, cl, cl, cl, 1); + RSurf_CopyUV(mesh->vertex, m.texcoords[0], m.numverts); + R_Mesh_Render(); + } } - return true; } -static int RSurfShader_Wall_Fullbright_Glow(int stage, msurface_t *s) +static void RSurfShader_OpaqueWall_Pass_Light(const entity_render_t *ent, const msurface_t *surf) { - switch(stage) - { - case 0: - c_brush_polys++; - RSurfShader_Wall_Pass_BaseFullbright(s); - return false; - case 1: - RSurfShader_Wall_Pass_Glow(s); - return false; - default: - return true; + surfmesh_t *mesh; + rmeshbufferinfo_t m; + + if (surf->dlightframe != r_framecount) + return; + if (ent->effects & EF_FULLBRIGHT) + return; + + memset(&m, 0, sizeof(m)); + m.blendfunc1 = GL_SRC_ALPHA; + m.blendfunc2 = GL_ONE; + m.tex[0] = R_GetTexture(surf->currenttexture->texture); + m.matrix = ent->matrix; + for (mesh = surf->mesh;mesh;mesh = mesh->chain) + { + if (RSurf_LightCheck(&ent->inversematrix, surf->dlightbits, mesh)) + { + m.numtriangles = mesh->numtriangles; + m.numverts = mesh->numverts; + if (R_Mesh_Draw_GetBuffer(&m, true)) + { + memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3])); + RSurf_CopyXYZ(mesh->vertex, m.vertex, m.numverts); + RSurf_CopyST(mesh->vertex, m.texcoords[0], m.numverts); + R_FillColors(m.color, m.numverts, 0, 0, 0, 1); + RSurf_LightSeparate(&ent->inversematrix, surf->dlightbits, m.numverts, m.vertex, m.color); + RSurf_ScaleColors(m.color, m.colorscale, m.numverts); + R_Mesh_Render(); + } + } } } -static int RSurfShader_Wall_Vertex(int stage, msurface_t *s) +static void RSurfShader_OpaqueWall_Pass_Fog(const entity_render_t *ent, const msurface_t *surf) { - if (stage == 0) + surfmesh_t *mesh; + rmeshbufferinfo_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; + m.tex[0] = R_GetTexture(surf->currenttexture->fogtexture); + m.matrix = ent->matrix; + for (mesh = surf->mesh;mesh;mesh = mesh->chain) { - c_brush_polys++; - RSurfShader_Wall_Pass_BaseVertex(s); - return false; + m.numtriangles = mesh->numtriangles; + m.numverts = mesh->numverts; + if (R_Mesh_Draw_GetBuffer(&m, false)) + { + memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3])); + RSurf_CopyXYZ(mesh->vertex, m.vertex, m.numverts); + if (m.tex[0]) + RSurf_CopyST(mesh->vertex, m.texcoords[0], m.numverts); + RSurf_FogPassColors(m.vertex, m.color, fogcolor[0], fogcolor[1], fogcolor[2], 1, m.colorscale, m.numverts, modelorg); + R_Mesh_Render(); + } } - return true; } -static int RSurfShader_Wall_Vertex_Glow(int stage, msurface_t *s) +static void RSurfShader_OpaqueWall_Pass_BaseDetail(const entity_render_t *ent, const msurface_t *surf) { - switch(stage) - { - case 0: - c_brush_polys++; - RSurfShader_Wall_Pass_BaseVertex(s); - return false; - case 1: - RSurfShader_Wall_Pass_Glow(s); - return false; - default: - return true; + surfmesh_t *mesh; + rmeshbufferinfo_t m; + memset(&m, 0, sizeof(m)); + m.blendfunc1 = GL_DST_COLOR; + m.blendfunc2 = GL_SRC_COLOR; + m.tex[0] = R_GetTexture(surf->currenttexture->detailtexture); + m.matrix = ent->matrix; + for (mesh = surf->mesh;mesh;mesh = mesh->chain) + { + m.numtriangles = mesh->numtriangles; + m.numverts = mesh->numverts; + if (R_Mesh_Draw_GetBuffer(&m, false)) + { + memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3])); + RSurf_CopyXYZ(mesh->vertex, m.vertex, m.numverts); + R_FillColors(m.color, m.numverts, 1, 1, 1, 1); + RSurf_CopyAB(mesh->vertex, m.texcoords[0], m.numverts); + R_Mesh_Render(); + } } } -static int RSurfShader_Wall_Lightmap(int stage, msurface_t *s) +static void RSurfShader_OpaqueWall_Pass_Glow(const entity_render_t *ent, const msurface_t *surf) { - if (r_vertexsurfaces.integer) + surfmesh_t *mesh; + rmeshbufferinfo_t m; + memset(&m, 0, sizeof(m)); + m.blendfunc1 = GL_SRC_ALPHA; + m.blendfunc2 = GL_ONE; + m.tex[0] = R_GetTexture(surf->currenttexture->glowtexture); + m.matrix = ent->matrix; + for (mesh = surf->mesh;mesh;mesh = mesh->chain) { - if (stage == 0) + m.numtriangles = mesh->numtriangles; + m.numverts = mesh->numverts; + if (R_Mesh_Draw_GetBuffer(&m, false)) { - c_brush_polys++; - RSurfShader_Wall_Pass_BaseVertex(s); - return false; + memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3])); + RSurf_CopyXYZ(mesh->vertex, m.vertex, m.numverts); + R_FillColors(m.color, m.numverts, m.colorscale, m.colorscale, m.colorscale, 1); + RSurf_CopyST(mesh->vertex, m.texcoords[0], m.numverts); + R_Mesh_Render(); } - return true; } - else if (r_multitexture.integer) +} + +static void RSurfShader_Wall_Fullbright_Callback(const void *calldata1, int calldata2) +{ + const entity_render_t *ent = calldata1; + const msurface_t *surf = ent->model->surfaces + calldata2; + RSurfShader_Wall_Pass_BaseFullbright(ent, surf); + if (surf->currenttexture->glowtexture) + RSurfShader_Wall_Pass_Glow(ent, surf); + if (fogenabled) + RSurfShader_Wall_Pass_Fog(ent, surf); +} + +static void RSurfShader_Wall_Fullbright(const entity_render_t *ent, const msurface_t *firstsurf) +{ + const msurface_t *surf; + vec3_t center; + if (ent->effects & EF_ADDITIVE || ent->alpha < 1) { - if (r_dlightmap.integer) + for (surf = firstsurf;surf;surf = surf->chain) { - if (stage == 0) - { - c_brush_polys++; - RSurfShader_Wall_Pass_BaseMTex(s); - return false; - } - return true; + Matrix4x4_Transform(&ent->matrix, surf->poly_center, center); + R_MeshQueue_AddTransparent(center, RSurfShader_Wall_Fullbright_Callback, ent, surf - ent->model->surfaces); } - else + } + else + { + for (surf = firstsurf;surf;surf = surf->chain) { - switch(stage) + if (surf->currenttexture->fogtexture != NULL) { - case 0: - c_brush_polys++; - RSurfShader_Wall_Pass_BaseMTex(s); - return false; - case 1: - if (s->dlightframe == r_framecount) - RSurfShader_Wall_Pass_Light(s); - return false; - default: - return true; + Matrix4x4_Transform(&ent->matrix, surf->poly_center, center); + R_MeshQueue_AddTransparent(center, RSurfShader_Wall_Fullbright_Callback, ent, surf - ent->model->surfaces); } + else + RSurfShader_Wall_Pass_BaseFullbright(ent, surf); } + for (surf = firstsurf;surf;surf = surf->chain) + if (surf->currenttexture->glowtexture) + if (surf->currenttexture->fogtexture == NULL) + RSurfShader_Wall_Pass_Glow(ent, surf); + if (fogenabled) + for (surf = firstsurf;surf;surf = surf->chain) + if (surf->currenttexture->fogtexture == NULL) + RSurfShader_Wall_Pass_Fog(ent, surf); } - else if (s->currenttexture->fogtexture != NULL || currentrenderentity->alpha != 1 || currentrenderentity->effects & EF_ADDITIVE) +} + +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; + RSurfShader_Wall_Pass_BaseVertex(ent, surf); + if (surf->currenttexture->glowtexture) + RSurfShader_Wall_Pass_Glow(ent, surf); + if (fogenabled) + RSurfShader_Wall_Pass_Fog(ent, surf); +} + +static void RSurfShader_Wall_Vertex(const entity_render_t *ent, const msurface_t *firstsurf) +{ + const msurface_t *surf; + vec3_t center; + if (ent->effects & EF_ADDITIVE || ent->alpha < 1) { - if (stage == 0) + for (surf = firstsurf;surf;surf = surf->chain) { - c_brush_polys++; - RSurfShader_Wall_Pass_BaseVertex(s); - return false; + Matrix4x4_Transform(&ent->matrix, surf->poly_center, center); + R_MeshQueue_AddTransparent(center, RSurfShader_Wall_Vertex_Callback, ent, surf - ent->model->surfaces); } - return true; } else { - if (r_dlightmap.integer) - { - switch(stage) - { - case 0: - c_brush_polys++; - RSurfShader_Wall_Pass_BaseTexture(s); - return false; - case 1: - RSurfShader_Wall_Pass_BaseLightmap(s); - return false; - default: - return true; - } - } - else + for (surf = firstsurf;surf;surf = surf->chain) { - switch(stage) + if (surf->currenttexture->fogtexture != NULL) { - case 0: - c_brush_polys++; - RSurfShader_Wall_Pass_BaseTexture(s); - return false; - case 1: - RSurfShader_Wall_Pass_BaseLightmap(s); - return false; - case 2: - if (s->dlightframe == r_framecount) - RSurfShader_Wall_Pass_Light(s); - return false; - default: - return true; + Matrix4x4_Transform(&ent->matrix, surf->poly_center, center); + R_MeshQueue_AddTransparent(center, RSurfShader_Wall_Vertex_Callback, ent, surf - ent->model->surfaces); } + else + RSurfShader_Wall_Pass_BaseVertex(ent, surf); } + for (surf = firstsurf;surf;surf = surf->chain) + if (surf->currenttexture->glowtexture) + if (surf->currenttexture->fogtexture == NULL) + RSurfShader_Wall_Pass_Glow(ent, surf); + if (fogenabled) + for (surf = firstsurf;surf;surf = surf->chain) + if (surf->currenttexture->fogtexture == NULL) + RSurfShader_Wall_Pass_Fog(ent, surf); } } -static int RSurfShader_Wall_Lightmap_Glow(int stage, msurface_t *s) +static void RSurfShader_Wall_Lightmap(const entity_render_t *ent, const msurface_t *firstsurf) { - if (stage == 0) - c_brush_polys++; - if (r_vertexsurfaces.integer) + const msurface_t *surf; + vec3_t center; + if (ent->alpha < 1 || ent->effects & EF_ADDITIVE) { - switch(stage) + for (surf = firstsurf;surf;surf = surf->chain) { - case 0: - RSurfShader_Wall_Pass_BaseVertex(s); - return false; - case 1: - RSurfShader_Wall_Pass_Glow(s); - return false; - default: - return true; + Matrix4x4_Transform(&ent->matrix, surf->poly_center, center); + R_MeshQueue_AddTransparent(center, RSurfShader_Wall_Vertex_Callback, ent, surf - ent->model->surfaces); } } - else if (r_multitexture.integer) + else if (r_vertexsurfaces.integer || ent->alpha < 1 || ent->effects & EF_ADDITIVE) { - if (r_dlightmap.integer) + for (surf = firstsurf;surf;surf = surf->chain) { - switch(stage) + if (surf->currenttexture->fogtexture != NULL) { - case 0: - RSurfShader_Wall_Pass_BaseMTex(s); - return false; - case 1: - RSurfShader_Wall_Pass_Glow(s); - return false; - default: - return true; + Matrix4x4_Transform(&ent->matrix, surf->poly_center, center); + R_MeshQueue_AddTransparent(center, RSurfShader_Wall_Vertex_Callback, ent, surf - ent->model->surfaces); } + else + RSurfShader_Wall_Pass_BaseVertex(ent, surf); } - else - { - switch(stage) - { - case 0: - RSurfShader_Wall_Pass_BaseMTex(s); - return false; - case 1: - if (s->dlightframe == r_framecount) - RSurfShader_Wall_Pass_Light(s); - return false; - case 2: - RSurfShader_Wall_Pass_Glow(s); - return false; - default: - return true; - } - } - } - else if (s->currenttexture->fogtexture != NULL || currentrenderentity->alpha != 1 || currentrenderentity->effects & EF_ADDITIVE) - { - switch(stage) - { - case 0: - RSurfShader_Wall_Pass_BaseVertex(s); - return false; - case 1: - RSurfShader_Wall_Pass_Glow(s); - return false; - default: - return true; - } + for (surf = firstsurf;surf;surf = surf->chain) + if (surf->currenttexture->glowtexture) + if (surf->currenttexture->fogtexture == NULL) + RSurfShader_Wall_Pass_Glow(ent, surf); + if (fogenabled) + for (surf = firstsurf;surf;surf = surf->chain) + if (surf->currenttexture->fogtexture == NULL) + RSurfShader_Wall_Pass_Fog(ent, surf); } else { - if (r_dlightmap.integer) + if (r_textureunits.integer >= 2) { - switch(stage) + if (r_textureunits.integer >= 3 && gl_combine.integer && r_detailtextures.integer) + { + for (surf = firstsurf;surf;surf = surf->chain) + { + if (surf->currenttexture->fogtexture != NULL) + { + Matrix4x4_Transform(&ent->matrix, surf->poly_center, center); + R_MeshQueue_AddTransparent(center, RSurfShader_Wall_Vertex_Callback, ent, surf - ent->model->surfaces); + } + else + RSurfShader_OpaqueWall_Pass_TripleTexCombine(ent, surf); + } + } + else { - case 0: - RSurfShader_Wall_Pass_BaseTexture(s); - return false; - case 1: - RSurfShader_Wall_Pass_BaseLightmap(s); - return false; - case 2: - RSurfShader_Wall_Pass_Glow(s); - return false; - default: - return true; + for (surf = firstsurf;surf;surf = surf->chain) + { + if (surf->currenttexture->fogtexture != NULL) + { + Matrix4x4_Transform(&ent->matrix, surf->poly_center, center); + R_MeshQueue_AddTransparent(center, RSurfShader_Wall_Vertex_Callback, ent, surf - ent->model->surfaces); + } + else + RSurfShader_OpaqueWall_Pass_BaseMTex(ent, surf); + } + if (r_detailtextures.integer) + for (surf = firstsurf;surf;surf = surf->chain) + if (surf->currenttexture->fogtexture == NULL) + RSurfShader_OpaqueWall_Pass_BaseDetail(ent, surf); } } else { - switch(stage) + for (surf = firstsurf;surf;surf = surf->chain) { - case 0: - RSurfShader_Wall_Pass_BaseTexture(s); - return false; - case 1: - RSurfShader_Wall_Pass_BaseLightmap(s); - return false; - case 2: - if (s->dlightframe == r_framecount) - RSurfShader_Wall_Pass_Light(s); - return false; - case 3: - RSurfShader_Wall_Pass_Glow(s); - return false; - default: - return true; + if (surf->currenttexture->fogtexture != NULL) + { + Matrix4x4_Transform(&ent->matrix, surf->poly_center, center); + R_MeshQueue_AddTransparent(center, RSurfShader_Wall_Vertex_Callback, ent, surf - ent->model->surfaces); + } + else + RSurfShader_OpaqueWall_Pass_BaseTexture(ent, surf); } - } - } -} - -static int RSurfShader_Wall_Fog(int stage, msurface_t *s) -{ - if (stage == 0 && fogenabled) - { - RSurfShader_Wall_Pass_Fog(s); - return false; + for (surf = firstsurf;surf;surf = surf->chain) + if (surf->currenttexture->fogtexture == NULL) + RSurfShader_OpaqueWall_Pass_BaseLightmap(ent, surf); + if (r_detailtextures.integer) + for (surf = firstsurf;surf;surf = surf->chain) + if (surf->currenttexture->fogtexture == NULL) + RSurfShader_OpaqueWall_Pass_BaseDetail(ent, surf); + } + if (!r_dlightmap.integer) + for (surf = firstsurf;surf;surf = surf->chain) + if (surf->dlightframe == r_framecount) + if (surf->currenttexture->fogtexture == NULL) + RSurfShader_OpaqueWall_Pass_Light(ent, surf); + for (surf = firstsurf;surf;surf = surf->chain) + if (surf->currenttexture->glowtexture) + if (surf->currenttexture->fogtexture == NULL) + RSurfShader_OpaqueWall_Pass_Glow(ent, surf); + if (fogenabled) + for (surf = firstsurf;surf;surf = surf->chain) + if (surf->currenttexture->fogtexture == NULL) + RSurfShader_OpaqueWall_Pass_Fog(ent, surf); } - else - return true; } -/* -============================================================= - - WORLD MODEL - -============================================================= -*/ +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}; -static void RSurf_Callback(void *data, void *junk) +int Cshader_count = 5; +Cshader_t *Cshaders[5] = { - ((msurface_t *)data)->visframe = r_framecount; -} + &Cshader_wall_vertex, + &Cshader_wall_lightmap, + &Cshader_wall_fullbright, + &Cshader_water, + &Cshader_sky +}; -static void R_SolidWorldNode (void) +void R_DrawSurfaces(entity_render_t *ent, int sky, int normal) { - 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: - c_leafs++; + int i, alttextures, texframe, framecount; + texture_t *t; + model_t *model; + msurface_t *surf; + vec3_t modelorg; + Cshader_t *shader; - leaf->visframe = r_framecount; + if (!ent->model) + return; - if (leaf->nummarksurfaces) + for (i = 0;i < Cshader_count;i++) + Cshaders[i]->chain = NULL; + + model = ent->model; + alttextures = ent->frame != 0; + texframe = (int)(cl.time * 5.0f); + + Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg); + for (i = 0;i < model->nummodelsurfaces;i++) + { + surf = model->modelsortedsurfaces[i]; + if (surf->visframe == r_framecount) { - mark = leaf->firstmarksurface; - endmark = mark + leaf->nummarksurfaces; - if (r_ser.integer) + // mark any backface surfaces as not visible + if (PlaneDist(modelorg, surf->plane) < surf->plane->dist) { - 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); + if (!(surf->flags & SURF_PLANEBACK)) + surf->visframe = -1; } else { - do + if (surf->flags & SURF_PLANEBACK) + surf->visframe = -1; + } + if (surf->visframe == r_framecount) + { + if (r_cullsurface.integer && R_CullBox (surf->poly_mins, surf->poly_maxs)) + surf->visframe = -1; + else { - 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) + c_faces++; + t = surf->texinfo->texture; + if (t->animated) { - if (surf->flags & SURF_PLANEBACK) - surf->visframe = r_framecount; + framecount = t->anim_total[alttextures]; + if (framecount >= 2) + surf->currenttexture = t->anim_frames[alttextures][texframe % framecount]; + else + surf->currenttexture = t->anim_frames[alttextures][0]; } else - { - if (!(surf->flags & SURF_PLANEBACK)) - surf->visframe = r_framecount; - } + surf->currenttexture = t; + surf->chain = surf->shader->chain; + surf->shader->chain = surf; } - while (mark < endmark); } } + } - // follow portals into other leafs - p = leaf->portals; - for (;p;p = p->next) + if (sky) + { + for (i = 0;i < Cshader_count;i++) { - if (DotProduct(r_origin, p->plane.normal) < p->plane.dist) - { - 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]; - } - } - } - } + shader = Cshaders[i]; + if (shader->chain && shader->shaderfunc[SHADERSTAGE_SKY]) + shader->shaderfunc[SHADERSTAGE_SKY](ent, shader->chain); } - - if (portalstack) - goto loc1; } - else + + if (normal) { - 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 + if (r_dynamic.integer) + R_MarkLights(ent); -loc2: - if (R_NotCulledBox(node->mins, node->maxs)) + if (!r_vertexsurfaces.integer) { - if (node->numsurfaces) + for (i = 0, surf = ent->model->surfaces + ent->model->firstmodelsurface;i < ent->model->nummodelsurfaces;i++, surf++) { - if (r_ser.integer) - { - 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 - { - for (;surf < surfend;surf++) - { - 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); - } - } - } - else + if (surf->visframe == r_framecount && surf->lightmaptexture != NULL) { - msurface_t *surf = cl.worldmodel->surfaces + node->firstsurface, *surfend = surf + node->numsurfaces; - if (PlaneDiff (r_origin, node->plane) < 0) + if (surf->cached_dlight + || surf->cached_ambient != r_ambient.value + || surf->cached_lightscalebit != lightscalebit) + R_BuildLightMap(ent, surf, false); // base lighting changed + else if (r_dynamic.integer) { - 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; - } + 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(ent, surf, false); // base lighting changed + else if (surf->dlightframe == r_framecount && r_dlightmap.integer) + R_BuildLightMap(ent, surf, true); // only dlights } } } + } - // 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; - } - } + for (i = 0;i < Cshader_count;i++) + { + shader = Cshaders[i]; + if (shader->chain && shader->shaderfunc[SHADERSTAGE_NORMAL]) + shader->shaderfunc[SHADERSTAGE_NORMAL](ent, shader->chain); } - else if (nodestackpos > 0) + } +} + +/* +static void R_DrawPortal_Callback(const void *calldata1, int calldata2) +{ + int i; + float *v; + rmeshbufferinfo_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; + m.numverts = portal->numpoints; + m.numtriangles = portal->numpoints - 2; + m.matrix = ent->matrix; + if (R_Mesh_Draw_GetBuffer(&m, false)) + { + for (i = 0;i < m.numtriangles;i++) { - node = nodestack[--nodestackpos]; - goto loc2; + m.index[i * 3 + 0] = 0; + m.index[i * 3 + 1] = i + 1; + m.index[i * 3 + 2] = i + 2; } + i = portal - ent->model->portals; + R_FillColors(m.color, m.numverts, + ((i & 0x0007) >> 0) * (1.0f / 7.0f) * m.colorscale, + ((i & 0x0038) >> 3) * (1.0f / 7.0f) * m.colorscale, + ((i & 0x01C0) >> 6) * (1.0f / 7.0f) * m.colorscale, + 0.125f); + if (PlaneDiff(r_origin, (&portal->plane)) > 0) + { + for (i = portal->numpoints - 1, v = m.vertex;i >= 0;i--, v += 4) + VectorCopy(portal->points[i].position, v); + } + else + for (i = 0, v = m.vertex;i < portal->numpoints;i++, v += 4) + VectorCopy(portal->points[i].position, v); + R_Mesh_Render(); + } +} + +static void R_DrawPortals(entity_render_t *ent) +{ + int i; + mportal_t *portal, *endportal; + float temp[3], center[3], f; + + if (r_drawportals.integer < 1) + return; + + for (portal = ent->model->portals, endportal = portal + ent->model->numportals;portal < endportal;portal++) + { + if (portal->here->visframe == r_framecount || portal->past->visframe == r_framecount) + { + 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); + } + } +} +*/ + +void R_DrawBrushModel(entity_render_t *ent, int sky, int normal) +{ + 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 = ent->model; + Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg); + for (i = 0;i < model->nummodelsurfaces;i++) + { + surf = model->surfaces + model->firstmodelsurface + i; + surf->visframe = r_framecount; + surf->pvsframe = -1; + surf->worldnodeframe = -1; + surf->lightframe = -1; + surf->dlightframe = -1; } + R_DrawSurfaces(ent, sky, normal); } -static int r_portalframecount = 0; +void R_SurfaceWorldNode (void) +{ + msurface_t *surf; + for (surf = r_pvsfirstsurface;surf;surf = surf->pvschain) + surf->visframe = r_framecount; +} -static void R_PVSWorldNode() +/* +static void R_PortalWorldNode(entity_render_t *ent, mleaf_t *viewleaf) { int portalstack, i; mportal_t *p, *pstack[8192]; msurface_t *surf, **mark, **endmark; mleaf_t *leaf; - tinyplane_t plane; - qbyte *worldvis; - - worldvis = Mod_LeafPVS (r_viewleaf, cl.worldmodel); - - leaf = r_viewleaf; + // 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 + leaf = viewleaf; leaf->worldnodeframe = r_framecount; portalstack = 0; loc0: c_leafs++; - - leaf->visframe = r_framecount; - 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 + surf = *mark++; + // make sure surfaces are only processed once + if (surf->worldnodeframe != 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) { @@ -1998,284 +1784,144 @@ loc0: surf->visframe = r_framecount; } } - while (mark < endmark); } } - // follow portals into other leafs for (p = leaf->portals;p;p = p->next) { - if (DotProduct(r_origin, p->plane.normal) < p->plane.dist) + leaf = p->past; + if (leaf->worldnodeframe != r_framecount) { - leaf = p->past; - if (leaf->worldnodeframe != r_framecount) + leaf->worldnodeframe = r_framecount; + // FIXME: R_NotCulledBox is absolute, should be done relative + if (leaf->pvsframe == r_pvsframecount && R_NotCulledBox(leaf->mins, leaf->maxs)) { - leaf->worldnodeframe = r_framecount; - if (leaf->contents != CONTENTS_SOLID) - { - i = (leaf - cl.worldmodel->leafs) - 1; - if (worldvis[i>>3] & (1<<(i&7))) - { - if (R_NotCulledBox(leaf->mins, leaf->maxs)) - { - pstack[portalstack++] = p; - goto loc0; - + p->visframe = r_framecount; + pstack[portalstack++] = p; + goto loc0; loc1: - p = pstack[--portalstack]; - } - } - } + p = pstack[--portalstack]; } } } - if (portalstack) goto loc1; } +*/ -Cshader_t Cshader_wall_vertex = {{NULL, RSurfShader_Wall_Vertex, RSurfShader_Wall_Fog}, NULL}; -Cshader_t Cshader_wall_vertex_glow = {{NULL, RSurfShader_Wall_Vertex_Glow, RSurfShader_Wall_Fog}, NULL}; -Cshader_t Cshader_wall_lightmap = {{NULL, RSurfShader_Wall_Lightmap, RSurfShader_Wall_Fog}, NULL}; -Cshader_t Cshader_wall_lightmap_glow = {{NULL, RSurfShader_Wall_Lightmap_Glow, RSurfShader_Wall_Fog}, NULL}; -Cshader_t Cshader_wall_fullbright = {{NULL, RSurfShader_Wall_Fullbright, RSurfShader_Wall_Fog}, NULL}; -Cshader_t Cshader_wall_fullbright_glow = {{NULL, RSurfShader_Wall_Fullbright_Glow, RSurfShader_Wall_Fog}, NULL}; -Cshader_t Cshader_water = {{NULL, RSurfShader_Water, NULL}, NULL}; -Cshader_t Cshader_water_glow = {{NULL, RSurfShader_Water_Glow, NULL}, NULL}; -Cshader_t Cshader_sky = {{RSurfShader_Sky, NULL, 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) +static void R_PortalWorldNode(entity_render_t *ent, mleaf_t *viewleaf) { - int i; - texture_t *t; - model_t *model; - msurface_t *surf; - - for (i = 0;i < Cshader_count;i++) - Cshaders[i]->chain = NULL; - - model = currentrenderentity->model; - - for (i = 0;i < model->nummodelsurfaces;i++) + int c, leafstackpos; + mleaf_t *leaf, *leafstack[8192]; + mportal_t *p; + msurface_t **mark; + vec3_t modelorg; + // 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 + Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg); + viewleaf->worldnodeframe = r_framecount; + leafstack[0] = viewleaf; + leafstackpos = 1; + while (leafstackpos) { - surf = model->modelsortedsurfaces[i]; - if (surf->visframe == r_framecount) + c_leafs++; + leaf = leafstack[--leafstackpos]; + // only useful for drawing portals + //leaf->visframe = r_framecount; + // draw any surfaces bounding this leaf + if (leaf->nummarksurfaces) + for (c = leaf->nummarksurfaces, mark = leaf->firstmarksurface;c;c--) + (*mark++)->visframe = r_framecount; + // follow portals into other leafs + for (p = leaf->portals;p;p = p->next) { - if (surf->insertframe != r_framecount) + leaf = p->past; + if (leaf->worldnodeframe != r_framecount) { - surf->insertframe = r_framecount; - c_faces++; - // manually inlined R_TextureAnimation - //t = R_TextureAnimation(surf->texinfo->texture); - t = surf->texinfo->texture; - if (t->alternate_anims != NULL && currentrenderentity->frame) - t = t->alternate_anims; - if (t->anim_total >= 2) - t = t->anim_frames[(int)(cl.time * 5.0f) % t->anim_total]; - surf->currenttexture = t; + leaf->worldnodeframe = r_framecount; + // FIXME: R_NotCulledBox is absolute, should be done relative + if (leaf->pvsframe == r_pvsframecount && R_NotCulledBox(leaf->mins, leaf->maxs)) + leafstack[leafstackpos++] = leaf; } - - surf->chain = surf->shader->chain; - surf->shader->chain = surf; } } + //if (r_drawportals.integer) + // R_DrawPortals(ent); } -void R_DrawSurfaces (int type) + +void R_PVSUpdate (mleaf_t *viewleaf) { - int i, stage; - msurface_t *surf; - Cshader_t *shader; + int i, j, l, c, bits; + mleaf_t *leaf; + qbyte *vis; + msurface_t **mark, *surf; - for (i = 0;i < Cshader_count;i++) - { - shader = Cshaders[i]; - if (shader->chain && shader->shaderfunc[type]) - // shader->shaderfunc[type](shader->chain); - for (stage = 0;stage < 1000;stage++) - for (surf = shader->chain;surf;surf = surf->chain) - if (shader->shaderfunc[type](stage, surf)) - goto done; -done:; - } -} + if (r_pvsviewleaf == viewleaf && r_pvsviewleafnovis == r_novis.integer) + return; -static float portalpointbuffer[256][3]; + r_pvsframecount++; + r_pvsviewleaf = viewleaf; + r_pvsviewleafnovis = r_novis.integer; -void R_DrawPortals(void) -{ - int drawportals, i; -// mleaf_t *leaf, *endleaf; - mportal_t *portal, *endportal; - mvertex_t *point/*, *endpoint*/; - rmeshinfo_t m; - drawportals = r_drawportals.integer; - if (drawportals < 1) - return; - /* - leaf = cl.worldmodel->leafs; - endleaf = leaf + cl.worldmodel->numleafs; - for (;leaf < endleaf;leaf++) - { - if (leaf->visframe == r_framecount && leaf->portals) - { - i = leaf - cl.worldmodel->leafs; - r = (i & 0x0007) << 5; - g = (i & 0x0038) << 2; - b = (i & 0x01C0) >> 1; - portal = leaf->portals; - while (portal) - { - transpolybegin(0, 0, 0, TPOLYTYPE_ALPHA); - point = portal->points + portal->numpoints - 1; - endpoint = portal->points; - for (;point >= endpoint;point--) - transpolyvertub(point->position[0], point->position[1], point->position[2], 0, 0, r, g, b, 32); - transpolyend(); - portal = portal->next; - } - } - } - */ - 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++) + if (viewleaf) { - if (portal->visframe == r_portalframecount) + vis = Mod_LeafPVS (viewleaf, cl.worldmodel); + for (j = 0;j < cl.worldmodel->numleafs;j += 8) { - if (portal->numpoints <= 256) + bits = *vis++; + if (bits) { - 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) + l = cl.worldmodel->numleafs - j; + if (l > 8) + l = 8; + for (i = 0;i < l;i++) { - for (i = portal->numpoints - 1;i >= 0;i--) - VectorCopy(point[i].position, portalpointbuffer[i]); - } - else - { - for (i = 0;i < portal->numpoints;i++) - VectorCopy(point[i].position, portalpointbuffer[i]); + if (bits & (1 << i)) + { + leaf = &cl.worldmodel->leafs[j + i + 1]; + leaf->pvsframe = r_pvsframecount; + // mark surfaces bounding this leaf as visible + for (c = leaf->nummarksurfaces, mark = leaf->firstmarksurface;c;c--) + (*mark++)->pvsframe = r_pvsframecount; + } } - R_Mesh_DrawPolygon(&m, portal->numpoints); } } - } -} - -void R_SetupForBModelRendering(void) -{ - int i; - msurface_t *s; - 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++) - { - s = model->modelsortedsurfaces[i]; - if (((s->flags & SURF_PLANEBACK) == 0) == (PlaneDiff(modelorg, s->plane) >= 0)) - s->visframe = r_framecount; - else - s->visframe = -1; - s->worldnodeframe = -1; - s->lightframe = -1; - s->dlightframe = -1; - s->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 *s; - - if (r_dynamic.integer) - R_MarkLights(); - - if (!r_vertexsurfaces.integer) - { - for (i = 0;i < currentrenderentity->model->nummodelsurfaces;i++) + // build pvs surfacechain + r_pvsfirstsurface = NULL; + mark = &r_pvsfirstsurface; + for (c = cl.worldmodel->nummodelsurfaces, surf = cl.worldmodel->surfaces + cl.worldmodel->firstmodelsurface;c;c--, surf++) { - s = currentrenderentity->model->modelsortedsurfaces[i]; - if (s->visframe == r_framecount && s->lightmaptexture != NULL) + if (surf->pvsframe == r_pvsframecount) { - if (s->cached_dlight - || s->cached_ambient != r_ambient.value - || s->cached_lightscalebit != lightscalebit) - R_BuildLightMap(s, false); // base lighting changed - else if (r_dynamic.integer) - { - if (s->styles[0] != 255 && (d_lightstylevalue[s->styles[0]] != s->cached_light[0] - || (s->styles[1] != 255 && (d_lightstylevalue[s->styles[1]] != s->cached_light[1] - || (s->styles[2] != 255 && (d_lightstylevalue[s->styles[2]] != s->cached_light[2] - || (s->styles[3] != 255 && (d_lightstylevalue[s->styles[3]] != s->cached_light[3])))))))) - //if (s->cached_light[0] != d_lightstylevalue[s->styles[0]] - // || s->cached_light[1] != d_lightstylevalue[s->styles[1]] - // || s->cached_light[2] != d_lightstylevalue[s->styles[2]] - // || s->cached_light[3] != d_lightstylevalue[s->styles[3]]) - R_BuildLightMap(s, false); // base lighting changed - else if (s->dlightframe == r_framecount && r_dlightmap.integer) - R_BuildLightMap(s, true); // only dlights - } + *mark = surf; + mark = &surf->pvschain; } } + *mark = NULL; } } -void R_MarkWorldLights(void) -{ - R_SetupForWorldRendering(); - R_SurfMarkLights(); -} - /* ============= R_DrawWorld ============= */ -void R_DrawWorld (void) +void R_DrawWorld (entity_render_t *ent) { - R_SetupForWorldRendering(); - - if (r_viewleaf->contents == CONTENTS_SOLID || r_novis.integer || r_viewleaf->compressed_vis == NULL) - R_SolidWorldNode (); + mleaf_t *viewleaf; + viewleaf = Mod_PointInLeaf (r_origin, cl.worldmodel); + R_PVSUpdate(viewleaf); + if (!viewleaf) + return; + if (r_surfaceworldnode.integer || viewleaf->contents == CONTENTS_SOLID) + R_SurfaceWorldNode (); else - R_PVSWorldNode (); + R_PortalWorldNode (ent, viewleaf); + R_DrawSurfaces(ent, true, true); } /* @@ -2283,29 +1929,51 @@ void R_DrawWorld (void) R_DrawBrushModel ================= */ -void R_DrawBrushModelSky (void) +void R_DrawBrushModelSky (entity_render_t *ent) { - R_SetupForBModelRendering(); - - R_PrepareSurfaces(); - R_DrawSurfaces(SHADERSTAGE_SKY); + R_DrawBrushModel(ent, true, false); } -void R_DrawBrushModelNormal (void) +void R_DrawBrushModelNormal (entity_render_t *ent) { c_bmodels++; + R_DrawBrushModel(ent, false, true); +} - // have to flush queue because of possible lightmap reuse - R_Mesh_Render(); +static void gl_surf_start(void) +{ +} - R_SetupForBModelRendering(); +static void gl_surf_shutdown(void) +{ +} - R_SurfMarkLights(); +static void gl_surf_newmap(void) +{ + // reset pvs visibility variables so it will update on first frame + r_pvsframecount = 1; + r_pvsviewleaf = NULL; + r_pvsviewleafnovis = false; + r_pvsfirstsurface = NULL; +} - R_PrepareSurfaces(); +void GL_Surf_Init(void) +{ + int i; + dlightdivtable[0] = 4194304; + for (i = 1;i < 32768;i++) + dlightdivtable[i] = 4194304 / (i << 7); + + Cvar_RegisterVariable(&r_ambient); + Cvar_RegisterVariable(&r_vertexsurfaces); + Cvar_RegisterVariable(&r_dlightmap); + //Cvar_RegisterVariable(&r_drawportals); + Cvar_RegisterVariable(&r_testvis); + Cvar_RegisterVariable(&r_floatbuildlightmap); + Cvar_RegisterVariable(&r_detailtextures); + Cvar_RegisterVariable(&r_surfaceworldnode); + Cvar_RegisterVariable(&r_cullsurface); - if (!skyrendermasked) - R_DrawSurfaces(SHADERSTAGE_SKY); - R_DrawSurfaces(SHADERSTAGE_NORMAL); - R_DrawSurfaces(SHADERSTAGE_FOG); + R_RegisterModule("GL_Surf", gl_surf_start, gl_surf_shutdown, gl_surf_newmap); } +