X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=gl_rsurf.c;h=94622dc05d6154f9f84b8b0c9951739d9d7d923d;hb=e61e64e24dc955e55dee4b26ffa4ea1e6fbe7701;hp=5eb98d3154ce6478af05ab71d8e6bc9307bc9b15;hpb=0cb12de96251928cc78a3c68dfafc79391bb3daa;p=xonotic%2Fdarkplaces.git diff --git a/gl_rsurf.c b/gl_rsurf.c index 5eb98d31..94622dc0 100644 --- a/gl_rsurf.c +++ b/gl_rsurf.c @@ -234,7 +234,7 @@ static void R_BuildLightMap (const entity_render_t *ent, msurface_t *surf) { if (!r_floatbuildlightmap.integer) { - int smax, tmax, i, j, size, size3, shift, maps, stride, l; + int smax, tmax, i, j, size, size3, maps, stride, l; unsigned int *bl, scale; qbyte *lightmap, *out, *stain; @@ -286,8 +286,10 @@ static void R_BuildLightMap (const entity_render_t *ent, msurface_t *surf) stain = surf->stainsamples; bl = intblocklights; out = templight; - // deal with lightmap brightness scale - shift = 7 + r_lightmapscalebit + 8; + // the >> 16 shift adjusts down 8 bits to account for the stainmap + // scaling, and remaps the 0-65536 (2x overbright) to 0-256, it will + // be doubled during rendering to achieve 2x overbright + // (0 = 0.0, 128 = 1.0, 256 = 2.0) if (ent->model->brushq1.lightmaprgba) { stride = (surf->lightmaptexturestride - smax) * 4; @@ -295,9 +297,9 @@ static void R_BuildLightMap (const entity_render_t *ent, msurface_t *surf) { for (j = 0;j < smax;j++) { - l = (*bl++ * *stain++) >> shift;*out++ = min(l, 255); - l = (*bl++ * *stain++) >> shift;*out++ = min(l, 255); - l = (*bl++ * *stain++) >> shift;*out++ = min(l, 255); + l = (*bl++ * *stain++) >> 16;*out++ = min(l, 255); + l = (*bl++ * *stain++) >> 16;*out++ = min(l, 255); + l = (*bl++ * *stain++) >> 16;*out++ = min(l, 255); *out++ = 255; } } @@ -309,9 +311,9 @@ static void R_BuildLightMap (const entity_render_t *ent, msurface_t *surf) { for (j = 0;j < smax;j++) { - l = (*bl++ * *stain++) >> shift;*out++ = min(l, 255); - l = (*bl++ * *stain++) >> shift;*out++ = min(l, 255); - l = (*bl++ * *stain++) >> shift;*out++ = min(l, 255); + l = (*bl++ * *stain++) >> 16;*out++ = min(l, 255); + l = (*bl++ * *stain++) >> 16;*out++ = min(l, 255); + l = (*bl++ * *stain++) >> 16;*out++ = min(l, 255); } } } @@ -368,8 +370,11 @@ static void R_BuildLightMap (const entity_render_t *ent, msurface_t *surf) stain = surf->stainsamples; bl = floatblocklights; out = templight; - // deal with lightmap brightness scale - scale = 1.0f / (1 << (7 + r_lightmapscalebit + 8)); + // this scaling adjusts down 8 bits to account for the stainmap + // scaling, and remaps the 0.0-2.0 (2x overbright) to 0-256, it will + // be doubled during rendering to achieve 2x overbright + // (0 = 0.0, 128 = 1.0, 256 = 2.0) + scale = 1.0f / (1 << 16); if (ent->model->brushq1.lightmaprgba) { stride = (surf->lightmaptexturestride - smax) * 4; @@ -700,31 +705,9 @@ static int RSurf_LightSeparate_Vertex3f_Color4f(const matrix4x4_t *matrix, const return lit; } -// 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; - const rdlight_t *rd; - vec3_t lightorigin; - 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, v = mesh->vertex3f;i < mesh->numverts;i++, v += 3) - if (VectorDistance2(v, lightorigin) < rd->cullradius2) - return true; - } - } - return false; -} - static void RSurfShader_Sky(const entity_render_t *ent, const texture_t *texture, msurface_t **surfchain) { const msurface_t *surf; - const surfmesh_t *mesh; rmeshstate_t m; // LordHavoc: HalfLife maps have freaky skypolys... @@ -764,11 +747,8 @@ static void RSurfShader_Sky(const entity_render_t *ent, const texture_t *texture { if (surf->visframe == r_framecount) { - for (mesh = surf->mesh;mesh;mesh = mesh->chain) - { - GL_VertexPointer(mesh->vertex3f); - R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->element3i); - } + GL_VertexPointer(surf->mesh.data_vertex3f); + R_Mesh_Draw(surf->mesh.num_vertices, surf->mesh.num_triangles, surf->mesh.data_element3i); } } qglColorMask(1,1,1,1); @@ -778,8 +758,6 @@ static void RSurfShader_Water_Callback(const void *calldata1, int calldata2) { const entity_render_t *ent = calldata1; const msurface_t *surf = ent->model->brushq1.surfaces + calldata2; - float colorscale; - const surfmesh_t *mesh; rmeshstate_t m; float alpha; float modelorg[3]; @@ -787,20 +765,22 @@ static void RSurfShader_Water_Callback(const void *calldata1, int calldata2) matrix4x4_t tempmatrix; float args[4] = {0.05f,0,0,0.04f}; - if (r_waterscroll.value) + if (gl_textureshader && r_watershader.value && !fogenabled) + { + 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(1, &tempmatrix); + Matrix4x4_CreateFromQuakeEntity(&tempmatrix, 0, 0, 0, 0, 0, 0, r_watershader.value); + R_Mesh_TextureMatrix(0, &tempmatrix); + } + else 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); - if (gl_textureshader && r_watershader.integer) - { - R_Mesh_TextureMatrix(1, &tempmatrix); - 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); + Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg); memset(&m, 0, sizeof(m)); texture = surf->texinfo->texture->currentframe; @@ -820,25 +800,19 @@ static void RSurfShader_Water_Callback(const void *calldata1, int calldata2) GL_BlendFunc(GL_ONE, GL_ZERO); GL_DepthMask(true); } - if (gl_textureshader && r_watershader.integer) + if (gl_textureshader && r_watershader.value && !fogenabled) { - m.tex[0] = R_GetTexture(mod_shared_distorttexture); + m.tex[0] = R_GetTexture(mod_shared_distorttexture[(int)(cl.time * 16)&63]); m.tex[1] = R_GetTexture(texture->skin.base); } else m.tex[0] = R_GetTexture(texture->skin.base); - colorscale = 1; - if (gl_combine.integer) - { - m.texrgbscale[0] = 4; - colorscale *= 0.25f; - } GL_DepthTest(true); if (fogenabled) GL_ColorPointer(varray_color4f); else GL_Color(1, 1, 1, alpha); - if (gl_textureshader && r_watershader.integer) + if (gl_textureshader && r_watershader.value && !fogenabled) { GL_ActiveTexture (0); qglTexEnvi (GL_TEXTURE_SHADER_NV, GL_SHADER_OPERATION_NV, GL_TEXTURE_2D); @@ -849,21 +823,20 @@ static void RSurfShader_Water_Callback(const void *calldata1, int calldata2) qglTexEnvfv (GL_TEXTURE_SHADER_NV, GL_OFFSET_TEXTURE_MATRIX_NV, &args[0]); qglEnable (GL_TEXTURE_SHADER_NV); } - for (mesh = surf->mesh;mesh;mesh = mesh->chain) + + GL_VertexPointer(surf->mesh.data_vertex3f); + m.pointer_texcoord[0] = surf->mesh.data_texcoordtexture2f; + m.pointer_texcoord[1] = surf->mesh.data_texcoordtexture2f; + m.texcombinergb[1] = GL_REPLACE; + R_Mesh_State_Texture(&m); + if (fogenabled) { - GL_VertexPointer(mesh->vertex3f); - m.pointer_texcoord[0] = mesh->texcoordtexture2f; - m.pointer_texcoord[1] = mesh->texcoordtexture2f; - m.texcombinergb[1] = GL_REPLACE; - R_Mesh_State_Texture(&m); - if (fogenabled) - { - R_FillColors(varray_color4f, mesh->numverts, 1, 1, 1, alpha); - RSurf_FogColors_Vertex3f_Color4f(mesh->vertex3f, varray_color4f, colorscale, mesh->numverts, modelorg); - } - R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->element3i); + R_FillColors(varray_color4f, surf->mesh.num_vertices, 1, 1, 1, alpha); + RSurf_FogColors_Vertex3f_Color4f(surf->mesh.data_vertex3f, varray_color4f, 1, surf->mesh.num_vertices, modelorg); } - if (gl_textureshader && r_watershader.integer) + R_Mesh_Draw(surf->mesh.num_vertices, surf->mesh.num_triangles, surf->mesh.data_element3i); + + if (gl_textureshader && r_watershader.value && !fogenabled) { qglDisable (GL_TEXTURE_SHADER_NV); GL_ActiveTexture (0); @@ -876,18 +849,15 @@ static void RSurfShader_Water_Callback(const void *calldata1, int calldata2) GL_DepthMask(false); GL_DepthTest(true); m.tex[0] = R_GetTexture(texture->skin.fog); - for (mesh = surf->mesh;mesh;mesh = mesh->chain) - { - 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, 1, mesh->numverts, modelorg); - R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->element3i); - } + GL_VertexPointer(surf->mesh.data_vertex3f); + m.pointer_texcoord[0] = surf->mesh.data_texcoordtexture2f; + GL_ColorPointer(varray_color4f); + R_Mesh_State_Texture(&m); + RSurf_FogPassColors_Vertex3f_Color4f(surf->mesh.data_vertex3f, varray_color4f, fogcolor[0], fogcolor[1], fogcolor[2], alpha, 1, surf->mesh.num_vertices, modelorg); + R_Mesh_Draw(surf->mesh.num_vertices, surf->mesh.num_triangles, surf->mesh.data_element3i); } - if (r_waterscroll.value) + if ((gl_textureshader && r_watershader.value && !fogenabled) || r_waterscroll.value) { Matrix4x4_CreateIdentity(&tempmatrix); R_Mesh_TextureMatrix(0, &tempmatrix); @@ -920,10 +890,9 @@ static void RSurfShader_Water(const entity_render_t *ent, const texture_t *textu static void RSurfShader_Wall_Pass_BaseVertex(const entity_render_t *ent, const msurface_t *surf, const texture_t *texture, int rendertype, float currentalpha) { float base, colorscale; - const surfmesh_t *mesh; rmeshstate_t m; float modelorg[3]; - Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg); + Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg); memset(&m, 0, sizeof(m)); if (rendertype == SURFRENDER_ADD) { @@ -950,89 +919,77 @@ static void RSurfShader_Wall_Pass_BaseVertex(const entity_render_t *ent, const m base = ent->effects & EF_FULLBRIGHT ? 2.0f : r_ambient.value * (1.0f / 64.0f); GL_DepthTest(true); GL_ColorPointer(varray_color4f); - for (mesh = surf->mesh;mesh;mesh = mesh->chain) + + GL_VertexPointer(surf->mesh.data_vertex3f); + m.pointer_texcoord[0] = surf->mesh.data_texcoordtexture2f; + R_Mesh_State_Texture(&m); + R_FillColors(varray_color4f, surf->mesh.num_vertices, base, base, base, currentalpha); + if (!(ent->effects & EF_FULLBRIGHT)) { - 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_Vertex3f_Color4f(&ent->inversematrix, surf->dlightbits, mesh->numverts, mesh->vertex3f, varray_color4f, 1); - if (surf->flags & SURF_LIGHTMAP) - 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_Vertex3f_Color4f(mesh->vertex3f, varray_color4f, colorscale, mesh->numverts, modelorg); - R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->element3i); + if (surf->dlightframe == r_framecount) + RSurf_LightSeparate_Vertex3f_Color4f(&ent->inversematrix, surf->dlightbits, surf->mesh.num_vertices, surf->mesh.data_vertex3f, varray_color4f, 1); + if (surf->flags & SURF_LIGHTMAP) + RSurf_AddLightmapToVertexColors_Color4f(surf->mesh.data_lightmapoffsets, varray_color4f,surf->mesh.num_vertices, surf->samples, ((surf->extents[0]>>4)+1)*((surf->extents[1]>>4)+1)*3, surf->styles); } + RSurf_FogColors_Vertex3f_Color4f(surf->mesh.data_vertex3f, varray_color4f, colorscale, surf->mesh.num_vertices, modelorg); + R_Mesh_Draw(surf->mesh.num_vertices, surf->mesh.num_triangles, surf->mesh.data_element3i); } static void RSurfShader_Wall_Pass_Glow(const entity_render_t *ent, const msurface_t *surf, const texture_t *texture, int rendertype, float currentalpha) { - const surfmesh_t *mesh; rmeshstate_t m; float modelorg[3]; - Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg); + Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg); memset(&m, 0, sizeof(m)); GL_BlendFunc(GL_SRC_ALPHA, GL_ONE); GL_DepthMask(false); GL_DepthTest(true); m.tex[0] = R_GetTexture(texture->skin.glow); GL_ColorPointer(varray_color4f); - for (mesh = surf->mesh;mesh;mesh = mesh->chain) - { - 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, 1, mesh->numverts, modelorg); - R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->element3i); - } + + GL_VertexPointer(surf->mesh.data_vertex3f); + if (m.tex[0]) + m.pointer_texcoord[0] = surf->mesh.data_texcoordtexture2f; + R_Mesh_State_Texture(&m); + RSurf_FoggedColors_Vertex3f_Color4f(surf->mesh.data_vertex3f, varray_color4f, 1, 1, 1, currentalpha, 1, surf->mesh.num_vertices, modelorg); + R_Mesh_Draw(surf->mesh.num_vertices, surf->mesh.num_triangles, surf->mesh.data_element3i); } static void RSurfShader_Wall_Pass_Fog(const entity_render_t *ent, const msurface_t *surf, const texture_t *texture, int rendertype, float currentalpha) { - const surfmesh_t *mesh; rmeshstate_t m; float modelorg[3]; - Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg); + Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg); memset(&m, 0, sizeof(m)); GL_BlendFunc(GL_SRC_ALPHA, GL_ONE); GL_DepthMask(false); GL_DepthTest(true); m.tex[0] = R_GetTexture(texture->skin.fog); GL_ColorPointer(varray_color4f); - for (mesh = surf->mesh;mesh;mesh = mesh->chain) - { - GL_VertexPointer(mesh->vertex3f); - if (m.tex[0]) - 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, 1, mesh->numverts, modelorg); - R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->element3i); - } + + GL_VertexPointer(surf->mesh.data_vertex3f); + if (m.tex[0]) + m.pointer_texcoord[0] = surf->mesh.data_texcoordtexture2f; + R_Mesh_State_Texture(&m); + RSurf_FogPassColors_Vertex3f_Color4f(surf->mesh.data_vertex3f, varray_color4f, fogcolor[0], fogcolor[1], fogcolor[2], currentalpha, 1, surf->mesh.num_vertices, modelorg); + R_Mesh_Draw(surf->mesh.num_vertices, surf->mesh.num_triangles, surf->mesh.data_element3i); } static void RSurfShader_OpaqueWall_Pass_BaseTripleTexCombine(const entity_render_t *ent, const texture_t *texture, msurface_t **surfchain) { const msurface_t *surf; - const surfmesh_t *mesh; rmeshstate_t m; int lightmaptexturenum; - float cl; memset(&m, 0, sizeof(m)); 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.texrgbscale[1] = 2; m.tex[2] = R_GetTexture(texture->skin.detail); - m.texrgbscale[0] = 1; - m.texrgbscale[1] = 4; m.texrgbscale[2] = 2; - cl = (float) (1 << r_lightmapscalebit); - GL_Color(cl, cl, cl, 1); + GL_Color(1, 1, 1, 1); while((surf = *surfchain++) != NULL) { @@ -1044,23 +1001,19 @@ static void RSurfShader_OpaqueWall_Pass_BaseTripleTexCombine(const entity_render m.tex[1] = lightmaptexturenum; // R_Mesh_State_Texture(&m); //} - for (mesh = surf->mesh;mesh;mesh = mesh->chain) - { - 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); - } + GL_VertexPointer(surf->mesh.data_vertex3f); + m.pointer_texcoord[0] = surf->mesh.data_texcoordtexture2f; + m.pointer_texcoord[1] = surf->mesh.data_texcoordlightmap2f; + m.pointer_texcoord[2] = surf->mesh.data_texcoorddetail2f; + R_Mesh_State_Texture(&m); + R_Mesh_Draw(surf->mesh.num_vertices, surf->mesh.num_triangles, surf->mesh.data_element3i); } } } -static void RSurfShader_OpaqueWall_Pass_BaseDoubleTex(const entity_render_t *ent, const texture_t *texture, msurface_t **surfchain) +static void RSurfShader_OpaqueWall_Pass_BaseDoubleTexCombine(const entity_render_t *ent, const texture_t *texture, msurface_t **surfchain) { const msurface_t *surf; - const surfmesh_t *mesh; rmeshstate_t m; int lightmaptexturenum; memset(&m, 0, sizeof(m)); @@ -1069,8 +1022,7 @@ static void RSurfShader_OpaqueWall_Pass_BaseDoubleTex(const entity_render_t *ent 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; + m.texrgbscale[1] = 2; GL_Color(1, 1, 1, 1); while((surf = *surfchain++) != NULL) { @@ -1082,14 +1034,11 @@ static void RSurfShader_OpaqueWall_Pass_BaseDoubleTex(const entity_render_t *ent m.tex[1] = lightmaptexturenum; // R_Mesh_State_Texture(&m); //} - for (mesh = surf->mesh;mesh;mesh = mesh->chain) - { - 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); - } + GL_VertexPointer(surf->mesh.data_vertex3f); + m.pointer_texcoord[0] = surf->mesh.data_texcoordtexture2f; + m.pointer_texcoord[1] = surf->mesh.data_texcoordlightmap2f; + R_Mesh_State_Texture(&m); + R_Mesh_Draw(surf->mesh.num_vertices, surf->mesh.num_triangles, surf->mesh.data_element3i); } } } @@ -1097,7 +1046,6 @@ static void RSurfShader_OpaqueWall_Pass_BaseDoubleTex(const entity_render_t *ent static void RSurfShader_OpaqueWall_Pass_BaseTexture(const entity_render_t *ent, const texture_t *texture, msurface_t **surfchain) { const msurface_t *surf; - const surfmesh_t *mesh; rmeshstate_t m; memset(&m, 0, sizeof(m)); GL_DepthMask(true); @@ -1109,13 +1057,10 @@ static void RSurfShader_OpaqueWall_Pass_BaseTexture(const entity_render_t *ent, { if (surf->visframe == r_framecount) { - for (mesh = surf->mesh;mesh;mesh = mesh->chain) - { - GL_VertexPointer(mesh->vertex3f); - m.pointer_texcoord[0] = mesh->texcoordtexture2f; - R_Mesh_State_Texture(&m); - R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->element3i); - } + GL_VertexPointer(surf->mesh.data_vertex3f); + m.pointer_texcoord[0] = surf->mesh.data_texcoordtexture2f; + R_Mesh_State_Texture(&m); + R_Mesh_Draw(surf->mesh.num_vertices, surf->mesh.num_triangles, surf->mesh.data_element3i); } } } @@ -1123,16 +1068,13 @@ static void RSurfShader_OpaqueWall_Pass_BaseTexture(const entity_render_t *ent, static void RSurfShader_OpaqueWall_Pass_BaseLightmap(const entity_render_t *ent, const texture_t *texture, msurface_t **surfchain) { const msurface_t *surf; - const surfmesh_t *mesh; rmeshstate_t m; int lightmaptexturenum; memset(&m, 0, sizeof(m)); - GL_BlendFunc(GL_ZERO, GL_SRC_COLOR); + GL_BlendFunc(GL_DST_COLOR, GL_SRC_COLOR); GL_DepthMask(false); GL_DepthTest(true); m.tex[0] = R_GetTexture((**surfchain).lightmaptexture); - if (gl_combine.integer) - m.texrgbscale[0] = 4; GL_Color(1, 1, 1, 1); while((surf = *surfchain++) != NULL) { @@ -1144,13 +1086,10 @@ static void RSurfShader_OpaqueWall_Pass_BaseLightmap(const entity_render_t *ent, m.tex[0] = lightmaptexturenum; // R_Mesh_State_Texture(&m); //} - for (mesh = surf->mesh;mesh;mesh = mesh->chain) - { - GL_VertexPointer(mesh->vertex3f); - m.pointer_texcoord[0] = mesh->texcoordlightmap2f; - R_Mesh_State_Texture(&m); - R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->element3i); - } + GL_VertexPointer(surf->mesh.data_vertex3f); + m.pointer_texcoord[0] = surf->mesh.data_texcoordlightmap2f; + R_Mesh_State_Texture(&m); + R_Mesh_Draw(surf->mesh.num_vertices, surf->mesh.num_triangles, surf->mesh.data_element3i); } } } @@ -1158,10 +1097,9 @@ static void RSurfShader_OpaqueWall_Pass_BaseLightmap(const entity_render_t *ent, static void RSurfShader_OpaqueWall_Pass_Fog(const entity_render_t *ent, const texture_t *texture, msurface_t **surfchain) { const msurface_t *surf; - const surfmesh_t *mesh; rmeshstate_t m; float modelorg[3]; - Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg); + Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg); memset(&m, 0, sizeof(m)); GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); GL_DepthMask(false); @@ -1171,15 +1109,12 @@ static void RSurfShader_OpaqueWall_Pass_Fog(const entity_render_t *ent, const te { if (surf->visframe == r_framecount) { - for (mesh = surf->mesh;mesh;mesh = mesh->chain) - { - GL_VertexPointer(mesh->vertex3f); - if (m.tex[0]) - 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, 1, mesh->numverts, modelorg); - R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->element3i); - } + GL_VertexPointer(surf->mesh.data_vertex3f); + if (m.tex[0]) + m.pointer_texcoord[0] = surf->mesh.data_texcoordtexture2f; + R_Mesh_State_Texture(&m); + RSurf_FogPassColors_Vertex3f_Color4f(surf->mesh.data_vertex3f, varray_color4f, fogcolor[0], fogcolor[1], fogcolor[2], 1, 1, surf->mesh.num_vertices, modelorg); + R_Mesh_Draw(surf->mesh.num_vertices, surf->mesh.num_triangles, surf->mesh.data_element3i); } } } @@ -1187,7 +1122,6 @@ static void RSurfShader_OpaqueWall_Pass_Fog(const entity_render_t *ent, const te static void RSurfShader_OpaqueWall_Pass_BaseDetail(const entity_render_t *ent, const texture_t *texture, msurface_t **surfchain) { const msurface_t *surf; - const surfmesh_t *mesh; rmeshstate_t m; memset(&m, 0, sizeof(m)); GL_BlendFunc(GL_DST_COLOR, GL_SRC_COLOR); @@ -1199,13 +1133,10 @@ static void RSurfShader_OpaqueWall_Pass_BaseDetail(const entity_render_t *ent, c { if (surf->visframe == r_framecount) { - for (mesh = surf->mesh;mesh;mesh = mesh->chain) - { - GL_VertexPointer(mesh->vertex3f); - m.pointer_texcoord[0] = mesh->texcoorddetail2f; - R_Mesh_State_Texture(&m); - R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->element3i); - } + GL_VertexPointer(surf->mesh.data_vertex3f); + m.pointer_texcoord[0] = surf->mesh.data_texcoorddetail2f; + R_Mesh_State_Texture(&m); + R_Mesh_Draw(surf->mesh.num_vertices, surf->mesh.num_triangles, surf->mesh.data_element3i); } } } @@ -1213,7 +1144,6 @@ static void RSurfShader_OpaqueWall_Pass_BaseDetail(const entity_render_t *ent, c static void RSurfShader_OpaqueWall_Pass_Glow(const entity_render_t *ent, const texture_t *texture, msurface_t **surfchain) { const msurface_t *surf; - const surfmesh_t *mesh; rmeshstate_t m; memset(&m, 0, sizeof(m)); GL_BlendFunc(GL_SRC_ALPHA, GL_ONE); @@ -1225,13 +1155,10 @@ static void RSurfShader_OpaqueWall_Pass_Glow(const entity_render_t *ent, const t { if (surf->visframe == r_framecount) { - for (mesh = surf->mesh;mesh;mesh = mesh->chain) - { - GL_VertexPointer(mesh->vertex3f); - m.pointer_texcoord[0] = mesh->texcoordtexture2f; - R_Mesh_State_Texture(&m); - R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->element3i); - } + GL_VertexPointer(surf->mesh.data_vertex3f); + m.pointer_texcoord[0] = surf->mesh.data_texcoordtexture2f; + R_Mesh_State_Texture(&m); + R_Mesh_Draw(surf->mesh.num_vertices, surf->mesh.num_triangles, surf->mesh.data_element3i); } } } @@ -1239,7 +1166,6 @@ static void RSurfShader_OpaqueWall_Pass_Glow(const entity_render_t *ent, const t static void RSurfShader_OpaqueWall_Pass_OpaqueGlow(const entity_render_t *ent, const texture_t *texture, msurface_t **surfchain) { const msurface_t *surf; - const surfmesh_t *mesh; rmeshstate_t m; memset(&m, 0, sizeof(m)); GL_BlendFunc(GL_SRC_ALPHA, GL_ZERO); @@ -1253,13 +1179,10 @@ static void RSurfShader_OpaqueWall_Pass_OpaqueGlow(const entity_render_t *ent, c { if (surf->visframe == r_framecount) { - for (mesh = surf->mesh;mesh;mesh = mesh->chain) - { - GL_VertexPointer(mesh->vertex3f); - m.pointer_texcoord[0] = mesh->texcoordtexture2f; - R_Mesh_State_Texture(&m); - R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->element3i); - } + GL_VertexPointer(surf->mesh.data_vertex3f); + m.pointer_texcoord[0] = surf->mesh.data_texcoordtexture2f; + R_Mesh_State_Texture(&m); + R_Mesh_Draw(surf->mesh.num_vertices, surf->mesh.num_triangles, surf->mesh.data_element3i); } } } @@ -1320,12 +1243,22 @@ static void RSurfShader_Wall_Lightmap(const entity_render_t *ent, const texture_ { // opaque lightmapped if (r_textureunits.integer >= 3 && gl_combine.integer && r_detailtextures.integer) + { RSurfShader_OpaqueWall_Pass_BaseTripleTexCombine(ent, texture, surfchain); - else if (r_textureunits.integer >= 2) + if (texture->skin.glow) + RSurfShader_OpaqueWall_Pass_Glow(ent, texture, surfchain); + if (fogenabled) + RSurfShader_OpaqueWall_Pass_Fog(ent, texture, surfchain); + } + else if (r_textureunits.integer >= 2 && gl_combine.integer) { - RSurfShader_OpaqueWall_Pass_BaseDoubleTex(ent, texture, surfchain); + RSurfShader_OpaqueWall_Pass_BaseDoubleTexCombine(ent, texture, surfchain); if (r_detailtextures.integer) RSurfShader_OpaqueWall_Pass_BaseDetail(ent, texture, surfchain); + if (texture->skin.glow) + RSurfShader_OpaqueWall_Pass_Glow(ent, texture, surfchain); + if (fogenabled) + RSurfShader_OpaqueWall_Pass_Fog(ent, texture, surfchain); } else { @@ -1333,11 +1266,11 @@ static void RSurfShader_Wall_Lightmap(const entity_render_t *ent, const texture_ RSurfShader_OpaqueWall_Pass_BaseLightmap(ent, texture, surfchain); if (r_detailtextures.integer) RSurfShader_OpaqueWall_Pass_BaseDetail(ent, texture, surfchain); + if (texture->skin.glow) + RSurfShader_OpaqueWall_Pass_Glow(ent, texture, surfchain); + if (fogenabled) + RSurfShader_OpaqueWall_Pass_Fog(ent, texture, surfchain); } - if (texture->skin.glow) - RSurfShader_OpaqueWall_Pass_Glow(ent, texture, surfchain); - if (fogenabled) - RSurfShader_OpaqueWall_Pass_Fog(ent, texture, surfchain); } } @@ -1393,7 +1326,7 @@ void R_PrepareSurfaces(entity_render_t *ent) return; model = ent->model; - Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg); + Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg); numsurfaces = model->brushq1.nummodelsurfaces; surfaces = model->brushq1.surfaces + model->brushq1.firstmodelsurface; surfacevisframes = model->brushq1.surfacevisframes + model->brushq1.firstmodelsurface; @@ -1403,10 +1336,9 @@ void R_PrepareSurfaces(entity_render_t *ent) if (r_dynamic.integer && !r_shadow_realtime_dlight.integer) R_MarkLights(ent); - if (model->brushq1.light_ambient != r_ambient.value || model->brushq1.light_scalebit != r_lightmapscalebit) + if (model->brushq1.light_ambient != r_ambient.value) { 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; } @@ -1484,7 +1416,7 @@ static void R_DrawPortal_Callback(const void *calldata1, int calldata2) ((i & 0x0038) >> 3) * (1.0f / 7.0f), ((i & 0x01C0) >> 6) * (1.0f / 7.0f), 0.125f); - if (PlaneDiff(r_origin, (&portal->plane)) < 0) + if (PlaneDiff(r_vieworigin, (&portal->plane)) < 0) { for (i = portal->numpoints - 1, v = varray_vertex3f;i >= 0;i--, v += 3) VectorCopy(portal->points[i].position, v); @@ -1533,7 +1465,7 @@ void R_PrepareBrushModel(entity_render_t *ent) if (model == NULL) return; #if WORLDNODECULLBACKFACES - Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg); + Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg); #endif numsurfaces = model->brushq1.nummodelsurfaces; surf = model->brushq1.surfaces + model->brushq1.firstmodelsurface; @@ -1572,7 +1504,7 @@ void R_SurfaceWorldNode (entity_render_t *ent) return; surfacevisframes = model->brushq1.surfacevisframes + model->brushq1.firstmodelsurface; surfacepvsframes = model->brushq1.surfacepvsframes + model->brushq1.firstmodelsurface; - Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg); + Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg); for (leaf = model->brushq1.pvsleafchain;leaf;leaf = leaf->pvschain) { @@ -1624,7 +1556,7 @@ static void R_PortalWorldNode(entity_render_t *ent, mleaf_t *viewleaf) // RecursiveWorldNode surfaces = ent->model->brushq1.surfaces; surfacevisframes = ent->model->brushq1.surfacevisframes; - Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg); + Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg); viewleaf->worldnodeframe = r_framecount; leafstack[0] = viewleaf; leafstackpos = 1; @@ -1720,7 +1652,7 @@ void R_WorldVisibility(entity_render_t *ent) vec3_t modelorg; mleaf_t *viewleaf; - Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg); + Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg); viewleaf = (ent->model && ent->model->brushq1.PointInLeaf) ? ent->model->brushq1.PointInLeaf(ent->model, modelorg) : NULL; R_PVSUpdate(ent, viewleaf); @@ -1737,8 +1669,13 @@ void R_DrawWorld(entity_render_t *ent) { if (ent->model == NULL) return; - if (!ent->model->brushq1.numleafs && ent->model->Draw) - ent->model->Draw(ent); + if (!ent->model->brushq1.numleafs) + { + if (ent->model->DrawSky) + ent->model->DrawSky(ent); + if (ent->model->Draw) + ent->model->Draw(ent); + } else { R_PrepareSurfaces(ent); @@ -1773,7 +1710,6 @@ void R_Model_Brush_DrawShadowVolume (entity_render_t *ent, vec3_t relativelighto int i; msurface_t *surf; float projectdistance, f, temp[3], lightradius2; - surfmesh_t *mesh; if (ent->model == NULL) return; R_Mesh_Matrix(&ent->matrix); @@ -1794,36 +1730,7 @@ 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_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, const matrix4x4_t *matrix_modeltofilter, const matrix4x4_t *matrix_modeltoattenuationxyz, const matrix4x4_t *matrix_modeltoattenuationz) -{ - int surfnum; - msurface_t *surf; - texture_t *t; - surfmesh_t *mesh; - if (ent->model == NULL) - return; - R_Mesh_Matrix(&ent->matrix); - R_UpdateTextureInfo(ent); - for (surfnum = 0;surfnum < numsurfaces;surfnum++) - { - surf = surflist[surfnum]; - if (surf->visframe == r_framecount) - { - t = surf->texinfo->texture->currentframe; - if (t->rendertype == SURFRENDER_OPAQUE && t->flags & SURF_SHADOWLIGHT) - { - for (mesh = surf->mesh;mesh;mesh = mesh->chain) - { - 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); - } + R_Shadow_Volume(surf->mesh.num_vertices, surf->mesh.num_triangles, surf->mesh.data_vertex3f, surf->mesh.data_element3i, surf->mesh.data_neighbor3i, relativelightorigin, lightradius, projectdistance); } } } @@ -1835,7 +1742,6 @@ void R_Model_Brush_DrawLight(entity_render_t *ent, vec3_t relativelightorigin, v msurface_t *surf; texture_t *t; float f, lightmins[3], lightmaxs[3]; - surfmesh_t *mesh; if (ent->model == NULL) return; R_Mesh_Matrix(&ent->matrix); @@ -1858,11 +1764,8 @@ void R_Model_Brush_DrawLight(entity_render_t *ent, vec3_t relativelightorigin, v t = surf->texinfo->texture->currentframe; if (t->rendertype == SURFRENDER_OPAQUE && t->flags & SURF_SHADOWLIGHT) { - for (mesh = surf->mesh;mesh;mesh = mesh->chain) - { - 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); - } + R_Shadow_DiffuseLighting(surf->mesh.num_vertices, surf->mesh.num_triangles, surf->mesh.data_element3i, surf->mesh.data_vertex3f, surf->mesh.data_svector3f, surf->mesh.data_tvector3f, surf->mesh.data_normal3f, surf->mesh.data_texcoordtexture2f, relativelightorigin, lightradius, lightcolor, matrix_modeltofilter, matrix_modeltoattenuationxyz, matrix_modeltoattenuationz, t->skin.base, t->skin.nmap, NULL); + R_Shadow_SpecularLighting(surf->mesh.num_vertices, surf->mesh.num_triangles, surf->mesh.data_element3i, surf->mesh.data_vertex3f, surf->mesh.data_svector3f, surf->mesh.data_tvector3f, surf->mesh.data_normal3f, surf->mesh.data_texcoordtexture2f, relativelightorigin, relativeeyeorigin, lightradius, lightcolor, matrix_modeltofilter, matrix_modeltoattenuationxyz, matrix_modeltoattenuationz, t->skin.gloss, t->skin.nmap, NULL); } } } @@ -1878,88 +1781,296 @@ void R_DrawCollisionBrush(colbrushf_t *brush) R_Mesh_Draw(brush->numpoints, brush->numtriangles, brush->elements); } -void R_Q3BSP_DrawFace(entity_render_t *ent, q3mface_t *face) +void R_Q3BSP_DrawSkyFace(entity_render_t *ent, q3mface_t *face) { rmeshstate_t m; - if (!face->numtriangles) + if (!face->num_triangles) return; - if (face->texture->renderflags) + if (skyrendernow) { - if (face->texture->renderflags & Q3MTEXTURERENDERFLAGS_SKY) - { - if (skyrendernow) - { - skyrendernow = false; - if (skyrendermasked) - R_Sky(); - } + skyrendernow = false; + if (skyrendermasked) + R_Sky(); + } - R_Mesh_Matrix(&ent->matrix); + R_Mesh_Matrix(&ent->matrix); - GL_Color(fogcolor[0], fogcolor[1], fogcolor[2], 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... - GL_BlendFunc(GL_ZERO, GL_ONE); - } - else - { - // fog sky - GL_BlendFunc(GL_ONE, GL_ZERO); - } - GL_DepthMask(true); - GL_DepthTest(true); + GL_Color(fogcolor[0], fogcolor[1], fogcolor[2], 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... + GL_BlendFunc(GL_ZERO, GL_ONE); + } + else + { + // fog sky + GL_BlendFunc(GL_ONE, GL_ZERO); + } + GL_DepthMask(true); + GL_DepthTest(true); - memset(&m, 0, sizeof(m)); - R_Mesh_State_Texture(&m); + memset(&m, 0, sizeof(m)); + R_Mesh_State_Texture(&m); - GL_VertexPointer(face->data_vertex3f); - R_Mesh_Draw(face->numvertices, face->numtriangles, face->data_element3i); - qglColorMask(1,1,1,1); - return; - } - if (face->texture->renderflags & Q3MTEXTURERENDERFLAGS_NODRAW) - return; + GL_VertexPointer(face->data_vertex3f); + R_Mesh_Draw(face->num_vertices, face->num_triangles, face->data_element3i); + qglColorMask(1,1,1,1); +} + +void R_Q3BSP_DrawFace_OpaqueWall_Pass_OpaqueGlow(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); + if (face->texture->skin.glow) + { + m.tex[0] = R_GetTexture(face->texture->skin.glow); + m.pointer_texcoord[0] = face->data_texcoordtexture2f; + GL_Color(1, 1, 1, 1); } - R_Mesh_Matrix(&ent->matrix); - face->visframe = r_framecount; + else + GL_Color(0, 0, 0, 1); + R_Mesh_State_Texture(&m); + GL_VertexPointer(face->data_vertex3f); + R_Mesh_Draw(face->num_vertices, face->num_triangles, face->data_element3i); +} + +void R_Q3BSP_DrawFace_OpaqueWall_Pass_TextureLightmapCombine(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(1, 1, 1, 1); + R_Mesh_State_Texture(&m); + GL_VertexPointer(face->data_vertex3f); + R_Mesh_Draw(face->num_vertices, face->num_triangles, face->data_element3i); +} + +void R_Q3BSP_DrawFace_OpaqueWall_Pass_Texture(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; + GL_Color(1, 1, 1, 1); + R_Mesh_State_Texture(&m); + GL_VertexPointer(face->data_vertex3f); + R_Mesh_Draw(face->num_vertices, face->num_triangles, face->data_element3i); +} + +void R_Q3BSP_DrawFace_OpaqueWall_Pass_Lightmap(entity_render_t *ent, q3mface_t *face) +{ + rmeshstate_t m; + memset(&m, 0, sizeof(m)); + GL_BlendFunc(GL_ONE, GL_SRC_COLOR); + GL_DepthMask(true); + GL_DepthTest(true); + m.tex[0] = R_GetTexture(face->lightmaptexture); + m.pointer_texcoord[0] = face->data_texcoordlightmap2f; + GL_Color(1, 1, 1, 1); + R_Mesh_State_Texture(&m); + GL_VertexPointer(face->data_vertex3f); + R_Mesh_Draw(face->num_vertices, face->num_triangles, face->data_element3i); +} + +void R_Q3BSP_DrawFace_OpaqueWall_Pass_Glow(entity_render_t *ent, q3mface_t *face) +{ + rmeshstate_t m; + memset(&m, 0, sizeof(m)); + GL_BlendFunc(GL_SRC_ALPHA, GL_ONE); + GL_DepthMask(true); + GL_DepthTest(true); + if (face->texture->skin.glow) { - m.tex[1] = R_GetTexture(face->lightmaptexture); - m.pointer_texcoord[1] = face->data_texcoordlightmap2f; - m.texrgbscale[1] = 2; + m.tex[0] = R_GetTexture(face->texture->skin.glow); + m.pointer_texcoord[0] = face->data_texcoordtexture2f; GL_Color(1, 1, 1, 1); } else + GL_Color(0, 0, 0, 1); + R_Mesh_State_Texture(&m); + GL_VertexPointer(face->data_vertex3f); + R_Mesh_Draw(face->num_vertices, face->num_triangles, face->data_element3i); +} + +void R_Q3BSP_DrawFace_OpaqueWall_Pass_TextureVertex(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 (gl_combine.integer) { m.texrgbscale[0] = 2; GL_ColorPointer(face->data_color4f); } + else + { + int i; + for (i = 0;i < face->num_vertices;i++) + { + varray_color4f[i*4+0] = face->data_color4f[i*4+0] * 2.0f; + varray_color4f[i*4+1] = face->data_color4f[i*4+1] * 2.0f; + varray_color4f[i*4+2] = face->data_color4f[i*4+2] * 2.0f; + varray_color4f[i*4+3] = face->data_color4f[i*4+3]; + } + GL_ColorPointer(varray_color4f); + } R_Mesh_State_Texture(&m); GL_VertexPointer(face->data_vertex3f); - R_Mesh_Draw(face->numvertices, face->numtriangles, face->data_element3i); + R_Mesh_Draw(face->num_vertices, face->num_triangles, face->data_element3i); } -/* -void R_Q3BSP_DrawSky(entity_render_t *ent) +void R_Q3BSP_DrawFace_OpaqueWall_Pass_AddTextureAmbient(entity_render_t *ent, q3mface_t *face) { + rmeshstate_t m; + memset(&m, 0, sizeof(m)); + GL_BlendFunc(GL_ONE, GL_ONE); + GL_DepthMask(true); + GL_DepthTest(true); + m.tex[0] = R_GetTexture(face->texture->skin.base); + m.pointer_texcoord[0] = face->data_texcoordtexture2f; + GL_Color(r_ambient.value * (1.0f / 128.0f), r_ambient.value * (1.0f / 128.0f), r_ambient.value * (1.0f / 128.0f), 1); + R_Mesh_State_Texture(&m); + GL_VertexPointer(face->data_vertex3f); + R_Mesh_Draw(face->num_vertices, face->num_triangles, face->data_element3i); +} + +void R_Q3BSP_DrawFace_TransparentCallback(const void *voident, int facenumber) +{ + const entity_render_t *ent = voident; + q3mface_t *face = ent->model->brushq3.data_faces + facenumber; + rmeshstate_t m; + R_Mesh_Matrix(&ent->matrix); + memset(&m, 0, sizeof(m)); + if (ent->effects & EF_ADDITIVE) + GL_BlendFunc(GL_SRC_ALPHA, GL_ONE); + else + GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + GL_DepthMask(false); + GL_DepthTest(true); + m.tex[0] = R_GetTexture(face->texture->skin.base); + m.pointer_texcoord[0] = face->data_texcoordtexture2f; + // LordHavoc: quake3 was not able to do this; lit transparent surfaces + if (gl_combine.integer) + { + m.texrgbscale[0] = 2; + if (r_textureunits.integer >= 2) + { + m.tex[1] = R_GetTexture(face->lightmaptexture); + m.pointer_texcoord[1] = face->data_texcoordlightmap2f; + GL_Color(1, 1, 1, ent->alpha); + } + else + { + if (ent->alpha == 1) + GL_ColorPointer(face->data_color4f); + else + { + int i; + for (i = 0;i < face->num_vertices;i++) + { + varray_color4f[i*4+0] = face->data_color4f[i*4+0]; + varray_color4f[i*4+1] = face->data_color4f[i*4+1]; + varray_color4f[i*4+2] = face->data_color4f[i*4+2]; + varray_color4f[i*4+3] = face->data_color4f[i*4+3] * ent->alpha; + } + GL_ColorPointer(varray_color4f); + } + } + } + else + { + int i; + for (i = 0;i < face->num_vertices;i++) + { + varray_color4f[i*4+0] = face->data_color4f[i*4+0] * 2.0f; + varray_color4f[i*4+1] = face->data_color4f[i*4+1] * 2.0f; + varray_color4f[i*4+2] = face->data_color4f[i*4+2] * 2.0f; + varray_color4f[i*4+3] = face->data_color4f[i*4+3] * ent->alpha; + } + GL_ColorPointer(varray_color4f); + } + R_Mesh_State_Texture(&m); + GL_VertexPointer(face->data_vertex3f); + qglDisable(GL_CULL_FACE); + R_Mesh_Draw(face->num_vertices, face->num_triangles, face->data_element3i); + qglEnable(GL_CULL_FACE); +} + +void R_Q3BSP_DrawFace(entity_render_t *ent, q3mface_t *face) +{ + if (!face->num_triangles) + return; + if (face->texture->surfaceparms) + { + if (face->texture->surfaceflags & (Q3SURFACEFLAG_SKY | Q3SURFACEFLAG_NODRAW)) + return; + } + face->visframe = r_framecount; + if ((face->texture->surfaceparms & Q3SURFACEPARM_TRANS) || ent->alpha < 1 || (ent->effects & EF_ADDITIVE)) + { + vec3_t facecenter, center; + facecenter[0] = (face->mins[0] + face->maxs[0]) * 0.5f; + facecenter[1] = (face->mins[1] + face->maxs[1]) * 0.5f; + facecenter[2] = (face->mins[2] + face->maxs[2]) * 0.5f; + Matrix4x4_Transform(&ent->matrix, facecenter, center); + R_MeshQueue_AddTransparent(center, R_Q3BSP_DrawFace_TransparentCallback, ent, face - ent->model->brushq3.data_faces); + return; + } + R_Mesh_Matrix(&ent->matrix); + if (r_shadow_realtime_world.integer) + R_Q3BSP_DrawFace_OpaqueWall_Pass_OpaqueGlow(ent, face); + else if ((ent->effects & EF_FULLBRIGHT) || r_fullbright.integer) + { + R_Q3BSP_DrawFace_OpaqueWall_Pass_Texture(ent, face); + if (face->texture->skin.glow) + R_Q3BSP_DrawFace_OpaqueWall_Pass_Glow(ent, face); + } + else if (face->lightmaptexture) + { + if (r_textureunits.integer >= 2 && gl_combine.integer) + R_Q3BSP_DrawFace_OpaqueWall_Pass_TextureLightmapCombine(ent, face); + else + { + R_Q3BSP_DrawFace_OpaqueWall_Pass_Texture(ent, face); + R_Q3BSP_DrawFace_OpaqueWall_Pass_Lightmap(ent, face); + } + if (face->texture->skin.glow) + R_Q3BSP_DrawFace_OpaqueWall_Pass_Glow(ent, face); + } + else + { + R_Q3BSP_DrawFace_OpaqueWall_Pass_TextureVertex(ent, face); + if (face->texture->skin.glow) + R_Q3BSP_DrawFace_OpaqueWall_Pass_Glow(ent, face); + } + if (r_ambient.value) + R_Q3BSP_DrawFace_OpaqueWall_Pass_AddTextureAmbient(ent, face); } -*/ void R_Q3BSP_RecursiveWorldNode(entity_render_t *ent, q3mnode_t *node, const vec3_t modelorg, qbyte *pvs, int markframe) { int i; q3mleaf_t *leaf; - q3mface_t *face; while (node->isnode) { if (R_CullBox(node->mins, node->maxs)) @@ -1971,22 +2082,42 @@ void R_Q3BSP_RecursiveWorldNode(entity_render_t *ent, q3mnode_t *node, const vec return; leaf = (q3mleaf_t *)node; if (pvs[leaf->clusterindex >> 3] & (1 << (leaf->clusterindex & 7))) - { for (i = 0;i < leaf->numleaffaces;i++) + leaf->firstleafface[i]->markframe = markframe; +} + +static int r_q3bsp_framecount = -1; + +void R_Q3BSP_DrawSky(entity_render_t *ent) +{ + int i; + q3mface_t *face; + vec3_t modelorg; + model_t *model; + qbyte *pvs; + R_Mesh_Matrix(&ent->matrix); + model = ent->model; + if (r_drawcollisionbrushes.integer < 2) + { + Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg); + if (ent == &cl_entities[0].render && model->brushq3.num_pvsclusters && !r_novis.integer && (pvs = model->brush.GetPVS(model, modelorg))) { - face = leaf->firstleafface[i]; - if (face->markframe != markframe) + if (r_q3bsp_framecount != r_framecount) { - face->markframe = markframe; - if (!R_CullBox(face->mins, face->maxs)) - R_Q3BSP_DrawFace(ent, face); + r_q3bsp_framecount = r_framecount; + R_Q3BSP_RecursiveWorldNode(ent, model->brushq3.data_nodes, modelorg, pvs, r_framecount); } + for (i = 0, face = model->brushq3.data_thismodel->firstface;i < model->brushq3.data_thismodel->numfaces;i++, face++) + if (face->markframe == r_framecount && (face->texture->surfaceflags & Q3SURFACEFLAG_SKY) && !R_CullBox(face->mins, face->maxs)) + R_Q3BSP_DrawSkyFace(ent, face); } + else + for (i = 0, face = model->brushq3.data_thismodel->firstface;i < model->brushq3.data_thismodel->numfaces;i++, face++) + if ((face->texture->surfaceflags & Q3SURFACEFLAG_SKY)) + R_Q3BSP_DrawSkyFace(ent, face); } } - - void R_Q3BSP_Draw(entity_render_t *ent) { int i; @@ -1994,14 +2125,22 @@ void R_Q3BSP_Draw(entity_render_t *ent) 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) { - Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg); + Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg); if (ent == &cl_entities[0].render && model->brushq3.num_pvsclusters && !r_novis.integer && (pvs = model->brush.GetPVS(model, modelorg))) - R_Q3BSP_RecursiveWorldNode(ent, model->brushq3.data_nodes, modelorg, pvs, ++markframe); + { + if (r_q3bsp_framecount != r_framecount) + { + r_q3bsp_framecount = r_framecount; + R_Q3BSP_RecursiveWorldNode(ent, model->brushq3.data_nodes, modelorg, pvs, r_framecount); + } + for (i = 0, face = model->brushq3.data_thismodel->firstface;i < model->brushq3.data_thismodel->numfaces;i++, face++) + if (face->markframe == r_framecount && !R_CullBox(face->mins, face->maxs)) + R_Q3BSP_DrawFace(ent, face); + } else for (i = 0, face = model->brushq3.data_thismodel->firstface;i < model->brushq3.data_thismodel->numfaces;i++, face++) R_Q3BSP_DrawFace(ent, face); @@ -2032,7 +2171,7 @@ void R_Q3BSP_DrawShadowVolume(entity_render_t *ent, vec3_t relativelightorigin, { model = ent->model; R_Mesh_Matrix(&ent->matrix); - Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg); + Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg); lightmins[0] = relativelightorigin[0] - lightradius; lightmins[1] = relativelightorigin[1] - lightradius; lightmins[2] = relativelightorigin[2] - lightradius; @@ -2044,16 +2183,16 @@ void R_Q3BSP_DrawShadowVolume(entity_render_t *ent, vec3_t relativelightorigin, //else for (i = 0, face = model->brushq3.data_thismodel->firstface;i < model->brushq3.data_thismodel->numfaces;i++, face++) if (BoxesOverlap(lightmins, lightmaxs, face->mins, face->maxs)) - R_Shadow_Volume(face->numvertices, face->numtriangles, face->data_vertex3f, face->data_element3i, face->data_neighbor3i, relativelightorigin, lightradius, projectdistance); + R_Shadow_Volume(face->num_vertices, face->num_triangles, face->data_vertex3f, face->data_element3i, face->data_neighbor3i, relativelightorigin, lightradius, projectdistance); } } void R_Q3BSP_DrawFaceLight(entity_render_t *ent, q3mface_t *face, 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) { - if ((face->texture->renderflags & Q3MTEXTURERENDERFLAGS_NODRAW) || !face->numtriangles) + if ((face->texture->surfaceflags & Q3SURFACEFLAG_NODRAW) || !face->num_triangles) return; - R_Shadow_DiffuseLighting(face->numvertices, face->numtriangles, face->data_element3i, face->data_vertex3f, face->data_svector3f, face->data_tvector3f, face->data_normal3f, face->data_texcoordtexture2f, relativelightorigin, lightradius, lightcolor, matrix_modeltofilter, matrix_modeltoattenuationxyz, matrix_modeltoattenuationz, face->texture->skin.base, face->texture->skin.nmap, NULL); - R_Shadow_SpecularLighting(face->numvertices, face->numtriangles, face->data_element3i, face->data_vertex3f, face->data_svector3f, face->data_tvector3f, face->data_normal3f, face->data_texcoordtexture2f, relativelightorigin, relativeeyeorigin, lightradius, lightcolor, matrix_modeltofilter, matrix_modeltoattenuationxyz, matrix_modeltoattenuationz, face->texture->skin.gloss, face->texture->skin.nmap, NULL); + R_Shadow_DiffuseLighting(face->num_vertices, face->num_triangles, face->data_element3i, face->data_vertex3f, face->data_svector3f, face->data_tvector3f, face->data_normal3f, face->data_texcoordtexture2f, relativelightorigin, lightradius, lightcolor, matrix_modeltofilter, matrix_modeltoattenuationxyz, matrix_modeltoattenuationz, face->texture->skin.base, face->texture->skin.nmap, NULL); + R_Shadow_SpecularLighting(face->num_vertices, face->num_triangles, face->data_element3i, face->data_vertex3f, face->data_svector3f, face->data_tvector3f, face->data_normal3f, face->data_texcoordtexture2f, relativelightorigin, relativeeyeorigin, lightradius, lightcolor, matrix_modeltofilter, matrix_modeltoattenuationxyz, matrix_modeltoattenuationz, face->texture->skin.gloss, face->texture->skin.nmap, NULL); } 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) @@ -2068,7 +2207,7 @@ void R_Q3BSP_DrawLight(entity_render_t *ent, vec3_t relativelightorigin, vec3_t { model = ent->model; R_Mesh_Matrix(&ent->matrix); - Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg); + Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg); lightmins[0] = relativelightorigin[0] - lightradius; lightmins[1] = relativelightorigin[1] - lightradius; lightmins[2] = relativelightorigin[2] - lightradius;