#define MAX_LIGHTMAP_SIZE 256
-static signed int blocklights[MAX_LIGHTMAP_SIZE*MAX_LIGHTMAP_SIZE*3]; // LordHavoc: *3 for colored lighting
+static unsigned int intblocklights[MAX_LIGHTMAP_SIZE*MAX_LIGHTMAP_SIZE*3]; // LordHavoc: *3 for colored lighting
+static float floatblocklights[MAX_LIGHTMAP_SIZE*MAX_LIGHTMAP_SIZE*3]; // LordHavoc: *3 for colored lighting
static qbyte templight[MAX_LIGHTMAP_SIZE*MAX_LIGHTMAP_SIZE*4];
cvar_t r_dlightmap = {CVAR_SAVE, "r_dlightmap", "1"};
cvar_t r_drawportals = {0, "r_drawportals", "0"};
cvar_t r_testvis = {0, "r_testvis", "0"};
-
-static void gl_surf_start(void)
-{
-}
-
-static void gl_surf_shutdown(void)
-{
-}
-
-static void gl_surf_newmap(void)
-{
-}
+cvar_t r_floatbuildlightmap = {0, "r_floatbuildlightmap", "0"};
+cvar_t r_detailtextures = {CVAR_SAVE, "r_detailtextures", "1"};
static int dlightdivtable[32768];
-void GL_Surf_Init(void)
-{
- int i;
- dlightdivtable[0] = 4194304;
- for (i = 1;i < 32768;i++)
- dlightdivtable[i] = 4194304 / (i << 7);
-
- Cvar_RegisterVariable(&r_ambient);
- Cvar_RegisterVariable(&r_vertexsurfaces);
- Cvar_RegisterVariable(&r_dlightmap);
- Cvar_RegisterVariable(&r_drawportals);
- Cvar_RegisterVariable(&r_testvis);
-
- R_RegisterModule("GL_Surf", gl_surf_start, gl_surf_shutdown, gl_surf_newmap);
-}
-
-static int R_AddDynamicLights (msurface_t *surf)
+static int R_IntAddDynamicLights (msurface_t *surf)
{
- int sdtable[256], lnum, td, maxdist, maxdist2, maxdist3, i, s, t, smax, tmax, smax3, red, green, blue, lit, dist2, impacts, impactt, subtract;
+ int sdtable[256], lnum, td, maxdist, maxdist2, maxdist3, i, s, t, smax, tmax, smax3, red, green, blue, lit, dist2, impacts, impactt, subtract;
unsigned int *bl;
- float dist;
- vec3_t impact, local;
+ float dist, impact[3], local[3];
// LordHavoc: use 64bit integer... shame it's not very standardized...
#if _MSC_VER || __BORLANDC__
smax = (surf->extents[0] >> 4) + 1;
tmax = (surf->extents[1] >> 4) + 1;
+ smax3 = smax * 3;
for (lnum = 0; lnum < r_numdlights; lnum++)
{
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
// compensate for LIGHTOFFSET
maxdist = (int) r_dlight[lnum].cullradius2 + LIGHTOFFSET;
- // already clamped, skip this
- // clamp radius to avoid exceeding 32768 entry division table
- //if (maxdist > 4194304)
- // maxdist = 4194304;
-
dist2 = dist * dist;
dist2 += LIGHTOFFSET;
if (dist2 >= maxdist)
continue;
- impact[0] = local[0] - surf->plane->normal[0] * dist;
- impact[1] = local[1] - surf->plane->normal[1] * dist;
- impact[2] = local[2] - surf->plane->normal[2] * dist;
+ if (surf->plane->type < 3)
+ {
+ VectorCopy(local, impact);
+ impact[surf->plane->type] -= dist;
+ }
+ else
+ {
+ impact[0] = local[0] - surf->plane->normal[0] * dist;
+ impact[1] = local[1] - surf->plane->normal[1] * dist;
+ impact[2] = local[2] - surf->plane->normal[2] * dist;
+ }
impacts = DotProduct (impact, surf->texinfo->vecs[0]) + surf->texinfo->vecs[0][3] - surf->texturemins[0];
impactt = DotProduct (impact, surf->texinfo->vecs[1]) + surf->texinfo->vecs[1][3] - surf->texturemins[1];
red = r_dlight[lnum].light[0];
green = r_dlight[lnum].light[1];
blue = r_dlight[lnum].light[2];
- subtract = (int) (r_dlight[lnum].lightsubtract * 4194304.0f);
- bl = blocklights;
- smax3 = smax * 3;
+ subtract = (int) (r_dlight[lnum].subtract * 4194304.0f);
+ bl = intblocklights;
i = impactt;
for (t = 0;t < tmax;t++, i -= 16)
k = dlightdivtable[(sdtable[s] + td) >> 7] - subtract;
if (k > 0)
{
- bl[0] += (red * k) >> 8;
- bl[1] += (green * k) >> 8;
- bl[2] += (blue * k) >> 8;
+ bl[0] += (red * k) >> 7;
+ bl[1] += (green * k) >> 7;
+ bl[2] += (blue * k) >> 7;
lit = true;
}
}
return lit;
}
+static int R_FloatAddDynamicLights (msurface_t *surf)
+{
+ int lnum, s, t, smax, tmax, smax3, lit, impacts, impactt;
+ float sdtable[256], *bl, k, dist, dist2, maxdist, maxdist2, maxdist3, td1, td, red, green, blue, impact[3], local[3], subtract;
+
+ lit = false;
+
+ smax = (surf->extents[0] >> 4) + 1;
+ tmax = (surf->extents[1] >> 4) + 1;
+ smax3 = smax * 3;
+
+ for (lnum = 0; lnum < r_numdlights; lnum++)
+ {
+ if (!(surf->dlightbits[lnum >> 5] & (1 << (lnum & 31))))
+ continue; // not lit by this light
+
+ softwareuntransform(r_dlight[lnum].origin, local);
+ dist = DotProduct (local, surf->plane->normal) - surf->plane->dist;
+
+ // for comparisons to minimum acceptable light
+ // compensate for LIGHTOFFSET
+ maxdist = (int) r_dlight[lnum].cullradius2 + LIGHTOFFSET;
+
+ dist2 = dist * dist;
+ dist2 += LIGHTOFFSET;
+ if (dist2 >= maxdist)
+ continue;
+
+ if (surf->plane->type < 3)
+ {
+ VectorCopy(local, impact);
+ impact[surf->plane->type] -= dist;
+ }
+ else
+ {
+ impact[0] = local[0] - surf->plane->normal[0] * dist;
+ impact[1] = local[1] - surf->plane->normal[1] * dist;
+ impact[2] = local[2] - surf->plane->normal[2] * dist;
+ }
+
+ impacts = DotProduct (impact, surf->texinfo->vecs[0]) + surf->texinfo->vecs[0][3] - surf->texturemins[0];
+ impactt = DotProduct (impact, surf->texinfo->vecs[1]) + surf->texinfo->vecs[1][3] - surf->texturemins[1];
+
+ td = bound(0, impacts, smax * 16) - impacts;
+ td1 = bound(0, impactt, tmax * 16) - impactt;
+ td = td * td + td1 * td1 + dist2;
+ if (td > maxdist)
+ continue;
+
+ // reduce calculations
+ for (s = 0, td1 = impacts; s < smax; s++, td1 -= 16.0f)
+ sdtable[s] = td1 * td1 + dist2;
+
+ maxdist3 = maxdist - dist2;
+
+ // convert to 8.8 blocklights format
+ red = r_dlight[lnum].light[0];
+ green = r_dlight[lnum].light[1];
+ blue = r_dlight[lnum].light[2];
+ subtract = r_dlight[lnum].subtract * 32768.0f;
+ bl = floatblocklights;
+
+ td1 = impactt;
+ for (t = 0;t < tmax;t++, td1 -= 16.0f)
+ {
+ td = td1 * td1;
+ // make sure some part of it is visible on this line
+ if (td < maxdist3)
+ {
+ maxdist2 = maxdist - td;
+ for (s = 0;s < smax;s++)
+ {
+ if (sdtable[s] < maxdist2)
+ {
+ k = (32768.0f / (sdtable[s] + td)) - subtract;
+ bl[0] += red * k;
+ bl[1] += green * k;
+ bl[2] += blue * k;
+ lit = true;
+ }
+ bl += 3;
+ }
+ }
+ else // skip line
+ bl += smax3;
+ }
+ }
+ return lit;
+}
+
+/*
+===============
+R_BuildLightMap
+
+Combine and scale multiple lightmaps into the 8.8 format in blocklights
+===============
+*/
+static void R_BuildLightMap (const entity_render_t *ent, msurface_t *surf, int dlightchanged)
+{
+ if (!r_floatbuildlightmap.integer)
+ {
+ int smax, tmax, i, j, size, size3, shift, maps, stride, l;
+ unsigned int *bl, scale;
+ qbyte *lightmap, *out, *stain;
+
+ // update cached lighting info
+ surf->cached_dlight = 0;
+ surf->cached_lightscalebit = lightscalebit;
+ surf->cached_ambient = r_ambient.value;
+ surf->cached_light[0] = d_lightstylevalue[surf->styles[0]];
+ surf->cached_light[1] = d_lightstylevalue[surf->styles[1]];
+ surf->cached_light[2] = d_lightstylevalue[surf->styles[2]];
+ surf->cached_light[3] = d_lightstylevalue[surf->styles[3]];
+
+ smax = (surf->extents[0]>>4)+1;
+ tmax = (surf->extents[1]>>4)+1;
+ size = smax*tmax;
+ size3 = size*3;
+ lightmap = surf->samples;
+
+ // set to full bright if no light data
+ bl = intblocklights;
+ if ((ent->effects & EF_FULLBRIGHT) || !ent->model->lightdata)
+ {
+ for (i = 0;i < size3;i++)
+ bl[i] = 255*256;
+ }
+ else
+ {
+ // clear to no light
+ j = r_ambient.value * 512.0f; // would be 128.0f logically, but using 512.0f to match winquake style
+ if (j)
+ {
+ for (i = 0;i < size3;i++)
+ *bl++ = j;
+ }
+ else
+ memset(bl, 0, size*3*sizeof(unsigned int));
+
+ if (surf->dlightframe == r_framecount && r_dlightmap.integer)
+ {
+ surf->cached_dlight = R_IntAddDynamicLights(surf);
+ if (surf->cached_dlight)
+ c_light_polys++;
+ else if (dlightchanged)
+ return; // don't upload if only updating dlights and none mattered
+ }
+
+ // add all the lightmaps
+ if (lightmap)
+ {
+ bl = intblocklights;
+ for (maps = 0;maps < MAXLIGHTMAPS && surf->styles[maps] != 255;maps++, lightmap += size3)
+ for (scale = d_lightstylevalue[surf->styles[maps]], i = 0;i < size3;i++)
+ bl[i] += lightmap[i] * scale;
+ }
+ }
+
+ stain = surf->stainsamples;
+ bl = intblocklights;
+ out = templight;
+ // deal with lightmap brightness scale
+ shift = 7 + lightscalebit + 8;
+ if (ent->model->lightmaprgba)
+ {
+ stride = (surf->lightmaptexturestride - smax) * 4;
+ for (i = 0;i < tmax;i++, out += stride)
+ {
+ for (j = 0;j < smax;j++)
+ {
+ l = (*bl++ * *stain++) >> shift;*out++ = min(l, 255);
+ l = (*bl++ * *stain++) >> shift;*out++ = min(l, 255);
+ l = (*bl++ * *stain++) >> shift;*out++ = min(l, 255);
+ *out++ = 255;
+ }
+ }
+ }
+ else
+ {
+ stride = (surf->lightmaptexturestride - smax) * 3;
+ for (i = 0;i < tmax;i++, out += stride)
+ {
+ for (j = 0;j < smax;j++)
+ {
+ l = (*bl++ * *stain++) >> shift;*out++ = min(l, 255);
+ l = (*bl++ * *stain++) >> shift;*out++ = min(l, 255);
+ l = (*bl++ * *stain++) >> shift;*out++ = min(l, 255);
+ }
+ }
+ }
+
+ R_UpdateTexture(surf->lightmaptexture, templight);
+ }
+ else
+ {
+ int smax, tmax, i, j, size, size3, maps, stride, l;
+ float *bl, scale;
+ qbyte *lightmap, *out, *stain;
+
+ // update cached lighting info
+ surf->cached_dlight = 0;
+ surf->cached_lightscalebit = lightscalebit;
+ surf->cached_ambient = r_ambient.value;
+ surf->cached_light[0] = d_lightstylevalue[surf->styles[0]];
+ surf->cached_light[1] = d_lightstylevalue[surf->styles[1]];
+ surf->cached_light[2] = d_lightstylevalue[surf->styles[2]];
+ surf->cached_light[3] = d_lightstylevalue[surf->styles[3]];
+
+ smax = (surf->extents[0]>>4)+1;
+ tmax = (surf->extents[1]>>4)+1;
+ size = smax*tmax;
+ size3 = size*3;
+ lightmap = surf->samples;
+
+ // set to full bright if no light data
+ bl = floatblocklights;
+ if ((ent->effects & EF_FULLBRIGHT) || !ent->model->lightdata)
+ j = 255*256;
+ else
+ j = r_ambient.value * 512.0f; // would be 128.0f logically, but using 512.0f to match winquake style
+
+ // clear to no light
+ if (j)
+ {
+ for (i = 0;i < size3;i++)
+ *bl++ = j;
+ }
+ else
+ memset(bl, 0, size*3*sizeof(float));
+
+ if (surf->dlightframe == r_framecount && r_dlightmap.integer)
+ {
+ surf->cached_dlight = R_FloatAddDynamicLights(surf);
+ if (surf->cached_dlight)
+ c_light_polys++;
+ else if (dlightchanged)
+ return; // don't upload if only updating dlights and none mattered
+ }
+
+ // add all the lightmaps
+ if (lightmap)
+ {
+ bl = floatblocklights;
+ for (maps = 0;maps < MAXLIGHTMAPS && surf->styles[maps] != 255;maps++, lightmap += size3)
+ for (scale = d_lightstylevalue[surf->styles[maps]], i = 0;i < size3;i++)
+ bl[i] += lightmap[i] * scale;
+ }
+
+ stain = surf->stainsamples;
+ bl = floatblocklights;
+ out = templight;
+ // deal with lightmap brightness scale
+ scale = 1.0f / (1 << (7 + lightscalebit + 8));
+ if (ent->model->lightmaprgba)
+ {
+ stride = (surf->lightmaptexturestride - smax) * 4;
+ for (i = 0;i < tmax;i++, out += stride)
+ {
+ for (j = 0;j < smax;j++)
+ {
+ l = *bl++ * *stain++ * scale;*out++ = min(l, 255);
+ l = *bl++ * *stain++ * scale;*out++ = min(l, 255);
+ l = *bl++ * *stain++ * scale;*out++ = min(l, 255);
+ *out++ = 255;
+ }
+ }
+ }
+ else
+ {
+ stride = (surf->lightmaptexturestride - smax) * 3;
+ for (i = 0;i < tmax;i++, out += stride)
+ {
+ for (j = 0;j < smax;j++)
+ {
+ l = *bl++ * *stain++ * scale;*out++ = min(l, 255);
+ l = *bl++ * *stain++ * scale;*out++ = min(l, 255);
+ l = *bl++ * *stain++ * scale;*out++ = min(l, 255);
+ }
+ }
+ }
+
+ R_UpdateTexture(surf->lightmaptexture, templight);
+ }
+}
+
void R_StainNode (mnode_t *node, model_t *model, vec3_t origin, float radius, int icolor[8])
{
float ndist;
// for comparisons to minimum acceptable light
- // compensate for 4096 offset
- maxdist = radius * radius + 4096;
+ // compensate for 256 offset
+ maxdist = radius * radius + 256.0f;
// clamp radius to avoid exceeding 32768 entry division table
if (maxdist > 4194304)
goto loc0;
}
- dist2 = ndist * ndist;
- dist2 += 4096.0f;
+ dist2 = ndist * ndist + 256.0f;
if (dist2 < maxdist)
{
maxdist3 = maxdist - dist2;
- impact[0] = origin[0] - node->plane->normal[0] * ndist;
- impact[1] = origin[1] - node->plane->normal[1] * ndist;
- impact[2] = origin[2] - node->plane->normal[2] * ndist;
+ if (node->plane->type < 3)
+ {
+ VectorCopy(origin, impact);
+ impact[node->plane->type] -= ndist;
+ }
+ else
+ {
+ impact[0] = origin[0] - node->plane->normal[0] * ndist;
+ impact[1] = origin[1] - node->plane->normal[1] * ndist;
+ impact[2] = origin[2] - node->plane->normal[2] * ndist;
+ }
for (surf = model->surfaces + node->firstsurface, endsurf = surf + node->numsurfaces;surf < endsurf;surf++)
{
icolor[7] = ca2;
model = cl.worldmodel;
- softwaretransformidentity();
R_StainNode(model->nodes + model->hulls[0].firstclipnode, model, origin, radius, icolor);
// look for embedded bmodels
- for (n = 1;n < MAX_EDICTS;n++)
+ for (n = 0;n < cl_num_brushmodel_entities;n++)
{
- ent = &cl_entities[n].render;
+ ent = cl_brushmodel_entities[n];
model = ent->model;
if (model && model->name[0] == '*')
{
Mod_CheckLoaded(model);
if (model->type == mod_brush)
{
- softwaretransformforentity(ent);
- softwareuntransform(origin, org);
+ Matrix4x4_Transform(&ent->inversematrix, origin, org);
R_StainNode(model->nodes + model->hulls[0].firstclipnode, model, org, radius, icolor);
}
}
}
}
+
/*
-===============
-R_BuildLightMap
+=============================================================
-Combine and scale multiple lightmaps into the 8.8 format in blocklights
-===============
+ BRUSH MODELS
+
+=============================================================
*/
-static void R_BuildLightMap (msurface_t *surf, int dlightchanged)
+
+static void RSurf_CopyXYZ(const surfvertex_t *in, float *out, int numverts)
{
- int smax, tmax, i, j, size, size3, shift, scale, maps, *bl, stride, l;
- qbyte *lightmap, *out, *stain;
-
- // update cached lighting info
- surf->cached_dlight = 0;
- surf->cached_lightscalebit = lightscalebit;
- surf->cached_ambient = r_ambient.value;
- surf->cached_light[0] = d_lightstylevalue[surf->styles[0]];
- surf->cached_light[1] = d_lightstylevalue[surf->styles[1]];
- surf->cached_light[2] = d_lightstylevalue[surf->styles[2]];
- surf->cached_light[3] = d_lightstylevalue[surf->styles[3]];
-
- smax = (surf->extents[0]>>4)+1;
- tmax = (surf->extents[1]>>4)+1;
- size = smax*tmax;
- size3 = size*3;
- lightmap = surf->samples;
-
-// set to full bright if no light data
- if ((currentrenderentity->effects & EF_FULLBRIGHT) || !cl.worldmodel->lightdata)
- {
- bl = blocklights;
- for (i = 0;i < size;i++)
- {
- *bl++ = 255*256;
- *bl++ = 255*256;
- *bl++ = 255*256;
- }
- }
- else
+ int i;
+ for (i = 0;i < numverts;i++, in++, out += 4)
{
-// clear to no light
- j = r_ambient.value * 512.0f; // would be 256.0f logically, but using 512.0f to match winquake style
- if (j)
- {
- bl = blocklights;
- for (i = 0;i < size3;i++)
- *bl++ = j;
- }
- else
- memset(&blocklights[0], 0, size*3*sizeof(int));
+ VectorCopy(in->v, out);
+ out[3] = 1;
+ }
+}
- if (surf->dlightframe == r_framecount && r_dlightmap.integer)
- {
- surf->cached_dlight = R_AddDynamicLights(surf);
- if (surf->cached_dlight)
- c_light_polys++;
- else if (dlightchanged)
- return; // don't upload if only updating dlights and none mattered
- }
+static void RSurf_CopyST(const surfvertex_t *in, float *out, int numverts)
+{
+ int i;
+ for (i = 0;i < numverts;i++, in++, out += 2)
+ {
+ out[0] = in->st[0];
+ out[1] = in->st[1];
+ }
+}
-// add all the lightmaps
- if (lightmap)
- for (maps = 0;maps < MAXLIGHTMAPS && surf->styles[maps] != 255;maps++)
- for (scale = d_lightstylevalue[surf->styles[maps]], bl = blocklights, i = 0;i < size3;i++)
- *bl++ += *lightmap++ * scale;
+static void RSurf_CopyUV(const surfvertex_t *in, float *out, int numverts)
+{
+ int i;
+ for (i = 0;i < numverts;i++, in++, out += 2)
+ {
+ out[0] = in->uv[0];
+ out[1] = in->uv[1];
}
+}
- stain = surf->stainsamples;
- if (stain)
- for (bl = blocklights, i = 0;i < size3;i++)
- if (stain[i] < 255)
- bl[i] = (bl[i] * stain[i]) >> 8;
+static void RSurf_CopyAB(const surfvertex_t *in, float *out, int numverts)
+{
+ int i;
+ for (i = 0;i < numverts;i++, in++, out += 2)
+ {
+ out[0] = in->ab[0];
+ out[1] = in->ab[1];
+ }
+}
- bl = blocklights;
- out = templight;
- // deal with lightmap brightness scale
- shift = 7 + lightscalebit;
- if (currentrenderentity->model->lightmaprgba)
+static void RSurf_AddLightmapToVertexColors(const surfvertex_t *in, float *c, int numverts, const qbyte *samples, int size3, const qbyte *styles)
+{
+ int i;
+ float scale;
+ const qbyte *lm;
+ if (styles[0] != 255)
{
- stride = (surf->lightmaptexturestride - smax) * 4;
- for (i = 0;i < tmax;i++, out += stride)
+ for (i = 0;i < numverts;i++, in++, c += 4)
{
- for (j = 0;j < smax;j++)
+ lm = samples + in->lightmapoffset;
+ scale = d_lightstylevalue[styles[0]] * (1.0f / 32768.0f);
+ VectorMA(c, scale, lm, c);
+ if (styles[1] != 255)
{
- l = *bl++ >> shift;*out++ = min(l, 255);
- l = *bl++ >> shift;*out++ = min(l, 255);
- l = *bl++ >> shift;*out++ = min(l, 255);
- *out++ = 255;
+ lm += size3;
+ scale = d_lightstylevalue[styles[1]] * (1.0f / 32768.0f);
+ VectorMA(c, scale, lm, c);
+ if (styles[2] != 255)
+ {
+ lm += size3;
+ scale = d_lightstylevalue[styles[2]] * (1.0f / 32768.0f);
+ VectorMA(c, scale, lm, c);
+ if (styles[3] != 255)
+ {
+ lm += size3;
+ scale = d_lightstylevalue[styles[3]] * (1.0f / 32768.0f);
+ VectorMA(c, scale, lm, c);
+ }
+ }
}
}
}
- else
+}
+
+static void RSurf_FogColors(const float *v, float *c, float colorscale, int numverts, const float *modelorg)
+{
+ int i;
+ float diff[3], f;
+ if (fogenabled)
{
- stride = (surf->lightmaptexturestride - smax) * 3;
- for (i = 0;i < tmax;i++, out += stride)
+ for (i = 0;i < numverts;i++, v += 4, c += 4)
{
- for (j = 0;j < smax;j++)
- {
- l = *bl++ >> shift;*out++ = min(l, 255);
- l = *bl++ >> shift;*out++ = min(l, 255);
- l = *bl++ >> shift;*out++ = min(l, 255);
- }
+ VectorSubtract(v, modelorg, diff);
+ f = colorscale * (1 - exp(fogdensity/DotProduct(diff, diff)));
+ VectorScale(c, f, c);
}
}
-
- R_UpdateTexture(surf->lightmaptexture, templight);
+ else if (colorscale != 1)
+ for (i = 0;i < numverts;i++, c += 4)
+ VectorScale(c, colorscale, c);
}
-/*
-===============
-R_TextureAnimation
-
-Returns the proper texture for a given time and base texture
-===============
-*/
-/*
-// note: this was manually inlined in R_PrepareSurfaces
-static texture_t *R_TextureAnimation (texture_t *base)
+static void RSurf_FoggedColors(const float *v, float *c, float r, float g, float b, float a, float colorscale, int numverts, const float *modelorg)
{
- if (currentrenderentity->frame && base->alternate_anims != NULL)
- base = base->alternate_anims;
-
- if (base->anim_total < 2)
- return base;
-
- return base->anim_frames[(int)(cl.time * 5.0f) % base->anim_total];
+ int i;
+ float diff[3], f;
+ r *= colorscale;
+ g *= colorscale;
+ b *= colorscale;
+ if (fogenabled)
+ {
+ for (i = 0;i < numverts;i++, v += 4, c += 4)
+ {
+ VectorSubtract(v, modelorg, diff);
+ f = 1 - exp(fogdensity/DotProduct(diff, diff));
+ c[0] = r * f;
+ c[1] = g * f;
+ c[2] = b * f;
+ c[3] = a;
+ }
+ }
+ else
+ {
+ for (i = 0;i < numverts;i++, c += 4)
+ {
+ c[0] = r;
+ c[1] = g;
+ c[2] = b;
+ c[3] = a;
+ }
+ }
}
-*/
+static void RSurf_FogPassColors(const float *v, float *c, float r, float g, float b, float a, float colorscale, int numverts, const float *modelorg)
+{
+ int i;
+ float diff[3], f;
+ r *= colorscale;
+ g *= colorscale;
+ b *= colorscale;
+ for (i = 0;i < numverts;i++, v += 4, c += 4)
+ {
+ VectorSubtract(v, modelorg, diff);
+ f = exp(fogdensity/DotProduct(diff, diff));
+ c[0] = r;
+ c[1] = g;
+ c[2] = b;
+ c[3] = a * f;
+ }
+}
-/*
-=============================================================
-
- BRUSH MODELS
-
-=============================================================
-*/
-
+static void RSurf_ScaleColors(float *c, float scale, int numverts)
+{
+ int i;
+ if (scale != 1)
+ for (i = 0;i < numverts;i++, c += 4)
+ VectorScale(c, scale, c);
+}
-static float turbsin[256] =
+static int RSurf_LightSeparate(const matrix4x4_t *matrix, const int *dlightbits, int numverts, const float *vert, float *color)
{
- #include "gl_warp_sin.h"
-};
-#define TURBSCALE (256.0 / (2 * M_PI))
+ float f;
+ const float *v;
+ float *c;
+ int i, l, lit = false;
+ rdlight_t *rd;
+ vec3_t lightorigin;
+ for (l = 0;l < r_numdlights;l++)
+ {
+ if (dlightbits[l >> 5] & (1 << (l & 31)))
+ {
+ rd = &r_dlight[l];
+ Matrix4x4_Transform(matrix, rd->origin, lightorigin);
+ for (i = 0, v = vert, c = color;i < numverts;i++, v += 4, c += 4)
+ {
+ f = VectorDistance2(v, lightorigin) + LIGHTOFFSET;
+ if (f < rd->cullradius2)
+ {
+ f = (1.0f / f) - rd->subtract;
+ VectorMA(c, f, rd->light, c);
+ lit = true;
+ }
+ }
+ }
+ }
+ return lit;
+}
-#define MAX_SURFVERTS 1024
-typedef struct
+// note: this untransforms lights to do the checking,
+// and takes surf->mesh->vertex data
+static int RSurf_LightCheck(const int *dlightbits, surfmesh_t *mesh)
{
- float v[4];
- float st[2];
- float uv[2];
- float c[4];
+ int i, l;
+ rdlight_t *rd;
+ vec3_t lightorigin;
+ surfvertex_t *sv;
+ for (l = 0;l < r_numdlights;l++)
+ {
+ if (dlightbits[l >> 5] & (1 << (l & 31)))
+ {
+ rd = &r_dlight[l];
+ softwareuntransform(rd->origin, lightorigin);
+ for (i = 0, sv = mesh->vertex;i < mesh->numverts;i++, sv++)
+ if (VectorDistance2(sv->v, lightorigin) < rd->cullradius2)
+ return true;
+ }
+ }
+ return false;
}
-surfvert_t;
-static surfvert_t svert[MAX_SURFVERTS]; // used by the following functions
-static void RSurfShader_Sky(msurface_t *firstsurf)
+static void RSurfShader_Sky(const entity_render_t *ent, const msurface_t *firstsurf)
{
- msurface_t *surf;
- int i;
- float number, length, dir[3], speedscale;
- surfvertex_t *v;
- surfvert_t *sv;
+ const msurface_t *surf;
surfmesh_t *mesh;
- rmeshinfo_t m;
+ rmeshbufferinfo_t m;
// LordHavoc: HalfLife maps have freaky skypolys...
- if (currentrenderentity->model->ishlbsp)
+ if (ent->model->ishlbsp)
return;
- if (skyrendermasked)
+ if (skyrendernow)
{
- if (skyrendernow)
- {
- skyrendernow = false;
+ skyrendernow = false;
+ if (skyrendermasked)
R_Sky();
- }
- for (surf = firstsurf;surf;surf = surf->chain)
+ }
+
+ // draw depth-only polys
+ memset(&m, 0, sizeof(m));
+ if (skyrendermasked)
+ {
+ m.blendfunc1 = GL_ZERO;
+ m.blendfunc2 = GL_ONE;
+ }
+ else
+ {
+ // fog sky
+ m.blendfunc1 = GL_ONE;
+ m.blendfunc2 = GL_ZERO;
+ }
+ m.depthwrite = true;
+ m.matrix = ent->matrix;
+ for (surf = firstsurf;surf;surf = surf->chain)
+ {
+ for (mesh = surf->mesh;mesh;mesh = mesh->chain)
{
- // draw depth-only polys
- memset(&m, 0, sizeof(m));
- m.transparent = false;
- m.blendfunc1 = GL_ZERO;
- m.blendfunc2 = GL_ONE;
- m.depthwrite = true;
- for (mesh = surf->mesh;mesh;mesh = mesh->chain)
+ m.numtriangles = mesh->numtriangles;
+ m.numverts = mesh->numverts;
+ if (R_Mesh_Draw_GetBuffer(&m, false))
{
- m.numtriangles = mesh->numtriangles;
- m.numverts = mesh->numverts;
- m.index = 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 = mesh->vertex;i < m.numverts;i++, sv++, v++)
- softwaretransform(v->v, sv->v);
- }
+ memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3]));
+ RSurf_CopyXYZ(mesh->vertex, m.vertex, m.numverts);
+ if (skyrendermasked)
+ memset(m.color, 0, m.numverts * sizeof(float[4]));
else
- {
- m.vertex = &mesh->vertex[0].v[0];
- m.vertexstep = sizeof(surfvertex_t);
- }
- R_Mesh_Draw(&m);
+ R_FillColors(m.color, m.numverts, fogcolor[0] * m.colorscale, fogcolor[1] * m.colorscale, fogcolor[2] * m.colorscale, 1);
+ R_Mesh_Render();
}
}
}
- else if (skyrenderglquake)
+}
+
+static void RSurfShader_Water_Callback(const void *calldata1, int calldata2)
+{
+ const entity_render_t *ent = calldata1;
+ msurface_t *surf = ent->model->surfaces + calldata2;
+ float f;
+ surfmesh_t *mesh;
+ rmeshbufferinfo_t m;
+ float alpha = ent->alpha * (surf->flags & SURF_DRAWNOALPHA ? 1 : r_wateralpha.value);
+ float modelorg[3];
+ Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg);
+
+ memset(&m, 0, sizeof(m));
+ if (ent->effects & EF_ADDITIVE)
{
- for (surf = firstsurf;surf;surf = surf->chain)
- {
- memset(&m, 0, sizeof(m));
- m.transparent = false;
- m.blendfunc1 = GL_ONE;
- m.blendfunc2 = GL_ZERO;
- m.vertex = &svert[0].v[0];
- m.vertexstep = sizeof(surfvert_t);
- m.cr = 1;
- m.cg = 1;
- m.cb = 1;
- m.ca = 1;
- m.tex[0] = R_GetTexture(solidskytexture);
- m.texcoords[0] = &svert[0].st[0];
- m.texcoordstep[0] = sizeof(surfvert_t);
- speedscale = cl.time * (8.0/128.0);
- speedscale -= (int)speedscale;
- for (mesh = surf->mesh;mesh;mesh = mesh->chain)
- {
- m.numtriangles = mesh->numtriangles;
- m.numverts = mesh->numverts;
- m.index = mesh->index;
- for (i = 0, sv = svert, v = 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
- *((int *)&length) = 0x5f3759df - ((* (int *) &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);
- }
- }
+ m.blendfunc1 = GL_SRC_ALPHA;
+ m.blendfunc2 = GL_ONE;
+ }
+ else if (surf->currenttexture->fogtexture != NULL || alpha < 1)
+ {
+ m.blendfunc1 = GL_SRC_ALPHA;
+ m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
}
else
{
- for (surf = firstsurf;surf;surf = surf->chain)
+ m.blendfunc1 = GL_ONE;
+ m.blendfunc2 = GL_ZERO;
+ }
+ m.tex[0] = R_GetTexture(surf->currenttexture->texture);
+ m.matrix = ent->matrix;
+ for (mesh = surf->mesh;mesh;mesh = mesh->chain)
+ {
+ m.numtriangles = mesh->numtriangles;
+ m.numverts = mesh->numverts;
+ if (R_Mesh_Draw_GetBuffer(&m, true))
{
- // flat color
- memset(&m, 0, sizeof(m));
- m.transparent = false;
- m.blendfunc1 = GL_ONE;
- m.blendfunc2 = GL_ZERO;
- m.cr = fogcolor[0];
- m.cg = fogcolor[1];
- m.cb = fogcolor[2];
- m.ca = 1;
- for (mesh = surf->mesh;mesh;mesh = mesh->chain)
+ memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3]));
+ RSurf_CopyXYZ(mesh->vertex, m.vertex, m.numverts);
+ RSurf_CopyST(mesh->vertex, m.texcoords[0], m.numverts);
+ f = surf->flags & SURF_DRAWFULLBRIGHT ? 1.0f : ((surf->flags & SURF_LIGHTMAP) ? 0 : 0.5f);
+ R_FillColors(m.color, m.numverts, f, f, f, alpha);
+ if (!(surf->flags & SURF_DRAWFULLBRIGHT || ent->effects & EF_FULLBRIGHT))
{
- m.numtriangles = mesh->numtriangles;
- m.numverts = mesh->numverts;
- m.index = mesh->index;
- if (softwaretransform_complexity)
- {
- m.vertex = &svert[0].v[0];
- m.vertexstep = sizeof(surfvert_t);
- for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++)
- softwaretransform(v->v, sv->v);
- }
- else
- {
- m.vertex = &mesh->vertex[0].v[0];
- m.vertexstep = sizeof(surfvertex_t);
- }
- R_Mesh_Draw(&m);
+ if (surf->dlightframe == r_framecount)
+ RSurf_LightSeparate(&ent->inversematrix, surf->dlightbits, m.numverts, m.vertex, m.color);
+ if (surf->flags & SURF_LIGHTMAP)
+ RSurf_AddLightmapToVertexColors(mesh->vertex, m.color, m.numverts, surf->samples, ((surf->extents[0]>>4)+1)*((surf->extents[1]>>4)+1)*3, surf->styles);
}
+ RSurf_FogColors(m.vertex, m.color, m.colorscale, m.numverts, modelorg);
+ R_Mesh_Render();
}
}
- if (skyrenderglquake)
+
+ if (fogenabled)
{
- for (surf = firstsurf;surf;surf = surf->chain)
+ memset(&m, 0, sizeof(m));
+ m.blendfunc1 = GL_SRC_ALPHA;
+ m.blendfunc2 = GL_ONE;
+ m.tex[0] = R_GetTexture(surf->currenttexture->fogtexture);
+ m.matrix = ent->matrix;
+ for (mesh = surf->mesh;mesh;mesh = mesh->chain)
{
- memset(&m, 0, sizeof(m));
- m.transparent = false;
- m.blendfunc1 = GL_SRC_ALPHA;
- m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
- 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 (mesh = surf->mesh;mesh;mesh = mesh->chain)
+ m.numtriangles = mesh->numtriangles;
+ m.numverts = mesh->numverts;
+ if (R_Mesh_Draw_GetBuffer(&m, false))
{
- m.numtriangles = mesh->numtriangles;
- m.numverts = mesh->numverts;
- m.index = mesh->index;
- for (i = 0, sv = svert, v = 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
- *((int *)&length) = 0x5f3759df - ((* (int *) &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);
+ memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3]));
+ RSurf_CopyXYZ(mesh->vertex, m.vertex, m.numverts);
+ if (m.tex[0])
+ RSurf_CopyST(mesh->vertex, m.texcoords[0], m.numverts);
+ RSurf_FogPassColors(m.vertex, m.color, fogcolor[0], fogcolor[1], fogcolor[2], alpha, m.colorscale, m.numverts, modelorg);
+ R_Mesh_Render();
}
}
}
}
-static int RSurf_Light(int *dlightbits, int numverts)
+static void RSurfShader_Water(const entity_render_t *ent, const msurface_t *firstsurf)
{
- float f;
- int i, l, lit = false;
- rdlight_t *rd;
- vec3_t lightorigin;
- surfvert_t *sv;
- for (l = 0;l < r_numdlights;l++)
+ const msurface_t *surf;
+ vec3_t center;
+ for (surf = firstsurf;surf;surf = surf->chain)
{
- if (dlightbits[l >> 5] & (1 << (l & 31)))
+ if ((r_wateralpha.value < 1 && !(surf->flags & SURF_DRAWNOALPHA)) || ent->effects & EF_ADDITIVE || surf->currenttexture->fogtexture)
{
- 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++)
- {
- f = VectorDistance2(sv->v, lightorigin) + LIGHTOFFSET;
- if (f < rd->cullradius2)
- {
- f = (1.0f / f) - rd->lightsubtract;
- sv->c[0] += rd->light[0] * f;
- sv->c[1] += rd->light[1] * f;
- sv->c[2] += rd->light[2] * f;
- lit = true;
- }
- }
+ Matrix4x4_Transform(&ent->matrix, surf->poly_center, center);
+ R_MeshQueue_AddTransparent(center, RSurfShader_Water_Callback, ent, surf - ent->model->surfaces);
}
+ else
+ R_MeshQueue_Add(RSurfShader_Water_Callback, ent, surf - ent->model->surfaces);
}
- return lit;
}
-static void RSurfShader_Water_Pass_Base(msurface_t *surf)
+static void RSurfShader_Wall_Pass_BaseVertex(const entity_render_t *ent, const msurface_t *surf)
{
- int i;
- float diff[3], alpha, ifog;
- surfvertex_t *v;
- surfvert_t *sv;
+ float base;
surfmesh_t *mesh;
- rmeshinfo_t m;
- alpha = currentrenderentity->alpha * (surf->flags & SURF_DRAWNOALPHA ? 1 : r_wateralpha.value);
-
+ rmeshbufferinfo_t m;
+ float modelorg[3];
+ Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg);
memset(&m, 0, sizeof(m));
- if (alpha != 1 || surf->currenttexture->fogtexture != NULL)
+ if (ent->effects & EF_ADDITIVE)
+ {
+ m.blendfunc1 = GL_SRC_ALPHA;
+ m.blendfunc2 = GL_ONE;
+ }
+ else if (surf->currenttexture->fogtexture != NULL || ent->alpha < 1)
{
- m.transparent = true;
m.blendfunc1 = GL_SRC_ALPHA;
m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
}
else
{
- m.transparent = false;
m.blendfunc1 = GL_ONE;
m.blendfunc2 = GL_ZERO;
}
- m.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(surf->currenttexture->texture);
- m.texcoords[0] = &svert[0].st[0];
- m.texcoordstep[0] = sizeof(surfvert_t);
+ base = ent->effects & EF_FULLBRIGHT ? 2.0f : r_ambient.value * (1.0f / 64.0f);
+ m.matrix = ent->matrix;
for (mesh = surf->mesh;mesh;mesh = mesh->chain)
{
m.numtriangles = mesh->numtriangles;
m.numverts = mesh->numverts;
- m.index = mesh->index;
- for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++)
+ if (R_Mesh_Draw_GetBuffer(&m, true))
{
- 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 (surf->flags & SURF_DRAWFULLBRIGHT)
+ memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3]));
+ RSurf_CopyXYZ(mesh->vertex, m.vertex, m.numverts);
+ RSurf_CopyST(mesh->vertex, m.texcoords[0], m.numverts);
+ R_FillColors(m.color, m.numverts, base, base, base, ent->alpha);
+ if (!(ent->effects & EF_FULLBRIGHT))
{
- 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;
+ if (surf->dlightframe == r_framecount)
+ RSurf_LightSeparate(&ent->inversematrix, surf->dlightbits, m.numverts, m.vertex, m.color);
+ if (surf->flags & SURF_LIGHTMAP)
+ RSurf_AddLightmapToVertexColors(mesh->vertex, m.color, m.numverts, surf->samples, ((surf->extents[0]>>4)+1)*((surf->extents[1]>>4)+1)*3, surf->styles);
}
- sv->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);
+ RSurf_FogColors(m.vertex, m.color, m.colorscale, m.numverts, modelorg);
+ R_Mesh_Render();
}
- if (surf->dlightframe == r_framecount && !(surf->flags & SURF_DRAWFULLBRIGHT))
- RSurf_Light(surf->dlightbits, m.numverts);
- if (fogenabled && (surf->flags & SURF_DRAWNOALPHA))
+ }
+}
+
+static void RSurfShader_Wall_Pass_BaseFullbright(const entity_render_t *ent, const msurface_t *surf)
+{
+ surfmesh_t *mesh;
+ rmeshbufferinfo_t m;
+ float modelorg[3];
+ Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg);
+ memset(&m, 0, sizeof(m));
+ if (ent->effects & EF_ADDITIVE)
+ {
+ m.blendfunc1 = GL_SRC_ALPHA;
+ m.blendfunc2 = GL_ONE;
+ }
+ else if (surf->currenttexture->fogtexture != NULL || ent->alpha < 1)
+ {
+ m.blendfunc1 = GL_SRC_ALPHA;
+ m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
+ }
+ else
+ {
+ m.blendfunc1 = GL_ONE;
+ m.blendfunc2 = GL_ZERO;
+ }
+ m.tex[0] = R_GetTexture(surf->currenttexture->texture);
+ m.matrix = ent->matrix;
+ for (mesh = surf->mesh;mesh;mesh = mesh->chain)
+ {
+ m.numtriangles = mesh->numtriangles;
+ m.numverts = mesh->numverts;
+ if (R_Mesh_Draw_GetBuffer(&m, false))
{
- for (i = 0, sv = svert;i < m.numverts;i++, sv++)
- {
- VectorSubtract(sv->v, r_origin, diff);
- ifog = 1 - exp(fogdensity/DotProduct(diff, diff));
- sv->c[0] *= ifog;
- sv->c[1] *= ifog;
- sv->c[2] *= ifog;
- }
+ memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3]));
+ RSurf_CopyXYZ(mesh->vertex, m.vertex, m.numverts);
+ RSurf_CopyST(mesh->vertex, m.texcoords[0], m.numverts);
+ RSurf_FoggedColors(m.vertex, m.color, 1, 1, 1, ent->alpha, m.colorscale, m.numverts, modelorg);
+ R_Mesh_Render();
}
- R_Mesh_Draw(&m);
}
}
-static void RSurfShader_Water_Pass_Glow(msurface_t *surf)
+static void RSurfShader_Wall_Pass_Glow(const entity_render_t *ent, const msurface_t *surf)
{
- int i;
- float diff[3], alpha, ifog;
- surfvertex_t *v;
- surfvert_t *sv;
surfmesh_t *mesh;
- rmeshinfo_t m;
- alpha = currentrenderentity->alpha * (surf->flags & SURF_DRAWNOALPHA ? 1 : r_wateralpha.value);
-
+ rmeshbufferinfo_t m;
+ float modelorg[3];
+ Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg);
memset(&m, 0, sizeof(m));
- m.transparent = alpha != 1 || surf->currenttexture->fogtexture != NULL;
m.blendfunc1 = GL_SRC_ALPHA;
m.blendfunc2 = GL_ONE;
- 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(surf->currenttexture->glowtexture);
- m.texcoords[0] = &svert[0].st[0];
- m.texcoordstep[0] = sizeof(surfvert_t);
+ m.matrix = ent->matrix;
for (mesh = surf->mesh;mesh;mesh = mesh->chain)
{
m.numtriangles = mesh->numtriangles;
m.numverts = mesh->numverts;
- m.index = mesh->index;
- if (fogenabled)
- {
- m.color = &svert[0].c[0];
- m.colorstep = sizeof(surfvert_t);
- for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++)
- {
- softwaretransform(v->v, sv->v);
- if (r_waterripple.value)
- sv->v[2] += r_waterripple.value * (1.0f / 64.0f) * turbsin[(int)((v->v[0]*(1.0f/32.0f)+cl.time) * TURBSCALE) & 255] * turbsin[(int)((v->v[1]*(1.0f/32.0f)+cl.time) * TURBSCALE) & 255];
- sv->st[0] = (v->st[0] + turbsin[(int)((v->st[1]*0.125f+cl.time) * TURBSCALE) & 255]) * (1.0f / 64.0f);
- sv->st[1] = (v->st[1] + turbsin[(int)((v->st[0]*0.125f+cl.time) * TURBSCALE) & 255]) * (1.0f / 64.0f);
- VectorSubtract(sv->v, r_origin, diff);
- ifog = 1 - exp(fogdensity/DotProduct(diff, diff));
- sv->c[0] = m.cr * ifog;
- sv->c[1] = m.cg * ifog;
- sv->c[2] = m.cb * ifog;
- sv->c[3] = m.ca;
- }
- }
- else
+ if (R_Mesh_Draw_GetBuffer(&m, false))
{
- for (i = 0, sv = svert, v = 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);
- }
+ memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3]));
+ RSurf_CopyXYZ(mesh->vertex, m.vertex, m.numverts);
+ RSurf_CopyST(mesh->vertex, m.texcoords[0], m.numverts);
+ RSurf_FoggedColors(m.vertex, m.color, 1, 1, 1, ent->alpha, m.colorscale, m.numverts, modelorg);
+ R_Mesh_Render();
}
- R_Mesh_Draw(&m);
}
}
-static void RSurfShader_Water_Pass_Fog(msurface_t *surf)
+static void RSurfShader_Wall_Pass_Fog(const entity_render_t *ent, const msurface_t *surf)
{
- int i;
- float alpha;
- surfvertex_t *v;
- surfvert_t *sv;
surfmesh_t *mesh;
- rmeshinfo_t m;
- vec3_t diff;
- alpha = currentrenderentity->alpha * (surf->flags & SURF_DRAWNOALPHA ? 1 : r_wateralpha.value);
-
+ rmeshbufferinfo_t m;
+ float modelorg[3];
+ Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg);
memset(&m, 0, sizeof(m));
- m.transparent = alpha != 1 || surf->currenttexture->fogtexture != NULL;
m.blendfunc1 = GL_SRC_ALPHA;
m.blendfunc2 = GL_ONE;
- m.vertex = &svert[0].v[0];
- m.vertexstep = sizeof(surfvert_t);
- m.color = &svert[0].c[0];
- m.colorstep = sizeof(surfvert_t);
+ m.matrix = ent->matrix;
m.tex[0] = R_GetTexture(surf->currenttexture->fogtexture);
- m.texcoords[0] = &svert[0].st[0];
- m.texcoordstep[0] = sizeof(surfvert_t);
-
for (mesh = surf->mesh;mesh;mesh = mesh->chain)
{
m.numtriangles = mesh->numtriangles;
m.numverts = mesh->numverts;
- m.index = mesh->index;
- for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++)
+ if (R_Mesh_Draw_GetBuffer(&m, false))
{
- 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];
+ memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3]));
+ RSurf_CopyXYZ(mesh->vertex, m.vertex, m.numverts);
if (m.tex[0])
- {
- sv->st[0] = (v->st[0] + turbsin[(int)((v->st[1]*0.125f+cl.time) * TURBSCALE) & 255]) * (1.0f / 64.0f);
- sv->st[1] = (v->st[1] + turbsin[(int)((v->st[0]*0.125f+cl.time) * TURBSCALE) & 255]) * (1.0f / 64.0f);
- }
- VectorSubtract(sv->v, r_origin, diff);
- sv->c[0] = fogcolor[0];
- sv->c[1] = fogcolor[1];
- sv->c[2] = fogcolor[2];
- sv->c[3] = alpha * exp(fogdensity/DotProduct(diff, diff));
+ RSurf_CopyST(mesh->vertex, m.texcoords[0], m.numverts);
+ RSurf_FogPassColors(m.vertex, m.color, fogcolor[0], fogcolor[1], fogcolor[2], ent->alpha, m.colorscale, m.numverts, modelorg);
+ R_Mesh_Render();
}
- R_Mesh_Draw(&m);
}
}
-static void RSurfShader_Water(msurface_t *firstsurf)
+static void RSurfShader_OpaqueWall_Pass_TripleTexCombine(const entity_render_t *ent, const msurface_t *surf)
{
- msurface_t *surf;
- for (surf = firstsurf;surf;surf = surf->chain)
- RSurfShader_Water_Pass_Base(surf);
- for (surf = firstsurf;surf;surf = surf->chain)
- if (surf->currenttexture->glowtexture)
- RSurfShader_Water_Pass_Glow(surf);
- if (fogenabled)
- for (surf = firstsurf;surf;surf = surf->chain)
- //if (currentrenderentity->alpha * (surf->flags & SURF_DRAWNOALPHA ? 1 : r_wateralpha.value) >= 1.0f)
- RSurfShader_Water_Pass_Fog(surf);
+ surfmesh_t *mesh;
+ rmeshbufferinfo_t m;
+ float cl;
+ memset(&m, 0, sizeof(m));
+ m.blendfunc1 = GL_ONE;
+ m.blendfunc2 = GL_ZERO;
+ m.tex[0] = R_GetTexture(surf->currenttexture->texture);
+ m.texrgbscale[0] = 1.0f;
+ m.tex[1] = R_GetTexture(surf->lightmaptexture);
+ m.texrgbscale[1] = 4.0f;
+ m.tex[2] = R_GetTexture(surf->currenttexture->detailtexture);
+ m.texrgbscale[2] = 2.0f;
+ m.matrix = ent->matrix;
+ for (mesh = surf->mesh;mesh;mesh = mesh->chain)
+ {
+ m.numtriangles = mesh->numtriangles;
+ m.numverts = mesh->numverts;
+ if (R_Mesh_Draw_GetBuffer(&m, false))
+ {
+ memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3]));
+ RSurf_CopyXYZ(mesh->vertex, m.vertex, m.numverts);
+ cl = (float) (1 << lightscalebit) * m.colorscale;
+ R_FillColors(m.color, m.numverts, cl, cl, cl, 1);
+ RSurf_CopyST(mesh->vertex, m.texcoords[0], m.numverts);
+ RSurf_CopyUV(mesh->vertex, m.texcoords[1], m.numverts);
+ RSurf_CopyAB(mesh->vertex, m.texcoords[2], m.numverts);
+ R_Mesh_Render();
+ }
+ }
}
-static void RSurfShader_Wall_Pass_BaseMTex(msurface_t *surf)
+static void RSurfShader_OpaqueWall_Pass_BaseMTex(const entity_render_t *ent, const msurface_t *surf)
{
- int i;
- float diff[3], ifog;
- surfvertex_t *v;
- surfvert_t *sv;
surfmesh_t *mesh;
- rmeshinfo_t m;
-
+ rmeshbufferinfo_t m;
+ float cl;
memset(&m, 0, sizeof(m));
- if (currentrenderentity->effects & EF_ADDITIVE)
- {
- m.transparent = true;
- m.blendfunc1 = GL_SRC_ALPHA;
- m.blendfunc2 = GL_ONE;
- }
- else if (surf->currenttexture->fogtexture != NULL || currentrenderentity->alpha != 1)
- {
- m.transparent = true;
- m.blendfunc1 = GL_SRC_ALPHA;
- m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
- }
- else
- {
- m.transparent = false;
- m.blendfunc1 = GL_ONE;
- m.blendfunc2 = GL_ZERO;
- }
- m.cr = m.cg = m.cb = (float) (1 << lightscalebit);
- m.ca = currentrenderentity->alpha;
+ m.blendfunc1 = GL_ONE;
+ m.blendfunc2 = GL_ZERO;
m.tex[0] = R_GetTexture(surf->currenttexture->texture);
m.tex[1] = R_GetTexture(surf->lightmaptexture);
- m.texcoordstep[0] = sizeof(surfvertex_t);
- m.texcoordstep[1] = sizeof(surfvertex_t);
+ m.matrix = ent->matrix;
for (mesh = surf->mesh;mesh;mesh = mesh->chain)
{
m.numtriangles = mesh->numtriangles;
m.numverts = mesh->numverts;
- m.index = mesh->index;
- m.texcoords[0] = &mesh->vertex->st[0];
- m.texcoords[1] = &mesh->vertex->uv[0];
- if (fogenabled)
+ if (R_Mesh_Draw_GetBuffer(&m, true))
{
- 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 = 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 = &mesh->vertex->v[0];
- m.vertexstep = sizeof(surfvertex_t);
- for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++)
- {
- VectorSubtract(v->v, r_origin, diff);
- ifog = 1 - exp(fogdensity/DotProduct(diff, diff));
- sv->c[0] = m.cr * ifog;
- sv->c[1] = m.cg * ifog;
- sv->c[2] = m.cb * ifog;
- sv->c[3] = m.ca;
- }
- }
+ memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3]));
+ RSurf_CopyXYZ(mesh->vertex, m.vertex, m.numverts);
+ cl = (float) (1 << lightscalebit) * m.colorscale;
+ R_FillColors(m.color, m.numverts, cl, cl, cl, 1);
+ RSurf_CopyST(mesh->vertex, m.texcoords[0], m.numverts);
+ RSurf_CopyUV(mesh->vertex, m.texcoords[1], m.numverts);
+ R_Mesh_Render();
}
- else
- {
- if (softwaretransform_complexity)
- {
- m.vertex = &svert[0].v[0];
- m.vertexstep = sizeof(surfvert_t);
- for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++)
- softwaretransform(v->v, sv->v);
- }
- else
- {
- m.vertex = &mesh->vertex->v[0];
- m.vertexstep = sizeof(surfvertex_t);
- }
- }
- R_Mesh_Draw(&m);
}
}
-static void RSurfShader_Wall_Pass_BaseTexture(msurface_t *surf)
+static void RSurfShader_OpaqueWall_Pass_BaseTexture(const entity_render_t *ent, const msurface_t *surf)
{
- int i;
- surfvertex_t *v;
- surfvert_t *sv;
surfmesh_t *mesh;
- rmeshinfo_t m;
-
+ rmeshbufferinfo_t m;
+ float cl;
memset(&m, 0, sizeof(m));
- m.transparent = false;
m.blendfunc1 = GL_ONE;
m.blendfunc2 = GL_ZERO;
- m.cr = m.cg = m.cb = (float) (1 << v_overbrightbits.integer);
- m.ca = 1;
m.tex[0] = R_GetTexture(surf->currenttexture->texture);
- m.texcoordstep[0] = sizeof(surfvertex_t);
+ m.matrix = ent->matrix;
for (mesh = surf->mesh;mesh;mesh = mesh->chain)
{
m.numtriangles = mesh->numtriangles;
m.numverts = mesh->numverts;
- m.index = mesh->index;
- m.texcoords[0] = &mesh->vertex->st[0];
- if (softwaretransform_complexity)
+ if (R_Mesh_Draw_GetBuffer(&m, false))
{
- m.vertex = &svert[0].v[0];
- m.vertexstep = sizeof(surfvert_t);
- for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++)
- softwaretransform(v->v, sv->v);
+ memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3]));
+ RSurf_CopyXYZ(mesh->vertex, m.vertex, m.numverts);
+ cl = m.colorscale;
+ R_FillColors(m.color, m.numverts, cl, cl, cl, 1);
+ RSurf_CopyST(mesh->vertex, m.texcoords[0], m.numverts);
+ R_Mesh_Render();
}
- else
- {
- m.vertex = &mesh->vertex->v[0];
- m.vertexstep = sizeof(surfvertex_t);
- }
- R_Mesh_Draw(&m);
}
}
-static void RSurfShader_Wall_Pass_BaseLightmap(msurface_t *surf)
+static void RSurfShader_OpaqueWall_Pass_BaseLightmap(const entity_render_t *ent, const msurface_t *surf)
{
- int i;
- float diff[3], ifog;
- surfvertex_t *v;
- surfvert_t *sv;
surfmesh_t *mesh;
- rmeshinfo_t m;
-
+ rmeshbufferinfo_t m;
+ float cl;
memset(&m, 0, sizeof(m));
- m.transparent = false;
m.blendfunc1 = GL_ZERO;
m.blendfunc2 = GL_SRC_COLOR;
- m.cr = m.cg = m.cb = (float) (1 << v_overbrightbits.integer);
- m.ca = 1;
m.tex[0] = R_GetTexture(surf->lightmaptexture);
- m.texcoordstep[0] = sizeof(surfvertex_t);
+ m.matrix = ent->matrix;
for (mesh = surf->mesh;mesh;mesh = mesh->chain)
{
m.numtriangles = mesh->numtriangles;
m.numverts = mesh->numverts;
- m.index = mesh->index;
- m.texcoords[0] = &mesh->vertex->uv[0];
- if (fogenabled)
- {
- m.color = &svert[0].c[0];
- m.colorstep = sizeof(surfvert_t);
- if (softwaretransform_complexity)
- {
- m.vertex = &svert[0].v[0];
- m.vertexstep = sizeof(surfvert_t);
- for (i = 0, sv = svert, v = 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 = &mesh->vertex->v[0];
- m.vertexstep = sizeof(surfvertex_t);
- for (i = 0, sv = svert, v = 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 (R_Mesh_Draw_GetBuffer(&m, true))
{
- if (softwaretransform_complexity)
- {
- m.vertex = &svert[0].v[0];
- m.vertexstep = sizeof(surfvert_t);
- for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++)
- softwaretransform(v->v, sv->v);
- }
- else
- {
- m.vertex = &mesh->vertex->v[0];
- m.vertexstep = sizeof(surfvertex_t);
- }
+ memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3]));
+ RSurf_CopyXYZ(mesh->vertex, m.vertex, m.numverts);
+ cl = (float) (1 << lightscalebit) * m.colorscale;
+ R_FillColors(m.color, m.numverts, cl, cl, cl, 1);
+ RSurf_CopyUV(mesh->vertex, m.texcoords[0], m.numverts);
+ R_Mesh_Render();
}
- R_Mesh_Draw(&m);
}
}
-static void RSurfShader_Wall_Pass_BaseVertex(msurface_t *surf)
+static void RSurfShader_OpaqueWall_Pass_Light(const entity_render_t *ent, const msurface_t *surf)
{
- int i, size3;
- float c[3], base[3], scale, diff[3], ifog;
- surfvertex_t *v;
- surfvert_t *sv;
surfmesh_t *mesh;
- rmeshinfo_t m;
- qbyte *lm;
-
- size3 = ((surf->extents[0]>>4)+1)*((surf->extents[1]>>4)+1)*3;
+ rmeshbufferinfo_t m;
- base[0] = base[1] = base[2] = r_ambient.value * (1.0f / 128.0f);
+ if (surf->dlightframe != r_framecount)
+ return;
+ if (ent->effects & EF_FULLBRIGHT)
+ return;
memset(&m, 0, sizeof(m));
- if (currentrenderentity->effects & EF_ADDITIVE)
- {
- m.transparent = true;
- m.blendfunc1 = GL_SRC_ALPHA;
- m.blendfunc2 = GL_ONE;
- }
- else if (surf->currenttexture->fogtexture != NULL || currentrenderentity->alpha != 1)
- {
- m.transparent = true;
- m.blendfunc1 = GL_SRC_ALPHA;
- m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
- }
- else
- {
- m.transparent = false;
- m.blendfunc1 = GL_ONE;
- m.blendfunc2 = GL_ZERO;
- }
- m.vertex = &svert[0].v[0];
- m.vertexstep = sizeof(surfvert_t);
- m.color = &svert[0].c[0];
- m.colorstep = sizeof(surfvert_t);
+ m.blendfunc1 = GL_SRC_ALPHA;
+ m.blendfunc2 = GL_ONE;
m.tex[0] = R_GetTexture(surf->currenttexture->texture);
- m.texcoordstep[0] = sizeof(surfvertex_t);
+ m.matrix = ent->matrix;
for (mesh = surf->mesh;mesh;mesh = mesh->chain)
{
- m.numtriangles = mesh->numtriangles;
- m.numverts = mesh->numverts;
- m.index = mesh->index;
- m.texcoords[0] = &mesh->vertex->st[0];
- for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++)
+ if (RSurf_LightCheck(surf->dlightbits, mesh))
{
- softwaretransform(v->v, sv->v);
- VectorCopy(base, c);
- if (surf->styles[0] != 255)
+ m.numtriangles = mesh->numtriangles;
+ m.numverts = mesh->numverts;
+ if (R_Mesh_Draw_GetBuffer(&m, true))
{
- lm = surf->samples + v->lightmapoffset;
- scale = d_lightstylevalue[surf->styles[0]] * (1.0f / 32768.0f);
- VectorMA(c, scale, lm, c);
- if (surf->styles[1] != 255)
- {
- lm += size3;
- scale = d_lightstylevalue[surf->styles[1]] * (1.0f / 32768.0f);
- VectorMA(c, scale, lm, c);
- if (surf->styles[2] != 255)
- {
- lm += size3;
- scale = d_lightstylevalue[surf->styles[2]] * (1.0f / 32768.0f);
- VectorMA(c, scale, lm, c);
- if (surf->styles[3] != 255)
- {
- lm += size3;
- scale = d_lightstylevalue[surf->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 (surf->dlightframe == r_framecount)
- RSurf_Light(surf->dlightbits, m.numverts);
- if (fogenabled)
- {
- for (i = 0, sv = svert, v = 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;
+ memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3]));
+ RSurf_CopyXYZ(mesh->vertex, m.vertex, m.numverts);
+ RSurf_CopyST(mesh->vertex, m.texcoords[0], m.numverts);
+ R_FillColors(m.color, m.numverts, 0, 0, 0, 1);
+ RSurf_LightSeparate(&ent->inversematrix, surf->dlightbits, m.numverts, m.vertex, m.color);
+ RSurf_ScaleColors(m.color, m.colorscale, m.numverts);
+ R_Mesh_Render();
}
}
- R_Mesh_Draw(&m);
}
}
-static void RSurfShader_Wall_Pass_BaseFullbright(msurface_t *surf)
+static void RSurfShader_OpaqueWall_Pass_Fog(const entity_render_t *ent, const msurface_t *surf)
{
- int i;
- float diff[3], ifog;
- surfvertex_t *v;
- surfvert_t *sv;
surfmesh_t *mesh;
- rmeshinfo_t m;
-
+ rmeshbufferinfo_t m;
+ float modelorg[3];
+ Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg);
memset(&m, 0, sizeof(m));
- if (currentrenderentity->effects & EF_ADDITIVE)
- {
- m.transparent = true;
- m.blendfunc1 = GL_SRC_ALPHA;
- m.blendfunc2 = GL_ONE;
- }
- else if (surf->currenttexture->fogtexture != NULL || currentrenderentity->alpha != 1)
- {
- m.transparent = true;
- m.blendfunc1 = GL_SRC_ALPHA;
- m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
- }
- else
- {
- m.transparent = false;
- m.blendfunc1 = GL_ONE;
- m.blendfunc2 = GL_ZERO;
- }
- m.vertex = &svert[0].v[0];
- m.vertexstep = sizeof(surfvert_t);
- m.tex[0] = R_GetTexture(surf->currenttexture->texture);
- m.texcoordstep[0] = sizeof(surfvertex_t);
+ m.blendfunc1 = GL_SRC_ALPHA;
+ m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
+ m.tex[0] = R_GetTexture(surf->currenttexture->fogtexture);
+ m.matrix = ent->matrix;
for (mesh = surf->mesh;mesh;mesh = mesh->chain)
{
m.numtriangles = mesh->numtriangles;
m.numverts = mesh->numverts;
- m.index = mesh->index;
- m.texcoords[0] = &mesh->vertex->st[0];
- if (fogenabled)
+ if (R_Mesh_Draw_GetBuffer(&m, false))
{
- m.color = &svert[0].c[0];
- m.colorstep = sizeof(surfvert_t);
- for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++)
- {
- softwaretransform(v->v, sv->v);
- VectorSubtract(sv->v, r_origin, diff);
- ifog = 1 - exp(fogdensity/DotProduct(diff, diff));
- sv->c[0] = ifog;
- sv->c[1] = ifog;
- sv->c[2] = ifog;
- sv->c[3] = currentrenderentity->alpha;
- }
- }
- else
- {
- m.cr = m.cg = m.cb = 1;
- m.ca = currentrenderentity->alpha;
- for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++)
- softwaretransform(v->v, sv->v);
+ memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3]));
+ RSurf_CopyXYZ(mesh->vertex, m.vertex, m.numverts);
+ if (m.tex[0])
+ RSurf_CopyST(mesh->vertex, m.texcoords[0], m.numverts);
+ RSurf_FogPassColors(m.vertex, m.color, fogcolor[0], fogcolor[1], fogcolor[2], 1, m.colorscale, m.numverts, modelorg);
+ R_Mesh_Render();
}
- R_Mesh_Draw(&m);
}
}
-static void RSurfShader_Wall_Pass_Light(msurface_t *surf)
+static void RSurfShader_OpaqueWall_Pass_BaseDetail(const entity_render_t *ent, const msurface_t *surf)
{
- int i;
- float diff[3], ifog;
- surfvertex_t *v;
- surfvert_t *sv;
surfmesh_t *mesh;
- rmeshinfo_t m;
-
+ rmeshbufferinfo_t m;
memset(&m, 0, sizeof(m));
- if (currentrenderentity->effects & EF_ADDITIVE)
- m.transparent = true;
- else if (surf->currenttexture->fogtexture != NULL || currentrenderentity->alpha != 1)
- m.transparent = true;
- else
- m.transparent = false;
- m.blendfunc1 = GL_SRC_ALPHA;
- m.blendfunc2 = GL_ONE;
- 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(surf->currenttexture->texture);
- m.texcoordstep[0] = sizeof(surfvertex_t);
+ m.blendfunc1 = GL_DST_COLOR;
+ m.blendfunc2 = GL_SRC_COLOR;
+ m.tex[0] = R_GetTexture(surf->currenttexture->detailtexture);
+ m.matrix = ent->matrix;
for (mesh = surf->mesh;mesh;mesh = mesh->chain)
{
m.numtriangles = mesh->numtriangles;
m.numverts = mesh->numverts;
- m.index = mesh->index;
- m.texcoords[0] = &mesh->vertex->st[0];
- for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++)
+ if (R_Mesh_Draw_GetBuffer(&m, false))
{
- 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(surf->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);
+ memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3]));
+ RSurf_CopyXYZ(mesh->vertex, m.vertex, m.numverts);
+ R_FillColors(m.color, m.numverts, 1, 1, 1, 1);
+ RSurf_CopyAB(mesh->vertex, m.texcoords[0], m.numverts);
+ R_Mesh_Render();
}
}
}
-static void RSurfShader_Wall_Pass_Glow(msurface_t *surf)
+static void RSurfShader_OpaqueWall_Pass_Glow(const entity_render_t *ent, const msurface_t *surf)
{
- int i;
- float diff[3], ifog;
- surfvertex_t *v;
- surfvert_t *sv;
surfmesh_t *mesh;
- rmeshinfo_t m;
-
+ rmeshbufferinfo_t m;
memset(&m, 0, sizeof(m));
- if (currentrenderentity->effects & EF_ADDITIVE)
- m.transparent = true;
- else if (surf->currenttexture->fogtexture != NULL || currentrenderentity->alpha != 1)
- m.transparent = true;
- else
- m.transparent = false;
m.blendfunc1 = GL_SRC_ALPHA;
m.blendfunc2 = GL_ONE;
- m.cr = 1;
- m.cg = 1;
- m.cb = 1;
- m.ca = currentrenderentity->alpha;
m.tex[0] = R_GetTexture(surf->currenttexture->glowtexture);
- m.texcoordstep[0] = sizeof(surfvertex_t);
+ m.matrix = ent->matrix;
for (mesh = surf->mesh;mesh;mesh = mesh->chain)
{
m.numtriangles = mesh->numtriangles;
m.numverts = mesh->numverts;
- m.index = mesh->index;
- m.texcoords[0] = &mesh->vertex->st[0];
- if (fogenabled)
+ if (R_Mesh_Draw_GetBuffer(&m, false))
{
- m.color = &svert[0].c[0];
- m.colorstep = sizeof(surfvert_t);
- if (softwaretransform_complexity)
- {
- m.vertex = &svert[0].v[0];
- m.vertexstep = sizeof(surfvert_t);
- for (i = 0, sv = svert, v = 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 = &mesh->vertex->v[0];
- m.vertexstep = sizeof(surfvertex_t);
- for (i = 0, sv = svert, v = 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 = mesh->vertex;i < m.numverts;i++, sv++, v++)
- softwaretransform(v->v, sv->v);
- }
- else
- {
- m.vertex = &mesh->vertex->v[0];
- m.vertexstep = sizeof(surfvertex_t);
- }
+ memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3]));
+ RSurf_CopyXYZ(mesh->vertex, m.vertex, m.numverts);
+ R_FillColors(m.color, m.numverts, m.colorscale, m.colorscale, m.colorscale, 1);
+ RSurf_CopyST(mesh->vertex, m.texcoords[0], m.numverts);
+ R_Mesh_Render();
}
- R_Mesh_Draw(&m);
}
}
-static void RSurfShader_Wall_Pass_Fog(msurface_t *surf)
+static void RSurfShader_Wall_Fullbright_Callback(const void *calldata1, int calldata2)
{
- int i;
- surfvertex_t *v;
- surfvert_t *sv;
- rmeshinfo_t m;
- surfmesh_t *mesh;
- vec3_t diff;
+ const entity_render_t *ent = calldata1;
+ const msurface_t *surf = ent->model->surfaces + calldata2;
+ RSurfShader_Wall_Pass_BaseFullbright(ent, surf);
+ if (surf->currenttexture->glowtexture)
+ RSurfShader_Wall_Pass_Glow(ent, surf);
+ if (fogenabled)
+ RSurfShader_Wall_Pass_Fog(ent, surf);
+}
- memset(&m, 0, sizeof(m));
- if (currentrenderentity->effects & EF_ADDITIVE)
- m.transparent = true;
- else if (surf->currenttexture->fogtexture != NULL || currentrenderentity->alpha != 1)
- m.transparent = true;
- else
- m.transparent = false;
- m.blendfunc1 = GL_SRC_ALPHA;
- m.blendfunc2 = GL_ONE;
- m.color = &svert[0].c[0];
- m.colorstep = sizeof(surfvert_t);
- m.tex[0] = R_GetTexture(surf->currenttexture->fogtexture);
- m.texcoordstep[0] = sizeof(surfvertex_t);
- for (mesh = surf->mesh;mesh;mesh = mesh->chain)
+static void RSurfShader_Wall_Fullbright(const entity_render_t *ent, const msurface_t *firstsurf)
+{
+ const msurface_t *surf;
+ vec3_t center;
+ if (ent->effects & EF_ADDITIVE || ent->alpha < 1)
{
- m.numtriangles = mesh->numtriangles;
- m.numverts = mesh->numverts;
- m.index = mesh->index;
- m.texcoords[0] = &mesh->vertex->st[0];
- if (softwaretransform_complexity)
+ for (surf = firstsurf;surf;surf = surf->chain)
{
- m.vertex = &svert[0].v[0];
- m.vertexstep = sizeof(surfvert_t);
- for (i = 0, sv = svert, v = 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));
- }
+ c_brush_polys++;
+ Matrix4x4_Transform(&ent->matrix, surf->poly_center, center);
+ R_MeshQueue_AddTransparent(center, RSurfShader_Wall_Fullbright_Callback, ent, surf - ent->model->surfaces);
}
- else
+ }
+ else
+ {
+ for (surf = firstsurf;surf;surf = surf->chain)
{
- m.vertex = &mesh->vertex->v[0];
- m.vertexstep = sizeof(surfvertex_t);
- for (i = 0, sv = svert, v = mesh->vertex;i < m.numverts;i++, sv++, v++)
+ c_brush_polys++;
+ if (surf->currenttexture->fogtexture != NULL)
{
- 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));
+ Matrix4x4_Transform(&ent->matrix, surf->poly_center, center);
+ R_MeshQueue_AddTransparent(center, RSurfShader_Wall_Fullbright_Callback, ent, surf - ent->model->surfaces);
}
+ else
+ RSurfShader_Wall_Pass_BaseFullbright(ent, surf);
}
- R_Mesh_Draw(&m);
+ for (surf = firstsurf;surf;surf = surf->chain)
+ if (surf->currenttexture->glowtexture)
+ if (surf->currenttexture->fogtexture == NULL)
+ RSurfShader_Wall_Pass_Glow(ent, surf);
+ if (fogenabled)
+ for (surf = firstsurf;surf;surf = surf->chain)
+ if (surf->currenttexture->fogtexture == NULL)
+ RSurfShader_Wall_Pass_Fog(ent, surf);
}
}
-static void RSurfShader_Wall_Fullbright(msurface_t *firstsurf)
+static void RSurfShader_Wall_Vertex_Callback(const void *calldata1, int calldata2)
{
- msurface_t *surf;
- for (surf = firstsurf;surf;surf = surf->chain)
- {
- c_brush_polys++;
- RSurfShader_Wall_Pass_BaseFullbright(surf);
- }
- for (surf = firstsurf;surf;surf = surf->chain)
- if (surf->currenttexture->glowtexture)
- RSurfShader_Wall_Pass_Glow(surf);
+ const entity_render_t *ent = calldata1;
+ const msurface_t *surf = ent->model->surfaces + calldata2;
+ RSurfShader_Wall_Pass_BaseVertex(ent, surf);
+ if (surf->currenttexture->glowtexture)
+ RSurfShader_Wall_Pass_Glow(ent, surf);
if (fogenabled)
- for (surf = firstsurf;surf;surf = surf->chain)
- RSurfShader_Wall_Pass_Fog(surf);
+ RSurfShader_Wall_Pass_Fog(ent, surf);
}
-static void RSurfShader_Wall_Vertex(msurface_t *firstsurf)
+static void RSurfShader_Wall_Vertex(const entity_render_t *ent, const msurface_t *firstsurf)
{
- msurface_t *surf;
- for (surf = firstsurf;surf;surf = surf->chain)
+ const msurface_t *surf;
+ vec3_t center;
+ if (ent->effects & EF_ADDITIVE || ent->alpha < 1)
{
- c_brush_polys++;
- RSurfShader_Wall_Pass_BaseVertex(surf);
- }
- for (surf = firstsurf;surf;surf = surf->chain)
- if (surf->currenttexture->glowtexture)
- RSurfShader_Wall_Pass_Glow(surf);
- if (fogenabled)
for (surf = firstsurf;surf;surf = surf->chain)
- RSurfShader_Wall_Pass_Fog(surf);
-}
-
-static void RSurfShader_Wall_Lightmap(msurface_t *firstsurf)
-{
- msurface_t *surf;
- if (r_vertexsurfaces.integer)
+ {
+ c_brush_polys++;
+ Matrix4x4_Transform(&ent->matrix, surf->poly_center, center);
+ R_MeshQueue_AddTransparent(center, RSurfShader_Wall_Vertex_Callback, ent, surf - ent->model->surfaces);
+ }
+ }
+ else
{
for (surf = firstsurf;surf;surf = surf->chain)
{
c_brush_polys++;
- RSurfShader_Wall_Pass_BaseVertex(surf);
+ if (surf->currenttexture->fogtexture != NULL)
+ {
+ Matrix4x4_Transform(&ent->matrix, surf->poly_center, center);
+ R_MeshQueue_AddTransparent(center, RSurfShader_Wall_Vertex_Callback, ent, surf - ent->model->surfaces);
+ }
+ else
+ RSurfShader_Wall_Pass_BaseVertex(ent, surf);
}
for (surf = firstsurf;surf;surf = surf->chain)
if (surf->currenttexture->glowtexture)
- RSurfShader_Wall_Pass_Glow(surf);
+ if (surf->currenttexture->fogtexture == NULL)
+ RSurfShader_Wall_Pass_Glow(ent, surf);
if (fogenabled)
for (surf = firstsurf;surf;surf = surf->chain)
- RSurfShader_Wall_Pass_Fog(surf);
+ if (surf->currenttexture->fogtexture == NULL)
+ RSurfShader_Wall_Pass_Fog(ent, surf);
}
- else if (r_multitexture.integer)
+}
+
+static void RSurfShader_Wall_Lightmap(const entity_render_t *ent, const msurface_t *firstsurf)
+{
+ const msurface_t *surf;
+ vec3_t center;
+ if (ent->alpha < 1 || ent->effects & EF_ADDITIVE)
{
- if (r_dlightmap.integer)
- {
- for (surf = firstsurf;surf;surf = surf->chain)
- {
- c_brush_polys++;
- RSurfShader_Wall_Pass_BaseMTex(surf);
- }
- for (surf = firstsurf;surf;surf = surf->chain)
- if (surf->currenttexture->glowtexture)
- RSurfShader_Wall_Pass_Glow(surf);
- if (fogenabled)
- for (surf = firstsurf;surf;surf = surf->chain)
- RSurfShader_Wall_Pass_Fog(surf);
- }
- else
+ for (surf = firstsurf;surf;surf = surf->chain)
{
- for (surf = firstsurf;surf;surf = surf->chain)
- {
- c_brush_polys++;
- RSurfShader_Wall_Pass_BaseMTex(surf);
- }
- for (surf = firstsurf;surf;surf = surf->chain)
- if (surf->dlightframe == r_framecount)
- RSurfShader_Wall_Pass_Light(surf);
- for (surf = firstsurf;surf;surf = surf->chain)
- if (surf->currenttexture->glowtexture)
- RSurfShader_Wall_Pass_Glow(surf);
- if (fogenabled)
- for (surf = firstsurf;surf;surf = surf->chain)
- RSurfShader_Wall_Pass_Fog(surf);
+ c_brush_polys++;
+ Matrix4x4_Transform(&ent->matrix, surf->poly_center, center);
+ R_MeshQueue_AddTransparent(center, RSurfShader_Wall_Vertex_Callback, ent, surf - ent->model->surfaces);
}
}
- else if (firstsurf->currenttexture->fogtexture != NULL || currentrenderentity->alpha != 1 || currentrenderentity->effects & EF_ADDITIVE)
+ else if (r_vertexsurfaces.integer || ent->alpha < 1 || ent->effects & EF_ADDITIVE)
{
for (surf = firstsurf;surf;surf = surf->chain)
{
c_brush_polys++;
- RSurfShader_Wall_Pass_BaseVertex(surf);
+ if (surf->currenttexture->fogtexture != NULL)
+ {
+ Matrix4x4_Transform(&ent->matrix, surf->poly_center, center);
+ R_MeshQueue_AddTransparent(center, RSurfShader_Wall_Vertex_Callback, ent, surf - ent->model->surfaces);
+ }
+ else
+ RSurfShader_Wall_Pass_BaseVertex(ent, surf);
}
for (surf = firstsurf;surf;surf = surf->chain)
if (surf->currenttexture->glowtexture)
- RSurfShader_Wall_Pass_Glow(surf);
+ if (surf->currenttexture->fogtexture == NULL)
+ RSurfShader_Wall_Pass_Glow(ent, surf);
if (fogenabled)
for (surf = firstsurf;surf;surf = surf->chain)
- RSurfShader_Wall_Pass_Fog(surf);
+ if (surf->currenttexture->fogtexture == NULL)
+ RSurfShader_Wall_Pass_Fog(ent, surf);
}
else
{
- if (r_dlightmap.integer)
+ if (r_textureunits.integer >= 2)
{
- for (surf = firstsurf;surf;surf = surf->chain)
+ if (r_textureunits.integer >= 3 && gl_combine.integer && r_detailtextures.integer)
{
- c_brush_polys++;
- RSurfShader_Wall_Pass_BaseTexture(surf);
+ for (surf = firstsurf;surf;surf = surf->chain)
+ {
+ c_brush_polys++;
+ if (surf->currenttexture->fogtexture != NULL)
+ {
+ Matrix4x4_Transform(&ent->matrix, surf->poly_center, center);
+ R_MeshQueue_AddTransparent(center, RSurfShader_Wall_Vertex_Callback, ent, surf - ent->model->surfaces);
+ }
+ else
+ RSurfShader_OpaqueWall_Pass_TripleTexCombine(ent, surf);
+ }
}
- for (surf = firstsurf;surf;surf = surf->chain)
- RSurfShader_Wall_Pass_BaseLightmap(surf);
- for (surf = firstsurf;surf;surf = surf->chain)
- if (surf->currenttexture->glowtexture)
- RSurfShader_Wall_Pass_Glow(surf);
- if (fogenabled)
+ else
+ {
for (surf = firstsurf;surf;surf = surf->chain)
- RSurfShader_Wall_Pass_Fog(surf);
+ {
+ c_brush_polys++;
+ if (surf->currenttexture->fogtexture != NULL)
+ {
+ Matrix4x4_Transform(&ent->matrix, surf->poly_center, center);
+ R_MeshQueue_AddTransparent(center, RSurfShader_Wall_Vertex_Callback, ent, surf - ent->model->surfaces);
+ }
+ else
+ RSurfShader_OpaqueWall_Pass_BaseMTex(ent, surf);
+ }
+ if (r_detailtextures.integer)
+ for (surf = firstsurf;surf;surf = surf->chain)
+ if (surf->currenttexture->fogtexture == NULL)
+ RSurfShader_OpaqueWall_Pass_BaseDetail(ent, surf);
+ }
}
else
{
for (surf = firstsurf;surf;surf = surf->chain)
{
c_brush_polys++;
- RSurfShader_Wall_Pass_BaseTexture(surf);
+ if (surf->currenttexture->fogtexture != NULL)
+ {
+ Matrix4x4_Transform(&ent->matrix, surf->poly_center, center);
+ R_MeshQueue_AddTransparent(center, RSurfShader_Wall_Vertex_Callback, ent, surf - ent->model->surfaces);
+ }
+ else
+ RSurfShader_OpaqueWall_Pass_BaseTexture(ent, surf);
}
for (surf = firstsurf;surf;surf = surf->chain)
- RSurfShader_Wall_Pass_BaseLightmap(surf);
+ if (surf->currenttexture->fogtexture == NULL)
+ RSurfShader_OpaqueWall_Pass_BaseLightmap(ent, surf);
+ if (r_detailtextures.integer)
+ for (surf = firstsurf;surf;surf = surf->chain)
+ if (surf->currenttexture->fogtexture == NULL)
+ RSurfShader_OpaqueWall_Pass_BaseDetail(ent, surf);
+ }
+ if (!r_dlightmap.integer)
for (surf = firstsurf;surf;surf = surf->chain)
if (surf->dlightframe == r_framecount)
- RSurfShader_Wall_Pass_Light(surf);
+ if (surf->currenttexture->fogtexture == NULL)
+ RSurfShader_OpaqueWall_Pass_Light(ent, surf);
+ for (surf = firstsurf;surf;surf = surf->chain)
+ if (surf->currenttexture->glowtexture)
+ if (surf->currenttexture->fogtexture == NULL)
+ RSurfShader_OpaqueWall_Pass_Glow(ent, surf);
+ if (fogenabled)
for (surf = firstsurf;surf;surf = surf->chain)
- if (surf->currenttexture->glowtexture)
- RSurfShader_Wall_Pass_Glow(surf);
- if (fogenabled)
- for (surf = firstsurf;surf;surf = surf->chain)
- RSurfShader_Wall_Pass_Fog(surf);
- }
+ if (surf->currenttexture->fogtexture == NULL)
+ RSurfShader_OpaqueWall_Pass_Fog(ent, surf);
}
}
=============================================================
*/
-static void RSurf_Callback(void *data, void *junk)
-{
- ((msurface_t *)data)->visframe = r_framecount;
-}
-
-static void R_SolidWorldNode (void)
+static void R_SolidWorldNode (entity_render_t *ent)
{
if (r_viewleaf->contents != CONTENTS_SOLID)
{
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
{
mark = leaf->firstmarksurface;
endmark = mark + leaf->nummarksurfaces;
- if (r_ser.integer)
+ do
{
- 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 = *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);
- }
+ if (surf->flags & SURF_PLANEBACK)
+ surf->visframe = r_framecount;
}
- while (mark < endmark);
- }
- else
- {
- do
+ else
{
- surf = *mark++;
- // make sure surfaces are only processed once
- if (surf->worldnodeframe == r_framecount)
- continue;
- surf->worldnodeframe = r_framecount;
- if (PlaneDist(r_origin, surf->plane) < surf->plane->dist)
- {
- if (surf->flags & SURF_PLANEBACK)
- surf->visframe = r_framecount;
- }
- else
- {
- if (!(surf->flags & SURF_PLANEBACK))
- surf->visframe = r_framecount;
- }
+ if (!(surf->flags & SURF_PLANEBACK))
+ surf->visframe = r_framecount;
}
- while (mark < endmark);
}
+ while (mark < endmark);
}
// follow portals into other leafs
{
if (node->numsurfaces)
{
- if (r_ser.integer)
+ msurface_t *surf = cl.worldmodel->surfaces + node->firstsurface, *surfend = surf + node->numsurfaces;
+ if (PlaneDiff (r_origin, node->plane) < 0)
{
- 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++)
{
- for (;surf < surfend;surf++)
- {
- if (surf->flags & SURF_PLANEBACK)
- {
- VectorNegate(surf->plane->normal, plane.normal);
- plane.dist = -surf->plane->dist;
- R_Clip_AddPolygon((float *)surf->poly_verts, surf->poly_numverts, sizeof(float[3]), surf->flags & SURF_CLIPSOLID, RSurf_Callback, surf, NULL, &plane);
- }
- }
- }
- else
- {
- for (;surf < surfend;surf++)
- {
- if (!(surf->flags & SURF_PLANEBACK))
- R_Clip_AddPolygon((float *)surf->poly_verts, surf->poly_numverts, sizeof(float[3]), surf->flags & SURF_CLIPSOLID, RSurf_Callback, surf, NULL, (tinyplane_t *)surf->plane);
- }
+ if (surf->flags & SURF_PLANEBACK)
+ surf->visframe = r_framecount;
}
}
else
{
- 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++)
{
- for (;surf < surfend;surf++)
- {
- if (!(surf->flags & SURF_PLANEBACK))
- surf->visframe = r_framecount;
- }
+ if (!(surf->flags & SURF_PLANEBACK))
+ surf->visframe = r_framecount;
}
}
}
}
}
-static int r_portalframecount = 0;
-
static void R_PVSWorldNode()
{
int portalstack, i;
mportal_t *p, *pstack[8192];
msurface_t *surf, **mark, **endmark;
mleaf_t *leaf;
- tinyplane_t plane;
qbyte *worldvis;
worldvis = Mod_LeafPVS (r_viewleaf, cl.worldmodel);
{
mark = leaf->firstmarksurface;
endmark = mark + leaf->nummarksurfaces;
- if (r_ser.integer)
+ do
{
- 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 = *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);
- }
+ if (surf->flags & SURF_PLANEBACK)
+ surf->visframe = r_framecount;
}
- while (mark < endmark);
- }
- else
- {
- do
+ else
{
- surf = *mark++;
- // make sure surfaces are only processed once
- if (surf->worldnodeframe == r_framecount)
- continue;
- surf->worldnodeframe = r_framecount;
- if (PlaneDist(r_origin, surf->plane) < surf->plane->dist)
- {
- if (surf->flags & SURF_PLANEBACK)
- surf->visframe = r_framecount;
- }
- else
- {
- if (!(surf->flags & SURF_PLANEBACK))
- surf->visframe = r_framecount;
- }
+ if (!(surf->flags & SURF_PLANEBACK))
+ surf->visframe = r_framecount;
}
- while (mark < endmark);
}
+ while (mark < endmark);
}
// follow portals into other leafs
&Cshader_sky
};
-void R_PrepareSurfaces(void)
+void R_PrepareSurfaces(entity_render_t *ent)
{
- int i;
+ int i, alttextures, texframe, framecount;
texture_t *t;
model_t *model;
msurface_t *surf;
for (i = 0;i < Cshader_count;i++)
Cshaders[i]->chain = NULL;
- model = currentrenderentity->model;
+ model = ent->model;
+ alttextures = ent->frame != 0;
+ texframe = (int)(cl.time * 5.0f);
for (i = 0;i < model->nummodelsurfaces;i++)
{
{
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 (t->animated)
+ {
+ framecount = t->anim_total[alttextures];
+ if (framecount >= 2)
+ surf->currenttexture = t->anim_frames[alttextures][texframe % framecount];
+ else
+ surf->currenttexture = t->anim_frames[alttextures][0];
+ }
+ else
+ surf->currenttexture = t;
}
surf->chain = surf->shader->chain;
}
}
-void R_DrawSurfaces (int type)
+void R_DrawSurfaces (entity_render_t *ent, int type)
{
int i;
Cshader_t *shader;
{
shader = Cshaders[i];
if (shader->chain && shader->shaderfunc[type])
- shader->shaderfunc[type](shader->chain);
+ shader->shaderfunc[type](ent, shader->chain);
}
}
-static float portalpointbuffer[256][3];
-
-void R_DrawPortals(void)
+static void R_DrawPortal_Callback(const void *calldata1, int calldata2)
{
- int drawportals, i;
-// mleaf_t *leaf, *endleaf;
- mportal_t *portal, *endportal;
- mvertex_t *point/*, *endpoint*/;
- rmeshinfo_t m;
- drawportals = r_drawportals.integer;
- if (drawportals < 1)
- return;
- /*
- leaf = cl.worldmodel->leafs;
- endleaf = leaf + cl.worldmodel->numleafs;
- for (;leaf < endleaf;leaf++)
+ int i;
+ float *v;
+ rmeshbufferinfo_t m;
+ const entity_render_t *ent = calldata1;
+ const mportal_t *portal = ent->model->portals + calldata2;
+ memset(&m, 0, sizeof(m));
+ m.blendfunc1 = GL_SRC_ALPHA;
+ m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
+ m.numverts = portal->numpoints;
+ m.numtriangles = portal->numpoints - 2;
+ m.matrix = ent->matrix;
+ if (R_Mesh_Draw_GetBuffer(&m, false))
{
- if (leaf->visframe == r_framecount && leaf->portals)
+ for (i = 0;i < m.numtriangles;i++)
{
- 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;
- }
+ m.index[i * 3 + 0] = 0;
+ m.index[i * 3 + 1] = i + 1;
+ m.index[i * 3 + 2] = i + 2;
+ }
+ i = portal - ent->model->portals;
+ R_FillColors(m.color, m.numverts,
+ ((i & 0x0007) >> 0) * (1.0f / 7.0f) * m.colorscale,
+ ((i & 0x0038) >> 3) * (1.0f / 7.0f) * m.colorscale,
+ ((i & 0x01C0) >> 6) * (1.0f / 7.0f) * m.colorscale,
+ 0.125f);
+ if (PlaneDiff(r_origin, (&portal->plane)) > 0)
+ {
+ for (i = portal->numpoints - 1, v = m.vertex;i >= 0;i--, v += 4)
+ VectorCopy(portal->points[i].position, v);
}
+ else
+ for (i = 0, v = m.vertex;i < portal->numpoints;i++, v += 4)
+ VectorCopy(portal->points[i].position, v);
+ R_Mesh_Render();
}
- */
- 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++)
+}
+
+void R_DrawPortals(entity_render_t *ent)
+{
+ int i;
+ mportal_t *portal, *endportal;
+ float temp[3], center[3], f;
+
+ if (r_drawportals.integer < 1)
+ return;
+
+ for (portal = ent->model->portals, endportal = portal + ent->model->numportals;portal < endportal;portal++)
{
- if (portal->visframe == r_portalframecount)
+ if (portal->here->visframe == r_framecount || portal->past->visframe == r_framecount)
{
- if (portal->numpoints <= 256)
- {
- i = portal - cl.worldmodel->portals;
- m.cr = ((i & 0x0007) >> 0) * (1.0f / 7.0f);
- m.cg = ((i & 0x0038) >> 3) * (1.0f / 7.0f);
- m.cb = ((i & 0x01C0) >> 6) * (1.0f / 7.0f);
- point = portal->points;
- if (PlaneDiff(r_origin, (&portal->plane)) > 0)
- {
- for (i = portal->numpoints - 1;i >= 0;i--)
- VectorCopy(point[i].position, portalpointbuffer[i]);
- }
- else
- {
- for (i = 0;i < portal->numpoints;i++)
- VectorCopy(point[i].position, portalpointbuffer[i]);
- }
- R_Mesh_DrawPolygon(&m, portal->numpoints);
- }
+ VectorClear(temp);
+ for (i = 0;i < portal->numpoints;i++)
+ VectorAdd(temp, portal->points[i].position, temp);
+ f = ixtable[portal->numpoints];
+ VectorScale(temp, f, temp);
+ Matrix4x4_Transform(&ent->matrix, temp, center);
+ R_MeshQueue_AddTransparent(center, R_DrawPortal_Callback, ent, portal - ent->model->portals);
}
}
}
-void R_SetupForBModelRendering(void)
+void R_SetupForBModelRendering(entity_render_t *ent)
{
int i;
msurface_t *surf;
// because bmodels can be reused, we have to decide which things to render
// from scratch every time
- model = currentrenderentity->model;
-
- softwaretransformforentity (currentrenderentity);
- softwareuntransform(r_origin, modelorg);
+ model = ent->model;
+ Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg);
for (i = 0;i < model->nummodelsurfaces;i++)
{
surf = model->modelsortedsurfaces[i];
}
}
-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)
+void R_SurfMarkLights (entity_render_t *ent)
{
int i;
msurface_t *surf;
if (r_dynamic.integer)
- R_MarkLights();
+ R_MarkLights(ent);
if (!r_vertexsurfaces.integer)
{
- for (i = 0;i < currentrenderentity->model->nummodelsurfaces;i++)
+ for (i = 0;i < ent->model->nummodelsurfaces;i++)
{
- surf = currentrenderentity->model->modelsortedsurfaces[i];
+ surf = ent->model->modelsortedsurfaces[i];
if (surf->visframe == r_framecount && surf->lightmaptexture != NULL)
{
if (surf->cached_dlight
|| surf->cached_ambient != r_ambient.value
|| surf->cached_lightscalebit != lightscalebit)
- R_BuildLightMap(surf, false); // base lighting changed
+ R_BuildLightMap(ent, surf, false); // base lighting changed
else if (r_dynamic.integer)
{
if (surf->styles[0] != 255 && (d_lightstylevalue[surf->styles[0]] != surf->cached_light[0]
|| (surf->styles[1] != 255 && (d_lightstylevalue[surf->styles[1]] != surf->cached_light[1]
|| (surf->styles[2] != 255 && (d_lightstylevalue[surf->styles[2]] != surf->cached_light[2]
|| (surf->styles[3] != 255 && (d_lightstylevalue[surf->styles[3]] != surf->cached_light[3]))))))))
- //if (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]])
- R_BuildLightMap(surf, false); // base lighting changed
+ R_BuildLightMap(ent, surf, false); // base lighting changed
else if (surf->dlightframe == r_framecount && r_dlightmap.integer)
- R_BuildLightMap(surf, true); // only dlights
+ R_BuildLightMap(ent, surf, true); // only dlights
}
}
}
}
}
-void R_MarkWorldLights(void)
-{
- R_SetupForWorldRendering();
- R_SurfMarkLights();
-}
-
/*
=============
R_DrawWorld
=============
*/
-void R_DrawWorld (void)
+void R_DrawWorld (entity_render_t *ent)
{
- R_SetupForWorldRendering();
-
+ // there is only one instance of the world, but it can be rendered in
+ // multiple stages
if (r_viewleaf->contents == CONTENTS_SOLID || r_novis.integer || r_viewleaf->compressed_vis == NULL)
- R_SolidWorldNode ();
+ R_SolidWorldNode (ent);
else
- R_PVSWorldNode ();
+ R_PVSWorldNode (ent);
}
/*
R_DrawBrushModel
=================
*/
-void R_DrawBrushModelSky (void)
+void R_DrawBrushModelSky (entity_render_t *ent)
{
- R_SetupForBModelRendering();
+ R_SetupForBModelRendering(ent);
- R_PrepareSurfaces();
- R_DrawSurfaces(SHADERSTAGE_SKY);
+ R_PrepareSurfaces(ent);
+ R_DrawSurfaces(ent, SHADERSTAGE_SKY);
}
-void R_DrawBrushModelNormal (void)
+void R_DrawBrushModelNormal (entity_render_t *ent)
{
c_bmodels++;
// have to flush queue because of possible lightmap reuse
R_Mesh_Render();
- R_SetupForBModelRendering();
+ R_SetupForBModelRendering(ent);
- R_SurfMarkLights();
+ R_SurfMarkLights(ent);
- R_PrepareSurfaces();
+ R_PrepareSurfaces(ent);
if (!skyrendermasked)
- R_DrawSurfaces(SHADERSTAGE_SKY);
- R_DrawSurfaces(SHADERSTAGE_NORMAL);
+ R_DrawSurfaces(ent, SHADERSTAGE_SKY);
+ R_DrawSurfaces(ent, SHADERSTAGE_NORMAL);
+}
+
+static void gl_surf_start(void)
+{
+}
+
+static void gl_surf_shutdown(void)
+{
+}
+
+static void gl_surf_newmap(void)
+{
+}
+
+void GL_Surf_Init(void)
+{
+ int i;
+ dlightdivtable[0] = 4194304;
+ for (i = 1;i < 32768;i++)
+ dlightdivtable[i] = 4194304 / (i << 7);
+
+ Cvar_RegisterVariable(&r_ambient);
+ Cvar_RegisterVariable(&r_vertexsurfaces);
+ Cvar_RegisterVariable(&r_dlightmap);
+ Cvar_RegisterVariable(&r_drawportals);
+ Cvar_RegisterVariable(&r_testvis);
+ Cvar_RegisterVariable(&r_floatbuildlightmap);
+ Cvar_RegisterVariable(&r_detailtextures);
+
+ R_RegisterModule("GL_Surf", gl_surf_start, gl_surf_shutdown, gl_surf_newmap);
}
+
projects / xonotic / darkplaces.git / blobdiff