X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=gl_rsurf.c;h=b0650a996f2bfb6e75d74b2e0f45cab8a2ee8a48;hb=83b77bee53d11d3e694f34e242e15cacdce188cd;hp=27cd761d4c08a0bf47eae9d796c7f1b47f190468;hpb=fa02ab7e4877633fa6e2e30d5bcf2600aaafc7d3;p=xonotic%2Fdarkplaces.git diff --git a/gl_rsurf.c b/gl_rsurf.c index 27cd761d..b0650a99 100644 --- a/gl_rsurf.c +++ b/gl_rsurf.c @@ -8,7 +8,7 @@ of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. @@ -21,77 +21,149 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "quakedef.h" -extern int skytexturenum; +#define MAX_LIGHTMAP_SIZE 256 -int lightmap_textures; +static signed int blocklights[MAX_LIGHTMAP_SIZE*MAX_LIGHTMAP_SIZE*3]; // LordHavoc: *3 for colored lighting -signed blocklights[18*18*3]; // LordHavoc: *3 for colored lighting +static byte templight[MAX_LIGHTMAP_SIZE*MAX_LIGHTMAP_SIZE*4]; -// LordHavoc: skinny but tall lightmaps for quicker subimage uploads -#define BLOCK_WIDTH 128 -#define BLOCK_HEIGHT 128 -// LordHavoc: increased lightmap limit from 64 to 1024 -#define MAX_LIGHTMAPS 1024 -#define LIGHTMAPSIZE (BLOCK_WIDTH*BLOCK_HEIGHT*4) +cvar_t r_ambient = {0, "r_ambient", "0"}; +cvar_t r_vertexsurfaces = {0, "r_vertexsurfaces", "0"}; +cvar_t r_dlightmap = {CVAR_SAVE, "r_dlightmap", "1"}; +cvar_t r_drawportals = {0, "r_drawportals", "0"}; +cvar_t r_testvis = {0, "r_testvis", "0"}; -int active_lightmaps; - -short allocated[MAX_LIGHTMAPS][BLOCK_WIDTH]; - -byte *lightmaps[MAX_LIGHTMAPS]; -short lightmapupdate[MAX_LIGHTMAPS][2]; - -int lightmapalign, lightmapalignmask; // LordHavoc: NVIDIA's broken subimage fix, see BuildLightmaps for notes -cvar_t gl_lightmapalign = {"gl_lightmapalign", "4"}; -cvar_t gl_lightmaprgba = {"gl_lightmaprgba", "0"}; -cvar_t gl_nosubimagefragments = {"gl_nosubimagefragments", "0"}; -cvar_t gl_nosubimage = {"gl_nosubimage", "0"}; -cvar_t r_ambient = {"r_ambient", "0"}; -cvar_t gl_vertex = {"gl_vertex", "0"}; -cvar_t gl_texsort = {"gl_texsort", "1"}; -//cvar_t gl_funnywalls = {"gl_funnywalls", "0"}; // LordHavoc: see BuildSurfaceDisplayList - -qboolean lightmaprgba, nosubimagefragments, nosubimage, skyisvisible; -int lightmapbytes; - -extern qboolean gl_arrays; - -extern int r_dlightframecount; +static void gl_surf_start(void) +{ +} -void gl_surf_start() +static void gl_surf_shutdown(void) { } -void gl_surf_shutdown() +static void gl_surf_newmap(void) { } -void GL_Surf_Init() +void GL_Surf_Init(void) { - int i; - for (i = 0;i < MAX_LIGHTMAPS;i++) - lightmaps[i] = NULL; - Cvar_RegisterVariable(&gl_lightmapalign); - Cvar_RegisterVariable(&gl_lightmaprgba); - Cvar_RegisterVariable(&gl_nosubimagefragments); - Cvar_RegisterVariable(&gl_nosubimage); Cvar_RegisterVariable(&r_ambient); -// Cvar_RegisterVariable(&gl_funnywalls); - Cvar_RegisterVariable(&gl_vertex); - Cvar_RegisterVariable(&gl_texsort); - // check if it's the glquake minigl driver - if (strncasecmp(gl_vendor,"3Dfx",4)==0) - if (!gl_arrays) + Cvar_RegisterVariable(&r_vertexsurfaces); + Cvar_RegisterVariable(&r_dlightmap); + Cvar_RegisterVariable(&r_drawportals); + Cvar_RegisterVariable(&r_testvis); + + R_RegisterModule("GL_Surf", gl_surf_start, gl_surf_shutdown, gl_surf_newmap); +} + +static int dlightdivtable[32768]; + +static int R_AddDynamicLights (msurface_t *surf) +{ + int sdtable[18], 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; + + // LordHavoc: use 64bit integer... shame it's not very standardized... +#if _MSC_VER || __BORLANDC__ + __int64 k; +#else + long long k; +#endif + + lit = false; + + if (!dlightdivtable[1]) { -// Cvar_SetValue("gl_nosubimagefragments", 1); -// Cvar_SetValue("gl_nosubimage", 1); - Cvar_SetValue("gl_lightmode", 0); + dlightdivtable[0] = 4194304; + for (s = 1; s < 32768; s++) + dlightdivtable[s] = 4194304 / (s << 7); } - R_RegisterModule("GL_Surf", gl_surf_start, gl_surf_shutdown); + smax = (surf->extents[0] >> 4) + 1; + tmax = (surf->extents[1] >> 4) + 1; + + for (lnum = 0; lnum < r_numdlights; lnum++) + { + if (!(surf->dlightbits[lnum >> 5] & (1 << (lnum & 31)))) + continue; // not lit by this light + + softwareuntransform(r_dlight[lnum].origin, local); +// VectorSubtract (r_dlight[lnum].origin, currentrenderentity->origin, local); + dist = DotProduct (local, surf->plane->normal) - surf->plane->dist; + + // for comparisons to minimum acceptable light + maxdist = (int) r_dlight[lnum].cullradius2; + + // already clamped, skip this + // clamp radius to avoid exceeding 32768 entry division table + //if (maxdist > 4194304) + // maxdist = 4194304; + + dist2 = dist * dist; + dist2 += LIGHTOFFSET; + if (dist2 >= maxdist) + continue; + + impact[0] = local[0] - surf->plane->normal[0] * dist; + impact[1] = local[1] - surf->plane->normal[1] * dist; + impact[2] = local[2] - surf->plane->normal[2] * dist; + + 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; + + maxdist3 = maxdist - dist2; + + // convert to 8.8 blocklights format + red = r_dlight[lnum].light[0]; + green = r_dlight[lnum].light[1]; + blue = r_dlight[lnum].light[2]; + subtract = (int) (r_dlight[lnum].lightsubtract * 4194304.0f); + bl = blocklights; + smax3 = smax * 3; + + 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) + { + bl[0] += (red * k) >> 8; + bl[1] += (green * k) >> 8; + bl[2] += (blue * k) >> 8; + lit = true; + } + } + bl += 3; + } + } + else // skip line + bl += smax3; + } + } + return lit; } -extern qboolean lighthalf; /* =============== R_BuildLightMap @@ -99,29 +171,31 @@ 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 t; - int i, j, size; - byte *lightmap; - int scale; - int maps; - int *bl; - - surf->cached_lighthalf = lighthalf; + int smax, tmax, i, j, size, size3, shift, scale, maps, *bl, stride, l; + byte *lightmap, *out; + + // update cached lighting info + surf->cached_dlight = 0; + surf->cached_lightscalebit = lightscalebit; surf->cached_ambient = r_ambient.value; + surf->cached_light[0] = d_lightstylevalue[surf->styles[0]]; + surf->cached_light[1] = d_lightstylevalue[surf->styles[1]]; + surf->cached_light[2] = d_lightstylevalue[surf->styles[2]]; + surf->cached_light[3] = d_lightstylevalue[surf->styles[3]]; smax = (surf->extents[0]>>4)+1; tmax = (surf->extents[1]>>4)+1; size = smax*tmax; + size3 = size*3; lightmap = surf->samples; // set to full bright if no light data - if (currententity->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) { - *bl++ = j; - *bl++ = j; - *bl++ = j; + 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 ; istyles[maps]], bl = blocklights, i = 0;i < size3;i++) *bl++ += *lightmap++ * scale; - *bl++ += *lightmap++ * scale; - } - } } - stride -= (smax*lightmapbytes); + bl = blocklights; - if (lighthalf) + out = templight; + // deal with lightmap brightness scale + shift = 7 + lightscalebit; + if (currentrenderentity->model->lightmaprgba) { - // LordHavoc: I shift down by 8 unlike GLQuake's 7, - // the image is brightened as a processing pass - if (lightmaprgba) - { - for (i=0 ; i> 8;if (t > 255) t = 255;else if (t < 0) t = 0;*dest++ = t; - t = *bl++ >> 8;if (t > 255) t = 255;else if (t < 0) t = 0;*dest++ = t; - t = *bl++ >> 8;if (t > 255) t = 255;else if (t < 0) t = 0;*dest++ = t; - *dest++ = 255; - } - } - } - else + stride = (surf->lightmaptexturestride - smax) * 4; + for (i = 0;i < tmax;i++, out += stride) { - for (i=0 ; i> 8;if (t > 255) t = 255;else if (t < 0) t = 0;*dest++ = t; - t = *bl++ >> 8;if (t > 255) t = 255;else if (t < 0) t = 0;*dest++ = t; - t = *bl++ >> 8;if (t > 255) t = 255;else if (t < 0) t = 0;*dest++ = t; - } + l = *bl++ >> shift;*out++ = min(l, 255); + l = *bl++ >> shift;*out++ = min(l, 255); + l = *bl++ >> shift;*out++ = min(l, 255); + *out++ = 255; } } } else { - if (lightmaprgba) - { - for (i=0 ; i> 7;if (t > 255) t = 255;else if (t < 0) t = 0;*dest++ = t; - t = *bl++ >> 7;if (t > 255) t = 255;else if (t < 0) t = 0;*dest++ = t; - t = *bl++ >> 7;if (t > 255) t = 255;else if (t < 0) t = 0;*dest++ = t; - *dest++ = 255; - } - } - } - else + stride = (surf->lightmaptexturestride - smax) * 3; + for (i = 0;i < tmax;i++, out += stride) { - for (i=0 ; i> 7;if (t > 255) t = 255;else if (t < 0) t = 0;*dest++ = t; - t = *bl++ >> 7;if (t > 255) t = 255;else if (t < 0) t = 0;*dest++ = t; - t = *bl++ >> 7;if (t > 255) t = 255;else if (t < 0) t = 0;*dest++ = t; - } + l = *bl++ >> shift;*out++ = min(l, 255); + l = *bl++ >> shift;*out++ = min(l, 255); + l = *bl++ >> shift;*out++ = min(l, 255); } } } -} -byte templight[32*32*4]; - -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 - { - smax = ((s->extents[0]>>4)+lightmapalign) & lightmapalignmask; - tmax = (s->extents[1]>>4)+1; - if (lightmaprgba) - { - 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); - } - else - { - R_BuildLightMap (s, templight, smax * 3); - if(r_upload.value) - glTexSubImage2D(GL_TEXTURE_2D, 0, s->light_s, s->light_t, smax, tmax, GL_RGB , GL_UNSIGNED_BYTE, templight); - } - } + R_UpdateTexture(surf->lightmaptexture, templight); } - /* =============== R_TextureAnimation @@ -263,43 +273,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->frame) - { - if (base->alternate_anims) - base = base->alternate_anims; - } - - if (!base->anim_total) + if (base->anim_total < 2) return base; - original = base; - - relative = (int)(cl.time*10) % 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]; } +*/ /* @@ -311,129 +297,217 @@ texture_t *R_TextureAnimation (texture_t *base) */ -extern int solidskytexture; -extern int alphaskytexture; -extern float speedscale; // for top sky and bottom sky - -extern char skyname[]; - -void R_DynamicLightPoint(vec3_t color, vec3_t org, int *dlightbits); -float turbsin[256] = +static float turbsin[256] = { #include "gl_warp_sin.h" }; #define TURBSCALE (256.0 / (2 * M_PI)) +#define MAX_SURFVERTS 1024 +typedef struct +{ + 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 -void UploadLightmaps() +static int RSurfShader_Sky(int stage, msurface_t *s) { - int i; - if (nosubimage || nosubimagefragments) + int i; + float number, length, dir[3], speedscale; + surfvertex_t *v; + surfvert_t *sv; + rmeshinfo_t m; + + // LordHavoc: HalfLife maps have freaky skypolys... + if (currentrenderentity->model->ishlbsp) + return true; + + if (stage == 0) { - for (i = 0;i < MAX_LIGHTMAPS;i++) + if (skyrendermasked) { - if (lightmapupdate[i][0] < lightmapupdate[i][1]) + if (skyrendernow) { - 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])); - } - } + skyrendernow = false; + R_Sky(); + } + // draw depth-only polys + memset(&m, 0, sizeof(m)); + m.transparent = false; + m.blendfunc1 = GL_ZERO; + m.blendfunc2 = GL_ONE; + m.depthwrite = true; + m.numtriangles = s->mesh.numtriangles; + m.numverts = s->mesh.numverts; + m.index = s->mesh.index; + //m.cr = 0; + //m.cg = 0; + //m.cb = 0; + //m.ca = 0; + if (softwaretransform_complexity) + { + m.vertex = &svert[0].v[0]; + m.vertexstep = sizeof(surfvert_t); + for (i = 0, sv = svert, v = s->mesh.vertex;i < m.numverts;i++, sv++, v++) + softwaretransform(v->v, sv->v); + } + else + { + m.vertex = &s->mesh.vertex[0].v[0]; + m.vertexstep = sizeof(surfvertex_t); } - lightmapupdate[i][0] = BLOCK_HEIGHT; - lightmapupdate[i][1] = 0; + R_Mesh_Draw(&m); } - } -} - -float wvert[1024*6]; // used by the following functions - -void RSurf_DrawSky(msurface_t *s, int transform) -{ - glpoly_t *p; - int i; - float *v; - for (p=s->polys ; p ; p=p->next) - { - if (currentskypoly < MAX_SKYPOLYS && currentskyvert + p->numverts <= MAX_SKYVERTS) + else if (skyrenderglquake) { - skypoly[currentskypoly].firstvert = currentskyvert; - skypoly[currentskypoly++].verts = p->numverts; - if (transform) + 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 (i = 0,v = p->verts[0];i < p->numverts;i++, v += VERTEXSIZE) - { - softwaretransform(v, skyvert[currentskyvert].v); - currentskyvert++; - } + softwaretransform(v->v, sv->v); + VectorSubtract (sv->v, r_origin, dir); + // flatten the sphere + dir[2] *= 3; + + number = DotProduct(dir, dir); + #if SLOWMATH + length = 3.0f / sqrt(number); + #else + *((long *)&length) = 0x5f3759df - ((* (long *) &number) >> 1); + length = 3.0f * (length * (1.5f - (number * 0.5f * length * length))); + #endif + + sv->st[0] = speedscale + dir[0] * length; + sv->st[1] = speedscale + dir[1] * length; + } + R_Mesh_Draw(&m); + } + else + { + // flat color + memset(&m, 0, sizeof(m)); + m.transparent = false; + m.blendfunc1 = GL_ONE; + m.blendfunc2 = GL_ZERO; + m.numtriangles = s->mesh.numtriangles; + m.numverts = s->mesh.numverts; + m.index = s->mesh.index; + m.cr = fogcolor[0]; + m.cg = fogcolor[1]; + m.cb = fogcolor[2]; + m.ca = 1; + if (softwaretransform_complexity) + { + m.vertex = &svert[0].v[0]; + m.vertexstep = sizeof(surfvert_t); + for (i = 0, sv = svert, v = s->mesh.vertex;i < m.numverts;i++, sv++, v++) + softwaretransform(v->v, sv->v); } else { - for (i = 0,v = p->verts[0];i < p->numverts;i++, v += VERTEXSIZE) - { - skyvert[currentskyvert].v[0] = v[0]; - skyvert[currentskyvert].v[1] = v[1]; - skyvert[currentskyvert++].v[2] = v[2]; - } + m.vertex = &s->mesh.vertex[0].v[0]; + m.vertexstep = sizeof(surfvertex_t); + } + R_Mesh_Draw(&m); + } + return false; + } + else if (stage == 1) + { + if (skyrenderglquake && !r_mergesky.integer) + { + memset(&m, 0, sizeof(m)); + m.transparent = false; + m.blendfunc1 = GL_SRC_ALPHA; + m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA; + m.numtriangles = s->mesh.numtriangles; + m.numverts = s->mesh.numverts; + m.index = s->mesh.index; + m.vertex = &svert[0].v[0]; + m.vertexstep = sizeof(surfvert_t); + m.cr = 1; + m.cg = 1; + m.cb = 1; + m.ca = 1; + m.tex[0] = R_GetTexture(alphaskytexture); + m.texcoords[0] = &svert[0].st[0]; + m.texcoordstep[0] = sizeof(surfvert_t); + speedscale = cl.time * (16.0/128.0); + speedscale -= (int)speedscale; + for (i = 0, sv = svert, v = s->mesh.vertex;i < m.numverts;i++, sv++, v++) + { + softwaretransform(v->v, sv->v); + VectorSubtract (sv->v, r_origin, dir); + // flatten the sphere + dir[2] *= 3; + + number = DotProduct(dir, dir); + #if SLOWMATH + length = 3.0f / sqrt(number); + #else + *((long *)&length) = 0x5f3759df - ((* (long *) &number) >> 1); + length = 3.0f * (length * (1.5f - (number * 0.5f * length * length))); + #endif + + sv->st[0] = speedscale + dir[0] * length; + sv->st[1] = speedscale + dir[1] * length; } + R_Mesh_Draw(&m); + return false; } + return true; } + else + return true; } -int RSurf_Light(int *dlightbits, glpoly_t *polys) +static int RSurf_Light(int *dlightbits, int numverts) { - float cr, cg, cb, radius, radius2, f, *v, *wv; - int i, a, b, lit = false; - unsigned int c, d; - dlight_t *light; - vec_t *lightorigin; - glpoly_t *p; - for (a = 0;a < 8;a++) + float f; + int i, l, lit = false; + rdlight_t *rd; + vec3_t lightorigin; + surfvert_t *sv; + for (l = 0;l < r_numdlights;l++) { - if ((c = dlightbits[a])) + if (dlightbits[l >> 5] & (1 << (l & 31))) { - for (b = 0, d = 1;c;b++, d <<= 1) + rd = &r_dlight[l]; + // FIXME: support softwareuntransform here and make bmodels use hardware transform? + VectorCopy(rd->origin, lightorigin); + for (i = 0, sv = svert;i < numverts;i++, sv++) { - if (c & d) + f = VectorDistance2(sv->v, lightorigin) + LIGHTOFFSET; + if (f < rd->cullradius2) { - c -= d; - light = &cl_dlights[a * 32 + b]; - lightorigin = light->origin; - cr = light->color[0]; - cg = light->color[1]; - cb = light->color[2]; - radius = light->radius*light->radius*LIGHTSCALE; - radius2 = radius * (256.0f / LIGHTSCALE); - wv = wvert; - for (p = polys;p;p = p->next) - { - for (i = 0, v = p->verts[0];i < p->numverts;i++, v += VERTEXSIZE) - { - f = VectorDistance2(wv, lightorigin); - if (f < radius) - { - f = radius2 / (f + LIGHTOFFSET); - wv[3] += cr * f; - wv[4] += cg * f; - wv[5] += cb * f; - lit = true; - } - wv += 6; - } - } + f = (1.0f / f) - rd->lightsubtract; + sv->c[0] += rd->light[0] * f; + sv->c[1] += rd->light[1] * f; + sv->c[2] += rd->light[2] * f; + lit = true; } } } @@ -441,355 +515,911 @@ int RSurf_Light(int *dlightbits, glpoly_t *polys) return lit; } -void RSurf_DrawWater(msurface_t *s, texture_t *t, int transform, int alpha) +static void RSurfShader_Water_Pass_Base(msurface_t *s) { - int i; - float os = turbsin[(int)(realtime * TURBSCALE) & 255], ot = turbsin[(int)(realtime * TURBSCALE + 96.0) & 255]; - glpoly_t *p; - float *wv, *v; - wv = wvert; - for (p = s->polys;p;p = p->next) + int i; + float diff[3], alpha, ifog; + surfvertex_t *v; + surfvert_t *sv; + rmeshinfo_t m; + alpha = s->flags & SURF_DRAWNOALPHA ? 1 : r_wateralpha.value; + + memset(&m, 0, sizeof(m)); + if (alpha != 1 || s->currenttexture->fogtexture != NULL) + { + m.transparent = true; + m.blendfunc1 = GL_SRC_ALPHA; + m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA; + } + else + { + m.transparent = false; + m.blendfunc1 = GL_SRC_ALPHA; + 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++) { - for (i = 0, v = p->verts[0];i < p->numverts;i++, v += VERTEXSIZE) + 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) { - 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)+realtime) * TURBSCALE) & 255] * turbsin[(int)((wv[1]*(1.0f/32.0f)+realtime) * TURBSCALE) & 255] * (1.0f / 64.0f); - wv[3] = wv[4] = wv[5] = 128.0f; - wv += 6; + sv->c[0] = 1; + sv->c[1] = 1; + sv->c[2] = 1; + sv->c[3] = alpha; + } + else + { + sv->c[0] = 0.5f; + sv->c[1] = 0.5f; + sv->c[2] = 0.5f; + sv->c[3] = alpha; } + sv->st[0] = (v->st[0] + turbsin[(int)((v->st[1]*0.125f+cl.time) * TURBSCALE) & 255]) * (1.0f / 64.0f); + sv->st[1] = (v->st[1] + turbsin[(int)((v->st[0]*0.125f+cl.time) * TURBSCALE) & 255]) * (1.0f / 64.0f); } - if (s->dlightframe == r_dlightframecount && r_dynamic.value) - RSurf_Light(s->dlightbits, s->polys); - wv = wvert; - // FIXME: make fog texture if water texture is transparent? - for (p=s->polys ; p ; p=p->next) + if (s->dlightframe == r_framecount && !(s->flags & SURF_DRAWFULLBRIGHT)) + RSurf_Light(s->dlightbits, m.numverts); + if (fogenabled) { - transpolybegin(t->gl_texturenum, t->gl_glowtexturenum, 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(); + 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_DrawWall(msurface_t *s, texture_t *t, int transform) +static void RSurfShader_Water_Pass_Glow(msurface_t *s) { - int i, lit = false, polys = 0, verts = 0; - float *v, *wv; - glpoly_t *p; - wallpoly_t *wp; - wallvert_t *out; - // check for lightmap modification - if (r_dynamic.value) + int i; + float diff[3], alpha, ifog; + surfvertex_t *v; + surfvert_t *sv; + rmeshinfo_t m; + 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) { - if (r_ambient.value != s->cached_ambient || lighthalf != s->cached_lighthalf - || (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); + m.color = &svert[0].c[0]; + m.colorstep = sizeof(surfvert_t); + for (i = 0, sv = svert, v = s->mesh.vertex;i < m.numverts;i++, sv++, v++) + { + softwaretransform(v->v, sv->v); + if (r_waterripple.value) + sv->v[2] += r_waterripple.value * (1.0f / 64.0f) * turbsin[(int)((v->v[0]*(1.0f/32.0f)+cl.time) * TURBSCALE) & 255] * turbsin[(int)((v->v[1]*(1.0f/32.0f)+cl.time) * TURBSCALE) & 255]; + sv->st[0] = (v->st[0] + turbsin[(int)((v->st[1]*0.125f+cl.time) * TURBSCALE) & 255]) * (1.0f / 64.0f); + sv->st[1] = (v->st[1] + turbsin[(int)((v->st[0]*0.125f+cl.time) * TURBSCALE) & 255]) * (1.0f / 64.0f); + VectorSubtract(sv->v, r_origin, diff); + ifog = 1 - exp(fogdensity/DotProduct(diff, diff)); + sv->c[0] = m.cr * ifog; + sv->c[1] = m.cg * ifog; + sv->c[2] = m.cb * ifog; + sv->c[3] = m.ca; + } } - wv = wvert; - for (p = s->polys;p;p = p->next) + else { - for (i = 0, v = p->verts[0];i < p->numverts;i++, v += VERTEXSIZE) + 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] = 0.0f; - 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); } - verts += p->numverts; - polys++; } - if ((currentwallpoly + polys > MAX_WALLPOLYS) || (currentwallvert+verts > MAX_WALLVERTS)) - return; - if (s->dlightframe == r_dlightframecount && r_dynamic.value) - lit = RSurf_Light(s->dlightbits, s->polys); - wv = wvert; - wp = &wallpoly[currentwallpoly]; - out = &wallvert[currentwallvert]; - currentwallpoly += polys; - for (p = s->polys;p;p = p->next) + 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 = 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++) { - v = p->verts[0]; - wp->texnum = (unsigned short) t->gl_texturenum; - wp->lighttexnum = (unsigned short) (lightmap_textures + s->lightmaptexturenum); - wp->glowtexnum = (unsigned short) t->gl_glowtexturenum; - 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++) + softwaretransform(v->v, sv->v); + if (r_waterripple.value) + sv->v[2] += r_waterripple.value * (1.0f / 64.0f) * turbsin[(int)((v->v[0]*(1.0f/32.0f)+cl.time) * TURBSCALE) & 255] * turbsin[(int)((v->v[1]*(1.0f/32.0f)+cl.time) * TURBSCALE) & 255]; + if (m.tex[0]) { - if (lit) - { - if (lighthalf) - { - out->r = (byte) (bound(0, (int) wv[3] >> 1, 255)); - out->g = (byte) (bound(0, (int) wv[4] >> 1, 255)); - out->b = (byte) (bound(0, (int) wv[5] >> 1, 255)); - out->a = 255; - } - else - { - out->r = (byte) (bound(0, (int) wv[3], 255)); - out->g = (byte) (bound(0, (int) wv[4], 255)); - out->b = (byte) (bound(0, (int) wv[5], 255)); - out->a = 255; - } - } - out->vert[0] = wv[0]; - out->vert[1] = wv[1]; - out->vert[2] = wv[2]; - out->s = v[3]; - out->t = v[4]; - out->u = v[5]; - out->v = v[6]; + 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); } -// LordHavoc: transparent brush models -extern int r_dlightframecount; -extern float modelalpha; +static int RSurfShader_Water(int stage, msurface_t *s) +{ + 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) + { + RSurfShader_Water_Pass_Fog(s); + return false; + } + else + return true; + default: + return true; + } +} -void RSurf_DrawWallVertex(msurface_t *s, texture_t *t, int transform, int isbmodel) +static void RSurfShader_Wall_Pass_BaseMTex(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) + 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 (currentrenderentity != &cl_entities[0].render && (s->currenttexture->fogtexture != NULL || currentrenderentity->alpha != 1)) { - for (i = 0, v = p->verts[0];i < p->numverts;i++, v += VERTEXSIZE) + m.transparent = true; + m.blendfunc1 = GL_SRC_ALPHA; + m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA; + } + else + { + m.transparent = false; + m.blendfunc1 = GL_ONE; + m.blendfunc2 = GL_ZERO; + } + m.numtriangles = s->mesh.numtriangles; + m.numverts = s->mesh.numverts; + m.index = s->mesh.index; + m.cr = 1; + if (lighthalf) + m.cr *= 2; + if (gl_combine.integer) + m.cr *= 4; + m.cg = m.cr; + m.cb = m.cr; + m.ca = 1; + 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) { - 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) + 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++) { - 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; - } - } - } + 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; } - wv += 6; } - } - if (s->dlightframe == r_dlightframecount && r_dynamic.value) - RSurf_Light(s->dlightbits, s->polys); - wv = wvert; - if (isbmodel && (currententity->colormod[0] != 1 || currententity->colormod[1] != 1 || currententity->colormod[2] != 1)) - { - for (p = s->polys;p;p = p->next) + else { - v = p->verts[0]; - transpolybegin(t->gl_texturenum, t->gl_glowtexturenum, 0, currententity->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->colormod[0], wv[4] * currententity->colormod[1], wv[5] * currententity->colormod[2], alpha); - transpolyend(); + 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 { - for (p = s->polys;p;p = p->next) + 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 { - v = p->verts[0]; - transpolybegin(t->gl_texturenum, t->gl_glowtexturenum, 0, currententity->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(); + m.vertex = &s->mesh.vertex->v[0]; + m.vertexstep = sizeof(surfvertex_t); } } + R_Mesh_Draw(&m); } -/* -================ -DrawTextureChains -================ -*/ -extern qboolean hlbsp; -extern char skyname[]; -void R_DrawSurf(msurface_t *s, int isbmodel, int vertexlit) +static void RSurfShader_Wall_Pass_BaseTexture(msurface_t *s) { - texture_t *t; - if (s->flags & SURF_DRAWSKY) + 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; + if (lighthalf) { - skyisvisible = true; - if (!hlbsp) // LordHavoc: HalfLife maps have freaky skypolys... - RSurf_DrawSky(s, false); - return; + m.cr = 2; + m.cg = 2; + m.cb = 2; } - t = R_TextureAnimation (s->texinfo->texture); - if (s->flags & SURF_DRAWTURB) + else { - RSurf_DrawWater(s, t, false, s->flags & SURF_DRAWNOALPHA ? 255 : r_wateralpha.value*255.0f); - return; + m.cr = 1; + m.cg = 1; + m.cb = 1; + } + 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); } - if (vertexlit) - RSurf_DrawWallVertex(s, t, false, false); else - RSurf_DrawWall(s, t, false); + { + m.vertex = &s->mesh.vertex->v[0]; + m.vertexstep = sizeof(surfvertex_t); + } + R_Mesh_Draw(&m); } -void DrawTextureChains (void) +static void RSurfShader_Wall_Pass_BaseLightmap(msurface_t *s) { - int n; - msurface_t *s; - texture_t *t; - - for (n = 0;n < cl.worldmodel->numtextures;n++) + 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 = 1; + if (lighthalf) + m.cr *= 2.0f; + m.cg = m.cr; + m.cb = m.cr; + 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) { - if (!cl.worldmodel->textures[n] || !(s = cl.worldmodel->textures[n]->texturechain)) - continue; - cl.worldmodel->textures[n]->texturechain = NULL; -// for (;s;s = s->texturechain) -// R_DrawSurf(s, false, gl_vertex.value); - // LordHavoc: decide the render type only once, because the surface properties were determined by texture anyway - // sky - if (s->flags & SURF_DRAWSKY) + m.color = &svert[0].c[0]; + m.colorstep = sizeof(surfvert_t); + if (softwaretransform_complexity) { - skyisvisible = true; - if (!hlbsp) // LordHavoc: HalfLife maps have freaky skypolys... - for (;s;s = s->texturechain) - RSurf_DrawSky(s, false); - continue; + 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; + } } - t = R_TextureAnimation (cl.worldmodel->textures[n]); - // subdivided water surface warp - if (s->flags & SURF_DRAWTURB) + } + else + { + if (softwaretransform_complexity) { - int alpha = s->flags & SURF_DRAWNOALPHA ? 255 : r_wateralpha.value*255.0f; - for (;s;s = s->texturechain) - RSurf_DrawWater(s, t, false, alpha); - continue; + 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); } - if (gl_vertex.value) - for (;s;s = s->texturechain) - RSurf_DrawWallVertex(s, t, false, false); else - for (;s;s = s->texturechain) - RSurf_DrawWall(s, t, false); + { + m.vertex = &s->mesh.vertex->v[0]; + m.vertexstep = sizeof(surfvertex_t); + } } + R_Mesh_Draw(&m); } -void R_NoVisMarkLights (vec3_t lightorigin, dlight_t *light, int bit, int bitindex, model_t *model); - -/* -================= -R_DrawBrushModel -================= -*/ -void R_DrawBrushModel (entity_t *e) +static void RSurfShader_Wall_Pass_BaseVertex(msurface_t *s) { - int i; - vec3_t mins, maxs; - msurface_t *s; - model_t *clmodel; - int rotated, vertexlit = false; - texture_t *t; - vec3_t org; + int i, size3; + float c[3], base[3], scale, diff[3], ifog; + surfvertex_t *v; + surfvert_t *sv; + rmeshinfo_t m; + byte *lm; - currententity = e; + size3 = ((s->extents[0]>>4)+1)*((s->extents[1]>>4)+1)*3; - clmodel = e->model; + base[0] = base[1] = base[2] = r_ambient.value * (1.0f / 128.0f); - if (e->angles[0] || e->angles[1] || e->angles[2]) + memset(&m, 0, sizeof(m)); + if (currentrenderentity->effects & EF_ADDITIVE) { - rotated = true; - for (i=0 ; i<3 ; i++) - { - mins[i] = e->origin[i] - clmodel->radius; - maxs[i] = e->origin[i] + clmodel->radius; - } + m.transparent = true; + m.blendfunc1 = GL_SRC_ALPHA; + m.blendfunc2 = GL_ONE; + } + else if (currentrenderentity != &cl_entities[0].render && (s->currenttexture->fogtexture != NULL || currentrenderentity->alpha != 1)) + { + m.transparent = true; + m.blendfunc1 = GL_SRC_ALPHA; + m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA; } else { - rotated = false; - VectorAdd (e->origin, clmodel->mins, mins); - VectorAdd (e->origin, clmodel->maxs, maxs); + m.transparent = false; + m.blendfunc1 = GL_ONE; + m.blendfunc2 = GL_ZERO; } + m.numtriangles = s->mesh.numtriangles; + m.numverts = s->mesh.numverts; + m.index = s->mesh.index; + m.vertex = &svert[0].v[0]; + m.vertexstep = sizeof(surfvert_t); + m.color = &svert[0].c[0]; + m.colorstep = sizeof(surfvert_t); + m.tex[0] = R_GetTexture(s->currenttexture->texture); + m.texcoords[0] = &s->mesh.vertex->st[0]; + m.texcoordstep[0] = sizeof(surfvertex_t); + for (i = 0, sv = svert, v = s->mesh.vertex;i < m.numverts;i++, sv++, v++) + { + softwaretransform(v->v, sv->v); + VectorCopy(base, c); + if (s->styles[0] != 255) + { + 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) + { + lm += size3; + scale = d_lightstylevalue[s->styles[1]] * (1.0f / 32768.0f); + VectorMA(c, scale, lm, c); + if (s->styles[2] != 255) + { + lm += size3; + scale = d_lightstylevalue[s->styles[2]] * (1.0f / 32768.0f); + VectorMA(c, scale, lm, c); + if (s->styles[3] != 255) + { + lm += size3; + scale = d_lightstylevalue[s->styles[3]] * (1.0f / 32768.0f); + VectorMA(c, scale, lm, c); + } + } + } + } + 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; + } + } + R_Mesh_Draw(&m); +} - if (R_CullBox (mins, maxs)) - return; - - VectorSubtract (r_refdef.vieworg, e->origin, modelorg); - if (rotated) +static void RSurfShader_Wall_Pass_BaseFullbright(msurface_t *s) +{ + 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 (currentrenderentity != &cl_entities[0].render && (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 { - vec3_t temp; - vec3_t forward, right, up; - - VectorCopy (modelorg, temp); - AngleVectors (e->angles, forward, right, up); - modelorg[0] = DotProduct (temp, forward); - modelorg[1] = -DotProduct (temp, right); - modelorg[2] = DotProduct (temp, up); + 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); +} - s = &clmodel->surfaces[clmodel->firstmodelsurface]; +static void RSurfShader_Wall_Pass_Light(msurface_t *s) +{ + 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 (currentrenderentity != &cl_entities[0].render && (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); + } +} -// calculate dynamic lighting for bmodel if it's not an -// instanced model - for (i = 0;i < MAX_DLIGHTS;i++) +static void RSurfShader_Wall_Pass_Glow(msurface_t *s) +{ + 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 (currentrenderentity != &cl_entities[0].render && (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) { - if ((cl_dlights[i].die < cl.time) || (!cl_dlights[i].radius)) - continue; + 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); +} + +static void RSurfShader_Wall_Pass_Fog(msurface_t *s) +{ + 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 (currentrenderentity != &cl_entities[0].render && (s->currenttexture->fogtexture != NULL || currentrenderentity->alpha != 1)) + m.transparent = true; + else + m.transparent = false; + m.blendfunc1 = GL_SRC_ALPHA; + m.blendfunc2 = GL_ONE; + m.numtriangles = s->mesh.numtriangles; + m.numverts = s->mesh.numverts; + m.index = s->mesh.index; + m.color = &svert[0].c[0]; + m.colorstep = sizeof(surfvert_t); + m.tex[0] = R_GetTexture(s->currenttexture->fogtexture); + m.texcoords[0] = &s->mesh.vertex->st[0]; + m.texcoordstep[0] = sizeof(surfvertex_t); + if (softwaretransform_complexity) + { + m.vertex = &svert[0].v[0]; + m.vertexstep = sizeof(surfvert_t); + for (i = 0, sv = svert, v = s->mesh.vertex;i < m.numverts;i++, sv++, v++) + { + 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); +} - VectorSubtract(cl_dlights[i].origin, currententity->origin, org); - R_NoVisMarkLights (org, &cl_dlights[i], 1<<(i&31), i >> 5, clmodel); +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; } - vertexlit = modelalpha != 1 || clmodel->firstmodelsurface == 0 || (currententity->effects & EF_FULLBRIGHT) || currententity->colormod[0] != 1 || currententity->colormod[2] != 1 || currententity->colormod[2] != 1; +} -e->angles[0] = -e->angles[0]; // stupid quake bug - softwaretransformforentity (e); -e->angles[0] = -e->angles[0]; // stupid quake bug +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; + } +} - // draw texture - for (i = 0;i < clmodel->nummodelsurfaces;i++, s++) +static int RSurfShader_Wall_Lightmap(int stage, msurface_t *s) +{ + if (r_vertexsurfaces.integer) { - if (((s->flags & SURF_PLANEBACK) == 0) == (PlaneDiff(modelorg, s->plane) >= 0)) + 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) { -// R_DrawSurf(s, true, vertexlit || s->texinfo->texture->transparent); - if (s->flags & SURF_DRAWSKY) + switch(stage) { - RSurf_DrawSky(s, true); - continue; + 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; } - t = R_TextureAnimation (s->texinfo->texture); - if (s->flags & SURF_DRAWTURB) + } + else + { + switch(stage) { - RSurf_DrawWater(s, t, true, s->flags & SURF_DRAWNOALPHA ? 255 : r_wateralpha.value*255.0f); - continue; + 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 (currentrenderentity != &cl_entities[0].render && (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 + { + if (r_dlightmap.integer) + { + 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; } - if (vertexlit || s->texinfo->texture->transparent) - RSurf_DrawWallVertex(s, t, true, true); - else - RSurf_DrawWall(s, t, true); } + else + { + switch(stage) + { + 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; + } + } + } +} + +static int RSurfShader_Wall_Fog(int stage, msurface_t *s) +{ + if (stage == 0 && fogenabled) + { + RSurfShader_Wall_Pass_Fog(s); + return false; } - UploadLightmaps(); + else + return true; } /* @@ -800,581 +1430,597 @@ e->angles[0] = -e->angles[0]; // stupid quake bug ============================================================= */ -void R_StoreEfrags (efrag_t **ppefrag); - -struct nodestack_s +static void RSurf_Callback(void *data, void *junk) { - int side; - mnode_t *node; -} nodestack[8192]; + ((msurface_t *)data)->visframe = r_framecount; +} -/* -================ -R_WorldNode -================ -*/ -void R_WorldNode () +static void R_SolidWorldNode (void) { - int side, texsort, vertex; - struct nodestack_s *nstack; - mnode_t *node; - mleaf_t *pleaf; - msurface_t *surf, *endsurf, **mark, **endmark; - nstack = nodestack; - texsort = gl_texsort.value; - vertex = gl_vertex.value; - - if (!(node = cl.worldmodel->nodes)) - return; - - while(1) + if (r_viewleaf->contents != CONTENTS_SOLID) { - // if a leaf node, draw stuff - if (node->contents < 0) + int portalstack; + mportal_t *p, *pstack[8192]; + msurface_t *surf, **mark, **endmark; + mleaf_t *leaf; + tinyplane_t plane; + // LordHavoc: portal-passage worldnode; follows portals leading + // outward from viewleaf, if a portal leads offscreen it is not + // followed, in indoor maps this can often cull a great deal of + // geometry away when pvs data is not present (useful with pvs as well) + + leaf = r_viewleaf; + leaf->worldnodeframe = r_framecount; + portalstack = 0; + loc0: + c_leafs++; + + leaf->visframe = r_framecount; + + if (leaf->nummarksurfaces) { - if (node->contents != CONTENTS_SOLID) + mark = leaf->firstmarksurface; + endmark = mark + leaf->nummarksurfaces; + if (r_ser.integer) { - pleaf = (mleaf_t *)node; - - c_leafs++; - if (pleaf->nummarksurfaces) + do { - mark = pleaf->firstmarksurface; - endmark = mark + pleaf->nummarksurfaces; - do + surf = *mark++; + // make sure surfaces are only processed once + if (surf->worldnodeframe == r_framecount) + continue; + surf->worldnodeframe = r_framecount; + if (PlaneDist(r_origin, surf->plane) < surf->plane->dist) + { + if (surf->flags & SURF_PLANEBACK) + { + VectorNegate(surf->plane->normal, plane.normal); + plane.dist = -surf->plane->dist; + R_Clip_AddPolygon((float *)surf->poly_verts, surf->poly_numverts, sizeof(float[3]), (surf->flags & SURF_CLIPSOLID) != 0, RSurf_Callback, surf, NULL, &plane); + } + } + else { - (*mark)->visframe = r_framecount; - mark++; + if (!(surf->flags & SURF_PLANEBACK)) + R_Clip_AddPolygon((float *)surf->poly_verts, surf->poly_numverts, sizeof(float[3]), (surf->flags & SURF_CLIPSOLID) != 0, RSurf_Callback, surf, NULL, (tinyplane_t *)surf->plane); } - while (mark < endmark); } - - // deal with model fragments in this leaf - if (pleaf->efrags) - R_StoreEfrags (&pleaf->efrags); + 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); } - - if (nstack <= nodestack) - break; - nstack--; - node = nstack->node; - side = nstack->side; - goto loc0; } - c_nodes++; - - // node is just a decision point, so go down the apropriate sides - - // find which side of the node we are on - side = PlaneDist(modelorg, node->plane) < node->plane->dist; - - // recurse down the children, front side first - if (node->children[side]->visframe == r_visframecount && R_NotCulledBox(node->children[side]->minmaxs, node->children[side]->minmaxs+3)) + // follow portals into other leafs + p = leaf->portals; + for (;p;p = p->next) { - nstack->node = node; - nstack->side = !side; // go down back side when we come back up - nstack++; - node = node->children[side]; - continue; + if (DotProduct(r_origin, p->plane.normal) < p->plane.dist) + { + leaf = p->past; + if (leaf->worldnodeframe != r_framecount) + { + leaf->worldnodeframe = r_framecount; + if (leaf->contents != CONTENTS_SOLID) + { + if (R_NotCulledBox(leaf->mins, leaf->maxs)) + { + p->visframe = r_framecount; + pstack[portalstack++] = p; + goto loc0; + + loc1: + p = pstack[--portalstack]; + } + } + } + } } - side = !side; -loc0: - // draw stuff - if (node->numsurfaces) + if (portalstack) + goto loc1; + } + else + { + mnode_t *nodestack[8192], *node = cl.worldmodel->nodes; + int nodestackpos = 0; + // LordHavoc: recursive descending worldnode; if portals are not + // available, this is a good last resort, can cull large amounts of + // geometry, but is more time consuming than portal-passage and renders + // things behind walls + +loc2: + if (R_NotCulledBox(node->mins, node->maxs)) { - surf = cl.worldmodel->surfaces + node->firstsurface; - endsurf = surf + node->numsurfaces; - - if (texsort) + if (node->numsurfaces) { - if (side) + if (r_ser.integer) { - do + msurface_t *surf = cl.worldmodel->surfaces + node->firstsurface, *surfend = surf + node->numsurfaces; + tinyplane_t plane; + if (PlaneDiff (r_origin, node->plane) < 0) + { + for (;surf < surfend;surf++) + { + if (surf->flags & SURF_PLANEBACK) + { + VectorNegate(surf->plane->normal, plane.normal); + plane.dist = -surf->plane->dist; + R_Clip_AddPolygon((float *)surf->poly_verts, surf->poly_numverts, sizeof(float[3]), surf->flags & SURF_CLIPSOLID, RSurf_Callback, surf, NULL, &plane); + } + } + } + else { - if (surf->visframe == r_framecount && !(surf->flags & SURF_PLANEBACK)) + for (;surf < surfend;surf++) { - surf->texturechain = surf->texinfo->texture->texturechain; - surf->texinfo->texture->texturechain = surf; + if (!(surf->flags & SURF_PLANEBACK)) + R_Clip_AddPolygon((float *)surf->poly_verts, surf->poly_numverts, sizeof(float[3]), surf->flags & SURF_CLIPSOLID, RSurf_Callback, surf, NULL, (tinyplane_t *)surf->plane); } - surf++; } - while (surf < endsurf); } else { - do + msurface_t *surf = cl.worldmodel->surfaces + node->firstsurface, *surfend = surf + node->numsurfaces; + if (PlaneDiff (r_origin, node->plane) < 0) { - if (surf->visframe == r_framecount && (surf->flags & SURF_PLANEBACK)) + for (;surf < surfend;surf++) { - surf->texturechain = surf->texinfo->texture->texturechain; - surf->texinfo->texture->texturechain = surf; + if (surf->flags & SURF_PLANEBACK) + surf->visframe = r_framecount; + } + } + else + { + for (;surf < surfend;surf++) + { + if (!(surf->flags & SURF_PLANEBACK)) + surf->visframe = r_framecount; } - surf++; } - while (surf < endsurf); } } - else + + // recurse down the children + if (node->children[0]->contents >= 0) { - if (side) + if (node->children[1]->contents >= 0) { - do - { - if (surf->visframe == r_framecount && !(surf->flags & SURF_PLANEBACK)) - R_DrawSurf(surf, false, vertex); - surf++; - } - while (surf < endsurf); + if (nodestackpos < 8192) + nodestack[nodestackpos++] = node->children[1]; + node = node->children[0]; + goto loc2; } else + ((mleaf_t *)node->children[1])->visframe = r_framecount; + node = node->children[0]; + goto loc2; + } + else + { + ((mleaf_t *)node->children[0])->visframe = r_framecount; + if (node->children[1]->contents >= 0) { - do - { - if (surf->visframe == r_framecount && (surf->flags & SURF_PLANEBACK)) - R_DrawSurf(surf, false, vertex); - surf++; - } - while (surf < endsurf); + node = node->children[1]; + goto loc2; + } + else if (nodestackpos > 0) + { + ((mleaf_t *)node->children[1])->visframe = r_framecount; + node = nodestack[--nodestackpos]; + goto loc2; } } } - - // recurse down the back side - if (node->children[side]->visframe == r_visframecount && R_NotCulledBox(node->children[side]->minmaxs, node->children[side]->minmaxs+3)) + else if (nodestackpos > 0) { - node = node->children[side]; - continue; + node = nodestack[--nodestackpos]; + goto loc2; } - - if (nstack <= nodestack) - break; - nstack--; - node = nstack->node; - side = nstack->side; - goto loc0; } } +static int r_portalframecount = 0; -/* -============= -R_DrawWorld -============= -*/ -void R_DrawWorld (void) -{ - entity_t ent; - - memset (&ent, 0, sizeof(ent)); - ent.model = cl.worldmodel; - ent.colormod[0] = ent.colormod[1] = ent.colormod[2] = 1; - modelalpha = ent.alpha = 1; - ent.scale = 1; - - VectorCopy (r_refdef.vieworg, modelorg); - - currententity = &ent; - - softwaretransformidentity(); // LordHavoc: clear transform - - if (cl.worldmodel) - R_WorldNode (); - - R_PushDlights (); // now mark the lit surfaces - - DrawTextureChains (); -} - - -/* -=============== -R_MarkLeaves -=============== -*/ -void R_MarkLeaves (void) +static void R_PVSWorldNode() { - byte *vis; - mnode_t *node; - int i; + 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++; - if (r_oldviewleaf == r_viewleaf && !r_novis.value) - return; - - r_visframecount++; - r_oldviewleaf = r_viewleaf; + leaf->visframe = r_framecount; - if (r_novis.value) + if (leaf->nummarksurfaces) { - for (i=0 ; inumleafs ; i++) + mark = leaf->firstmarksurface; + endmark = mark + leaf->nummarksurfaces; + if (r_ser.integer) + { + do + { + surf = *mark++; + // make sure surfaces are only processed once + if (surf->worldnodeframe == r_framecount) + continue; + surf->worldnodeframe = r_framecount; + if (PlaneDist(r_origin, surf->plane) < surf->plane->dist) + { + if (surf->flags & SURF_PLANEBACK) + { + VectorNegate(surf->plane->normal, plane.normal); + plane.dist = -surf->plane->dist; + R_Clip_AddPolygon((float *)surf->poly_verts, surf->poly_numverts, sizeof(float[3]), (surf->flags & SURF_CLIPSOLID) != 0, RSurf_Callback, surf, NULL, &plane); + } + } + else + { + if (!(surf->flags & SURF_PLANEBACK)) + R_Clip_AddPolygon((float *)surf->poly_verts, surf->poly_numverts, sizeof(float[3]), (surf->flags & SURF_CLIPSOLID) != 0, RSurf_Callback, surf, NULL, (tinyplane_t *)surf->plane); + } + } + while (mark < endmark); + } + else { - node = (mnode_t *)&cl.worldmodel->leafs[i+1]; do { - if (node->visframe == r_visframecount) - break; - node->visframe = r_visframecount; - node = node->parent; - } while (node); + 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); } } - else + + // follow portals into other leafs + for (p = leaf->portals;p;p = p->next) { - vis = Mod_LeafPVS (r_viewleaf, cl.worldmodel); - - for (i=0 ; inumleafs ; i++) + if (DotProduct(r_origin, p->plane.normal) < p->plane.dist) { - if (vis[i>>3] & (1<<(i&7))) + leaf = p->past; + if (leaf->worldnodeframe != r_framecount) { - node = (mnode_t *)&cl.worldmodel->leafs[i+1]; - do + leaf->worldnodeframe = r_framecount; + if (leaf->contents != CONTENTS_SOLID) { - if (node->visframe == r_visframecount) - break; - node->visframe = r_visframecount; - node = node->parent; - } while (node); + 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; + +loc1: + p = pstack[--portalstack]; + } + } + } } } } -} + if (portalstack) + goto loc1; +} +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}; -/* -============================================================================= +int Cshader_count = 5; +Cshader_t *Cshaders[5] = +{ + &Cshader_wall_vertex, + &Cshader_wall_lightmap, + &Cshader_wall_fullbright, + &Cshader_water, + &Cshader_sky +}; - LIGHTMAP ALLOCATION +void R_PrepareSurfaces(void) +{ + int i; + texture_t *t; + model_t *model; + msurface_t *surf; -============================================================================= -*/ + for (i = 0;i < Cshader_count;i++) + Cshaders[i]->chain = NULL; -// returns a texture number and the position inside it -int AllocBlock (int w, int h, short *x, short *y) -{ - int i, j; - int best, best2; - int texnum; + model = currentrenderentity->model; - for (texnum=0 ; texnumnummodelsurfaces;i++) { - best = BLOCK_HEIGHT; - - for (i=0 ; imodelsortedsurfaces[i]; + if (surf->visframe == r_framecount) { - best2 = 0; - - for (j=0 ; jinsertframe != r_framecount) { - if (allocated[texnum][i+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; + 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; } - } - - if (best + h > BLOCK_HEIGHT) - continue; - if (nosubimagefragments || nosubimage) - { - if (!lightmaps[texnum]) - lightmaps[texnum] = calloc(BLOCK_WIDTH*BLOCK_HEIGHT*4, 1); - } - // LordHavoc: clear texture to blank image, fragments are uploaded using subimage - else if (!allocated[texnum][0]) - { - byte blank[BLOCK_WIDTH*BLOCK_HEIGHT*3]; - 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); - } + surf->chain = surf->shader->chain; + surf->shader->chain = surf; } + } +} - for (i=0 ; ichain && 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:; } - - Sys_Error ("AllocBlock: full"); - return 0; } +void R_DrawSurfacesAll (void) +{ + R_DrawSurfaces(SHADERSTAGE_SKY); + R_DrawSurfaces(SHADERSTAGE_NORMAL); + R_DrawSurfaces(SHADERSTAGE_FOG); +} -mvertex_t *r_pcurrentvertbase; -model_t *currentmodel; - -int nColinElim; +static float portalpointbuffer[256][3]; -/* -================ -BuildSurfaceDisplayList -================ -*/ -void BuildSurfaceDisplayList (msurface_t *fa) +void R_DrawPortals(void) { - int i, j, lindex, lnumverts; - medge_t *pedges, *r_pedge; - int vertpage; - float *vec; - float s, t; - glpoly_t *poly; - -// reconstruct the polygon - pedges = currentmodel->edges; - lnumverts = fa->numedges; - vertpage = 0; - - // - // draw texture - // - poly = Hunk_Alloc (sizeof(glpoly_t) + (lnumverts-4) * VERTEXSIZE*sizeof(float)); - poly->next = fa->polys; - poly->flags = fa->flags; - fa->polys = poly; - poly->numverts = lnumverts; - - for (i=0 ; ileafs; + endleaf = leaf + cl.worldmodel->numleafs; + for (;leaf < endleaf;leaf++) { - lindex = currentmodel->surfedges[fa->firstedge + i]; - - if (lindex > 0) + if (leaf->visframe == r_framecount && leaf->portals) { - r_pedge = &pedges[lindex]; - vec = r_pcurrentvertbase[r_pedge->v[0]].position; - } - else - { - r_pedge = &pedges[-lindex]; - vec = r_pcurrentvertbase[r_pedge->v[1]].position; + i = leaf - cl.worldmodel->leafs; + r = (i & 0x0007) << 5; + g = (i & 0x0038) << 2; + b = (i & 0x01C0) >> 1; + portal = leaf->portals; + while (portal) + { + transpolybegin(0, 0, 0, TPOLYTYPE_ALPHA); + point = portal->points + portal->numpoints - 1; + endpoint = portal->points; + for (;point >= endpoint;point--) + transpolyvertub(point->position[0], point->position[1], point->position[2], 0, 0, r, g, b, 32); + transpolyend(); + portal = portal->next; + } } - 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) + */ + 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++) { - for (i = 0 ; i < lnumverts ; ++i) + if (portal->visframe == r_portalframecount) { - 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)) + if (portal->numpoints <= 256) { - int j; - for (j = i + 1; j < lnumverts; ++j) + 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 { - int k; - for (k = 0; k < VERTEXSIZE; ++k) - poly->verts[j - 1][k] = poly->verts[j][k]; + for (i = 0;i < portal->numpoints;i++) + VectorCopy(point[i].position, portalpointbuffer[i]); } - --lnumverts; - ++nColinElim; - // retry next vertex next time, which is now current vertex - --i; + R_Mesh_DrawPolygon(&m, portal->numpoints); } } } - */ - poly->numverts = lnumverts; } -/* -======================== -GL_CreateSurfaceLightmap -======================== -*/ -void GL_CreateSurfaceLightmap (msurface_t *surf) +void R_SetupForBModelRendering(void) { - int smax, tmax; + int i; + msurface_t *s; + model_t *model; + vec3_t modelorg; - if (surf->flags & (SURF_DRAWSKY|SURF_DRAWTURB)) - return; + // because bmodels can be reused, we have to decide which things to render + // from scratch every time - smax = (surf->extents[0]>>4)+1; - tmax = (surf->extents[1]>>4)+1; + model = currentrenderentity->model; - 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) + softwaretransformforentity (currentrenderentity); + softwareuntransform(r_origin, modelorg); + + for (i = 0;i < model->nummodelsurfaces;i++) { - 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); + s = model->modelsortedsurfaces[i]; + if (((s->flags & SURF_PLANEBACK) == 0) == (PlaneDiff(modelorg, s->plane) >= 0)) + s->visframe = r_framecount; + else + s->visframe = -1; + s->worldnodeframe = -1; + s->lightframe = -1; + s->dlightframe = -1; + s->insertframe = -1; } - else +} + +void R_SetupForWorldRendering(void) +{ + // there is only one instance of the world, but it can be rendered in + // multiple stages + + currentrenderentity = &cl_entities[0].render; + softwaretransformidentity(); +} + +static void R_SurfMarkLights (void) +{ + int i; + msurface_t *s; + + if (r_dynamic.integer) + R_MarkLights(); + + if (!r_vertexsurfaces.integer) { - 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); + for (i = 0;i < currentrenderentity->model->nummodelsurfaces;i++) + { + s = currentrenderentity->model->modelsortedsurfaces[i]; + if (s->visframe == r_framecount && s->lightmaptexture != NULL) + { + if (s->cached_dlight + || s->cached_ambient != r_ambient.value + || s->cached_lightscalebit != lightscalebit) + R_BuildLightMap(s, false); // base lighting changed + else if (r_dynamic.integer) + { + if (s->styles[0] != 255 && (d_lightstylevalue[s->styles[0]] != s->cached_light[0] + || (s->styles[1] != 255 && (d_lightstylevalue[s->styles[1]] != s->cached_light[1] + || (s->styles[2] != 255 && (d_lightstylevalue[s->styles[2]] != s->cached_light[2] + || (s->styles[3] != 255 && (d_lightstylevalue[s->styles[3]] != s->cached_light[3])))))))) + //if (s->cached_light[0] != d_lightstylevalue[s->styles[0]] + // || s->cached_light[1] != d_lightstylevalue[s->styles[1]] + // || s->cached_light[2] != d_lightstylevalue[s->styles[2]] + // || s->cached_light[3] != d_lightstylevalue[s->styles[3]]) + R_BuildLightMap(s, false); // base lighting changed + else if (s->dlightframe == r_framecount && r_dlightmap.integer) + R_BuildLightMap(s, true); // only dlights + } + } + } } } +void R_MarkWorldLights(void) +{ + R_SetupForWorldRendering(); + R_SurfMarkLights(); +} /* -================== -GL_BuildLightmaps - -Builds the lightmap texture -with all the surfaces from all brush models -================== +============= +R_DrawWorld +============= */ -void GL_BuildLightmaps (void) +void R_DrawWorld (void) { - int i, j; - model_t *m; + R_SetupForWorldRendering(); - memset (allocated, 0, sizeof(allocated)); + if (r_viewleaf->contents == CONTENTS_SOLID || r_novis.integer || r_viewleaf->compressed_vis == NULL) + R_SolidWorldNode (); + else + R_PVSWorldNode (); +} - r_framecount = 1; // no dlightcache +/* +================= +R_DrawBrushModel +================= +*/ +void R_DrawBrushModelSky (void) +{ + R_SetupForBModelRendering(); - 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 = texture_extension_number; - texture_extension_number += MAX_LIGHTMAPS; - } + R_SurfMarkLights(); - for (j=1 ; jname[0] == '*') - continue; - r_pcurrentvertbase = m->vertexes; - currentmodel = m; - 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->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); } -