X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=gl_rsurf.c;h=465e124c1fa44c19f71ed4b39d5bd03663d625f1;hb=fc735cfb4488156f2e28c0521ac39676a7ff6ffe;hp=8797b9d0f91a9443d9a2fbd1bc5b1f32456ef0b8;hpb=685e171914f1c0709b04ca02c97505a4055001f0;p=xonotic%2Fdarkplaces.git diff --git a/gl_rsurf.c b/gl_rsurf.c index 8797b9d0..465e124c 100644 --- a/gl_rsurf.c +++ b/gl_rsurf.c @@ -21,81 +21,51 @@ 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 signed int blocklights[MAX_LIGHTMAP_SIZE*MAX_LIGHTMAP_SIZE*3]; // LordHavoc: *3 for colored lighting -int active_lightmaps; +static byte 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", "3"}; -cvar_t r_pvsworldnode = {0, "r_pvsworldnode", "1"}; - -qboolean lightmaprgba, nosubimagefragments, nosubimage; -int lightmapbytes; -int wateralpha; - -void gl_surf_start(void) +static void gl_surf_start(void) { } -void gl_surf_shutdown(void) +static void gl_surf_shutdown(void) { } -void gl_surf_newmap(void) +static void gl_surf_newmap(void) { } +static int dlightdivtable[32768]; + 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); + dlightdivtable[0] = 4194304; + for (i = 1;i < 32768;i++) + dlightdivtable[i] = 4194304 / (i << 7); + Cvar_RegisterVariable(&r_ambient); - Cvar_RegisterVariable(&gl_vertex); + Cvar_RegisterVariable(&r_vertexsurfaces); Cvar_RegisterVariable(&r_dlightmap); Cvar_RegisterVariable(&r_drawportals); Cvar_RegisterVariable(&r_testvis); - Cvar_RegisterVariable(&r_solidworldnode); - Cvar_RegisterVariable(&r_pvsworldnode); R_RegisterModule("GL_Surf", gl_surf_start, gl_surf_shutdown, gl_surf_newmap); } -int dlightdivtable[32768]; - -/* - R_AddDynamicLights -*/ -int R_AddDynamicLights (msurface_t *surf) +static int R_AddDynamicLights (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; @@ -109,38 +79,35 @@ 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; - 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); +// VectorSubtract (r_dlight[lnum].origin, currentrenderentity->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)); + // compensate for LIGHTOFFSET + maxdist = (int) r_dlight[lnum].cullradius2 + LIGHTOFFSET; + // already clamped, skip this // clamp radius to avoid exceeding 32768 entry division table - if (maxdist > 4194304) - maxdist = 4194304; + //if (maxdist > 4194304) + // maxdist = 4194304; 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; + 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]; @@ -153,73 +120,221 @@ 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; + // convert to 8.8 blocklights format + red = r_dlight[lnum].light[0]; + green = r_dlight[lnum].light[1]; + blue = r_dlight[lnum].light[2]; + subtract = (int) (r_dlight[lnum].lightsubtract * 4194304.0f); bl = blocklights; + smax3 = smax * 3; 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) >> 8; + bl[1] += (green * k) >> 8; + bl[2] += (blue * k) >> 8; + 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) +void R_StainNode (mnode_t *node, model_t *model, vec3_t origin, float radius, int icolor[8]) { - int i, j, shift; - stride -= (width*lightmapbytes); - // deal with lightmap brightness scale - shift = 7 + lightscalebit; - if (lightmaprgba) + 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; + byte *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) + { + node = node->children[0]; + goto loc0; + } + if (ndist < -radius) { - for (i = 0;i < height;i++, out += stride) + node = node->children[1]; + goto loc0; + } + + dist2 = ndist * ndist; + dist2 += 4096.0f; + if (dist2 < maxdist) + { + maxdist3 = maxdist - dist2; + + impact[0] = origin[0] - node->plane->normal[0] * ndist; + impact[1] = origin[1] - node->plane->normal[1] * ndist; + impact[2] = origin[2] - node->plane->normal[2] * ndist; + + for (surf = model->surfaces + node->firstsurface, endsurf = surf + node->numsurfaces;surf < endsurf;surf++) { - for (j = 0;j < width;j++, in += 3, out += 4) + if (surf->stainsamples) { - out[0] = min(in[0] >> shift, 255); - out[1] = min(in[1] >> shift, 255); - out[2] = min(in[2] >> shift, 255); - out[3] = 255; + smax = (surf->extents[0] >> 4) + 1; + tmax = (surf->extents[1] >> 4) + 1; + + impacts = DotProduct (impact, surf->texinfo->vecs[0]) + surf->texinfo->vecs[0][3] - surf->texturemins[0]; + impactt = DotProduct (impact, surf->texinfo->vecs[1]) + surf->texinfo->vecs[1][3] - surf->texturemins[1]; + + s = bound(0, impacts, smax * 16) - impacts; + t = bound(0, impactt, tmax * 16) - impactt; + i = s * s + t * t + dist2; + if (i > maxdist) + continue; + + // reduce calculations + for (s = 0, i = impacts; s < smax; s++, i -= 16) + sdtable[s] = i * i + dist2; + + // convert to 8.8 blocklights format + bl = surf->stainsamples; + smax3 = smax * 3; + stained = false; + + 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] = (byte) ((((cr - (int) bl[0]) * a) >> 8) + (int) bl[0]); + bl[1] = (byte) ((((cg - (int) bl[1]) * a) >> 8) + (int) bl[1]); + bl[2] = (byte) ((((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; } } } - else + + if (node->children[0]->contents >= 0) + { + if (node->children[1]->contents >= 0) + { + R_StainNode(node->children[0], model, origin, radius, icolor); + node = node->children[1]; + goto loc0; + } + else + { + node = node->children[0]; + goto loc0; + } + } + else if (node->children[1]->contents >= 0) { - for (i = 0;i < height;i++, out += stride) + node = node->children[1]; + goto loc0; + } +} + +void R_Stain (vec3_t origin, float radius, int cr1, int cg1, int cb1, int ca1, int cr2, int cg2, int cb2, int ca2) +{ + 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); + + // look for embedded bmodels + for (n = 1;n < MAX_EDICTS;n++) + { + ent = &cl_entities[n].render; + model = ent->model; + if (model && model->name[0] == '*') { - for (j = 0;j < width;j++, in += 3, out += 3) + Mod_CheckLoaded(model); + if (model->type == mod_brush) { - out[0] = min(in[0] >> shift, 255); - out[1] = min(in[1] >> shift, 255); - out[2] = min(in[2] >> shift, 255); + softwaretransformforentity(ent); + softwareuntransform(origin, org); + R_StainNode(model->nodes + model->hulls[0].firstclipnode, model, org, radius, icolor); } } } @@ -232,18 +347,19 @@ 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; + int smax, tmax, i, j, size, size3, shift, scale, maps, *bl, stride, l; + byte *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; @@ -252,10 +368,10 @@ void R_BuildLightMap (msurface_t *surf, byte *dest, int stride) lightmap = surf->samples; // set to full bright if no light data - if ((currententity && (currententity->render.effects & EF_FULLBRIGHT)) || !cl.worldmodel->lightdata) + if ((currentrenderentity->effects & EF_FULLBRIGHT) || !cl.worldmodel->lightdata) { bl = blocklights; - for (i=0 ; idlightframe == r_framecount && r_dlightmap.integer) + { + surf->cached_dlight = R_AddDynamicLights(surf); + if (surf->cached_dlight) + c_light_polys++; + else if (dlightchanged) + return; // don't upload if only updating dlights and none mattered + } + // add all the lightmaps if (lightmap) - { for (maps = 0;maps < MAXLIGHTMAPS && surf->styles[maps] != 255;maps++) - { - scale = d_lightstylevalue[surf->styles[maps]]; - surf->cached_light[maps] = scale; // 8.8 fraction - bl = blocklights; - for (i = 0;i < size3;i++) + for (scale = d_lightstylevalue[surf->styles[maps]], bl = blocklights, i = 0;i < size3;i++) *bl++ += *lightmap++ * scale; - } - } - if (r_dlightmap.value && surf->dlightframe == r_framecount) - if ((surf->cached_dlight = R_AddDynamicLights(surf))) - c_light_polys++; } - R_ConvertLightmap(blocklights, dest, smax, tmax, stride); -} -byte templight[BLOCK_WIDTH*BLOCK_HEIGHT*4]; + stain = surf->stainsamples; + if (stain) + for (bl = blocklights, i = 0;i < size3;i++) + if (stain[i] < 255) + bl[i] = (bl[i] * stain[i]) >> 8; -void R_UpdateLightmap(msurface_t *s, int lnum) -{ - int smax, tmax; - // upload the new lightmap texture fragment - if(r_upload.value) - glBindTexture(GL_TEXTURE_2D, lightmap_textures + lnum); - if (nosubimage || nosubimagefragments) - { - 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); - } - else + bl = blocklights; + out = templight; + // deal with lightmap brightness scale + shift = 7 + lightscalebit; + if (currentrenderentity->model->lightmaprgba) { - smax = ((s->extents[0]>>4)+lightmapalign) & lightmapalignmask; - tmax = (s->extents[1]>>4)+1; - if (lightmaprgba) + stride = (surf->lightmaptexturestride - smax) * 4; + for (i = 0;i < tmax;i++, out += stride) { - 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); + for (j = 0;j < smax;j++) + { + l = *bl++ >> shift;*out++ = min(l, 255); + l = *bl++ >> shift;*out++ = min(l, 255); + l = *bl++ >> shift;*out++ = min(l, 255); + *out++ = 255; + } } - else + } + else + { + stride = (surf->lightmaptexturestride - smax) * 3; + for (i = 0;i < tmax;i++, out += stride) { - 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); + for (j = 0;j < smax;j++) + { + l = *bl++ >> shift;*out++ = min(l, 255); + l = *bl++ >> shift;*out++ = min(l, 255); + l = *bl++ >> shift;*out++ = min(l, 255); + } } } -} + R_UpdateTexture(surf->lightmaptexture, templight); +} /* =============== @@ -340,47 +455,19 @@ R_TextureAnimation Returns the proper texture for a given time and base texture =============== */ -texture_t *R_TextureAnimation (texture_t *base) +/* +// note: this was manually inlined in R_PrepareSurfaces +static texture_t *R_TextureAnimation (texture_t *base) { -// texture_t *original; -// int relative; -// int count; + if (currentrenderentity->frame && base->alternate_anims != NULL) + base = base->alternate_anims; - if (currententity->render.frame) - { - if (base->alternate_anims) - base = base->alternate_anims; - } - - if (!base->anim_total) + if (base->anim_total < 2) return base; - return base->anim_frames[(int)(cl.time*5) % base->anim_total]; - - /* - original = base; - - relative = (int)(cl.time*5) % base->anim_total; - - count = 0; - while (base->anim_min > relative || base->anim_max <= relative) - { - base = base->anim_next; - if (!base) - { - Con_Printf("R_TextureAnimation: broken cycle"); - return original; - } - if (++count > 100) - { - Con_Printf("R_TextureAnimation: infinite cycle"); - return original; - } - } - - return base; - */ + return base->anim_frames[(int)(cl.time * 5.0f) % base->anim_total]; } +*/ /* @@ -392,760 +479,1136 @@ texture_t *R_TextureAnimation (texture_t *base) */ -float turbsin[256] = +static float turbsin[256] = { #include "gl_warp_sin.h" }; #define TURBSCALE (256.0 / (2 * M_PI)) - -void UploadLightmaps(void) +#define MAX_SURFVERTS 1024 +typedef struct { - int i; - if (nosubimage || nosubimagefragments) - { - for (i = 0;i < MAX_LIGHTMAPS;i++) - { - if (lightmapupdate[i][0] < lightmapupdate[i][1]) - { - 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])); - } - } - } - lightmapupdate[i][0] = BLOCK_HEIGHT; - lightmapupdate[i][1] = 0; - } - } + float v[4]; + float st[2]; + float uv[2]; + float c[4]; } +surfvert_t; +static surfvert_t svert[MAX_SURFVERTS]; // used by the following functions -float wvert[1024*6]; // used by the following functions - -void RSurf_DrawSky(msurface_t *s, int transform) +static int RSurfShader_Sky(int stage, msurface_t *s) { - glpoly_t *p; - int i; - float *v; + int i; + float number, length, dir[3], speedscale; + surfvertex_t *v; + surfvert_t *sv; + rmeshinfo_t m; // LordHavoc: HalfLife maps have freaky skypolys... - if (hlbsp) - return; + if (currentrenderentity->model->ishlbsp) + return true; - for (p=s->polys ; p ; p=p->next) + if (stage == 0) { - if (currentskypoly < MAX_SKYPOLYS && currentskyvert + p->numverts <= MAX_SKYVERTS) + if (skyrendermasked) { - skypoly[currentskypoly].firstvert = currentskyvert; - skypoly[currentskypoly++].verts = p->numverts; - if (transform) + if (skyrendernow) { - for (i = 0,v = p->verts[0];i < p->numverts;i++, v += VERTEXSIZE) - { - softwaretransform(v, skyvert[currentskyvert].v); - currentskyvert++; - } + skyrendernow = false; + R_Sky(); } - else + // draw depth-only polys + memset(&m, 0, sizeof(m)); + m.transparent = false; + m.blendfunc1 = GL_ZERO; + m.blendfunc2 = GL_ONE; + m.depthwrite = true; + m.numtriangles = s->mesh.numtriangles; + m.numverts = s->mesh.numverts; + m.index = s->mesh.index; + //m.cr = 0; + //m.cg = 0; + //m.cb = 0; + //m.ca = 0; + if (softwaretransform_complexity) { - for (i = 0,v = p->verts[0];i < p->numverts;i++, v += VERTEXSIZE) - { - VectorCopy(v, skyvert[currentskyvert].v); - currentskyvert++; - } + m.vertex = &svert[0].v[0]; + m.vertexstep = sizeof(surfvert_t); + for (i = 0, sv = svert, v = s->mesh.vertex;i < m.numverts;i++, sv++, v++) + softwaretransform(v->v, sv->v); } - } - } -} - -int RSurf_Light(int *dlightbits, glpoly_t *polys) -{ - 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++) - { - if ((c = dlightbits[a])) - { - for (b = 0, d = 1;c;b++, d <<= 1) + else { - if (c & d) - { - 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; - } - } - } + m.vertex = &s->mesh.vertex[0].v[0]; + m.vertexstep = sizeof(surfvertex_t); } + R_Mesh_Draw(&m); } - } - return lit; -} - -void RSurf_DrawWater(msurface_t *s, texture_t *t, int transform, int alpha) -{ - 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) - { - vec3_t temp; - // LordHavoc: fast path for no vertex lighting cases - if (transform) + else if (skyrenderglquake) { - 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(); - } - } + memset(&m, 0, sizeof(m)); + m.transparent = false; + m.blendfunc1 = GL_ONE; + m.blendfunc2 = GL_ZERO; + m.numtriangles = s->mesh.numtriangles; + m.numverts = s->mesh.numverts; + m.index = s->mesh.index; + m.vertex = &svert[0].v[0]; + m.vertexstep = sizeof(surfvert_t); + m.cr = 1; + m.cg = 1; + m.cb = 1; + m.ca = 1; + if (r_mergesky.integer) + m.tex[0] = R_GetTexture(mergeskytexture); else + m.tex[0] = R_GetTexture(solidskytexture); + m.texcoords[0] = &svert[0].st[0]; + m.texcoordstep[0] = sizeof(surfvert_t); + speedscale = cl.time * (8.0/128.0); + speedscale -= (int)speedscale; + for (i = 0, sv = svert, v = s->mesh.vertex;i < m.numverts;i++, sv++, v++) { - 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], (v[3] + os) * (1.0f/64.0f), (v[4] + ot) * (1.0f/64.0f), 128, 128, 128, alpha); - } - transpolyend(); - } + softwaretransform(v->v, sv->v); + VectorSubtract (sv->v, r_origin, dir); + // flatten the sphere + dir[2] *= 3; + + number = DotProduct(dir, dir); + #if SLOWMATH + length = 3.0f / sqrt(number); + #else + *((long *)&length) = 0x5f3759df - ((* (long *) &number) >> 1); + length = 3.0f * (length * (1.5f - (number * 0.5f * length * length))); + #endif + + sv->st[0] = speedscale + dir[0] * length; + sv->st[1] = speedscale + dir[1] * length; } + R_Mesh_Draw(&m); } else { - if (r_waterripple.value) + // flat color + memset(&m, 0, sizeof(m)); + m.transparent = false; + m.blendfunc1 = GL_ONE; + m.blendfunc2 = GL_ZERO; + m.numtriangles = s->mesh.numtriangles; + m.numverts = s->mesh.numverts; + m.index = s->mesh.index; + m.cr = fogcolor[0]; + m.cg = fogcolor[1]; + m.cb = fogcolor[2]; + m.ca = 1; + if (softwaretransform_complexity) { - 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) - 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(); - } + m.vertex = &svert[0].v[0]; + m.vertexstep = sizeof(surfvert_t); + for (i = 0, sv = svert, v = s->mesh.vertex;i < m.numverts;i++, sv++, v++) + softwaretransform(v->v, sv->v); } else { - 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) - 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(); - } + m.vertex = &s->mesh.vertex[0].v[0]; + m.vertexstep = sizeof(surfvertex_t); } + R_Mesh_Draw(&m); } + return false; } - else + else if (stage == 1) { - float *wv; - wv = wvert; - for (p = s->polys;p;p = p->next) + if (skyrenderglquake && !r_mergesky.integer) { - for (i = 0, v = p->verts[0];i < p->numverts;i++, v += VERTEXSIZE) + memset(&m, 0, sizeof(m)); + m.transparent = false; + m.blendfunc1 = GL_SRC_ALPHA; + m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA; + m.numtriangles = s->mesh.numtriangles; + m.numverts = s->mesh.numverts; + m.index = s->mesh.index; + m.vertex = &svert[0].v[0]; + m.vertexstep = sizeof(surfvert_t); + m.cr = 1; + m.cg = 1; + m.cb = 1; + m.ca = 1; + m.tex[0] = R_GetTexture(alphaskytexture); + m.texcoords[0] = &svert[0].st[0]; + m.texcoordstep[0] = sizeof(surfvert_t); + speedscale = cl.time * (16.0/128.0); + speedscale -= (int)speedscale; + for (i = 0, sv = svert, v = s->mesh.vertex;i < m.numverts;i++, sv++, v++) { - 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, sv->v); + VectorSubtract (sv->v, r_origin, dir); + // flatten the sphere + dir[2] *= 3; + + number = DotProduct(dir, dir); + #if SLOWMATH + length = 3.0f / sqrt(number); + #else + *((long *)&length) = 0x5f3759df - ((* (long *) &number) >> 1); + length = 3.0f * (length * (1.5f - (number * 0.5f * length * length))); + #endif + + sv->st[0] = speedscale + dir[0] * length; + sv->st[1] = speedscale + dir[1] * length; } + R_Mesh_Draw(&m); + return false; } - 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(); - } + return true; } + else + return true; } -void RSurf_DrawWall(msurface_t *s, texture_t *t, int transform) +static int RSurf_Light(int *dlightbits, int numverts) { - 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 - || lightscalebit != s->cached_lightscalebit - || (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) - { - // LordHavoc: fast path version for no vertex lighting cases - wp = &wallpoly[currentwallpoly]; - out = &wallvert[currentwallvert]; - for (p = s->polys;p;p = p->next) + float f; + int i, l, lit = false; + rdlight_t *rd; + vec3_t lightorigin; + surfvert_t *sv; + for (l = 0;l < r_numdlights;l++) + { + if (dlightbits[l >> 5] & (1 << (l & 31))) { - 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) - { - for (i = 0;i < p->numverts;i++, v += VERTEXSIZE, out++) - { - softwaretransform(v, out->vert); - out->vert[3] = v[3]; - out->vert[4] = v[4]; - out->vert[5] = v[5]; - out->vert[6] = v[6]; - } - } - else + rd = &r_dlight[l]; + // FIXME: support softwareuntransform here and make bmodels use hardware transform? + VectorCopy(rd->origin, lightorigin); + for (i = 0, sv = svert;i < numverts;i++, sv++) { - /* - for (i = 0;i < p->numverts;i++, v += VERTEXSIZE, out++) + f = VectorDistance2(sv->v, lightorigin) + LIGHTOFFSET; + if (f < rd->cullradius2) { - VectorCopy(v, out->vert); - out->vert[3] = v[3]; - out->vert[4] = v[4]; - out->vert[5] = v[5]; - out->vert[6] = v[6]; + f = (1.0f / f) - rd->lightsubtract; + sv->c[0] += rd->light[0] * f; + sv->c[1] += rd->light[1] * f; + sv->c[2] += rd->light[2] * f; + lit = true; } - */ - memcpy(out, v, sizeof(vec_t) * VERTEXSIZE * p->numverts); - out += p->numverts; } } } + return lit; +} + +static void RSurfShader_Water_Pass_Base(msurface_t *s) +{ + int i; + float diff[3], alpha, ifog; + surfvertex_t *v; + surfvert_t *sv; + rmeshinfo_t m; + alpha = currentrenderentity->alpha * (s->flags & SURF_DRAWNOALPHA ? 1 : r_wateralpha.value); + + memset(&m, 0, sizeof(m)); + if (alpha != 1 || s->currenttexture->fogtexture != NULL) + { + m.transparent = true; + m.blendfunc1 = GL_SRC_ALPHA; + m.blendfunc2 = GL_ONE; //_MINUS_SRC_ALPHA; + } else { - float *wv; - wv = wvert; - for (p = s->polys;p;p = p->next) + m.transparent = false; + m.blendfunc1 = GL_ONE; + m.blendfunc2 = GL_ZERO; + } + m.numtriangles = s->mesh.numtriangles; + m.numverts = s->mesh.numverts; + m.index = s->mesh.index; + m.vertex = &svert[0].v[0]; + m.vertexstep = sizeof(surfvert_t); + m.color = &svert[0].c[0]; + m.colorstep = sizeof(surfvert_t); + m.tex[0] = R_GetTexture(s->currenttexture->texture); + m.texcoords[0] = &svert[0].st[0]; + m.texcoordstep[0] = sizeof(surfvert_t); + for (i = 0, sv = svert, v = s->mesh.vertex;i < m.numverts;i++, sv++, v++) + { + softwaretransform(v->v, sv->v); + if (r_waterripple.value) + sv->v[2] += r_waterripple.value * (1.0f / 64.0f) * turbsin[(int)((v->v[0]*(1.0f/32.0f)+cl.time) * TURBSCALE) & 255] * turbsin[(int)((v->v[1]*(1.0f/32.0f)+cl.time) * TURBSCALE) & 255]; + if (s->flags & SURF_DRAWFULLBRIGHT) { - for (i = 0, v = p->verts[0];i < p->numverts;i++, v += VERTEXSIZE) - { - if (transform) - softwaretransform(v, wv); - else - VectorCopy(v, wv); - wv[3] = wv[4] = wv[5] = 0.0f; - wv += 6; - } - verts += p->numverts; - polys++; + sv->c[0] = 1; + sv->c[1] = 1; + sv->c[2] = 1; + sv->c[3] = alpha; } - 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) + else { - 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++) - { - if (lit) - { - 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; - } - } - 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]; - } + sv->c[0] = 0.5f; + sv->c[1] = 0.5f; + sv->c[2] = 0.5f; + sv->c[3] = alpha; + } + sv->st[0] = (v->st[0] + turbsin[(int)((v->st[1]*0.125f+cl.time) * TURBSCALE) & 255]) * (1.0f / 64.0f); + sv->st[1] = (v->st[1] + turbsin[(int)((v->st[0]*0.125f+cl.time) * TURBSCALE) & 255]) * (1.0f / 64.0f); + } + if (s->dlightframe == r_framecount && !(s->flags & SURF_DRAWFULLBRIGHT)) + RSurf_Light(s->dlightbits, m.numverts); + if (fogenabled/* && m.blendfunc2 == GL_ONE_MINUS_SRC_ALPHA*/) + { + for (i = 0, sv = svert;i < m.numverts;i++, sv++) + { + VectorSubtract(sv->v, r_origin, diff); + ifog = 1 - exp(fogdensity/DotProduct(diff, diff)); + sv->c[0] *= ifog; + sv->c[1] *= ifog; + sv->c[2] *= ifog; } } + R_Mesh_Draw(&m); } -// LordHavoc: transparent brush models -void RSurf_DrawWallVertex(msurface_t *s, texture_t *t, int transform, int isbmodel) +static void RSurfShader_Water_Pass_Glow(msurface_t *s) { - 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) - { - for (i = 0, v = p->verts[0];i < p->numverts;i++, v += VERTEXSIZE) + int i; + float diff[3], alpha, ifog; + surfvertex_t *v; + surfvert_t *sv; + rmeshinfo_t m; + alpha = currentrenderentity->alpha * (s->flags & SURF_DRAWNOALPHA ? 1 : r_wateralpha.value); + + memset(&m, 0, sizeof(m)); + m.transparent = alpha != 1 || s->currenttexture->fogtexture != NULL; + m.blendfunc1 = GL_SRC_ALPHA; + m.blendfunc2 = GL_ONE; + m.numtriangles = s->mesh.numtriangles; + m.numverts = s->mesh.numverts; + m.index = s->mesh.index; + m.vertex = &svert[0].v[0]; + m.vertexstep = sizeof(surfvert_t); + m.cr = 1; + m.cg = 1; + m.cb = 1; + m.ca = alpha; + m.tex[0] = R_GetTexture(s->currenttexture->glowtexture); + m.texcoords[0] = &svert[0].st[0]; + m.texcoordstep[0] = sizeof(surfvert_t); + if (fogenabled) + { + m.color = &svert[0].c[0]; + m.colorstep = sizeof(surfvert_t); + for (i = 0, sv = svert, v = s->mesh.vertex;i < m.numverts;i++, sv++, v++) { - if (transform) - softwaretransform(v, wv); - 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) - { - 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) - { - 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; - } - } - } - } - wv += 6; + softwaretransform(v->v, sv->v); + if (r_waterripple.value) + sv->v[2] += r_waterripple.value * (1.0f / 64.0f) * turbsin[(int)((v->v[0]*(1.0f/32.0f)+cl.time) * TURBSCALE) & 255] * turbsin[(int)((v->v[1]*(1.0f/32.0f)+cl.time) * TURBSCALE) & 255]; + sv->st[0] = (v->st[0] + turbsin[(int)((v->st[1]*0.125f+cl.time) * TURBSCALE) & 255]) * (1.0f / 64.0f); + sv->st[1] = (v->st[1] + turbsin[(int)((v->st[0]*0.125f+cl.time) * TURBSCALE) & 255]) * (1.0f / 64.0f); + VectorSubtract(sv->v, r_origin, diff); + ifog = 1 - exp(fogdensity/DotProduct(diff, diff)); + sv->c[0] = m.cr * ifog; + sv->c[1] = m.cg * ifog; + sv->c[2] = m.cb * ifog; + sv->c[3] = m.ca; } } - 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)) + else { - for (p = s->polys;p;p = p->next) + for (i = 0, sv = svert, v = s->mesh.vertex;i < m.numverts;i++, sv++, v++) { - 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(); + softwaretransform(v->v, sv->v); + if (r_waterripple.value) + sv->v[2] += r_waterripple.value * (1.0f / 64.0f) * turbsin[(int)((v->v[0]*(1.0f/32.0f)+cl.time) * TURBSCALE) & 255] * turbsin[(int)((v->v[1]*(1.0f/32.0f)+cl.time) * TURBSCALE) & 255]; + sv->st[0] = (v->st[0] + turbsin[(int)((v->st[1]*0.125f+cl.time) * TURBSCALE) & 255]) * (1.0f / 64.0f); + sv->st[1] = (v->st[1] + turbsin[(int)((v->st[0]*0.125f+cl.time) * TURBSCALE) & 255]) * (1.0f / 64.0f); } } - else + R_Mesh_Draw(&m); +} + +static void RSurfShader_Water_Pass_Fog(msurface_t *s) +{ + int i; + float alpha; + surfvertex_t *v; + surfvert_t *sv; + rmeshinfo_t m; + vec3_t diff; + alpha = currentrenderentity->alpha * (s->flags & SURF_DRAWNOALPHA ? 1 : r_wateralpha.value); + + memset(&m, 0, sizeof(m)); + m.transparent = alpha != 1 || s->currenttexture->fogtexture != NULL; + m.blendfunc1 = GL_SRC_ALPHA; + m.blendfunc2 = GL_ONE; + m.numtriangles = s->mesh.numtriangles; + m.numverts = s->mesh.numverts; + m.index = s->mesh.index; + m.vertex = &svert[0].v[0]; + m.vertexstep = sizeof(surfvert_t); + m.color = &svert[0].c[0]; + m.colorstep = sizeof(surfvert_t); + m.tex[0] = R_GetTexture(s->currenttexture->fogtexture); + m.texcoords[0] = &svert[0].st[0]; + m.texcoordstep[0] = sizeof(surfvert_t); + + for (i = 0, sv = svert, v = s->mesh.vertex;i < m.numverts;i++, sv++, v++) { - for (p = s->polys;p;p = p->next) + softwaretransform(v->v, sv->v); + if (r_waterripple.value) + sv->v[2] += r_waterripple.value * (1.0f / 64.0f) * turbsin[(int)((v->v[0]*(1.0f/32.0f)+cl.time) * TURBSCALE) & 255] * turbsin[(int)((v->v[1]*(1.0f/32.0f)+cl.time) * TURBSCALE) & 255]; + if (m.tex[0]) { - 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(); + sv->st[0] = (v->st[0] + turbsin[(int)((v->st[1]*0.125f+cl.time) * TURBSCALE) & 255]) * (1.0f / 64.0f); + sv->st[1] = (v->st[1] + turbsin[(int)((v->st[0]*0.125f+cl.time) * TURBSCALE) & 255]) * (1.0f / 64.0f); } + VectorSubtract(sv->v, r_origin, diff); + sv->c[0] = fogcolor[0]; + sv->c[1] = fogcolor[1]; + sv->c[2] = fogcolor[2]; + sv->c[3] = alpha * exp(fogdensity/DotProduct(diff, diff)); } + R_Mesh_Draw(&m); } -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) +static int RSurfShader_Water(int stage, msurface_t *s) { -// 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; -// } + switch(stage) + { + case 0: + RSurfShader_Water_Pass_Base(s); + return false; + case 1: + if (s->currenttexture->glowtexture) + RSurfShader_Water_Pass_Glow(s); + return false; + case 2: + if (fogenabled && (s->flags & SURF_DRAWNOALPHA)) + { + RSurfShader_Water_Pass_Fog(s); + return false; + } + else + return true; + default: + return true; + } } -*/ -void RBrushModelSurf_Callback(void *data, void *data2) +static void RSurfShader_Wall_Pass_BaseMTex(msurface_t *s) { - 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; + float diff[3], ifog; + surfvertex_t *v; + surfvert_t *sv; + rmeshinfo_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 (s->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, vertexlit; - vec3_t mins, maxs; - msurface_t *s; - model_t *clmodel; - int rotated; - vec3_t org; - glpoly_t *p; - - currententity = e; + m.numtriangles = s->mesh.numtriangles; + m.numverts = s->mesh.numverts; + m.index = s->mesh.index; + m.cr = m.cg = m.cb = (float) (1 << lightscalebit); + m.ca = currentrenderentity->alpha; + m.tex[0] = R_GetTexture(s->currenttexture->texture); + m.tex[1] = R_GetTexture(s->lightmaptexture); + m.texcoords[0] = &s->mesh.vertex->st[0]; + m.texcoords[1] = &s->mesh.vertex->uv[0]; + m.texcoordstep[0] = sizeof(surfvertex_t); + m.texcoordstep[1] = sizeof(surfvertex_t); + if (fogenabled) + { + m.color = &svert[0].c[0]; + m.colorstep = sizeof(surfvert_t); + if (softwaretransform_complexity) + { + m.vertex = &svert[0].v[0]; + m.vertexstep = sizeof(surfvert_t); + for (i = 0, sv = svert, v = s->mesh.vertex;i < m.numverts;i++, sv++, v++) + { + softwaretransform(v->v, sv->v); + VectorSubtract(sv->v, r_origin, diff); + ifog = 1 - exp(fogdensity/DotProduct(diff, diff)); + sv->c[0] = m.cr * ifog; + sv->c[1] = m.cg * ifog; + sv->c[2] = m.cb * ifog; + sv->c[3] = m.ca; + } + } + else + { + m.vertex = &s->mesh.vertex->v[0]; + m.vertexstep = sizeof(surfvertex_t); + for (i = 0, sv = svert, v = s->mesh.vertex;i < m.numverts;i++, sv++, v++) + { + VectorSubtract(v->v, r_origin, diff); + ifog = 1 - exp(fogdensity/DotProduct(diff, diff)); + sv->c[0] = m.cr * ifog; + sv->c[1] = m.cg * ifog; + sv->c[2] = m.cb * ifog; + sv->c[3] = m.ca; + } + } + } + else + { + if (softwaretransform_complexity) + { + m.vertex = &svert[0].v[0]; + m.vertexstep = sizeof(surfvert_t); + for (i = 0, sv = svert, v = s->mesh.vertex;i < m.numverts;i++, sv++, v++) + softwaretransform(v->v, sv->v); + } + else + { + m.vertex = &s->mesh.vertex->v[0]; + m.vertexstep = sizeof(surfvertex_t); + } + } + R_Mesh_Draw(&m); +} - clmodel = e->render.model; +static void RSurfShader_Wall_Pass_BaseTexture(msurface_t *s) +{ + int i; + surfvertex_t *v; + surfvert_t *sv; + rmeshinfo_t m; + + memset(&m, 0, sizeof(m)); + m.transparent = false; + m.blendfunc1 = GL_ONE; + m.blendfunc2 = GL_ZERO; + m.numtriangles = s->mesh.numtriangles; + m.numverts = s->mesh.numverts; + m.index = s->mesh.index; + m.cr = m.cg = m.cb = (float) (1 << v_overbrightbits.integer); + m.ca = 1; + m.tex[0] = R_GetTexture(s->currenttexture->texture); + m.texcoords[0] = &s->mesh.vertex->st[0]; + m.texcoordstep[0] = sizeof(surfvertex_t); + if (softwaretransform_complexity) + { + m.vertex = &svert[0].v[0]; + m.vertexstep = sizeof(surfvert_t); + for (i = 0, sv = svert, v = s->mesh.vertex;i < m.numverts;i++, sv++, v++) + softwaretransform(v->v, sv->v); + } + else + { + m.vertex = &s->mesh.vertex->v[0]; + m.vertexstep = sizeof(surfvertex_t); + } + R_Mesh_Draw(&m); +} - if (e->render.angles[0] || e->render.angles[1] || e->render.angles[2]) +static void RSurfShader_Wall_Pass_BaseLightmap(msurface_t *s) +{ + int i; + float diff[3], ifog; + surfvertex_t *v; + surfvert_t *sv; + rmeshinfo_t m; + + memset(&m, 0, sizeof(m)); + m.transparent = false; + m.blendfunc1 = GL_ZERO; + m.blendfunc2 = GL_SRC_COLOR; + m.numtriangles = s->mesh.numtriangles; + m.numverts = s->mesh.numverts; + m.index = s->mesh.index; + m.cr = m.cg = m.cb = (float) (1 << v_overbrightbits.integer); + m.ca = 1; + m.tex[0] = R_GetTexture(s->lightmaptexture); + m.texcoords[0] = &s->mesh.vertex->uv[0]; + m.texcoordstep[0] = sizeof(surfvertex_t); + if (fogenabled) { - rotated = true; - for (i=0 ; i<3 ; i++) + m.color = &svert[0].c[0]; + m.colorstep = sizeof(surfvert_t); + if (softwaretransform_complexity) + { + m.vertex = &svert[0].v[0]; + m.vertexstep = sizeof(surfvert_t); + for (i = 0, sv = svert, v = s->mesh.vertex;i < m.numverts;i++, sv++, v++) + { + softwaretransform(v->v, sv->v); + VectorSubtract(sv->v, r_origin, diff); + ifog = 1 - exp(fogdensity/DotProduct(diff, diff)); + sv->c[0] = m.cr * ifog; + sv->c[1] = m.cg * ifog; + sv->c[2] = m.cb * ifog; + sv->c[3] = m.ca; + } + } + else { - mins[i] = e->render.origin[i] - clmodel->radius; - maxs[i] = e->render.origin[i] + clmodel->radius; + m.vertex = &s->mesh.vertex->v[0]; + m.vertexstep = sizeof(surfvertex_t); + for (i = 0, sv = svert, v = s->mesh.vertex;i < m.numverts;i++, sv++, v++) + { + VectorSubtract(v->v, r_origin, diff); + ifog = 1 - exp(fogdensity/DotProduct(diff, diff)); + sv->c[0] = m.cr * ifog; + sv->c[1] = m.cg * ifog; + sv->c[2] = m.cb * ifog; + sv->c[3] = m.ca; + } } } else { - rotated = false; - VectorAdd (e->render.origin, clmodel->mins, mins); - VectorAdd (e->render.origin, clmodel->maxs, maxs); + if (softwaretransform_complexity) + { + m.vertex = &svert[0].v[0]; + m.vertexstep = sizeof(surfvert_t); + for (i = 0, sv = svert, v = s->mesh.vertex;i < m.numverts;i++, sv++, v++) + softwaretransform(v->v, sv->v); + } + else + { + m.vertex = &s->mesh.vertex->v[0]; + m.vertexstep = sizeof(surfvertex_t); + } } + R_Mesh_Draw(&m); +} - if (R_CullBox (mins, maxs)) - return; +static void RSurfShader_Wall_Pass_BaseVertex(msurface_t *s) +{ + int i, size3; + float c[3], base[3], scale, diff[3], ifog; + surfvertex_t *v; + surfvert_t *sv; + rmeshinfo_t m; + byte *lm; - c_bmodels++; + size3 = ((s->extents[0]>>4)+1)*((s->extents[1]>>4)+1)*3; - VectorSubtract (r_origin, e->render.origin, modelorg); - if (rotated) - { - vec3_t temp; - vec3_t forward, right, up; + base[0] = base[1] = base[2] = r_ambient.value * (1.0f / 128.0f); - 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); + memset(&m, 0, sizeof(m)); + if (currentrenderentity->effects & EF_ADDITIVE) + { + m.transparent = true; + m.blendfunc1 = GL_SRC_ALPHA; + m.blendfunc2 = GL_ONE; } - - softwaretransformforbrushentity (e); - - for (i = 0, s = &clmodel->surfaces[clmodel->firstmodelsurface];i < clmodel->nummodelsurfaces;i++, s++) + else if (s->currenttexture->fogtexture != NULL || currentrenderentity->alpha != 1) { - 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_MINUS_SRC_ALPHA; } - -// calculate dynamic lighting for bmodel if it's not an instanced model - for (i = 0;i < MAX_DLIGHTS;i++) + else { - 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 = false; + m.blendfunc1 = GL_ONE; + m.blendfunc2 = GL_ZERO; } - 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++) + m.numtriangles = s->mesh.numtriangles; + m.numverts = s->mesh.numverts; + m.index = s->mesh.index; + m.vertex = &svert[0].v[0]; + m.vertexstep = sizeof(surfvert_t); + m.color = &svert[0].c[0]; + m.colorstep = sizeof(surfvert_t); + m.tex[0] = R_GetTexture(s->currenttexture->texture); + m.texcoords[0] = &s->mesh.vertex->st[0]; + m.texcoordstep[0] = sizeof(surfvertex_t); + for (i = 0, sv = svert, v = s->mesh.vertex;i < m.numverts;i++, sv++, v++) { - if (s->visframe == r_framecount) + softwaretransform(v->v, sv->v); + VectorCopy(base, c); + if (s->styles[0] != 255) { -// R_DrawSurf(s, true, vertexlit || s->texinfo->texture->transparent); - if (r_ser.value) - { - 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); - } - } - else + lm = s->samples + v->lightmapoffset; + scale = d_lightstylevalue[s->styles[0]] * (1.0f / 32768.0f); + VectorMA(c, scale, lm, c); + if (s->styles[1] != 255) { - if (s->flags & (SURF_DRAWSKY | SURF_DRAWTURB)) - { - // sky and liquid don't need sorting (skypoly/transpoly) - if (s->flags & SURF_DRAWSKY) - RSurf_DrawSky(s, true); - else - RSurf_DrawWater(s, R_TextureAnimation(s->texinfo->texture), true, s->flags & SURF_DRAWNOALPHA ? 255 : wateralpha); - } - else + lm += size3; + scale = d_lightstylevalue[s->styles[1]] * (1.0f / 32768.0f); + VectorMA(c, scale, lm, c); + if (s->styles[2] != 255) { - texture_t *t = R_TextureAnimation(s->texinfo->texture); - if (vertexlit || s->texinfo->texture->transparent) - RSurf_DrawWallVertex(s, t, true, true); - else - RSurf_DrawWall(s, t, true); + lm += size3; + scale = d_lightstylevalue[s->styles[2]] * (1.0f / 32768.0f); + VectorMA(c, scale, lm, c); + if (s->styles[3] != 255) + { + lm += size3; + scale = d_lightstylevalue[s->styles[3]] * (1.0f / 32768.0f); + VectorMA(c, scale, lm, c); + } } } } + sv->c[0] = c[0]; + sv->c[1] = c[1]; + sv->c[2] = c[2]; + sv->c[3] = currentrenderentity->alpha; + } + if (s->dlightframe == r_framecount) + RSurf_Light(s->dlightbits, m.numverts); + if (fogenabled) + { + for (i = 0, sv = svert, v = s->mesh.vertex;i < m.numverts;i++, sv++, v++) + { + VectorSubtract(sv->v, r_origin, diff); + ifog = 1 - exp(fogdensity/DotProduct(diff, diff)); + sv->c[0] *= ifog; + sv->c[1] *= ifog; + sv->c[2] *= ifog; + } } - UploadLightmaps(); + R_Mesh_Draw(&m); } -/* -============================================================= - - WORLD MODEL - -============================================================= -*/ - -/* -static byte *worldvis; - -void R_MarkLeaves (void) +static void RSurfShader_Wall_Pass_BaseFullbright(msurface_t *s) { - 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); + int i; + float diff[3], ifog; + surfvertex_t *v; + surfvert_t *sv; + rmeshinfo_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 (s->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.numtriangles = s->mesh.numtriangles; + m.numverts = s->mesh.numverts; + m.index = s->mesh.index; + m.vertex = &svert[0].v[0]; + m.vertexstep = sizeof(surfvert_t); + m.tex[0] = R_GetTexture(s->currenttexture->texture); + m.texcoords[0] = &s->mesh.vertex->st[0]; + m.texcoordstep[0] = sizeof(surfvertex_t); + if (fogenabled) + { + m.color = &svert[0].c[0]; + m.colorstep = sizeof(surfvert_t); + for (i = 0, sv = svert, v = s->mesh.vertex;i < m.numverts;i++, sv++, v++) + { + softwaretransform(v->v, sv->v); + VectorSubtract(sv->v, r_origin, diff); + ifog = 1 - exp(fogdensity/DotProduct(diff, diff)); + sv->c[0] = ifog; + sv->c[1] = ifog; + sv->c[2] = ifog; + sv->c[3] = currentrenderentity->alpha; + } + } + else + { + m.cr = m.cg = m.cb = 1; + m.ca = currentrenderentity->alpha; + for (i = 0, sv = svert, v = s->mesh.vertex;i < m.numverts;i++, sv++, v++) + softwaretransform(v->v, sv->v); + } + R_Mesh_Draw(&m); } -*/ -void RSurf_Callback(void *data, void *junk) +static void RSurfShader_Wall_Pass_Light(msurface_t *s) { - ((msurface_t *)data)->visframe = r_framecount; + int i; + float diff[3], ifog; + surfvertex_t *v; + surfvert_t *sv; + rmeshinfo_t m; + + memset(&m, 0, sizeof(m)); + if (currentrenderentity->effects & EF_ADDITIVE) + m.transparent = true; + else if (s->currenttexture->fogtexture != NULL || currentrenderentity->alpha != 1) + m.transparent = true; + else + m.transparent = false; + m.blendfunc1 = GL_SRC_ALPHA; + m.blendfunc2 = GL_ONE; + m.numtriangles = s->mesh.numtriangles; + m.numverts = s->mesh.numverts; + m.index = s->mesh.index; + m.vertex = &svert[0].v[0]; + m.vertexstep = sizeof(surfvert_t); + m.color = &svert[0].c[0]; + m.colorstep = sizeof(surfvert_t); + m.tex[0] = R_GetTexture(s->currenttexture->texture); + m.texcoords[0] = &s->mesh.vertex->st[0]; + m.texcoordstep[0] = sizeof(surfvertex_t); + for (i = 0, sv = svert, v = s->mesh.vertex;i < m.numverts;i++, sv++, v++) + { + softwaretransform(v->v, sv->v); + sv->c[0] = 0; + sv->c[1] = 0; + sv->c[2] = 0; + sv->c[3] = currentrenderentity->alpha; + } + if (RSurf_Light(s->dlightbits, m.numverts)) + { + if (fogenabled) + { + for (i = 0, sv = svert;i < m.numverts;i++, sv++) + { + VectorSubtract(sv->v, r_origin, diff); + ifog = 1 - exp(fogdensity/DotProduct(diff, diff)); + sv->c[0] *= ifog; + sv->c[1] *= ifog; + sv->c[2] *= ifog; + } + } + R_Mesh_Draw(&m); + } } -/* -void RSurf_Callback(void *data, void *junk) +static void RSurfShader_Wall_Pass_Glow(msurface_t *s) { - msurface_t *surf = data; - texture_t *t; - -// if (surf->visframe == r_framecount) -// return; - - surf->visframe = r_framecount; - - c_faces++; - - if (surf->flags & (SURF_DRAWSKY | SURF_DRAWTURB)) + int i; + float diff[3], ifog; + surfvertex_t *v; + surfvert_t *sv; + rmeshinfo_t m; + + memset(&m, 0, sizeof(m)); + if (currentrenderentity->effects & EF_ADDITIVE) + m.transparent = true; + else if (s->currenttexture->fogtexture != NULL || currentrenderentity->alpha != 1) + m.transparent = true; + else + m.transparent = false; + m.blendfunc1 = GL_SRC_ALPHA; + m.blendfunc2 = GL_ONE; + m.numtriangles = s->mesh.numtriangles; + m.numverts = s->mesh.numverts; + m.index = s->mesh.index; + m.cr = 1; + m.cg = 1; + m.cb = 1; + m.ca = currentrenderentity->alpha; + m.tex[0] = R_GetTexture(s->currenttexture->glowtexture); + m.texcoords[0] = &s->mesh.vertex->st[0]; + m.texcoordstep[0] = sizeof(surfvertex_t); + if (fogenabled) { - // sky and liquid don't need sorting (skypoly/transpoly) - if (surf->flags & SURF_DRAWSKY) - RSurf_DrawSky(surf, false); + m.color = &svert[0].c[0]; + m.colorstep = sizeof(surfvert_t); + if (softwaretransform_complexity) + { + m.vertex = &svert[0].v[0]; + m.vertexstep = sizeof(surfvert_t); + for (i = 0, sv = svert, v = s->mesh.vertex;i < m.numverts;i++, sv++, v++) + { + softwaretransform(v->v, sv->v); + VectorSubtract(sv->v, r_origin, diff); + ifog = 1 - exp(fogdensity/DotProduct(diff, diff)); + sv->c[0] = m.cr * ifog; + sv->c[1] = m.cg * ifog; + sv->c[2] = m.cb * ifog; + sv->c[3] = m.ca; + } + } else - RSurf_DrawWater(surf, R_TextureAnimation(surf->texinfo->texture), false, surf->flags & SURF_DRAWNOALPHA ? 255 : wateralpha); + { + m.vertex = &s->mesh.vertex->v[0]; + m.vertexstep = sizeof(surfvertex_t); + for (i = 0, sv = svert, v = s->mesh.vertex;i < m.numverts;i++, sv++, v++) + { + VectorSubtract(v->v, r_origin, diff); + ifog = 1 - exp(fogdensity/DotProduct(diff, diff)); + sv->c[0] = m.cr * ifog; + sv->c[1] = m.cg * ifog; + sv->c[2] = m.cb * ifog; + sv->c[3] = m.ca; + } + } } else { - t = R_TextureAnimation(surf->texinfo->texture); - if (vertexworld) - RSurf_DrawWallVertex(surf, t, false, false); + if (softwaretransform_complexity) + { + m.vertex = &svert[0].v[0]; + m.vertexstep = sizeof(surfvert_t); + for (i = 0, sv = svert, v = s->mesh.vertex;i < m.numverts;i++, sv++, v++) + softwaretransform(v->v, sv->v); + } else - RSurf_DrawWall(surf, t, false); + { + m.vertex = &s->mesh.vertex->v[0]; + m.vertexstep = sizeof(surfvertex_t); + } } + R_Mesh_Draw(&m); } -*/ - -/* -mleaf_t *r_oldviewleaf; -int r_markvisframecount = 0; -void R_MarkLeaves (void) +static void RSurfShader_Wall_Pass_Fog(msurface_t *s) { - 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)) + int i; + surfvertex_t *v; + surfvert_t *sv; + rmeshinfo_t m; + vec3_t diff; + + memset(&m, 0, sizeof(m)); + if (currentrenderentity->effects & EF_ADDITIVE) + m.transparent = true; + else if (s->currenttexture->fogtexture != NULL || currentrenderentity->alpha != 1) + m.transparent = true; + else + m.transparent = false; + m.blendfunc1 = GL_SRC_ALPHA; + m.blendfunc2 = GL_ONE; + m.numtriangles = s->mesh.numtriangles; + m.numverts = s->mesh.numverts; + m.index = s->mesh.index; + m.color = &svert[0].c[0]; + m.colorstep = sizeof(surfvert_t); + m.tex[0] = R_GetTexture(s->currenttexture->fogtexture); + m.texcoords[0] = &s->mesh.vertex->st[0]; + m.texcoordstep[0] = sizeof(surfvertex_t); + if (softwaretransform_complexity) { - row = (model->numleafs+7)>>3; + m.vertex = &svert[0].v[0]; + m.vertexstep = sizeof(surfvert_t); + for (i = 0, sv = svert, v = s->mesh.vertex;i < m.numverts;i++, sv++, v++) + { + softwaretransform(v->v, sv->v); + VectorSubtract(sv->v, r_origin, diff); + sv->c[0] = fogcolor[0]; + sv->c[1] = fogcolor[1]; + sv->c[2] = fogcolor[2]; + sv->c[3] = currentrenderentity->alpha * exp(fogdensity/DotProduct(diff,diff)); + } + } + else + { + m.vertex = &s->mesh.vertex->v[0]; + m.vertexstep = sizeof(surfvertex_t); + for (i = 0, sv = svert, v = s->mesh.vertex;i < m.numverts;i++, sv++, v++) + { + VectorSubtract(v->v, r_origin, diff); + sv->c[0] = fogcolor[0]; + sv->c[1] = fogcolor[1]; + sv->c[2] = fogcolor[2]; + sv->c[3] = currentrenderentity->alpha * exp(fogdensity/DotProduct(diff,diff)); + } + } + R_Mesh_Draw(&m); +} - if (!r_testvis.value) - r_markvisframecount++; +static int RSurfShader_Wall_Fullbright(int stage, msurface_t *s) +{ + switch(stage) + { + case 0: + RSurfShader_Wall_Pass_BaseFullbright(s); + return false; + case 1: + if (s->currenttexture->glowtexture) + RSurfShader_Wall_Pass_Glow(s); + return false; + default: + return true; + } +} - // LordHavoc: mark the root node as visible, it will terminate all other ascensions - model->nodes->markvisframe = r_markvisframecount; +static int RSurfShader_Wall_Vertex(int stage, msurface_t *s) +{ + switch(stage) + { + case 0: + RSurfShader_Wall_Pass_BaseVertex(s); + return false; + case 1: + if (s->currenttexture->glowtexture) + RSurfShader_Wall_Pass_Glow(s); + return false; + default: + return true; + } +} - k = 0; - while (k < row) +static int RSurfShader_Wall_Lightmap(int stage, msurface_t *s) +{ + if (r_vertexsurfaces.integer) + { + switch(stage) + { + case 0: + RSurfShader_Wall_Pass_BaseVertex(s); + return false; + case 1: + if (s->currenttexture->glowtexture) + RSurfShader_Wall_Pass_Glow(s); + return false; + default: + return true; + } + } + else if (r_multitexture.integer) + { + if (r_dlightmap.integer) { - c = *in++; - if (c) + switch(stage) { - l = model->numleafs - (k << 3); - if (l > 8) - l = 8; - for (i=0 ; ileafs[(k << 3)+i+1]; - node = (mnode_t *)leaf; - do - { - node->markvisframe = r_markvisframecount; - node = node->parent; - } - while (node->markvisframecount != r_markvisframecount); - } - } - k++; + case 0: + RSurfShader_Wall_Pass_BaseMTex(s); + return false; + case 1: + if (s->currenttexture->glowtexture) + RSurfShader_Wall_Pass_Glow(s); + return false; + default: + return true; } - else - k += *in++; + } + else + { + switch(stage) + { + case 0: + RSurfShader_Wall_Pass_BaseMTex(s); + return false; + case 1: + if (s->dlightframe == r_framecount) + RSurfShader_Wall_Pass_Light(s); + return false; + case 2: + if (s->currenttexture->glowtexture) + RSurfShader_Wall_Pass_Glow(s); + return false; + default: + return true; + } + } + } + else if (s->currenttexture->fogtexture != NULL || currentrenderentity->alpha != 1 || currentrenderentity->effects & EF_ADDITIVE) + { + switch(stage) + { + case 0: + RSurfShader_Wall_Pass_BaseVertex(s); + return false; + case 1: + if (s->currenttexture->glowtexture) + RSurfShader_Wall_Pass_Glow(s); + return false; + default: + return true; } } else { - // LordHavoc: no vis data, mark everything as visible - model->nodes->markvisframe = r_markvisframecount; - - for (i = 1;i < model->numleafs;i++) + if (r_dlightmap.integer) { - node = (mnode_t *)&model->leafs[i]; - do + switch(stage) + { + case 0: + RSurfShader_Wall_Pass_BaseTexture(s); + return false; + case 1: + RSurfShader_Wall_Pass_BaseLightmap(s); + return false; + case 2: + if (s->currenttexture->glowtexture) + RSurfShader_Wall_Pass_Glow(s); + return false; + default: + return true; + } + } + else + { + switch(stage) { - node->markvisframe = r_markvisframecount; - node = node->parent; + case 0: + RSurfShader_Wall_Pass_BaseTexture(s); + return false; + case 1: + RSurfShader_Wall_Pass_BaseLightmap(s); + return false; + case 2: + if (s->dlightframe == r_framecount) + RSurfShader_Wall_Pass_Light(s); + return false; + case 3: + if (s->currenttexture->glowtexture) + RSurfShader_Wall_Pass_Glow(s); + return false; + default: + return true; } - while (node->markvisframecount != r_markvisframecount); } } } + +static int RSurfShader_Wall_Fog(int stage, msurface_t *s) +{ + if (stage == 0 && fogenabled) + { + RSurfShader_Wall_Pass_Fog(s); + return false; + } + else + return true; +} + +/* +============================================================= + + WORLD MODEL + +============================================================= */ -void R_SolidWorldNode (void) +static void RSurf_Callback(void *data, void *junk) +{ + ((msurface_t *)data)->visframe = r_framecount; +} + +static void R_SolidWorldNode (void) { - if ((int) r_solidworldnode.value == 3) + if (r_viewleaf->contents != CONTENTS_SOLID) { int portalstack; mportal_t *p, *pstack[8192]; msurface_t *surf, **mark, **endmark; mleaf_t *leaf; - glpoly_t *poly; tinyplane_t plane; + // LordHavoc: portal-passage worldnode; follows portals leading + // outward from viewleaf, if a portal leads offscreen it is not + // followed, in indoor maps this can often cull a great deal of + // geometry away when pvs data is not present (useful with pvs as well) leaf = r_viewleaf; leaf->worldnodeframe = r_framecount; @@ -1159,7 +1622,7 @@ void R_SolidWorldNode (void) { mark = leaf->firstmarksurface; endmark = mark + leaf->nummarksurfaces; - if (r_ser.value) + if (r_ser.integer) { do { @@ -1174,15 +1637,13 @@ void R_SolidWorldNode (void) { VectorNegate(surf->plane->normal, plane.normal); plane.dist = -surf->plane->dist; - for (poly = surf->polys;poly;poly = poly->next) - R_Clip_AddPolygon((float *)poly->verts, poly->numverts, VERTEXSIZE * sizeof(float), (surf->flags & SURF_CLIPSOLID) != 0, RSurf_Callback, surf, NULL, &plane); + R_Clip_AddPolygon((float *)surf->poly_verts, surf->poly_numverts, sizeof(float[3]), (surf->flags & SURF_CLIPSOLID) != 0, RSurf_Callback, surf, NULL, &plane); } } else { if (!(surf->flags & SURF_PLANEBACK)) - for (poly = surf->polys;poly;poly = poly->next) - R_Clip_AddPolygon((float *)poly->verts, poly->numverts, VERTEXSIZE * sizeof(float), (surf->flags & SURF_CLIPSOLID) != 0, RSurf_Callback, surf, NULL, (tinyplane_t *)surf->plane); + R_Clip_AddPolygon((float *)surf->poly_verts, surf->poly_numverts, sizeof(float[3]), (surf->flags & SURF_CLIPSOLID) != 0, RSurf_Callback, surf, NULL, (tinyplane_t *)surf->plane); } } while (mark < endmark); @@ -1225,6 +1686,7 @@ void R_SolidWorldNode (void) { if (R_NotCulledBox(leaf->mins, leaf->maxs)) { + p->visframe = r_framecount; pstack[portalstack++] = p; goto loc0; @@ -1239,18 +1701,21 @@ void R_SolidWorldNode (void) if (portalstack) goto loc1; } - else if ((int) r_solidworldnode.value == 2) + else { mnode_t *nodestack[8192], *node = cl.worldmodel->nodes; int nodestackpos = 0; - glpoly_t *poly; + // LordHavoc: recursive descending worldnode; if portals are not + // available, this is a good last resort, can cull large amounts of + // geometry, but is more time consuming than portal-passage and renders + // things behind walls loc2: if (R_NotCulledBox(node->mins, node->maxs)) { - if (r_ser.value) + if (node->numsurfaces) { - if (node->numsurfaces) + if (r_ser.integer) { msurface_t *surf = cl.worldmodel->surfaces + node->firstsurface, *surfend = surf + node->numsurfaces; tinyplane_t plane; @@ -1262,8 +1727,7 @@ loc2: { VectorNegate(surf->plane->normal, plane.normal); plane.dist = -surf->plane->dist; - for (poly = surf->polys;poly;poly = poly->next) - R_Clip_AddPolygon((float *)poly->verts, poly->numverts, VERTEXSIZE * sizeof(float), surf->flags & SURF_CLIPSOLID, RSurf_Callback, surf, NULL, &plane); + R_Clip_AddPolygon((float *)surf->poly_verts, surf->poly_numverts, sizeof(float[3]), surf->flags & SURF_CLIPSOLID, RSurf_Callback, surf, NULL, &plane); } } } @@ -1272,15 +1736,11 @@ loc2: for (;surf < surfend;surf++) { if (!(surf->flags & SURF_PLANEBACK)) - for (poly = surf->polys;poly;poly = poly->next) - R_Clip_AddPolygon((float *)poly->verts, poly->numverts, VERTEXSIZE * sizeof(float), surf->flags & SURF_CLIPSOLID, RSurf_Callback, surf, NULL, (tinyplane_t *)surf->plane); + R_Clip_AddPolygon((float *)surf->poly_verts, surf->poly_numverts, sizeof(float[3]), surf->flags & SURF_CLIPSOLID, RSurf_Callback, surf, NULL, (tinyplane_t *)surf->plane); } } } - } - else - { - if (node->numsurfaces) + else { msurface_t *surf = cl.worldmodel->surfaces + node->firstsurface, *surfend = surf + node->numsurfaces; if (PlaneDiff (r_origin, node->plane) < 0) @@ -1339,568 +1799,196 @@ loc2: goto loc2; } } - else if ((int) r_solidworldnode.value == 1 && r_ser.value) - { - glpoly_t *poly; - msurface_t *surf, *endsurf; - tinyplane_t plane; +} + +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; + tinyplane_t plane; + byte *worldvis; + + worldvis = Mod_LeafPVS (r_viewleaf, cl.worldmodel); + + leaf = r_viewleaf; + leaf->worldnodeframe = r_framecount; + portalstack = 0; +loc0: + c_leafs++; - surf = &cl.worldmodel->surfaces[cl.worldmodel->firstmodelsurface]; - endsurf = surf + cl.worldmodel->nummodelsurfaces; - for (;surf < endsurf;surf++) + leaf->visframe = r_framecount; + + if (leaf->nummarksurfaces) + { + mark = leaf->firstmarksurface; + endmark = mark + leaf->nummarksurfaces; + if (r_ser.integer) { - if (PlaneDiff(r_origin, surf->plane) < 0) + do { - if (surf->flags & SURF_PLANEBACK) + 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) { - VectorNegate(surf->plane->normal, plane.normal); - plane.dist = -surf->plane->dist; - for (poly = surf->polys;poly;poly = poly->next) - R_Clip_AddPolygon((float *)poly->verts, poly->numverts, VERTEXSIZE * sizeof(float), (surf->flags & SURF_CLIPSOLID) != 0, RSurf_Callback, surf, NULL, &plane); + if (surf->flags & SURF_PLANEBACK) + { + VectorNegate(surf->plane->normal, plane.normal); + plane.dist = -surf->plane->dist; + R_Clip_AddPolygon((float *)surf->poly_verts, surf->poly_numverts, sizeof(float[3]), (surf->flags & SURF_CLIPSOLID) != 0, RSurf_Callback, surf, NULL, &plane); + } + } + else + { + if (!(surf->flags & SURF_PLANEBACK)) + R_Clip_AddPolygon((float *)surf->poly_verts, surf->poly_numverts, sizeof(float[3]), (surf->flags & SURF_CLIPSOLID) != 0, RSurf_Callback, surf, NULL, (tinyplane_t *)surf->plane); } } - else - { - if (!(surf->flags & SURF_PLANEBACK)) - for (poly = surf->polys;poly;poly = poly->next) - R_Clip_AddPolygon((float *)poly->verts, poly->numverts, VERTEXSIZE * sizeof(float), (surf->flags & SURF_CLIPSOLID) != 0, RSurf_Callback, surf, NULL, (tinyplane_t *)&surf->plane); - } + while (mark < endmark); } - } - else - { - int l; - mleaf_t *leaf; - msurface_t *surf, **mark, **endmark; - glpoly_t *poly; - tinyplane_t plane; - - for (l = 0, leaf = cl.worldmodel->leafs;l < cl.worldmodel->numleafs;l++, leaf++) + else { - 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) - { - mark = leaf->firstmarksurface; - endmark = mark + leaf->nummarksurfaces; - if (r_ser.value) - { - 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 (poly = surf->polys;poly;poly = poly->next) - R_Clip_AddPolygon((float *)poly->verts, poly->numverts, VERTEXSIZE * sizeof(float), (surf->flags & SURF_CLIPSOLID) != 0, RSurf_Callback, surf, NULL, &plane); - } - } - else - { - if (!(surf->flags & SURF_PLANEBACK)) - for (poly = surf->polys;poly;poly = poly->next) - R_Clip_AddPolygon((float *)poly->verts, poly->numverts, VERTEXSIZE * sizeof(float), (surf->flags & SURF_CLIPSOLID) != 0, RSurf_Callback, surf, NULL, (tinyplane_t *)surf->plane); - } - } - while (mark < endmark); - } - else - { - do - { - surf = *mark++; - // make sure surfaces are only processed once - if (surf->worldnodeframe == r_framecount) - continue; - surf->worldnodeframe = r_framecount; - if (PlaneDist(r_origin, surf->plane) < surf->plane->dist) - { - if (surf->flags & SURF_PLANEBACK) - surf->visframe = r_framecount; - } - else - { - if (!(surf->flags & SURF_PLANEBACK)) - surf->visframe = r_framecount; - } - } - while (mark < endmark); - } - } - } - } - } -} - -/* -void RSurf_Callback(void *data, void *junk) -{ - ((msurface_t *)data)->visframe = r_framecount; -} - -int R_FrustumTestPolygon(float *points, int numpoints, int stride); - -void RSurf_DoVisible(msurface_t *surf) -{ - 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; -} -*/ - -//mleaf_t *llistbuffer[32768], *l, **llist; - -/* -void RSurfLeaf_Callback(void *data) -{ - int portalstackpos = 0; - mleaf_t *leaf; - mportal_t *p, *portalstack[32768]; - msurface_t *surf, **mark, **endmark; - do - { - - leaf = data; - if (leaf->visframe == r_framecount) - return; - leaf->visframe = r_framecount; - - c_leafs++; - - if (leaf->nummarksurfaces) - { - mark = leaf->firstmarksurface; - endmark = mark + leaf->nummarksurfaces; - do + do { 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 (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) - { - if (p->past->visframe != r_framecount && DotProduct(r_origin, p->plane.normal) < p->plane.dist) - { - // 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; - } - } } - 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) + // follow portals into other leafs + for (p = leaf->portals;p;p = p->next) { - leaf = *l++; - - c_leafs++; - - if (leaf->nummarksurfaces) + if (DotProduct(r_origin, p->plane.normal) < p->plane.dist) { - mark = leaf->firstmarksurface; - endmark = mark + leaf->nummarksurfaces; - do + leaf = p->past; + if (leaf->worldnodeframe != r_framecount) { - 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) + leaf->worldnodeframe = r_framecount; + if (leaf->contents != CONTENTS_SOLID) { - if (surf->flags & SURF_PLANEBACK) - RSurf_DoVisible(surf); - } - else - { - if (!(surf->flags & SURF_PLANEBACK)) - RSurf_DoVisible(surf); - } - } - while (mark < endmark); - } + i = (leaf - cl.worldmodel->leafs) - 1; + if (worldvis[i>>3] & (1<<(i&7))) + { + if (R_NotCulledBox(leaf->mins, leaf->maxs)) + { + pstack[portalstack++] = p; + goto loc0; - // follow portals into other leafs - for (p = leaf->portals;p;p = p->next) - { - if (p->past->visframe != r_framecount) - { - if (R_Clip_Portal((float *) p->points, p->numpoints, sizeof(float) * 3)) - { - p->past->visframe = r_framecount; - *llist++ = p->past; +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; -// } -// } - } - -// 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); + if (portalstack) + goto loc1; } -*/ - -int r_portalframecount = 0; +Cshader_t Cshader_wall_vertex = {{NULL, RSurfShader_Wall_Vertex, RSurfShader_Wall_Fog}, NULL}; +Cshader_t Cshader_wall_lightmap = {{NULL, RSurfShader_Wall_Lightmap, RSurfShader_Wall_Fog}, NULL}; +Cshader_t Cshader_wall_fullbright = {{NULL, RSurfShader_Wall_Fullbright, RSurfShader_Wall_Fog}, NULL}; +Cshader_t Cshader_water = {{NULL, RSurfShader_Water, NULL}, NULL}; +Cshader_t Cshader_sky = {{RSurfShader_Sky, NULL, NULL}, NULL}; -/* -void R_Portal_Callback(void *data, void *data2) +int Cshader_count = 5; +Cshader_t *Cshaders[5] = { - mleaf_t *leaf = data; - if (!r_testvis.value) - ((mportal_t *)data2)->visframe = r_portalframecount; - if (leaf->visframe != r_framecount) - { - c_leafs++; - leaf->visframe = r_framecount; - } -} -*/ + &Cshader_wall_vertex, + &Cshader_wall_lightmap, + &Cshader_wall_fullbright, + &Cshader_water, + &Cshader_sky +}; -void R_PVSWorldNode() +void R_PrepareSurfaces(void) { - if (r_pvsworldnode.value == 1) - { - int portalstack, i; - mportal_t *p, *pstack[8192]; - msurface_t *surf, **mark, **endmark; - mleaf_t *leaf; - tinyplane_t plane; - glpoly_t *poly; - byte *worldvis; - - worldvis = Mod_LeafPVS (r_viewleaf, cl.worldmodel); - - leaf = r_viewleaf; - leaf->worldnodeframe = r_framecount; - portalstack = 0; - loc0: - c_leafs++; - - leaf->visframe = r_framecount; - - if (leaf->nummarksurfaces) - { - mark = leaf->firstmarksurface; - endmark = mark + leaf->nummarksurfaces; - if (r_ser.value) - { - do - { - 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) - { - VectorNegate(surf->plane->normal, plane.normal); - plane.dist = -surf->plane->dist; - for (poly = surf->polys;poly;poly = poly->next) - R_Clip_AddPolygon((float *)poly->verts, poly->numverts, VERTEXSIZE * sizeof(float), (surf->flags & SURF_CLIPSOLID) != 0, RSurf_Callback, surf, NULL, &plane); - } - } - else - { - if (!(surf->flags & SURF_PLANEBACK)) - for (poly = surf->polys;poly;poly = poly->next) - R_Clip_AddPolygon((float *)poly->verts, poly->numverts, VERTEXSIZE * sizeof(float), (surf->flags & SURF_CLIPSOLID) != 0, RSurf_Callback, surf, NULL, (tinyplane_t *)surf->plane); - } - } - while (mark < endmark); - } - else - { - do - { - surf = *mark++; - // make sure surfaces are only processed once - if (surf->worldnodeframe == r_framecount) - continue; - surf->worldnodeframe = r_framecount; - if (PlaneDist(modelorg, surf->plane) < surf->plane->dist) - { - if (surf->flags & SURF_PLANEBACK) - surf->visframe = r_framecount; - } - else - { - if (!(surf->flags & SURF_PLANEBACK)) - surf->visframe = r_framecount; - } - } - while (mark < endmark); - } - } + int i; + texture_t *t; + model_t *model; + msurface_t *surf; - // follow portals into other leafs - p = leaf->portals; - for (;p;p = p->next) - { - if (DotProduct(r_origin, p->plane.normal) < p->plane.dist) - { - leaf = p->past; - if (leaf->worldnodeframe != r_framecount) - { - leaf->worldnodeframe = r_framecount; - if (leaf->contents != CONTENTS_SOLID) - { - i = (leaf - cl.worldmodel->leafs) - 1; - if (worldvis[i>>3] & (1<<(i&7))) - { - if (R_NotCulledBox(leaf->mins, leaf->maxs)) - { - pstack[portalstack++] = p; - goto loc0; + for (i = 0;i < Cshader_count;i++) + Cshaders[i]->chain = NULL; - loc1: - p = pstack[--portalstack]; - } - } - } - } - } - } + model = currentrenderentity->model; - if (portalstack) - goto loc1; - } - else + for (i = 0;i < model->nummodelsurfaces;i++) { - 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 *poly; - 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) + surf = model->modelsortedsurfaces[i]; + if (surf->visframe == r_framecount) { - c = *in++; - if (c) + if (surf->insertframe != r_framecount) { - for (i = 0, bit = 1;c;i++, bit <<= 1) - { - if (c & bit) - { - leafnum = (k << 3)+i+1; - if (leafnum > numleafs) - return; - c -= bit; - leaf = &model->leafs[leafnum]; - if (R_NotCulledBox(leaf->mins, leaf->maxs)) - { - //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; - if (r_ser.value) - { - 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 (poly = surf->polys;poly;poly = poly->next) - R_Clip_AddPolygon((float *)poly->verts, poly->numverts, VERTEXSIZE * sizeof(float), (surf->flags & SURF_CLIPSOLID) != 0, RSurf_Callback, surf, NULL, &plane); - } - } - else - { - if (!(surf->flags & SURF_PLANEBACK)) - for (poly = surf->polys;poly;poly = poly->next) - R_Clip_AddPolygon((float *)poly->verts, poly->numverts, VERTEXSIZE * sizeof(float), (surf->flags & SURF_CLIPSOLID) != 0, RSurf_Callback, surf, NULL, (tinyplane_t *)surf->plane); - } - } - while (mark < endmark); - } - else - { - do - { - surf = *mark++; - // make sure surfaces are only processed once - if (surf->worldnodeframe == r_framecount) - continue; - surf->worldnodeframe = r_framecount; - if (PlaneDist(r_origin, surf->plane) < surf->plane->dist) - { - if (surf->flags & SURF_PLANEBACK) - surf->visframe = r_framecount; - } - else - { - if (!(surf->flags & SURF_PLANEBACK)) - surf->visframe = r_framecount; - } - } - while (mark < endmark); - } - } - } - } - } - k++; + surf->insertframe = r_framecount; + c_faces++; + // manually inlined R_TextureAnimation + //t = R_TextureAnimation(surf->texinfo->texture); + t = surf->texinfo->texture; + if (t->alternate_anims != NULL && currentrenderentity->frame) + t = t->alternate_anims; + if (t->anim_total >= 2) + t = t->anim_frames[(int)(cl.time * 5.0f) % t->anim_total]; + surf->currenttexture = t; } - else - k += *in++; + + surf->chain = surf->shader->chain; + surf->shader->chain = surf; } } } -entity_t clworldent; - -void R_DrawSurfaces (void) +void R_DrawSurfaces (int type) { - msurface_t *surf, *endsurf; - texture_t *t, *currentt; - int vertex = gl_vertex.value; + int i, stage; + msurface_t *surf; + Cshader_t *shader; - currententity = &clworldent; - modelalpha = 1; - softwaretransformidentity(); - surf = &cl.worldmodel->surfaces[cl.worldmodel->firstmodelsurface]; - endsurf = surf + cl.worldmodel->nummodelsurfaces; - t = currentt = NULL; - for (;surf < endsurf;surf++) + for (i = 0;i < Cshader_count;i++) { - if (surf->visframe == r_framecount) - { - c_faces++; - if (surf->flags & (SURF_DRAWSKY | SURF_DRAWTURB)) - { - 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 (currentt != surf->texinfo->texture) - { - currentt = surf->texinfo->texture; - t = R_TextureAnimation(surf->texinfo->texture); - } - if (vertex) - RSurf_DrawWallVertex(surf, t, false, false); - else - RSurf_DrawWall(surf, t, false); - } - } + shader = Cshaders[i]; + if (shader->chain && shader->shaderfunc[type]) + for (stage = 0;stage < 1000;stage++) + for (surf = shader->chain;surf;surf = surf->chain) + if (shader->shaderfunc[type](stage, surf)) + goto done; +done:; } } +static float portalpointbuffer[256][3]; + void R_DrawPortals(void) { - int drawportals, i, r, g, b; + int drawportals, i; // mleaf_t *leaf, *endleaf; mportal_t *portal, *endportal; mvertex_t *point/*, *endpoint*/; - drawportals = (int)r_drawportals.value; + rmeshinfo_t m; + drawportals = r_drawportals.integer; if (drawportals < 1) return; /* @@ -1928,388 +2016,165 @@ void R_DrawPortals(void) } } */ - 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) - { - 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 + if (portal->numpoints <= 256) { - 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; - - 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; + int i; + msurface_t *s; + model_t *model; + vec3_t modelorg; - VectorCopy (r_origin, modelorg); + // because bmodels can be reused, we have to decide which things to render + // from scratch every time - currententity = &clworldent; + model = currentrenderentity->model; - softwaretransformidentity(); // LordHavoc: clear transform + softwaretransformforentity (currentrenderentity); + softwareuntransform(r_origin, modelorg); - if (cl.worldmodel) + for (i = 0;i < model->nummodelsurfaces;i++) { - if (r_novis.value || r_viewleaf->compressed_vis == NULL) - R_SolidWorldNode (); + s = model->modelsortedsurfaces[i]; + if (((s->flags & SURF_PLANEBACK) == 0) == (PlaneDiff(modelorg, s->plane) >= 0)) + s->visframe = r_framecount; else - { -// R_MarkLeaves (); - R_PVSWorldNode (); - } + s->visframe = -1; + s->worldnodeframe = -1; + s->lightframe = -1; + s->dlightframe = -1; + s->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); - } - } - - for (i = 0;i < w;i++) - allocated[texnum][*x + i] = best + h; + // there is only one instance of the world, but it can be rendered in + // multiple stages - 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(); } +static void R_SurfMarkLights (void) +{ + int i; + msurface_t *s; -//int nColinElim; + if (r_dynamic.integer) + R_MarkLights(); -/* -================ -BuildSurfaceDisplayList -================ -*/ -void BuildSurfaceDisplayList (model_t *model, mvertex_t *vertices, msurface_t *fa) -{ - 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]; - - 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; - } - - // - // 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)) + s = currentrenderentity->model->modelsortedsurfaces[i]; + if (s->visframe == r_framecount && s->lightmaptexture != NULL) { - int j; - for (j = i + 1; j < lnumverts; ++j) + if (s->cached_dlight + || s->cached_ambient != r_ambient.value + || s->cached_lightscalebit != lightscalebit) + R_BuildLightMap(s, false); // base lighting changed + else if (r_dynamic.integer) { - int k; - for (k = 0; k < VERTEXSIZE; ++k) - poly->verts[j - 1][k] = poly->verts[j][k]; + if (s->styles[0] != 255 && (d_lightstylevalue[s->styles[0]] != s->cached_light[0] + || (s->styles[1] != 255 && (d_lightstylevalue[s->styles[1]] != s->cached_light[1] + || (s->styles[2] != 255 && (d_lightstylevalue[s->styles[2]] != s->cached_light[2] + || (s->styles[3] != 255 && (d_lightstylevalue[s->styles[3]] != s->cached_light[3])))))))) + //if (s->cached_light[0] != d_lightstylevalue[s->styles[0]] + // || s->cached_light[1] != d_lightstylevalue[s->styles[1]] + // || s->cached_light[2] != d_lightstylevalue[s->styles[2]] + // || s->cached_light[3] != d_lightstylevalue[s->styles[3]]) + R_BuildLightMap(s, false); // base lighting changed + else if (s->dlightframe == r_framecount && r_dlightmap.integer) + R_BuildLightMap(s, true); // only dlights } - --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_framecount = 1; // no dlightcache - - if (gl_nosubimagefragments.value) - nosubimagefragments = 1; - else - nosubimagefragments = 0; + R_PrepareSurfaces(); + R_DrawSurfaces(SHADERSTAGE_SKY); +} - if (gl_nosubimage.value) - nosubimage = 1; - else - nosubimage = 0; +void R_DrawBrushModelNormal (void) +{ + c_bmodels++; - if (gl_lightmaprgba.value) - { - lightmaprgba = true; - lightmapbytes = 4; - } - else - { - lightmaprgba = false; - lightmapbytes = 3; - } + // have to flush queue because of possible lightmap reuse + R_Mesh_Render(); - // 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_SetupForBModelRendering(); - if (!lightmap_textures) - lightmap_textures = R_GetTextureSlots(MAX_LIGHTMAPS); + R_SurfMarkLights(); - 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); - } - } + R_PrepareSurfaces(); - 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); - } + if (!skyrendermasked) + R_DrawSurfaces(SHADERSTAGE_SKY); + R_DrawSurfaces(SHADERSTAGE_NORMAL); + R_DrawSurfaces(SHADERSTAGE_FOG); } -