X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=gl_rsurf.c;h=f33bd315ab773fcb5af9d3b9c30dc4d7e9fb7a4c;hp=9fe860b5bbe22a69981d80c88e0ae3d0a5586b12;hb=ada6778a14d4ccecf7d2de73aa7816865d297399;hpb=45bff1c2dd893d329c86aa043661187b86da6609 diff --git a/gl_rsurf.c b/gl_rsurf.c index 9fe860b5..f33bd315 100644 --- a/gl_rsurf.c +++ b/gl_rsurf.c @@ -31,14 +31,22 @@ static qbyte templight[MAX_LIGHTMAP_SIZE*MAX_LIGHTMAP_SIZE*4]; cvar_t r_ambient = {0, "r_ambient", "0"}; cvar_t r_vertexsurfaces = {0, "r_vertexsurfaces", "0"}; cvar_t r_dlightmap = {CVAR_SAVE, "r_dlightmap", "1"}; -cvar_t r_drawportals = {0, "r_drawportals", "0"}; +//cvar_t r_drawportals = {0, "r_drawportals", "0"}; cvar_t r_testvis = {0, "r_testvis", "0"}; cvar_t r_floatbuildlightmap = {0, "r_floatbuildlightmap", "0"}; cvar_t r_detailtextures = {CVAR_SAVE, "r_detailtextures", "1"}; +cvar_t r_surfaceworldnode = {0, "r_surfaceworldnode", "0"}; +cvar_t r_cullsurface = {0, "r_cullsurface", "0"}; static int dlightdivtable[32768]; -static int R_IntAddDynamicLights (msurface_t *surf) +// variables used by R_PVSUpdate +int r_pvsframecount = 0; +mleaf_t *r_pvsviewleaf = NULL; +int r_pvsviewleafnovis = 0; +msurface_t *r_pvsfirstsurface = NULL; + +static int R_IntAddDynamicLights (const matrix4x4_t *matrix, 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; unsigned int *bl; @@ -62,7 +70,7 @@ static int R_IntAddDynamicLights (msurface_t *surf) if (!(surf->dlightbits[lnum >> 5] & (1 << (lnum & 31)))) continue; // not lit by this light - softwareuntransform(r_dlight[lnum].origin, local); + Matrix4x4_Transform(matrix, r_dlight[lnum].origin, local); dist = DotProduct (local, surf->plane->normal) - surf->plane->dist; // for comparisons to minimum acceptable light @@ -139,7 +147,7 @@ static int R_IntAddDynamicLights (msurface_t *surf) return lit; } -static int R_FloatAddDynamicLights (msurface_t *surf) +static int R_FloatAddDynamicLights (const matrix4x4_t *matrix, 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; @@ -155,7 +163,7 @@ static int R_FloatAddDynamicLights (msurface_t *surf) if (!(surf->dlightbits[lnum >> 5] & (1 << (lnum & 31)))) continue; // not lit by this light - softwareuntransform(r_dlight[lnum].origin, local); + Matrix4x4_Transform(matrix, r_dlight[lnum].origin, local); dist = DotProduct (local, surf->plane->normal) - surf->plane->dist; // for comparisons to minimum acceptable light @@ -236,7 +244,7 @@ R_BuildLightMap Combine and scale multiple lightmaps into the 8.8 format in blocklights =============== */ -static void R_BuildLightMap (msurface_t *surf, int dlightchanged) +static void R_BuildLightMap (const entity_render_t *ent, msurface_t *surf, int dlightchanged) { if (!r_floatbuildlightmap.integer) { @@ -261,7 +269,7 @@ static void R_BuildLightMap (msurface_t *surf, int dlightchanged) // set to full bright if no light data bl = intblocklights; - if ((currentrenderentity->effects & EF_FULLBRIGHT) || !currentrenderentity->model->lightdata) + if ((ent->effects & EF_FULLBRIGHT) || !ent->model->lightdata) { for (i = 0;i < size3;i++) bl[i] = 255*256; @@ -280,7 +288,7 @@ static void R_BuildLightMap (msurface_t *surf, int dlightchanged) if (surf->dlightframe == r_framecount && r_dlightmap.integer) { - surf->cached_dlight = R_IntAddDynamicLights(surf); + surf->cached_dlight = R_IntAddDynamicLights(&ent->inversematrix, surf); if (surf->cached_dlight) c_light_polys++; else if (dlightchanged) @@ -302,7 +310,7 @@ static void R_BuildLightMap (msurface_t *surf, int dlightchanged) out = templight; // deal with lightmap brightness scale shift = 7 + lightscalebit + 8; - if (currentrenderentity->model->lightmaprgba) + if (ent->model->lightmaprgba) { stride = (surf->lightmaptexturestride - smax) * 4; for (i = 0;i < tmax;i++, out += stride) @@ -355,7 +363,7 @@ static void R_BuildLightMap (msurface_t *surf, int dlightchanged) // set to full bright if no light data bl = floatblocklights; - if ((currentrenderentity->effects & EF_FULLBRIGHT) || !currentrenderentity->model->lightdata) + 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 @@ -371,7 +379,7 @@ static void R_BuildLightMap (msurface_t *surf, int dlightchanged) if (surf->dlightframe == r_framecount && r_dlightmap.integer) { - surf->cached_dlight = R_FloatAddDynamicLights(surf); + surf->cached_dlight = R_FloatAddDynamicLights(&ent->inversematrix, surf); if (surf->cached_dlight) c_light_polys++; else if (dlightchanged) @@ -392,7 +400,7 @@ static void R_BuildLightMap (msurface_t *surf, int dlightchanged) out = templight; // deal with lightmap brightness scale scale = 1.0f / (1 << (7 + lightscalebit + 8)); - if (currentrenderentity->model->lightmaprgba) + if (ent->model->lightmaprgba) { stride = (surf->lightmaptexturestride - smax) * 4; for (i = 0;i < tmax;i++, out += stride) @@ -587,8 +595,8 @@ void R_Stain (vec3_t origin, float radius, int cr1, int cg1, int cb1, int ca1, i icolor[7] = ca2; model = cl.worldmodel; - softwaretransformidentity(); - R_StainNode(model->nodes + model->hulls[0].firstclipnode, model, origin, radius, icolor); + if (model) + R_StainNode(model->nodes + model->hulls[0].firstclipnode, model, origin, radius, icolor); // look for embedded bmodels for (n = 0;n < cl_num_brushmodel_entities;n++) @@ -600,8 +608,7 @@ void R_Stain (vec3_t origin, float radius, int cr1, int cg1, int cb1, int ca1, i 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); } } @@ -617,83 +624,129 @@ void R_Stain (vec3_t origin, float radius, int cr1, int cg1, int cb1, int ca1, i ============================================================= */ -static void RSurfShader_Sky(msurface_t *firstsurf) +static void RSurf_AddLightmapToVertexColors(const int *lightmapoffsets, float *c, int numverts, const qbyte *samples, int size3, const qbyte *styles) { - msurface_t *surf; int i; - surfvertex_t *v; - surfmesh_t *mesh; - rmeshbufferinfo_t m; - float cr, cg, cb, ca; - float *outv, *outc; - - // LordHavoc: HalfLife maps have freaky skypolys... - if (currentrenderentity->model->ishlbsp) - return; - - if (skyrendernow) + float scale; + const qbyte *lm; + if (styles[0] != 255) { - skyrendernow = false; - if (skyrendermasked) - R_Sky(); + for (i = 0;i < numverts;i++, c += 4) + { + lm = samples + lightmapoffsets[i]; + scale = d_lightstylevalue[styles[0]] * (1.0f / 32768.0f); + VectorMA(c, scale, lm, c); + if (styles[1] != 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); + } + } + } + } } - for (surf = firstsurf;surf;surf = surf->chain) +} + +static void RSurf_FogColors(const float *v, float *c, float colorscale, int numverts, const float *modelorg) +{ + int i; + float diff[3], f; + if (fogenabled) { - // draw depth-only polys - memset(&m, 0, sizeof(m)); - m.transparent = false; - if (skyrendermasked) + for (i = 0;i < numverts;i++, v += 4, c += 4) { - m.blendfunc1 = GL_ZERO; - m.blendfunc2 = GL_ONE; - m.depthwrite = true; + VectorSubtract(v, modelorg, diff); + f = colorscale * (1 - exp(fogdensity/DotProduct(diff, diff))); + VectorScale(c, f, c); } - else + } + else if (colorscale != 1) + for (i = 0;i < numverts;i++, c += 4) + VectorScale(c, colorscale, c); +} + +static void RSurf_FoggedColors(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; + if (fogenabled) + { + for (i = 0;i < numverts;i++, v += 4, c += 4) { - m.blendfunc1 = GL_ONE; - m.blendfunc2 = GL_ZERO; - m.depthwrite = false; + 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; } - for (mesh = surf->mesh;mesh;mesh = mesh->chain) + } + else + { + for (i = 0;i < numverts;i++, c += 4) { - m.numtriangles = mesh->numtriangles; - m.numverts = mesh->numverts; - if (R_Mesh_Draw_GetBuffer(&m, false)) - { - cr = fogcolor[0] * m.colorscale; - cg = fogcolor[1] * m.colorscale; - cb = fogcolor[2] * m.colorscale; - ca = 1; - memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3])); - for (i = 0, v = mesh->vertex, outv = m.vertex;i < m.numverts;i++, v++, outv += 4, outc += 4) - { - softwaretransform(v->v, outv); - } - for (i = 0, outc = m.color;i < m.numverts;i++, outc += 4) - { - outc[0] = cr; - outc[1] = cg; - outc[2] = cb; - outc[3] = ca; - } - } + c[0] = r; + c[1] = g; + c[2] = b; + c[3] = a; } } } -static int RSurf_LightSeparate(int *dlightbits, int numverts, float *vert, float *color) +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; + } +} + +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 int RSurf_LightSeparate(const matrix4x4_t *matrix, const int *dlightbits, int numverts, const float *vert, float *color) { - float f, *v, *c; + float f; + const float *v; + float *c; int i, l, lit = false; - rdlight_t *rd; + const rdlight_t *rd; vec3_t lightorigin; for (l = 0;l < r_numdlights;l++) { if (dlightbits[l >> 5] & (1 << (l & 31))) { rd = &r_dlight[l]; - // FIXME: support softwareuntransform here and make bmodels use hardware transform? - VectorCopy(rd->origin, lightorigin); + 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; @@ -710,810 +763,620 @@ static int RSurf_LightSeparate(int *dlightbits, int numverts, float *vert, float } // note: this untransforms lights to do the checking, -// and takes surf->mesh->vertex data -static int RSurf_LightCheck(int *dlightbits, surfmesh_t *mesh) +// and takes surf->mesh->verts data +static int RSurf_LightCheck(const matrix4x4_t *matrix, const int *dlightbits, const surfmesh_t *mesh) { int i, l; - rdlight_t *rd; + const rdlight_t *rd; vec3_t lightorigin; - surfvertex_t *sv; + const float *v; 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) + Matrix4x4_Transform(matrix, rd->origin, lightorigin); + for (i = 0, v = mesh->verts;i < mesh->numverts;i++, v += 4) + if (VectorDistance2(v, lightorigin) < rd->cullradius2) return true; } } return false; } -static void RSurfShader_Water_Pass_Base(msurface_t *surf) +static void RSurfShader_Sky(const entity_render_t *ent, const msurface_t *firstsurf) +{ + const msurface_t *surf; + const surfmesh_t *mesh; + rmeshstate_t m; + + // LordHavoc: HalfLife maps have freaky skypolys... + if (ent->model->ishlbsp) + return; + + if (skyrendernow) + { + skyrendernow = false; + if (skyrendermasked) + R_Sky(); + } + + R_Mesh_Matrix(&ent->matrix); + + // 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.wantoverbright = false; + m.depthwrite = true; + R_Mesh_State(&m); + for (surf = firstsurf;surf;surf = surf->chain) + { + for (mesh = surf->mesh;mesh;mesh = mesh->chain) + { + R_Mesh_ResizeCheck(mesh->numverts, mesh->numtriangles); + memcpy(varray_element, mesh->index, mesh->numtriangles * sizeof(int[3])); + memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4])); + if (skyrendermasked) + memset(varray_color, 0, mesh->numverts * sizeof(float[4])); + else + R_FillColors(varray_color, mesh->numverts, fogcolor[0] * mesh_colorscale, fogcolor[1] * mesh_colorscale, fogcolor[2] * mesh_colorscale, 1); + R_Mesh_Draw(mesh->numverts, mesh->numtriangles); + } + } +} + +static void RSurfShader_Water_Callback(const void *calldata1, int calldata2) { - int i, size3; - surfvertex_t *v; - float *outv, *outc, *outst, cl, diff[3]; - float base[3], scale, f; - qbyte *lm; - surfmesh_t *mesh; - rmeshbufferinfo_t m; - float alpha = currentrenderentity->alpha * (surf->flags & SURF_DRAWNOALPHA ? 1 : r_wateralpha.value); + const entity_render_t *ent = calldata1; + const msurface_t *surf = ent->model->surfaces + calldata2; + float f; + const surfmesh_t *mesh; + rmeshstate_t m; + float alpha = ent->alpha * (surf->flags & SURF_DRAWNOALPHA ? 1 : r_wateralpha.value); + float modelorg[3]; + Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg); + + R_Mesh_Matrix(&ent->matrix); + memset(&m, 0, sizeof(m)); - if (currentrenderentity->effects & EF_ADDITIVE) + if (ent->effects & EF_ADDITIVE) { - m.transparent = true; m.blendfunc1 = GL_SRC_ALPHA; m.blendfunc2 = GL_ONE; } else if (surf->currenttexture->fogtexture != NULL || alpha < 1) { - m.transparent = true; m.blendfunc1 = GL_SRC_ALPHA; m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA; } else { - m.transparent = false; m.blendfunc1 = GL_ONE; m.blendfunc2 = GL_ZERO; } - m.depthwrite = false; - m.depthdisable = false; + m.wantoverbright = true; m.tex[0] = R_GetTexture(surf->currenttexture->texture); - if (surf->flags & SURF_DRAWFULLBRIGHT || currentrenderentity->effects & EF_FULLBRIGHT) + R_Mesh_State(&m); + for (mesh = surf->mesh;mesh;mesh = mesh->chain) { - for (mesh = surf->mesh;mesh;mesh = mesh->chain) + R_Mesh_ResizeCheck(mesh->numverts, mesh->numtriangles); + memcpy(varray_element, mesh->index, mesh->numtriangles * sizeof(int[3])); + memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4])); + memcpy(varray_texcoord[0], mesh->st, mesh->numverts * sizeof(float[2])); + f = surf->flags & SURF_DRAWFULLBRIGHT ? 1.0f : ((surf->flags & SURF_LIGHTMAP) ? 0 : 0.5f); + R_FillColors(varray_color, mesh->numverts, f, f, f, alpha); + if (!(surf->flags & SURF_DRAWFULLBRIGHT || ent->effects & EF_FULLBRIGHT)) { - m.numtriangles = mesh->numtriangles; - m.numverts = mesh->numverts; - if (R_Mesh_Draw_GetBuffer(&m, true)) - { - base[0] = base[1] = base[2] = 1.0f * m.colorscale; - memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3])); - for (i = 0, v = mesh->vertex, outv = m.vertex, outc = m.color, outst = m.texcoords[0];i < m.numverts;i++, v++, outv += 4, outc += 4, outst += 2) - { - softwaretransform(v->v, outv); - outv[3] = 1; - VectorCopy(base, outc); - outc[3] = alpha; - outst[0] = v->st[0]; - outst[1] = v->st[1]; - if (fogenabled) - { - VectorSubtract(outv, r_origin, diff); - f = 1 - exp(fogdensity/DotProduct(diff, diff)); - VectorScale(outc, f, outc); - } - } - } + if (surf->dlightframe == r_framecount) + RSurf_LightSeparate(&ent->inversematrix, surf->dlightbits, mesh->numverts, varray_vertex, varray_color); + if (surf->flags & SURF_LIGHTMAP) + RSurf_AddLightmapToVertexColors(mesh->lightmapoffsets, varray_color, mesh->numverts, surf->samples, ((surf->extents[0]>>4)+1)*((surf->extents[1]>>4)+1)*3, surf->styles); } + RSurf_FogColors(varray_vertex, varray_color, mesh_colorscale, mesh->numverts, modelorg); + R_Mesh_Draw(mesh->numverts, mesh->numtriangles); } - else + + if (fogenabled) { - size3 = ((surf->extents[0]>>4)+1)*((surf->extents[1]>>4)+1)*3; - base[0] = base[1] = base[2] = (r_ambient.value * (1.0f / 64.0f) + ((surf->flags & SURF_LIGHTMAP) ? 0 : 0.5f)); + memset(&m, 0, sizeof(m)); + m.blendfunc1 = GL_SRC_ALPHA; + m.blendfunc2 = GL_ONE; + m.wantoverbright = false; + m.tex[0] = R_GetTexture(surf->currenttexture->fogtexture); + R_Mesh_State(&m); for (mesh = surf->mesh;mesh;mesh = mesh->chain) { - m.numtriangles = mesh->numtriangles; - m.numverts = mesh->numverts; - if (R_Mesh_Draw_GetBuffer(&m, true)) - { - cl = m.colorscale; - memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3])); - for (i = 0, v = mesh->vertex, outv = m.vertex, outc = m.color, outst = m.texcoords[0];i < m.numverts;i++, v++, outv += 4, outc += 4, outst += 2) - { - softwaretransform(v->v, outv); - outv[3] = 1; - VectorCopy(base, outc); - outc[3] = alpha; - outst[0] = v->st[0]; - outst[1] = v->st[1]; - } - if (surf->dlightframe == r_framecount) - RSurf_LightSeparate(surf->dlightbits, m.numverts, m.vertex, m.color); - for (i = 0, v = mesh->vertex, outv = m.vertex, outc = m.color;i < m.numverts;i++, v++, outv += 4, outc += 4) - { - if (surf->flags & SURF_LIGHTMAP) - if (surf->styles[0] != 255) - { - lm = surf->samples + v->lightmapoffset; - scale = d_lightstylevalue[surf->styles[0]] * (1.0f / 32768.0f); - VectorMA(outc, scale, lm, outc); - if (surf->styles[1] != 255) - { - lm += size3; - scale = d_lightstylevalue[surf->styles[1]] * (1.0f / 32768.0f); - VectorMA(outc, scale, lm, outc); - if (surf->styles[2] != 255) - { - lm += size3; - scale = d_lightstylevalue[surf->styles[2]] * (1.0f / 32768.0f); - VectorMA(outc, scale, lm, outc); - if (surf->styles[3] != 255) - { - lm += size3; - scale = d_lightstylevalue[surf->styles[3]] * (1.0f / 32768.0f); - VectorMA(outc, scale, lm, outc); - } - } - } - } - if (fogenabled) - { - VectorSubtract(outv, r_origin, diff); - f = cl * (1 - exp(fogdensity/DotProduct(diff, diff))); - VectorScale(outc, f, outc); - } - else - VectorScale(outc, cl, outc); - } - } + R_Mesh_ResizeCheck(mesh->numverts, mesh->numtriangles); + memcpy(varray_element, mesh->index, mesh->numtriangles * sizeof(int[3])); + memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4])); + if (m.tex[0]) + memcpy(varray_texcoord[0], mesh->st, mesh->numverts * sizeof(float[2])); + RSurf_FogPassColors(varray_vertex, varray_color, fogcolor[0], fogcolor[1], fogcolor[2], alpha, mesh_colorscale, mesh->numverts, modelorg); + R_Mesh_Draw(mesh->numverts, mesh->numtriangles); } } } -static void RSurfShader_Water_Pass_Fog(msurface_t *surf) +static void RSurfShader_Water(const entity_render_t *ent, const msurface_t *firstsurf) { - int i; - surfvertex_t *v; - float *outv, *outc, *outst, diff[3]; - float base[3], f; - surfmesh_t *mesh; - rmeshbufferinfo_t m; - float alpha = currentrenderentity->alpha * (surf->flags & SURF_DRAWNOALPHA ? 1 : r_wateralpha.value); - memset(&m, 0, sizeof(m)); - m.transparent = currentrenderentity->effects & EF_ADDITIVE || surf->currenttexture->fogtexture != NULL || alpha < 1; - m.blendfunc1 = GL_SRC_ALPHA; - m.blendfunc2 = GL_ONE; - m.depthwrite = false; - m.depthdisable = false; - m.tex[0] = R_GetTexture(surf->currenttexture->fogtexture); - for (mesh = surf->mesh;mesh;mesh = mesh->chain) + const msurface_t *surf; + vec3_t center; + for (surf = firstsurf;surf;surf = surf->chain) { - m.numtriangles = mesh->numtriangles; - m.numverts = mesh->numverts; - if (R_Mesh_Draw_GetBuffer(&m, false)) + if ((r_wateralpha.value < 1 && !(surf->flags & SURF_DRAWNOALPHA)) || ent->effects & EF_ADDITIVE || surf->currenttexture->fogtexture) { - VectorScale(fogcolor, m.colorscale, base); - memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3])); - for (i = 0, v = mesh->vertex, outv = m.vertex, outc = m.color;i < m.numverts;i++, v++, outv += 4, outc += 4) - { - softwaretransform(v->v, outv); - outv[3] = 1; - VectorSubtract(outv, r_origin, diff); - f = exp(fogdensity/DotProduct(diff, diff)); - VectorScale(base, f, outc); - outc[3] = alpha; - } - if (m.tex[0]) - { - for (i = 0, v = mesh->vertex, outst = m.texcoords[0];i < m.numverts;i++, v++, outv += 4, outst += 2) - { - outst[0] = v->st[0]; - outst[1] = v->st[1]; - } - } + Matrix4x4_Transform(&ent->matrix, surf->poly_center, center); + R_MeshQueue_AddTransparent(center, RSurfShader_Water_Callback, ent, surf - ent->model->surfaces); } + else + RSurfShader_Water_Callback(ent, surf - ent->model->surfaces); } } -static void RSurfShader_Water(msurface_t *firstsurf) -{ - msurface_t *surf; - for (surf = firstsurf;surf;surf = surf->chain) - RSurfShader_Water_Pass_Base(surf); - if (fogenabled) - for (surf = firstsurf;surf;surf = surf->chain) - RSurfShader_Water_Pass_Fog(surf); -} - -static void RSurfShader_Wall_Pass_BaseVertex(msurface_t *surf) +static void RSurfShader_Wall_Pass_BaseVertex(const entity_render_t *ent, const msurface_t *surf) { - int i, size3; - surfvertex_t *v; - float *outv, *outc, *outst, cl, ca, diff[3]; - float base[3], scale, f; - qbyte *lm; - surfmesh_t *mesh; - rmeshbufferinfo_t m; + float base; + const surfmesh_t *mesh; + rmeshstate_t m; + float modelorg[3]; + Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg); memset(&m, 0, sizeof(m)); - if (currentrenderentity->effects & EF_ADDITIVE) + if (ent->effects & EF_ADDITIVE) { - m.transparent = true; m.blendfunc1 = GL_SRC_ALPHA; m.blendfunc2 = GL_ONE; } - else if (surf->currenttexture->fogtexture != NULL || currentrenderentity->alpha != 1) + 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.depthwrite = false; - m.depthdisable = false; + m.wantoverbright = true; m.tex[0] = R_GetTexture(surf->currenttexture->texture); - - size3 = ((surf->extents[0]>>4)+1)*((surf->extents[1]>>4)+1)*3; - - base[0] = base[1] = base[2] = currentrenderentity->effects & EF_FULLBRIGHT ? 2.0f : r_ambient.value * (1.0f / 64.0f); - - ca = currentrenderentity->alpha; + base = ent->effects & EF_FULLBRIGHT ? 2.0f : r_ambient.value * (1.0f / 64.0f); + R_Mesh_State(&m); for (mesh = surf->mesh;mesh;mesh = mesh->chain) { - m.numtriangles = mesh->numtriangles; - m.numverts = mesh->numverts; - - if (R_Mesh_Draw_GetBuffer(&m, true)) + R_Mesh_ResizeCheck(mesh->numverts, mesh->numtriangles); + memcpy(varray_element, mesh->index, mesh->numtriangles * sizeof(int[3])); + memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4])); + memcpy(varray_texcoord[0], mesh->st, mesh->numverts * sizeof(float[2])); + R_FillColors(varray_color, mesh->numverts, base, base, base, ent->alpha); + if (!(ent->effects & EF_FULLBRIGHT)) { - cl = m.colorscale; - memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3])); - - if (currentrenderentity->effects & EF_FULLBRIGHT) - { - for (i = 0, v = mesh->vertex, outv = m.vertex, outc = m.color, outst = m.texcoords[0];i < m.numverts;i++, v++, outv += 4, outc += 4, outst += 2) - { - softwaretransform(v->v, outv); - outv[3] = 1; - VectorSubtract(outv, r_origin, diff); - outc[0] = outc[1] = outc[2] = 2.0f * cl * (1 - exp(fogdensity/DotProduct(diff, diff))); - outc[3] = ca; - outst[0] = v->st[0]; - outst[1] = v->st[1]; - } - } - else - { - for (i = 0, v = mesh->vertex, outv = m.vertex, outc = m.color, outst = m.texcoords[0];i < m.numverts;i++, v++, outv += 4, outc += 4, outst += 2) - { - softwaretransform(v->v, outv); - outv[3] = 1; - VectorCopy(base, outc); - outc[3] = ca; - outst[0] = v->st[0]; - outst[1] = v->st[1]; - } - - if (surf->dlightframe == r_framecount) - RSurf_LightSeparate(surf->dlightbits, m.numverts, m.vertex, m.color); - - for (i = 0, v = mesh->vertex, outv = m.vertex, outc = m.color;i < m.numverts;i++, v++, outv += 4, outc += 4) - { - if (surf->styles[0] != 255) - { - lm = surf->samples + v->lightmapoffset; - scale = d_lightstylevalue[surf->styles[0]] * (1.0f / 32768.0f); - VectorMA(outc, scale, lm, outc); - if (surf->styles[1] != 255) - { - lm += size3; - scale = d_lightstylevalue[surf->styles[1]] * (1.0f / 32768.0f); - VectorMA(outc, scale, lm, outc); - if (surf->styles[2] != 255) - { - lm += size3; - scale = d_lightstylevalue[surf->styles[2]] * (1.0f / 32768.0f); - VectorMA(outc, scale, lm, outc); - if (surf->styles[3] != 255) - { - lm += size3; - scale = d_lightstylevalue[surf->styles[3]] * (1.0f / 32768.0f); - VectorMA(outc, scale, lm, outc); - } - } - } - } - if (fogenabled) - { - VectorSubtract(outv, r_origin, diff); - f = cl * (1 - exp(fogdensity/DotProduct(diff, diff))); - VectorScale(outc, f, outc); - } - else - VectorScale(outc, cl, outc); - } - } + if (surf->dlightframe == r_framecount) + RSurf_LightSeparate(&ent->inversematrix, surf->dlightbits, mesh->numverts, varray_vertex, varray_color); + if (surf->flags & SURF_LIGHTMAP) + RSurf_AddLightmapToVertexColors(mesh->lightmapoffsets, varray_color, mesh->numverts, surf->samples, ((surf->extents[0]>>4)+1)*((surf->extents[1]>>4)+1)*3, surf->styles); } + RSurf_FogColors(varray_vertex, varray_color, mesh_colorscale, mesh->numverts, modelorg); + R_Mesh_Draw(mesh->numverts, mesh->numtriangles); } } -static void RSurfShader_Wall_Pass_BaseFullbright(msurface_t *surf) +static void RSurfShader_Wall_Pass_BaseFullbright(const entity_render_t *ent, const msurface_t *surf) { - int i; - surfvertex_t *v; - float *outv, *outc, *outst, cl, ca, diff[3]; - surfmesh_t *mesh; - rmeshbufferinfo_t m; + const surfmesh_t *mesh; + rmeshstate_t m; + float modelorg[3]; + Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg); memset(&m, 0, sizeof(m)); - if (currentrenderentity->effects & EF_ADDITIVE) + if (ent->effects & EF_ADDITIVE) { - m.transparent = true; m.blendfunc1 = GL_SRC_ALPHA; m.blendfunc2 = GL_ONE; } - else if (surf->currenttexture->fogtexture != NULL || currentrenderentity->alpha != 1) + 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.depthwrite = false; - m.depthdisable = false; + m.wantoverbright = false; m.tex[0] = R_GetTexture(surf->currenttexture->texture); - ca = currentrenderentity->alpha; + R_Mesh_State(&m); for (mesh = surf->mesh;mesh;mesh = mesh->chain) { - m.numtriangles = mesh->numtriangles; - m.numverts = mesh->numverts; - - if (R_Mesh_Draw_GetBuffer(&m, false)) - { - cl = m.colorscale; - memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3])); - for (i = 0, v = mesh->vertex, outv = m.vertex, outc = m.color, outst = m.texcoords[0];i < m.numverts;i++, v++, outv += 4, outc += 4, outst += 2) - { - softwaretransform(v->v, outv); - outv[3] = 1; - if (fogenabled) - { - VectorSubtract(outv, r_origin, diff); - outc[0] = outc[1] = outc[2] = cl * (1 - exp(fogdensity/DotProduct(diff, diff))); - } - else - outc[0] = outc[1] = outc[2] = cl; - outc[3] = ca; - outst[0] = v->st[0]; - outst[1] = v->st[1]; - } - } + R_Mesh_ResizeCheck(mesh->numverts, mesh->numtriangles); + memcpy(varray_element, mesh->index, mesh->numtriangles * sizeof(int[3])); + memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4])); + memcpy(varray_texcoord[0], mesh->st, mesh->numverts * sizeof(float[2])); + RSurf_FoggedColors(varray_vertex, varray_color, 1, 1, 1, ent->alpha, mesh_colorscale, mesh->numverts, modelorg); + R_Mesh_Draw(mesh->numverts, mesh->numtriangles); } } -static void RSurfShader_Wall_Pass_Glow(msurface_t *surf) +static void RSurfShader_Wall_Pass_Glow(const entity_render_t *ent, const msurface_t *surf) { - int i; - surfvertex_t *v; - float *outv, *outc, *outst, cl, ca, diff[3]; - surfmesh_t *mesh; - rmeshbufferinfo_t m; + const surfmesh_t *mesh; + rmeshstate_t m; + float modelorg[3]; + Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg); memset(&m, 0, sizeof(m)); - m.transparent = currentrenderentity->effects & EF_ADDITIVE || surf->currenttexture->fogtexture != NULL || currentrenderentity->alpha != 1; m.blendfunc1 = GL_SRC_ALPHA; m.blendfunc2 = GL_ONE; + m.wantoverbright = false; m.tex[0] = R_GetTexture(surf->currenttexture->glowtexture); - ca = currentrenderentity->alpha; + R_Mesh_State(&m); for (mesh = surf->mesh;mesh;mesh = mesh->chain) { - m.numtriangles = mesh->numtriangles; - m.numverts = mesh->numverts; - - if (R_Mesh_Draw_GetBuffer(&m, false)) - { - cl = m.colorscale; - memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3])); - for (i = 0, v = mesh->vertex, outv = m.vertex, outc = m.color, outst = m.texcoords[0];i < m.numverts;i++, v++, outv += 4, outc += 4, outst += 2) - { - softwaretransform(v->v, outv); - outv[3] = 1; - if (fogenabled) - { - VectorSubtract(outv, r_origin, diff); - outc[0] = outc[1] = outc[2] = cl * (1 - exp(fogdensity/DotProduct(diff, diff))); - } - else - outc[0] = outc[1] = outc[2] = cl; - outc[3] = ca; - outst[0] = v->st[0]; - outst[1] = v->st[1]; - } - } + R_Mesh_ResizeCheck(mesh->numverts, mesh->numtriangles); + memcpy(varray_element, mesh->index, mesh->numtriangles * sizeof(int[3])); + memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4])); + memcpy(varray_texcoord[0], mesh->st, mesh->numverts * sizeof(float[2])); + RSurf_FoggedColors(varray_vertex, varray_color, 1, 1, 1, ent->alpha, mesh_colorscale, mesh->numverts, modelorg); + R_Mesh_Draw(mesh->numverts, mesh->numtriangles); } } -static void RSurfShader_Wall_Pass_Fog(msurface_t *surf) +static void RSurfShader_Wall_Pass_Fog(const entity_render_t *ent, const msurface_t *surf) { - int i; - surfvertex_t *v; - float *outv, *outc, *outst, cl, ca, diff[3], f; - surfmesh_t *mesh; - rmeshbufferinfo_t m; + const surfmesh_t *mesh; + rmeshstate_t m; + float modelorg[3]; + Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg); memset(&m, 0, sizeof(m)); - m.transparent = currentrenderentity->effects & EF_ADDITIVE || surf->currenttexture->fogtexture != NULL || currentrenderentity->alpha != 1; m.blendfunc1 = GL_SRC_ALPHA; m.blendfunc2 = GL_ONE; - ca = currentrenderentity->alpha; + m.wantoverbright = false; + m.tex[0] = R_GetTexture(surf->currenttexture->fogtexture); + R_Mesh_State(&m); for (mesh = surf->mesh;mesh;mesh = mesh->chain) { - m.numtriangles = mesh->numtriangles; - m.numverts = mesh->numverts; - - if (R_Mesh_Draw_GetBuffer(&m, false)) - { - cl = m.colorscale; - memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3])); - for (i = 0, v = mesh->vertex, outv = m.vertex, outc = m.color, outst = m.texcoords[0];i < m.numverts;i++, v++, outv += 4, outc += 4, outst += 2) - { - softwaretransform(v->v, outv); - outv[3] = 1; - VectorSubtract(outv, r_origin, diff); - f = cl * exp(fogdensity/DotProduct(diff, diff)); - VectorScale(fogcolor, f, outc); - outc[3] = ca; - outst[0] = v->st[0]; - outst[1] = v->st[1]; - } - } + R_Mesh_ResizeCheck(mesh->numverts, mesh->numtriangles); + memcpy(varray_element, mesh->index, mesh->numtriangles * sizeof(int[3])); + memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4])); + if (m.tex[0]) + memcpy(varray_texcoord[0], mesh->st, mesh->numverts * sizeof(float[2])); + RSurf_FogPassColors(varray_vertex, varray_color, fogcolor[0], fogcolor[1], fogcolor[2], ent->alpha, mesh_colorscale, mesh->numverts, modelorg); + R_Mesh_Draw(mesh->numverts, mesh->numtriangles); } } -static void RSurfShader_OpaqueWall_Pass_TripleTexCombine(msurface_t *surf) +static void RSurfShader_OpaqueWall_Pass_TripleTexCombine(const entity_render_t *ent, const msurface_t *surf) { - int i; - surfvertex_t *v; - float *outv, *outc, *outst, *outuv, *outab, cl; - surfmesh_t *mesh; - rmeshbufferinfo_t m; - memset(&m, 0, sizeof(m)); - m.transparent = false; + const surfmesh_t *mesh; + static rmeshstate_t m; + float cl; + //memset(&m, 0, sizeof(m)); m.blendfunc1 = GL_ONE; m.blendfunc2 = GL_ZERO; - m.depthwrite = false; - m.depthdisable = false; + m.wantoverbright = false; 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; + R_Mesh_State(&m); for (mesh = surf->mesh;mesh;mesh = mesh->chain) { - m.numtriangles = mesh->numtriangles; - m.numverts = mesh->numverts; - - if (R_Mesh_Draw_GetBuffer(&m, false)) - { - cl = (float) (1 << lightscalebit) * m.colorscale; - memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3])); - for (i = 0, v = mesh->vertex, outv = m.vertex, outc = m.color, outst = m.texcoords[0], outuv = m.texcoords[1], outab = m.texcoords[2];i < m.numverts;i++, v++, outv += 4, outc += 4, outst += 2, outuv += 2, outab += 2) - { - softwaretransform(v->v, outv); - outv[3] = 1; - outc[0] = outc[1] = outc[2] = cl; - outc[3] = 1; - outst[0] = v->st[0]; - outst[1] = v->st[1]; - outuv[0] = v->uv[0]; - outuv[1] = v->uv[1]; - outab[0] = v->ab[0]; - outab[1] = v->ab[1]; - } - } + R_Mesh_ResizeCheck(mesh->numverts, mesh->numtriangles); + memcpy(varray_element, mesh->index, mesh->numtriangles * sizeof(int[3])); + memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4])); + memcpy(varray_texcoord[0], mesh->st, mesh->numverts * sizeof(float[2])); + memcpy(varray_texcoord[1], mesh->uv, mesh->numverts * sizeof(float[2])); + memcpy(varray_texcoord[2], mesh->ab, mesh->numverts * sizeof(float[2])); + cl = (float) (1 << lightscalebit) * mesh_colorscale; + R_FillColors(varray_color, mesh->numverts, cl, cl, cl, 1); + R_Mesh_Draw(mesh->numverts, mesh->numtriangles); } } -static void RSurfShader_OpaqueWall_Pass_BaseMTex(msurface_t *surf) +static void RSurfShader_OpaqueWall_Pass_BaseMTex(const entity_render_t *ent, const msurface_t *surf) { - int i; - surfvertex_t *v; - float *outv, *outc, *outst, *outuv, cl; - surfmesh_t *mesh; - rmeshbufferinfo_t m; + const surfmesh_t *mesh; + rmeshstate_t m; + float cl; memset(&m, 0, sizeof(m)); - m.transparent = false; m.blendfunc1 = GL_ONE; m.blendfunc2 = GL_ZERO; - m.depthwrite = false; - m.depthdisable = false; + m.wantoverbright = true; m.tex[0] = R_GetTexture(surf->currenttexture->texture); m.tex[1] = R_GetTexture(surf->lightmaptexture); + R_Mesh_State(&m); for (mesh = surf->mesh;mesh;mesh = mesh->chain) { - m.numtriangles = mesh->numtriangles; - m.numverts = mesh->numverts; - - if (R_Mesh_Draw_GetBuffer(&m, true)) - { - cl = (float) (1 << lightscalebit) * m.colorscale; - memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3])); - for (i = 0, v = mesh->vertex, outv = m.vertex, outc = m.color, outst = m.texcoords[0], outuv = m.texcoords[1];i < m.numverts;i++, v++, outv += 4, outc += 4, outst += 2, outuv += 2) - { - softwaretransform(v->v, outv); - outv[3] = 1; - outc[0] = outc[1] = outc[2] = cl; - outc[3] = 1; - outst[0] = v->st[0]; - outst[1] = v->st[1]; - outuv[0] = v->uv[0]; - outuv[1] = v->uv[1]; - } - } + R_Mesh_ResizeCheck(mesh->numverts, mesh->numtriangles); + memcpy(varray_element, mesh->index, mesh->numtriangles * sizeof(int[3])); + memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4])); + memcpy(varray_texcoord[0], mesh->st, mesh->numverts * sizeof(float[2])); + memcpy(varray_texcoord[1], mesh->uv, mesh->numverts * sizeof(float[2])); + cl = (float) (1 << lightscalebit) * mesh_colorscale; + R_FillColors(varray_color, mesh->numverts, cl, cl, cl, 1); + R_Mesh_Draw(mesh->numverts, mesh->numtriangles); } } -static void RSurfShader_OpaqueWall_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; - float *outv, *outc, *outst, cl; - surfmesh_t *mesh; - rmeshbufferinfo_t m; + const surfmesh_t *mesh; + rmeshstate_t m; + float cl; memset(&m, 0, sizeof(m)); - m.transparent = false; m.blendfunc1 = GL_ONE; m.blendfunc2 = GL_ZERO; - m.depthwrite = false; - m.depthdisable = false; + m.wantoverbright = false; m.tex[0] = R_GetTexture(surf->currenttexture->texture); + R_Mesh_State(&m); for (mesh = surf->mesh;mesh;mesh = mesh->chain) { - m.numtriangles = mesh->numtriangles; - m.numverts = mesh->numverts; - - if (R_Mesh_Draw_GetBuffer(&m, false)) - { - cl = (float) (1 << lightscalebit) * m.colorscale; - memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3])); - for (i = 0, v = mesh->vertex, outv = m.vertex, outc = m.color, outst = m.texcoords[0];i < m.numverts;i++, v++, outv += 4, outc += 4, outst += 2) - { - softwaretransform(v->v, outv); - outv[3] = 1; - outc[0] = outc[1] = outc[2] = cl; - outc[3] = 1; - outst[0] = v->st[0]; - outst[1] = v->st[1]; - } - } + R_Mesh_ResizeCheck(mesh->numverts, mesh->numtriangles); + memcpy(varray_element, mesh->index, mesh->numtriangles * sizeof(int[3])); + memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4])); + memcpy(varray_texcoord[0], mesh->st, mesh->numverts * sizeof(float[2])); + cl = mesh_colorscale; + R_FillColors(varray_color, mesh->numverts, cl, cl, cl, 1); + R_Mesh_Draw(mesh->numverts, mesh->numtriangles); } } -static void RSurfShader_OpaqueWall_Pass_BaseLightmap(msurface_t *surf) +static void RSurfShader_OpaqueWall_Pass_BaseLightmap(const entity_render_t *ent, const msurface_t *surf) { - int i; - surfvertex_t *v; - float *outv, *outc, *outuv, cl; - surfmesh_t *mesh; - rmeshbufferinfo_t m; + const surfmesh_t *mesh; + rmeshstate_t m; + float cl; memset(&m, 0, sizeof(m)); - m.transparent = false; m.blendfunc1 = GL_ZERO; m.blendfunc2 = GL_SRC_COLOR; - m.depthwrite = false; - m.depthdisable = false; + m.wantoverbright = true; m.tex[0] = R_GetTexture(surf->lightmaptexture); + R_Mesh_State(&m); for (mesh = surf->mesh;mesh;mesh = mesh->chain) { - m.numtriangles = mesh->numtriangles; - m.numverts = mesh->numverts; - - if (R_Mesh_Draw_GetBuffer(&m, true)) - { - cl = (float) (1 << lightscalebit) * m.colorscale; - memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3])); - for (i = 0, v = mesh->vertex, outv = m.vertex, outc = m.color, outuv = m.texcoords[0];i < m.numverts;i++, v++, outv += 4, outc += 4, outuv += 2) - { - softwaretransform(v->v, outv); - outv[3] = 1; - outc[0] = outc[1] = outc[2] = cl; - outc[3] = 1; - outuv[0] = v->uv[0]; - outuv[1] = v->uv[1]; - } - } + R_Mesh_ResizeCheck(mesh->numverts, mesh->numtriangles); + memcpy(varray_element, mesh->index, mesh->numtriangles * sizeof(int[3])); + memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4])); + memcpy(varray_texcoord[0], mesh->uv, mesh->numverts * sizeof(float[2])); + cl = (float) (1 << lightscalebit) * mesh_colorscale; + R_FillColors(varray_color, mesh->numverts, cl, cl, cl, 1); + R_Mesh_Draw(mesh->numverts, mesh->numtriangles); } } -static void RSurfShader_OpaqueWall_Pass_Light(msurface_t *surf) +static void RSurfShader_OpaqueWall_Pass_Light(const entity_render_t *ent, const msurface_t *surf) { - int i; - surfvertex_t *v; - float *outv, *outc, *outst, cl; - surfmesh_t *mesh; - rmeshbufferinfo_t m; + const surfmesh_t *mesh; + rmeshstate_t m; if (surf->dlightframe != r_framecount) return; - if (currentrenderentity->effects & EF_FULLBRIGHT) + if (ent->effects & EF_FULLBRIGHT) return; memset(&m, 0, sizeof(m)); - m.transparent = false; m.blendfunc1 = GL_SRC_ALPHA; m.blendfunc2 = GL_ONE; - m.depthwrite = false; - m.depthdisable = false; + m.wantoverbright = true; m.tex[0] = R_GetTexture(surf->currenttexture->texture); + R_Mesh_State(&m); for (mesh = surf->mesh;mesh;mesh = mesh->chain) { - if (RSurf_LightCheck(surf->dlightbits, mesh)) + if (RSurf_LightCheck(&ent->inversematrix, surf->dlightbits, mesh)) { - m.numtriangles = mesh->numtriangles; - m.numverts = mesh->numverts; - - if (R_Mesh_Draw_GetBuffer(&m, true)) - { - cl = m.colorscale; - memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3])); - for (i = 0, v = mesh->vertex, outv = m.vertex, outc = m.color, outst = m.texcoords[0];i < m.numverts;i++, v++, outv += 4, outc += 4, outst += 2) - { - softwaretransform(v->v, outv); - outv[3] = 1; - VectorClear(outc); - outc[3] = 1; - outst[0] = v->st[0]; - outst[1] = v->st[1]; - } - RSurf_LightSeparate(surf->dlightbits, m.numverts, m.vertex, m.color); - if (cl != 1) - for (i = 0, outc = m.color;i < m.numverts;i++, outc += 4) - VectorScale(outc, cl, outc); - } + R_Mesh_ResizeCheck(mesh->numverts, mesh->numtriangles); + memcpy(varray_element, mesh->index, mesh->numtriangles * sizeof(int[3])); + memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4])); + memcpy(varray_texcoord[0], mesh->st, mesh->numverts * sizeof(float[2])); + R_FillColors(varray_color, mesh->numverts, 0, 0, 0, 1); + RSurf_LightSeparate(&ent->inversematrix, surf->dlightbits, mesh->numverts, varray_vertex, varray_color); + RSurf_ScaleColors(varray_color, mesh_colorscale, mesh->numverts); + R_Mesh_Draw(mesh->numverts, mesh->numtriangles); } } } -static void RSurfShader_OpaqueWall_Pass_Fog(msurface_t *surf) +static void RSurfShader_OpaqueWall_Pass_Fog(const entity_render_t *ent, const msurface_t *surf) { - int i; - surfvertex_t *v; - float *outv, *outc, cl, diff[3], fcolor[3]; - surfmesh_t *mesh; - rmeshbufferinfo_t m; + const surfmesh_t *mesh; + rmeshstate_t m; + float modelorg[3]; + Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg); memset(&m, 0, sizeof(m)); - m.transparent = false; m.blendfunc1 = GL_SRC_ALPHA; m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA; + m.wantoverbright = false; + m.tex[0] = R_GetTexture(surf->currenttexture->fogtexture); + R_Mesh_State(&m); for (mesh = surf->mesh;mesh;mesh = mesh->chain) { - m.numtriangles = mesh->numtriangles; - m.numverts = mesh->numverts; - - if (R_Mesh_Draw_GetBuffer(&m, false)) - { - cl = m.colorscale; - VectorScale(fogcolor, cl, fcolor); - memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3])); - for (i = 0, v = mesh->vertex, outv = m.vertex, outc = m.color;i < m.numverts;i++, v++, outv += 4, outc += 4) - { - softwaretransform(v->v, outv); - outv[3] = 1; - VectorCopy(fcolor, outc); - VectorSubtract(outv, r_origin, diff); - outc[3] = exp(fogdensity/DotProduct(diff, diff)); - } - } + R_Mesh_ResizeCheck(mesh->numverts, mesh->numtriangles); + memcpy(varray_element, mesh->index, mesh->numtriangles * sizeof(int[3])); + memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4])); + if (m.tex[0]) + memcpy(varray_texcoord[0], mesh->st, mesh->numverts * sizeof(float[2])); + RSurf_FogPassColors(varray_vertex, varray_color, fogcolor[0], fogcolor[1], fogcolor[2], 1, mesh_colorscale, mesh->numverts, modelorg); + R_Mesh_Draw(mesh->numverts, mesh->numtriangles); } } -static void RSurfShader_OpaqueWall_Pass_BaseDetail(msurface_t *surf) +static void RSurfShader_OpaqueWall_Pass_BaseDetail(const entity_render_t *ent, const msurface_t *surf) { - int i; - surfvertex_t *v; - float *outv, *outc, *outst; - surfmesh_t *mesh; - rmeshbufferinfo_t m; + const surfmesh_t *mesh; + rmeshstate_t m; memset(&m, 0, sizeof(m)); - m.transparent = false; m.blendfunc1 = GL_DST_COLOR; m.blendfunc2 = GL_SRC_COLOR; - m.depthwrite = false; - m.depthdisable = false; + m.wantoverbright = false; m.tex[0] = R_GetTexture(surf->currenttexture->detailtexture); + R_Mesh_State(&m); 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])); - for (i = 0, v = mesh->vertex, outv = m.vertex, outc = m.color, outst = m.texcoords[0];i < m.numverts;i++, v++, outv += 4, outc += 4, outst += 2) - { - softwaretransform(v->v, outv); - outv[3] = 1; - outc[0] = outc[1] = outc[2] = outc[3] = 1; - outst[0] = v->ab[0]; - outst[1] = v->ab[1]; - } - } + R_Mesh_ResizeCheck(mesh->numverts, mesh->numtriangles); + memcpy(varray_element, mesh->index, mesh->numtriangles * sizeof(int[3])); + memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4])); + memcpy(varray_texcoord[0], mesh->ab, mesh->numverts * sizeof(float[2])); + R_FillColors(varray_color, mesh->numverts, 1, 1, 1, 1); + R_Mesh_Draw(mesh->numverts, mesh->numtriangles); } } -static void RSurfShader_OpaqueWall_Pass_Glow(msurface_t *surf) +static void RSurfShader_OpaqueWall_Pass_Glow(const entity_render_t *ent, const msurface_t *surf) { - int i; - surfvertex_t *v; - float *outv, *outc, *outst, cl; - surfmesh_t *mesh; - rmeshbufferinfo_t m; + const surfmesh_t *mesh; + rmeshstate_t m; memset(&m, 0, sizeof(m)); - m.transparent = false; m.blendfunc1 = GL_SRC_ALPHA; m.blendfunc2 = GL_ONE; + m.wantoverbright = false; m.tex[0] = R_GetTexture(surf->currenttexture->glowtexture); + R_Mesh_State(&m); for (mesh = surf->mesh;mesh;mesh = mesh->chain) { - m.numtriangles = mesh->numtriangles; - m.numverts = mesh->numverts; - - if (R_Mesh_Draw_GetBuffer(&m, false)) - { - cl = m.colorscale; - memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3])); - for (i = 0, v = mesh->vertex, outv = m.vertex, outc = m.color, outst = m.texcoords[0];i < m.numverts;i++, v++, outv += 4, outc += 4, outst += 2) - { - softwaretransform(v->v, outv); - outv[3] = 1; - outc[0] = outc[1] = outc[2] = cl; - outc[3] = 1; - outst[0] = v->st[0]; - outst[1] = v->st[1]; - } - } + R_Mesh_ResizeCheck(mesh->numverts, mesh->numtriangles); + memcpy(varray_element, mesh->index, mesh->numtriangles * sizeof(int[3])); + memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4])); + memcpy(varray_texcoord[0], mesh->st, mesh->numverts * sizeof(float[2])); + R_FillColors(varray_color, mesh->numverts, mesh_colorscale, mesh_colorscale, mesh_colorscale, 1); + R_Mesh_Draw(mesh->numverts, mesh->numtriangles); } } -static void RSurfShader_Wall_Fullbright(msurface_t *firstsurf) +static void RSurfShader_Wall_Fullbright_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; + R_Mesh_Matrix(&ent->matrix); + RSurfShader_Wall_Pass_BaseFullbright(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_Fullbright(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); + for (surf = firstsurf;surf;surf = surf->chain) + { + Matrix4x4_Transform(&ent->matrix, surf->poly_center, center); + R_MeshQueue_AddTransparent(center, RSurfShader_Wall_Fullbright_Callback, ent, surf - ent->model->surfaces); + } + } + else + { + for (surf = firstsurf;surf;surf = surf->chain) + { + if (surf->currenttexture->fogtexture != NULL) + { + 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); + } + 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_Vertex_Callback(const void *calldata1, int calldata2) +{ + const entity_render_t *ent = calldata1; + const msurface_t *surf = ent->model->surfaces + calldata2; + R_Mesh_Matrix(&ent->matrix); + RSurfShader_Wall_Pass_BaseVertex(ent, surf); + if (surf->currenttexture->glowtexture) + RSurfShader_Wall_Pass_Glow(ent, surf); if (fogenabled) + RSurfShader_Wall_Pass_Fog(ent, surf); +} + +static void RSurfShader_Wall_Vertex(const entity_render_t *ent, const msurface_t *firstsurf) +{ + const msurface_t *surf; + vec3_t center; + if (ent->effects & EF_ADDITIVE || ent->alpha < 1) + { + for (surf = firstsurf;surf;surf = surf->chain) + { + 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) + { + 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) - RSurfShader_Wall_Pass_Fog(surf); + 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_Lightmap(msurface_t *firstsurf) +static void RSurfShader_Wall_Lightmap(const entity_render_t *ent, const msurface_t *firstsurf) { - msurface_t *surf; - if (r_vertexsurfaces.integer || firstsurf->currenttexture->fogtexture != NULL || currentrenderentity->alpha != 1 || currentrenderentity->effects & EF_ADDITIVE) + const msurface_t *surf; + vec3_t center; + if (ent->alpha < 1 || ent->effects & EF_ADDITIVE) + { + for (surf = firstsurf;surf;surf = surf->chain) + { + Matrix4x4_Transform(&ent->matrix, surf->poly_center, center); + R_MeshQueue_AddTransparent(center, RSurfShader_Wall_Vertex_Callback, ent, surf - ent->model->surfaces); + } + } + 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 { @@ -1523,489 +1386,463 @@ static void RSurfShader_Wall_Lightmap(msurface_t *firstsurf) { for (surf = firstsurf;surf;surf = surf->chain) { - c_brush_polys++; - RSurfShader_OpaqueWall_Pass_TripleTexCombine(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_TripleTexCombine(ent, surf); } } else { for (surf = firstsurf;surf;surf = surf->chain) { - c_brush_polys++; - RSurfShader_OpaqueWall_Pass_BaseMTex(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_BaseMTex(ent, surf); } if (r_detailtextures.integer) for (surf = firstsurf;surf;surf = surf->chain) - RSurfShader_OpaqueWall_Pass_BaseDetail(surf); + if (surf->currenttexture->fogtexture == NULL) + RSurfShader_OpaqueWall_Pass_BaseDetail(ent, surf); } } else { for (surf = firstsurf;surf;surf = surf->chain) { - c_brush_polys++; - RSurfShader_OpaqueWall_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_OpaqueWall_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) - RSurfShader_OpaqueWall_Pass_BaseDetail(surf); + 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_OpaqueWall_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) - RSurfShader_OpaqueWall_Pass_Glow(surf); + if (surf->currenttexture->fogtexture == NULL) + RSurfShader_OpaqueWall_Pass_Glow(ent, surf); if (fogenabled) for (surf = firstsurf;surf;surf = surf->chain) - RSurfShader_OpaqueWall_Pass_Fog(surf); + if (surf->currenttexture->fogtexture == NULL) + RSurfShader_OpaqueWall_Pass_Fog(ent, surf); } } -/* -============================================================= - - WORLD MODEL +Cshader_t Cshader_wall_vertex = {{NULL, RSurfShader_Wall_Vertex}, NULL}; +Cshader_t Cshader_wall_lightmap = {{NULL, RSurfShader_Wall_Lightmap}, NULL}; +Cshader_t Cshader_wall_fullbright = {{NULL, RSurfShader_Wall_Fullbright}, NULL}; +Cshader_t Cshader_water = {{NULL, RSurfShader_Water}, NULL}; +Cshader_t Cshader_sky = {{RSurfShader_Sky, NULL}, NULL}; -============================================================= -*/ +int Cshader_count = 5; +Cshader_t *Cshaders[5] = +{ + &Cshader_wall_vertex, + &Cshader_wall_lightmap, + &Cshader_wall_fullbright, + &Cshader_water, + &Cshader_sky +}; -static void R_SolidWorldNode (void) +void R_DrawSurfaces(entity_render_t *ent, int sky, int normal) { - if (r_viewleaf->contents != CONTENTS_SOLID) - { - int portalstack; - mportal_t *p, *pstack[8192]; - msurface_t *surf, **mark, **endmark; - mleaf_t *leaf; - // LordHavoc: portal-passage worldnode; follows portals leading - // outward from viewleaf, if a portal leads offscreen it is not - // followed, in indoor maps this can often cull a great deal of - // geometry away when pvs data is not present (useful with pvs as well) - - leaf = r_viewleaf; - leaf->worldnodeframe = r_framecount; - portalstack = 0; - loc0: - c_leafs++; + int i, alttextures, texframe, framecount; + texture_t *t; + model_t *model; + msurface_t *surf; + vec3_t modelorg; + Cshader_t *shader; + + if (!ent->model) + return; - leaf->visframe = r_framecount; + R_Mesh_Matrix(&ent->matrix); - if (leaf->nummarksurfaces) + for (i = 0;i < Cshader_count;i++) + Cshaders[i]->chain = NULL; + + model = ent->model; + alttextures = ent->frame != 0; + texframe = (int)(cl.time * 5.0f); + + Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg); + for (i = 0;i < model->nummodelsurfaces;i++) + { + surf = model->surfaces + i + model->firstmodelsurface; + if (surf->visframe == r_framecount) { - mark = leaf->firstmarksurface; - endmark = mark + leaf->nummarksurfaces; - do + // mark any backface surfaces as not visible + if (PlaneDist(modelorg, 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) - surf->visframe = r_framecount; - } - else - { - if (!(surf->flags & SURF_PLANEBACK)) - surf->visframe = r_framecount; - } + if (!(surf->flags & SURF_PLANEBACK)) + surf->visframe = -1; } - 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) + else + { + if (surf->flags & SURF_PLANEBACK) + surf->visframe = -1; + } + if (surf->visframe == r_framecount) { - leaf = p->past; - if (leaf->worldnodeframe != r_framecount) + if (r_cullsurface.integer && R_CullBox (surf->poly_mins, surf->poly_maxs)) + surf->visframe = -1; + else { - leaf->worldnodeframe = r_framecount; - if (leaf->contents != CONTENTS_SOLID) + c_faces++; + t = surf->texinfo->texture; + if (t->animated) { - if (R_NotCulledBox(leaf->mins, leaf->maxs)) - { - p->visframe = r_framecount; - pstack[portalstack++] = p; - goto loc0; - - loc1: - p = pstack[--portalstack]; - } + 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; + surf->shader->chain = surf; } } } + } - if (portalstack) - goto loc1; + if (sky) + { + for (i = 0;i < Cshader_count;i++) + { + shader = Cshaders[i]; + if (shader->chain && shader->shaderfunc[SHADERSTAGE_SKY]) + shader->shaderfunc[SHADERSTAGE_SKY](ent, shader->chain); + } } - else + + if (normal) { - mnode_t *nodestack[8192], *node = cl.worldmodel->nodes; - int nodestackpos = 0; - // LordHavoc: recursive descending worldnode; if portals are not - // available, this is a good last resort, can cull large amounts of - // geometry, but is more time consuming than portal-passage and renders - // things behind walls - -loc2: - if (R_NotCulledBox(node->mins, node->maxs)) + if (r_dynamic.integer) + R_MarkLights(ent); + + if (!r_vertexsurfaces.integer) { - if (node->numsurfaces) + for (i = 0, surf = ent->model->surfaces + ent->model->firstmodelsurface;i < ent->model->nummodelsurfaces;i++, surf++) { - 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 + if (surf->visframe == r_framecount && surf->lightmaptexture != NULL) { - for (;surf < surfend;surf++) + if (surf->cached_dlight + || surf->cached_ambient != r_ambient.value + || surf->cached_lightscalebit != lightscalebit) + R_BuildLightMap(ent, surf, false); // base lighting changed + else if (r_dynamic.integer) { - if (!(surf->flags & SURF_PLANEBACK)) - surf->visframe = r_framecount; + if (surf->styles[0] != 255 && (d_lightstylevalue[surf->styles[0]] != surf->cached_light[0] + || (surf->styles[1] != 255 && (d_lightstylevalue[surf->styles[1]] != surf->cached_light[1] + || (surf->styles[2] != 255 && (d_lightstylevalue[surf->styles[2]] != surf->cached_light[2] + || (surf->styles[3] != 255 && (d_lightstylevalue[surf->styles[3]] != surf->cached_light[3])))))))) + R_BuildLightMap(ent, surf, false); // base lighting changed + else if (surf->dlightframe == r_framecount && r_dlightmap.integer) + R_BuildLightMap(ent, surf, true); // only dlights } } } + } - // 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; - } - } + for (i = 0;i < Cshader_count;i++) + { + shader = Cshaders[i]; + if (shader->chain && shader->shaderfunc[SHADERSTAGE_NORMAL]) + shader->shaderfunc[SHADERSTAGE_NORMAL](ent, shader->chain); } - else if (nodestackpos > 0) + } +} + +/* +static void R_DrawPortal_Callback(const void *calldata1, int calldata2) +{ + int i; + float *v; + rmeshstate_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.wantoverbright = false; + R_Mesh_Matrix(&ent->matrix); + R_Mesh_State(&m); + R_Mesh_ResizeCheck(portal->numpoints, portal->numpoints - 2); + for (i = 0;i < mesh->numtriangles;i++) + { + varray_element[i * 3 + 0] = 0; + varray_element[i * 3 + 1] = i + 1; + varray_element[i * 3 + 2] = i + 2; + } + i = portal - ent->model->portals; + R_FillColors(varray_color, mesh->numverts, + ((i & 0x0007) >> 0) * (1.0f / 7.0f) * mesh_colorscale, + ((i & 0x0038) >> 3) * (1.0f / 7.0f) * mesh_colorscale, + ((i & 0x01C0) >> 6) * (1.0f / 7.0f) * mesh_colorscale, + 0.125f); + if (PlaneDiff(r_origin, (&portal->plane)) > 0) + { + for (i = portal->numpoints - 1, v = varray_vertex;i >= 0;i--, v += 4) + VectorCopy(portal->points[i].position, v); + } + else + for (i = 0, v = varray_vertex;i < portal->numpoints;i++, v += 4) + VectorCopy(portal->points[i].position, v); + R_Mesh_Draw(portal->numpoints, portal->numpoints - 2); +} + +static 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->here->visframe == r_framecount || portal->past->visframe == r_framecount) { - node = nodestack[--nodestackpos]; - goto loc2; + 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_DrawBrushModel(entity_render_t *ent, int sky, int normal) +{ + int i; + msurface_t *surf; + model_t *model; + vec3_t modelorg; + + // because bmodels can be reused, we have to decide which things to render + // from scratch every time + model = ent->model; + Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg); + for (i = 0;i < model->nummodelsurfaces;i++) + { + surf = model->surfaces + model->firstmodelsurface + i; + surf->visframe = r_framecount; + surf->pvsframe = -1; + surf->worldnodeframe = -1; + surf->lightframe = -1; + surf->dlightframe = -1; + } + R_DrawSurfaces(ent, sky, normal); +} -static int r_portalframecount = 0; +void R_SurfaceWorldNode (void) +{ + msurface_t *surf; + for (surf = r_pvsfirstsurface;surf;surf = surf->pvschain) + surf->visframe = r_framecount; +} -static void R_PVSWorldNode() +/* +static void R_PortalWorldNode(entity_render_t *ent, mleaf_t *viewleaf) { int portalstack, i; mportal_t *p, *pstack[8192]; msurface_t *surf, **mark, **endmark; mleaf_t *leaf; - qbyte *worldvis; - - worldvis = Mod_LeafPVS (r_viewleaf, cl.worldmodel); - - leaf = r_viewleaf; + // LordHavoc: portal-passage worldnode with PVS; + // follows portals leading outward from viewleaf, does not venture + // offscreen or into leafs that are not visible, faster than Quake's + // RecursiveWorldNode + leaf = viewleaf; leaf->worldnodeframe = r_framecount; portalstack = 0; loc0: c_leafs++; - - leaf->visframe = r_framecount; - if (leaf->nummarksurfaces) { - mark = leaf->firstmarksurface; - endmark = mark + leaf->nummarksurfaces; - do + for (c = leaf->nummarksurfaces, mark = leaf->firstmarksurface;c;c--) { 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->worldnodeframe != r_framecount) { - if (!(surf->flags & SURF_PLANEBACK)) - surf->visframe = r_framecount; + 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); } - // follow portals into other leafs for (p = leaf->portals;p;p = p->next) { - if (DotProduct(r_origin, p->plane.normal) < p->plane.dist) + leaf = p->past; + if (leaf->worldnodeframe != r_framecount) { - leaf = p->past; - if (leaf->worldnodeframe != r_framecount) + leaf->worldnodeframe = r_framecount; + // FIXME: R_NotCulledBox is absolute, should be done relative + if (leaf->pvsframe == r_pvsframecount && R_NotCulledBox(leaf->mins, leaf->maxs)) { - leaf->worldnodeframe = r_framecount; - if (leaf->contents != CONTENTS_SOLID) - { - i = (leaf - cl.worldmodel->leafs) - 1; - if (worldvis[i>>3] & (1<<(i&7))) - { - if (R_NotCulledBox(leaf->mins, leaf->maxs)) - { - pstack[portalstack++] = p; - goto loc0; - + p->visframe = r_framecount; + pstack[portalstack++] = p; + goto loc0; loc1: - p = pstack[--portalstack]; - } - } - } + p = pstack[--portalstack]; } } } - if (portalstack) goto loc1; } +*/ -Cshader_t Cshader_wall_vertex = {{NULL, RSurfShader_Wall_Vertex}, NULL}; -Cshader_t Cshader_wall_lightmap = {{NULL, RSurfShader_Wall_Lightmap}, NULL}; -Cshader_t Cshader_wall_fullbright = {{NULL, RSurfShader_Wall_Fullbright}, NULL}; -Cshader_t Cshader_water = {{NULL, RSurfShader_Water}, NULL}; -Cshader_t Cshader_sky = {{RSurfShader_Sky, NULL}, NULL}; - -int Cshader_count = 5; -Cshader_t *Cshaders[5] = -{ - &Cshader_wall_vertex, - &Cshader_wall_lightmap, - &Cshader_wall_fullbright, - &Cshader_water, - &Cshader_sky -}; - -void R_PrepareSurfaces(void) +static void R_PortalWorldNode(entity_render_t *ent, mleaf_t *viewleaf) { - int i, alttextures, texframe, framecount; - texture_t *t; - model_t *model; - msurface_t *surf; - - for (i = 0;i < Cshader_count;i++) - Cshaders[i]->chain = NULL; - - model = currentrenderentity->model; - alttextures = currentrenderentity->frame != 0; - texframe = (int)(cl.time * 5.0f); - - for (i = 0;i < model->nummodelsurfaces;i++) + int c, leafstackpos; + mleaf_t *leaf, *leafstack[8192]; + mportal_t *p; + msurface_t **mark; + vec3_t modelorg; + // LordHavoc: portal-passage worldnode with PVS; + // follows portals leading outward from viewleaf, does not venture + // offscreen or into leafs that are not visible, faster than Quake's + // RecursiveWorldNode + Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg); + viewleaf->worldnodeframe = r_framecount; + leafstack[0] = viewleaf; + leafstackpos = 1; + while (leafstackpos) { - surf = model->modelsortedsurfaces[i]; - if (surf->visframe == r_framecount) + c_leafs++; + leaf = leafstack[--leafstackpos]; + // only useful for drawing portals + //leaf->visframe = r_framecount; + // draw any surfaces bounding this leaf + if (leaf->nummarksurfaces) + for (c = leaf->nummarksurfaces, mark = leaf->firstmarksurface;c;c--) + (*mark++)->visframe = r_framecount; + // follow portals into other leafs + for (p = leaf->portals;p;p = p->next) { - if (surf->insertframe != r_framecount) + leaf = p->past; + if (leaf->worldnodeframe != r_framecount) { - surf->insertframe = r_framecount; - c_faces++; - t = surf->texinfo->texture; - 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; + leaf->worldnodeframe = r_framecount; + // FIXME: R_NotCulledBox is absolute, should be done relative + if (leaf->pvsframe == r_pvsframecount && R_NotCulledBox(leaf->mins, leaf->maxs)) + leafstack[leafstackpos++] = leaf; } - - surf->chain = surf->shader->chain; - surf->shader->chain = surf; } } + //if (r_drawportals.integer) + // R_DrawPortals(ent); } -void R_DrawSurfaces (int type) -{ - int i; - Cshader_t *shader; - - for (i = 0;i < Cshader_count;i++) - { - shader = Cshaders[i]; - if (shader->chain && shader->shaderfunc[type]) - shader->shaderfunc[type](shader->chain); - } -} - -static float portalpointbuffer[256][3]; -void R_DrawPortals(void) +void R_PVSUpdate (mleaf_t *viewleaf) { - int drawportals, i; - mportal_t *portal, *endportal; - mvertex_t *point; - rmeshinfo_t m; - drawportals = r_drawportals.integer; + int i, j, l, c, bits; + mleaf_t *leaf; + qbyte *vis; + msurface_t **mark, *surf; - if (drawportals < 1) + if (r_pvsviewleaf == viewleaf && r_pvsviewleafnovis == r_novis.integer) return; - 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++) + r_pvsframecount++; + r_pvsviewleaf = viewleaf; + r_pvsviewleafnovis = r_novis.integer; + + if (viewleaf) { - if (portal->visframe == r_portalframecount) + vis = Mod_LeafPVS (viewleaf, cl.worldmodel); + for (j = 0;j < cl.worldmodel->numleafs;j += 8) { - if (portal->numpoints <= 256) + bits = *vis++; + if (bits) { - 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) + l = cl.worldmodel->numleafs - j; + if (l > 8) + l = 8; + for (i = 0;i < l;i++) { - 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]); + if (bits & (1 << i)) + { + leaf = &cl.worldmodel->leafs[j + i + 1]; + leaf->pvsframe = r_pvsframecount; + // mark surfaces bounding this leaf as visible + for (c = leaf->nummarksurfaces, mark = leaf->firstmarksurface;c;c--) + (*mark++)->pvsframe = r_pvsframecount; + } } - R_Mesh_DrawPolygon(&m, portal->numpoints); } } - } -} - -void R_SetupForBModelRendering(void) -{ - int i; - msurface_t *surf; - model_t *model; - vec3_t modelorg; - - // 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); - - for (i = 0;i < model->nummodelsurfaces;i++) - { - surf = model->modelsortedsurfaces[i]; - if (((surf->flags & SURF_PLANEBACK) == 0) == (PlaneDiff(modelorg, surf->plane) >= 0)) - surf->visframe = r_framecount; - else - surf->visframe = -1; - surf->worldnodeframe = -1; - surf->lightframe = -1; - surf->dlightframe = -1; - surf->insertframe = -1; - } -} - -void R_SetupForWorldRendering(void) -{ - // there is only one instance of the world, but it can be rendered in - // multiple stages - - currentrenderentity = &cl_entities[0].render; - softwaretransformidentity(); -} - -static void R_SurfMarkLights (void) -{ - int i; - msurface_t *surf; - - if (r_dynamic.integer) - R_MarkLights(); - - if (!r_vertexsurfaces.integer) - { - for (i = 0;i < currentrenderentity->model->nummodelsurfaces;i++) + // build pvs surfacechain + r_pvsfirstsurface = NULL; + mark = &r_pvsfirstsurface; + for (c = cl.worldmodel->nummodelsurfaces, surf = cl.worldmodel->surfaces + cl.worldmodel->firstmodelsurface;c;c--, surf++) { - surf = currentrenderentity->model->modelsortedsurfaces[i]; - if (surf->visframe == r_framecount && surf->lightmaptexture != NULL) + if (surf->pvsframe == r_pvsframecount) { - if (surf->cached_dlight - || surf->cached_ambient != r_ambient.value - || surf->cached_lightscalebit != lightscalebit) - R_BuildLightMap(surf, false); // base lighting changed - else if (r_dynamic.integer) - { - if (surf->styles[0] != 255 && (d_lightstylevalue[surf->styles[0]] != surf->cached_light[0] - || (surf->styles[1] != 255 && (d_lightstylevalue[surf->styles[1]] != surf->cached_light[1] - || (surf->styles[2] != 255 && (d_lightstylevalue[surf->styles[2]] != surf->cached_light[2] - || (surf->styles[3] != 255 && (d_lightstylevalue[surf->styles[3]] != surf->cached_light[3])))))))) - R_BuildLightMap(surf, false); // base lighting changed - else if (surf->dlightframe == r_framecount && r_dlightmap.integer) - R_BuildLightMap(surf, true); // only dlights - } + *mark = surf; + mark = &surf->pvschain; } } + *mark = NULL; } } -void R_MarkWorldLights(void) -{ - R_SetupForWorldRendering(); - R_SurfMarkLights(); -} - /* ============= R_DrawWorld ============= */ -void R_DrawWorld (void) +void R_DrawWorld (entity_render_t *ent) { - R_SetupForWorldRendering(); - - if (r_viewleaf->contents == CONTENTS_SOLID || r_novis.integer || r_viewleaf->compressed_vis == NULL) - R_SolidWorldNode (); + mleaf_t *viewleaf; + viewleaf = Mod_PointInLeaf (r_origin, cl.worldmodel); + R_PVSUpdate(viewleaf); + if (!viewleaf) + return; + if (r_surfaceworldnode.integer || viewleaf->contents == CONTENTS_SOLID) + R_SurfaceWorldNode (); else - R_PVSWorldNode (); + R_PortalWorldNode (ent, viewleaf); + R_DrawSurfaces(ent, true, true); } /* @@ -2013,30 +1850,15 @@ void R_DrawWorld (void) R_DrawBrushModel ================= */ -void R_DrawBrushModelSky (void) +void R_DrawBrushModelSky (entity_render_t *ent) { - R_SetupForBModelRendering(); - - R_PrepareSurfaces(); - R_DrawSurfaces(SHADERSTAGE_SKY); + R_DrawBrushModel(ent, true, false); } -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_SurfMarkLights(); - - R_PrepareSurfaces(); - - if (!skyrendermasked) - R_DrawSurfaces(SHADERSTAGE_SKY); - R_DrawSurfaces(SHADERSTAGE_NORMAL); + R_DrawBrushModel(ent, false, true); } static void gl_surf_start(void) @@ -2049,6 +1871,11 @@ static void gl_surf_shutdown(void) static void gl_surf_newmap(void) { + // reset pvs visibility variables so it will update on first frame + r_pvsframecount = 1; + r_pvsviewleaf = NULL; + r_pvsviewleafnovis = false; + r_pvsfirstsurface = NULL; } void GL_Surf_Init(void) @@ -2061,10 +1888,12 @@ void GL_Surf_Init(void) Cvar_RegisterVariable(&r_ambient); Cvar_RegisterVariable(&r_vertexsurfaces); Cvar_RegisterVariable(&r_dlightmap); - Cvar_RegisterVariable(&r_drawportals); + //Cvar_RegisterVariable(&r_drawportals); Cvar_RegisterVariable(&r_testvis); Cvar_RegisterVariable(&r_floatbuildlightmap); Cvar_RegisterVariable(&r_detailtextures); + Cvar_RegisterVariable(&r_surfaceworldnode); + Cvar_RegisterVariable(&r_cullsurface); R_RegisterModule("GL_Surf", gl_surf_start, gl_surf_shutdown, gl_surf_newmap); }