X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=gl_rsurf.c;h=30851689c9919a32077f96492dea74f818c2a187;hp=ba5e89d8b1ac25d54e5849d730476c3e276f62ab;hb=4a3c7b42fbd66d9df4f7afbf72f580a6ecbb047d;hpb=a71156e14d3f1144f73e52ca14a2925c2420cfd0 diff --git a/gl_rsurf.c b/gl_rsurf.c index ba5e89d8..30851689 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. @@ -23,11 +23,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. int lightmap_textures; -signed int blocklights[18*18*3]; // LordHavoc: *3 for colored lighting - -// LordHavoc: skinny but tall lightmaps for quicker subimage uploads -#define BLOCK_WIDTH 128 -#define BLOCK_HEIGHT 128 +#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) @@ -39,34 +36,39 @@ 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 = {"gl_lightmapalign", "4"}; -cvar_t gl_lightmaprgba = {"gl_lightmaprgba", "1"}; -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 r_newworldnode = {"r_newworldnode", "0"}; -cvar_t r_oldclip = {"r_oldclip", "1"}; -cvar_t r_dlightmap = {"r_dlightmap", "1"}; - -qboolean lightmaprgba, nosubimagefragments, nosubimage, skyisvisible; +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_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; -extern qboolean gl_arrays; +int wateralpha; -extern int r_dlightframecount; +void gl_surf_start(void) +{ +} -void gl_surf_start() +void gl_surf_shutdown(void) { } -void gl_surf_shutdown() +void gl_surf_newmap(void) { } -void GL_Surf_Init() +void GL_Surf_Init(void) { int i; for (i = 0;i < MAX_LIGHTMAPS;i++) @@ -77,43 +79,33 @@ void GL_Surf_Init() Cvar_RegisterVariable(&gl_nosubimage); Cvar_RegisterVariable(&r_ambient); Cvar_RegisterVariable(&gl_vertex); - Cvar_RegisterVariable(&gl_texsort); - Cvar_RegisterVariable(&r_newworldnode); - Cvar_RegisterVariable(&r_oldclip); Cvar_RegisterVariable(&r_dlightmap); - // check if it's the glquake minigl driver - if (strncasecmp(gl_vendor,"3Dfx",4)==0) - if (!gl_arrays) - { -// Cvar_SetValue("gl_nosubimagefragments", 1); -// Cvar_SetValue("gl_nosubimage", 1); - Cvar_SetValue("gl_lightmode", 0); - } + 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); + R_RegisterModule("GL_Surf", gl_surf_start, gl_surf_shutdown, gl_surf_newmap); } -int dlightdivtable[32768]; +int dlightdivtable[32768]; /* R_AddDynamicLights */ int R_AddDynamicLights (msurface_t *surf) { - int sdtable[18], lnum, td, maxdist, maxdist2, maxdist3, i, j, s, t, smax, tmax, red, green, blue, lit, dist2, impacts, impactt; + int sdtable[18], lnum, td, maxdist, maxdist2, maxdist3, i, s, t, smax, tmax, red, green, blue, lit, dist2, impacts, impactt; 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 - - // LordHavoc: later note: MSVC and hopefully all other C compilers use a 64bit result for 32bit*32bit multiply, so that was not necessary - int k; +#if _MSC_VER || __BORLANDC__ + __int64 k; +#else + long long k; +#endif lit = false; @@ -132,11 +124,11 @@ int R_AddDynamicLights (msurface_t *surf) if (!(surf->dlightbits[lnum >> 5] & (1 << (lnum & 31)))) continue; // not lit by this light - VectorSubtract (cl_dlights[lnum].origin, currententity->origin, local); + VectorSubtract (cl_dlights[lnum].origin, currententity->render.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) * LIGHTSCALE); + maxdist = (int) ((cl_dlights[lnum].radius * cl_dlights[lnum].radius)); // clamp radius to avoid exceeding 32768 entry division table if (maxdist > 4194304) @@ -161,7 +153,7 @@ int R_AddDynamicLights (msurface_t *surf) // reduce calculations for (s = 0, i = impacts; s < smax; s++, i -= 16) - sdtable[s] = i * i + dist2; + sdtable[s] = i * i + dist2 + LIGHTOFFSET; maxdist3 = maxdist - (int) (dist * dist); @@ -184,9 +176,9 @@ int R_AddDynamicLights (msurface_t *surf) if (sdtable[s] < maxdist2) { k = dlightdivtable[(sdtable[s] + td) >> 7]; - j = (red * k) >> 9;bl[0] += j; - j = (green * k) >> 9;bl[1] += j; - j = (blue * k) >> 9;bl[2] += j; + bl[0] += (red * k) >> 9; + bl[1] += (green * k) >> 9; + bl[2] += (blue * k) >> 9; lit = true; } bl += 3; @@ -200,6 +192,39 @@ int R_AddDynamicLights (msurface_t *surf) } +void R_ConvertLightmap (int *in, byte *out, int width, int height, int stride) +{ + int i, j, shift; + stride -= (width*lightmapbytes); + // deal with lightmap brightness scale + shift = 7 + lightscalebit; + if (lightmaprgba) + { + for (i = 0;i < height;i++, out += stride) + { + for (j = 0;j < width;j++, in += 3, out += 4) + { + out[0] = min(in[0] >> shift, 255); + out[1] = min(in[1] >> shift, 255); + out[2] = min(in[2] >> shift, 255); + out[3] = 255; + } + } + } + else + { + for (i = 0;i < height;i++, out += stride) + { + for (j = 0;j < width;j++, in += 3, out += 3) + { + out[0] = min(in[0] >> shift, 255); + out[1] = min(in[1] >> shift, 255); + out[2] = min(in[2] >> shift, 255); + } + } + } +} + /* =============== R_BuildLightMap @@ -209,15 +234,15 @@ Combine and scale multiple lightmaps into the 8.8 format in blocklights */ void R_BuildLightMap (msurface_t *surf, byte *dest, int stride) { - int smax, tmax; - int i, j, size, size3; - byte *lightmap; - int scale; - int maps; - int *bl; + int smax, tmax; + int i, j, size, size3; + byte *lightmap; + int scale; + int maps; + int *bl; surf->cached_dlight = 0; - surf->cached_lighthalf = lighthalf; + surf->cached_lightscalebit = lightscalebit; surf->cached_ambient = r_ambient.value; smax = (surf->extents[0]>>4)+1; @@ -227,7 +252,7 @@ void R_BuildLightMap (msurface_t *surf, byte *dest, int stride) lightmap = surf->samples; // set to full bright if no light data - if (currententity->effects & EF_FULLBRIGHT || !cl.worldmodel->lightdata) + if ((currententity && (currententity->render.effects & EF_FULLBRIGHT)) || !cl.worldmodel->lightdata) { bl = blocklights; for (i=0 ; idlightframe == r_dlightframecount) + if (r_dlightmap.value && surf->dlightframe == r_framecount) if ((surf->cached_dlight = R_AddDynamicLights(surf))) c_light_polys++; } - stride -= (smax*lightmapbytes); - bl = blocklights; - if (lighthalf) - { - // LordHavoc: I shift down by 8 unlike GLQuake's 7, - // the image is brightened as a processing pass - if (lightmaprgba) - { - for (i = 0;i < tmax;i++, dest += stride) - { - for (j = 0;j < smax;j++, bl += 3, dest += 4) - { - dest[0] = min(bl[0] >> 8, 255); - dest[1] = min(bl[1] >> 8, 255); - dest[2] = min(bl[2] >> 8, 255); - dest[3] = 255; - } - } - } - else - { - for (i = 0;i < tmax;i++, dest += stride) - { - for (j = 0;j < smax;j++, bl += 3, dest += 3) - { - dest[0] = min(bl[0] >> 8, 255); - dest[1] = min(bl[1] >> 8, 255); - dest[2] = min(bl[2] >> 8, 255); - } - } - } - } - else - { - if (lightmaprgba) - { - for (i = 0;i < tmax;i++, dest += stride) - { - for (j = 0;j < smax;j++, bl += 3, dest += 4) - { - dest[0] = min(bl[0] >> 7, 255); - dest[1] = min(bl[1] >> 7, 255); - dest[2] = min(bl[2] >> 7, 255); - dest[3] = 255; - } - } - } - else - { - for (i = 0;i < tmax;i++, dest += stride) - { - for (j = 0;j < smax;j++, bl += 3, dest += 3) - { - dest[0] = min(bl[0] >> 7, 255); - dest[1] = min(bl[1] >> 7, 255); - dest[2] = min(bl[2] >> 7, 255); - } - } - } - } + R_ConvertLightmap(blocklights, dest, smax, tmax, stride); } -byte templight[32*32*4]; +byte templight[BLOCK_WIDTH*BLOCK_HEIGHT*4]; void R_UpdateLightmap(msurface_t *s, int lnum) { @@ -376,11 +342,11 @@ Returns the proper texture for a given time and base texture */ texture_t *R_TextureAnimation (texture_t *base) { - texture_t *original; - int relative; - int count; +// texture_t *original; +// int relative; +// int count; - if (currententity->frame) + if (currententity->render.frame) { if (base->alternate_anims) base = base->alternate_anims; @@ -389,9 +355,12 @@ texture_t *R_TextureAnimation (texture_t *base) if (!base->anim_total) return base; + return base->anim_frames[(int)(cl.time*5) % base->anim_total]; + + /* original = base; - relative = (int)(cl.time*10) % base->anim_total; + relative = (int)(cl.time*5) % base->anim_total; count = 0; while (base->anim_min > relative || base->anim_max <= relative) @@ -410,6 +379,7 @@ texture_t *R_TextureAnimation (texture_t *base) } return base; + */ } @@ -422,13 +392,6 @@ 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] = { #include "gl_warp_sin.h" @@ -436,7 +399,7 @@ float turbsin[256] = #define TURBSCALE (256.0 / (2 * M_PI)) -void UploadLightmaps() +void UploadLightmaps(void) { int i; if (nosubimage || nosubimagefragments) @@ -477,6 +440,11 @@ void RSurf_DrawSky(msurface_t *s, int transform) glpoly_t *p; int i; float *v; + + // LordHavoc: HalfLife maps have freaky skypolys... + if (hlbsp) + return; + for (p=s->polys ; p ; p=p->next) { if (currentskypoly < MAX_SKYPOLYS && currentskyvert + p->numverts <= MAX_SKYVERTS) @@ -495,9 +463,8 @@ void RSurf_DrawSky(msurface_t *s, int transform) { 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]; + VectorCopy(v, skyvert[currentskyvert].v); + currentskyvert++; } } } @@ -526,8 +493,8 @@ int RSurf_Light(int *dlightbits, glpoly_t *polys) cr = light->color[0]; cg = light->color[1]; cb = light->color[2]; - radius = light->radius*light->radius*LIGHTSCALE; - radius2 = radius * (256.0f / LIGHTSCALE2); + radius = light->radius*light->radius; + radius2 = radius * 256.0f; wv = wvert; for (p = polys;p;p = p->next) { @@ -555,125 +522,235 @@ int RSurf_Light(int *dlightbits, glpoly_t *polys) void RSurf_DrawWater(msurface_t *s, texture_t *t, int transform, int alpha) { int i; - float os = turbsin[(int)(realtime * TURBSCALE) & 255], ot = turbsin[(int)(cl.time * TURBSCALE + 96.0) & 255]; + float os = turbsin[(int)(cl.time * TURBSCALE) & 255], ot = turbsin[(int)(cl.time * TURBSCALE + 96.0) & 255]; glpoly_t *p; - float *wv, *v; - wv = wvert; - for (p = s->polys;p;p = p->next) + float *v; + // FIXME: make fog texture if water texture is transparent? + + if (s->dlightframe != r_framecount) { - for (i = 0, v = p->verts[0];i < p->numverts;i++, v += VERTEXSIZE) + vec3_t temp; + // LordHavoc: fast path for no vertex lighting cases + if (transform) { - if (transform) - softwaretransform(v, wv); + if (r_waterripple.value) + { + for (p=s->polys ; p ; p=p->next) + { + transpolybegin(R_GetTexture(t->texture), R_GetTexture(t->glowtexture), 0, TPOLYTYPE_ALPHA); + for (i = 0,v = p->verts[0];i < p->numverts;i++, v += VERTEXSIZE) + { + softwaretransform(v, temp); + transpolyvert(temp[0], temp[1], temp[2] + r_waterripple.value * turbsin[(int)((temp[0]*(1.0f/32.0f)+cl.time) * TURBSCALE) & 255] * turbsin[(int)((temp[1]*(1.0f/32.0f)+cl.time) * TURBSCALE) & 255] * (1.0f / 64.0f), (v[3] + os) * (1.0f/64.0f), (v[4] + ot) * (1.0f/64.0f), 128, 128, 128, alpha); + } + transpolyend(); + } + } else - VectorCopy(v, wv); + { + 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(); + } + } + } + else + { 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)+realtime) * TURBSCALE) & 255] * (1.0f / 64.0f); - wv[3] = wv[4] = wv[5] = 128.0f; - wv += 6; + { + 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(); + } + } + 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(); + } + } } } - if (s->dlightframe == r_dlightframecount) - 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) + else { - 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(); + float *wv; + wv = wvert; + for (p = s->polys;p;p = p->next) + { + for (i = 0, v = p->verts[0];i < p->numverts;i++, v += VERTEXSIZE) + { + 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; + } + } + if (s->dlightframe == r_framecount) + RSurf_Light(s->dlightbits, s->polys); + wv = wvert; + for (p=s->polys ; p ; p=p->next) + { + transpolybegin(R_GetTexture(t->texture), R_GetTexture(t->glowtexture), 0, TPOLYTYPE_ALPHA); + for (i = 0,v = p->verts[0];i < p->numverts;i++, v += VERTEXSIZE, wv += 6) + transpolyvert(wv[0], wv[1], wv[2], (v[3] + os) * (1.0f/64.0f), (v[4] + ot) * (1.0f/64.0f), wv[3], wv[4], wv[5], alpha); + transpolyend(); + } } } void RSurf_DrawWall(msurface_t *s, texture_t *t, int transform) { int i, lit = false, polys = 0, verts = 0; - float *v, *wv; + float *v; glpoly_t *p; wallpoly_t *wp; wallvert_t *out; + wallvertcolor_t *outcolor; // check for lightmap modification - if (r_dynamic.value) - { - if (s->cached_dlight - || (r_dlightmap.value && s->dlightframe == r_dlightframecount) - || 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); - } - wv = wvert; - for (p = s->polys;p;p = p->next) + 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) { - for (i = 0, v = p->verts[0];i < p->numverts;i++, v += VERTEXSIZE) + // LordHavoc: fast path version for no vertex lighting cases + wp = &wallpoly[currentwallpoly]; + out = &wallvert[currentwallvert]; + for (p = s->polys;p;p = p->next) { + 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) - softwaretransform(v, wv); + { + 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 - VectorCopy(v, wv); - wv[3] = wv[4] = wv[5] = 0.0f; - wv += 6; + { + /* + for (i = 0;i < p->numverts;i++, v += VERTEXSIZE, out++) + { + VectorCopy(v, out->vert); + out->vert[3] = v[3]; + out->vert[4] = v[4]; + out->vert[5] = v[5]; + out->vert[6] = v[6]; + } + */ + memcpy(out, v, sizeof(vec_t) * VERTEXSIZE * p->numverts); + out += p->numverts; + } } - verts += p->numverts; - polys++; } - if ((currentwallpoly + polys > MAX_WALLPOLYS) || (currentwallvert+verts > MAX_WALLVERTS)) - return; - if ((!r_dlightmap.value) && s->dlightframe == r_dlightframecount) - 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) + else { - 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++) + float *wv; + wv = wvert; + for (p = s->polys;p;p = p->next) { - if (lit) + for (i = 0, v = p->verts[0];i < p->numverts;i++, v += VERTEXSIZE) { - 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; - } + if (transform) + softwaretransform(v, wv); else + VectorCopy(v, wv); + wv[3] = wv[4] = wv[5] = 0.0f; + wv += 6; + } + verts += p->numverts; + polys++; + } + if ((currentwallpoly + polys > MAX_WALLPOLYS) || (currentwallvert+verts > MAX_WALLVERTS)) + return; + if ((!r_dlightmap.value) && s->dlightframe == r_framecount) + lit = RSurf_Light(s->dlightbits, s->polys); + wv = wvert; + wp = &wallpoly[currentwallpoly]; + out = &wallvert[currentwallvert]; + outcolor = &wallvertcolor[currentwallvert]; + currentwallpoly += polys; + for (p = s->polys;p;p = p->next) + { + v = p->verts[0]; + wp->texnum = (unsigned short) R_GetTexture(t->texture); + wp->lighttexnum = (unsigned short) (lightmap_textures + s->lightmaptexturenum); + wp->glowtexnum = (unsigned short) R_GetTexture(t->glowtexture); + wp->firstvert = currentwallvert; + wp->numverts = p->numverts; + wp->lit = lit; + wp++; + currentwallvert += p->numverts; + for (i = 0;i < p->numverts;i++, v += VERTEXSIZE, wv += 6, out++, outcolor++) + { + if (lit) { - 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; + 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]; } - 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]; } } } // LordHavoc: transparent brush models -extern int r_dlightframecount; -extern float modelalpha; - void RSurf_DrawWallVertex(msurface_t *s, texture_t *t, int transform, int isbmodel) { int i, alpha, size3; @@ -712,17 +789,17 @@ void RSurf_DrawWallVertex(msurface_t *s, texture_t *t, int transform, int isbmod wv += 6; } } - if (s->dlightframe == r_dlightframecount) + if (s->dlightframe == r_framecount) RSurf_Light(s->dlightbits, s->polys); wv = wvert; - if (isbmodel && (currententity->colormod[0] != 1 || currententity->colormod[1] != 1 || currententity->colormod[2] != 1)) + if (isbmodel && (currententity->render.colormod[0] != 1 || currententity->render.colormod[1] != 1 || currententity->render.colormod[2] != 1)) { for (p = s->polys;p;p = p->next) { v = p->verts[0]; - transpolybegin(t->gl_texturenum, t->gl_glowtexturenum, 0, currententity->effects & EF_ADDITIVE ? TPOLYTYPE_ADD : TPOLYTYPE_ALPHA); + 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->colormod[0], wv[4] * currententity->colormod[1], wv[5] * currententity->colormod[2], alpha); + 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(); } } @@ -731,7 +808,7 @@ void RSurf_DrawWallVertex(msurface_t *s, texture_t *t, int transform, int isbmod for (p = s->polys;p;p = p->next) { v = p->verts[0]; - transpolybegin(t->gl_texturenum, t->gl_glowtexturenum, 0, currententity->effects & EF_ADDITIVE ? TPOLYTYPE_ADD : TPOLYTYPE_ALPHA); + 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(); @@ -739,78 +816,69 @@ void RSurf_DrawWallVertex(msurface_t *s, texture_t *t, int transform, int isbmod } } +void R_NoVisMarkLights (vec3_t lightorigin, dlight_t *light, int bit, int bitindex, model_t *model); + +float bmverts[256*3]; + +int vertexworld; + /* -================ -DrawTextureChains -================ +void RBrushModelSurf_DoVisible(msurface_t *surf) +{ +// float *v, *bmv, *endbmv; +// glpoly_t *p; +// for (p = surf->polys;p;p = p->next) +// { +// for (v = p->verts[0], bmv = bmpoints, endbmv = bmv + p->numverts * 3;bmv < endbmv;v += VERTEXSIZE, bmv += 3) +// softwaretransform(v, bmv); +// if (R_Clip_Polygon(bmpoints, p->numverts, sizeof(float) * 3, surf->flags & SURF_CLIPSOLID)) + surf->visframe = r_framecount; +// } +} */ -extern qboolean hlbsp; -extern char skyname[]; -void R_DrawSurf(msurface_t *s, int isbmodel, int vertexlit) + +void RBrushModelSurf_Callback(void *data, void *data2) { + entity_t *ent = data2; + msurface_t *surf = data; texture_t *t; - if (s->flags & SURF_DRAWSKY) + + /* + // FIXME: implement better dupe prevention in AddPolygon callback code + if (ent->render.model->firstmodelsurface != 0) { - skyisvisible = true; - if (!hlbsp) // LordHavoc: HalfLife maps have freaky skypolys... - RSurf_DrawSky(s, false); - return; + // 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; } - t = R_TextureAnimation (s->texinfo->texture); - if (s->flags & SURF_DRAWTURB) + */ + surf->visframe = r_framecount; + + c_faces++; + + currententity = ent; + modelalpha = ent->render.alpha; + + softwaretransformforbrushentity (ent); + + if (surf->flags & (SURF_DRAWSKY | SURF_DRAWTURB)) { - RSurf_DrawWater(s, t, false, s->flags & SURF_DRAWNOALPHA ? 255 : r_wateralpha.value*255.0f); - return; + // 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); } - if (vertexlit) - RSurf_DrawWallVertex(s, t, false, false); else - RSurf_DrawWall(s, t, false); -} - -void DrawTextureChains (void) -{ - int n; - msurface_t *s; - texture_t *t; - - for (n = 0;n < cl.worldmodel->numtextures;n++) { - 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) - { - skyisvisible = true; - if (!hlbsp) // LordHavoc: HalfLife maps have freaky skypolys... - for (;s;s = s->texturechain) - RSurf_DrawSky(s, false); - continue; - } - t = R_TextureAnimation (cl.worldmodel->textures[n]); - // subdivided water surface warp - if (s->flags & SURF_DRAWTURB) - { - int alpha = s->flags & SURF_DRAWNOALPHA ? 255 : r_wateralpha.value*255.0f; - for (;s;s = s->texturechain) - RSurf_DrawWater(s, t, false, alpha); - continue; - } - if (gl_vertex.value) - for (;s;s = s->texturechain) - RSurf_DrawWallVertex(s, t, false, false); + 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 - for (;s;s = s->texturechain) - RSurf_DrawWall(s, t, false); + RSurf_DrawWall(surf, t, true); } } -void R_NoVisMarkLights (vec3_t lightorigin, dlight_t *light, int bit, int bitindex, model_t *model); - /* ================= R_DrawBrushModel @@ -818,32 +886,32 @@ R_DrawBrushModel */ void R_DrawBrushModel (entity_t *e) { - int i; + int i, j, vertexlit; vec3_t mins, maxs; msurface_t *s; model_t *clmodel; - int rotated, vertexlit = false; - texture_t *t; + int rotated; vec3_t org; + glpoly_t *p; currententity = e; - clmodel = e->model; + clmodel = e->render.model; - if (e->angles[0] || e->angles[1] || e->angles[2]) + if (e->render.angles[0] || e->render.angles[1] || e->render.angles[2]) { rotated = true; for (i=0 ; i<3 ; i++) { - mins[i] = e->origin[i] - clmodel->radius; - maxs[i] = e->origin[i] + clmodel->radius; + mins[i] = e->render.origin[i] - clmodel->radius; + maxs[i] = e->render.origin[i] + clmodel->radius; } } else { rotated = false; - VectorAdd (e->origin, clmodel->mins, mins); - VectorAdd (e->origin, clmodel->maxs, maxs); + VectorAdd (e->render.origin, clmodel->mins, mins); + VectorAdd (e->render.origin, clmodel->maxs, maxs); } if (R_CullBox (mins, maxs)) @@ -851,58 +919,73 @@ void R_DrawBrushModel (entity_t *e) c_bmodels++; - VectorSubtract (r_refdef.vieworg, e->origin, modelorg); + VectorSubtract (r_origin, e->render.origin, modelorg); if (rotated) { vec3_t temp; vec3_t forward, right, up; VectorCopy (modelorg, temp); - AngleVectors (e->angles, forward, right, up); + AngleVectors (e->render.angles, forward, right, up); modelorg[0] = DotProduct (temp, forward); modelorg[1] = -DotProduct (temp, right); modelorg[2] = DotProduct (temp, up); } - s = &clmodel->surfaces[clmodel->firstmodelsurface]; + softwaretransformforbrushentity (e); + + for (i = 0, s = &clmodel->surfaces[clmodel->firstmodelsurface];i < clmodel->nummodelsurfaces;i++, s++) + { + s->visframe = -1; + if (((s->flags & SURF_PLANEBACK) == 0) == (PlaneDiff(modelorg, s->plane) >= 0)) + s->visframe = r_framecount; + } -// calculate dynamic lighting for bmodel if it's not an -// instanced model +// calculate dynamic lighting for bmodel if it's not an instanced model for (i = 0;i < MAX_DLIGHTS;i++) { - if ((cl_dlights[i].die < cl.time) || (!cl_dlights[i].radius)) + if (!cl_dlights[i].radius) continue; - VectorSubtract(cl_dlights[i].origin, currententity->origin, org); + VectorSubtract(cl_dlights[i].origin, currententity->render.origin, org); R_NoVisMarkLights (org, &cl_dlights[i], 1<<(i&31), i >> 5, clmodel); } - 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 + 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;i < clmodel->nummodelsurfaces;i++, s++) + for (i = 0, s = &clmodel->surfaces[clmodel->firstmodelsurface];i < clmodel->nummodelsurfaces;i++, s++) { - if (((s->flags & SURF_PLANEBACK) == 0) == (PlaneDiff(modelorg, s->plane) >= 0)) + if (s->visframe == r_framecount) { // R_DrawSurf(s, true, vertexlit || s->texinfo->texture->transparent); - if (s->flags & SURF_DRAWSKY) + if (r_ser.value) { - RSurf_DrawSky(s, true); - continue; + 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); + } } - t = R_TextureAnimation (s->texinfo->texture); - if (s->flags & SURF_DRAWTURB) + else { - RSurf_DrawWater(s, t, true, s->flags & SURF_DRAWNOALPHA ? 255 : r_wateralpha.value*255.0f); - continue; + 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 + { + 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); + } } - if (vertexlit || s->texinfo->texture->transparent) - RSurf_DrawWallVertex(s, t, true, true); - else - RSurf_DrawWall(s, t, true); } } UploadLightmaps(); @@ -916,273 +999,961 @@ e->angles[0] = -e->angles[0]; // stupid quake bug ============================================================= */ -void R_StoreEfrags (efrag_t **ppefrag); +/* +static byte *worldvis; + +void R_MarkLeaves (void) +{ + static float noviscache; + if (r_oldviewleaf == r_viewleaf && noviscache == r_novis.value) + return; + + r_oldviewleaf = r_viewleaf; + noviscache = r_novis.value; + + worldvis = Mod_LeafPVS (r_viewleaf, cl.worldmodel); +} +*/ + +void RSurf_Callback(void *data, void *junk) +{ + ((msurface_t *)data)->visframe = r_framecount; +} + +/* +void RSurf_Callback(void *data, void *junk) +{ + 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)) + { + // sky and liquid don't need sorting (skypoly/transpoly) + if (surf->flags & SURF_DRAWSKY) + RSurf_DrawSky(surf, false); + else + RSurf_DrawWater(surf, R_TextureAnimation(surf->texinfo->texture), false, surf->flags & SURF_DRAWNOALPHA ? 255 : wateralpha); + } + else + { + t = R_TextureAnimation(surf->texinfo->texture); + if (vertexworld) + RSurf_DrawWallVertex(surf, t, false, false); + else + RSurf_DrawWall(surf, t, false); + } +} +*/ + +/* +mleaf_t *r_oldviewleaf; +int r_markvisframecount = 0; -void R_NewWorldNode () +void R_MarkLeaves (void) { - int l, texsort = gl_texsort.value, vertex = gl_vertex.value; + 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; - for (l = 0, leaf = cl.worldmodel->leafs;l < cl.worldmodel->numleafs;l++, leaf++) + // 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)) { - if ((leaf->visframe == r_visframecount) && (leaf->efrags || leaf->nummarksurfaces)) - { - if (R_CullBox(leaf->minmaxs, leaf->minmaxs+3)) - continue; + row = (model->numleafs+7)>>3; - c_leafs++; + if (!r_testvis.value) + r_markvisframecount++; - // deal with model fragments in this leaf - if (leaf->efrags) - R_StoreEfrags (&leaf->efrags); + // LordHavoc: mark the root node as visible, it will terminate all other ascensions + model->nodes->markvisframe = r_markvisframecount; - if (leaf->nummarksurfaces) + k = 0; + while (k < row) + { + c = *in++; + if (c) { - mark = leaf->firstmarksurface; - endmark = mark + leaf->nummarksurfaces; - do + l = model->numleafs - (k << 3); + if (l > 8) + l = 8; + for (i=0 ; iworldnodeframe == r_framecount) - continue; + if (c & (1<leafs[(k << 3)+i+1]; + node = (mnode_t *)leaf; + do + { + node->markvisframe = r_markvisframecount; + node = node->parent; + } + while (node->markvisframecount != r_markvisframecount); + } + } + k++; + } + else + k += *in++; + } + } + else + { + // LordHavoc: no vis data, mark everything as visible + model->nodes->markvisframe = r_markvisframecount; + + for (i = 1;i < model->numleafs;i++) + { + node = (mnode_t *)&model->leafs[i]; + do + { + node->markvisframe = r_markvisframecount; + node = node->parent; + } + while (node->markvisframecount != r_markvisframecount); + } + } +} +*/ + +void R_SolidWorldNode (void) +{ + if ((int) r_solidworldnode.value == 3) + { + int portalstack; + mportal_t *p, *pstack[8192]; + msurface_t *surf, **mark, **endmark; + mleaf_t *leaf; + glpoly_t *poly; + tinyplane_t plane; + + 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 (PlaneDist(r_origin, surf->plane) < surf->plane->dist) { - if ( (surf->flags & SURF_PLANEBACK)) + 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; - c_faces++; - if (texsort) + } + } + while (mark < endmark); + } + } + + // 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) + { + if (R_NotCulledBox(leaf->mins, leaf->maxs)) + { + pstack[portalstack++] = p; + goto loc0; + + loc1: + p = pstack[--portalstack]; + } + } + } + } + } + + if (portalstack) + goto loc1; + } + else if ((int) r_solidworldnode.value == 2) + { + mnode_t *nodestack[8192], *node = cl.worldmodel->nodes; + int nodestackpos = 0; + glpoly_t *poly; + +loc2: + if (R_NotCulledBox(node->mins, node->maxs)) + { + if (r_ser.value) + { + if (node->numsurfaces) + { + 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; + 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); + } + } + } + else + { + 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); + } + } + } + } + else + { + if (node->numsurfaces) + { + msurface_t *surf = cl.worldmodel->surfaces + node->firstsurface, *surfend = surf + node->numsurfaces; + if (PlaneDiff (r_origin, node->plane) < 0) + { + for (;surf < surfend;surf++) + { + if (surf->flags & SURF_PLANEBACK) + surf->visframe = r_framecount; + } + } + else + { + for (;surf < surfend;surf++) + { + if (!(surf->flags & SURF_PLANEBACK)) + surf->visframe = r_framecount; + } + } + } + } + + // recurse down the children + if (node->children[0]->contents >= 0) + { + if (node->children[1]->contents >= 0) + { + if (nodestackpos < 8192) + nodestack[nodestackpos++] = node->children[1]; + node = node->children[0]; + goto loc2; + } + else + ((mleaf_t *)node->children[1])->visframe = r_framecount; + node = node->children[0]; + goto loc2; + } + else + { + ((mleaf_t *)node->children[0])->visframe = r_framecount; + if (node->children[1]->contents >= 0) + { + node = node->children[1]; + goto loc2; + } + else if (nodestackpos > 0) + { + ((mleaf_t *)node->children[1])->visframe = r_framecount; + node = nodestack[--nodestackpos]; + goto loc2; + } + } + } + else if (nodestackpos > 0) + { + node = nodestack[--nodestackpos]; + goto loc2; + } + } + else if ((int) r_solidworldnode.value == 1 && r_ser.value) + { + glpoly_t *poly; + msurface_t *surf, *endsurf; + tinyplane_t plane; + + surf = &cl.worldmodel->surfaces[cl.worldmodel->firstmodelsurface]; + endsurf = surf + cl.worldmodel->nummodelsurfaces; + for (;surf < endsurf;surf++) + { + if (PlaneDiff(r_origin, surf->plane) < 0) + { + 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); + } + } + } + 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++) + { + 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) { - surf->texturechain = surf->texinfo->texture->texturechain; - surf->texinfo->texture->texturechain = surf; + 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 - R_DrawSurf(surf, false, vertex); + { + 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 { - if (!(surf->flags & SURF_PLANEBACK)) + do { - surf->visframe = r_framecount; - c_faces++; - if (texsort) + surf = *mark++; + // make sure surfaces are only processed once + if (surf->worldnodeframe == r_framecount) + continue; + surf->worldnodeframe = r_framecount; + if (PlaneDist(r_origin, surf->plane) < surf->plane->dist) { - surf->texturechain = surf->texinfo->texture->texturechain; - surf->texinfo->texture->texturechain = surf; + if (surf->flags & SURF_PLANEBACK) + surf->visframe = r_framecount; } else - R_DrawSurf(surf, false, vertex); + { + if (!(surf->flags & SURF_PLANEBACK)) + surf->visframe = r_framecount; + } } + while (mark < endmark); } } - while (mark < endmark); } } } } -struct nodestack_s +/* +void RSurf_Callback(void *data, void *junk) { - int side; - mnode_t *node; - int noclipping; -} nodestack[8192]; + ((msurface_t *)data)->visframe = r_framecount; +} -/* -================ -R_WorldNode -================ -*/ -void R_WorldNode () +int R_FrustumTestPolygon(float *points, int numpoints, int stride); + +void RSurf_DoVisible(msurface_t *surf) { - int side, texsort = gl_texsort.value, vertex = gl_vertex.value, ca, cb, cc, cd, noclipping = false, oldclip = r_oldclip.value; - struct nodestack_s *nstack; - mnode_t *node; - mleaf_t *pleaf; - msurface_t *surf, *endsurf, **mark, **endmark; - nstack = nodestack; - - if (!(node = cl.worldmodel->nodes)) - return; + 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; - while(1) +/* +void RSurfLeaf_Callback(void *data) +{ + int portalstackpos = 0; + mleaf_t *leaf; + mportal_t *p, *portalstack[32768]; + msurface_t *surf, **mark, **endmark; + do { - if (oldclip) + + leaf = data; + if (leaf->visframe == r_framecount) + return; + leaf->visframe = r_framecount; + + c_leafs++; + + if (leaf->nummarksurfaces) { - if (R_CullBox(node->minmaxs, node->minmaxs+3)) + mark = leaf->firstmarksurface; + endmark = mark + leaf->nummarksurfaces; + do { -backupstack: - if (nstack <= nodestack) - break; - nstack--; - node = nstack->node; - side = nstack->side; - noclipping = nstack->noclipping; - goto loc0; + surf = *mark++; + // make sure surfaces are only processed once + if (surf->worldnodeframe == r_framecount) + continue; + surf->worldnodeframe = r_framecount; + if (PlaneDist(modelorg, surf->plane) < surf->plane->dist) + { + if (surf->flags & SURF_PLANEBACK) + RSurf_DoVisible(surf); + } + else + { + if (!(surf->flags & SURF_PLANEBACK)) + RSurf_DoVisible(surf); + } } + while (mark < endmark); } - else - if (!noclipping) + + // follow portals into other leafs + for (p = leaf->portals;p;p = p->next) { - ca = frustum[0].BoxOnPlaneSideFunc(node->minmaxs, node->minmaxs+3, &frustum[0]);if (ca == 2) goto backupstack; // completely clipped away - cb = frustum[1].BoxOnPlaneSideFunc(node->minmaxs, node->minmaxs+3, &frustum[1]);if (cb == 2) goto backupstack; // completely clipped away - cc = frustum[2].BoxOnPlaneSideFunc(node->minmaxs, node->minmaxs+3, &frustum[2]);if (cc == 2) goto backupstack; // completely clipped away - cd = frustum[3].BoxOnPlaneSideFunc(node->minmaxs, node->minmaxs+3, &frustum[3]);if (cd == 2) goto backupstack; // completely clipped away - if (ca == 0 && cb == 0 && cc == 0 && cd == 0) - noclipping = true; // not clipped at all, no need to clip any children of this node - // partially clipped node + 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; + } } - // if a leaf node, draw stuff - if (node->contents < 0) + } + while(portalstackpos); + RSurfLeaf_Callback(p->past); + // upon returning, R_ProcessSpans will notice that the spans have changed and restart the line, this is ok because we're not adding any polygons that aren't already behind the portal +} +*/ + +/* +// experimental and inferior to the other in recursion depth allowances +void R_PortalWorldNode (void) +{ +// int i, j; + mportal_t *p; + msurface_t *surf, **mark, **endmark; + mleaf_t *leaf, *llistbuffer[32768], **l, **llist; + + leaf = r_viewleaf; + leaf->visframe = r_framecount; + l = llist = &llistbuffer[0]; + *llist++ = r_viewleaf; + while (l < llist) + { + leaf = *l++; + + c_leafs++; + + if (leaf->nummarksurfaces) { - if (node->contents != CONTENTS_SOLID) + mark = leaf->firstmarksurface; + endmark = mark + leaf->nummarksurfaces; + do { - pleaf = (mleaf_t *)node; - - c_leafs++; - if (pleaf->nummarksurfaces) + 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) { - mark = pleaf->firstmarksurface; - endmark = mark + pleaf->nummarksurfaces; - do - { - (*mark)->visframe = r_framecount; - mark++; - } - while (mark < endmark); + if (surf->flags & SURF_PLANEBACK) + RSurf_DoVisible(surf); + } + else + { + if (!(surf->flags & SURF_PLANEBACK)) + RSurf_DoVisible(surf); } - - // deal with model fragments in this leaf - if (pleaf->efrags) - R_StoreEfrags (&pleaf->efrags); } + while (mark < endmark); + } - if (nstack <= nodestack) - break; - nstack--; - node = nstack->node; - side = nstack->side; - noclipping = nstack->noclipping; - 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; + } + } } - c_nodes++; +// 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; +// } +// } + } - // node is just a decision point, so go down the apropriate sides +// 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); +} +*/ - // 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) - { - nstack->node = node; - nstack->side = !side; // go down back side when we come back up - nstack->noclipping = noclipping; - nstack++; - node = node->children[side]; - continue; - } - side = !side; -loc0: +int r_portalframecount = 0; - // draw stuff - if (node->numsurfaces) - { - surf = cl.worldmodel->surfaces + node->firstsurface; - endsurf = surf + node->numsurfaces; +/* +void R_Portal_Callback(void *data, void *data2) +{ + mleaf_t *leaf = data; + if (!r_testvis.value) + ((mportal_t *)data2)->visframe = r_portalframecount; + if (leaf->visframe != r_framecount) + { + c_leafs++; + leaf->visframe = r_framecount; + } +} +*/ + +void R_PVSWorldNode() +{ + 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; - if (texsort) + 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) { - if (side) + 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 (surf->visframe == r_framecount && !(surf->flags & SURF_PLANEBACK)) + if (surf->flags & SURF_PLANEBACK) { - c_faces++; - surf->texturechain = surf->texinfo->texture->texturechain; - surf->texinfo->texture->texturechain = surf; + 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 - surf->visframe = -1; // LordHavoc: mark as not visible, so lighting will not touch it - surf++; } - while (surf < endsurf); + 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); + } } - else + while (mark < endmark); + } + else + { + 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 (surf->visframe == r_framecount && (surf->flags & SURF_PLANEBACK)) - { - c_faces++; - surf->texturechain = surf->texinfo->texture->texturechain; - surf->texinfo->texture->texturechain = surf; - } - else - surf->visframe = -1; // LordHavoc: mark as not visible, so lighting will not touch it - surf++; + if (surf->flags & SURF_PLANEBACK) + surf->visframe = r_framecount; + } + else + { + if (!(surf->flags & SURF_PLANEBACK)) + surf->visframe = r_framecount; } - while (surf < endsurf); } + while (mark < endmark); } - else + } + + // follow portals into other leafs + p = leaf->portals; + for (;p;p = p->next) + { + if (DotProduct(r_origin, p->plane.normal) < p->plane.dist) { - if (side) + leaf = p->past; + if (leaf->worldnodeframe != r_framecount) { - do + leaf->worldnodeframe = r_framecount; + if (leaf->contents != CONTENTS_SOLID) { - if (surf->visframe == r_framecount && !(surf->flags & SURF_PLANEBACK)) + i = (leaf - cl.worldmodel->leafs) - 1; + if (worldvis[i>>3] & (1<<(i&7))) { - c_faces++; - R_DrawSurf(surf, false, vertex); + if (R_NotCulledBox(leaf->mins, leaf->maxs)) + { + pstack[portalstack++] = p; + goto loc0; + + loc1: + p = pstack[--portalstack]; + } } - else - surf->visframe = -1; // LordHavoc: mark as not visible, so lighting will not touch it - surf++; } - while (surf < endsurf); } - else + } + } + + if (portalstack) + goto loc1; + } + else + { + 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) + { + c = *in++; + if (c) + { + for (i = 0, bit = 1;c;i++, bit <<= 1) { - do + if (c & bit) { - if (surf->visframe == r_framecount && (surf->flags & SURF_PLANEBACK)) + leafnum = (k << 3)+i+1; + if (leafnum > numleafs) + return; + c -= bit; + leaf = &model->leafs[leafnum]; + if (R_NotCulledBox(leaf->mins, leaf->maxs)) { - c_faces++; - R_DrawSurf(surf, false, vertex); + //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); + } + } } - else - surf->visframe = -1; // LordHavoc: mark as not visible, so lighting will not touch it - surf++; } - while (surf < endsurf); } + k++; } + else + k += *in++; } + } +} + +entity_t clworldent; - // recurse down the back side - if (node->children[side]->visframe == r_visframecount) +void R_DrawSurfaces (void) +{ + msurface_t *surf, *endsurf; + texture_t *t, *currentt; + int vertex = gl_vertex.value; + + currententity = &clworldent; + modelalpha = 1; + softwaretransformidentity(); + surf = &cl.worldmodel->surfaces[cl.worldmodel->firstmodelsurface]; + endsurf = surf + cl.worldmodel->nummodelsurfaces; + t = currentt = NULL; + for (;surf < endsurf;surf++) + { + if (surf->visframe == r_framecount) { - node = node->children[side]; - continue; + 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); + } } - - if (nstack <= nodestack) - break; - nstack--; - node = nstack->node; - side = nstack->side; - noclipping = nstack->noclipping; - goto loc0; } } +void R_DrawPortals(void) +{ + int drawportals, i, r, g, b; +// mleaf_t *leaf, *endleaf; + mportal_t *portal, *endportal; + mvertex_t *point/*, *endpoint*/; + drawportals = (int)r_drawportals.value; + if (drawportals < 1) + return; + /* + leaf = cl.worldmodel->leafs; + endleaf = leaf + cl.worldmodel->numleafs; + for (;leaf < endleaf;leaf++) + { + if (leaf->visframe == r_framecount && leaf->portals) + { + i = leaf - cl.worldmodel->leafs; + r = (i & 0x0007) << 5; + g = (i & 0x0038) << 2; + b = (i & 0x01C0) >> 1; + portal = leaf->portals; + while (portal) + { + transpolybegin(0, 0, 0, TPOLYTYPE_ALPHA); + point = portal->points + portal->numpoints - 1; + endpoint = portal->points; + for (;point >= endpoint;point--) + transpolyvertub(point->position[0], point->position[1], point->position[2], 0, 0, r, g, b, 32); + transpolyend(); + portal = portal->next; + } + } + } + */ + portal = cl.worldmodel->portals; + endportal = portal + cl.worldmodel->numportals; + for (;portal < endportal;portal++) + { + 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 + { + 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); + } + transpolyend(); + } + } +} /* ============= @@ -1191,88 +1962,33 @@ R_DrawWorld */ void R_DrawWorld (void) { - entity_t ent; + wateralpha = bound(0, r_wateralpha.value*255.0f, 255); + vertexworld = gl_vertex.value; - 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; + 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; - VectorCopy (r_refdef.vieworg, modelorg); + VectorCopy (r_origin, modelorg); - currententity = &ent; + currententity = &clworldent; softwaretransformidentity(); // LordHavoc: clear transform if (cl.worldmodel) { - if (r_newworldnode.value) - R_NewWorldNode (); + if (r_novis.value || r_viewleaf->compressed_vis == NULL) + R_SolidWorldNode (); else - R_WorldNode (); - } - - R_PushDlights (); // now mark the lit surfaces - - DrawTextureChains (); -} - - -/* -=============== -R_MarkLeaves -=============== -*/ -void R_MarkLeaves (void) -{ - byte *vis; - mnode_t *node; - int i; - - if (r_oldviewleaf == r_viewleaf && !r_novis.value) - return; - - r_visframecount++; - r_oldviewleaf = r_viewleaf; - - if (r_novis.value) - { - for (i=0 ; inumleafs ; i++) - { - node = (mnode_t *)&cl.worldmodel->leafs[i+1]; - do - { - if (node->visframe == r_visframecount) - break; - node->visframe = r_visframecount; - node = node->parent; - } while (node); - } - } - else - { - vis = Mod_LeafPVS (r_viewleaf, cl.worldmodel); - - for (i=0 ; inumleafs ; i++) { - if (vis[i>>3] & (1<<(i&7))) - { - node = (mnode_t *)&cl.worldmodel->leafs[i+1]; - do - { - if (node->visframe == r_visframecount) - break; - node->visframe = r_visframecount; - node = node->parent; - } while (node); - } +// R_MarkLeaves (); + R_PVSWorldNode (); } } } - - /* ============================================================================= @@ -1288,11 +2004,11 @@ int AllocBlock (int w, int h, short *x, short *y) int best, best2; int texnum; - for (texnum=0 ; texnumedges; + pedges = model->edges; lnumverts = fa->numedges; - vertpage = 0; // // draw texture // - poly = Hunk_AllocName (sizeof(glpoly_t) + (lnumverts-4) * VERTEXSIZE*sizeof(float), "surfaces"); + poly = Hunk_AllocName (sizeof(glpolysizeof_t) + lnumverts * sizeof(float[VERTEXSIZE]), "surfaces"); poly->next = fa->polys; - poly->flags = fa->flags; fa->polys = poly; +// poly->flags = fa->flags; poly->numverts = lnumverts; for (i=0 ; isurfedges[fa->firstedge + i]; + lindex = model->surfedges[fa->firstedge + i]; if (lindex > 0) - { - r_pedge = &pedges[lindex]; - vec = r_pcurrentvertbase[r_pedge->v[0]].position; - } + vec = vertices[pedges[lindex].v[0]].position; else - { - r_pedge = &pedges[-lindex]; - vec = r_pcurrentvertbase[r_pedge->v[1]].position; - } + 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]; @@ -1446,7 +2152,7 @@ void BuildSurfaceDisplayList (msurface_t *fa) // 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[1] - v2[1] ) <= COLINEAR_EPSILON) && (fabs( v1[2] - v2[2] ) <= COLINEAR_EPSILON)) { int j; @@ -1462,9 +2168,9 @@ void BuildSurfaceDisplayList (msurface_t *fa) --i; } } + poly->numverts = lnumverts; } */ - poly->numverts = lnumverts; } /* @@ -1559,10 +2265,7 @@ void GL_BuildLightmaps (void) } if (!lightmap_textures) - { - lightmap_textures = texture_extension_number; - texture_extension_number += MAX_LIGHTMAPS; - } + lightmap_textures = R_GetTextureSlots(MAX_LIGHTMAPS); for (j=1 ; jname[0] == '*') continue; - r_pcurrentvertbase = m->vertexes; - currentmodel = m; for (i=0 ; inumsurfaces ; i++) { if ( m->surfaces[i].flags & SURF_DRAWTURB ) @@ -1580,15 +2281,18 @@ void GL_BuildLightmaps (void) if ( m->surfaces[i].flags & SURF_DRAWSKY ) continue; GL_CreateSurfaceLightmap (m->surfaces + i); - BuildSurfaceDisplayList (m->surfaces + i); + BuildSurfaceDisplayList (m, m->vertexes, m->surfaces + i); } } if (nosubimage || nosubimagefragments) { + // LordHavoc: switch to second TMU as an upload hint for voodoo2 + // (don't know if it really pays attention or not, but original + // glquake did this...) if(r_upload.value) if (gl_mtexable) - qglSelectTexture(gl_mtex_enum+1); + qglActiveTexture(GL_TEXTURE1_ARB); for (i = 0;i < MAX_LIGHTMAPS;i++) { if (!allocated[i][0]) @@ -1608,7 +2312,7 @@ void GL_BuildLightmaps (void) } if(r_upload.value) if (gl_mtexable) - qglSelectTexture(gl_mtex_enum+0); + qglActiveTexture(GL_TEXTURE0_ARB); } }