X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=gl_rsurf.c;h=80f8096b7ab54e8d3805613898d514a528024e4f;hb=bb4ed8a33e0e281d86c35260fd43ab108a5b68f7;hp=59313255c4591976b0f650949918d1a5de64c4fe;hpb=2274be7533700b0ec8ea78e9583678e4fa8fc130;p=xonotic%2Fdarkplaces.git diff --git a/gl_rsurf.c b/gl_rsurf.c index 59313255..80f8096b 100644 --- a/gl_rsurf.c +++ b/gl_rsurf.c @@ -250,7 +250,7 @@ static void R_BuildLightMap (const entity_render_t *ent, msurface_t *surf) // set to full bright if no light data bl = intblocklights; - if ((ent->effects & EF_FULLBRIGHT) || !ent->model->lightdata) + if ((ent->effects & EF_FULLBRIGHT) || !ent->model->brushq1.lightdata) { for (i = 0;i < size3;i++) bl[i] = 255*256; @@ -289,7 +289,7 @@ static void R_BuildLightMap (const entity_render_t *ent, msurface_t *surf) out = templight; // deal with lightmap brightness scale shift = 7 + r_lightmapscalebit + 8; - if (ent->model->lightmaprgba) + if (ent->model->brushq1.lightmaprgba) { stride = (surf->lightmaptexturestride - smax) * 4; for (i = 0;i < tmax;i++, out += stride) @@ -336,7 +336,7 @@ static void R_BuildLightMap (const entity_render_t *ent, msurface_t *surf) // set to full bright if no light data bl = floatblocklights; - if ((ent->effects & EF_FULLBRIGHT) || !ent->model->lightdata) + if ((ent->effects & EF_FULLBRIGHT) || !ent->model->brushq1.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 +371,7 @@ static void R_BuildLightMap (const entity_render_t *ent, msurface_t *surf) out = templight; // deal with lightmap brightness scale scale = 1.0f / (1 << (7 + r_lightmapscalebit + 8)); - if (ent->model->lightmaprgba) + if (ent->model->brushq1.lightmaprgba) { stride = (surf->lightmaptexturestride - smax) * 4; for (i = 0;i < tmax;i++, out += stride) @@ -444,7 +444,7 @@ loc0: impact[2] = origin[2] - node->plane->normal[2] * ndist; } - for (surf = model->surfaces + node->firstsurface, endsurf = surf + node->numsurfaces;surf < endsurf;surf++) + for (surf = model->brushq1.surfaces + node->firstsurface, endsurf = surf + node->numsurfaces;surf < endsurf;surf++) { if (surf->stainsamples) { @@ -532,7 +532,7 @@ void R_Stain (const vec3_t origin, float radius, int cr1, int cg1, int cb1, int entity_render_t *ent; model_t *model; vec3_t org; - if (cl.worldmodel == NULL) + if (cl.worldmodel == NULL || !cl.worldmodel->brushq1.nodes) return; fcolor[0] = cr1; fcolor[1] = cg1; @@ -543,7 +543,7 @@ void R_Stain (const vec3_t origin, float radius, int cr1, int cg1, int cb1, int fcolor[6] = cb2 - cb1; fcolor[7] = (ca2 - ca1) * (1.0f / 64.0f); - R_StainNode(cl.worldmodel->nodes + cl.worldmodel->hulls[0].firstclipnode, cl.worldmodel, origin, radius, fcolor); + R_StainNode(cl.worldmodel->brushq1.nodes + cl.worldmodel->brushq1.hulls[0].firstclipnode, cl.worldmodel, origin, radius, fcolor); // look for embedded bmodels for (n = 0;n < cl_num_brushmodel_entities;n++) @@ -553,10 +553,10 @@ void R_Stain (const vec3_t origin, float radius, int cr1, int cg1, int cb1, int if (model && model->name[0] == '*') { Mod_CheckLoaded(model); - if (model->type == mod_brush) + if (model->brushq1.nodes) { Matrix4x4_Transform(&ent->inversematrix, origin, org); - R_StainNode(model->nodes + model->hulls[0].firstclipnode, model, org, radius, fcolor); + R_StainNode(model->brushq1.nodes + model->brushq1.hulls[0].firstclipnode, model, org, radius, fcolor); } } } @@ -571,7 +571,7 @@ void R_Stain (const vec3_t origin, float radius, int cr1, int cg1, int cb1, int ============================================================= */ -static void RSurf_AddLightmapToVertexColors(const int *lightmapoffsets, float *c, int numverts, const qbyte *samples, int size3, const qbyte *styles) +static void RSurf_AddLightmapToVertexColors_Color4f(const int *lightmapoffsets, float *c, int numverts, const qbyte *samples, int size3, const qbyte *styles) { int i; float scale; @@ -605,13 +605,13 @@ static void RSurf_AddLightmapToVertexColors(const int *lightmapoffsets, float *c } } -static void RSurf_FogColors(const float *v, float *c, float colorscale, int numverts, const float *modelorg) +static void RSurf_FogColors_Vertex3f_Color4f(const float *v, float *c, float colorscale, int numverts, const float *modelorg) { int i; float diff[3], f; if (fogenabled) { - for (i = 0;i < numverts;i++, v += 4, c += 4) + for (i = 0;i < numverts;i++, v += 3, c += 4) { VectorSubtract(v, modelorg, diff); f = colorscale * (1 - exp(fogdensity/DotProduct(diff, diff))); @@ -623,7 +623,7 @@ static void RSurf_FogColors(const float *v, float *c, float colorscale, int numv 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) +static void RSurf_FoggedColors_Vertex3f_Color4f(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; @@ -632,7 +632,7 @@ static void RSurf_FoggedColors(const float *v, float *c, float r, float g, float b *= colorscale; if (fogenabled) { - for (i = 0;i < numverts;i++, v += 4, c += 4) + for (i = 0;i < numverts;i++, v += 3, c += 4) { VectorSubtract(v, modelorg, diff); f = 1 - exp(fogdensity/DotProduct(diff, diff)); @@ -654,14 +654,14 @@ static void RSurf_FoggedColors(const float *v, float *c, float r, float g, float } } -static void RSurf_FogPassColors(const float *v, float *c, float r, float g, float b, float a, float colorscale, int numverts, const float *modelorg) +static void RSurf_FogPassColors_Vertex3f_Color4f(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) + for (i = 0;i < numverts;i++, v += 3, c += 4) { VectorSubtract(v, modelorg, diff); f = exp(fogdensity/DotProduct(diff, diff)); @@ -672,15 +672,7 @@ static void RSurf_FogPassColors(const float *v, float *c, float r, float g, floa } } -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) +static int RSurf_LightSeparate_Vertex3f_Color4f(const matrix4x4_t *matrix, const int *dlightbits, int numverts, const float *vert, float *color, float scale) { float f; const float *v; @@ -694,12 +686,12 @@ static int RSurf_LightSeparate(const matrix4x4_t *matrix, const int *dlightbits, { rd = &r_dlight[l]; Matrix4x4_Transform(matrix, rd->origin, lightorigin); - for (i = 0, v = vert, c = color;i < numverts;i++, v += 4, c += 4) + for (i = 0, v = vert, c = color;i < numverts;i++, v += 3, c += 4) { f = VectorDistance2(v, lightorigin) + LIGHTOFFSET; if (f < rd->cullradius2) { - f = (1.0f / f) - rd->subtract; + f = ((1.0f / f) - rd->subtract) * scale; VectorMA(c, f, rd->light, c); lit = true; } @@ -709,8 +701,7 @@ static int RSurf_LightSeparate(const matrix4x4_t *matrix, const int *dlightbits, return lit; } -// note: this untransforms lights to do the checking, -// and takes surf->mesh->verts data +// note: this untransforms lights to do the checking static int RSurf_LightCheck(const matrix4x4_t *matrix, const int *dlightbits, const surfmesh_t *mesh) { int i, l; @@ -723,7 +714,7 @@ static int RSurf_LightCheck(const matrix4x4_t *matrix, const int *dlightbits, co { rd = &r_dlight[l]; Matrix4x4_Transform(matrix, rd->origin, lightorigin); - for (i = 0, v = mesh->verts;i < mesh->numverts;i++, v += 4) + for (i = 0, v = mesh->vertex3f;i < mesh->numverts;i++, v += 3) if (VectorDistance2(v, lightorigin) < rd->cullradius2) return true; } @@ -738,7 +729,7 @@ static void RSurfShader_Sky(const entity_render_t *ent, const texture_t *texture rmeshstate_t m; // LordHavoc: HalfLife maps have freaky skypolys... - if (ent->model->ishlbsp) + if (ent->model->brush.ishlbsp) return; if (skyrendernow) @@ -750,34 +741,34 @@ static void RSurfShader_Sky(const entity_render_t *ent, const texture_t *texture R_Mesh_Matrix(&ent->matrix); - // draw depth-only polys - memset(&m, 0, sizeof(m)); + GL_Color(fogcolor[0] * r_colorscale, fogcolor[1] * r_colorscale, fogcolor[2] * r_colorscale, 1); if (skyrendermasked) { + // depth-only (masking) qglColorMask(0,0,0,0); // just to make sure that braindead drivers don't draw anything // despite that colormask... - m.blendfunc1 = GL_ZERO; - m.blendfunc2 = GL_ONE; + GL_BlendFunc(GL_ZERO, GL_ONE); } else { // fog sky - m.blendfunc1 = GL_ONE; - m.blendfunc2 = GL_ZERO; + GL_BlendFunc(GL_ONE, GL_ZERO); } - m.depthwrite = true; - R_Mesh_State(&m); + GL_DepthMask(true); + GL_DepthTest(true); + + memset(&m, 0, sizeof(m)); + R_Mesh_State_Texture(&m); + while((surf = *surfchain++) != NULL) { if (surf->visframe == r_framecount) { for (mesh = surf->mesh;mesh;mesh = mesh->chain) { - R_Mesh_ResizeCheck(mesh->numverts); - memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4])); - GL_Color(fogcolor[0] * r_colorscale, fogcolor[1] * r_colorscale, fogcolor[2] * r_colorscale, 1); - R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->index); + GL_VertexPointer(mesh->vertex3f); + R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->element3i); } } } @@ -786,36 +777,43 @@ static void RSurfShader_Sky(const entity_render_t *ent, const texture_t *texture static void RSurfShader_Water_Callback(const void *calldata1, int calldata2) { - int i; const entity_render_t *ent = calldata1; - const msurface_t *surf = ent->model->surfaces + calldata2; - float f, colorscale, scroll[2], *v; + const msurface_t *surf = ent->model->brushq1.surfaces + calldata2; + float f, colorscale; const surfmesh_t *mesh; rmeshstate_t m; float alpha; float modelorg[3]; texture_t *texture; - Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg); + matrix4x4_t tempmatrix; + + if (r_waterscroll.value) + { + // scrolling in texture matrix + Matrix4x4_CreateTranslate(&tempmatrix, sin(cl.time) * 0.025 * r_waterscroll.value, sin(cl.time * 0.8f) * 0.025 * r_waterscroll.value, 0); + R_Mesh_TextureMatrix(0, &tempmatrix); + } R_Mesh_Matrix(&ent->matrix); + Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg); memset(&m, 0, sizeof(m)); texture = surf->texinfo->texture->currentframe; alpha = texture->currentalpha; if (texture->rendertype == SURFRENDER_ADD) { - m.blendfunc1 = GL_SRC_ALPHA; - m.blendfunc2 = GL_ONE; + GL_BlendFunc(GL_SRC_ALPHA, GL_ONE); + GL_DepthMask(false); } else if (texture->rendertype == SURFRENDER_ALPHA) { - m.blendfunc1 = GL_SRC_ALPHA; - m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA; + GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + GL_DepthMask(false); } else { - m.blendfunc1 = GL_ONE; - m.blendfunc2 = GL_ZERO; + GL_BlendFunc(GL_ONE, GL_ZERO); + GL_DepthMask(true); } m.tex[0] = R_GetTexture(texture->skin.base); colorscale = r_colorscale; @@ -824,50 +822,49 @@ static void RSurfShader_Water_Callback(const void *calldata1, int calldata2) m.texrgbscale[0] = 4; colorscale *= 0.25f; } - R_Mesh_State(&m); - GL_UseColorArray(); + GL_DepthTest(true); + GL_ColorPointer(varray_color4f); for (mesh = surf->mesh;mesh;mesh = mesh->chain) { - R_Mesh_ResizeCheck(mesh->numverts); - memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4])); - memcpy(varray_texcoord[0], mesh->str, mesh->numverts * sizeof(float[4])); - scroll[0] = sin(cl.time) * 0.125f; - scroll[1] = sin(cl.time * 0.8f) * 0.125f; - for (i = 0, v = varray_texcoord[0];i < mesh->numverts;i++, v += 4) - { - v[0] += scroll[0]; - v[1] += scroll[1]; - } + GL_VertexPointer(mesh->vertex3f); + m.pointer_texcoord[0] = mesh->texcoordtexture2f; + R_Mesh_State_Texture(&m); f = surf->flags & SURF_DRAWFULLBRIGHT ? 1.0f : ((surf->flags & SURF_LIGHTMAP) ? 0 : 0.5f); - R_FillColors(varray_color, mesh->numverts, f, f, f, alpha); + R_FillColors(varray_color4f, mesh->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, mesh->numverts, varray_vertex, varray_color); + RSurf_LightSeparate_Vertex3f_Color4f(&ent->inversematrix, surf->dlightbits, mesh->numverts, mesh->vertex3f, varray_color4f, 1); 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_AddLightmapToVertexColors_Color4f(mesh->lightmapoffsets, varray_color4f, mesh->numverts, surf->samples, ((surf->extents[0]>>4)+1)*((surf->extents[1]>>4)+1)*3, surf->styles); } - RSurf_FogColors(varray_vertex, varray_color, colorscale, mesh->numverts, modelorg); - R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->index); + RSurf_FogColors_Vertex3f_Color4f(mesh->vertex3f, varray_color4f, colorscale, mesh->numverts, modelorg); + R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->element3i); } if (fogenabled) { memset(&m, 0, sizeof(m)); - m.blendfunc1 = GL_SRC_ALPHA; - m.blendfunc2 = GL_ONE; + GL_BlendFunc(GL_SRC_ALPHA, GL_ONE); + GL_DepthMask(false); + GL_DepthTest(true); m.tex[0] = R_GetTexture(texture->skin.fog); - R_Mesh_State(&m); for (mesh = surf->mesh;mesh;mesh = mesh->chain) { - R_Mesh_ResizeCheck(mesh->numverts); - memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4])); - if (m.tex[0]) - memcpy(varray_texcoord[0], mesh->str, mesh->numverts * sizeof(float[4])); - RSurf_FogPassColors(varray_vertex, varray_color, fogcolor[0], fogcolor[1], fogcolor[2], alpha, r_colorscale, mesh->numverts, modelorg); - R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->index); + GL_VertexPointer(mesh->vertex3f); + m.pointer_texcoord[0] = mesh->texcoordtexture2f; + GL_ColorPointer(varray_color4f); + R_Mesh_State_Texture(&m); + RSurf_FogPassColors_Vertex3f_Color4f(mesh->vertex3f, varray_color4f, fogcolor[0], fogcolor[1], fogcolor[2], alpha, r_colorscale, mesh->numverts, modelorg); + R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->element3i); } } + + if (r_waterscroll.value) + { + Matrix4x4_CreateIdentity(&tempmatrix); + R_Mesh_TextureMatrix(0, &tempmatrix); + } } static void RSurfShader_Water(const entity_render_t *ent, const texture_t *texture, msurface_t **surfchain) @@ -882,14 +879,14 @@ static void RSurfShader_Water(const entity_render_t *ent, const texture_t *textu if (surf->visframe == r_framecount) { Matrix4x4_Transform(&ent->matrix, surf->poly_center, center); - R_MeshQueue_AddTransparent(center, RSurfShader_Water_Callback, ent, surf - ent->model->surfaces); + R_MeshQueue_AddTransparent(center, RSurfShader_Water_Callback, ent, surf - ent->model->brushq1.surfaces); } } } else for (chain = surfchain;(surf = *chain) != NULL;chain++) if (surf->visframe == r_framecount) - RSurfShader_Water_Callback(ent, surf - ent->model->surfaces); + RSurfShader_Water_Callback(ent, surf - ent->model->brushq1.surfaces); } static void RSurfShader_Wall_Pass_BaseVertex(const entity_render_t *ent, const msurface_t *surf, const texture_t *texture, int rendertype, float currentalpha) @@ -902,18 +899,18 @@ static void RSurfShader_Wall_Pass_BaseVertex(const entity_render_t *ent, const m memset(&m, 0, sizeof(m)); if (rendertype == SURFRENDER_ADD) { - m.blendfunc1 = GL_SRC_ALPHA; - m.blendfunc2 = GL_ONE; + GL_BlendFunc(GL_SRC_ALPHA, GL_ONE); + GL_DepthMask(false); } else if (rendertype == SURFRENDER_ALPHA) { - m.blendfunc1 = GL_SRC_ALPHA; - m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA; + GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + GL_DepthMask(false); } else { - m.blendfunc1 = GL_ONE; - m.blendfunc2 = GL_ZERO; + GL_BlendFunc(GL_ONE, GL_ZERO); + GL_DepthMask(true); } m.tex[0] = R_GetTexture(texture->skin.base); colorscale = r_colorscale; @@ -923,23 +920,23 @@ static void RSurfShader_Wall_Pass_BaseVertex(const entity_render_t *ent, const m colorscale *= 0.25f; } base = ent->effects & EF_FULLBRIGHT ? 2.0f : r_ambient.value * (1.0f / 64.0f); - R_Mesh_State(&m); - GL_UseColorArray(); + GL_DepthTest(true); + GL_ColorPointer(varray_color4f); for (mesh = surf->mesh;mesh;mesh = mesh->chain) { - R_Mesh_ResizeCheck(mesh->numverts); - memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4])); - memcpy(varray_texcoord[0], mesh->str, mesh->numverts * sizeof(float[4])); - R_FillColors(varray_color, mesh->numverts, base, base, base, currentalpha); + GL_VertexPointer(mesh->vertex3f); + m.pointer_texcoord[0] = mesh->texcoordtexture2f; + R_Mesh_State_Texture(&m); + R_FillColors(varray_color4f, mesh->numverts, base, base, base, currentalpha); if (!(ent->effects & EF_FULLBRIGHT)) { if (surf->dlightframe == r_framecount) - RSurf_LightSeparate(&ent->inversematrix, surf->dlightbits, mesh->numverts, varray_vertex, varray_color); + RSurf_LightSeparate_Vertex3f_Color4f(&ent->inversematrix, surf->dlightbits, mesh->numverts, mesh->vertex3f, varray_color4f, 1); 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_AddLightmapToVertexColors_Color4f(mesh->lightmapoffsets, varray_color4f, mesh->numverts, surf->samples, ((surf->extents[0]>>4)+1)*((surf->extents[1]>>4)+1)*3, surf->styles); } - RSurf_FogColors(varray_vertex, varray_color, colorscale, mesh->numverts, modelorg); - R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->index); + RSurf_FogColors_Vertex3f_Color4f(mesh->vertex3f, varray_color4f, colorscale, mesh->numverts, modelorg); + R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->element3i); } } @@ -950,18 +947,19 @@ static void RSurfShader_Wall_Pass_Glow(const entity_render_t *ent, const msurfac float modelorg[3]; Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg); memset(&m, 0, sizeof(m)); - m.blendfunc1 = GL_SRC_ALPHA; - m.blendfunc2 = GL_ONE; + GL_BlendFunc(GL_SRC_ALPHA, GL_ONE); + GL_DepthMask(false); + GL_DepthTest(true); m.tex[0] = R_GetTexture(texture->skin.glow); - R_Mesh_State(&m); - GL_UseColorArray(); + GL_ColorPointer(varray_color4f); for (mesh = surf->mesh;mesh;mesh = mesh->chain) { - R_Mesh_ResizeCheck(mesh->numverts); - memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4])); - memcpy(varray_texcoord[0], mesh->str, mesh->numverts * sizeof(float[4])); - RSurf_FoggedColors(varray_vertex, varray_color, 1, 1, 1, currentalpha, r_colorscale, mesh->numverts, modelorg); - R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->index); + GL_VertexPointer(mesh->vertex3f); + if (m.tex[0]) + m.pointer_texcoord[0] = mesh->texcoordtexture2f; + R_Mesh_State_Texture(&m); + RSurf_FoggedColors_Vertex3f_Color4f(mesh->vertex3f, varray_color4f, 1, 1, 1, currentalpha, r_colorscale, mesh->numverts, modelorg); + R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->element3i); } } @@ -972,19 +970,19 @@ static void RSurfShader_Wall_Pass_Fog(const entity_render_t *ent, const msurface float modelorg[3]; Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg); memset(&m, 0, sizeof(m)); - m.blendfunc1 = GL_SRC_ALPHA; - m.blendfunc2 = GL_ONE; + GL_BlendFunc(GL_SRC_ALPHA, GL_ONE); + GL_DepthMask(false); + GL_DepthTest(true); m.tex[0] = R_GetTexture(texture->skin.fog); - R_Mesh_State(&m); - GL_UseColorArray(); + GL_ColorPointer(varray_color4f); for (mesh = surf->mesh;mesh;mesh = mesh->chain) { - R_Mesh_ResizeCheck(mesh->numverts); - memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4])); + GL_VertexPointer(mesh->vertex3f); if (m.tex[0]) - memcpy(varray_texcoord[0], mesh->str, mesh->numverts * sizeof(float[4])); - RSurf_FogPassColors(varray_vertex, varray_color, fogcolor[0], fogcolor[1], fogcolor[2], currentalpha, r_colorscale, mesh->numverts, modelorg); - R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->index); + m.pointer_texcoord[0] = mesh->texcoordtexture2f; + R_Mesh_State_Texture(&m); + RSurf_FogPassColors_Vertex3f_Color4f(mesh->vertex3f, varray_color4f, fogcolor[0], fogcolor[1], fogcolor[2], currentalpha, r_colorscale, mesh->numverts, modelorg); + R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->element3i); } } @@ -996,35 +994,36 @@ static void RSurfShader_OpaqueWall_Pass_BaseTripleTexCombine(const entity_render int lightmaptexturenum; float cl; memset(&m, 0, sizeof(m)); - m.blendfunc1 = GL_ONE; - m.blendfunc2 = GL_ZERO; + GL_BlendFunc(GL_ONE, GL_ZERO); + GL_DepthMask(true); + GL_DepthTest(true); m.tex[0] = R_GetTexture(texture->skin.base); m.tex[1] = R_GetTexture((**surfchain).lightmaptexture); m.tex[2] = R_GetTexture(texture->skin.detail); m.texrgbscale[0] = 1; m.texrgbscale[1] = 4; m.texrgbscale[2] = 2; - R_Mesh_State(&m); cl = (float) (1 << r_lightmapscalebit) * r_colorscale; GL_Color(cl, cl, cl, 1); + while((surf = *surfchain++) != NULL) { if (surf->visframe == r_framecount) { lightmaptexturenum = R_GetTexture(surf->lightmaptexture); - if (m.tex[1] != lightmaptexturenum) - { + //if (m.tex[1] != lightmaptexturenum) + //{ m.tex[1] = lightmaptexturenum; - R_Mesh_State(&m); - } + // R_Mesh_State_Texture(&m); + //} for (mesh = surf->mesh;mesh;mesh = mesh->chain) { - R_Mesh_ResizeCheck(mesh->numverts); - memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4])); - memcpy(varray_texcoord[0], mesh->str, mesh->numverts * sizeof(float[4])); - memcpy(varray_texcoord[1], mesh->uvw, mesh->numverts * sizeof(float[4])); - memcpy(varray_texcoord[2], mesh->abc, mesh->numverts * sizeof(float[4])); - R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->index); + GL_VertexPointer(mesh->vertex3f); + m.pointer_texcoord[0] = mesh->texcoordtexture2f; + m.pointer_texcoord[1] = mesh->texcoordlightmap2f; + m.pointer_texcoord[2] = mesh->texcoorddetail2f; + R_Mesh_State_Texture(&m); + R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->element3i); } } } @@ -1037,31 +1036,31 @@ static void RSurfShader_OpaqueWall_Pass_BaseDoubleTex(const entity_render_t *ent rmeshstate_t m; int lightmaptexturenum; memset(&m, 0, sizeof(m)); - m.blendfunc1 = GL_ONE; - m.blendfunc2 = GL_ZERO; + GL_BlendFunc(GL_ONE, GL_ZERO); + GL_DepthMask(true); + GL_DepthTest(true); m.tex[0] = R_GetTexture(texture->skin.base); m.tex[1] = R_GetTexture((**surfchain).lightmaptexture); if (gl_combine.integer) m.texrgbscale[1] = 4; - R_Mesh_State(&m); GL_Color(r_colorscale, r_colorscale, r_colorscale, 1); while((surf = *surfchain++) != NULL) { if (surf->visframe == r_framecount) { lightmaptexturenum = R_GetTexture(surf->lightmaptexture); - if (m.tex[1] != lightmaptexturenum) - { + //if (m.tex[1] != lightmaptexturenum) + //{ m.tex[1] = lightmaptexturenum; - R_Mesh_State(&m); - } + // R_Mesh_State_Texture(&m); + //} for (mesh = surf->mesh;mesh;mesh = mesh->chain) { - R_Mesh_ResizeCheck(mesh->numverts); - memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4])); - memcpy(varray_texcoord[0], mesh->str, mesh->numverts * sizeof(float[4])); - memcpy(varray_texcoord[1], mesh->uvw, mesh->numverts * sizeof(float[4])); - R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->index); + GL_VertexPointer(mesh->vertex3f); + m.pointer_texcoord[0] = mesh->texcoordtexture2f; + m.pointer_texcoord[1] = mesh->texcoordlightmap2f; + R_Mesh_State_Texture(&m); + R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->element3i); } } } @@ -1073,10 +1072,10 @@ static void RSurfShader_OpaqueWall_Pass_BaseTexture(const entity_render_t *ent, const surfmesh_t *mesh; rmeshstate_t m; memset(&m, 0, sizeof(m)); - m.blendfunc1 = GL_ONE; - m.blendfunc2 = GL_ZERO; + GL_DepthMask(true); + GL_DepthTest(true); + GL_BlendFunc(GL_ONE, GL_ZERO); m.tex[0] = R_GetTexture(texture->skin.base); - R_Mesh_State(&m); GL_Color(1, 1, 1, 1); while((surf = *surfchain++) != NULL) { @@ -1084,10 +1083,10 @@ static void RSurfShader_OpaqueWall_Pass_BaseTexture(const entity_render_t *ent, { for (mesh = surf->mesh;mesh;mesh = mesh->chain) { - R_Mesh_ResizeCheck(mesh->numverts); - memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4])); - memcpy(varray_texcoord[0], mesh->str, mesh->numverts * sizeof(float[4])); - R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->index); + GL_VertexPointer(mesh->vertex3f); + m.pointer_texcoord[0] = mesh->texcoordtexture2f; + R_Mesh_State_Texture(&m); + R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->element3i); } } } @@ -1100,29 +1099,29 @@ static void RSurfShader_OpaqueWall_Pass_BaseLightmap(const entity_render_t *ent, rmeshstate_t m; int lightmaptexturenum; memset(&m, 0, sizeof(m)); - m.blendfunc1 = GL_ZERO; - m.blendfunc2 = GL_SRC_COLOR; + GL_BlendFunc(GL_ZERO, GL_SRC_COLOR); + GL_DepthMask(false); + GL_DepthTest(true); m.tex[0] = R_GetTexture((**surfchain).lightmaptexture); if (gl_combine.integer) m.texrgbscale[0] = 4; - R_Mesh_State(&m); GL_Color(r_colorscale, r_colorscale, r_colorscale, 1); while((surf = *surfchain++) != NULL) { if (surf->visframe == r_framecount) { lightmaptexturenum = R_GetTexture(surf->lightmaptexture); - if (m.tex[0] != lightmaptexturenum) - { + //if (m.tex[0] != lightmaptexturenum) + //{ m.tex[0] = lightmaptexturenum; - R_Mesh_State(&m); - } + // R_Mesh_State_Texture(&m); + //} for (mesh = surf->mesh;mesh;mesh = mesh->chain) { - R_Mesh_ResizeCheck(mesh->numverts); - memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4])); - memcpy(varray_texcoord[0], mesh->uvw, mesh->numverts * sizeof(float[4])); - R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->index); + GL_VertexPointer(mesh->vertex3f); + m.pointer_texcoord[0] = mesh->texcoordlightmap2f; + R_Mesh_State_Texture(&m); + R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->element3i); } } } @@ -1136,8 +1135,9 @@ static void RSurfShader_OpaqueWall_Pass_Light(const entity_render_t *ent, const rmeshstate_t m; memset(&m, 0, sizeof(m)); - m.blendfunc1 = GL_SRC_ALPHA; - m.blendfunc2 = GL_ONE; + GL_BlendFunc(GL_SRC_ALPHA, GL_ONE); + GL_DepthMask(false); + GL_DepthTest(true); m.tex[0] = R_GetTexture(texture->skin.base); colorscale = r_colorscale; if (gl_combine.integer) @@ -1145,8 +1145,7 @@ static void RSurfShader_OpaqueWall_Pass_Light(const entity_render_t *ent, const m.texrgbscale[0] = 4; colorscale *= 0.25f; } - R_Mesh_State(&m); - GL_UseColorArray(); + GL_ColorPointer(varray_color4f); while((surf = *surfchain++) != NULL) { if (surf->visframe == r_framecount && surf->dlightframe == r_framecount) @@ -1155,13 +1154,12 @@ static void RSurfShader_OpaqueWall_Pass_Light(const entity_render_t *ent, const { if (RSurf_LightCheck(&ent->inversematrix, surf->dlightbits, mesh)) { - R_Mesh_ResizeCheck(mesh->numverts); - memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4])); - memcpy(varray_texcoord[0], mesh->str, mesh->numverts * sizeof(float[4])); - 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, colorscale, mesh->numverts); - R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->index); + GL_VertexPointer(mesh->vertex3f); + m.pointer_texcoord[0] = mesh->texcoordtexture2f; + R_FillColors(varray_color4f, mesh->numverts, 0, 0, 0, 1); + R_Mesh_State_Texture(&m); + RSurf_LightSeparate_Vertex3f_Color4f(&ent->inversematrix, surf->dlightbits, mesh->numverts, mesh->vertex3f, varray_color4f, colorscale); + R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->element3i); } } } @@ -1176,22 +1174,22 @@ static void RSurfShader_OpaqueWall_Pass_Fog(const entity_render_t *ent, const te 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; - R_Mesh_State(&m); - GL_UseColorArray(); + GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + GL_DepthMask(false); + GL_DepthTest(true); + GL_ColorPointer(varray_color4f); while((surf = *surfchain++) != NULL) { if (surf->visframe == r_framecount) { for (mesh = surf->mesh;mesh;mesh = mesh->chain) { - R_Mesh_ResizeCheck(mesh->numverts); - memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4])); + GL_VertexPointer(mesh->vertex3f); if (m.tex[0]) - memcpy(varray_texcoord[0], mesh->str, mesh->numverts * sizeof(float[4])); - RSurf_FogPassColors(varray_vertex, varray_color, fogcolor[0], fogcolor[1], fogcolor[2], 1, r_colorscale, mesh->numverts, modelorg); - R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->index); + m.pointer_texcoord[0] = mesh->texcoordtexture2f; + R_Mesh_State_Texture(&m); + RSurf_FogPassColors_Vertex3f_Color4f(mesh->vertex3f, varray_color4f, fogcolor[0], fogcolor[1], fogcolor[2], 1, r_colorscale, mesh->numverts, modelorg); + R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->element3i); } } } @@ -1203,10 +1201,10 @@ static void RSurfShader_OpaqueWall_Pass_BaseDetail(const entity_render_t *ent, c const surfmesh_t *mesh; rmeshstate_t m; memset(&m, 0, sizeof(m)); - m.blendfunc1 = GL_DST_COLOR; - m.blendfunc2 = GL_SRC_COLOR; + GL_BlendFunc(GL_DST_COLOR, GL_SRC_COLOR); + GL_DepthMask(false); + GL_DepthTest(true); m.tex[0] = R_GetTexture(texture->skin.detail); - R_Mesh_State(&m); GL_Color(1, 1, 1, 1); while((surf = *surfchain++) != NULL) { @@ -1214,10 +1212,10 @@ static void RSurfShader_OpaqueWall_Pass_BaseDetail(const entity_render_t *ent, c { for (mesh = surf->mesh;mesh;mesh = mesh->chain) { - R_Mesh_ResizeCheck(mesh->numverts); - memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4])); - memcpy(varray_texcoord[0], mesh->abc, mesh->numverts * sizeof(float[4])); - R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->index); + GL_VertexPointer(mesh->vertex3f); + m.pointer_texcoord[0] = mesh->texcoorddetail2f; + R_Mesh_State_Texture(&m); + R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->element3i); } } } @@ -1229,10 +1227,10 @@ static void RSurfShader_OpaqueWall_Pass_Glow(const entity_render_t *ent, const t const surfmesh_t *mesh; rmeshstate_t m; memset(&m, 0, sizeof(m)); - m.blendfunc1 = GL_SRC_ALPHA; - m.blendfunc2 = GL_ONE; + GL_BlendFunc(GL_SRC_ALPHA, GL_ONE); + GL_DepthMask(false); + GL_DepthTest(true); m.tex[0] = R_GetTexture(texture->skin.glow); - R_Mesh_State(&m); GL_Color(r_colorscale, r_colorscale, r_colorscale, 1); while((surf = *surfchain++) != NULL) { @@ -1240,10 +1238,10 @@ static void RSurfShader_OpaqueWall_Pass_Glow(const entity_render_t *ent, const t { for (mesh = surf->mesh;mesh;mesh = mesh->chain) { - R_Mesh_ResizeCheck(mesh->numverts); - memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4])); - memcpy(varray_texcoord[0], mesh->str, mesh->numverts * sizeof(float[4])); - R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->index); + GL_VertexPointer(mesh->vertex3f); + m.pointer_texcoord[0] = mesh->texcoordtexture2f; + R_Mesh_State_Texture(&m); + R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->element3i); } } } @@ -1255,10 +1253,9 @@ static void RSurfShader_OpaqueWall_Pass_OpaqueGlow(const entity_render_t *ent, c const surfmesh_t *mesh; rmeshstate_t m; memset(&m, 0, sizeof(m)); - m.blendfunc1 = GL_SRC_ALPHA; - m.blendfunc2 = GL_ZERO; + GL_BlendFunc(GL_SRC_ALPHA, GL_ZERO); + GL_DepthMask(true); m.tex[0] = R_GetTexture(texture->skin.glow); - R_Mesh_State(&m); if (m.tex[0]) GL_Color(r_colorscale, r_colorscale, r_colorscale, 1); else @@ -1269,10 +1266,10 @@ static void RSurfShader_OpaqueWall_Pass_OpaqueGlow(const entity_render_t *ent, c { for (mesh = surf->mesh;mesh;mesh = mesh->chain) { - R_Mesh_ResizeCheck(mesh->numverts); - memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4])); - memcpy(varray_texcoord[0], mesh->str, mesh->numverts * sizeof(float[4])); - R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->index); + GL_VertexPointer(mesh->vertex3f); + m.pointer_texcoord[0] = mesh->texcoordtexture2f; + R_Mesh_State_Texture(&m); + R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->element3i); } } } @@ -1281,7 +1278,7 @@ static void RSurfShader_OpaqueWall_Pass_OpaqueGlow(const entity_render_t *ent, c 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; + const msurface_t *surf = ent->model->brushq1.surfaces + calldata2; int rendertype; float currentalpha; texture_t *texture; @@ -1321,11 +1318,11 @@ static void RSurfShader_Wall_Lightmap(const entity_render_t *ent, const texture_ if (surf->visframe == r_framecount) { Matrix4x4_Transform(&ent->matrix, surf->poly_center, center); - R_MeshQueue_AddTransparent(center, RSurfShader_Wall_Vertex_Callback, ent, surf - ent->model->surfaces); + R_MeshQueue_AddTransparent(center, RSurfShader_Wall_Vertex_Callback, ent, surf - ent->model->brushq1.surfaces); } } } - else if (r_shadow_lightingmode >= 2) + else if (r_shadow_realtime_world.integer) { // opaque base lighting RSurfShader_OpaqueWall_Pass_OpaqueGlow(ent, texture, surfchain); @@ -1399,9 +1396,9 @@ void R_UpdateTextureInfo(entity_render_t *ent) alttextures = ent->frame != 0; texframe = (int)(cl.time * 5.0f); - for (i = 0;i < ent->model->numtextures;i++) + for (i = 0;i < ent->model->brushq1.numtextures;i++) { - t = ent->model->textures + i; + t = ent->model->brushq1.textures + i; t->currentalpha = ent->alpha; if (t->flags & SURF_WATERALPHA) t->currentalpha *= r_wateralpha.value; @@ -1430,30 +1427,30 @@ void R_PrepareSurfaces(entity_render_t *ent) model = ent->model; Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg); - numsurfaces = model->nummodelsurfaces; - surfaces = model->surfaces + model->firstmodelsurface; - surfacevisframes = model->surfacevisframes + model->firstmodelsurface; + numsurfaces = model->brushq1.nummodelsurfaces; + surfaces = model->brushq1.surfaces + model->brushq1.firstmodelsurface; + surfacevisframes = model->brushq1.surfacevisframes + model->brushq1.firstmodelsurface; R_UpdateTextureInfo(ent); - if (r_dynamic.integer && r_shadow_lightingmode < 1) + if (r_dynamic.integer && !r_shadow_realtime_dlight.integer) R_MarkLights(ent); - if (model->light_ambient != r_ambient.value || model->light_scalebit != r_lightmapscalebit) + if (model->brushq1.light_ambient != r_ambient.value || model->brushq1.light_scalebit != r_lightmapscalebit) { - model->light_ambient = r_ambient.value; - model->light_scalebit = r_lightmapscalebit; - for (i = 0;i < model->nummodelsurfaces;i++) - model->surfaces[i + model->firstmodelsurface].cached_dlight = true; + model->brushq1.light_ambient = r_ambient.value; + model->brushq1.light_scalebit = r_lightmapscalebit; + for (i = 0;i < model->brushq1.nummodelsurfaces;i++) + model->brushq1.surfaces[i + model->brushq1.firstmodelsurface].cached_dlight = true; } else { - for (i = 0;i < model->light_styles;i++) + for (i = 0;i < model->brushq1.light_styles;i++) { - if (model->light_stylevalue[i] != d_lightstylevalue[model->light_style[i]]) + if (model->brushq1.light_stylevalue[i] != d_lightstylevalue[model->brushq1.light_style[i]]) { - model->light_stylevalue[i] = d_lightstylevalue[model->light_style[i]]; - for (surfchain = model->light_styleupdatechains[i];*surfchain;surfchain++) + model->brushq1.light_stylevalue[i] = d_lightstylevalue[model->brushq1.light_style[i]]; + for (surfchain = model->brushq1.light_styleupdatechains[i];*surfchain;surfchain++) (**surfchain).cached_dlight = true; } } @@ -1494,7 +1491,7 @@ void R_DrawSurfaces(entity_render_t *ent, int type, msurface_t ***chains) if (ent->model == NULL) return; R_Mesh_Matrix(&ent->matrix); - for (i = 0, t = ent->model->textures;i < ent->model->numtextures;i++, t++) + for (i = 0, t = ent->model->brushq1.textures;i < ent->model->brushq1.numtextures;i++, t++) if (t->shader->shaderfunc[type] && t->currentframe && chains[i] != NULL) t->shader->shaderfunc[type](ent, t->currentframe, chains[i]); } @@ -1505,29 +1502,33 @@ static void R_DrawPortal_Callback(const void *calldata1, int calldata2) 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; + const mportal_t *portal = ent->model->brushq1.portals + calldata2; + GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + GL_DepthMask(false); + GL_DepthTest(true); R_Mesh_Matrix(&ent->matrix); - R_Mesh_State(&m); - R_Mesh_ResizeCheck(portal->numpoints); - i = portal - ent->model->portals; + GL_VertexPointer(varray_vertex3f); + + memset(&m, 0, sizeof(m)); + R_Mesh_State_Texture(&m); + + i = portal - ent->model->brushq1.portals; GL_Color(((i & 0x0007) >> 0) * (1.0f / 7.0f) * r_colorscale, ((i & 0x0038) >> 3) * (1.0f / 7.0f) * r_colorscale, ((i & 0x01C0) >> 6) * (1.0f / 7.0f) * r_colorscale, 0.125f); if (PlaneDiff(r_origin, (&portal->plane)) > 0) { - for (i = portal->numpoints - 1, v = varray_vertex;i >= 0;i--, v += 4) + for (i = portal->numpoints - 1, v = varray_vertex3f;i >= 0;i--, v += 3) VectorCopy(portal->points[i].position, v); } else - for (i = 0, v = varray_vertex;i < portal->numpoints;i++, v += 4) + for (i = 0, v = varray_vertex3f;i < portal->numpoints;i++, v += 3) VectorCopy(portal->points[i].position, v); R_Mesh_Draw(portal->numpoints, portal->numpoints - 2, polygonelements); } +// LordHavoc: this is just a nice debugging tool, very slow static void R_DrawPortals(entity_render_t *ent) { int i; @@ -1535,9 +1536,9 @@ static void R_DrawPortals(entity_render_t *ent) float temp[3], center[3], f; if (ent->model == NULL) return; - for (portal = ent->model->portals, endportal = portal + ent->model->numportals;portal < endportal;portal++) + for (portal = ent->model->brushq1.portals, endportal = portal + ent->model->brushq1.numportals;portal < endportal;portal++) { - if ((portal->here->pvsframe == ent->model->pvsframecount || portal->past->pvsframe == ent->model->pvsframecount) && portal->numpoints <= POLYGONELEMENTS_MAXPOINTS) + if (portal->numpoints <= POLYGONELEMENTS_MAXPOINTS) { VectorClear(temp); for (i = 0;i < portal->numpoints;i++) @@ -1545,7 +1546,7 @@ static void R_DrawPortals(entity_render_t *ent) 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); + R_MeshQueue_AddTransparent(center, R_DrawPortal_Callback, ent, portal - ent->model->brushq1.portals); } } } @@ -1567,10 +1568,10 @@ void R_PrepareBrushModel(entity_render_t *ent) #if WORLDNODECULLBACKFACES Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg); #endif - numsurfaces = model->nummodelsurfaces; - surf = model->surfaces + model->firstmodelsurface; - surfacevisframes = model->surfacevisframes + model->firstmodelsurface; - surfacepvsframes = model->surfacepvsframes + model->firstmodelsurface; + numsurfaces = model->brushq1.nummodelsurfaces; + surf = model->brushq1.surfaces + model->brushq1.firstmodelsurface; + surfacevisframes = model->brushq1.surfacevisframes + model->brushq1.firstmodelsurface; + surfacepvsframes = model->brushq1.surfacepvsframes + model->brushq1.firstmodelsurface; for (i = 0;i < numsurfaces;i++, surf++) { #if WORLDNODECULLBACKFACES @@ -1602,11 +1603,11 @@ void R_SurfaceWorldNode (entity_render_t *ent) model = ent->model; if (model == NULL) return; - surfacevisframes = model->surfacevisframes + model->firstmodelsurface; - surfacepvsframes = model->surfacepvsframes + model->firstmodelsurface; + surfacevisframes = model->brushq1.surfacevisframes + model->brushq1.firstmodelsurface; + surfacepvsframes = model->brushq1.surfacepvsframes + model->brushq1.firstmodelsurface; Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg); - for (leaf = model->pvsleafchain;leaf;leaf = leaf->pvschain) + for (leaf = model->brushq1.pvsleafchain;leaf;leaf = leaf->pvschain) { if (!R_CullBox (leaf->mins, leaf->maxs)) { @@ -1615,10 +1616,10 @@ void R_SurfaceWorldNode (entity_render_t *ent) } } - for (i = 0;i < model->pvssurflistlength;i++) + for (i = 0;i < model->brushq1.pvssurflistlength;i++) { - surfnum = model->pvssurflist[i]; - surf = model->surfaces + surfnum; + surfnum = model->brushq1.pvssurflist[i]; + surf = model->brushq1.surfaces + surfnum; #if WORLDNODECULLBACKFACES if (PlaneDist(modelorg, surf->plane) < surf->plane->dist) { @@ -1639,7 +1640,7 @@ void R_SurfaceWorldNode (entity_render_t *ent) static void R_PortalWorldNode(entity_render_t *ent, mleaf_t *viewleaf) { - int c, leafstackpos, *mark, *surfacevisframes; + int c, leafstackpos, *mark, *surfacevisframes, bitnum; #if WORLDNODECULLBACKFACES int n; msurface_t *surf; @@ -1654,8 +1655,8 @@ static void R_PortalWorldNode(entity_render_t *ent, mleaf_t *viewleaf) // follows portals leading outward from viewleaf, does not venture // offscreen or into leafs that are not visible, faster than Quake's // RecursiveWorldNode - surfaces = ent->model->surfaces; - surfacevisframes = ent->model->surfacevisframes; + surfaces = ent->model->brushq1.surfaces; + surfacevisframes = ent->model->brushq1.surfacevisframes; Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg); viewleaf->worldnodeframe = r_framecount; leafstack[0] = viewleaf; @@ -1703,7 +1704,8 @@ static void R_PortalWorldNode(entity_render_t *ent, mleaf_t *viewleaf) { leaf->worldnodeframe = r_framecount; // FIXME: R_CullBox is absolute, should be done relative - if (leaf->pvsframe == ent->model->pvsframecount && !R_CullBox(leaf->mins, leaf->maxs)) + bitnum = (leaf - ent->model->brushq1.leafs) - 1; + if ((r_pvsbits[bitnum >> 3] & (1 << (bitnum & 7))) && !R_CullBox(leaf->mins, leaf->maxs)) leafstack[leafstackpos++] = leaf; } } @@ -1713,58 +1715,46 @@ static void R_PortalWorldNode(entity_render_t *ent, mleaf_t *viewleaf) void R_PVSUpdate (entity_render_t *ent, mleaf_t *viewleaf) { - int i, j, l, c, bits, *surfacepvsframes, *mark; + int j, c, *surfacepvsframes, *mark; mleaf_t *leaf; - qbyte *vis; model_t *model; model = ent->model; - if (model && (model->pvsviewleaf != viewleaf || model->pvsviewleafnovis != r_novis.integer)) + if (model && (model->brushq1.pvsviewleaf != viewleaf || model->brushq1.pvsviewleafnovis != r_novis.integer)) { - model->pvsframecount++; - model->pvsviewleaf = viewleaf; - model->pvsviewleafnovis = r_novis.integer; - model->pvsleafchain = NULL; - model->pvssurflistlength = 0; + model->brushq1.pvsframecount++; + model->brushq1.pvsviewleaf = viewleaf; + model->brushq1.pvsviewleafnovis = r_novis.integer; + model->brushq1.pvsleafchain = NULL; + model->brushq1.pvssurflistlength = 0; if (viewleaf) { - surfacepvsframes = model->surfacepvsframes; - vis = Mod_LeafPVS (viewleaf, model); - for (j = 0;j < model->numleafs;j += 8) + surfacepvsframes = model->brushq1.surfacepvsframes; + for (j = 0;j < model->brushq1.visleafs;j++) { - bits = *vis++; - if (bits) + if (r_pvsbits[j >> 3] & (1 << (j & 7))) { - l = model->numleafs - j; - if (l > 8) - l = 8; - for (i = 0;i < l;i++) - { - if (bits & (1 << i)) - { - leaf = &model->leafs[j + i + 1]; - leaf->pvschain = model->pvsleafchain; - model->pvsleafchain = leaf; - leaf->pvsframe = model->pvsframecount; - // mark surfaces bounding this leaf as visible - for (c = leaf->nummarksurfaces, mark = leaf->firstmarksurface;c;c--, mark++) - surfacepvsframes[*mark] = model->pvsframecount; - } - } + leaf = model->brushq1.leafs + j + 1; + leaf->pvsframe = model->brushq1.pvsframecount; + leaf->pvschain = model->brushq1.pvsleafchain; + model->brushq1.pvsleafchain = leaf; + // mark surfaces bounding this leaf as visible + for (c = leaf->nummarksurfaces, mark = leaf->firstmarksurface;c;c--, mark++) + surfacepvsframes[*mark] = model->brushq1.pvsframecount; } } - Mod_BuildPVSTextureChains(model); + model->brushq1.BuildPVSTextureChains(model); } } } -void R_WorldVisibility (entity_render_t *ent) +void R_WorldVisibility(entity_render_t *ent) { vec3_t modelorg; mleaf_t *viewleaf; Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg); - viewleaf = Mod_PointInLeaf (modelorg, ent->model); + viewleaf = (ent->model && ent->model->brushq1.PointInLeaf) ? ent->model->brushq1.PointInLeaf(ent->model, modelorg) : NULL; R_PVSUpdate(ent, viewleaf); if (!viewleaf) @@ -1776,34 +1766,39 @@ void R_WorldVisibility (entity_render_t *ent) R_PortalWorldNode (ent, viewleaf); } -void R_DrawWorld (entity_render_t *ent) +void R_DrawWorld(entity_render_t *ent) { if (ent->model == NULL) return; - R_PrepareSurfaces(ent); - R_DrawSurfaces(ent, SHADERSTAGE_SKY, ent->model->pvstexturechains); - R_DrawSurfaces(ent, SHADERSTAGE_NORMAL, ent->model->pvstexturechains); - if (r_drawportals.integer) - R_DrawPortals(ent); + if (!ent->model->brushq1.numleafs && ent->model->Draw) + ent->model->Draw(ent); + else + { + R_PrepareSurfaces(ent); + R_DrawSurfaces(ent, SHADERSTAGE_SKY, ent->model->brushq1.pvstexturechains); + R_DrawSurfaces(ent, SHADERSTAGE_NORMAL, ent->model->brushq1.pvstexturechains); + if (r_drawportals.integer) + R_DrawPortals(ent); + } } -void R_Model_Brush_DrawSky (entity_render_t *ent) +void R_Model_Brush_DrawSky(entity_render_t *ent) { if (ent->model == NULL) return; if (ent != &cl_entities[0].render) R_PrepareBrushModel(ent); - R_DrawSurfaces(ent, SHADERSTAGE_SKY, ent->model->pvstexturechains); + R_DrawSurfaces(ent, SHADERSTAGE_SKY, ent->model->brushq1.pvstexturechains); } -void R_Model_Brush_Draw (entity_render_t *ent) +void R_Model_Brush_Draw(entity_render_t *ent) { if (ent->model == NULL) return; c_bmodels++; if (ent != &cl_entities[0].render) R_PrepareBrushModel(ent); - R_DrawSurfaces(ent, SHADERSTAGE_NORMAL, ent->model->pvstexturechains); + R_DrawSurfaces(ent, SHADERSTAGE_NORMAL, ent->model->brushq1.pvstexturechains); } void R_Model_Brush_DrawShadowVolume (entity_render_t *ent, vec3_t relativelightorigin, float lightradius) @@ -1818,7 +1813,7 @@ void R_Model_Brush_DrawShadowVolume (entity_render_t *ent, vec3_t relativelighto lightradius2 = lightradius * lightradius; R_UpdateTextureInfo(ent); projectdistance = 1000000000.0f;//lightradius + ent->model->radius; - for (i = 0, surf = ent->model->surfaces + ent->model->firstmodelsurface;i < ent->model->nummodelsurfaces;i++, surf++) + for (i = 0, surf = ent->model->brushq1.surfaces + ent->model->brushq1.firstmodelsurface;i < ent->model->brushq1.nummodelsurfaces;i++, surf++) { if (surf->texinfo->texture->rendertype == SURFRENDER_OPAQUE && surf->flags & SURF_SHADOWCAST) { @@ -1832,20 +1827,14 @@ void R_Model_Brush_DrawShadowVolume (entity_render_t *ent, vec3_t relativelighto temp[1] = bound(surf->poly_mins[1], relativelightorigin[1], surf->poly_maxs[1]) - relativelightorigin[1]; temp[2] = bound(surf->poly_mins[2], relativelightorigin[2], surf->poly_maxs[2]) - relativelightorigin[2]; if (DotProduct(temp, temp) < lightradius2) - { for (mesh = surf->mesh;mesh;mesh = mesh->chain) - { - R_Mesh_ResizeCheck(mesh->numverts * 2); - memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4])); - R_Shadow_Volume(mesh->numverts, mesh->numtriangles, mesh->index, mesh->triangleneighbors, relativelightorigin, lightradius, projectdistance); - } - } + R_Shadow_Volume(mesh->numverts, mesh->numtriangles, mesh->vertex3f, mesh->element3i, mesh->neighbor3i, relativelightorigin, lightradius, projectdistance); } } } } -void R_Model_Brush_DrawLightForSurfaceList(entity_render_t *ent, vec3_t relativelightorigin, vec3_t relativeeyeorigin, float lightradius, float *lightcolor, msurface_t **surflist, int numsurfaces) +void R_Model_Brush_DrawLightForSurfaceList(entity_render_t *ent, vec3_t relativelightorigin, vec3_t relativeeyeorigin, float lightradius, float *lightcolor, msurface_t **surflist, int numsurfaces, const matrix4x4_t *matrix_modeltofilter, const matrix4x4_t *matrix_modeltoattenuationxyz, const matrix4x4_t *matrix_modeltoattenuationz) { int surfnum; msurface_t *surf; @@ -1865,99 +1854,200 @@ void R_Model_Brush_DrawLightForSurfaceList(entity_render_t *ent, vec3_t relative { for (mesh = surf->mesh;mesh;mesh = mesh->chain) { - R_Mesh_ResizeCheck(mesh->numverts); - memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4])); - R_Shadow_DiffuseLighting(mesh->numverts, mesh->numtriangles, mesh->index, mesh->svectors, mesh->tvectors, mesh->normals, mesh->str, relativelightorigin, lightradius, lightcolor, t->skin.base, t->skin.nmap, NULL); - R_Shadow_SpecularLighting(mesh->numverts, mesh->numtriangles, mesh->index, mesh->svectors, mesh->tvectors, mesh->normals, mesh->str, relativelightorigin, relativeeyeorigin, lightradius, lightcolor, t->skin.gloss, t->skin.nmap, NULL); + R_Shadow_DiffuseLighting(mesh->numverts, mesh->numtriangles, mesh->element3i, mesh->vertex3f, mesh->svector3f, mesh->tvector3f, mesh->normal3f, mesh->texcoordtexture2f, relativelightorigin, lightradius, lightcolor, matrix_modeltofilter, matrix_modeltoattenuationxyz, matrix_modeltoattenuationz, t->skin.base, t->skin.nmap, NULL); + R_Shadow_SpecularLighting(mesh->numverts, mesh->numtriangles, mesh->element3i, mesh->vertex3f, mesh->svector3f, mesh->tvector3f, mesh->normal3f, mesh->texcoordtexture2f, relativelightorigin, relativeeyeorigin, lightradius, lightcolor, matrix_modeltofilter, matrix_modeltoattenuationxyz, matrix_modeltoattenuationz, t->skin.gloss, t->skin.nmap, NULL); } } } } } -void R_Model_Brush_DrawLight(entity_render_t *ent, vec3_t relativelightorigin, vec3_t relativeeyeorigin, float lightradius, float *lightcolor) +void R_Model_Brush_DrawLight(entity_render_t *ent, vec3_t relativelightorigin, vec3_t relativeeyeorigin, float lightradius, float *lightcolor, const matrix4x4_t *matrix_modeltofilter, const matrix4x4_t *matrix_modeltoattenuationxyz, const matrix4x4_t *matrix_modeltoattenuationz) { int surfnum; msurface_t *surf; texture_t *t; - float f, lightradius2, temp[3]; + float f, lightmins[3], lightmaxs[3]; surfmesh_t *mesh; if (ent->model == NULL) return; R_Mesh_Matrix(&ent->matrix); - lightradius2 = lightradius * lightradius; + lightmins[0] = relativelightorigin[0] - lightradius; + lightmins[1] = relativelightorigin[1] - lightradius; + lightmins[2] = relativelightorigin[2] - lightradius; + lightmaxs[0] = relativelightorigin[0] + lightradius; + lightmaxs[1] = relativelightorigin[1] + lightradius; + lightmaxs[2] = relativelightorigin[2] + lightradius; R_UpdateTextureInfo(ent); - if (ent != &cl_entities[0].render) + for (surfnum = 0, surf = ent->model->brushq1.surfaces + ent->model->brushq1.firstmodelsurface;surfnum < ent->model->brushq1.nummodelsurfaces;surfnum++, surf++) { - // bmodel, cull crudely to view and light - for (surfnum = 0, surf = ent->model->surfaces + ent->model->firstmodelsurface;surfnum < ent->model->nummodelsurfaces;surfnum++, surf++) + if ((ent != &cl_entities[0].render || surf->visframe == r_framecount) && BoxesOverlap(surf->poly_mins, surf->poly_maxs, lightmins, lightmaxs)) { - temp[0] = bound(surf->poly_mins[0], relativelightorigin[0], surf->poly_maxs[0]) - relativelightorigin[0]; - temp[1] = bound(surf->poly_mins[1], relativelightorigin[1], surf->poly_maxs[1]) - relativelightorigin[1]; - temp[2] = bound(surf->poly_mins[2], relativelightorigin[2], surf->poly_maxs[2]) - relativelightorigin[2]; - if (DotProduct(temp, temp) < lightradius2) + f = PlaneDiff(relativelightorigin, surf->plane); + if (surf->flags & SURF_PLANEBACK) + f = -f; + if (f >= -0.1 && f < lightradius) { - f = PlaneDiff(relativelightorigin, surf->plane); - if (surf->flags & SURF_PLANEBACK) - f = -f; - if (f >= -0.1 && f < lightradius) + t = surf->texinfo->texture->currentframe; + if (t->rendertype == SURFRENDER_OPAQUE && t->flags & SURF_SHADOWLIGHT) { - f = PlaneDiff(relativeeyeorigin, surf->plane); - if (surf->flags & SURF_PLANEBACK) - f = -f; - if (f > 0) + for (mesh = surf->mesh;mesh;mesh = mesh->chain) { - t = surf->texinfo->texture->currentframe; - if (t->rendertype == SURFRENDER_OPAQUE && t->flags & SURF_SHADOWLIGHT) - { - for (mesh = surf->mesh;mesh;mesh = mesh->chain) - { - R_Mesh_ResizeCheck(mesh->numverts); - memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4])); - R_Shadow_DiffuseLighting(mesh->numverts, mesh->numtriangles, mesh->index, mesh->svectors, mesh->tvectors, mesh->normals, mesh->str, relativelightorigin, lightradius, lightcolor, t->skin.base, t->skin.nmap, NULL); - R_Shadow_SpecularLighting(mesh->numverts, mesh->numtriangles, mesh->index, mesh->svectors, mesh->tvectors, mesh->normals, mesh->str, relativelightorigin, relativeeyeorigin, lightradius, lightcolor, t->skin.gloss, t->skin.nmap, NULL); - } - } + R_Shadow_DiffuseLighting(mesh->numverts, mesh->numtriangles, mesh->element3i, mesh->vertex3f, mesh->svector3f, mesh->tvector3f, mesh->normal3f, mesh->texcoordtexture2f, relativelightorigin, lightradius, lightcolor, matrix_modeltofilter, matrix_modeltoattenuationxyz, matrix_modeltoattenuationz, t->skin.base, t->skin.nmap, NULL); + R_Shadow_SpecularLighting(mesh->numverts, mesh->numtriangles, mesh->element3i, mesh->vertex3f, mesh->svector3f, mesh->tvector3f, mesh->normal3f, mesh->texcoordtexture2f, relativelightorigin, relativeeyeorigin, lightradius, lightcolor, matrix_modeltofilter, matrix_modeltoattenuationxyz, matrix_modeltoattenuationz, t->skin.gloss, t->skin.nmap, NULL); } } } } } +} + +void R_DrawCollisionBrush(colbrushf_t *brush) +{ + int i; + i = ((int)brush) / sizeof(colbrushf_t); + GL_Color((i & 31) * (1.0f / 32.0f) * r_colorscale, ((i >> 5) & 31) * (1.0f / 32.0f) * r_colorscale, ((i >> 10) & 31) * (1.0f / 32.0f) * r_colorscale, 0.2f); + GL_VertexPointer(brush->points->v); + R_Mesh_Draw(brush->numpoints, brush->numtriangles, brush->elements); +} + +void R_Q3BSP_DrawFace_Mesh(entity_render_t *ent, q3mface_t *face) +{ + rmeshstate_t m; + memset(&m, 0, sizeof(m)); + GL_BlendFunc(GL_ONE, GL_ZERO); + GL_DepthMask(true); + GL_DepthTest(true); + m.tex[0] = R_GetTexture(face->texture->skin.base); + m.pointer_texcoord[0] = face->data_texcoordtexture2f; + if (face->lightmaptexture) + { + m.tex[1] = R_GetTexture(face->lightmaptexture); + m.pointer_texcoord[1] = face->data_texcoordlightmap2f; + m.texrgbscale[1] = 2; + GL_Color(r_colorscale, r_colorscale, r_colorscale, 1); + } else { - // world, already culled to view, just cull to light - for (surfnum = 0, surf = ent->model->surfaces + ent->model->firstmodelsurface;surfnum < ent->model->nummodelsurfaces;surfnum++, surf++) + m.texrgbscale[0] = 2; + GL_ColorPointer(face->data_color4f); + } + R_Mesh_State_Texture(&m); + GL_VertexPointer(face->data_vertex3f); + R_Mesh_Draw(face->numvertices, face->numtriangles, face->data_element3i); +} + +void R_Q3BSP_DrawFace_Patch(entity_render_t *ent, q3mface_t *face) +{ +} + +void R_Q3BSP_DrawFace(entity_render_t *ent, q3mface_t *face) +{ + if (face->texture->renderflags & Q3MTEXTURERENDERFLAGS_NODRAW) + return; + switch(face->type) + { + case Q3FACETYPE_POLYGON: + case Q3FACETYPE_MESH: + R_Q3BSP_DrawFace_Mesh(ent, face); + break; + case Q3FACETYPE_PATCH: + R_Q3BSP_DrawFace_Patch(ent, face); + break; + case Q3FACETYPE_FLARE: + break; + } +} + +/* +void R_Q3BSP_DrawSky(entity_render_t *ent) +{ +} +*/ + +void R_Q3BSP_RecursiveWorldNode(entity_render_t *ent, q3mnode_t *node, const vec3_t modelorg, qbyte *pvs, int markframe) +{ + int i; + q3mleaf_t *leaf; + while (node->isnode) + { + if (R_CullBox(node->mins, node->maxs)) + return; + R_Q3BSP_RecursiveWorldNode(ent, node->children[0], modelorg, pvs, markframe); + node = node->children[1]; + } + if (R_CullBox(node->mins, node->maxs)) + return; + leaf = (q3mleaf_t *)node; + if (pvs[leaf->clusterindex >> 3] & (1 << (leaf->clusterindex & 7))) + { + for (i = 0;i < leaf->numleaffaces;i++) { - if (surf->visframe == r_framecount) + if (leaf->firstleafface[i]->markframe != markframe) { - temp[0] = bound(surf->poly_mins[0], relativelightorigin[0], surf->poly_maxs[0]) - relativelightorigin[0]; - temp[1] = bound(surf->poly_mins[1], relativelightorigin[1], surf->poly_maxs[1]) - relativelightorigin[1]; - temp[2] = bound(surf->poly_mins[2], relativelightorigin[2], surf->poly_maxs[2]) - relativelightorigin[2]; - if (DotProduct(temp, temp) < lightradius2) - { - f = PlaneDiff(relativelightorigin, surf->plane); - if (surf->flags & SURF_PLANEBACK) - f = -f; - if (f >= -0.1 && f < lightradius) - { - t = surf->texinfo->texture->currentframe; - if (t->rendertype == SURFRENDER_OPAQUE && t->flags & SURF_SHADOWLIGHT) - { - for (mesh = surf->mesh;mesh;mesh = mesh->chain) - { - R_Mesh_ResizeCheck(mesh->numverts); - memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4])); - R_Shadow_DiffuseLighting(mesh->numverts, mesh->numtriangles, mesh->index, mesh->svectors, mesh->tvectors, mesh->normals, mesh->str, relativelightorigin, lightradius, lightcolor, t->skin.base, t->skin.nmap, NULL); - R_Shadow_SpecularLighting(mesh->numverts, mesh->numtriangles, mesh->index, mesh->svectors, mesh->tvectors, mesh->normals, mesh->str, relativelightorigin, relativeeyeorigin, lightradius, lightcolor, t->skin.gloss, t->skin.nmap, NULL); - } - } - } - } + leaf->firstleafface[i]->markframe = markframe; + R_Q3BSP_DrawFace(ent, leaf->firstleafface[i]); } } } } + + +void R_Q3BSP_Draw(entity_render_t *ent) +{ + int i; + q3mface_t *face; + vec3_t modelorg; + model_t *model; + qbyte *pvs; + static int markframe = 0; + R_Mesh_Matrix(&ent->matrix); + model = ent->model; + if (r_drawcollisionbrushes.integer < 2) + { + if (ent == &cl_entities[0].render) + { + Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg); + pvs = model->brush.GetPVS(model, modelorg); + R_Q3BSP_RecursiveWorldNode(ent, model->brushq3.data_nodes, modelorg, pvs, ++markframe); + } + else + for (i = 0, face = model->brushq3.data_thismodel->firstface;i < model->brushq3.data_thismodel->numfaces;i++, face++) + R_Q3BSP_DrawFace(ent, face); + } + if (r_drawcollisionbrushes.integer >= 1) + { + rmeshstate_t m; + memset(&m, 0, sizeof(m)); + GL_BlendFunc(GL_SRC_ALPHA, GL_ONE); + GL_DepthMask(false); + GL_DepthTest(true); + R_Mesh_State_Texture(&m); + for (i = 0;i < model->brushq3.data_thismodel->numbrushes;i++) + if (model->brushq3.data_thismodel->firstbrush[i].colbrushf && model->brushq3.data_thismodel->firstbrush[i].colbrushf->numtriangles) + R_DrawCollisionBrush(model->brushq3.data_thismodel->firstbrush[i].colbrushf); + } +} + +/* +void R_Q3BSP_DrawFakeShadow(entity_render_t *ent) +{ +} +*/ + +/* +void R_Q3BSP_DrawShadowVolume(entity_render_t *ent, vec3_t relativelightorigin, float lightradius) +{ +} +*/ + +/* +void R_Q3BSP_DrawLight(entity_render_t *ent, vec3_t relativelightorigin, vec3_t relativeeyeorigin, float lightradius, float *lightcolor, const matrix4x4_t *matrix_modeltofilter, const matrix4x4_t *matrix_modeltoattenuationxyz, const matrix4x4_t *matrix_modeltoattenuationz) +{ +} +*/ + static void gl_surf_start(void) { }