X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=gl_rsurf.c;h=fed6a6a72d4916aa3b6591846a56116fcec77613;hb=bc8b80ee19f7a87e326fa765427d0c4e8dfe9940;hp=6f258d0e22126b15791a79215e786d63c6a336f1;hpb=8468ffaf8162a4fe8361127385c40141c375661d;p=xonotic%2Fdarkplaces.git diff --git a/gl_rsurf.c b/gl_rsurf.c index 6f258d0e..fed6a6a7 100644 --- a/gl_rsurf.c +++ b/gl_rsurf.c @@ -21,82 +21,27 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "quakedef.h" -int lightmap_textures; +#define MAX_LIGHTMAP_SIZE 256 -#define BLOCK_WIDTH 256 -#define BLOCK_HEIGHT 256 -// LordHavoc: increased lightmap limit from 64 to 1024 -#define MAX_LIGHTMAPS 1024 -#define LIGHTMAPSIZE (BLOCK_WIDTH*BLOCK_HEIGHT*4) +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 -int active_lightmaps; +static qbyte templight[MAX_LIGHTMAP_SIZE*MAX_LIGHTMAP_SIZE*4]; -short allocated[MAX_LIGHTMAPS][BLOCK_WIDTH]; - -byte *lightmaps[MAX_LIGHTMAPS]; -short lightmapupdate[MAX_LIGHTMAPS][2]; - -signed int blocklights[BLOCK_WIDTH*BLOCK_HEIGHT*3]; // LordHavoc: *3 for colored lighting - -int lightmapalign, lightmapalignmask; // LordHavoc: NVIDIA's broken subimage fix, see BuildLightmaps for notes -cvar_t gl_lightmapalign = {0, "gl_lightmapalign", "4"}; -cvar_t gl_lightmaprgba = {0, "gl_lightmaprgba", "1"}; -cvar_t gl_nosubimagefragments = {0, "gl_nosubimagefragments", "0"}; -cvar_t gl_nosubimage = {0, "gl_nosubimage", "0"}; cvar_t r_ambient = {0, "r_ambient", "0"}; -cvar_t gl_vertex = {0, "gl_vertex", "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_testvis = {0, "r_testvis", "0"}; -cvar_t r_solidworldnode = {0, "r_solidworldnode", "1"}; - -qboolean lightmaprgba, nosubimagefragments, nosubimage; -int lightmapbytes; - -int wateralpha; - -void gl_surf_start(void) -{ -} - -void gl_surf_shutdown(void) -{ -} - -void gl_surf_newmap(void) -{ -} - -void GL_Surf_Init(void) -{ - int i; - for (i = 0;i < MAX_LIGHTMAPS;i++) - lightmaps[i] = NULL; - Cvar_RegisterVariable(&gl_lightmapalign); - Cvar_RegisterVariable(&gl_lightmaprgba); - Cvar_RegisterVariable(&gl_nosubimagefragments); - Cvar_RegisterVariable(&gl_nosubimage); - Cvar_RegisterVariable(&r_ambient); - Cvar_RegisterVariable(&gl_vertex); - Cvar_RegisterVariable(&r_dlightmap); - Cvar_RegisterVariable(&r_drawportals); - Cvar_RegisterVariable(&r_testvis); - Cvar_RegisterVariable(&r_solidworldnode); - - R_RegisterModule("GL_Surf", gl_surf_start, gl_surf_shutdown, gl_surf_newmap); -} +cvar_t r_floatbuildlightmap = {0, "r_floatbuildlightmap", "0"}; -int dlightdivtable[32768]; +static int dlightdivtable[32768]; -/* - R_AddDynamicLights -*/ -int R_AddDynamicLights (msurface_t *surf) +static int R_IntAddDynamicLights (msurface_t *surf) { - int sdtable[18], lnum, td, maxdist, maxdist2, maxdist3, i, s, t, smax, tmax, red, green, blue, lit, dist2, impacts, impactt; + 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__ @@ -107,38 +52,38 @@ int R_AddDynamicLights (msurface_t *surf) lit = false; - if (!dlightdivtable[1]) - { - dlightdivtable[0] = 4194304; - for (s = 1; s < 32768; s++) - dlightdivtable[s] = 4194304 / (s << 7); - } - smax = (surf->extents[0] >> 4) + 1; tmax = (surf->extents[1] >> 4) + 1; + smax3 = smax * 3; - for (lnum = 0; lnum < MAX_DLIGHTS; lnum++) + for (lnum = 0; lnum < r_numdlights; lnum++) { if (!(surf->dlightbits[lnum >> 5] & (1 << (lnum & 31)))) continue; // not lit by this light - VectorSubtract (cl_dlights[lnum].origin, currententity->render.origin, local); + softwareuntransform(r_dlight[lnum].origin, local); dist = DotProduct (local, surf->plane->normal) - surf->plane->dist; // for comparisons to minimum acceptable light - maxdist = (int) ((cl_dlights[lnum].radius * cl_dlights[lnum].radius)); - - // clamp radius to avoid exceeding 32768 entry division table - if (maxdist > 4194304) - maxdist = 4194304; + // compensate for LIGHTOFFSET + maxdist = (int) r_dlight[lnum].cullradius2 + LIGHTOFFSET; dist2 = dist * dist; + dist2 += LIGHTOFFSET; if (dist2 >= maxdist) continue; - impact[0] = cl_dlights[lnum].origin[0] - surf->plane->normal[0] * dist; - impact[1] = cl_dlights[lnum].origin[1] - surf->plane->normal[1] * dist; - impact[2] = cl_dlights[lnum].origin[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]; @@ -151,107 +96,136 @@ int R_AddDynamicLights (msurface_t *surf) // reduce calculations for (s = 0, i = impacts; s < smax; s++, i -= 16) - sdtable[s] = i * i + dist2 + LIGHTOFFSET; + sdtable[s] = i * i + dist2; - maxdist3 = maxdist - (int) (dist * dist); + maxdist3 = maxdist - dist2; - // convert to 8.8 blocklights format and scale up by radius - red = cl_dlights[lnum].color[0] * maxdist; - green = cl_dlights[lnum].color[1] * maxdist; - blue = cl_dlights[lnum].color[2] * maxdist; - bl = blocklights; + // convert to 8.8 blocklights format + red = r_dlight[lnum].light[0]; + green = r_dlight[lnum].light[1]; + blue = r_dlight[lnum].light[2]; + subtract = (int) (r_dlight[lnum].subtract * 4194304.0f); + bl = intblocklights; i = impactt; - for (t = 0; t < tmax; t++, i -= 16) + for (t = 0;t < tmax;t++, i -= 16) { td = i * i; // make sure some part of it is visible on this line if (td < maxdist3) { maxdist2 = maxdist - td; - for (s = 0; s < smax; s++) + for (s = 0;s < smax;s++) { if (sdtable[s] < maxdist2) { - k = dlightdivtable[(sdtable[s] + td) >> 7]; - bl[0] += (red * k) >> 9; - bl[1] += (green * k) >> 9; - bl[2] += (blue * k) >> 9; - lit = true; + k = dlightdivtable[(sdtable[s] + td) >> 7] - subtract; + if (k > 0) + { + bl[0] += (red * k) >> 7; + bl[1] += (green * k) >> 7; + bl[2] += (blue * k) >> 7; + lit = true; + } } bl += 3; } } else // skip line - bl += smax * 3; + bl += smax3; } } return lit; } - -void R_ConvertLightmap (int *in, byte *out, int width, int height, int stride) +static int R_FloatAddDynamicLights (msurface_t *surf) { - int i, j; - stride -= (width*lightmapbytes); - if (lighthalf) + 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++) { - // LordHavoc: I shift down by 8 unlike GLQuake's 7, - // the image is brightened as a processing pass - if (lightmaprgba) + if (!(surf->dlightbits[lnum >> 5] & (1 << (lnum & 31)))) + continue; // not lit by this light + + softwareuntransform(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) { - for (i = 0;i < height;i++, out += stride) - { - for (j = 0;j < width;j++, in += 3, out += 4) - { - out[0] = min(in[0] >> 8, 255); - out[1] = min(in[1] >> 8, 255); - out[2] = min(in[2] >> 8, 255); - out[3] = 255; - } - } + VectorCopy(local, impact); + impact[surf->plane->type] -= dist; } else { - for (i = 0;i < height;i++, out += stride) - { - for (j = 0;j < width;j++, in += 3, out += 3) - { - out[0] = min(in[0] >> 8, 255); - out[1] = min(in[1] >> 8, 255); - out[2] = min(in[2] >> 8, 255); - } - } - } - } - else - { - if (lightmaprgba) - { - for (i = 0;i < height;i++, out += stride) - { - for (j = 0;j < width;j++, in += 3, out += 4) - { - out[0] = min(in[0] >> 7, 255); - out[1] = min(in[1] >> 7, 255); - out[2] = min(in[2] >> 7, 255); - out[3] = 255; - } - } + 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; } - else + + 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) { - for (i = 0;i < height;i++, out += stride) + td = td1 * td1; + // make sure some part of it is visible on this line + if (td < maxdist3) { - for (j = 0;j < width;j++, in += 3, out += 3) + maxdist2 = maxdist - td; + for (s = 0;s < smax;s++) { - out[0] = min(in[0] >> 7, 255); - out[1] = min(in[1] >> 7, 255); - out[2] = min(in[2] >> 7, 255); + 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; } /* @@ -261,286 +235,473 @@ R_BuildLightMap Combine and scale multiple lightmaps into the 8.8 format in blocklights =============== */ -void R_BuildLightMap (msurface_t *surf, byte *dest, int stride) +static void R_BuildLightMap (msurface_t *surf, int dlightchanged) { - int smax, tmax; - int i, j, size, size3; - byte *lightmap; - int scale; - int maps; - int *bl; - - surf->cached_dlight = 0; - surf->cached_lighthalf = lighthalf; - surf->cached_ambient = r_ambient.value; - - 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 ((currententity && (currententity->render.effects & EF_FULLBRIGHT)) || !cl.worldmodel->lightdata) + if (!r_floatbuildlightmap.integer) { - bl = blocklights; - for (i=0 ; icached_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 ((currentrenderentity->effects & EF_FULLBRIGHT) || !currentrenderentity->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(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 (currentrenderentity->model->lightmaprgba) { - *bl++ = 255*256; - *bl++ = 255*256; - *bl++ = 255*256; + 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 { -// clear to no light - j = r_ambient.value * 512.0f; // would be 256.0f logically, but using 512.0f to match winquake style + 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 ((currentrenderentity->effects & EF_FULLBRIGHT) || !currentrenderentity->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) { - bl = blocklights; for (i = 0;i < size3;i++) *bl++ = j; } else - memset(&blocklights[0], 0, size*3*sizeof(int)); + memset(bl, 0, size*3*sizeof(float)); + + if (surf->dlightframe == r_framecount && r_dlightmap.integer) + { + surf->cached_dlight = R_FloatAddDynamicLights(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 + // add all the lightmaps if (lightmap) { - for (maps = 0;maps < MAXLIGHTMAPS && surf->styles[maps] != 255;maps++) + 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 (currentrenderentity->model->lightmaprgba) + { + stride = (surf->lightmaptexturestride - smax) * 4; + for (i = 0;i < tmax;i++, out += stride) { - scale = d_lightstylevalue[surf->styles[maps]]; - surf->cached_light[maps] = scale; // 8.8 fraction - bl = blocklights; - for (i = 0;i < size3;i++) - *bl++ += *lightmap++ * scale; + 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; + } } } - if (r_dlightmap.value && surf->dlightframe == r_framecount) - if ((surf->cached_dlight = R_AddDynamicLights(surf))) - c_light_polys++; + 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); } - R_ConvertLightmap(blocklights, dest, smax, tmax, stride); } -byte templight[BLOCK_WIDTH*BLOCK_HEIGHT*4]; - -void R_UpdateLightmap(msurface_t *s, int lnum) +void R_StainNode (mnode_t *node, model_t *model, vec3_t origin, float radius, int icolor[8]) { - int smax, tmax; - // upload the new lightmap texture fragment - if(r_upload.value) - glBindTexture(GL_TEXTURE_2D, lightmap_textures + lnum); - if (nosubimage || nosubimagefragments) + float ndist; + msurface_t *surf, *endsurf; + int sdtable[256], td, maxdist, maxdist2, maxdist3, i, s, t, smax, tmax, smax3, dist2, impacts, impactt, subtract, a, stained, cr, cg, cb, ca, ratio; + qbyte *bl; + vec3_t impact; + // LordHavoc: use 64bit integer... shame it's not very standardized... +#if _MSC_VER || __BORLANDC__ + __int64 k; +#else + long long k; +#endif + + + // for comparisons to minimum acceptable light + // compensate for 4096 offset + maxdist = radius * radius + 4096; + + // clamp radius to avoid exceeding 32768 entry division table + if (maxdist > 4194304) + maxdist = 4194304; + + subtract = (int) ((1.0f / maxdist) * 4194304.0f); + +loc0: + if (node->contents < 0) + return; + ndist = PlaneDiff(origin, node->plane); + if (ndist > radius) { - if (lightmapupdate[lnum][0] > s->light_t) - lightmapupdate[lnum][0] = s->light_t; - if (lightmapupdate[lnum][1] < (s->light_t + ((s->extents[1]>>4)+1))) - lightmapupdate[lnum][1] = (s->light_t + ((s->extents[1]>>4)+1)); - if (lightmaprgba) - R_BuildLightMap (s, lightmaps[s->lightmaptexturenum] + (s->light_t * BLOCK_WIDTH + s->light_s) * 4, BLOCK_WIDTH * 4); - else - R_BuildLightMap (s, lightmaps[s->lightmaptexturenum] + (s->light_t * BLOCK_WIDTH + s->light_s) * 3, BLOCK_WIDTH * 3); + node = node->children[0]; + goto loc0; } - else + if (ndist < -radius) + { + node = node->children[1]; + goto loc0; + } + + dist2 = ndist * ndist; + dist2 += 4096.0f; + if (dist2 < maxdist) { - smax = ((s->extents[0]>>4)+lightmapalign) & lightmapalignmask; - tmax = (s->extents[1]>>4)+1; - if (lightmaprgba) + maxdist3 = maxdist - dist2; + + if (node->plane->type < 3) { - R_BuildLightMap (s, templight, smax * 4); - if(r_upload.value) - glTexSubImage2D(GL_TEXTURE_2D, 0, s->light_s, s->light_t, smax, tmax, GL_RGBA, GL_UNSIGNED_BYTE, templight); + VectorCopy(origin, impact); + impact[node->plane->type] -= ndist; } else { - R_BuildLightMap (s, templight, smax * 3); - if(r_upload.value) - glTexSubImage2D(GL_TEXTURE_2D, 0, s->light_s, s->light_t, smax, tmax, GL_RGB , GL_UNSIGNED_BYTE, templight); + 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; } - } -} - -/* -=============== -R_TextureAnimation + for (surf = model->surfaces + node->firstsurface, endsurf = surf + node->numsurfaces;surf < endsurf;surf++) + { + if (surf->stainsamples) + { + smax = (surf->extents[0] >> 4) + 1; + tmax = (surf->extents[1] >> 4) + 1; -Returns the proper texture for a given time and base texture -=============== -*/ -texture_t *R_TextureAnimation (texture_t *base) -{ -// texture_t *original; -// int relative; -// int count; + 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]; - if (currententity->render.frame) - { - if (base->alternate_anims) - base = base->alternate_anims; - } - - if (!base->anim_total) - return base; + s = bound(0, impacts, smax * 16) - impacts; + t = bound(0, impactt, tmax * 16) - impactt; + i = s * s + t * t + dist2; + if (i > maxdist) + continue; - return base->anim_frames[(int)(cl.time*5) % base->anim_total]; + // reduce calculations + for (s = 0, i = impacts; s < smax; s++, i -= 16) + sdtable[s] = i * i + dist2; - /* - original = base; + // convert to 8.8 blocklights format + bl = surf->stainsamples; + smax3 = smax * 3; + stained = false; - relative = (int)(cl.time*5) % base->anim_total; + i = impactt; + for (t = 0;t < tmax;t++, i -= 16) + { + td = i * i; + // make sure some part of it is visible on this line + if (td < maxdist3) + { + maxdist2 = maxdist - td; + for (s = 0;s < smax;s++) + { + if (sdtable[s] < maxdist2) + { + k = dlightdivtable[(sdtable[s] + td) >> 7] - subtract; + if (k > 0) + { + ratio = rand() & 255; + ca = (((icolor[7] - icolor[3]) * ratio) >> 8) + icolor[3]; + a = (ca * k) >> 8; + if (a > 0) + { + a = bound(0, a, 256); + cr = (((icolor[4] - icolor[0]) * ratio) >> 8) + icolor[0]; + cg = (((icolor[5] - icolor[1]) * ratio) >> 8) + icolor[1]; + cb = (((icolor[6] - icolor[2]) * ratio) >> 8) + icolor[2]; + bl[0] = (qbyte) ((((cr - (int) bl[0]) * a) >> 8) + (int) bl[0]); + bl[1] = (qbyte) ((((cg - (int) bl[1]) * a) >> 8) + (int) bl[1]); + bl[2] = (qbyte) ((((cb - (int) bl[2]) * a) >> 8) + (int) bl[2]); + stained = true; + } + } + } + bl += 3; + } + } + else // skip line + bl += smax3; + } + // force lightmap upload + if (stained) + surf->cached_dlight = true; + } + } + } - count = 0; - while (base->anim_min > relative || base->anim_max <= relative) + if (node->children[0]->contents >= 0) { - base = base->anim_next; - if (!base) + if (node->children[1]->contents >= 0) { - Con_Printf("R_TextureAnimation: broken cycle"); - return original; + R_StainNode(node->children[0], model, origin, radius, icolor); + node = node->children[1]; + goto loc0; } - if (++count > 100) + else { - Con_Printf("R_TextureAnimation: infinite cycle"); - return original; + node = node->children[0]; + goto loc0; } } - - return base; - */ + else if (node->children[1]->contents >= 0) + { + node = node->children[1]; + goto loc0; + } } - -/* -============================================================= - - BRUSH MODELS - -============================================================= -*/ - - -float turbsin[256] = +void R_Stain (vec3_t origin, float radius, int cr1, int cg1, int cb1, int ca1, int cr2, int cg2, int cb2, int ca2) { - #include "gl_warp_sin.h" -}; -#define TURBSCALE (256.0 / (2 * M_PI)) - + int n, icolor[8]; + entity_render_t *ent; + model_t *model; + vec3_t org; + icolor[0] = cr1; + icolor[1] = cg1; + icolor[2] = cb1; + icolor[3] = ca1; + icolor[4] = cr2; + icolor[5] = cg2; + icolor[6] = cb2; + icolor[7] = ca2; + + model = cl.worldmodel; + softwaretransformidentity(); + R_StainNode(model->nodes + model->hulls[0].firstclipnode, model, origin, radius, icolor); -void UploadLightmaps(void) -{ - int i; - if (nosubimage || nosubimagefragments) + // look for embedded bmodels + for (n = 0;n < cl_num_brushmodel_entities;n++) { - for (i = 0;i < MAX_LIGHTMAPS;i++) + ent = cl_brushmodel_entities[n]; + model = ent->model; + if (model && model->name[0] == '*') { - if (lightmapupdate[i][0] < lightmapupdate[i][1]) + Mod_CheckLoaded(model); + if (model->type == mod_brush) { - if(r_upload.value) - { - glBindTexture(GL_TEXTURE_2D, lightmap_textures + i); - if (nosubimage) - { - if (lightmaprgba) - glTexImage2D(GL_TEXTURE_2D, 0, 3, BLOCK_WIDTH, BLOCK_HEIGHT, 0, GL_RGBA, GL_UNSIGNED_BYTE, lightmaps[i]); - else - glTexImage2D(GL_TEXTURE_2D, 0, 3, BLOCK_WIDTH, BLOCK_HEIGHT, 0, GL_RGB, GL_UNSIGNED_BYTE, lightmaps[i]); - } - else - { - if (lightmaprgba) - glTexSubImage2D(GL_TEXTURE_2D, 0, 0, lightmapupdate[i][0], BLOCK_WIDTH, lightmapupdate[i][1] - lightmapupdate[i][0], GL_RGBA, GL_UNSIGNED_BYTE, lightmaps[i] + (BLOCK_WIDTH * 4 * lightmapupdate[i][0])); - else - glTexSubImage2D(GL_TEXTURE_2D, 0, 0, lightmapupdate[i][0], BLOCK_WIDTH, lightmapupdate[i][1] - lightmapupdate[i][0], GL_RGB, GL_UNSIGNED_BYTE, lightmaps[i] + (BLOCK_WIDTH * 3 * lightmapupdate[i][0])); - } - } + softwaretransformforentity(ent); + softwareuntransform(origin, org); + R_StainNode(model->nodes + model->hulls[0].firstclipnode, model, org, radius, icolor); } - lightmapupdate[i][0] = BLOCK_HEIGHT; - lightmapupdate[i][1] = 0; } } } -float wvert[1024*6]; // used by the following functions -void RSurf_DrawSky(msurface_t *s, int transform) +/* +============================================================= + + BRUSH MODELS + +============================================================= +*/ + +static void RSurfShader_Sky(msurface_t *firstsurf) { - glpoly_t *p; + msurface_t *surf; int i; - float *v; + surfvertex_t *v; + surfmesh_t *mesh; + rmeshbufferinfo_t m; + float cr, cg, cb, ca; + float *outv, *outc; // LordHavoc: HalfLife maps have freaky skypolys... - if (hlbsp) + if (currentrenderentity->model->ishlbsp) return; - for (p=s->polys ; p ; p=p->next) + if (skyrendernow) + { + skyrendernow = false; + if (skyrendermasked) + R_Sky(); + } + for (surf = firstsurf;surf;surf = surf->chain) { - if (currentskypoly < MAX_SKYPOLYS && currentskyvert + p->numverts <= MAX_SKYVERTS) + // draw depth-only polys + memset(&m, 0, sizeof(m)); + m.transparent = false; + if (skyrendermasked) + { + m.blendfunc1 = GL_ZERO; + m.blendfunc2 = GL_ONE; + m.depthwrite = true; + } + else { - skypoly[currentskypoly].firstvert = currentskyvert; - skypoly[currentskypoly++].verts = p->numverts; - if (transform) + m.blendfunc1 = GL_ONE; + m.blendfunc2 = GL_ZERO; + m.depthwrite = false; + } + for (mesh = surf->mesh;mesh;mesh = mesh->chain) + { + m.numtriangles = mesh->numtriangles; + m.numverts = mesh->numverts; + if (R_Mesh_Draw_GetBuffer(&m)) { - for (i = 0,v = p->verts[0];i < p->numverts;i++, v += VERTEXSIZE) + cr = fogcolor[0] * m.colorscale; + cg = fogcolor[1] * m.colorscale; + cb = fogcolor[2] * m.colorscale; + ca = 1; + memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3])); + for (i = 0, v = mesh->vertex, outv = m.vertex;i < m.numverts;i++, v++, outv += 4, outc += 4) { - softwaretransform(v, skyvert[currentskyvert].v); - currentskyvert++; + softwaretransform(v->v, outv); } - } - else - { - for (i = 0,v = p->verts[0];i < p->numverts;i++, v += VERTEXSIZE) + for (i = 0, outc = m.color;i < m.numverts;i++, outc += 4) { - VectorCopy(v, skyvert[currentskyvert].v); - currentskyvert++; + outc[0] = cr; + outc[1] = cg; + outc[2] = cb; + outc[3] = ca; } } } } } -int RSurf_Light(int *dlightbits, glpoly_t *polys) +static int RSurf_LightSeparate(int *dlightbits, int numverts, float *vert, float *color) { - float cr, cg, cb, radius, radius2, f, *v, *wv; - int i, a, b, lit = false; - unsigned int c, d; - dlight_t *light; - vec_t *lightorigin; - glpoly_t *p; - for (a = 0;a < 8;a++) + float f, *v, *c; + int i, l, lit = false; + rdlight_t *rd; + vec3_t lightorigin; + for (l = 0;l < r_numdlights;l++) { - if ((c = dlightbits[a])) + if (dlightbits[l >> 5] & (1 << (l & 31))) { - for (b = 0, d = 1;c;b++, d <<= 1) + rd = &r_dlight[l]; + // FIXME: support softwareuntransform here and make bmodels use hardware transform? + VectorCopy(rd->origin, lightorigin); + for (i = 0, v = vert, c = color;i < numverts;i++, v += 4, c += 4) { - if (c & d) + f = VectorDistance2(v, lightorigin) + LIGHTOFFSET; + if (f < rd->cullradius2) { - c -= d; - light = &cl_dlights[a * 32 + b]; - lightorigin = light->origin; - cr = light->color[0]; - cg = light->color[1]; - cb = light->color[2]; - radius = light->radius*light->radius; - radius2 = radius * 256.0f; - wv = wvert; - for (p = polys;p;p = p->next) - { - for (i = 0, v = p->verts[0];i < p->numverts;i++, v += VERTEXSIZE) - { - f = VectorDistance2(wv, lightorigin); - if (f < radius) - { - f = radius2 / (f + LIGHTOFFSET); - wv[3] += cr * f; - wv[4] += cg * f; - wv[5] += cb * f; - lit = true; - } - wv += 6; - } - } + f = (1.0f / f) - rd->subtract; + VectorMA(c, f, rd->light, c); + lit = true; } } } @@ -548,862 +709,1041 @@ int RSurf_Light(int *dlightbits, glpoly_t *polys) return lit; } -void RSurf_DrawWater(msurface_t *s, texture_t *t, int transform, int alpha) +// note: this untransforms lights to do the checking, +// and takes surf->mesh->vertex data +static int RSurf_LightCheck(int *dlightbits, surfmesh_t *mesh) { - int i; - float os = turbsin[(int)(cl.time * TURBSCALE) & 255], ot = turbsin[(int)(cl.time * TURBSCALE + 96.0) & 255]; - glpoly_t *p; - float *v; - // FIXME: make fog texture if water texture is transparent? - - if (s->dlightframe != r_framecount) + int i, l; + rdlight_t *rd; + vec3_t lightorigin; + surfvertex_t *sv; + for (l = 0;l < r_numdlights;l++) { - vec3_t temp; - // LordHavoc: fast path for no vertex lighting cases - if (transform) + if (dlightbits[l >> 5] & (1 << (l & 31))) { - if (r_waterripple.value) - { - for (p=s->polys ; p ; p=p->next) - { - transpolybegin(R_GetTexture(t->texture), R_GetTexture(t->glowtexture), 0, TPOLYTYPE_ALPHA); - for (i = 0,v = p->verts[0];i < p->numverts;i++, v += VERTEXSIZE) - { - softwaretransform(v, temp); - transpolyvert(temp[0], temp[1], temp[2] + r_waterripple.value * turbsin[(int)((temp[0]*(1.0f/32.0f)+cl.time) * TURBSCALE) & 255] * turbsin[(int)((temp[1]*(1.0f/32.0f)+cl.time) * TURBSCALE) & 255] * (1.0f / 64.0f), (v[3] + os) * (1.0f/64.0f), (v[4] + ot) * (1.0f/64.0f), 128, 128, 128, alpha); - } - transpolyend(); - } - } - else - { - for (p=s->polys ; p ; p=p->next) + rd = &r_dlight[l]; + softwareuntransform(rd->origin, lightorigin); + for (i = 0, sv = mesh->vertex;i < mesh->numverts;i++, sv++) + if (VectorDistance2(sv->v, lightorigin) < rd->cullradius2) + return true; + } + } + return false; +} + +static void RSurfShader_Water_Pass_Base(msurface_t *surf) +{ + int i, size3; + surfvertex_t *v; + float *outv, *outc, *outst, cl, diff[3]; + float base[3], scale, f; + qbyte *lm; + surfmesh_t *mesh; + rmeshbufferinfo_t m; + float alpha = currentrenderentity->alpha * (surf->flags & SURF_DRAWNOALPHA ? 1 : r_wateralpha.value); + memset(&m, 0, sizeof(m)); + if (currentrenderentity->effects & EF_ADDITIVE) + { + m.transparent = true; + m.blendfunc1 = GL_SRC_ALPHA; + m.blendfunc2 = GL_ONE; + } + else if (surf->currenttexture->fogtexture != NULL || 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.depthwrite = false; + m.depthdisable = false; + m.tex[0] = R_GetTexture(surf->currenttexture->texture); + if (surf->flags & SURF_DRAWFULLBRIGHT || currentrenderentity->effects & EF_FULLBRIGHT) + { + for (mesh = surf->mesh;mesh;mesh = mesh->chain) + { + m.numtriangles = mesh->numtriangles; + m.numverts = mesh->numverts; + if (R_Mesh_Draw_GetBuffer(&m)) + { + base[0] = base[1] = base[2] = 1.0f * m.colorscale; + memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3])); + for (i = 0, v = mesh->vertex, outv = m.vertex, outc = m.color, outst = m.texcoords[0];i < m.numverts;i++, v++, outv += 4, outc += 4, outst += 2) { - transpolybegin(R_GetTexture(t->texture), R_GetTexture(t->glowtexture), 0, TPOLYTYPE_ALPHA); - for (i = 0,v = p->verts[0];i < p->numverts;i++, v += VERTEXSIZE) + softwaretransform(v->v, outv); + outv[3] = 1; + VectorCopy(base, outc); + outc[3] = alpha; + outst[0] = v->st[0]; + outst[1] = v->st[1]; + if (fogenabled) { - softwaretransform(v, temp); - transpolyvert(temp[0], temp[1], temp[2], (v[3] + os) * (1.0f/64.0f), (v[4] + ot) * (1.0f/64.0f), 128, 128, 128, alpha); + VectorSubtract(outv, r_origin, diff); + f = 1 - exp(fogdensity/DotProduct(diff, diff)); + VectorScale(outc, f, outc); } - transpolyend(); } } } - else + } + else + { + size3 = ((surf->extents[0]>>4)+1)*((surf->extents[1]>>4)+1)*3; + base[0] = base[1] = base[2] = (r_ambient.value * (1.0f / 64.0f) + ((surf->flags & SURF_LIGHTMAP) ? 0 : 0.5f)); + for (mesh = surf->mesh;mesh;mesh = mesh->chain) { - if (r_waterripple.value) + m.numtriangles = mesh->numtriangles; + m.numverts = mesh->numverts; + if (R_Mesh_Draw_GetBuffer(&m)) { - for (p=s->polys ; p ; p=p->next) + cl = m.colorscale; + memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3])); + for (i = 0, v = mesh->vertex, outv = m.vertex, outc = m.color, outst = m.texcoords[0];i < m.numverts;i++, v++, outv += 4, outc += 4, outst += 2) { - transpolybegin(R_GetTexture(t->texture), R_GetTexture(t->glowtexture), 0, TPOLYTYPE_ALPHA); - for (i = 0,v = p->verts[0];i < p->numverts;i++, v += VERTEXSIZE) - transpolyvert(v[0], v[1], v[2] + r_waterripple.value * turbsin[(int)((v[0]*(1.0f/32.0f)+cl.time) * TURBSCALE) & 255] * turbsin[(int)((v[1]*(1.0f/32.0f)+cl.time) * TURBSCALE) & 255] * (1.0f / 64.0f), (v[3] + os) * (1.0f/64.0f), (v[4] + ot) * (1.0f/64.0f), 128, 128, 128, alpha); - transpolyend(); + softwaretransform(v->v, outv); + outv[3] = 1; + VectorCopy(base, outc); + outc[3] = alpha; + outst[0] = v->st[0]; + outst[1] = v->st[1]; } - } - else - { - for (p=s->polys ; p ; p=p->next) + if (surf->dlightframe == r_framecount) + RSurf_LightSeparate(surf->dlightbits, m.numverts, m.vertex, m.color); + for (i = 0, v = mesh->vertex, outv = m.vertex, outc = m.color;i < m.numverts;i++, v++, outv += 4, outc += 4) { - transpolybegin(R_GetTexture(t->texture), R_GetTexture(t->glowtexture), 0, TPOLYTYPE_ALPHA); - for (i = 0,v = p->verts[0];i < p->numverts;i++, v += VERTEXSIZE) - transpolyvert(v[0], v[1], v[2], (v[3] + os) * (1.0f/64.0f), (v[4] + ot) * (1.0f/64.0f), 128, 128, 128, alpha); - transpolyend(); + if (surf->flags & SURF_LIGHTMAP) + if (surf->styles[0] != 255) + { + lm = surf->samples + v->lightmapoffset; + scale = d_lightstylevalue[surf->styles[0]] * (1.0f / 32768.0f); + VectorMA(outc, scale, lm, outc); + if (surf->styles[1] != 255) + { + lm += size3; + scale = d_lightstylevalue[surf->styles[1]] * (1.0f / 32768.0f); + VectorMA(outc, scale, lm, outc); + if (surf->styles[2] != 255) + { + lm += size3; + scale = d_lightstylevalue[surf->styles[2]] * (1.0f / 32768.0f); + VectorMA(outc, scale, lm, outc); + if (surf->styles[3] != 255) + { + lm += size3; + scale = d_lightstylevalue[surf->styles[3]] * (1.0f / 32768.0f); + VectorMA(outc, scale, lm, outc); + } + } + } + } + if (fogenabled) + { + VectorSubtract(outv, r_origin, diff); + f = cl * (1 - exp(fogdensity/DotProduct(diff, diff))); + VectorScale(outc, f, outc); + } + else + VectorScale(outc, cl, outc); } } } } - else +} + +static void RSurfShader_Water_Pass_Fog(msurface_t *surf) +{ + int i; + surfvertex_t *v; + float *outv, *outc, *outst, diff[3]; + float base[3], f; + surfmesh_t *mesh; + rmeshbufferinfo_t m; + float alpha = currentrenderentity->alpha * (surf->flags & SURF_DRAWNOALPHA ? 1 : r_wateralpha.value); + memset(&m, 0, sizeof(m)); + m.transparent = currentrenderentity->effects & EF_ADDITIVE || surf->currenttexture->fogtexture != NULL || alpha < 1; + m.blendfunc1 = GL_SRC_ALPHA; + m.blendfunc2 = GL_ONE; + m.depthwrite = false; + m.depthdisable = false; + m.tex[0] = R_GetTexture(surf->currenttexture->fogtexture); + for (mesh = surf->mesh;mesh;mesh = mesh->chain) { - float *wv; - wv = wvert; - for (p = s->polys;p;p = p->next) + m.numtriangles = mesh->numtriangles; + m.numverts = mesh->numverts; + if (R_Mesh_Draw_GetBuffer(&m)) { - for (i = 0, v = p->verts[0];i < p->numverts;i++, v += VERTEXSIZE) + VectorScale(fogcolor, m.colorscale, base); + memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3])); + for (i = 0, v = mesh->vertex, outv = m.vertex, outc = m.color;i < m.numverts;i++, v++, outv += 4, outc += 4) { - if (transform) - softwaretransform(v, wv); - else - VectorCopy(v, wv); - if (r_waterripple.value) - wv[2] += r_waterripple.value * turbsin[(int)((wv[0]*(1.0f/32.0f)+cl.time) * TURBSCALE) & 255] * turbsin[(int)((wv[1]*(1.0f/32.0f)+cl.time) * TURBSCALE) & 255] * (1.0f / 64.0f); - wv[3] = wv[4] = wv[5] = 128.0f; - wv += 6; + softwaretransform(v->v, outv); + outv[3] = 1; + VectorSubtract(outv, r_origin, diff); + f = exp(fogdensity/DotProduct(diff, diff)); + VectorScale(base, f, outc); + outc[3] = alpha; + } + if (m.tex[0]) + { + for (i = 0, v = mesh->vertex, outst = m.texcoords[0];i < m.numverts;i++, v++, outv += 4, outst += 2) + { + outst[0] = v->st[0]; + outst[1] = v->st[1]; + } } - } - if (s->dlightframe == r_framecount) - RSurf_Light(s->dlightbits, s->polys); - wv = wvert; - for (p=s->polys ; p ; p=p->next) - { - transpolybegin(R_GetTexture(t->texture), R_GetTexture(t->glowtexture), 0, TPOLYTYPE_ALPHA); - for (i = 0,v = p->verts[0];i < p->numverts;i++, v += VERTEXSIZE, wv += 6) - transpolyvert(wv[0], wv[1], wv[2], (v[3] + os) * (1.0f/64.0f), (v[4] + ot) * (1.0f/64.0f), wv[3], wv[4], wv[5], alpha); - transpolyend(); } } } -void RSurf_DrawWall(msurface_t *s, texture_t *t, int transform) +static void RSurfShader_Water(msurface_t *firstsurf) +{ + msurface_t *surf; + for (surf = firstsurf;surf;surf = surf->chain) + RSurfShader_Water_Pass_Base(surf); + if (fogenabled) + for (surf = firstsurf;surf;surf = surf->chain) + RSurfShader_Water_Pass_Fog(surf); +} + +static void RSurfShader_Wall_Pass_BaseMTex(msurface_t *surf) { - int i, lit = false, polys = 0, verts = 0; - float *v; - glpoly_t *p; - wallpoly_t *wp; - wallvert_t *out; - wallvertcolor_t *outcolor; - // check for lightmap modification - if (s->cached_dlight - || (r_dynamic.value && r_dlightmap.value && s->dlightframe == r_framecount) - || r_ambient.value != s->cached_ambient - || lighthalf != s->cached_lighthalf - || (r_dynamic.value - && ((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])))) - R_UpdateLightmap(s, s->lightmaptexturenum); - if (s->dlightframe != r_framecount || r_dlightmap.value) + int i; + surfvertex_t *v; + float *outv, *outc, *outst, *outuv, cl, ca, diff[3]; + surfmesh_t *mesh; + rmeshbufferinfo_t m; + memset(&m, 0, sizeof(m)); + if (currentrenderentity->effects & EF_ADDITIVE) + { + m.transparent = true; + m.blendfunc1 = GL_SRC_ALPHA; + m.blendfunc2 = GL_ONE; + } + else if (surf->currenttexture->fogtexture != NULL || currentrenderentity->alpha != 1) + { + m.transparent = true; + m.blendfunc1 = GL_SRC_ALPHA; + m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA; + } + else + { + m.transparent = false; + m.blendfunc1 = GL_ONE; + m.blendfunc2 = GL_ZERO; + } + m.depthwrite = false; + m.depthdisable = false; + m.tex[0] = R_GetTexture(surf->currenttexture->texture); + m.tex[1] = R_GetTexture(surf->lightmaptexture); + ca = currentrenderentity->alpha; + for (mesh = surf->mesh;mesh;mesh = mesh->chain) { - // LordHavoc: fast path version for no vertex lighting cases - wp = &wallpoly[currentwallpoly]; - out = &wallvert[currentwallvert]; - for (p = s->polys;p;p = p->next) + m.numtriangles = mesh->numtriangles; + m.numverts = mesh->numverts; + + if (R_Mesh_Draw_GetBuffer(&m)) { - if ((currentwallpoly >= MAX_WALLPOLYS) || (currentwallvert+p->numverts > MAX_WALLVERTS)) - return; - wp->texnum = (unsigned short) R_GetTexture(t->texture); - wp->lighttexnum = (unsigned short) (lightmap_textures + s->lightmaptexturenum); - wp->glowtexnum = (unsigned short) R_GetTexture(t->glowtexture); - wp->firstvert = currentwallvert; - wp->numverts = p->numverts; - wp->lit = false; - wp++; - currentwallpoly++; - currentwallvert += p->numverts; - v = p->verts[0]; - if (transform) + cl = (float) (1 << lightscalebit) * m.colorscale; + memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3])); + if (fogenabled) { - for (i = 0;i < p->numverts;i++, v += VERTEXSIZE, out++) + if (softwaretransform_complexity) + { + for (i = 0, v = mesh->vertex, outv = m.vertex, outc = m.color, outst = m.texcoords[0], outuv = m.texcoords[1];i < m.numverts;i++, v++, outv += 4, outc += 4, outst += 2, outuv += 2) + { + softwaretransform(v->v, outv); + outv[3] = 1; + VectorSubtract(outv, r_origin, diff); + outc[0] = outc[1] = outc[2] = cl * (1 - exp(fogdensity/DotProduct(diff, diff))); + outc[3] = ca; + outst[0] = v->st[0]; + outst[1] = v->st[1]; + outuv[0] = v->uv[0]; + outuv[1] = v->uv[1]; + } + } + else { - softwaretransform(v, out->vert); - out->vert[3] = v[3]; - out->vert[4] = v[4]; - out->vert[5] = v[5]; - out->vert[6] = v[6]; + for (i = 0, v = mesh->vertex, outv = m.vertex, outc = m.color, outst = m.texcoords[0], outuv = m.texcoords[1];i < m.numverts;i++, v++, outv += 4, outc += 4, outst += 2, outuv += 2) + { + VectorCopy(v->v, outv); + outv[3] = 1; + VectorSubtract(outv, r_origin, diff); + outc[0] = outc[1] = outc[2] = cl * (1 - exp(fogdensity/DotProduct(diff, diff))); + outc[3] = ca; + outst[0] = v->st[0]; + outst[1] = v->st[1]; + outuv[0] = v->uv[0]; + outuv[1] = v->uv[1]; + } } } else { - /* - for (i = 0;i < p->numverts;i++, v += VERTEXSIZE, out++) + if (softwaretransform_complexity) + { + for (i = 0, v = mesh->vertex, outv = m.vertex, outc = m.color, outst = m.texcoords[0], outuv = m.texcoords[1];i < m.numverts;i++, v++, outv += 4, outc += 4, outst += 2, outuv += 2) + { + softwaretransform(v->v, outv); + outv[3] = 1; + outc[0] = outc[1] = outc[2] = cl; + outc[3] = ca; + outst[0] = v->st[0]; + outst[1] = v->st[1]; + outuv[0] = v->uv[0]; + outuv[1] = v->uv[1]; + } + } + else { - VectorCopy(v, out->vert); - out->vert[3] = v[3]; - out->vert[4] = v[4]; - out->vert[5] = v[5]; - out->vert[6] = v[6]; + for (i = 0, v = mesh->vertex, outv = m.vertex, outc = m.color, outst = m.texcoords[0], outuv = m.texcoords[1];i < m.numverts;i++, v++, outv += 4, outc += 4, outst += 2, outuv += 2) + { + VectorCopy(v->v, outv); + outv[3] = 1; + outc[0] = outc[1] = outc[2] = cl; + outc[3] = ca; + outst[0] = v->st[0]; + outst[1] = v->st[1]; + outuv[0] = v->uv[0]; + outuv[1] = v->uv[1]; + } } - */ - memcpy(out, v, sizeof(vec_t) * VERTEXSIZE * p->numverts); - out += p->numverts; } } } - else +} + +static void RSurfShader_Wall_Pass_BaseTexture(msurface_t *surf) +{ + int i; + surfvertex_t *v; + float *outv, *outc, *outst, cl, ca; + surfmesh_t *mesh; + rmeshbufferinfo_t m; + memset(&m, 0, sizeof(m)); + m.transparent = false; + m.blendfunc1 = GL_ONE; + m.blendfunc2 = GL_ZERO; + m.depthwrite = false; + m.depthdisable = false; + m.tex[0] = R_GetTexture(surf->currenttexture->texture); + ca = currentrenderentity->alpha; + for (mesh = surf->mesh;mesh;mesh = mesh->chain) { - float *wv; - wv = wvert; - for (p = s->polys;p;p = p->next) + m.numtriangles = mesh->numtriangles; + m.numverts = mesh->numverts; + + if (R_Mesh_Draw_GetBuffer(&m)) { - for (i = 0, v = p->verts[0];i < p->numverts;i++, v += VERTEXSIZE) + cl = (float) (1 << lightscalebit) * m.colorscale; + memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3])); + if (softwaretransform_complexity) { - if (transform) - softwaretransform(v, wv); - else - VectorCopy(v, wv); - wv[3] = wv[4] = wv[5] = 0.0f; - wv += 6; + for (i = 0, v = mesh->vertex, outv = m.vertex, outc = m.color, outst = m.texcoords[0];i < m.numverts;i++, v++, outv += 4, outc += 4, outst += 2) + { + softwaretransform(v->v, outv); + outv[3] = 1; + outc[0] = outc[1] = outc[2] = cl; + outc[3] = ca; + outst[0] = v->st[0]; + outst[1] = v->st[1]; + } } - verts += p->numverts; - polys++; - } - if ((currentwallpoly + polys > MAX_WALLPOLYS) || (currentwallvert+verts > MAX_WALLVERTS)) - return; - if ((!r_dlightmap.value) && s->dlightframe == r_framecount) - lit = RSurf_Light(s->dlightbits, s->polys); - wv = wvert; - wp = &wallpoly[currentwallpoly]; - out = &wallvert[currentwallvert]; - outcolor = &wallvertcolor[currentwallvert]; - currentwallpoly += polys; - for (p = s->polys;p;p = p->next) - { - v = p->verts[0]; - wp->texnum = (unsigned short) R_GetTexture(t->texture); - wp->lighttexnum = (unsigned short) (lightmap_textures + s->lightmaptexturenum); - wp->glowtexnum = (unsigned short) R_GetTexture(t->glowtexture); - wp->firstvert = currentwallvert; - wp->numverts = p->numverts; - wp->lit = lit; - wp++; - currentwallvert += p->numverts; - for (i = 0;i < p->numverts;i++, v += VERTEXSIZE, wv += 6, out++, outcolor++) + else { - if (lit) + for (i = 0, v = mesh->vertex, outv = m.vertex, outc = m.color, outst = m.texcoords[0];i < m.numverts;i++, v++, outv += 4, outc += 4, outst += 2) { - if (lighthalf) - { - outcolor->r = (byte) (bound(0, (int) wv[3] >> 1, 255)); - outcolor->g = (byte) (bound(0, (int) wv[4] >> 1, 255)); - outcolor->b = (byte) (bound(0, (int) wv[5] >> 1, 255)); - outcolor->a = 255; - } - else - { - outcolor->r = (byte) (bound(0, (int) wv[3], 255)); - outcolor->g = (byte) (bound(0, (int) wv[4], 255)); - outcolor->b = (byte) (bound(0, (int) wv[5], 255)); - outcolor->a = 255; - } + VectorCopy(v->v, outv); + outv[3] = 1; + outc[0] = outc[1] = outc[2] = cl; + outc[3] = ca; + outst[0] = v->st[0]; + outst[1] = v->st[1]; } - out->vert[0] = wv[0]; - out->vert[1] = wv[1]; - out->vert[2] = wv[2]; - out->vert[3] = v[3]; - out->vert[4] = v[4]; - out->vert[5] = v[5]; - out->vert[6] = v[6]; } } } } -// LordHavoc: transparent brush models -void RSurf_DrawWallVertex(msurface_t *s, texture_t *t, int transform, int isbmodel) +static void RSurfShader_Wall_Pass_BaseLightmap(msurface_t *surf) { - int i, alpha, size3; - float *v, *wv, scale; - glpoly_t *p; - byte *lm; - alpha = (int) (modelalpha * 255.0f); - size3 = ((s->extents[0]>>4)+1)*((s->extents[1]>>4)+1)*3; // *3 for colored lighting - wv = wvert; - for (p = s->polys;p;p = p->next) + int i; + surfvertex_t *v; + float *outv, *outc, *outuv, cl, ca, diff[3]; + surfmesh_t *mesh; + rmeshbufferinfo_t m; + memset(&m, 0, sizeof(m)); + m.transparent = false; + m.blendfunc1 = GL_ZERO; + m.blendfunc2 = GL_SRC_COLOR; + m.depthwrite = false; + m.depthdisable = false; + m.tex[0] = R_GetTexture(surf->lightmaptexture); + ca = currentrenderentity->alpha; + for (mesh = surf->mesh;mesh;mesh = mesh->chain) { - for (i = 0, v = p->verts[0];i < p->numverts;i++, v += VERTEXSIZE) + m.numtriangles = mesh->numtriangles; + m.numverts = mesh->numverts; + + if (R_Mesh_Draw_GetBuffer(&m)) { - if (transform) - softwaretransform(v, wv); + cl = (float) (1 << lightscalebit) * m.colorscale; + memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3])); + if (fogenabled) + { + if (softwaretransform_complexity) + { + for (i = 0, v = mesh->vertex, outv = m.vertex, outc = m.color, outuv = m.texcoords[0];i < m.numverts;i++, v++, outv += 4, outc += 4, outuv += 2) + { + softwaretransform(v->v, outv); + outv[3] = 1; + VectorSubtract(outv, r_origin, diff); + outc[0] = outc[1] = outc[2] = cl * (1 - exp(fogdensity/DotProduct(diff, diff))); + outc[3] = ca; + outuv[0] = v->uv[0]; + outuv[1] = v->uv[1]; + } + } + else + { + for (i = 0, v = mesh->vertex, outv = m.vertex, outc = m.color, outuv = m.texcoords[0];i < m.numverts;i++, v++, outv += 4, outc += 4, outuv += 2) + { + VectorCopy(v->v, outv); + outv[3] = 1; + VectorSubtract(outv, r_origin, diff); + outc[0] = outc[1] = outc[2] = cl * (1 - exp(fogdensity/DotProduct(diff, diff))); + outc[3] = ca; + outuv[0] = v->uv[0]; + outuv[1] = v->uv[1]; + } + } + } else - VectorCopy(v, wv); - wv[3] = wv[4] = wv[5] = r_ambient.value * 2.0f; - if (s->styles[0] != 255) { - lm = (byte *)((long) s->samples + (int) v[7]); - scale = d_lightstylevalue[s->styles[0]] * (1.0f / 128.0f);wv[3] += lm[size3*0+0] * scale;wv[4] += lm[size3*0+1] * scale;wv[5] += lm[size3*0+2] * scale; - if (s->styles[1] != 255) + if (softwaretransform_complexity) { - scale = d_lightstylevalue[s->styles[1]] * (1.0f / 128.0f);wv[3] += lm[size3*1+0] * scale;wv[4] += lm[size3*1+1] * scale;wv[5] += lm[size3*1+2] * scale; - if (s->styles[2] != 255) + for (i = 0, v = mesh->vertex, outv = m.vertex, outc = m.color, outuv = m.texcoords[0];i < m.numverts;i++, v++, outv += 4, outc += 4, outuv += 2) { - scale = d_lightstylevalue[s->styles[2]] * (1.0f / 128.0f);wv[3] += lm[size3*2+0] * scale;wv[4] += lm[size3*2+1] * scale;wv[5] += lm[size3*2+2] * scale; - if (s->styles[3] != 255) - { - scale = d_lightstylevalue[s->styles[3]] * (1.0f / 128.0f);wv[3] += lm[size3*3+0] * scale;wv[4] += lm[size3*3+1] * scale;wv[5] += lm[size3*3+2] * scale; - } + softwaretransform(v->v, outv); + outv[3] = 1; + outc[0] = outc[1] = outc[2] = cl; + outc[3] = ca; + outuv[0] = v->uv[0]; + outuv[1] = v->uv[1]; + } + } + else + { + for (i = 0, v = mesh->vertex, outv = m.vertex, outc = m.color, outuv = m.texcoords[0];i < m.numverts;i++, v++, outv += 4, outc += 4, outuv += 2) + { + VectorCopy(v->v, outv); + outv[3] = 1; + outc[0] = outc[1] = outc[2] = cl; + outc[3] = ca; + outuv[0] = v->uv[0]; + outuv[1] = v->uv[1]; } } } - wv += 6; - } - } - if (s->dlightframe == r_framecount) - RSurf_Light(s->dlightbits, s->polys); - wv = wvert; - if (isbmodel && (currententity->render.colormod[0] != 1 || currententity->render.colormod[1] != 1 || currententity->render.colormod[2] != 1)) - { - for (p = s->polys;p;p = p->next) - { - v = p->verts[0]; - transpolybegin(R_GetTexture(t->texture), R_GetTexture(t->glowtexture), 0, currententity->render.effects & EF_ADDITIVE ? TPOLYTYPE_ADD : TPOLYTYPE_ALPHA); - for (i = 0,v = p->verts[0];i < p->numverts;i++, v += VERTEXSIZE, wv += 6) - transpolyvert(wv[0], wv[1], wv[2], v[3], v[4], wv[3] * currententity->render.colormod[0], wv[4] * currententity->render.colormod[1], wv[5] * currententity->render.colormod[2], alpha); - transpolyend(); - } - } - else - { - for (p = s->polys;p;p = p->next) - { - v = p->verts[0]; - transpolybegin(R_GetTexture(t->texture), R_GetTexture(t->glowtexture), 0, currententity->render.effects & EF_ADDITIVE ? TPOLYTYPE_ADD : TPOLYTYPE_ALPHA); - for (i = 0,v = p->verts[0];i < p->numverts;i++, v += VERTEXSIZE, wv += 6) - transpolyvert(wv[0], wv[1], wv[2], v[3], v[4], wv[3], wv[4], wv[5], alpha); - transpolyend(); } } } -void R_NoVisMarkLights (vec3_t lightorigin, dlight_t *light, int bit, int bitindex, model_t *model); - -float bmverts[256*3]; - -int vertexworld; - -/* -void RBrushModelSurf_DoVisible(msurface_t *surf) -{ -// float *v, *bmv, *endbmv; -// glpoly_t *p; -// for (p = surf->polys;p;p = p->next) -// { -// for (v = p->verts[0], bmv = bmpoints, endbmv = bmv + p->numverts * 3;bmv < endbmv;v += VERTEXSIZE, bmv += 3) -// softwaretransform(v, bmv); -// if (R_Clip_Polygon(bmpoints, p->numverts, sizeof(float) * 3, surf->flags & SURF_CLIPSOLID)) - surf->visframe = r_framecount; -// } -} -*/ - -void RBrushModelSurf_Callback(void *data, void *data2) +static void RSurfShader_Wall_Pass_BaseVertex(msurface_t *surf) { - entity_t *ent = data2; - msurface_t *surf = data; - texture_t *t; - - /* - // FIXME: implement better dupe prevention in AddPolygon callback code - if (ent->render.model->firstmodelsurface != 0) + int i, size3; + surfvertex_t *v; + float *outv, *outc, *outst, cl, ca, diff[3]; + float base[3], scale, f; + qbyte *lm; + surfmesh_t *mesh; + rmeshbufferinfo_t m; + memset(&m, 0, sizeof(m)); + if (currentrenderentity->effects & EF_ADDITIVE) { - // it's not an instanced model, so we already rely on there being only one of it (usually a valid assumption, but QC can break this) - if (surf->visframe == r_framecount) - return; + m.transparent = true; + m.blendfunc1 = GL_SRC_ALPHA; + m.blendfunc2 = GL_ONE; } - */ - surf->visframe = r_framecount; - - c_faces++; - - currententity = ent; - modelalpha = ent->render.alpha; - - softwaretransformforbrushentity (ent); - - if (surf->flags & (SURF_DRAWSKY | SURF_DRAWTURB)) + else if (surf->currenttexture->fogtexture != NULL || currentrenderentity->alpha != 1) { - // sky and liquid don't need sorting (skypoly/transpoly) - if (surf->flags & SURF_DRAWSKY) - RSurf_DrawSky(surf, true); - else - RSurf_DrawWater(surf, R_TextureAnimation(surf->texinfo->texture), true, surf->flags & SURF_DRAWNOALPHA ? 255 : wateralpha); + m.transparent = true; + m.blendfunc1 = GL_SRC_ALPHA; + m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA; } else { - t = R_TextureAnimation(surf->texinfo->texture); - if (surf->texinfo->texture->transparent || vertexworld || ent->render.alpha != 1 || ent->render.model->firstmodelsurface == 0 || (ent->render.effects & EF_FULLBRIGHT) || ent->render.colormod[0] != 1 || ent->render.colormod[2] != 1 || ent->render.colormod[2] != 1) - RSurf_DrawWallVertex(surf, t, true, true); - else - RSurf_DrawWall(surf, t, true); + m.transparent = false; + m.blendfunc1 = GL_ONE; + m.blendfunc2 = GL_ZERO; } -} - -/* -================= -R_DrawBrushModel -================= -*/ -void R_DrawBrushModel (entity_t *e) -{ - int i, j; - vec3_t mins, maxs; - msurface_t *s; - model_t *clmodel; - int rotated; - vec3_t org; - glpoly_t *p; + m.depthwrite = false; + m.depthdisable = false; + m.tex[0] = R_GetTexture(surf->currenttexture->texture); - currententity = e; + size3 = ((surf->extents[0]>>4)+1)*((surf->extents[1]>>4)+1)*3; - clmodel = e->render.model; + base[0] = base[1] = base[2] = currentrenderentity->effects & EF_FULLBRIGHT ? 2.0f : r_ambient.value * (1.0f / 64.0f); - if (e->render.angles[0] || e->render.angles[1] || e->render.angles[2]) + ca = currentrenderentity->alpha; + for (mesh = surf->mesh;mesh;mesh = mesh->chain) { - rotated = true; - for (i=0 ; i<3 ; i++) + m.numtriangles = mesh->numtriangles; + m.numverts = mesh->numverts; + + if (R_Mesh_Draw_GetBuffer(&m)) { - mins[i] = e->render.origin[i] - clmodel->radius; - maxs[i] = e->render.origin[i] + clmodel->radius; - } - } - else - { - rotated = false; - VectorAdd (e->render.origin, clmodel->mins, mins); - VectorAdd (e->render.origin, clmodel->maxs, maxs); - } + cl = m.colorscale; + memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3])); - if (R_CullBox (mins, maxs)) - return; + if (currentrenderentity->effects & EF_FULLBRIGHT) + { + if (softwaretransform_complexity) + { + for (i = 0, v = mesh->vertex, outv = m.vertex, outc = m.color, outst = m.texcoords[0];i < m.numverts;i++, v++, outv += 4, outc += 4, outst += 2) + { + softwaretransform(v->v, outv); + outv[3] = 1; + VectorSubtract(outv, r_origin, diff); + outc[0] = outc[1] = outc[2] = 2.0f * cl * (1 - exp(fogdensity/DotProduct(diff, diff))); + outc[3] = ca; + outst[0] = v->st[0]; + outst[1] = v->st[1]; + } + } + else + { + for (i = 0, v = mesh->vertex, outv = m.vertex, outc = m.color, outst = m.texcoords[0];i < m.numverts;i++, v++, outv += 4, outc += 4, outst += 2) + { + VectorCopy(v->v, outv); + outv[3] = 1; + VectorSubtract(outv, r_origin, diff); + outc[0] = outc[1] = outc[2] = 2.0f * cl * (1 - exp(fogdensity/DotProduct(diff, diff))); + outc[3] = ca; + outst[0] = v->st[0]; + outst[1] = v->st[1]; + } + } + } + else + { + if (softwaretransform_complexity) + { + for (i = 0, v = mesh->vertex, outv = m.vertex, outc = m.color, outst = m.texcoords[0];i < m.numverts;i++, v++, outv += 4, outc += 4, outst += 2) + { + softwaretransform(v->v, outv); + outv[3] = 1; + VectorCopy(base, outc); + outc[3] = ca; + outst[0] = v->st[0]; + outst[1] = v->st[1]; + } + } + else + { + for (i = 0, v = mesh->vertex, outv = m.vertex, outc = m.color, outst = m.texcoords[0];i < m.numverts;i++, v++, outv += 4, outc += 4, outst += 2) + { + VectorCopy(v->v, outv); + outv[3] = 1; + VectorCopy(base, outc); + outc[3] = ca; + outst[0] = v->st[0]; + outst[1] = v->st[1]; + } + } - c_bmodels++; + if (surf->dlightframe == r_framecount) + RSurf_LightSeparate(surf->dlightbits, m.numverts, m.vertex, m.color); - VectorSubtract (r_origin, e->render.origin, modelorg); - if (rotated) - { - vec3_t temp; - vec3_t forward, right, up; - - VectorCopy (modelorg, temp); - AngleVectors (e->render.angles, forward, right, up); - modelorg[0] = DotProduct (temp, forward); - modelorg[1] = -DotProduct (temp, right); - modelorg[2] = DotProduct (temp, up); + for (i = 0, v = mesh->vertex, outv = m.vertex, outc = m.color;i < m.numverts;i++, v++, outv += 4, outc += 4) + { + if (surf->styles[0] != 255) + { + lm = surf->samples + v->lightmapoffset; + scale = d_lightstylevalue[surf->styles[0]] * (1.0f / 32768.0f); + VectorMA(outc, scale, lm, outc); + if (surf->styles[1] != 255) + { + lm += size3; + scale = d_lightstylevalue[surf->styles[1]] * (1.0f / 32768.0f); + VectorMA(outc, scale, lm, outc); + if (surf->styles[2] != 255) + { + lm += size3; + scale = d_lightstylevalue[surf->styles[2]] * (1.0f / 32768.0f); + VectorMA(outc, scale, lm, outc); + if (surf->styles[3] != 255) + { + lm += size3; + scale = d_lightstylevalue[surf->styles[3]] * (1.0f / 32768.0f); + VectorMA(outc, scale, lm, outc); + } + } + } + } + if (fogenabled) + { + VectorSubtract(outv, r_origin, diff); + f = cl * (1 - exp(fogdensity/DotProduct(diff, diff))); + VectorScale(outc, f, outc); + } + else + VectorScale(outc, cl, outc); + } + } + } } +} - softwaretransformforbrushentity (e); - - for (i = 0, s = &clmodel->surfaces[clmodel->firstmodelsurface];i < clmodel->nummodelsurfaces;i++, s++) +static void RSurfShader_Wall_Pass_BaseFullbright(msurface_t *surf) +{ + int i; + surfvertex_t *v; + float *outv, *outc, *outst, cl, ca, diff[3]; + surfmesh_t *mesh; + rmeshbufferinfo_t m; + memset(&m, 0, sizeof(m)); + if (currentrenderentity->effects & EF_ADDITIVE) { - s->visframe = -1; - if (((s->flags & SURF_PLANEBACK) == 0) == (PlaneDiff(modelorg, s->plane) >= 0)) - s->visframe = r_framecount; + m.transparent = true; + m.blendfunc1 = GL_SRC_ALPHA; + m.blendfunc2 = GL_ONE; } - -// calculate dynamic lighting for bmodel if it's not an instanced model - for (i = 0;i < MAX_DLIGHTS;i++) + else if (surf->currenttexture->fogtexture != NULL || currentrenderentity->alpha != 1) { - if (!cl_dlights[i].radius) - continue; - - VectorSubtract(cl_dlights[i].origin, currententity->render.origin, org); - R_NoVisMarkLights (org, &cl_dlights[i], 1<<(i&31), i >> 5, clmodel); + m.transparent = true; + m.blendfunc1 = GL_SRC_ALPHA; + m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA; } -// vertexlit = modelalpha != 1 || clmodel->firstmodelsurface == 0 || (currententity->render.effects & EF_FULLBRIGHT) || currententity->render.colormod[0] != 1 || currententity->render.colormod[2] != 1 || currententity->render.colormod[2] != 1; - - // draw texture - for (i = 0, s = &clmodel->surfaces[clmodel->firstmodelsurface];i < clmodel->nummodelsurfaces;i++, s++) + else + { + m.transparent = false; + m.blendfunc1 = GL_ONE; + m.blendfunc2 = GL_ZERO; + } + m.depthwrite = false; + m.depthdisable = false; + m.tex[0] = R_GetTexture(surf->currenttexture->texture); + ca = currentrenderentity->alpha; + for (mesh = surf->mesh;mesh;mesh = mesh->chain) { - if (s->visframe == r_framecount) + m.numtriangles = mesh->numtriangles; + m.numverts = mesh->numverts; + + if (R_Mesh_Draw_GetBuffer(&m)) { -// R_DrawSurf(s, true, vertexlit || s->texinfo->texture->transparent); - for (p = s->polys;p;p = p->next) - { - for (j = 0;j < p->numverts;j++) - softwaretransform(&p->verts[j][0], bmverts + j * 3); - R_Clip_AddPolygon(bmverts, p->numverts, 3 * sizeof(float), (s->flags & SURF_CLIPSOLID) != 0 && modelalpha == 1, RBrushModelSurf_Callback, s, e, NULL); - } - /* - if (s->flags & (SURF_DRAWSKY | SURF_DRAWTURB)) + cl = m.colorscale; + memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3])); + if (fogenabled) { - // sky and liquid don't need sorting (skypoly/transpoly) - if (s->flags & SURF_DRAWSKY) - RSurf_DrawSky(s, true); + if (softwaretransform_complexity) + { + for (i = 0, v = mesh->vertex, outv = m.vertex, outc = m.color, outst = m.texcoords[0];i < m.numverts;i++, v++, outv += 4, outc += 4, outst += 2) + { + softwaretransform(v->v, outv); + outv[3] = 1; + VectorSubtract(outv, r_origin, diff); + outc[0] = outc[1] = outc[2] = cl * (1 - exp(fogdensity/DotProduct(diff, diff))); + outc[3] = ca; + outst[0] = v->st[0]; + outst[1] = v->st[1]; + } + } else - RSurf_DrawWater(s, R_TextureAnimation(s->texinfo->texture), true, s->flags & SURF_DRAWNOALPHA ? 255 : wateralpha); + { + for (i = 0, v = mesh->vertex, outv = m.vertex, outc = m.color, outst = m.texcoords[0];i < m.numverts;i++, v++, outv += 4, outc += 4, outst += 2) + { + VectorCopy(v->v, outv); + outv[3] = 1; + VectorSubtract(outv, r_origin, diff); + outc[0] = outc[1] = outc[2] = cl * (1 - exp(fogdensity/DotProduct(diff, diff))); + outc[3] = ca; + outst[0] = v->st[0]; + outst[1] = v->st[1]; + } + } } else { - texture_t *t = R_TextureAnimation(s->texinfo->texture); - if (vertexlit || s->texinfo->texture->transparent) - RSurf_DrawWallVertex(s, t, true, true); + if (softwaretransform_complexity) + { + for (i = 0, v = mesh->vertex, outv = m.vertex, outc = m.color, outst = m.texcoords[0];i < m.numverts;i++, v++, outv += 4, outc += 4, outst += 2) + { + softwaretransform(v->v, outv); + outv[3] = 1; + outc[0] = outc[1] = outc[2] = cl; + outc[3] = ca; + outst[0] = v->st[0]; + outst[1] = v->st[1]; + } + } else - RSurf_DrawWall(s, t, true); + { + for (i = 0, v = mesh->vertex, outv = m.vertex, outc = m.color, outst = m.texcoords[0];i < m.numverts;i++, v++, outv += 4, outc += 4, outst += 2) + { + VectorCopy(v->v, outv); + outv[3] = 1; + outc[0] = outc[1] = outc[2] = cl; + outc[3] = ca; + outst[0] = v->st[0]; + outst[1] = v->st[1]; + } + } } - */ } } - UploadLightmaps(); -} - -/* -============================================================= - - WORLD MODEL - -============================================================= -*/ - -/* -static byte *worldvis; - -void R_MarkLeaves (void) -{ - static float noviscache; - if (r_oldviewleaf == r_viewleaf && noviscache == r_novis.value) - return; - - r_oldviewleaf = r_viewleaf; - noviscache = r_novis.value; - - worldvis = Mod_LeafPVS (r_viewleaf, cl.worldmodel); -} -*/ - -void RSurf_Callback(void *data, void *junk) -{ - ((msurface_t *)data)->visframe = r_framecount; } -/* -void RSurf_Callback(void *data, void *junk) +static void RSurfShader_Wall_Pass_Light(msurface_t *surf) { - msurface_t *surf = data; - texture_t *t; - -// if (surf->visframe == r_framecount) -// return; - - surf->visframe = r_framecount; + int i; + surfvertex_t *v; + float *outv, *outc, *outst, cl, ca, diff[3], f; + surfmesh_t *mesh; + rmeshbufferinfo_t m; - c_faces++; + if (surf->dlightframe != r_framecount) + return; + if (currentrenderentity->effects & EF_FULLBRIGHT) + return; - if (surf->flags & (SURF_DRAWSKY | SURF_DRAWTURB)) + memset(&m, 0, sizeof(m)); + if (currentrenderentity->effects & EF_ADDITIVE) { - // sky and liquid don't need sorting (skypoly/transpoly) - if (surf->flags & SURF_DRAWSKY) - RSurf_DrawSky(surf, false); - else - RSurf_DrawWater(surf, R_TextureAnimation(surf->texinfo->texture), false, surf->flags & SURF_DRAWNOALPHA ? 255 : wateralpha); + m.transparent = true; + m.blendfunc1 = GL_SRC_ALPHA; + m.blendfunc2 = GL_ONE; + } + else if (surf->currenttexture->fogtexture != NULL || currentrenderentity->alpha != 1) + { + m.transparent = true; + m.blendfunc1 = GL_SRC_ALPHA; + m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA; } else { - t = R_TextureAnimation(surf->texinfo->texture); - if (vertexworld) - RSurf_DrawWallVertex(surf, t, false, false); - else - RSurf_DrawWall(surf, t, false); + m.transparent = false; + m.blendfunc1 = GL_ONE; + m.blendfunc2 = GL_ZERO; } -} -*/ - -/* -mleaf_t *r_oldviewleaf; -int r_markvisframecount = 0; - -void R_MarkLeaves (void) -{ - static float noviscache; - int i, l, k, c; - mleaf_t *leaf; - msurface_t *surf, **mark, **endmark; - model_t *model = cl.worldmodel; -// mportal_t *portal; - glpoly_t *p; - byte *in; - int row; - - // ignore testvis if the map just changed - if (r_testvis.value && model->nodes->markvisframe == r_markvisframecount) - return; - - if (r_oldviewleaf == r_viewleaf && noviscache == r_novis.value) - return; - - r_oldviewleaf = r_viewleaf; - noviscache = r_novis.value; - - if ((in = r_viewleaf->compressed_vis)) + m.depthwrite = false; + m.depthdisable = false; + m.tex[0] = R_GetTexture(surf->currenttexture->texture); + ca = currentrenderentity->alpha; + for (mesh = surf->mesh;mesh;mesh = mesh->chain) { - row = (model->numleafs+7)>>3; - - if (!r_testvis.value) - r_markvisframecount++; - - // LordHavoc: mark the root node as visible, it will terminate all other ascensions - model->nodes->markvisframe = r_markvisframecount; - - k = 0; - while (k < row) + if (RSurf_LightCheck(surf->dlightbits, mesh)) { - c = *in++; - if (c) + m.numtriangles = mesh->numtriangles; + m.numverts = mesh->numverts; + + if (R_Mesh_Draw_GetBuffer(&m)) { - l = model->numleafs - (k << 3); - if (l > 8) - l = 8; - for (i=0 ; iindex, m.numtriangles * sizeof(int[3])); + for (i = 0, v = mesh->vertex, outv = m.vertex, outc = m.color, outst = m.texcoords[0];i < m.numverts;i++, v++, outv += 4, outc += 4, outst += 2) { - if (c & (1<v, outv); + outv[3] = 1; + VectorClear(outc); + outc[3] = ca; + outst[0] = v->st[0]; + outst[1] = v->st[1]; + } + RSurf_LightSeparate(surf->dlightbits, m.numverts, m.vertex, m.color); + if (fogenabled) + { + for (i = 0, outv = m.vertex, outc = m.color;i < m.numverts;i++, outv += 4, outc += 4) { - leaf = &model->leafs[(k << 3)+i+1]; - node = (mnode_t *)leaf; - do - { - node->markvisframe = r_markvisframecount; - node = node->parent; - } - while (node->markvisframecount != r_markvisframecount); + VectorSubtract(outv, r_origin, diff); + f = cl * (1 - exp(fogdensity/DotProduct(diff, diff))); + VectorScale(outc, f, outc); } } - k++; - } - else - k += *in++; - } - } - else - { - // LordHavoc: no vis data, mark everything as visible - model->nodes->markvisframe = r_markvisframecount; - - for (i = 1;i < model->numleafs;i++) - { - node = (mnode_t *)&model->leafs[i]; - do - { - node->markvisframe = r_markvisframecount; - node = node->parent; + else if (cl != 1) + for (i = 0, outc = m.color;i < m.numverts;i++, outc += 4) + VectorScale(outc, cl, outc); } - while (node->markvisframecount != r_markvisframecount); } } } -*/ -void R_SolidWorldNode (void) +static void RSurfShader_Wall_Pass_Glow(msurface_t *surf) { - if ((int) r_solidworldnode.value == 2) + int i; + surfvertex_t *v; + float *outv, *outc, *outst, cl, ca, diff[3]; + surfmesh_t *mesh; + rmeshbufferinfo_t m; + memset(&m, 0, sizeof(m)); + m.transparent = currentrenderentity->effects & EF_ADDITIVE || surf->currenttexture->fogtexture != NULL || currentrenderentity->alpha != 1; + m.blendfunc1 = GL_SRC_ALPHA; + m.blendfunc2 = GL_ONE; + m.tex[0] = R_GetTexture(surf->currenttexture->glowtexture); + ca = currentrenderentity->alpha; + for (mesh = surf->mesh;mesh;mesh = mesh->chain) { - mnode_t *nodestack[8192], *node = cl.worldmodel->nodes; - int nodestackpos = 0; - glpoly_t *p; + m.numtriangles = mesh->numtriangles; + m.numverts = mesh->numverts; -loc0: - if (node->numsurfaces) + if (R_Mesh_Draw_GetBuffer(&m)) { - msurface_t *surf = cl.worldmodel->surfaces + node->firstsurface, *surfend = surf + node->numsurfaces; - tinyplane_t plane; - if (PlaneDiff (r_origin, node->plane) < 0) + cl = m.colorscale; + memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3])); + if (fogenabled) { - for (;surf < surfend;surf++) + for (i = 0, v = mesh->vertex, outv = m.vertex, outc = m.color, outst = m.texcoords[0];i < m.numverts;i++, v++, outv += 4, outc += 4, outst += 2) { - if (surf->flags & SURF_PLANEBACK) - { - VectorNegate(surf->plane->normal, plane.normal); - plane.dist = -surf->plane->dist; - for (p = surf->polys;p;p = p->next) - R_Clip_AddPolygon((float *)p->verts, p->numverts, VERTEXSIZE * sizeof(float), surf->flags & SURF_CLIPSOLID, RSurf_Callback, surf, NULL, &plane); - } + softwaretransform(v->v, outv); + outv[3] = 1; + VectorSubtract(outv, r_origin, diff); + outc[0] = outc[1] = outc[2] = cl * (1 - exp(fogdensity/DotProduct(diff, diff))); + outc[3] = ca; + outst[0] = v->st[0]; + outst[1] = v->st[1]; } } else { - for (;surf < surfend;surf++) + for (i = 0, v = mesh->vertex, outv = m.vertex, outc = m.color, outst = m.texcoords[0];i < m.numverts;i++, v++, outv += 4, outc += 4, outst += 2) { - if (!(surf->flags & SURF_PLANEBACK)) - for (p = surf->polys;p;p = p->next) - R_Clip_AddPolygon((float *)p->verts, p->numverts, VERTEXSIZE * sizeof(float), surf->flags & SURF_CLIPSOLID, RSurf_Callback, surf, NULL, (tinyplane_t *)surf->plane); + softwaretransform(v->v, outv); + outv[3] = 1; + outc[0] = outc[1] = outc[2] = cl; + outc[3] = ca; + outst[0] = v->st[0]; + outst[1] = v->st[1]; } } } - - // 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 loc0; - } - node = node->children[0]; - goto loc0; - } - else if (node->children[1]->contents >= 0) - { - node = node->children[1]; - goto loc0; - } - else if (nodestackpos > 0) - { - node = nodestack[--nodestackpos]; - goto loc0; - } } - else if ((int) r_solidworldnode.value == 1) - { - glpoly_t *p; - msurface_t *surf, *endsurf; - tinyplane_t plane; +} +static void RSurfShader_Wall_Pass_Fog(msurface_t *surf) +{ + int i; + surfvertex_t *v; + float *outv, *outc, *outst, cl, ca, diff[3], f; + surfmesh_t *mesh; + rmeshbufferinfo_t m; + memset(&m, 0, sizeof(m)); + m.transparent = currentrenderentity->effects & EF_ADDITIVE || surf->currenttexture->fogtexture != NULL || currentrenderentity->alpha != 1; + m.blendfunc1 = GL_SRC_ALPHA; + m.blendfunc2 = GL_ONE; + ca = currentrenderentity->alpha; + for (mesh = surf->mesh;mesh;mesh = mesh->chain) + { + m.numtriangles = mesh->numtriangles; + m.numverts = mesh->numverts; - surf = &cl.worldmodel->surfaces[cl.worldmodel->firstmodelsurface]; - endsurf = surf + cl.worldmodel->nummodelsurfaces; - for (;surf < endsurf;surf++) + if (R_Mesh_Draw_GetBuffer(&m)) { - if (PlaneDiff(r_origin, surf->plane) < 0) + cl = m.colorscale; + memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3])); + if (softwaretransform_complexity) { - if (surf->flags & SURF_PLANEBACK) + for (i = 0, v = mesh->vertex, outv = m.vertex, outc = m.color, outst = m.texcoords[0];i < m.numverts;i++, v++, outv += 4, outc += 4, outst += 2) { - VectorNegate(surf->plane->normal, plane.normal); - plane.dist = -surf->plane->dist; - for (p = surf->polys;p;p = p->next) - R_Clip_AddPolygon((float *)p->verts, p->numverts, VERTEXSIZE * sizeof(float), (surf->flags & SURF_CLIPSOLID) != 0, RSurf_Callback, surf, NULL, &plane); + softwaretransform(v->v, outv); + outv[3] = 1; + VectorSubtract(outv, r_origin, diff); + f = cl * exp(fogdensity/DotProduct(diff, diff)); + VectorScale(fogcolor, f, outc); + outc[3] = ca; + outst[0] = v->st[0]; + outst[1] = v->st[1]; } } else { - if (!(surf->flags & SURF_PLANEBACK)) - for (p = surf->polys;p;p = p->next) - R_Clip_AddPolygon((float *)p->verts, p->numverts, VERTEXSIZE * sizeof(float), (surf->flags & SURF_CLIPSOLID) != 0, RSurf_Callback, surf, NULL, (tinyplane_t *)&surf->plane); - } - } - } - else - { - int l; - mleaf_t *leaf; - msurface_t *surf, **mark, **endmark; - glpoly_t *p; - tinyplane_t plane; - - for (l = 0, leaf = cl.worldmodel->leafs;l < cl.worldmodel->numleafs;l++, leaf++) - { - if (R_CullBox(leaf->mins, leaf->maxs)) - continue; -// leaf->visframe = r_framecount; - c_leafs++; - if (leaf->nummarksurfaces) - { -// if (R_CullBox(leaf->mins, leaf->maxs)) -// continue; - - if (leaf->nummarksurfaces) + for (i = 0, v = mesh->vertex, outv = m.vertex, outc = m.color, outst = m.texcoords[0];i < m.numverts;i++, v++, outv += 4, outc += 4, outst += 2) { - mark = leaf->firstmarksurface; - endmark = mark + leaf->nummarksurfaces; - 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; - for (p = surf->polys;p;p = p->next) - R_Clip_AddPolygon((float *)p->verts, p->numverts, VERTEXSIZE * sizeof(float), (surf->flags & SURF_CLIPSOLID) != 0, RSurf_Callback, surf, NULL, &plane); - } - } - else - { - if (!(surf->flags & SURF_PLANEBACK)) - for (p = surf->polys;p;p = p->next) - R_Clip_AddPolygon((float *)p->verts, p->numverts, VERTEXSIZE * sizeof(float), (surf->flags & SURF_CLIPSOLID) != 0, RSurf_Callback, surf, NULL, (tinyplane_t *)surf->plane); - } - } - while (mark < endmark); + VectorCopy(v->v, outv); + outv[3] = 1; + VectorSubtract(outv, r_origin, diff); + VectorSubtract(outv, r_origin, diff); + f = cl * exp(fogdensity/DotProduct(diff, diff)); + VectorScale(fogcolor, f, outc); + outc[3] = ca; + outst[0] = v->st[0]; + outst[1] = v->st[1]; } } } } } -/* -void RSurf_Callback(void *data, void *junk) +static void RSurfShader_Wall_Fullbright(msurface_t *firstsurf) { - ((msurface_t *)data)->visframe = r_framecount; + msurface_t *surf; + for (surf = firstsurf;surf;surf = surf->chain) + { + c_brush_polys++; + RSurfShader_Wall_Pass_BaseFullbright(surf); + } + for (surf = firstsurf;surf;surf = surf->chain) + if (surf->currenttexture->glowtexture) + RSurfShader_Wall_Pass_Glow(surf); + if (fogenabled) + for (surf = firstsurf;surf;surf = surf->chain) + RSurfShader_Wall_Pass_Fog(surf); } -int R_FrustumTestPolygon(float *points, int numpoints, int stride); - -void RSurf_DoVisible(msurface_t *surf) +static void RSurfShader_Wall_Vertex(msurface_t *firstsurf) { - glpoly_t *p; - for (p = surf->polys;p;p = p->next) - if (R_FrustumTestPolygon((float *) p->verts, p->numverts, VERTEXSIZE * sizeof(float)) >= 3) -// R_Clip_Polygon((float *) p->verts, p->numverts, VERTEXSIZE * sizeof(float), true, RSurf_Callback, surf, 1); -// if (R_Clip_Polygon((float *) p->verts, p->numverts, VERTEXSIZE * sizeof(float), surf->flags & SURF_CLIPSOLID)) - surf->visframe = r_framecount; + msurface_t *surf; + for (surf = firstsurf;surf;surf = surf->chain) + { + c_brush_polys++; + RSurfShader_Wall_Pass_BaseVertex(surf); + } + for (surf = firstsurf;surf;surf = surf->chain) + if (surf->currenttexture->glowtexture) + RSurfShader_Wall_Pass_Glow(surf); + if (fogenabled) + for (surf = firstsurf;surf;surf = surf->chain) + RSurfShader_Wall_Pass_Fog(surf); } -*/ - -//mleaf_t *llistbuffer[32768], *l, **llist; -/* -void RSurfLeaf_Callback(void *data) +static void RSurfShader_Wall_Lightmap(msurface_t *firstsurf) { - int portalstackpos = 0; - mleaf_t *leaf; - mportal_t *p, *portalstack[32768]; - msurface_t *surf, **mark, **endmark; - do + msurface_t *surf; + if (r_vertexsurfaces.integer) { - - leaf = data; - if (leaf->visframe == r_framecount) - return; - leaf->visframe = r_framecount; - - c_leafs++; - - if (leaf->nummarksurfaces) + for (surf = firstsurf;surf;surf = surf->chain) { - mark = leaf->firstmarksurface; - endmark = mark + leaf->nummarksurfaces; - do + c_brush_polys++; + RSurfShader_Wall_Pass_BaseVertex(surf); + } + for (surf = firstsurf;surf;surf = surf->chain) + if (surf->currenttexture->glowtexture) + RSurfShader_Wall_Pass_Glow(surf); + if (fogenabled) + for (surf = firstsurf;surf;surf = surf->chain) + RSurfShader_Wall_Pass_Fog(surf); + } + else if (r_multitexture.integer) + { + if (r_dlightmap.integer) + { + for (surf = firstsurf;surf;surf = surf->chain) + { + c_brush_polys++; + RSurfShader_Wall_Pass_BaseMTex(surf); + } + for (surf = firstsurf;surf;surf = surf->chain) + if (surf->currenttexture->glowtexture) + RSurfShader_Wall_Pass_Glow(surf); + if (fogenabled) + for (surf = firstsurf;surf;surf = surf->chain) + RSurfShader_Wall_Pass_Fog(surf); + } + else + { + for (surf = firstsurf;surf;surf = surf->chain) + { + c_brush_polys++; + RSurfShader_Wall_Pass_BaseMTex(surf); + } + for (surf = firstsurf;surf;surf = surf->chain) + if (surf->dlightframe == r_framecount) + RSurfShader_Wall_Pass_Light(surf); + for (surf = firstsurf;surf;surf = surf->chain) + if (surf->currenttexture->glowtexture) + RSurfShader_Wall_Pass_Glow(surf); + if (fogenabled) + for (surf = firstsurf;surf;surf = surf->chain) + RSurfShader_Wall_Pass_Fog(surf); + } + } + else if (firstsurf->currenttexture->fogtexture != NULL || currentrenderentity->alpha != 1 || currentrenderentity->effects & EF_ADDITIVE) + { + for (surf = firstsurf;surf;surf = surf->chain) + { + c_brush_polys++; + RSurfShader_Wall_Pass_BaseVertex(surf); + } + for (surf = firstsurf;surf;surf = surf->chain) + if (surf->currenttexture->glowtexture) + RSurfShader_Wall_Pass_Glow(surf); + if (fogenabled) + for (surf = firstsurf;surf;surf = surf->chain) + RSurfShader_Wall_Pass_Fog(surf); + } + else + { + if (r_dlightmap.integer) + { + for (surf = firstsurf;surf;surf = surf->chain) { - surf = *mark++; - // make sure surfaces are only processed once - if (surf->worldnodeframe == r_framecount) - continue; - surf->worldnodeframe = r_framecount; - if (PlaneDist(modelorg, surf->plane) < surf->plane->dist) - { - if (surf->flags & SURF_PLANEBACK) - RSurf_DoVisible(surf); - } - else - { - if (!(surf->flags & SURF_PLANEBACK)) - RSurf_DoVisible(surf); - } + c_brush_polys++; + RSurfShader_Wall_Pass_BaseTexture(surf); } - while (mark < endmark); + for (surf = firstsurf;surf;surf = surf->chain) + RSurfShader_Wall_Pass_BaseLightmap(surf); + for (surf = firstsurf;surf;surf = surf->chain) + if (surf->currenttexture->glowtexture) + RSurfShader_Wall_Pass_Glow(surf); + if (fogenabled) + for (surf = firstsurf;surf;surf = surf->chain) + RSurfShader_Wall_Pass_Fog(surf); } - - // follow portals into other leafs - for (p = leaf->portals;p;p = p->next) + else { - if (p->past->visframe != r_framecount && DotProduct(r_origin, p->plane.normal) < p->plane.dist) + for (surf = firstsurf;surf;surf = surf->chain) { - // R_Clip_Portal((float *) p->points, p->numpoints, sizeof(float) * 3, RSurfLeaf_Callback, p->past, 1); - if (R_Clip_Portal((float *) p->points, p->numpoints, sizeof(float) * 3)) - portalstack[portalstackpos++] = p; + c_brush_polys++; + RSurfShader_Wall_Pass_BaseTexture(surf); } + for (surf = firstsurf;surf;surf = surf->chain) + RSurfShader_Wall_Pass_BaseLightmap(surf); + for (surf = firstsurf;surf;surf = surf->chain) + if (surf->dlightframe == r_framecount) + RSurfShader_Wall_Pass_Light(surf); + for (surf = firstsurf;surf;surf = surf->chain) + if (surf->currenttexture->glowtexture) + RSurfShader_Wall_Pass_Glow(surf); + if (fogenabled) + for (surf = firstsurf;surf;surf = surf->chain) + RSurfShader_Wall_Pass_Fog(surf); } } - while(portalstackpos); - RSurfLeaf_Callback(p->past); - // upon returning, R_ProcessSpans will notice that the spans have changed and restart the line, this is ok because we're not adding any polygons that aren't already behind the portal } -*/ /* -// experimental and inferior to the other in recursion depth allowances -void R_PortalWorldNode (void) -{ -// int i, j; - mportal_t *p; - msurface_t *surf, **mark, **endmark; - mleaf_t *leaf, *llistbuffer[32768], **l, **llist; +============================================================= - leaf = r_viewleaf; - leaf->visframe = r_framecount; - l = llist = &llistbuffer[0]; - *llist++ = r_viewleaf; - while (l < llist) - { - leaf = *l++; + WORLD MODEL + +============================================================= +*/ +static void R_SolidWorldNode (void) +{ + if (r_viewleaf->contents != CONTENTS_SOLID) + { + int portalstack; + mportal_t *p, *pstack[8192]; + msurface_t *surf, **mark, **endmark; + mleaf_t *leaf; + // 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++; + leaf->visframe = r_framecount; + if (leaf->nummarksurfaces) { mark = leaf->firstmarksurface; @@ -1415,166 +1755,132 @@ void R_PortalWorldNode (void) if (surf->worldnodeframe == r_framecount) continue; surf->worldnodeframe = r_framecount; - if (PlaneDist(modelorg, surf->plane) < surf->plane->dist) + if (PlaneDist(r_origin, surf->plane) < surf->plane->dist) { if (surf->flags & SURF_PLANEBACK) - RSurf_DoVisible(surf); + surf->visframe = r_framecount; } else { if (!(surf->flags & SURF_PLANEBACK)) - RSurf_DoVisible(surf); + surf->visframe = r_framecount; } } while (mark < endmark); } // follow portals into other leafs - for (p = leaf->portals;p;p = p->next) + p = leaf->portals; + for (;p;p = p->next) { - if (p->past->visframe != r_framecount) + if (DotProduct(r_origin, p->plane.normal) < p->plane.dist) { - if (R_Clip_Portal((float *) p->points, p->numpoints, sizeof(float) * 3)) + leaf = p->past; + if (leaf->worldnodeframe != r_framecount) { - p->past->visframe = r_framecount; - *llist++ = p->past; + 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]; + } + } } } } -// for (p = leaf->portals;p;p = p->next) -// { -// leaf = p->past; -// if (leaf->worldnodeframe != r_framecount) -// { -// leaf->worldnodeframe = r_framecount; -// i = (leaf - cl.worldmodel->leafs) - 1; -// if ((worldvis[i>>3] & (1<<(i&7))) && R_NotCulledBox(leaf->mins, leaf->maxs)) -// *llist++ = leaf; -// } -// } + if (portalstack) + goto loc1; } - -// i = 0; -// j = 0; -// p = r_viewleaf->portals; -// for (;p;p = p->next) -// { -// j++; -// if (p->past->worldnodeframe != r_framecount) -// i++; -// } -// if (i) -// Con_Printf("%i portals of viewleaf (%i portals) were not checked\n", i, j); -} -*/ - - -int r_portalframecount = 0; - -/* -void R_Portal_Callback(void *data, void *data2) -{ - mleaf_t *leaf = data; - if (!r_testvis.value) - ((mportal_t *)data2)->visframe = r_portalframecount; - if (leaf->visframe != r_framecount) + else { - c_leafs++; - leaf->visframe = r_framecount; - } -} -*/ + 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 -void R_PVSWorldNode() -{ - int i/*, l*/, k, c, row, numbits, bit, leafnum, numleafs; - mleaf_t *leaf; - msurface_t *surf, **mark, **endmark; - model_t *model = cl.worldmodel; - byte *in; -// mportal_t *portal; - glpoly_t *p; - tinyplane_t plane; - -// c_leafs++; -// r_viewleaf->visframe = r_framecount; - if (!r_testvis.value) - r_portalframecount++; - - numleafs = model->numleafs; - numbits = numleafs; - k = 0; - in = r_viewleaf->compressed_vis; - row = (numbits + 7) >> 3; - while (k < row) - { - c = *in++; - if (c) +loc2: + if (R_NotCulledBox(node->mins, node->maxs)) { - for (i = 0, bit = 1;c;i++, bit <<= 1) + if (node->numsurfaces) { - if (c & bit) + msurface_t *surf = cl.worldmodel->surfaces + node->firstsurface, *surfend = surf + node->numsurfaces; + if (PlaneDiff (r_origin, node->plane) < 0) { - leafnum = (k << 3)+i+1; - if (leafnum > numleafs) - return; - c -= bit; - leaf = &model->leafs[leafnum]; - if (R_NotCulledBox(leaf->mins, leaf->maxs)) + for (;surf < surfend;surf++) { - //for (portal = leaf->portals;portal;portal = portal->next) - // if (DotProduct(r_origin, portal->plane.normal) > portal->plane.dist) - // R_Clip_AddPolygon((float *)portal->points, portal->numpoints, sizeof(mvertex_t), false, R_Portal_Callback, leaf, portal, portal->plane); - //leaf->visframe = r_framecount; - c_leafs++; - if (leaf->nummarksurfaces) - { - mark = leaf->firstmarksurface; - endmark = mark + leaf->nummarksurfaces; - 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; - for (p = surf->polys;p;p = p->next) - R_Clip_AddPolygon((float *)p->verts, p->numverts, VERTEXSIZE * sizeof(float), (surf->flags & SURF_CLIPSOLID) != 0, RSurf_Callback, surf, NULL, &plane); - } - } - else - { - if (!(surf->flags & SURF_PLANEBACK)) - for (p = surf->polys;p;p = p->next) - R_Clip_AddPolygon((float *)p->verts, p->numverts, VERTEXSIZE * sizeof(float), (surf->flags & SURF_CLIPSOLID) != 0, RSurf_Callback, surf, NULL, (tinyplane_t *)surf->plane); - } - } - while (mark < endmark); - } + if (surf->flags & SURF_PLANEBACK) + surf->visframe = r_framecount; + } + } + else + { + for (;surf < surfend;surf++) + { + if (!(surf->flags & SURF_PLANEBACK)) + surf->visframe = r_framecount; } } } - k++; + + // recurse down the children + if (node->children[0]->contents >= 0) + { + if (node->children[1]->contents >= 0) + { + if (nodestackpos < 8192) + nodestack[nodestackpos++] = node->children[1]; + node = node->children[0]; + goto loc2; + } + else + ((mleaf_t *)node->children[1])->visframe = r_framecount; + node = node->children[0]; + goto loc2; + } + else + { + ((mleaf_t *)node->children[0])->visframe = r_framecount; + if (node->children[1]->contents >= 0) + { + node = node->children[1]; + goto loc2; + } + else if (nodestackpos > 0) + { + ((mleaf_t *)node->children[1])->visframe = r_framecount; + node = nodestack[--nodestackpos]; + goto loc2; + } + } + } + else if (nodestackpos > 0) + { + node = nodestack[--nodestackpos]; + goto loc2; } - else - k += *in++; } } -/* -void R_OldPortalWorldNode (void) +static int r_portalframecount = 0; + +static void R_PVSWorldNode() { int portalstack, i; mportal_t *p, *pstack[8192]; msurface_t *surf, **mark, **endmark; mleaf_t *leaf; + qbyte *worldvis; + + worldvis = Mod_LeafPVS (r_viewleaf, cl.worldmodel); leaf = r_viewleaf; leaf->worldnodeframe = r_framecount; @@ -1595,7 +1901,7 @@ loc0: if (surf->worldnodeframe == r_framecount) continue; surf->worldnodeframe = r_framecount; - if (PlaneDist(modelorg, surf->plane) < surf->plane->dist) + if (PlaneDist(r_origin, surf->plane) < surf->plane->dist) { if (surf->flags & SURF_PLANEBACK) surf->visframe = r_framecount; @@ -1610,25 +1916,27 @@ loc0: } // follow portals into other leafs - p = leaf->portals; - for (;p;p = p->next) + for (p = leaf->portals;p;p = p->next) { - leaf = p->past; - if (leaf->worldnodeframe != r_framecount) + if (DotProduct(r_origin, p->plane.normal) < p->plane.dist) { - leaf->worldnodeframe = r_framecount; - if (leaf->contents != CONTENTS_SOLID) + leaf = p->past; + if (leaf->worldnodeframe != r_framecount) { - i = (leaf - cl.worldmodel->leafs) - 1; - if (worldvis[i>>3] & (1<<(i&7))) + leaf->worldnodeframe = r_framecount; + if (leaf->contents != CONTENTS_SOLID) { - if (R_NotCulledBox(leaf->mins, leaf->maxs)) + i = (leaf - cl.worldmodel->leafs) - 1; + if (worldvis[i>>3] & (1<<(i&7))) { - pstack[portalstack++] = p; - goto loc0; + if (R_NotCulledBox(leaf->mins, leaf->maxs)) + { + pstack[portalstack++] = p; + goto loc0; loc1: - p = pstack[--portalstack]; + p = pstack[--portalstack]; + } } } } @@ -1637,487 +1945,276 @@ loc1: if (portalstack) goto loc1; - - i = 0; - portalstack = 0; - p = r_viewleaf->portals; - for (;p;p = p->next) - { - portalstack++; - if (p->past->worldnodeframe != r_framecount) - i++; - } - if (i) - Con_Printf("%i portals of viewleaf (%i portals) were not checked\n", i, portalstack); } -*/ -entity_t clworldent; +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}; -void R_DrawSurfaces (void) +int Cshader_count = 5; +Cshader_t *Cshaders[5] = { - msurface_t *surf, *endsurf; - texture_t *t, *currentt; - int vertex = gl_vertex.value; + &Cshader_wall_vertex, + &Cshader_wall_lightmap, + &Cshader_wall_fullbright, + &Cshader_water, + &Cshader_sky +}; - currententity = &clworldent; - modelalpha = 1; - softwaretransformidentity(); - surf = &cl.worldmodel->surfaces[cl.worldmodel->firstmodelsurface]; - endsurf = surf + cl.worldmodel->nummodelsurfaces; - t = currentt = NULL; - for (;surf < endsurf;surf++) +void R_PrepareSurfaces(void) +{ + int i, alttextures, texframe, framecount; + texture_t *t; + model_t *model; + msurface_t *surf; + + for (i = 0;i < Cshader_count;i++) + Cshaders[i]->chain = NULL; + + model = currentrenderentity->model; + alttextures = currentrenderentity->frame != 0; + texframe = (int)(cl.time * 5.0f); + + for (i = 0;i < model->nummodelsurfaces;i++) { + surf = model->modelsortedsurfaces[i]; if (surf->visframe == r_framecount) { - c_faces++; - if (surf->flags & (SURF_DRAWSKY | SURF_DRAWTURB)) - { - // sky and liquid don't need sorting (skypoly/transpoly) - if (surf->flags & SURF_DRAWSKY) - RSurf_DrawSky(surf, false); - else - { - if (currentt != surf->texinfo->texture) - { - currentt = surf->texinfo->texture; - t = R_TextureAnimation(surf->texinfo->texture); - } - RSurf_DrawWater(surf, t, false, surf->flags & SURF_DRAWNOALPHA ? 255 : wateralpha); - } - } - else + if (surf->insertframe != r_framecount) { - if (currentt != surf->texinfo->texture) + surf->insertframe = r_framecount; + c_faces++; + t = surf->texinfo->texture; + if (t->animated) { - currentt = surf->texinfo->texture; - t = R_TextureAnimation(surf->texinfo->texture); + framecount = t->anim_total[alttextures]; + if (framecount >= 2) + surf->currenttexture = t->anim_frames[alttextures][texframe % framecount]; + else + surf->currenttexture = t->anim_frames[alttextures][0]; } - if (vertex) - RSurf_DrawWallVertex(surf, t, false, false); else - RSurf_DrawWall(surf, t, false); + surf->currenttexture = t; } + + surf->chain = surf->shader->chain; + surf->shader->chain = surf; } } } +void R_DrawSurfaces (int type) +{ + int i; + Cshader_t *shader; + + for (i = 0;i < Cshader_count;i++) + { + shader = Cshaders[i]; + if (shader->chain && shader->shaderfunc[type]) + shader->shaderfunc[type](shader->chain); + } +} + +static float portalpointbuffer[256][3]; + void R_DrawPortals(void) { - int drawportals, i, r, g, b; -// mleaf_t *leaf, *endleaf; + int drawportals, i; mportal_t *portal, *endportal; - mvertex_t *point/*, *endpoint*/; - drawportals = (int)r_drawportals.value; + mvertex_t *point; + 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; - } - } - } - */ - portal = cl.worldmodel->portals; - endportal = portal + cl.worldmodel->numportals; - for (;portal < endportal;portal++) + + 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 (portal->visframe == r_portalframecount) { - i = portal - cl.worldmodel->portals; - r = (i & 0x0007) << 5; - g = (i & 0x0038) << 2; - b = (i & 0x01C0) >> 1; - transpolybegin(0, 0, 0, TPOLYTYPE_ALPHA); - point = portal->points; - if (PlaneDiff(r_origin, (&portal->plane)) > 0) + if (portal->numpoints <= 256) { - for (i = portal->numpoints - 1;i >= 0;i--) - transpolyvertub(point[i].position[0], point[i].position[1], point[i].position[2], 0, 0, r, g, b, 32); - } - else - { - for (i = 0;i < portal->numpoints;i++) - transpolyvertub(point[i].position[0], point[i].position[1], point[i].position[2], 0, 0, r, g, b, 32); + i = portal - cl.worldmodel->portals; + m.cr = ((i & 0x0007) >> 0) * (1.0f / 7.0f); + m.cg = ((i & 0x0038) >> 3) * (1.0f / 7.0f); + m.cb = ((i & 0x01C0) >> 6) * (1.0f / 7.0f); + point = portal->points; + if (PlaneDiff(r_origin, (&portal->plane)) > 0) + { + for (i = portal->numpoints - 1;i >= 0;i--) + VectorCopy(point[i].position, portalpointbuffer[i]); + } + else + { + for (i = 0;i < portal->numpoints;i++) + VectorCopy(point[i].position, portalpointbuffer[i]); + } + R_Mesh_DrawPolygon(&m, portal->numpoints); } - transpolyend(); } } } -/* -============= -R_DrawWorld -============= -*/ -void R_DrawWorld (void) +void R_SetupForBModelRendering(void) { - wateralpha = bound(0, r_wateralpha.value*255.0f, 255); - vertexworld = gl_vertex.value; + int i; + msurface_t *surf; + model_t *model; + vec3_t modelorg; - memset (&clworldent, 0, sizeof(clworldent)); - clworldent.render.model = cl.worldmodel; - clworldent.render.colormod[0] = clworldent.render.colormod[1] = clworldent.render.colormod[2] = 1; - modelalpha = clworldent.render.alpha = 1; - clworldent.render.scale = 1; + // because bmodels can be reused, we have to decide which things to render + // from scratch every time - VectorCopy (r_origin, modelorg); + model = currentrenderentity->model; - currententity = &clworldent; + softwaretransformforentity (currentrenderentity); + softwareuntransform(r_origin, modelorg); - softwaretransformidentity(); // LordHavoc: clear transform - - if (cl.worldmodel) + for (i = 0;i < model->nummodelsurfaces;i++) { - if (r_novis.value || r_viewleaf->compressed_vis == NULL) - R_SolidWorldNode (); + surf = model->modelsortedsurfaces[i]; + if (((surf->flags & SURF_PLANEBACK) == 0) == (PlaneDiff(modelorg, surf->plane) >= 0)) + surf->visframe = r_framecount; else - { -// R_MarkLeaves (); - R_PVSWorldNode (); - } + surf->visframe = -1; + surf->worldnodeframe = -1; + surf->lightframe = -1; + surf->dlightframe = -1; + surf->insertframe = -1; } } -/* -============================================================================= - - LIGHTMAP ALLOCATION - -============================================================================= -*/ - -// returns a texture number and the position inside it -int AllocBlock (int w, int h, short *x, short *y) +void R_SetupForWorldRendering(void) { - int i, j; - int best, best2; - int texnum; - - for (texnum = 0;texnum < MAX_LIGHTMAPS;texnum++) - { - best = BLOCK_HEIGHT; - - for (i = 0;i < BLOCK_WIDTH - w;i += lightmapalign) // LordHavoc: NVIDIA has broken subimage, so align the lightmaps - { - best2 = 0; - - for (j=0 ; j= best) - break; - if (allocated[texnum][i+j] > best2) - best2 = allocated[texnum][i+j]; - } - if (j == w) - { // this is a valid spot - *x = i; - *y = best = best2; - } - } - - if (best + h > BLOCK_HEIGHT) - continue; - - if (nosubimagefragments || nosubimage) - { - if (!lightmaps[texnum]) - { - lightmaps[texnum] = qmalloc(BLOCK_WIDTH*BLOCK_HEIGHT*4); - memset(lightmaps[texnum], 0, BLOCK_WIDTH*BLOCK_HEIGHT*4); - } - } - // LordHavoc: clear texture to blank image, fragments are uploaded using subimage - else if (!allocated[texnum][0]) - { - byte blank[BLOCK_WIDTH*BLOCK_HEIGHT*4]; - memset(blank, 0, sizeof(blank)); - if(r_upload.value) - { - glBindTexture(GL_TEXTURE_2D, lightmap_textures + texnum); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - if (lightmaprgba) - glTexImage2D (GL_TEXTURE_2D, 0, 3, BLOCK_WIDTH, BLOCK_HEIGHT, 0, GL_RGBA, GL_UNSIGNED_BYTE, blank); - else - glTexImage2D (GL_TEXTURE_2D, 0, 3, BLOCK_WIDTH, BLOCK_HEIGHT, 0, GL_RGB, GL_UNSIGNED_BYTE, blank); - } - } + // there is only one instance of the world, but it can be rendered in + // multiple stages - for (i = 0;i < w;i++) - allocated[texnum][*x + i] = best + h; - - return texnum; - } - - Host_Error ("AllocBlock: full, unable to find room for %i by %i lightmap", w, h); - return 0; + currentrenderentity = &cl_entities[0].render; + softwaretransformidentity(); } - -//int nColinElim; - -/* -================ -BuildSurfaceDisplayList -================ -*/ -void BuildSurfaceDisplayList (model_t *model, mvertex_t *vertices, msurface_t *fa) +static void R_SurfMarkLights (void) { - int i, j, lindex, lnumverts; - medge_t *pedges; - float *vec; - float s, t; - glpoly_t *poly; - -// reconstruct the polygon - pedges = model->edges; - lnumverts = fa->numedges; - - // - // draw texture - // - poly = Hunk_AllocName (sizeof(glpolysizeof_t) + lnumverts * sizeof(float[VERTEXSIZE]), "surfaces"); - poly->next = fa->polys; - fa->polys = poly; -// poly->flags = fa->flags; - poly->numverts = lnumverts; - - for (i=0 ; isurfedges[fa->firstedge + i]; + int i; + msurface_t *surf; - if (lindex > 0) - vec = vertices[pedges[lindex].v[0]].position; - else - vec = vertices[pedges[-lindex].v[1]].position; - - s = DotProduct (vec, fa->texinfo->vecs[0]) + fa->texinfo->vecs[0][3]; - t = DotProduct (vec, fa->texinfo->vecs[1]) + fa->texinfo->vecs[1][3]; - - VectorCopy (vec, poly->verts[i]); - poly->verts[i][3] = s / fa->texinfo->texture->width; - poly->verts[i][4] = t / fa->texinfo->texture->height; - - // - // lightmap texture coordinates - // - s -= fa->texturemins[0]; - t -= fa->texturemins[1]; - s += 8; - t += 8; - // LordHavoc: calc lightmap data offset - j = (bound(0l, (int)t>>4, fa->extents[1]>>4) * ((fa->extents[0]>>4)+1) + bound(0l, (int)s>>4, fa->extents[0]>>4)) * 3; - poly->verts[i][7] = j; - s += fa->light_s*16; - s /= BLOCK_WIDTH*16; //fa->texinfo->texture->width; - - t += fa->light_t*16; - t /= BLOCK_HEIGHT*16; //fa->texinfo->texture->height; - - poly->verts[i][5] = s; - poly->verts[i][6] = t; - } + if (r_dynamic.integer) + R_MarkLights(); - // - // remove co-linear points - Ed - // - /* - if (!gl_keeptjunctions.value) + if (!r_vertexsurfaces.integer) { - for (i = 0 ; i < lnumverts ; ++i) + for (i = 0;i < currentrenderentity->model->nummodelsurfaces;i++) { - vec3_t v1, v2; - float *prev, *this, *next; - - prev = poly->verts[(i + lnumverts - 1) % lnumverts]; - this = poly->verts[i]; - next = poly->verts[(i + 1) % lnumverts]; - - VectorSubtract( this, prev, v1 ); - VectorNormalize( v1 ); - VectorSubtract( next, prev, v2 ); - VectorNormalize( v2 ); - - // skip co-linear points - #define COLINEAR_EPSILON 0.001 - if ((fabs( v1[0] - v2[0] ) <= COLINEAR_EPSILON) && - (fabs( v1[1] - v2[1] ) <= COLINEAR_EPSILON) && - (fabs( v1[2] - v2[2] ) <= COLINEAR_EPSILON)) + surf = currentrenderentity->model->modelsortedsurfaces[i]; + if (surf->visframe == r_framecount && surf->lightmaptexture != NULL) { - int j; - for (j = i + 1; j < lnumverts; ++j) + if (surf->cached_dlight + || surf->cached_ambient != r_ambient.value + || surf->cached_lightscalebit != lightscalebit) + R_BuildLightMap(surf, false); // base lighting changed + else if (r_dynamic.integer) { - int k; - for (k = 0; k < VERTEXSIZE; ++k) - poly->verts[j - 1][k] = poly->verts[j][k]; + if (surf->styles[0] != 255 && (d_lightstylevalue[surf->styles[0]] != surf->cached_light[0] + || (surf->styles[1] != 255 && (d_lightstylevalue[surf->styles[1]] != surf->cached_light[1] + || (surf->styles[2] != 255 && (d_lightstylevalue[surf->styles[2]] != surf->cached_light[2] + || (surf->styles[3] != 255 && (d_lightstylevalue[surf->styles[3]] != surf->cached_light[3])))))))) + R_BuildLightMap(surf, false); // base lighting changed + else if (surf->dlightframe == r_framecount && r_dlightmap.integer) + R_BuildLightMap(surf, true); // only dlights } - --lnumverts; - ++nColinElim; - // retry next vertex next time, which is now current vertex - --i; } } - poly->numverts = lnumverts; } - */ +} + +void R_MarkWorldLights(void) +{ + R_SetupForWorldRendering(); + R_SurfMarkLights(); } /* -======================== -GL_CreateSurfaceLightmap -======================== +============= +R_DrawWorld +============= */ -void GL_CreateSurfaceLightmap (msurface_t *surf) +void R_DrawWorld (void) { - int smax, tmax; - - if (surf->flags & (SURF_DRAWSKY|SURF_DRAWTURB)) - return; + R_SetupForWorldRendering(); - smax = (surf->extents[0]>>4)+1; - tmax = (surf->extents[1]>>4)+1; - - surf->lightmaptexturenum = AllocBlock (smax, tmax, &surf->light_s, &surf->light_t); - if (nosubimage || nosubimagefragments) - return; - glBindTexture(GL_TEXTURE_2D, lightmap_textures + surf->lightmaptexturenum); - smax = ((surf->extents[0]>>4)+lightmapalign) & lightmapalignmask; - if (lightmaprgba) - { - R_BuildLightMap (surf, templight, smax * 4); - if(r_upload.value) - glTexSubImage2D(GL_TEXTURE_2D, 0, surf->light_s, surf->light_t, smax, tmax, GL_RGBA, GL_UNSIGNED_BYTE, templight); - } + if (r_viewleaf->contents == CONTENTS_SOLID || r_novis.integer || r_viewleaf->compressed_vis == NULL) + R_SolidWorldNode (); else - { - R_BuildLightMap (surf, templight, smax * 3); - if(r_upload.value) - glTexSubImage2D(GL_TEXTURE_2D, 0, surf->light_s, surf->light_t, smax, tmax, GL_RGB , GL_UNSIGNED_BYTE, templight); - } + R_PVSWorldNode (); } - /* -================== -GL_BuildLightmaps - -Builds the lightmap texture -with all the surfaces from all brush models -================== +================= +R_DrawBrushModel +================= */ -void GL_BuildLightmaps (void) +void R_DrawBrushModelSky (void) { - int i, j; - model_t *m; + R_SetupForBModelRendering(); - memset (allocated, 0, sizeof(allocated)); + R_PrepareSurfaces(); + R_DrawSurfaces(SHADERSTAGE_SKY); +} - r_framecount = 1; // no dlightcache +void R_DrawBrushModelNormal (void) +{ + c_bmodels++; - if (gl_nosubimagefragments.value) - nosubimagefragments = 1; - else - nosubimagefragments = 0; + // have to flush queue because of possible lightmap reuse + R_Mesh_Render(); - if (gl_nosubimage.value) - nosubimage = 1; - else - nosubimage = 0; + R_SetupForBModelRendering(); - if (gl_lightmaprgba.value) - { - lightmaprgba = true; - lightmapbytes = 4; - } - else - { - lightmaprgba = false; - lightmapbytes = 3; - } + R_SurfMarkLights(); - // LordHavoc: NVIDIA seems to have a broken glTexSubImage2D, - // it needs to be aligned on 4 pixel boundaries... - // so I implemented an adjustable lightmap alignment - if (gl_lightmapalign.value < 1) - gl_lightmapalign.value = 1; - if (gl_lightmapalign.value > 16) - gl_lightmapalign.value = 16; - lightmapalign = 1; - while (lightmapalign < gl_lightmapalign.value) - lightmapalign <<= 1; - gl_lightmapalign.value = lightmapalign; - lightmapalignmask = ~(lightmapalign - 1); - if (nosubimagefragments || nosubimage) - { - lightmapalign = 1; - lightmapalignmask = ~0; - } + R_PrepareSurfaces(); + + if (!skyrendermasked) + R_DrawSurfaces(SHADERSTAGE_SKY); + R_DrawSurfaces(SHADERSTAGE_NORMAL); +} - if (!lightmap_textures) - lightmap_textures = R_GetTextureSlots(MAX_LIGHTMAPS); +static void gl_surf_start(void) +{ +} - for (j=1 ; jname[0] == '*') - continue; - for (i=0 ; inumsurfaces ; i++) - { - if ( m->surfaces[i].flags & SURF_DRAWTURB ) - continue; - if ( m->surfaces[i].flags & SURF_DRAWSKY ) - continue; - GL_CreateSurfaceLightmap (m->surfaces + i); - BuildSurfaceDisplayList (m, m->vertexes, m->surfaces + i); - } - } +static void gl_surf_shutdown(void) +{ +} - if (nosubimage || nosubimagefragments) - { - if(r_upload.value) - if (gl_mtexable) - qglSelectTexture(gl_mtex_enum+1); - for (i = 0;i < MAX_LIGHTMAPS;i++) - { - if (!allocated[i][0]) - break; - lightmapupdate[i][0] = BLOCK_HEIGHT; - lightmapupdate[i][1] = 0; - if(r_upload.value) - { - glBindTexture(GL_TEXTURE_2D, lightmap_textures + i); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - if (lightmaprgba) - glTexImage2D(GL_TEXTURE_2D, 0, 3, BLOCK_WIDTH, BLOCK_HEIGHT, 0, GL_RGBA, GL_UNSIGNED_BYTE, lightmaps[i]); - else - glTexImage2D(GL_TEXTURE_2D, 0, 3, BLOCK_WIDTH, BLOCK_HEIGHT, 0, GL_RGB, GL_UNSIGNED_BYTE, lightmaps[i]); - } - } - if(r_upload.value) - if (gl_mtexable) - qglSelectTexture(gl_mtex_enum+0); - } +static void gl_surf_newmap(void) +{ +} + +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); + + R_RegisterModule("GL_Surf", gl_surf_start, gl_surf_shutdown, gl_surf_newmap); }