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"};
// variables used by R_PVSUpdate
int r_pvsframecount = 0;
-mleaf_t *r_viewleaf = NULL;
-int r_viewleafnovis = 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)
{
=============================================================
*/
-static void RSurf_CopyXYZ(const surfvertex_t *in, float *out, int numverts)
-{
- int i;
- for (i = 0;i < numverts;i++, in++, out += 4)
- {
- VectorCopy(in->v, out);
- out[3] = 1;
- }
-}
-
-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];
- }
-}
-
-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];
- }
-}
-
-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];
- }
-}
-
-static void RSurf_AddLightmapToVertexColors(const surfvertex_t *in, float *c, int numverts, const qbyte *samples, int size3, const qbyte *styles)
+static void RSurf_AddLightmapToVertexColors(const int *lightmapoffsets, float *c, int numverts, const qbyte *samples, int size3, const qbyte *styles)
{
int i;
float scale;
const qbyte *lm;
if (styles[0] != 255)
{
- for (i = 0;i < numverts;i++, in++, c += 4)
+ for (i = 0;i < numverts;i++, c += 4)
{
- lm = samples + in->lightmapoffset;
+ lm = samples + lightmapoffsets[i];
scale = d_lightstylevalue[styles[0]] * (1.0f / 32768.0f);
VectorMA(c, scale, lm, c);
if (styles[1] != 255)
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++)
{
}
// note: this untransforms lights to do the checking,
-// and takes surf->mesh->vertex data
-static int RSurf_LightCheck(const matrix4x4_t *matrix, const 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];
Matrix4x4_Transform(matrix, rd->origin, lightorigin);
- for (i = 0, sv = mesh->vertex;i < mesh->numverts;i++, sv++)
- if (VectorDistance2(sv->v, lightorigin) < rd->cullradius2)
+ for (i = 0, v = mesh->verts;i < mesh->numverts;i++, v += 4)
+ if (VectorDistance2(v, lightorigin) < rd->cullradius2)
return true;
}
}
static void RSurfShader_Sky(const entity_render_t *ent, const msurface_t *firstsurf)
{
const msurface_t *surf;
- surfmesh_t *mesh;
- rmeshbufferinfo_t m;
+ const surfmesh_t *mesh;
+ rmeshstate_t m;
// LordHavoc: HalfLife maps have freaky skypolys...
if (ent->model->ishlbsp)
R_Sky();
}
+ R_Mesh_Matrix(&ent->matrix);
+
// draw depth-only polys
memset(&m, 0, sizeof(m));
if (skyrendermasked)
m.blendfunc1 = GL_ONE;
m.blendfunc2 = GL_ZERO;
}
+ m.wantoverbright = false;
m.depthwrite = true;
- m.matrix = ent->matrix;
+ R_Mesh_State(&m);
for (surf = firstsurf;surf;surf = surf->chain)
{
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);
- if (skyrendermasked)
- memset(m.color, 0, m.numverts * sizeof(float[4]));
- else
- R_FillColors(m.color, m.numverts, fogcolor[0] * m.colorscale, fogcolor[1] * m.colorscale, fogcolor[2] * m.colorscale, 1);
- R_Mesh_Render();
- }
+ 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)
{
const entity_render_t *ent = calldata1;
- msurface_t *surf = ent->model->surfaces + calldata2;
+ const msurface_t *surf = ent->model->surfaces + calldata2;
float f;
- surfmesh_t *mesh;
- rmeshbufferinfo_t m;
+ 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 (ent->effects & EF_ADDITIVE)
{
m.blendfunc1 = GL_ONE;
m.blendfunc2 = GL_ZERO;
}
+ m.wantoverbright = true;
m.tex[0] = R_GetTexture(surf->currenttexture->texture);
- m.matrix = ent->matrix;
+ 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]));
+ 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))
{
- 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))
- {
- 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 (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);
}
if (fogenabled)
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);
- m.matrix = ent->matrix;
+ 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]));
- 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();
- }
+ 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);
}
}
}
R_MeshQueue_AddTransparent(center, RSurfShader_Water_Callback, ent, surf - ent->model->surfaces);
}
else
- R_MeshQueue_Add(RSurfShader_Water_Callback, ent, surf - ent->model->surfaces);
+ RSurfShader_Water_Callback(ent, surf - ent->model->surfaces);
}
}
static void RSurfShader_Wall_Pass_BaseVertex(const entity_render_t *ent, const msurface_t *surf)
{
float base;
- 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.blendfunc1 = GL_ONE;
m.blendfunc2 = GL_ZERO;
}
+ m.wantoverbright = true;
m.tex[0] = R_GetTexture(surf->currenttexture->texture);
base = ent->effects & EF_FULLBRIGHT ? 2.0f : r_ambient.value * (1.0f / 64.0f);
- m.matrix = ent->matrix;
+ 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))
{
- 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))
- {
- 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 (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(const entity_render_t *ent, const msurface_t *surf)
{
- 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.blendfunc1 = GL_ONE;
m.blendfunc2 = GL_ZERO;
}
+ m.wantoverbright = false;
m.tex[0] = R_GetTexture(surf->currenttexture->texture);
- m.matrix = ent->matrix;
+ 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]));
- 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_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(const entity_render_t *ent, const msurface_t *surf)
{
- 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.blendfunc1 = GL_SRC_ALPHA;
m.blendfunc2 = GL_ONE;
+ m.wantoverbright = false;
m.tex[0] = R_GetTexture(surf->currenttexture->glowtexture);
- m.matrix = ent->matrix;
+ 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]));
- 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_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(const entity_render_t *ent, const msurface_t *surf)
{
- 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.blendfunc1 = GL_SRC_ALPHA;
m.blendfunc2 = GL_ONE;
- m.matrix = ent->matrix;
+ 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))
- {
- 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], ent->alpha, m.colorscale, m.numverts, modelorg);
- R_Mesh_Render();
- }
+ 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(const entity_render_t *ent, const msurface_t *surf)
{
- surfmesh_t *mesh;
- rmeshbufferinfo_t m;
+ const surfmesh_t *mesh;
+ static rmeshstate_t m;
float cl;
- memset(&m, 0, sizeof(m));
+ //memset(&m, 0, sizeof(m));
m.blendfunc1 = GL_ONE;
m.blendfunc2 = GL_ZERO;
+ 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;
- m.matrix = ent->matrix;
+ 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]));
- 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();
- }
+ 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(const entity_render_t *ent, const msurface_t *surf)
{
- surfmesh_t *mesh;
- rmeshbufferinfo_t m;
+ const surfmesh_t *mesh;
+ rmeshstate_t m;
float cl;
memset(&m, 0, sizeof(m));
m.blendfunc1 = GL_ONE;
m.blendfunc2 = GL_ZERO;
+ m.wantoverbright = true;
m.tex[0] = R_GetTexture(surf->currenttexture->texture);
m.tex[1] = R_GetTexture(surf->lightmaptexture);
- m.matrix = ent->matrix;
+ 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))
- {
- 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();
- }
+ 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(const entity_render_t *ent, const msurface_t *surf)
{
- surfmesh_t *mesh;
- rmeshbufferinfo_t m;
+ const surfmesh_t *mesh;
+ rmeshstate_t m;
float cl;
memset(&m, 0, sizeof(m));
m.blendfunc1 = GL_ONE;
m.blendfunc2 = GL_ZERO;
+ m.wantoverbright = false;
m.tex[0] = R_GetTexture(surf->currenttexture->texture);
- m.matrix = ent->matrix;
+ 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]));
- 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();
- }
+ 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(const entity_render_t *ent, const msurface_t *surf)
{
- surfmesh_t *mesh;
- rmeshbufferinfo_t m;
+ const surfmesh_t *mesh;
+ rmeshstate_t m;
float cl;
memset(&m, 0, sizeof(m));
m.blendfunc1 = GL_ZERO;
m.blendfunc2 = GL_SRC_COLOR;
+ m.wantoverbright = true;
m.tex[0] = R_GetTexture(surf->lightmaptexture);
- m.matrix = ent->matrix;
+ 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))
- {
- 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_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(const entity_render_t *ent, const msurface_t *surf)
{
- surfmesh_t *mesh;
- rmeshbufferinfo_t m;
+ const surfmesh_t *mesh;
+ rmeshstate_t m;
if (surf->dlightframe != r_framecount)
return;
memset(&m, 0, sizeof(m));
m.blendfunc1 = GL_SRC_ALPHA;
m.blendfunc2 = GL_ONE;
+ m.wantoverbright = true;
m.tex[0] = R_GetTexture(surf->currenttexture->texture);
- m.matrix = ent->matrix;
+ R_Mesh_State(&m);
for (mesh = surf->mesh;mesh;mesh = mesh->chain)
{
if (RSurf_LightCheck(&ent->inversematrix, surf->dlightbits, mesh))
{
- m.numtriangles = mesh->numtriangles;
- m.numverts = mesh->numverts;
- if (R_Mesh_Draw_GetBuffer(&m, true))
- {
- 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_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(const entity_render_t *ent, const msurface_t *surf)
{
- 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.blendfunc1 = GL_SRC_ALPHA;
m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
+ m.wantoverbright = false;
m.tex[0] = R_GetTexture(surf->currenttexture->fogtexture);
- m.matrix = ent->matrix;
+ 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]));
- 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_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(const entity_render_t *ent, const msurface_t *surf)
{
- surfmesh_t *mesh;
- rmeshbufferinfo_t m;
+ const surfmesh_t *mesh;
+ rmeshstate_t m;
memset(&m, 0, sizeof(m));
m.blendfunc1 = GL_DST_COLOR;
m.blendfunc2 = GL_SRC_COLOR;
+ m.wantoverbright = false;
m.tex[0] = R_GetTexture(surf->currenttexture->detailtexture);
- m.matrix = ent->matrix;
+ 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]));
- 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();
- }
+ 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(const entity_render_t *ent, const msurface_t *surf)
{
- surfmesh_t *mesh;
- rmeshbufferinfo_t m;
+ const surfmesh_t *mesh;
+ rmeshstate_t m;
memset(&m, 0, sizeof(m));
m.blendfunc1 = GL_SRC_ALPHA;
m.blendfunc2 = GL_ONE;
+ m.wantoverbright = false;
m.tex[0] = R_GetTexture(surf->currenttexture->glowtexture);
- m.matrix = ent->matrix;
+ 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]));
- 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_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);
}
}
{
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);
{
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);
&Cshader_sky
};
-void R_PrepareSurfaces(entity_render_t *ent)
+void R_DrawSurfaces(entity_render_t *ent, int sky, int normal)
{
int i, alttextures, texframe, framecount;
texture_t *t;
model_t *model;
msurface_t *surf;
vec3_t modelorg;
+ Cshader_t *shader;
+
+ if (!ent->model)
+ return;
+
+ R_Mesh_Matrix(&ent->matrix);
for (i = 0;i < Cshader_count;i++)
Cshaders[i]->chain = NULL;
}
if (surf->visframe == r_framecount)
{
- c_faces++;
- t = surf->texinfo->texture;
- if (t->animated)
+ if (r_cullsurface.integer && R_CullBox (surf->poly_mins, surf->poly_maxs))
+ surf->visframe = -1;
+ else
{
- framecount = t->anim_total[alttextures];
- if (framecount >= 2)
- surf->currenttexture = t->anim_frames[alttextures][texframe % 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->anim_frames[alttextures][0];
+ surf->currenttexture = t;
+ surf->chain = surf->shader->chain;
+ surf->shader->chain = surf;
}
- else
- surf->currenttexture = t;
-
- surf->chain = surf->shader->chain;
- surf->shader->chain = surf;
}
}
}
-}
-void R_DrawSurfaces (entity_render_t *ent, int type)
-{
- int i;
- Cshader_t *shader;
+ 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);
+ }
+ }
- for (i = 0;i < Cshader_count;i++)
+ if (normal)
{
- shader = Cshaders[i];
- if (shader->chain && shader->shaderfunc[type])
- shader->shaderfunc[type](ent, shader->chain);
+ if (r_dynamic.integer)
+ R_MarkLights(ent);
+
+ if (!r_vertexsurfaces.integer)
+ {
+ for (i = 0, surf = ent->model->surfaces + ent->model->firstmodelsurface;i < ent->model->nummodelsurfaces;i++, surf++)
+ {
+ if (surf->visframe == r_framecount && surf->lightmaptexture != NULL)
+ {
+ 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->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
+ }
+ }
+ }
+ }
+
+ for (i = 0;i < Cshader_count;i++)
+ {
+ shader = Cshaders[i];
+ if (shader->chain && shader->shaderfunc[SHADERSTAGE_NORMAL])
+ shader->shaderfunc[SHADERSTAGE_NORMAL](ent, shader->chain);
+ }
}
}
+/*
static void R_DrawPortal_Callback(const void *calldata1, int calldata2)
{
int i;
float *v;
- rmeshbufferinfo_t m;
+ 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.numverts = portal->numpoints;
- m.numtriangles = portal->numpoints - 2;
- m.matrix = ent->matrix;
- if (R_Mesh_Draw_GetBuffer(&m, false))
- {
- for (i = 0;i < m.numtriangles;i++)
- {
- 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();
+ 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);
}
-void R_DrawPortals(entity_render_t *ent)
+static void R_DrawPortals(entity_render_t *ent)
{
int i;
mportal_t *portal, *endportal;
}
}
}
+*/
-void R_SetupForBrushModelRendering(entity_render_t *ent)
+void R_DrawBrushModel(entity_render_t *ent, int sky, int normal)
{
int i;
msurface_t *surf;
surf->lightframe = -1;
surf->dlightframe = -1;
}
- R_PrepareSurfaces(ent);
+ R_DrawSurfaces(ent, sky, normal);
}
-void R_SurfMarkLights (entity_render_t *ent)
+void R_SurfaceWorldNode (void)
{
- int i;
msurface_t *surf;
-
- if (!ent->model)
- return;
-
- if (r_dynamic.integer)
- R_MarkLights(ent);
-
- if (!r_vertexsurfaces.integer)
- {
- for (i = 0, surf = ent->model->surfaces + ent->model->firstmodelsurface;i < ent->model->nummodelsurfaces;i++, surf++)
- {
- if (surf->visframe == r_framecount && surf->lightmaptexture != NULL)
- {
- 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->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
- }
- }
- }
- }
-}
-
-void R_SurfaceWorldNode (entity_render_t *ent)
-{
- int i;
- msurface_t *surf;
- model_t *model;
- model = ent->model;
- // FIXME: R_NotCulledBox is absolute, should be done relative
- for (i = 0, surf = model->surfaces + model->firstmodelsurface;i < model->nummodelsurfaces;i++, surf++)
- if (surf->pvsframe == r_pvsframecount && (!r_cullsurface.integer || R_NotCulledBox (surf->poly_mins, surf->poly_maxs)))
- surf->visframe = r_framecount;
+ for (surf = r_pvsfirstsurface;surf;surf = surf->pvschain)
+ surf->visframe = r_framecount;
}
/*
int c, leafstackpos;
mleaf_t *leaf, *leafstack[8192];
mportal_t *p;
- msurface_t *surf, **mark;
+ msurface_t **mark;
vec3_t modelorg;
// LordHavoc: portal-passage worldnode with PVS;
// follows portals leading outward from viewleaf, does not venture
//leaf->visframe = r_framecount;
// draw any surfaces bounding this leaf
if (leaf->nummarksurfaces)
- {
for (c = leaf->nummarksurfaces, mark = leaf->firstmarksurface;c;c--)
- {
- surf = *mark++;
- if (!r_cullsurface.integer || R_NotCulledBox (surf->poly_mins, surf->poly_maxs))
- surf->visframe = r_framecount;
- }
- }
+ (*mark++)->visframe = r_framecount;
// follow portals into other leafs
for (p = leaf->portals;p;p = p->next)
{
}
}
}
+ //if (r_drawportals.integer)
+ // R_DrawPortals(ent);
}
void R_PVSUpdate (mleaf_t *viewleaf)
{
int i, j, l, c, bits;
- mnode_t *node;
mleaf_t *leaf;
qbyte *vis;
- msurface_t **mark;
+ msurface_t **mark, *surf;
- if (r_viewleaf == viewleaf && r_viewleafnovis == r_novis.integer)
+ if (r_pvsviewleaf == viewleaf && r_pvsviewleafnovis == r_novis.integer)
return;
r_pvsframecount++;
- r_viewleaf = viewleaf;
- r_viewleafnovis = r_novis.integer;
+ r_pvsviewleaf = viewleaf;
+ r_pvsviewleafnovis = r_novis.integer;
if (viewleaf)
{
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;
- // mark parents as visible until we hit an already
- // marked parent (which is usually very soon)
- for (node = (mnode_t *)leaf;node && node->pvsframe != r_pvsframecount;node = node->parent)
- node->pvsframe = r_pvsframecount;
}
}
}
}
+ // build pvs surfacechain
+ r_pvsfirstsurface = NULL;
+ mark = &r_pvsfirstsurface;
+ for (c = cl.worldmodel->nummodelsurfaces, surf = cl.worldmodel->surfaces + cl.worldmodel->firstmodelsurface;c;c--, surf++)
+ {
+ if (surf->pvsframe == r_pvsframecount)
+ {
+ *mark = surf;
+ mark = &surf->pvschain;
+ }
+ }
+ *mark = NULL;
}
}
*/
void R_DrawWorld (entity_render_t *ent)
{
- // there is only one instance of the world, but it can be rendered in
- // multiple stages
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 (ent);
+ R_SurfaceWorldNode ();
else
R_PortalWorldNode (ent, viewleaf);
+ R_DrawSurfaces(ent, true, true);
}
/*
*/
void R_DrawBrushModelSky (entity_render_t *ent)
{
- R_SetupForBrushModelRendering(ent);
- R_DrawSurfaces(ent, SHADERSTAGE_SKY);
+ R_DrawBrushModel(ent, true, false);
}
void R_DrawBrushModelNormal (entity_render_t *ent)
{
c_bmodels++;
- // have to flush queue because of possible lightmap reuse
- R_Mesh_Render();
- R_SetupForBrushModelRendering(ent);
- R_SurfMarkLights(ent);
- R_DrawSurfaces(ent, SHADERSTAGE_NORMAL);
+ R_DrawBrushModel(ent, false, true);
}
static void gl_surf_start(void)
{
// reset pvs visibility variables so it will update on first frame
r_pvsframecount = 1;
- r_viewleaf = NULL;
- r_viewleafnovis = false;
+ r_pvsviewleaf = NULL;
+ r_pvsviewleafnovis = false;
+ r_pvsfirstsurface = NULL;
}
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);