X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=r_shadow.c;h=69ffabf3ecbb2f061c98c26e2748954017b3f9e4;hb=a19dce25671ecfa28e4eb3861f8636750bf3ba68;hp=9ddb71f74cb7214dedfb98072767f14df5f1a23a;hpb=7842db054947d1818134fc9eefebd37516ab683a;p=xonotic%2Fdarkplaces.git diff --git a/r_shadow.c b/r_shadow.c index 9ddb71f7..69ffabf3 100644 --- a/r_shadow.c +++ b/r_shadow.c @@ -198,8 +198,9 @@ cvar_t r_shadow_bumpscale_basetexture = {0, "r_shadow_bumpscale_basetexture", "0 cvar_t r_shadow_bumpscale_bumpmap = {0, "r_shadow_bumpscale_bumpmap", "4", "what magnitude to interpret _bump.tga textures as, higher values increase depth, requires r_restart to take effect"}; cvar_t r_shadow_debuglight = {0, "r_shadow_debuglight", "-1", "renders only one light, for level design purposes or debugging"}; cvar_t r_shadow_gloss = {CVAR_SAVE, "r_shadow_gloss", "1", "0 disables gloss (specularity) rendering, 1 uses gloss if textures are found, 2 forces a flat metallic specular effect on everything without textures (similar to tenebrae)"}; -cvar_t r_shadow_gloss2intensity = {0, "r_shadow_gloss2intensity", "0.25", "how bright the forced flat gloss should look if r_shadow_gloss is 2"}; -cvar_t r_shadow_glossintensity = {0, "r_shadow_glossintensity", "1", "how bright textured glossmaps should look if r_shadow_gloss is 1 or 2"}; +cvar_t r_shadow_gloss2intensity = {0, "r_shadow_gloss2intensity", "0.5", "how bright the forced flat gloss should look if r_shadow_gloss is 2"}; +cvar_t r_shadow_glossintensity = {0, "r_shadow_glossintensity", "2", "how bright textured glossmaps should look if r_shadow_gloss is 1 or 2"}; +cvar_t r_shadow_glossexponent = {0, "r_shadow_glossexponent", "32", "how 'sharp' the gloss should appear (specular power)"}; cvar_t r_shadow_lightattenuationpower = {0, "r_shadow_lightattenuationpower", "0.5", "changes attenuation texture generation (does not affect r_glsl lighting)"}; cvar_t r_shadow_lightattenuationscale = {0, "r_shadow_lightattenuationscale", "1", "changes attenuation texture generation (does not affect r_glsl lighting)"}; cvar_t r_shadow_lightintensityscale = {0, "r_shadow_lightintensityscale", "1", "renders all world lights brighter or darker"}; @@ -385,6 +386,7 @@ void R_Shadow_Init(void) Cvar_RegisterVariable(&r_shadow_gloss); Cvar_RegisterVariable(&r_shadow_gloss2intensity); Cvar_RegisterVariable(&r_shadow_glossintensity); + Cvar_RegisterVariable(&r_shadow_glossexponent); Cvar_RegisterVariable(&r_shadow_lightattenuationpower); Cvar_RegisterVariable(&r_shadow_lightattenuationscale); Cvar_RegisterVariable(&r_shadow_lightintensityscale); @@ -524,12 +526,18 @@ void R_Shadow_PrepareShadowMark(int numtris) numshadowmark = 0; } -int R_Shadow_ConstructShadowVolume(int innumvertices, int innumtris, const int *inelement3i, const int *inneighbor3i, const float *invertex3f, int *outnumvertices, int *outelement3i, float *outvertex3f, const float *projectorigin, float projectdistance, int numshadowmarktris, const int *shadowmarktris) +int R_Shadow_ConstructShadowVolume(int innumvertices, int innumtris, const int *inelement3i, const int *inneighbor3i, const float *invertex3f, int *outnumvertices, int *outelement3i, float *outvertex3f, const float *projectorigin, const float *projectdirection, float projectdistance, int numshadowmarktris, const int *shadowmarktris) { int i, j; int outtriangles = 0, outvertices = 0; const int *element; const float *vertex; + float ratio, direction[3], projectvector[3]; + + if (projectdirection) + VectorScale(projectdirection, projectdistance, projectvector); + else + VectorClear(projectvector); if (maxvertexupdate < innumvertices) { @@ -553,26 +561,49 @@ int R_Shadow_ConstructShadowVolume(int innumvertices, int innumtris, const int * for (i = 0;i < numshadowmarktris;i++) shadowmark[shadowmarktris[i]] = shadowmarkcount; - for (i = 0;i < numshadowmarktris;i++) + // create the vertices + if (projectdirection) { - element = inelement3i + shadowmarktris[i] * 3; - // make sure the vertices are created - for (j = 0;j < 3;j++) + for (i = 0;i < numshadowmarktris;i++) { - if (vertexupdate[element[j]] != vertexupdatenum) + element = inelement3i + shadowmarktris[i] * 3; + for (j = 0;j < 3;j++) { - float ratio, direction[3]; - vertexupdate[element[j]] = vertexupdatenum; - vertexremap[element[j]] = outvertices; - vertex = invertex3f + element[j] * 3; - // project one copy of the vertex to the sphere radius of the light - // (FIXME: would projecting it to the light box be better?) - VectorSubtract(vertex, projectorigin, direction); - ratio = projectdistance / VectorLength(direction); - VectorCopy(vertex, outvertex3f); - VectorMA(projectorigin, ratio, direction, (outvertex3f + 3)); - outvertex3f += 6; - outvertices += 2; + if (vertexupdate[element[j]] != vertexupdatenum) + { + vertexupdate[element[j]] = vertexupdatenum; + vertexremap[element[j]] = outvertices; + vertex = invertex3f + element[j] * 3; + // project one copy of the vertex according to projectvector + VectorCopy(vertex, outvertex3f); + VectorAdd(vertex, projectvector, (outvertex3f + 3)); + outvertex3f += 6; + outvertices += 2; + } + } + } + } + else + { + for (i = 0;i < numshadowmarktris;i++) + { + element = inelement3i + shadowmarktris[i] * 3; + for (j = 0;j < 3;j++) + { + if (vertexupdate[element[j]] != vertexupdatenum) + { + vertexupdate[element[j]] = vertexupdatenum; + vertexremap[element[j]] = outvertices; + vertex = invertex3f + element[j] * 3; + // project one copy of the vertex to the sphere radius of the light + // (FIXME: would projecting it to the light box be better?) + VectorSubtract(vertex, projectorigin, direction); + ratio = projectdistance / VectorLength(direction); + VectorCopy(vertex, outvertex3f); + VectorMA(projectorigin, ratio, direction, (outvertex3f + 3)); + outvertex3f += 6; + outvertices += 2; + } } } } @@ -645,12 +676,12 @@ int R_Shadow_ConstructShadowVolume(int innumvertices, int innumtris, const int * return outtriangles; } -void R_Shadow_VolumeFromList(int numverts, int numtris, const float *invertex3f, const int *elements, const int *neighbors, const vec3_t projectorigin, float projectdistance, int nummarktris, const int *marktris) +void R_Shadow_VolumeFromList(int numverts, int numtris, const float *invertex3f, const int *elements, const int *neighbors, const vec3_t projectorigin, const vec3_t projectdirection, float projectdistance, int nummarktris, const int *marktris) { int tris, outverts; if (projectdistance < 0.1) { - Con_Printf("R_Shadow_Volume: projectdistance %f\n"); + Con_Printf("R_Shadow_Volume: projectdistance %f\n", projectdistance); return; } if (!numverts || !nummarktris) @@ -658,16 +689,17 @@ void R_Shadow_VolumeFromList(int numverts, int numtris, const float *invertex3f, // make sure shadowelements is big enough for this volume if (maxshadowtriangles < nummarktris || maxshadowvertices < numverts) R_Shadow_ResizeShadowArrays((numverts + 255) & ~255, (nummarktris + 255) & ~255); - tris = R_Shadow_ConstructShadowVolume(numverts, numtris, elements, neighbors, invertex3f, &outverts, shadowelements, shadowvertex3f, projectorigin, projectdistance, nummarktris, marktris); - renderstats.lights_dynamicshadowtriangles += tris; + tris = R_Shadow_ConstructShadowVolume(numverts, numtris, elements, neighbors, invertex3f, &outverts, shadowelements, shadowvertex3f, projectorigin, projectdirection, projectdistance, nummarktris, marktris); + r_refdef.stats.lights_dynamicshadowtriangles += tris; R_Shadow_RenderVolume(outverts, tris, shadowvertex3f, shadowelements); } -void R_Shadow_MarkVolumeFromBox(int firsttriangle, int numtris, const float *invertex3f, const int *elements, const vec3_t projectorigin, const vec3_t lightmins, const vec3_t lightmaxs, const vec3_t surfacemins, const vec3_t surfacemaxs) +void R_Shadow_MarkVolumeFromBox(int firsttriangle, int numtris, const float *invertex3f, const int *elements, const vec3_t projectorigin, const vec3_t projectdirection, const vec3_t lightmins, const vec3_t lightmaxs, const vec3_t surfacemins, const vec3_t surfacemaxs) { int t, tend; const int *e; const float *v[3]; + float normal[3]; if (!BoxesOverlap(lightmins, lightmaxs, surfacemins, surfacemaxs)) return; tend = firsttriangle + numtris; @@ -676,26 +708,59 @@ void R_Shadow_MarkVolumeFromBox(int firsttriangle, int numtris, const float *inv && surfacemins[2] >= lightmins[2] && surfacemaxs[2] <= lightmaxs[2]) { // surface box entirely inside light box, no box cull - for (t = firsttriangle, e = elements + t * 3;t < tend;t++, e += 3) - if (PointInfrontOfTriangle(projectorigin, invertex3f + e[0] * 3, invertex3f + e[1] * 3, invertex3f + e[2] * 3)) - shadowmarklist[numshadowmark++] = t; + if (projectdirection) + { + for (t = firsttriangle, e = elements + t * 3;t < tend;t++, e += 3) + { + TriangleNormal(invertex3f + e[0] * 3, invertex3f + e[1] * 3, invertex3f + e[2] * 3, normal); + if (DotProduct(normal, projectdirection) < 0) + shadowmarklist[numshadowmark++] = t; + } + } + else + { + for (t = firsttriangle, e = elements + t * 3;t < tend;t++, e += 3) + if (PointInfrontOfTriangle(projectorigin, invertex3f + e[0] * 3, invertex3f + e[1] * 3, invertex3f + e[2] * 3)) + shadowmarklist[numshadowmark++] = t; + } } else { // surface box not entirely inside light box, cull each triangle - for (t = firsttriangle, e = elements + t * 3;t < tend;t++, e += 3) + if (projectdirection) + { + for (t = firsttriangle, e = elements + t * 3;t < tend;t++, e += 3) + { + v[0] = invertex3f + e[0] * 3; + v[1] = invertex3f + e[1] * 3; + v[2] = invertex3f + e[2] * 3; + TriangleNormal(v[0], v[1], v[2], normal); + if (DotProduct(normal, projectdirection) < 0 + && lightmaxs[0] > min(v[0][0], min(v[1][0], v[2][0])) + && lightmins[0] < max(v[0][0], max(v[1][0], v[2][0])) + && lightmaxs[1] > min(v[0][1], min(v[1][1], v[2][1])) + && lightmins[1] < max(v[0][1], max(v[1][1], v[2][1])) + && lightmaxs[2] > min(v[0][2], min(v[1][2], v[2][2])) + && lightmins[2] < max(v[0][2], max(v[1][2], v[2][2]))) + shadowmarklist[numshadowmark++] = t; + } + } + else { - v[0] = invertex3f + e[0] * 3; - v[1] = invertex3f + e[1] * 3; - v[2] = invertex3f + e[2] * 3; - if (PointInfrontOfTriangle(projectorigin, v[0], v[1], v[2]) - && lightmaxs[0] > min(v[0][0], min(v[1][0], v[2][0])) - && lightmins[0] < max(v[0][0], max(v[1][0], v[2][0])) - && lightmaxs[1] > min(v[0][1], min(v[1][1], v[2][1])) - && lightmins[1] < max(v[0][1], max(v[1][1], v[2][1])) - && lightmaxs[2] > min(v[0][2], min(v[1][2], v[2][2])) - && lightmins[2] < max(v[0][2], max(v[1][2], v[2][2]))) - shadowmarklist[numshadowmark++] = t; + for (t = firsttriangle, e = elements + t * 3;t < tend;t++, e += 3) + { + v[0] = invertex3f + e[0] * 3; + v[1] = invertex3f + e[1] * 3; + v[2] = invertex3f + e[2] * 3; + if (PointInfrontOfTriangle(projectorigin, v[0], v[1], v[2]) + && lightmaxs[0] > min(v[0][0], min(v[1][0], v[2][0])) + && lightmins[0] < max(v[0][0], max(v[1][0], v[2][0])) + && lightmaxs[1] > min(v[0][1], min(v[1][1], v[2][1])) + && lightmins[1] < max(v[0][1], max(v[1][1], v[2][1])) + && lightmaxs[2] > min(v[0][2], min(v[1][2], v[2][2])) + && lightmins[2] < max(v[0][2], max(v[1][2], v[2][2]))) + shadowmarklist[numshadowmark++] = t; + } } } } @@ -708,21 +773,23 @@ void R_Shadow_RenderVolume(int numvertices, int numtriangles, const float *verte Mod_ShadowMesh_AddMesh(r_main_mempool, r_shadow_compilingrtlight->static_meshchain_shadow, NULL, NULL, NULL, vertex3f, NULL, NULL, NULL, NULL, numtriangles, element3i); return; } - renderstats.lights_shadowtriangles += numtriangles; + r_refdef.stats.lights_shadowtriangles += numtriangles; + CHECKGLERROR R_Mesh_VertexPointer(vertex3f); GL_LockArrays(0, numvertices); if (r_shadow_rendermode == R_SHADOW_RENDERMODE_STENCIL) { // decrement stencil if backface is behind depthbuffer - qglCullFace(GL_BACK); // quake is backwards, this culls front faces - qglStencilOp(GL_KEEP, GL_DECR, GL_KEEP); + GL_CullFace(GL_BACK); // quake is backwards, this culls front faces + qglStencilOp(GL_KEEP, GL_DECR, GL_KEEP);CHECKGLERROR R_Mesh_Draw(0, numvertices, numtriangles, element3i); // increment stencil if frontface is behind depthbuffer - qglCullFace(GL_FRONT); // quake is backwards, this culls back faces - qglStencilOp(GL_KEEP, GL_INCR, GL_KEEP); + GL_CullFace(GL_FRONT); // quake is backwards, this culls back faces + qglStencilOp(GL_KEEP, GL_INCR, GL_KEEP);CHECKGLERROR } R_Mesh_Draw(0, numvertices, numtriangles, element3i); GL_LockArrays(0, 0); + CHECKGLERROR } static void R_Shadow_MakeTextures(void) @@ -755,7 +822,7 @@ static void R_Shadow_MakeTextures(void) } } r_shadow_attenuation2dtexture = R_LoadTexture2D(r_shadow_texturepool, "attenuation2d", ATTEN2DSIZE, ATTEN2DSIZE, data, TEXTYPE_RGBA, TEXF_PRECACHE | TEXF_CLAMP | TEXF_ALPHA, NULL); - if (r_shadow_texture3d.integer) + if (r_shadow_texture3d.integer && gl_texture3d) { for (z = 0;z < ATTEN3DSIZE;z++) { @@ -793,8 +860,6 @@ void R_Shadow_ValidateCvars(void) // light currently being rendered rtlight_t *r_shadow_rtlight; -// this is the location of the eye in entity space -vec3_t r_shadow_entityeyeorigin; // this is the location of the light in entity space vec3_t r_shadow_entitylightorigin; // this transforms entity coordinates to light filter cubemap coordinates @@ -816,15 +881,13 @@ void R_Shadow_RenderMode_Begin(void) || r_shadow_lightattenuationscale.value != r_shadow_attenscale) R_Shadow_MakeTextures(); + CHECKGLERROR R_Mesh_ColorPointer(NULL); R_Mesh_ResetTextureState(); GL_BlendFunc(GL_ONE, GL_ZERO); GL_DepthMask(false); - GL_DepthTest(true); GL_Color(0, 0, 0, 1); - qglCullFace(GL_FRONT); // quake is backwards, this culls back faces - qglEnable(GL_CULL_FACE); - GL_Scissor(r_view_x, r_view_y, r_view_width, r_view_height); + GL_Scissor(r_view.x, r_view.y, r_view.width, r_view.height); r_shadow_rendermode = R_SHADOW_RENDERMODE_NONE; @@ -848,81 +911,85 @@ void R_Shadow_RenderMode_ActiveLight(rtlight_t *rtlight) void R_Shadow_RenderMode_Reset(void) { + CHECKGLERROR if (r_shadow_rendermode == R_SHADOW_RENDERMODE_LIGHT_GLSL) { - qglUseProgramObjectARB(0); - // HACK HACK HACK: work around for bug in NVIDIAI 6xxx drivers that causes GL_OUT_OF_MEMORY and/or software rendering - qglBegin(GL_TRIANGLES); - qglEnd(); - CHECKGLERROR + qglUseProgramObjectARB(0);CHECKGLERROR } else if (r_shadow_rendermode == R_SHADOW_RENDERMODE_STENCILTWOSIDE) - qglDisable(GL_STENCIL_TEST_TWO_SIDE_EXT); + { + qglDisable(GL_STENCIL_TEST_TWO_SIDE_EXT);CHECKGLERROR + } R_Mesh_ColorPointer(NULL); R_Mesh_ResetTextureState(); } void R_Shadow_RenderMode_StencilShadowVolumes(void) { + CHECKGLERROR R_Shadow_RenderMode_Reset(); GL_Color(1, 1, 1, 1); GL_ColorMask(0, 0, 0, 0); GL_BlendFunc(GL_ONE, GL_ZERO); GL_DepthMask(false); - GL_DepthTest(true); - qglPolygonOffset(r_shadowpolygonfactor, r_shadowpolygonoffset); - qglDepthFunc(GL_LESS); - qglCullFace(GL_FRONT); // quake is backwards, this culls back faces - qglEnable(GL_STENCIL_TEST); - qglStencilFunc(GL_ALWAYS, 128, ~0); + qglPolygonOffset(r_refdef.shadowpolygonfactor, r_refdef.shadowpolygonoffset);CHECKGLERROR + qglDepthFunc(GL_LESS);CHECKGLERROR + qglEnable(GL_STENCIL_TEST);CHECKGLERROR + qglStencilFunc(GL_ALWAYS, 128, ~0);CHECKGLERROR r_shadow_rendermode = r_shadow_shadowingrendermode; if (r_shadow_rendermode == R_SHADOW_RENDERMODE_STENCILTWOSIDE) { - qglDisable(GL_CULL_FACE); - qglEnable(GL_STENCIL_TEST_TWO_SIDE_EXT); - qglActiveStencilFaceEXT(GL_BACK); // quake is backwards, this is front faces - qglStencilMask(~0); - qglStencilOp(GL_KEEP, GL_INCR, GL_KEEP); - qglActiveStencilFaceEXT(GL_FRONT); // quake is backwards, this is back faces - qglStencilMask(~0); - qglStencilOp(GL_KEEP, GL_DECR, GL_KEEP); + GL_CullFace(GL_NONE); + qglEnable(GL_STENCIL_TEST_TWO_SIDE_EXT);CHECKGLERROR + qglActiveStencilFaceEXT(GL_BACK);CHECKGLERROR // quake is backwards, this is front faces + qglStencilMask(~0);CHECKGLERROR + qglStencilOp(GL_KEEP, GL_INCR, GL_KEEP);CHECKGLERROR + qglActiveStencilFaceEXT(GL_FRONT);CHECKGLERROR // quake is backwards, this is back faces + qglStencilMask(~0);CHECKGLERROR + qglStencilOp(GL_KEEP, GL_DECR, GL_KEEP);CHECKGLERROR } else { - qglEnable(GL_CULL_FACE); - qglStencilMask(~0); + GL_CullFace(GL_FRONT); // quake is backwards, this culls back faces + qglStencilMask(~0);CHECKGLERROR // this is changed by every shadow render so its value here is unimportant - qglStencilOp(GL_KEEP, GL_KEEP, GL_KEEP); + qglStencilOp(GL_KEEP, GL_KEEP, GL_KEEP);CHECKGLERROR } GL_Clear(GL_STENCIL_BUFFER_BIT); - renderstats.lights_clears++; + r_refdef.stats.lights_clears++; } void R_Shadow_RenderMode_Lighting(qboolean stenciltest, qboolean transparent) { + CHECKGLERROR R_Shadow_RenderMode_Reset(); GL_BlendFunc(GL_SRC_ALPHA, GL_ONE); GL_DepthMask(false); - GL_DepthTest(true); - qglPolygonOffset(r_polygonfactor, r_polygonoffset); - //qglDisable(GL_POLYGON_OFFSET_FILL); + qglPolygonOffset(r_refdef.polygonfactor, r_refdef.polygonoffset);CHECKGLERROR + //qglDisable(GL_POLYGON_OFFSET_FILL);CHECKGLERROR GL_Color(1, 1, 1, 1); - GL_ColorMask(r_refdef.colormask[0], r_refdef.colormask[1], r_refdef.colormask[2], 1); + GL_ColorMask(r_view.colormask[0], r_view.colormask[1], r_view.colormask[2], 1); if (transparent) - qglDepthFunc(GL_LEQUAL); + { + qglDepthFunc(GL_LEQUAL);CHECKGLERROR + } else - qglDepthFunc(GL_EQUAL); - qglCullFace(GL_FRONT); // quake is backwards, this culls back faces - qglEnable(GL_CULL_FACE); + { + qglDepthFunc(GL_EQUAL);CHECKGLERROR + } if (stenciltest) - qglEnable(GL_STENCIL_TEST); + { + qglEnable(GL_STENCIL_TEST);CHECKGLERROR + } else - qglDisable(GL_STENCIL_TEST); - qglStencilMask(~0); - qglStencilOp(GL_KEEP, GL_KEEP, GL_KEEP); + { + qglDisable(GL_STENCIL_TEST);CHECKGLERROR + } + qglStencilMask(~0);CHECKGLERROR + qglStencilOp(GL_KEEP, GL_KEEP, GL_KEEP);CHECKGLERROR // only draw light where this geometry was already rendered AND the // stencil is 128 (values other than this mean shadow) - qglStencilFunc(GL_EQUAL, 128, ~0); + qglStencilFunc(GL_EQUAL, 128, ~0);CHECKGLERROR r_shadow_rendermode = r_shadow_lightingrendermode; // do global setup needed for the chosen lighting mode if (r_shadow_rendermode == R_SHADOW_RENDERMODE_LIGHT_GLSL) @@ -939,70 +1006,86 @@ void R_Shadow_RenderMode_Lighting(qboolean stenciltest, qboolean transparent) R_Mesh_TexBind(9, R_GetTexture(r_texture_black)); // glow //R_Mesh_TexMatrix(3, r_shadow_entitytolight); // light filter matrix GL_BlendFunc(GL_SRC_ALPHA, GL_ONE); - GL_ColorMask(r_refdef.colormask[0], r_refdef.colormask[1], r_refdef.colormask[2], 0); + GL_ColorMask(r_view.colormask[0], r_view.colormask[1], r_view.colormask[2], 0); CHECKGLERROR } } void R_Shadow_RenderMode_VisibleShadowVolumes(void) { + CHECKGLERROR R_Shadow_RenderMode_Reset(); GL_BlendFunc(GL_ONE, GL_ONE); GL_DepthMask(false); - GL_DepthTest(!r_showdisabledepthtest.integer); - qglPolygonOffset(r_polygonfactor, r_polygonoffset); - GL_Color(0.0, 0.0125, 0.1, 1); - GL_ColorMask(r_refdef.colormask[0], r_refdef.colormask[1], r_refdef.colormask[2], 1); - qglDepthFunc(GL_GEQUAL); - qglCullFace(GL_FRONT); // this culls back - qglDisable(GL_CULL_FACE); - qglDisable(GL_STENCIL_TEST); + qglPolygonOffset(r_refdef.polygonfactor, r_refdef.polygonoffset);CHECKGLERROR + GL_Color(0.0, 0.0125 * r_view.colorscale, 0.1 * r_view.colorscale, 1); + GL_ColorMask(r_view.colormask[0], r_view.colormask[1], r_view.colormask[2], 1); + if (r_showshadowvolumes.integer >= 2) + { + qglDepthFunc(GL_ALWAYS);CHECKGLERROR + } + else + { + qglDepthFunc(GL_GEQUAL);CHECKGLERROR + } + qglDisable(GL_STENCIL_TEST);CHECKGLERROR r_shadow_rendermode = R_SHADOW_RENDERMODE_VISIBLEVOLUMES; } void R_Shadow_RenderMode_VisibleLighting(qboolean stenciltest, qboolean transparent) { + CHECKGLERROR R_Shadow_RenderMode_Reset(); GL_BlendFunc(GL_ONE, GL_ONE); GL_DepthMask(false); - GL_DepthTest(!r_showdisabledepthtest.integer); - qglPolygonOffset(r_polygonfactor, r_polygonoffset); - GL_Color(0.1, 0.0125, 0, 1); - GL_ColorMask(r_refdef.colormask[0], r_refdef.colormask[1], r_refdef.colormask[2], 1); - if (transparent) - qglDepthFunc(GL_LEQUAL); + qglPolygonOffset(r_refdef.polygonfactor, r_refdef.polygonoffset);CHECKGLERROR + GL_Color(0.1 * r_view.colorscale, 0.0125 * r_view.colorscale, 0, 1); + GL_ColorMask(r_view.colormask[0], r_view.colormask[1], r_view.colormask[2], 1); + if (r_showshadowvolumes.integer >= 2) + { + qglDepthFunc(GL_ALWAYS);CHECKGLERROR + } + else if (transparent) + { + qglDepthFunc(GL_LEQUAL);CHECKGLERROR + } else - qglDepthFunc(GL_EQUAL); - qglCullFace(GL_FRONT); // this culls back - qglEnable(GL_CULL_FACE); + { + qglDepthFunc(GL_EQUAL);CHECKGLERROR + } if (stenciltest) - qglEnable(GL_STENCIL_TEST); + { + qglEnable(GL_STENCIL_TEST);CHECKGLERROR + } else - qglDisable(GL_STENCIL_TEST); + { + qglDisable(GL_STENCIL_TEST);CHECKGLERROR + } r_shadow_rendermode = R_SHADOW_RENDERMODE_VISIBLELIGHTING; } void R_Shadow_RenderMode_End(void) { + CHECKGLERROR R_Shadow_RenderMode_Reset(); R_Shadow_RenderMode_ActiveLight(NULL); GL_BlendFunc(GL_ONE, GL_ZERO); GL_DepthMask(true); - GL_DepthTest(true); - qglPolygonOffset(r_polygonfactor, r_polygonoffset); - //qglDisable(GL_POLYGON_OFFSET_FILL); + qglPolygonOffset(r_refdef.polygonfactor, r_refdef.polygonoffset);CHECKGLERROR + //qglDisable(GL_POLYGON_OFFSET_FILL);CHECKGLERROR GL_Color(1, 1, 1, 1); - GL_ColorMask(r_refdef.colormask[0], r_refdef.colormask[1], r_refdef.colormask[2], 1); - GL_Scissor(r_view_x, r_view_y, r_view_width, r_view_height); - qglDepthFunc(GL_LEQUAL); - qglCullFace(GL_FRONT); // quake is backwards, this culls back faces - qglEnable(GL_CULL_FACE); - qglDisable(GL_STENCIL_TEST); - qglStencilOp(GL_KEEP, GL_KEEP, GL_KEEP); + GL_ColorMask(r_view.colormask[0], r_view.colormask[1], r_view.colormask[2], 1); + GL_Scissor(r_view.x, r_view.y, r_view.width, r_view.height); + qglDepthFunc(GL_LEQUAL);CHECKGLERROR if (gl_support_stenciltwoside) - qglDisable(GL_STENCIL_TEST_TWO_SIDE_EXT); - qglStencilMask(~0); - qglStencilFunc(GL_ALWAYS, 128, ~0); + { + qglDisable(GL_STENCIL_TEST_TWO_SIDE_EXT);CHECKGLERROR + } + qglDisable(GL_STENCIL_TEST);CHECKGLERROR + qglStencilMask(~0);CHECKGLERROR + qglStencilFunc(GL_ALWAYS, 128, ~0);CHECKGLERROR + qglStencilOp(GL_KEEP, GL_KEEP, GL_KEEP);CHECKGLERROR + GL_CullFace(GL_FRONT); // quake is backwards, this culls back faces r_shadow_rendermode = R_SHADOW_RENDERMODE_NONE; } @@ -1016,18 +1099,18 @@ qboolean R_Shadow_ScissorForBBox(const float *mins, const float *maxs) float vertex3f[256*3]; // if view is inside the light box, just say yes it's visible - if (BoxesOverlap(r_vieworigin, r_vieworigin, mins, maxs)) + if (BoxesOverlap(r_view.origin, r_view.origin, mins, maxs)) { - GL_Scissor(r_view_x, r_view_y, r_view_width, r_view_height); + GL_Scissor(r_view.x, r_view.y, r_view.width, r_view.height); return false; } // create a temporary brush describing the area the light can affect in worldspace - VectorNegate(frustum[0].normal, planes[ 0].normal);planes[ 0].dist = -frustum[0].dist; - VectorNegate(frustum[1].normal, planes[ 1].normal);planes[ 1].dist = -frustum[1].dist; - VectorNegate(frustum[2].normal, planes[ 2].normal);planes[ 2].dist = -frustum[2].dist; - VectorNegate(frustum[3].normal, planes[ 3].normal);planes[ 3].dist = -frustum[3].dist; - VectorNegate(frustum[4].normal, planes[ 4].normal);planes[ 4].dist = -frustum[4].dist; + VectorNegate(r_view.frustum[0].normal, planes[ 0].normal);planes[ 0].dist = -r_view.frustum[0].dist; + VectorNegate(r_view.frustum[1].normal, planes[ 1].normal);planes[ 1].dist = -r_view.frustum[1].dist; + VectorNegate(r_view.frustum[2].normal, planes[ 2].normal);planes[ 2].dist = -r_view.frustum[2].dist; + VectorNegate(r_view.frustum[3].normal, planes[ 3].normal);planes[ 3].dist = -r_view.frustum[3].dist; + VectorNegate(r_view.frustum[4].normal, planes[ 4].normal);planes[ 4].dist = -r_view.frustum[4].dist; VectorSet (planes[ 5].normal, 1, 0, 0); planes[ 5].dist = maxs[0]; VectorSet (planes[ 6].normal, -1, 0, 0); planes[ 6].dist = -mins[0]; VectorSet (planes[ 7].normal, 0, 1, 0); planes[ 7].dist = maxs[1]; @@ -1052,6 +1135,7 @@ qboolean R_Shadow_ScissorForBBox(const float *mins, const float *maxs) // if that mesh is not empty, check what area of the screen it covers x1 = y1 = x2 = y2 = 0; v[3] = 1.0f; + //Con_Printf("%i vertices to transform...\n", mesh.numvertices); for (i = 0;i < mesh.numvertices;i++) { VectorCopy(mesh.vertex3f + i * 3, v); @@ -1079,20 +1163,20 @@ qboolean R_Shadow_ScissorForBBox(const float *mins, const float *maxs) //Con_Printf("%f %f %f %f\n", x1, y1, x2, y2); // clamp it to the screen - if (ix1 < r_view_x) ix1 = r_view_x; - if (iy1 < r_view_y) iy1 = r_view_y; - if (ix2 > r_view_x + r_view_width) ix2 = r_view_x + r_view_width; - if (iy2 > r_view_y + r_view_height) iy2 = r_view_y + r_view_height; + if (ix1 < r_view.x) ix1 = r_view.x; + if (iy1 < r_view.y) iy1 = r_view.y; + if (ix2 > r_view.x + r_view.width) ix2 = r_view.x + r_view.width; + if (iy2 > r_view.y + r_view.height) iy2 = r_view.y + r_view.height; // if it is inside out, it's not visible if (ix2 <= ix1 || iy2 <= iy1) return true; // the light area is visible, set up the scissor rectangle - GL_Scissor(ix1, vid.height - iy2, ix2 - ix1, iy2 - iy1); - //qglScissor(ix1, iy1, ix2 - ix1, iy2 - iy1); - //qglEnable(GL_SCISSOR_TEST); - renderstats.lights_scissored++; + GL_Scissor(ix1, iy1, ix2 - ix1, iy2 - iy1); + //qglScissor(ix1, iy1, ix2 - ix1, iy2 - iy1);CHECKGLERROR + //qglEnable(GL_SCISSOR_TEST);CHECKGLERROR + r_refdef.stats.lights_scissored++; return false; } @@ -1115,9 +1199,9 @@ static void R_Shadow_RenderSurfacesLighting_Light_Vertex_Shading(const msurface_ color4f[0] = (ambientcolor[0] + shadeintensity * diffusecolor[0]); color4f[1] = (ambientcolor[1] + shadeintensity * diffusecolor[1]); color4f[2] = (ambientcolor[2] + shadeintensity * diffusecolor[2]); - if (fogenabled) + if (r_refdef.fogenabled) { - float f = VERTEXFOGTABLE(VectorDistance(v, r_shadow_entityeyeorigin)); + float f = VERTEXFOGTABLE(VectorDistance(v, rsurface_modelorg)); VectorScale(color4f, f, color4f); } } @@ -1148,9 +1232,9 @@ static void R_Shadow_RenderSurfacesLighting_Light_Vertex_Shading(const msurface_ color4f[1] = ambientcolor[1] * distintensity; color4f[2] = ambientcolor[2] * distintensity; } - if (fogenabled) + if (r_refdef.fogenabled) { - float f = VERTEXFOGTABLE(VectorDistance(v, r_shadow_entityeyeorigin)); + float f = VERTEXFOGTABLE(VectorDistance(v, rsurface_modelorg)); VectorScale(color4f, f, color4f); } } @@ -1182,9 +1266,9 @@ static void R_Shadow_RenderSurfacesLighting_Light_Vertex_Shading(const msurface_ color4f[1] = ambientcolor[1] * distintensity; color4f[2] = ambientcolor[2] * distintensity; } - if (fogenabled) + if (r_refdef.fogenabled) { - float f = VERTEXFOGTABLE(VectorDistance(v, r_shadow_entityeyeorigin)); + float f = VERTEXFOGTABLE(VectorDistance(v, rsurface_modelorg)); VectorScale(color4f, f, color4f); } } @@ -1197,84 +1281,106 @@ static void R_Shadow_RenderSurfacesLighting_Light_Vertex_Shading(const msurface_ // TODO: use glTexGen instead of feeding vertices to texcoordpointer? -static void R_Shadow_GenTexCoords_Diffuse_NormalCubeMap(float *out3f, int numverts, const float *vertex3f, const float *svector3f, const float *tvector3f, const float *normal3f, const vec3_t relativelightorigin) +static void R_Shadow_GenTexCoords_Diffuse_NormalCubeMap(int numsurfaces, msurface_t **surfacelist) { - int i; - float lightdir[3]; - for (i = 0;i < numverts;i++, vertex3f += 3, svector3f += 3, tvector3f += 3, normal3f += 3, out3f += 3) + int surfacelistindex; + for (surfacelistindex = 0;surfacelistindex < numsurfaces;surfacelistindex++) { - VectorSubtract(relativelightorigin, vertex3f, lightdir); - // the cubemap normalizes this for us - out3f[0] = DotProduct(svector3f, lightdir); - out3f[1] = DotProduct(tvector3f, lightdir); - out3f[2] = DotProduct(normal3f, lightdir); + const msurface_t *surface = surfacelist[surfacelistindex]; + int i; + float *out3f = rsurface_array_texcoord3f + 3 * surface->num_firstvertex; + const float *vertex3f = rsurface_vertex3f + 3 * surface->num_firstvertex; + const float *svector3f = rsurface_svector3f + 3 * surface->num_firstvertex; + const float *tvector3f = rsurface_tvector3f + 3 * surface->num_firstvertex; + const float *normal3f = rsurface_normal3f + 3 * surface->num_firstvertex; + float lightdir[3]; + for (i = 0;i < surface->num_vertices;i++, vertex3f += 3, svector3f += 3, tvector3f += 3, normal3f += 3, out3f += 3) + { + VectorSubtract(r_shadow_entitylightorigin, vertex3f, lightdir); + // the cubemap normalizes this for us + out3f[0] = DotProduct(svector3f, lightdir); + out3f[1] = DotProduct(tvector3f, lightdir); + out3f[2] = DotProduct(normal3f, lightdir); + } } } -static void R_Shadow_GenTexCoords_Specular_NormalCubeMap(float *out3f, int numverts, const float *vertex3f, const float *svector3f, const float *tvector3f, const float *normal3f, const vec3_t relativelightorigin, const vec3_t relativeeyeorigin) +static void R_Shadow_GenTexCoords_Specular_NormalCubeMap(int numsurfaces, msurface_t **surfacelist) { - int i; - float lightdir[3], eyedir[3], halfdir[3]; - for (i = 0;i < numverts;i++, vertex3f += 3, svector3f += 3, tvector3f += 3, normal3f += 3, out3f += 3) + int surfacelistindex; + for (surfacelistindex = 0;surfacelistindex < numsurfaces;surfacelistindex++) { - VectorSubtract(relativelightorigin, vertex3f, lightdir); - VectorNormalize(lightdir); - VectorSubtract(relativeeyeorigin, vertex3f, eyedir); - VectorNormalize(eyedir); - VectorAdd(lightdir, eyedir, halfdir); - // the cubemap normalizes this for us - out3f[0] = DotProduct(svector3f, halfdir); - out3f[1] = DotProduct(tvector3f, halfdir); - out3f[2] = DotProduct(normal3f, halfdir); + const msurface_t *surface = surfacelist[surfacelistindex]; + int i; + float *out3f = rsurface_array_texcoord3f + 3 * surface->num_firstvertex; + const float *vertex3f = rsurface_vertex3f + 3 * surface->num_firstvertex; + const float *svector3f = rsurface_svector3f + 3 * surface->num_firstvertex; + const float *tvector3f = rsurface_tvector3f + 3 * surface->num_firstvertex; + const float *normal3f = rsurface_normal3f + 3 * surface->num_firstvertex; + float lightdir[3], eyedir[3], halfdir[3]; + for (i = 0;i < surface->num_vertices;i++, vertex3f += 3, svector3f += 3, tvector3f += 3, normal3f += 3, out3f += 3) + { + VectorSubtract(r_shadow_entitylightorigin, vertex3f, lightdir); + VectorNormalize(lightdir); + VectorSubtract(rsurface_modelorg, vertex3f, eyedir); + VectorNormalize(eyedir); + VectorAdd(lightdir, eyedir, halfdir); + // the cubemap normalizes this for us + out3f[0] = DotProduct(svector3f, halfdir); + out3f[1] = DotProduct(tvector3f, halfdir); + out3f[2] = DotProduct(normal3f, halfdir); + } } } -static void R_Shadow_RenderSurfacesLighting_VisibleLighting(const entity_render_t *ent, const texture_t *texture, int numsurfaces, msurface_t **surfacelist, const vec3_t lightcolorbase, const vec3_t lightcolorpants, const vec3_t lightcolorshirt, rtexture_t *basetexture, rtexture_t *pantstexture, rtexture_t *shirttexture, rtexture_t *normalmaptexture, rtexture_t *glosstexture, float specularscale, qboolean dopants, qboolean doshirt) +static void R_Shadow_RenderSurfacesLighting_VisibleLighting(int numsurfaces, msurface_t **surfacelist, const vec3_t lightcolorbase, const vec3_t lightcolorpants, const vec3_t lightcolorshirt, rtexture_t *basetexture, rtexture_t *pantstexture, rtexture_t *shirttexture, rtexture_t *normalmaptexture, rtexture_t *glosstexture, float specularscale, qboolean dopants, qboolean doshirt) { // used to display how many times a surface is lit for level design purposes - int surfacelistindex; - model_t *model = ent->model; - GL_Color(0.1, 0.025, 0, 1); + GL_Color(0.1 * r_view.colorscale, 0.025 * r_view.colorscale, 0, 1); R_Mesh_ColorPointer(NULL); R_Mesh_ResetTextureState(); - RSurf_PrepareVerticesForBatch(ent, texture, r_shadow_entityeyeorigin, false, false, numsurfaces, surfacelist); - for (surfacelistindex = 0;surfacelistindex < numsurfaces;surfacelistindex++) - { - const msurface_t *surface = surfacelist[surfacelistindex]; - GL_LockArrays(surface->num_firstvertex, surface->num_vertices); - R_Mesh_Draw(surface->num_firstvertex, surface->num_vertices, surface->num_triangles, model->surfmesh.data_element3i + 3 * surface->num_firsttriangle); - GL_LockArrays(0, 0); - } + RSurf_PrepareVerticesForBatch(false, false, numsurfaces, surfacelist); + RSurf_DrawBatch_Simple(numsurfaces, surfacelist); + GL_LockArrays(0, 0); } -static void R_Shadow_RenderSurfacesLighting_Light_GLSL(const entity_render_t *ent, const texture_t *texture, int numsurfaces, msurface_t **surfacelist, const vec3_t lightcolorbase, const vec3_t lightcolorpants, const vec3_t lightcolorshirt, rtexture_t *basetexture, rtexture_t *pantstexture, rtexture_t *shirttexture, rtexture_t *normalmaptexture, rtexture_t *glosstexture, float specularscale, qboolean dopants, qboolean doshirt) +static void R_Shadow_RenderSurfacesLighting_Light_GLSL(int numsurfaces, msurface_t **surfacelist, const vec3_t lightcolorbase, const vec3_t lightcolorpants, const vec3_t lightcolorshirt, rtexture_t *basetexture, rtexture_t *pantstexture, rtexture_t *shirttexture, rtexture_t *normalmaptexture, rtexture_t *glosstexture, float specularscale, qboolean dopants, qboolean doshirt) { // ARB2 GLSL shader path (GFFX5200, Radeon 9500) - int surfacelistindex; - model_t *model = ent->model; - RSurf_PrepareVerticesForBatch(ent, texture, r_shadow_entityeyeorigin, true, true, numsurfaces, surfacelist); - R_SetupSurfaceShader(ent, texture, r_shadow_entityeyeorigin, lightcolorbase, false); - R_Mesh_TexCoordPointer(0, 2, model->surfmesh.data_texcoordtexture2f); + RSurf_PrepareVerticesForBatch(true, true, numsurfaces, surfacelist); + R_SetupSurfaceShader(lightcolorbase, false); + R_Mesh_TexCoordPointer(0, 2, rsurface_model->surfmesh.data_texcoordtexture2f); R_Mesh_TexCoordPointer(1, 3, rsurface_svector3f); R_Mesh_TexCoordPointer(2, 3, rsurface_tvector3f); R_Mesh_TexCoordPointer(3, 3, rsurface_normal3f); - for (surfacelistindex = 0;surfacelistindex < numsurfaces;surfacelistindex++) + if (rsurface_texture->currentmaterialflags & MATERIALFLAG_ALPHATEST) { - const msurface_t *surface = surfacelist[surfacelistindex]; - GL_LockArrays(surface->num_firstvertex, surface->num_vertices); - R_Mesh_Draw(surface->num_firstvertex, surface->num_vertices, surface->num_triangles, model->surfmesh.data_element3i + surface->num_firsttriangle * 3); + qglDepthFunc(GL_EQUAL);CHECKGLERROR } + RSurf_DrawBatch_Simple(numsurfaces, surfacelist); GL_LockArrays(0, 0); + if (rsurface_texture->currentmaterialflags & MATERIALFLAG_ALPHATEST) + { + qglDepthFunc(GL_LEQUAL);CHECKGLERROR + } } -static void R_Shadow_RenderSurfacesLighting_Light_Dot3_AmbientPass(const entity_render_t *ent, const texture_t *texture, const msurface_t *surface, const vec3_t lightcolorbase, rtexture_t *basetexture, float colorscale) +static void R_Shadow_RenderSurfacesLighting_Light_Dot3_Finalize(int numsurfaces, msurface_t **surfacelist, float r, float g, float b) { + // shared final code for all the dot3 layers int renders; - model_t *model = ent->model; - float color2[3]; + GL_ColorMask(r_view.colormask[0], r_view.colormask[1], r_view.colormask[2], 0); + for (renders = 0;renders < 64 && (r > 0 || g > 0 || b > 0);renders++, r--, g--, b--) + { + GL_Color(bound(0, r, 1), bound(0, g, 1), bound(0, b, 1), 1); + RSurf_DrawBatch_Simple(numsurfaces, surfacelist); + GL_LockArrays(0, 0); + } +} + +static void R_Shadow_RenderSurfacesLighting_Light_Dot3_AmbientPass(int numsurfaces, msurface_t **surfacelist, const vec3_t lightcolorbase, rtexture_t *basetexture, float colorscale) +{ rmeshstate_t m; - const int *elements = model->surfmesh.data_element3i + surface->num_firsttriangle * 3; - GL_Color(1,1,1,1); // colorscale accounts for how much we multiply the brightness // during combine. // @@ -1282,6 +1388,7 @@ static void R_Shadow_RenderSurfacesLighting_Light_Dot3_AmbientPass(const entity_ // performed to get more brightness than otherwise possible. // // Limit mult to 64 for sanity sake. + GL_Color(1,1,1,1); if (r_shadow_texture3d.integer && r_shadow_rtlight->currentcubemap != r_texture_whitecube && r_textureunits.integer >= 4) { // 3 3D combine path (Geforce3, Radeon 8500) @@ -1290,8 +1397,8 @@ static void R_Shadow_RenderSurfacesLighting_Light_Dot3_AmbientPass(const entity_ m.pointer_texcoord3f[0] = rsurface_vertex3f; m.texmatrix[0] = r_shadow_entitytoattenuationxyz; m.tex[1] = R_GetTexture(basetexture); - m.pointer_texcoord[1] = model->surfmesh.data_texcoordtexture2f; - m.texmatrix[1] = texture->currenttexmatrix; + m.pointer_texcoord[1] = rsurface_model->surfmesh.data_texcoordtexture2f; + m.texmatrix[1] = rsurface_texture->currenttexmatrix; m.texcubemap[2] = R_GetTexture(r_shadow_rtlight->currentcubemap); m.pointer_texcoord3f[2] = rsurface_vertex3f; m.texmatrix[2] = r_shadow_entitytolight; @@ -1305,8 +1412,8 @@ static void R_Shadow_RenderSurfacesLighting_Light_Dot3_AmbientPass(const entity_ m.pointer_texcoord3f[0] = rsurface_vertex3f; m.texmatrix[0] = r_shadow_entitytoattenuationxyz; m.tex[1] = R_GetTexture(basetexture); - m.pointer_texcoord[1] = model->surfmesh.data_texcoordtexture2f; - m.texmatrix[1] = texture->currenttexmatrix; + m.pointer_texcoord[1] = rsurface_model->surfmesh.data_texcoordtexture2f; + m.texmatrix[1] = rsurface_texture->currenttexmatrix; GL_BlendFunc(GL_ONE, GL_ONE); } else if (r_textureunits.integer >= 4 && r_shadow_rtlight->currentcubemap != r_texture_whitecube) @@ -1320,8 +1427,8 @@ static void R_Shadow_RenderSurfacesLighting_Light_Dot3_AmbientPass(const entity_ m.pointer_texcoord3f[1] = rsurface_vertex3f; m.texmatrix[1] = r_shadow_entitytoattenuationz; m.tex[2] = R_GetTexture(basetexture); - m.pointer_texcoord[2] = model->surfmesh.data_texcoordtexture2f; - m.texmatrix[2] = texture->currenttexmatrix; + m.pointer_texcoord[2] = rsurface_model->surfmesh.data_texcoordtexture2f; + m.texmatrix[2] = rsurface_texture->currenttexmatrix; if (r_shadow_rtlight->currentcubemap != r_texture_whitecube) { m.texcubemap[3] = R_GetTexture(r_shadow_rtlight->currentcubemap); @@ -1341,8 +1448,8 @@ static void R_Shadow_RenderSurfacesLighting_Light_Dot3_AmbientPass(const entity_ m.pointer_texcoord3f[1] = rsurface_vertex3f; m.texmatrix[1] = r_shadow_entitytoattenuationz; m.tex[2] = R_GetTexture(basetexture); - m.pointer_texcoord[2] = model->surfmesh.data_texcoordtexture2f; - m.texmatrix[2] = texture->currenttexmatrix; + m.pointer_texcoord[2] = rsurface_model->surfmesh.data_texcoordtexture2f; + m.texmatrix[2] = rsurface_texture->currenttexmatrix; GL_BlendFunc(GL_ONE, GL_ONE); } else @@ -1358,14 +1465,14 @@ static void R_Shadow_RenderSurfacesLighting_Light_Dot3_AmbientPass(const entity_ R_Mesh_TextureState(&m); GL_ColorMask(0,0,0,1); GL_BlendFunc(GL_ONE, GL_ZERO); - GL_LockArrays(surface->num_firstvertex, surface->num_vertices); - R_Mesh_Draw(surface->num_firstvertex, surface->num_vertices, surface->num_triangles, elements); + RSurf_DrawBatch_Simple(numsurfaces, surfacelist); GL_LockArrays(0, 0); + // second pass memset(&m, 0, sizeof(m)); m.tex[0] = R_GetTexture(basetexture); - m.pointer_texcoord[0] = model->surfmesh.data_texcoordtexture2f; - m.texmatrix[0] = texture->currenttexmatrix; + m.pointer_texcoord[0] = rsurface_model->surfmesh.data_texcoordtexture2f; + m.texmatrix[0] = rsurface_texture->currenttexmatrix; if (r_shadow_rtlight->currentcubemap != r_texture_whitecube) { m.texcubemap[1] = R_GetTexture(r_shadow_rtlight->currentcubemap); @@ -1376,25 +1483,12 @@ static void R_Shadow_RenderSurfacesLighting_Light_Dot3_AmbientPass(const entity_ } // this final code is shared R_Mesh_TextureState(&m); - GL_ColorMask(r_refdef.colormask[0], r_refdef.colormask[1], r_refdef.colormask[2], 0); - VectorScale(lightcolorbase, colorscale, color2); - GL_LockArrays(surface->num_firstvertex, surface->num_vertices); - for (renders = 0;renders < 64 && (color2[0] > 0 || color2[1] > 0 || color2[2] > 0);renders++, color2[0]--, color2[1]--, color2[2]--) - { - GL_Color(bound(0, color2[0], 1), bound(0, color2[1], 1), bound(0, color2[2], 1), 1); - R_Mesh_Draw(surface->num_firstvertex, surface->num_vertices, surface->num_triangles, elements); - } - GL_LockArrays(0, 0); + R_Shadow_RenderSurfacesLighting_Light_Dot3_Finalize(numsurfaces, surfacelist, lightcolorbase[0] * colorscale, lightcolorbase[1] * colorscale, lightcolorbase[2] * colorscale); } -static void R_Shadow_RenderSurfacesLighting_Light_Dot3_DiffusePass(const entity_render_t *ent, const texture_t *texture, const msurface_t *surface, const vec3_t lightcolorbase, rtexture_t *basetexture, rtexture_t *normalmaptexture, float colorscale) +static void R_Shadow_RenderSurfacesLighting_Light_Dot3_DiffusePass(int numsurfaces, msurface_t **surfacelist, const vec3_t lightcolorbase, rtexture_t *basetexture, rtexture_t *normalmaptexture, float colorscale) { - int renders; - model_t *model = ent->model; - float color2[3]; rmeshstate_t m; - const int *elements = model->surfmesh.data_element3i + surface->num_firsttriangle * 3; - GL_Color(1,1,1,1); // colorscale accounts for how much we multiply the brightness // during combine. // @@ -1402,32 +1496,34 @@ static void R_Shadow_RenderSurfacesLighting_Light_Dot3_DiffusePass(const entity_ // performed to get more brightness than otherwise possible. // // Limit mult to 64 for sanity sake. + GL_Color(1,1,1,1); + // generate normalization cubemap texcoords + R_Shadow_GenTexCoords_Diffuse_NormalCubeMap(numsurfaces, surfacelist); if (r_shadow_texture3d.integer && r_textureunits.integer >= 4) { // 3/2 3D combine path (Geforce3, Radeon 8500) memset(&m, 0, sizeof(m)); m.tex[0] = R_GetTexture(normalmaptexture); m.texcombinergb[0] = GL_REPLACE; - m.pointer_texcoord[0] = model->surfmesh.data_texcoordtexture2f; - m.texmatrix[0] = texture->currenttexmatrix; + m.pointer_texcoord[0] = rsurface_model->surfmesh.data_texcoordtexture2f; + m.texmatrix[0] = rsurface_texture->currenttexmatrix; m.texcubemap[1] = R_GetTexture(r_texture_normalizationcube); m.texcombinergb[1] = GL_DOT3_RGBA_ARB; m.pointer_texcoord3f[1] = rsurface_array_texcoord3f; - R_Shadow_GenTexCoords_Diffuse_NormalCubeMap(rsurface_array_texcoord3f + 3 * surface->num_firstvertex, surface->num_vertices, rsurface_vertex3f + 3 * surface->num_firstvertex, rsurface_svector3f + 3 * surface->num_firstvertex, rsurface_tvector3f + 3 * surface->num_firstvertex, rsurface_normal3f + 3 * surface->num_firstvertex, r_shadow_entitylightorigin); m.tex3d[2] = R_GetTexture(r_shadow_attenuation3dtexture); m.pointer_texcoord3f[2] = rsurface_vertex3f; m.texmatrix[2] = r_shadow_entitytoattenuationxyz; R_Mesh_TextureState(&m); GL_ColorMask(0,0,0,1); GL_BlendFunc(GL_ONE, GL_ZERO); - GL_LockArrays(surface->num_firstvertex, surface->num_vertices); - R_Mesh_Draw(surface->num_firstvertex, surface->num_vertices, surface->num_triangles, elements); + RSurf_DrawBatch_Simple(numsurfaces, surfacelist); GL_LockArrays(0, 0); + // second pass memset(&m, 0, sizeof(m)); m.tex[0] = R_GetTexture(basetexture); - m.pointer_texcoord[0] = model->surfmesh.data_texcoordtexture2f; - m.texmatrix[0] = texture->currenttexmatrix; + m.pointer_texcoord[0] = rsurface_model->surfmesh.data_texcoordtexture2f; + m.texmatrix[0] = rsurface_texture->currenttexmatrix; if (r_shadow_rtlight->currentcubemap != r_texture_whitecube) { m.texcubemap[1] = R_GetTexture(r_shadow_rtlight->currentcubemap); @@ -1446,29 +1542,28 @@ static void R_Shadow_RenderSurfacesLighting_Light_Dot3_DiffusePass(const entity_ R_Mesh_TextureState(&m); GL_ColorMask(0,0,0,1); GL_BlendFunc(GL_ONE, GL_ZERO); - GL_LockArrays(surface->num_firstvertex, surface->num_vertices); - R_Mesh_Draw(surface->num_firstvertex, surface->num_vertices, surface->num_triangles, elements); + RSurf_DrawBatch_Simple(numsurfaces, surfacelist); GL_LockArrays(0, 0); + // second pass memset(&m, 0, sizeof(m)); m.tex[0] = R_GetTexture(normalmaptexture); m.texcombinergb[0] = GL_REPLACE; - m.pointer_texcoord[0] = model->surfmesh.data_texcoordtexture2f; - m.texmatrix[0] = texture->currenttexmatrix; + m.pointer_texcoord[0] = rsurface_model->surfmesh.data_texcoordtexture2f; + m.texmatrix[0] = rsurface_texture->currenttexmatrix; m.texcubemap[1] = R_GetTexture(r_texture_normalizationcube); m.texcombinergb[1] = GL_DOT3_RGBA_ARB; m.pointer_texcoord3f[1] = rsurface_array_texcoord3f; - R_Shadow_GenTexCoords_Diffuse_NormalCubeMap(rsurface_array_texcoord3f + 3 * surface->num_firstvertex, surface->num_vertices, rsurface_vertex3f + 3 * surface->num_firstvertex, rsurface_svector3f + 3 * surface->num_firstvertex, rsurface_tvector3f + 3 * surface->num_firstvertex, rsurface_normal3f + 3 * surface->num_firstvertex, r_shadow_entitylightorigin); R_Mesh_TextureState(&m); GL_BlendFunc(GL_DST_ALPHA, GL_ZERO); - GL_LockArrays(surface->num_firstvertex, surface->num_vertices); - R_Mesh_Draw(surface->num_firstvertex, surface->num_vertices, surface->num_triangles, elements); + RSurf_DrawBatch_Simple(numsurfaces, surfacelist); GL_LockArrays(0, 0); + // second pass memset(&m, 0, sizeof(m)); m.tex[0] = R_GetTexture(basetexture); - m.pointer_texcoord[0] = model->surfmesh.data_texcoordtexture2f; - m.texmatrix[0] = texture->currenttexmatrix; + m.pointer_texcoord[0] = rsurface_model->surfmesh.data_texcoordtexture2f; + m.texmatrix[0] = rsurface_texture->currenttexmatrix; if (r_shadow_rtlight->currentcubemap != r_texture_whitecube) { m.texcubemap[1] = R_GetTexture(r_shadow_rtlight->currentcubemap); @@ -1483,23 +1578,22 @@ static void R_Shadow_RenderSurfacesLighting_Light_Dot3_DiffusePass(const entity_ memset(&m, 0, sizeof(m)); m.tex[0] = R_GetTexture(normalmaptexture); m.texcombinergb[0] = GL_REPLACE; - m.pointer_texcoord[0] = model->surfmesh.data_texcoordtexture2f; - m.texmatrix[0] = texture->currenttexmatrix; + m.pointer_texcoord[0] = rsurface_model->surfmesh.data_texcoordtexture2f; + m.texmatrix[0] = rsurface_texture->currenttexmatrix; m.texcubemap[1] = R_GetTexture(r_texture_normalizationcube); m.texcombinergb[1] = GL_DOT3_RGBA_ARB; m.pointer_texcoord3f[1] = rsurface_array_texcoord3f; - R_Shadow_GenTexCoords_Diffuse_NormalCubeMap(rsurface_array_texcoord3f + 3 * surface->num_firstvertex, surface->num_vertices, rsurface_vertex3f + 3 * surface->num_firstvertex, rsurface_svector3f + 3 * surface->num_firstvertex, rsurface_tvector3f + 3 * surface->num_firstvertex, rsurface_normal3f + 3 * surface->num_firstvertex, r_shadow_entitylightorigin); R_Mesh_TextureState(&m); GL_ColorMask(0,0,0,1); GL_BlendFunc(GL_ONE, GL_ZERO); - GL_LockArrays(surface->num_firstvertex, surface->num_vertices); - R_Mesh_Draw(surface->num_firstvertex, surface->num_vertices, surface->num_triangles, elements); + RSurf_DrawBatch_Simple(numsurfaces, surfacelist); GL_LockArrays(0, 0); + // second pass memset(&m, 0, sizeof(m)); m.tex[0] = R_GetTexture(basetexture); - m.pointer_texcoord[0] = model->surfmesh.data_texcoordtexture2f; - m.texmatrix[0] = texture->currenttexmatrix; + m.pointer_texcoord[0] = rsurface_model->surfmesh.data_texcoordtexture2f; + m.texmatrix[0] = rsurface_texture->currenttexmatrix; m.tex3d[1] = R_GetTexture(r_shadow_attenuation3dtexture); m.pointer_texcoord3f[1] = rsurface_vertex3f; m.texmatrix[1] = r_shadow_entitytoattenuationxyz; @@ -1511,12 +1605,11 @@ static void R_Shadow_RenderSurfacesLighting_Light_Dot3_DiffusePass(const entity_ memset(&m, 0, sizeof(m)); m.tex[0] = R_GetTexture(normalmaptexture); m.texcombinergb[0] = GL_REPLACE; - m.pointer_texcoord[0] = model->surfmesh.data_texcoordtexture2f; - m.texmatrix[0] = texture->currenttexmatrix; + m.pointer_texcoord[0] = rsurface_model->surfmesh.data_texcoordtexture2f; + m.texmatrix[0] = rsurface_texture->currenttexmatrix; m.texcubemap[1] = R_GetTexture(r_texture_normalizationcube); m.texcombinergb[1] = GL_DOT3_RGBA_ARB; m.pointer_texcoord3f[1] = rsurface_array_texcoord3f; - R_Shadow_GenTexCoords_Diffuse_NormalCubeMap(rsurface_array_texcoord3f + 3 * surface->num_firstvertex, surface->num_vertices, rsurface_vertex3f + 3 * surface->num_firstvertex, rsurface_svector3f + 3 * surface->num_firstvertex, rsurface_tvector3f + 3 * surface->num_firstvertex, rsurface_normal3f + 3 * surface->num_firstvertex, r_shadow_entitylightorigin); m.tex[2] = R_GetTexture(r_shadow_attenuation2dtexture); m.pointer_texcoord3f[2] = rsurface_vertex3f; m.texmatrix[2] = r_shadow_entitytoattenuationxyz; @@ -1526,14 +1619,14 @@ static void R_Shadow_RenderSurfacesLighting_Light_Dot3_DiffusePass(const entity_ R_Mesh_TextureState(&m); GL_ColorMask(0,0,0,1); GL_BlendFunc(GL_ONE, GL_ZERO); - GL_LockArrays(surface->num_firstvertex, surface->num_vertices); - R_Mesh_Draw(surface->num_firstvertex, surface->num_vertices, surface->num_triangles, elements); + RSurf_DrawBatch_Simple(numsurfaces, surfacelist); GL_LockArrays(0, 0); + // second pass memset(&m, 0, sizeof(m)); m.tex[0] = R_GetTexture(basetexture); - m.pointer_texcoord[0] = model->surfmesh.data_texcoordtexture2f; - m.texmatrix[0] = texture->currenttexmatrix; + m.pointer_texcoord[0] = rsurface_model->surfmesh.data_texcoordtexture2f; + m.texmatrix[0] = rsurface_texture->currenttexmatrix; if (r_shadow_rtlight->currentcubemap != r_texture_whitecube) { m.texcubemap[1] = R_GetTexture(r_shadow_rtlight->currentcubemap); @@ -1555,29 +1648,28 @@ static void R_Shadow_RenderSurfacesLighting_Light_Dot3_DiffusePass(const entity_ R_Mesh_TextureState(&m); GL_ColorMask(0,0,0,1); GL_BlendFunc(GL_ONE, GL_ZERO); - GL_LockArrays(surface->num_firstvertex, surface->num_vertices); - R_Mesh_Draw(surface->num_firstvertex, surface->num_vertices, surface->num_triangles, elements); + RSurf_DrawBatch_Simple(numsurfaces, surfacelist); GL_LockArrays(0, 0); + // second pass memset(&m, 0, sizeof(m)); m.tex[0] = R_GetTexture(normalmaptexture); m.texcombinergb[0] = GL_REPLACE; - m.pointer_texcoord[0] = model->surfmesh.data_texcoordtexture2f; - m.texmatrix[0] = texture->currenttexmatrix; + m.pointer_texcoord[0] = rsurface_model->surfmesh.data_texcoordtexture2f; + m.texmatrix[0] = rsurface_texture->currenttexmatrix; m.texcubemap[1] = R_GetTexture(r_texture_normalizationcube); m.texcombinergb[1] = GL_DOT3_RGBA_ARB; m.pointer_texcoord3f[1] = rsurface_array_texcoord3f; - R_Shadow_GenTexCoords_Diffuse_NormalCubeMap(rsurface_array_texcoord3f + 3 * surface->num_firstvertex, surface->num_vertices, rsurface_vertex3f + 3 * surface->num_firstvertex, rsurface_svector3f + 3 * surface->num_firstvertex, rsurface_tvector3f + 3 * surface->num_firstvertex, rsurface_normal3f + 3 * surface->num_firstvertex, r_shadow_entitylightorigin); R_Mesh_TextureState(&m); GL_BlendFunc(GL_DST_ALPHA, GL_ZERO); - GL_LockArrays(surface->num_firstvertex, surface->num_vertices); - R_Mesh_Draw(surface->num_firstvertex, surface->num_vertices, surface->num_triangles, elements); + RSurf_DrawBatch_Simple(numsurfaces, surfacelist); GL_LockArrays(0, 0); + // second pass memset(&m, 0, sizeof(m)); m.tex[0] = R_GetTexture(basetexture); - m.pointer_texcoord[0] = model->surfmesh.data_texcoordtexture2f; - m.texmatrix[0] = texture->currenttexmatrix; + m.pointer_texcoord[0] = rsurface_model->surfmesh.data_texcoordtexture2f; + m.texmatrix[0] = rsurface_texture->currenttexmatrix; if (r_shadow_rtlight->currentcubemap != r_texture_whitecube) { m.texcubemap[1] = R_GetTexture(r_shadow_rtlight->currentcubemap); @@ -1588,73 +1680,59 @@ static void R_Shadow_RenderSurfacesLighting_Light_Dot3_DiffusePass(const entity_ } // this final code is shared R_Mesh_TextureState(&m); - GL_ColorMask(r_refdef.colormask[0], r_refdef.colormask[1], r_refdef.colormask[2], 0); - VectorScale(lightcolorbase, colorscale, color2); - GL_LockArrays(surface->num_firstvertex, surface->num_vertices); - for (renders = 0;renders < 64 && (color2[0] > 0 || color2[1] > 0 || color2[2] > 0);renders++, color2[0]--, color2[1]--, color2[2]--) - { - GL_Color(bound(0, color2[0], 1), bound(0, color2[1], 1), bound(0, color2[2], 1), 1); - R_Mesh_Draw(surface->num_firstvertex, surface->num_vertices, surface->num_triangles, elements); - } - GL_LockArrays(0, 0); + R_Shadow_RenderSurfacesLighting_Light_Dot3_Finalize(numsurfaces, surfacelist, lightcolorbase[0] * colorscale, lightcolorbase[1] * colorscale, lightcolorbase[2] * colorscale); } -static void R_Shadow_RenderSurfacesLighting_Light_Dot3_SpecularPass(const entity_render_t *ent, const texture_t *texture, const msurface_t *surface, const vec3_t lightcolorbase, rtexture_t *glosstexture, rtexture_t *normalmaptexture, float colorscale) +static void R_Shadow_RenderSurfacesLighting_Light_Dot3_SpecularPass(int numsurfaces, msurface_t **surfacelist, const vec3_t lightcolorbase, rtexture_t *glosstexture, rtexture_t *normalmaptexture, float colorscale) { - int renders; - model_t *model = ent->model; - float color2[3]; + float glossexponent; rmeshstate_t m; - const int *elements = model->surfmesh.data_element3i + surface->num_firsttriangle * 3; // FIXME: detect blendsquare! //if (!gl_support_blendsquare) // return; GL_Color(1,1,1,1); - if (r_shadow_texture3d.integer && r_textureunits.integer >= 2 && r_shadow_rtlight->currentcubemap != r_texture_whitecube /* && gl_support_blendsquare*/) // FIXME: detect blendsquare! + // generate normalization cubemap texcoords + R_Shadow_GenTexCoords_Specular_NormalCubeMap(numsurfaces, surfacelist); + if (r_shadow_texture3d.integer && r_textureunits.integer >= 2 && r_shadow_rtlight->currentcubemap != r_texture_whitecube) { // 2/0/0/1/2 3D combine blendsquare path memset(&m, 0, sizeof(m)); m.tex[0] = R_GetTexture(normalmaptexture); - m.pointer_texcoord[0] = model->surfmesh.data_texcoordtexture2f; - m.texmatrix[0] = texture->currenttexmatrix; + m.pointer_texcoord[0] = rsurface_model->surfmesh.data_texcoordtexture2f; + m.texmatrix[0] = rsurface_texture->currenttexmatrix; m.texcubemap[1] = R_GetTexture(r_texture_normalizationcube); m.texcombinergb[1] = GL_DOT3_RGBA_ARB; m.pointer_texcoord3f[1] = rsurface_array_texcoord3f; - R_Shadow_GenTexCoords_Specular_NormalCubeMap(rsurface_array_texcoord3f + 3 * surface->num_firstvertex, surface->num_vertices, rsurface_vertex3f + 3 * surface->num_firstvertex, rsurface_svector3f + 3 * surface->num_firstvertex, rsurface_tvector3f + 3 * surface->num_firstvertex, rsurface_normal3f + 3 * surface->num_firstvertex, r_shadow_entitylightorigin, r_shadow_entityeyeorigin); R_Mesh_TextureState(&m); GL_ColorMask(0,0,0,1); // this squares the result GL_BlendFunc(GL_SRC_ALPHA, GL_ZERO); - GL_LockArrays(surface->num_firstvertex, surface->num_vertices); - R_Mesh_Draw(surface->num_firstvertex, surface->num_vertices, surface->num_triangles, elements); + RSurf_DrawBatch_Simple(numsurfaces, surfacelist); GL_LockArrays(0, 0); + // second and third pass R_Mesh_ResetTextureState(); - GL_LockArrays(surface->num_firstvertex, surface->num_vertices); // square alpha in framebuffer a few times to make it shiny GL_BlendFunc(GL_ZERO, GL_DST_ALPHA); - // these comments are a test run through this math for intensity 0.5 - // 0.5 * 0.5 = 0.25 (done by the BlendFunc earlier) - // 0.25 * 0.25 = 0.0625 (this is another pass) - // 0.0625 * 0.0625 = 0.00390625 (this is another pass) - R_Mesh_Draw(surface->num_firstvertex, surface->num_vertices, surface->num_triangles, elements); - R_Mesh_Draw(surface->num_firstvertex, surface->num_vertices, surface->num_triangles, elements); + for (glossexponent = 2;glossexponent * 2 <= r_shadow_glossexponent.value;glossexponent *= 2) + RSurf_DrawBatch_Simple(numsurfaces, surfacelist); GL_LockArrays(0, 0); + // fourth pass memset(&m, 0, sizeof(m)); m.tex3d[0] = R_GetTexture(r_shadow_attenuation3dtexture); m.pointer_texcoord3f[0] = rsurface_vertex3f; m.texmatrix[0] = r_shadow_entitytoattenuationxyz; R_Mesh_TextureState(&m); GL_BlendFunc(GL_DST_ALPHA, GL_ZERO); - GL_LockArrays(surface->num_firstvertex, surface->num_vertices); - R_Mesh_Draw(surface->num_firstvertex, surface->num_vertices, surface->num_triangles, elements); + RSurf_DrawBatch_Simple(numsurfaces, surfacelist); GL_LockArrays(0, 0); + // fifth pass memset(&m, 0, sizeof(m)); m.tex[0] = R_GetTexture(glosstexture); - m.pointer_texcoord[0] = model->surfmesh.data_texcoordtexture2f; - m.texmatrix[0] = texture->currenttexmatrix; + m.pointer_texcoord[0] = rsurface_model->surfmesh.data_texcoordtexture2f; + m.texmatrix[0] = rsurface_texture->currenttexmatrix; if (r_shadow_rtlight->currentcubemap != r_texture_whitecube) { m.texcubemap[1] = R_GetTexture(r_shadow_rtlight->currentcubemap); @@ -1668,36 +1746,31 @@ static void R_Shadow_RenderSurfacesLighting_Light_Dot3_SpecularPass(const entity // 2/0/0/2 3D combine blendsquare path memset(&m, 0, sizeof(m)); m.tex[0] = R_GetTexture(normalmaptexture); - m.pointer_texcoord[0] = model->surfmesh.data_texcoordtexture2f; - m.texmatrix[0] = texture->currenttexmatrix; + m.pointer_texcoord[0] = rsurface_model->surfmesh.data_texcoordtexture2f; + m.texmatrix[0] = rsurface_texture->currenttexmatrix; m.texcubemap[1] = R_GetTexture(r_texture_normalizationcube); m.texcombinergb[1] = GL_DOT3_RGBA_ARB; m.pointer_texcoord3f[1] = rsurface_array_texcoord3f; - R_Shadow_GenTexCoords_Specular_NormalCubeMap(rsurface_array_texcoord3f + 3 * surface->num_firstvertex, surface->num_vertices, rsurface_vertex3f + 3 * surface->num_firstvertex, rsurface_svector3f + 3 * surface->num_firstvertex, rsurface_tvector3f + 3 * surface->num_firstvertex, rsurface_normal3f + 3 * surface->num_firstvertex, r_shadow_entitylightorigin, r_shadow_entityeyeorigin); R_Mesh_TextureState(&m); GL_ColorMask(0,0,0,1); // this squares the result GL_BlendFunc(GL_SRC_ALPHA, GL_ZERO); - GL_LockArrays(surface->num_firstvertex, surface->num_vertices); - R_Mesh_Draw(surface->num_firstvertex, surface->num_vertices, surface->num_triangles, elements); + RSurf_DrawBatch_Simple(numsurfaces, surfacelist); GL_LockArrays(0, 0); + // second and third pass R_Mesh_ResetTextureState(); - GL_LockArrays(surface->num_firstvertex, surface->num_vertices); // square alpha in framebuffer a few times to make it shiny GL_BlendFunc(GL_ZERO, GL_DST_ALPHA); - // these comments are a test run through this math for intensity 0.5 - // 0.5 * 0.5 = 0.25 (done by the BlendFunc earlier) - // 0.25 * 0.25 = 0.0625 (this is another pass) - // 0.0625 * 0.0625 = 0.00390625 (this is another pass) - R_Mesh_Draw(surface->num_firstvertex, surface->num_vertices, surface->num_triangles, elements); - R_Mesh_Draw(surface->num_firstvertex, surface->num_vertices, surface->num_triangles, elements); + for (glossexponent = 2;glossexponent * 2 <= r_shadow_glossexponent.value;glossexponent *= 2) + RSurf_DrawBatch_Simple(numsurfaces, surfacelist); GL_LockArrays(0, 0); + // fourth pass memset(&m, 0, sizeof(m)); m.tex[0] = R_GetTexture(glosstexture); - m.pointer_texcoord[0] = model->surfmesh.data_texcoordtexture2f; - m.texmatrix[0] = texture->currenttexmatrix; + m.pointer_texcoord[0] = rsurface_model->surfmesh.data_texcoordtexture2f; + m.texmatrix[0] = rsurface_texture->currenttexmatrix; m.tex3d[1] = R_GetTexture(r_shadow_attenuation3dtexture); m.pointer_texcoord3f[1] = rsurface_vertex3f; m.texmatrix[1] = r_shadow_entitytoattenuationxyz; @@ -1708,32 +1781,27 @@ static void R_Shadow_RenderSurfacesLighting_Light_Dot3_SpecularPass(const entity // 2/0/0/2/2 2D combine blendsquare path memset(&m, 0, sizeof(m)); m.tex[0] = R_GetTexture(normalmaptexture); - m.pointer_texcoord[0] = model->surfmesh.data_texcoordtexture2f; - m.texmatrix[0] = texture->currenttexmatrix; + m.pointer_texcoord[0] = rsurface_model->surfmesh.data_texcoordtexture2f; + m.texmatrix[0] = rsurface_texture->currenttexmatrix; m.texcubemap[1] = R_GetTexture(r_texture_normalizationcube); m.texcombinergb[1] = GL_DOT3_RGBA_ARB; m.pointer_texcoord3f[1] = rsurface_array_texcoord3f; - R_Shadow_GenTexCoords_Specular_NormalCubeMap(rsurface_array_texcoord3f + 3 * surface->num_firstvertex, surface->num_vertices, rsurface_vertex3f + 3 * surface->num_firstvertex, rsurface_svector3f + 3 * surface->num_firstvertex, rsurface_tvector3f + 3 * surface->num_firstvertex, rsurface_normal3f + 3 * surface->num_firstvertex, r_shadow_entitylightorigin, r_shadow_entityeyeorigin); R_Mesh_TextureState(&m); GL_ColorMask(0,0,0,1); // this squares the result GL_BlendFunc(GL_SRC_ALPHA, GL_ZERO); - GL_LockArrays(surface->num_firstvertex, surface->num_vertices); - R_Mesh_Draw(surface->num_firstvertex, surface->num_vertices, surface->num_triangles, elements); + RSurf_DrawBatch_Simple(numsurfaces, surfacelist); GL_LockArrays(0, 0); + // second and third pass R_Mesh_ResetTextureState(); - GL_LockArrays(surface->num_firstvertex, surface->num_vertices); // square alpha in framebuffer a few times to make it shiny GL_BlendFunc(GL_ZERO, GL_DST_ALPHA); - // these comments are a test run through this math for intensity 0.5 - // 0.5 * 0.5 = 0.25 (done by the BlendFunc earlier) - // 0.25 * 0.25 = 0.0625 (this is another pass) - // 0.0625 * 0.0625 = 0.00390625 (this is another pass) - R_Mesh_Draw(surface->num_firstvertex, surface->num_vertices, surface->num_triangles, elements); - R_Mesh_Draw(surface->num_firstvertex, surface->num_vertices, surface->num_triangles, elements); + for (glossexponent = 2;glossexponent * 2 <= r_shadow_glossexponent.value;glossexponent *= 2) + RSurf_DrawBatch_Simple(numsurfaces, surfacelist); GL_LockArrays(0, 0); + // fourth pass memset(&m, 0, sizeof(m)); m.tex[0] = R_GetTexture(r_shadow_attenuation2dtexture); m.pointer_texcoord3f[0] = rsurface_vertex3f; @@ -1743,14 +1811,14 @@ static void R_Shadow_RenderSurfacesLighting_Light_Dot3_SpecularPass(const entity m.texmatrix[1] = r_shadow_entitytoattenuationz; R_Mesh_TextureState(&m); GL_BlendFunc(GL_DST_ALPHA, GL_ZERO); - GL_LockArrays(surface->num_firstvertex, surface->num_vertices); - R_Mesh_Draw(surface->num_firstvertex, surface->num_vertices, surface->num_triangles, elements); + RSurf_DrawBatch_Simple(numsurfaces, surfacelist); GL_LockArrays(0, 0); + // fifth pass memset(&m, 0, sizeof(m)); m.tex[0] = R_GetTexture(glosstexture); - m.pointer_texcoord[0] = model->surfmesh.data_texcoordtexture2f; - m.texmatrix[0] = texture->currenttexmatrix; + m.pointer_texcoord[0] = rsurface_model->surfmesh.data_texcoordtexture2f; + m.texmatrix[0] = rsurface_texture->currenttexmatrix; if (r_shadow_rtlight->currentcubemap != r_texture_whitecube) { m.texcubemap[1] = R_GetTexture(r_shadow_rtlight->currentcubemap); @@ -1759,145 +1827,169 @@ static void R_Shadow_RenderSurfacesLighting_Light_Dot3_SpecularPass(const entity } GL_BlendFunc(GL_DST_ALPHA, GL_ONE); } + // this final code is shared R_Mesh_TextureState(&m); - GL_ColorMask(r_refdef.colormask[0], r_refdef.colormask[1], r_refdef.colormask[2], 0); - VectorScale(lightcolorbase, colorscale, color2); - GL_LockArrays(surface->num_firstvertex, surface->num_vertices); - for (renders = 0;renders < 64 && (color2[0] > 0 || color2[1] > 0 || color2[2] > 0);renders++, color2[0]--, color2[1]--, color2[2]--) - { - GL_Color(bound(0, color2[0], 1), bound(0, color2[1], 1), bound(0, color2[2], 1), 1); - R_Mesh_Draw(surface->num_firstvertex, surface->num_vertices, surface->num_triangles, elements); - } - GL_LockArrays(0, 0); + R_Shadow_RenderSurfacesLighting_Light_Dot3_Finalize(numsurfaces, surfacelist, lightcolorbase[0] * colorscale, lightcolorbase[1] * colorscale, lightcolorbase[2] * colorscale); } -static void R_Shadow_RenderSurfacesLighting_Light_Dot3(const entity_render_t *ent, const texture_t *texture, int numsurfaces, msurface_t **surfacelist, const vec3_t lightcolorbase, const vec3_t lightcolorpants, const vec3_t lightcolorshirt, rtexture_t *basetexture, rtexture_t *pantstexture, rtexture_t *shirttexture, rtexture_t *normalmaptexture, rtexture_t *glosstexture, float specularscale, qboolean dopants, qboolean doshirt) +static void R_Shadow_RenderSurfacesLighting_Light_Dot3(int numsurfaces, msurface_t **surfacelist, const vec3_t lightcolorbase, const vec3_t lightcolorpants, const vec3_t lightcolorshirt, rtexture_t *basetexture, rtexture_t *pantstexture, rtexture_t *shirttexture, rtexture_t *normalmaptexture, rtexture_t *glosstexture, float specularscale, qboolean dopants, qboolean doshirt) { // ARB path (any Geforce, any Radeon) - int surfacelistindex; qboolean doambient = r_shadow_rtlight->ambientscale > 0; qboolean dodiffuse = r_shadow_rtlight->diffusescale > 0; qboolean dospecular = specularscale > 0; if (!doambient && !dodiffuse && !dospecular) return; - RSurf_PrepareVerticesForBatch(ent, texture, r_shadow_entityeyeorigin, true, true, numsurfaces, surfacelist); + RSurf_PrepareVerticesForBatch(true, true, numsurfaces, surfacelist); R_Mesh_ColorPointer(NULL); - for (surfacelistindex = 0;surfacelistindex < numsurfaces;surfacelistindex++) + if (doambient) + R_Shadow_RenderSurfacesLighting_Light_Dot3_AmbientPass(numsurfaces, surfacelist, lightcolorbase, basetexture, r_shadow_rtlight->ambientscale * r_view.colorscale); + if (dodiffuse) + R_Shadow_RenderSurfacesLighting_Light_Dot3_DiffusePass(numsurfaces, surfacelist, lightcolorbase, basetexture, normalmaptexture, r_shadow_rtlight->diffusescale * r_view.colorscale); + if (dopants) { - const msurface_t *surface = surfacelist[surfacelistindex]; if (doambient) - R_Shadow_RenderSurfacesLighting_Light_Dot3_AmbientPass(ent, texture, surface, lightcolorbase, basetexture, r_shadow_rtlight->ambientscale); + R_Shadow_RenderSurfacesLighting_Light_Dot3_AmbientPass(numsurfaces, surfacelist, lightcolorpants, pantstexture, r_shadow_rtlight->ambientscale * r_view.colorscale); if (dodiffuse) - R_Shadow_RenderSurfacesLighting_Light_Dot3_DiffusePass(ent, texture, surface, lightcolorbase, basetexture, normalmaptexture, r_shadow_rtlight->diffusescale); - if (dopants) - { - if (doambient) - R_Shadow_RenderSurfacesLighting_Light_Dot3_AmbientPass(ent, texture, surface, lightcolorpants, pantstexture, r_shadow_rtlight->ambientscale); - if (dodiffuse) - R_Shadow_RenderSurfacesLighting_Light_Dot3_DiffusePass(ent, texture, surface, lightcolorpants, pantstexture, normalmaptexture, r_shadow_rtlight->diffusescale); - } - if (doshirt) - { - if (doambient) - R_Shadow_RenderSurfacesLighting_Light_Dot3_AmbientPass(ent, texture, surface, lightcolorshirt, shirttexture, r_shadow_rtlight->ambientscale); - if (dodiffuse) - R_Shadow_RenderSurfacesLighting_Light_Dot3_DiffusePass(ent, texture, surface, lightcolorshirt, shirttexture, normalmaptexture, r_shadow_rtlight->diffusescale); - } - if (dospecular) - R_Shadow_RenderSurfacesLighting_Light_Dot3_SpecularPass(ent, texture, surface, lightcolorbase, glosstexture, normalmaptexture, specularscale); + R_Shadow_RenderSurfacesLighting_Light_Dot3_DiffusePass(numsurfaces, surfacelist, lightcolorpants, pantstexture, normalmaptexture, r_shadow_rtlight->diffusescale * r_view.colorscale); + } + if (doshirt) + { + if (doambient) + R_Shadow_RenderSurfacesLighting_Light_Dot3_AmbientPass(numsurfaces, surfacelist, lightcolorshirt, shirttexture, r_shadow_rtlight->ambientscale * r_view.colorscale); + if (dodiffuse) + R_Shadow_RenderSurfacesLighting_Light_Dot3_DiffusePass(numsurfaces, surfacelist, lightcolorshirt, shirttexture, normalmaptexture, r_shadow_rtlight->diffusescale * r_view.colorscale); } + if (dospecular) + R_Shadow_RenderSurfacesLighting_Light_Dot3_SpecularPass(numsurfaces, surfacelist, lightcolorbase, glosstexture, normalmaptexture, specularscale * r_view.colorscale); } -void R_Shadow_RenderSurfacesLighting_Light_Vertex_Pass(const model_t *model, const msurface_t *surface, vec3_t diffusecolor2, vec3_t ambientcolor2) +void R_Shadow_RenderSurfacesLighting_Light_Vertex_Pass(const model_t *model, int numsurfaces, msurface_t **surfacelist, vec3_t diffusecolor2, vec3_t ambientcolor2) { + int surfacelistindex; int renders; - const int *elements = model->surfmesh.data_element3i + surface->num_firsttriangle * 3; - R_Shadow_RenderSurfacesLighting_Light_Vertex_Shading(surface, diffusecolor2, ambientcolor2); - for (renders = 0;renders < 64 && (ambientcolor2[0] > renders || ambientcolor2[1] > renders || ambientcolor2[2] > renders || diffusecolor2[0] > renders || diffusecolor2[1] > renders || diffusecolor2[2] > renders);renders++) + for (surfacelistindex = 0;surfacelistindex < numsurfaces;surfacelistindex++) + { + const msurface_t *surface = surfacelist[surfacelistindex]; + R_Shadow_RenderSurfacesLighting_Light_Vertex_Shading(surface, diffusecolor2, ambientcolor2); + } + for (renders = 0;renders < 64;renders++) { - int i; - float *c; -#if 1 - // due to low fillrate on the cards this vertex lighting path is - // designed for, we manually cull all triangles that do not - // contain a lit vertex - int draw; const int *e; + int stop; + int firstvertex; + int lastvertex; int newnumtriangles; int *newe; int newelements[3072]; - draw = false; + stop = true; + firstvertex = 0; + lastvertex = 0; newnumtriangles = 0; newe = newelements; - for (i = 0, e = elements;i < surface->num_triangles;i++, e += 3) - { - if (newnumtriangles >= 1024) - { - GL_LockArrays(surface->num_firstvertex, surface->num_vertices); - R_Mesh_Draw(surface->num_firstvertex, surface->num_vertices, newnumtriangles, newelements); - GL_LockArrays(0, 0); - newnumtriangles = 0; - newe = newelements; - } - if (VectorLength2(rsurface_array_color4f + e[0] * 4) + VectorLength2(rsurface_array_color4f + e[1] * 4) + VectorLength2(rsurface_array_color4f + e[2] * 4) >= 0.01) + for (surfacelistindex = 0;surfacelistindex < numsurfaces;surfacelistindex++) + { + const msurface_t *surface = surfacelist[surfacelistindex]; + const int *elements = rsurface_model->surfmesh.data_element3i + surface->num_firsttriangle * 3; + int i; + // due to low fillrate on the cards this vertex lighting path is + // designed for, we manually cull all triangles that do not + // contain a lit vertex + // this builds batches of triangles from multiple surfaces and + // renders them at once + for (i = 0, e = elements;i < surface->num_triangles;i++, e += 3) { - newe[0] = e[0]; - newe[1] = e[1]; - newe[2] = e[2]; - newnumtriangles++; - newe += 3; - draw = true; + if (VectorLength2(rsurface_array_color4f + e[0] * 4) + VectorLength2(rsurface_array_color4f + e[1] * 4) + VectorLength2(rsurface_array_color4f + e[2] * 4) >= 0.01) + { + if (newnumtriangles) + { + firstvertex = min(firstvertex, e[0]); + lastvertex = max(lastvertex, e[0]); + } + else + { + firstvertex = e[0]; + lastvertex = e[0]; + } + firstvertex = min(firstvertex, e[1]); + lastvertex = max(lastvertex, e[1]); + firstvertex = min(firstvertex, e[2]); + lastvertex = max(lastvertex, e[2]); + newe[0] = e[0]; + newe[1] = e[1]; + newe[2] = e[2]; + newnumtriangles++; + newe += 3; + if (newnumtriangles >= 1024) + { + GL_LockArrays(firstvertex, lastvertex - firstvertex + 1); + R_Mesh_Draw(firstvertex, lastvertex - firstvertex + 1, newnumtriangles, newelements); + newnumtriangles = 0; + newe = newelements; + stop = false; + } + } } } if (newnumtriangles >= 1) { - GL_LockArrays(surface->num_firstvertex, surface->num_vertices); - R_Mesh_Draw(surface->num_firstvertex, surface->num_vertices, newnumtriangles, newelements); - GL_LockArrays(0, 0); - draw = true; + GL_LockArrays(firstvertex, lastvertex - firstvertex + 1); + R_Mesh_Draw(firstvertex, lastvertex - firstvertex + 1, newnumtriangles, newelements); + stop = false; } - if (!draw) - break; -#else - for (i = 0, c = rsurface_array_color4f + 4 * surface->num_firstvertex;i < surface->num_vertices;i++, c += 4) - if (VectorLength2(c)) - goto goodpass; - break; -goodpass: - GL_LockArrays(surface->num_firstvertex, surface->num_vertices); - R_Mesh_Draw(surface->num_firstvertex, surface->num_vertices, surface->num_triangles, elements); GL_LockArrays(0, 0); -#endif + // if we couldn't find any lit triangles, exit early + if (stop) + break; // now reduce the intensity for the next overbright pass - for (i = 0, c = rsurface_array_color4f + 4 * surface->num_firstvertex;i < surface->num_vertices;i++, c += 4) - { - c[0] = max(0, c[0] - 1); - c[1] = max(0, c[1] - 1); - c[2] = max(0, c[2] - 1); + // we have to clamp to 0 here incase the drivers have improper + // handling of negative colors + // (some old drivers even have improper handling of >1 color) + stop = true; + for (surfacelistindex = 0;surfacelistindex < numsurfaces;surfacelistindex++) + { + int i; + float *c; + const msurface_t *surface = surfacelist[surfacelistindex]; + for (i = 0, c = rsurface_array_color4f + 4 * surface->num_firstvertex;i < surface->num_vertices;i++, c += 4) + { + if (c[0] > 1 || c[1] > 1 || c[2] > 1) + { + c[0] = max(0, c[0] - 1); + c[1] = max(0, c[1] - 1); + c[2] = max(0, c[2] - 1); + stop = false; + } + else + VectorClear(c); + } } + // another check... + if (stop) + break; } } -static void R_Shadow_RenderSurfacesLighting_Light_Vertex(const entity_render_t *ent, const texture_t *texture, int numsurfaces, msurface_t **surfacelist, const vec3_t lightcolorbase, const vec3_t lightcolorpants, const vec3_t lightcolorshirt, rtexture_t *basetexture, rtexture_t *pantstexture, rtexture_t *shirttexture, rtexture_t *normalmaptexture, rtexture_t *glosstexture, float specularscale, qboolean dopants, qboolean doshirt) +static void R_Shadow_RenderSurfacesLighting_Light_Vertex(int numsurfaces, msurface_t **surfacelist, const vec3_t lightcolorbase, const vec3_t lightcolorpants, const vec3_t lightcolorshirt, rtexture_t *basetexture, rtexture_t *pantstexture, rtexture_t *shirttexture, rtexture_t *normalmaptexture, rtexture_t *glosstexture, float specularscale, qboolean dopants, qboolean doshirt) { - int surfacelistindex; - model_t *model = ent->model; + // OpenGL 1.1 path (anything) + model_t *model = rsurface_entity->model; float ambientcolorbase[3], diffusecolorbase[3]; float ambientcolorpants[3], diffusecolorpants[3]; float ambientcolorshirt[3], diffusecolorshirt[3]; rmeshstate_t m; - VectorScale(lightcolorbase, r_shadow_rtlight->ambientscale * 2, ambientcolorbase); - VectorScale(lightcolorbase, r_shadow_rtlight->diffusescale * 2, diffusecolorbase); - VectorScale(lightcolorpants, r_shadow_rtlight->ambientscale * 2, ambientcolorpants); - VectorScale(lightcolorpants, r_shadow_rtlight->diffusescale * 2, diffusecolorpants); - VectorScale(lightcolorshirt, r_shadow_rtlight->ambientscale * 2, ambientcolorshirt); - VectorScale(lightcolorshirt, r_shadow_rtlight->diffusescale * 2, diffusecolorshirt); + VectorScale(lightcolorbase, r_shadow_rtlight->ambientscale * 2 * r_view.colorscale, ambientcolorbase); + VectorScale(lightcolorbase, r_shadow_rtlight->diffusescale * 2 * r_view.colorscale, diffusecolorbase); + VectorScale(lightcolorpants, r_shadow_rtlight->ambientscale * 2 * r_view.colorscale, ambientcolorpants); + VectorScale(lightcolorpants, r_shadow_rtlight->diffusescale * 2 * r_view.colorscale, diffusecolorpants); + VectorScale(lightcolorshirt, r_shadow_rtlight->ambientscale * 2 * r_view.colorscale, ambientcolorshirt); + VectorScale(lightcolorshirt, r_shadow_rtlight->diffusescale * 2 * r_view.colorscale, diffusecolorshirt); GL_BlendFunc(GL_SRC_ALPHA, GL_ONE); R_Mesh_ColorPointer(rsurface_array_color4f); memset(&m, 0, sizeof(m)); m.tex[0] = R_GetTexture(basetexture); - m.texmatrix[0] = texture->currenttexmatrix; - m.pointer_texcoord[0] = model->surfmesh.data_texcoordtexture2f; + m.texmatrix[0] = rsurface_texture->currenttexmatrix; + m.pointer_texcoord[0] = rsurface_model->surfmesh.data_texcoordtexture2f; if (r_textureunits.integer >= 2) { // voodoo2 or TNT @@ -1913,73 +2005,67 @@ static void R_Shadow_RenderSurfacesLighting_Light_Vertex(const entity_render_t * } } R_Mesh_TextureState(&m); - RSurf_PrepareVerticesForBatch(ent, texture, r_shadow_entityeyeorigin, true, false, numsurfaces, surfacelist); - for (surfacelistindex = 0;surfacelistindex < numsurfaces;surfacelistindex++) + RSurf_PrepareVerticesForBatch(true, false, numsurfaces, surfacelist); + R_Mesh_TexBind(0, R_GetTexture(basetexture)); + R_Shadow_RenderSurfacesLighting_Light_Vertex_Pass(model, numsurfaces, surfacelist, diffusecolorbase, ambientcolorbase); + if (dopants) { - const msurface_t *surface = surfacelist[surfacelistindex]; - // OpenGL 1.1 path (anything) - R_Mesh_TexBind(0, R_GetTexture(basetexture)); - R_Shadow_RenderSurfacesLighting_Light_Vertex_Pass(model, surface, diffusecolorbase, ambientcolorbase); - if (dopants) - { - R_Mesh_TexBind(0, R_GetTexture(pantstexture)); - R_Shadow_RenderSurfacesLighting_Light_Vertex_Pass(model, surface, diffusecolorpants, ambientcolorpants); - } - if (doshirt) - { - R_Mesh_TexBind(0, R_GetTexture(shirttexture)); - R_Shadow_RenderSurfacesLighting_Light_Vertex_Pass(model, surface, diffusecolorshirt, ambientcolorshirt); - } + R_Mesh_TexBind(0, R_GetTexture(pantstexture)); + R_Shadow_RenderSurfacesLighting_Light_Vertex_Pass(model, numsurfaces, surfacelist, diffusecolorpants, ambientcolorpants); + } + if (doshirt) + { + R_Mesh_TexBind(0, R_GetTexture(shirttexture)); + R_Shadow_RenderSurfacesLighting_Light_Vertex_Pass(model, numsurfaces, surfacelist, diffusecolorshirt, ambientcolorshirt); } } -void R_Shadow_RenderSurfacesLighting(const entity_render_t *ent, const texture_t *texture, int numsurfaces, msurface_t **surfacelist) +void R_Shadow_RenderSurfacesLighting(int numsurfaces, msurface_t **surfacelist) { // FIXME: support MATERIALFLAG_NODEPTHTEST vec3_t lightcolorbase, lightcolorpants, lightcolorshirt; // calculate colors to render this texture with - lightcolorbase[0] = r_shadow_rtlight->currentcolor[0] * ent->colormod[0] * texture->currentalpha; - lightcolorbase[1] = r_shadow_rtlight->currentcolor[1] * ent->colormod[1] * texture->currentalpha; - lightcolorbase[2] = r_shadow_rtlight->currentcolor[2] * ent->colormod[2] * texture->currentalpha; - if ((r_shadow_rtlight->ambientscale + r_shadow_rtlight->diffusescale) * VectorLength2(lightcolorbase) + (r_shadow_rtlight->specularscale * texture->specularscale) * VectorLength2(lightcolorbase) < (1.0f / 1048576.0f)) + lightcolorbase[0] = r_shadow_rtlight->currentcolor[0] * rsurface_entity->colormod[0] * rsurface_texture->currentalpha; + lightcolorbase[1] = r_shadow_rtlight->currentcolor[1] * rsurface_entity->colormod[1] * rsurface_texture->currentalpha; + lightcolorbase[2] = r_shadow_rtlight->currentcolor[2] * rsurface_entity->colormod[2] * rsurface_texture->currentalpha; + if ((r_shadow_rtlight->ambientscale + r_shadow_rtlight->diffusescale) * VectorLength2(lightcolorbase) + (r_shadow_rtlight->specularscale * rsurface_texture->specularscale) * VectorLength2(lightcolorbase) < (1.0f / 1048576.0f)) return; - if ((texture->textureflags & Q3TEXTUREFLAG_TWOSIDED) || (ent->flags & RENDER_NOCULLFACE)) - qglDisable(GL_CULL_FACE); - else - qglEnable(GL_CULL_FACE); - if (texture->colormapping) + GL_DepthTest(!(rsurface_texture->currentmaterialflags & MATERIALFLAG_NODEPTHTEST)); + GL_CullFace(((rsurface_texture->textureflags & Q3TEXTUREFLAG_TWOSIDED) || (rsurface_entity->flags & RENDER_NOCULLFACE)) ? GL_NONE : GL_FRONT); // quake is backwards, this culls back faces + if (rsurface_texture->colormapping) { - qboolean dopants = texture->skin.pants != NULL && VectorLength2(ent->colormap_pantscolor) >= (1.0f / 1048576.0f); - qboolean doshirt = texture->skin.shirt != NULL && VectorLength2(ent->colormap_shirtcolor) >= (1.0f / 1048576.0f); + qboolean dopants = rsurface_texture->currentskinframe->pants != NULL && VectorLength2(rsurface_entity->colormap_pantscolor) >= (1.0f / 1048576.0f); + qboolean doshirt = rsurface_texture->currentskinframe->shirt != NULL && VectorLength2(rsurface_entity->colormap_shirtcolor) >= (1.0f / 1048576.0f); if (dopants) { - lightcolorpants[0] = lightcolorbase[0] * ent->colormap_pantscolor[0]; - lightcolorpants[1] = lightcolorbase[1] * ent->colormap_pantscolor[1]; - lightcolorpants[2] = lightcolorbase[2] * ent->colormap_pantscolor[2]; + lightcolorpants[0] = lightcolorbase[0] * rsurface_entity->colormap_pantscolor[0]; + lightcolorpants[1] = lightcolorbase[1] * rsurface_entity->colormap_pantscolor[1]; + lightcolorpants[2] = lightcolorbase[2] * rsurface_entity->colormap_pantscolor[2]; } else VectorClear(lightcolorpants); if (doshirt) { - lightcolorshirt[0] = lightcolorbase[0] * ent->colormap_shirtcolor[0]; - lightcolorshirt[1] = lightcolorbase[1] * ent->colormap_shirtcolor[1]; - lightcolorshirt[2] = lightcolorbase[2] * ent->colormap_shirtcolor[2]; + lightcolorshirt[0] = lightcolorbase[0] * rsurface_entity->colormap_shirtcolor[0]; + lightcolorshirt[1] = lightcolorbase[1] * rsurface_entity->colormap_shirtcolor[1]; + lightcolorshirt[2] = lightcolorbase[2] * rsurface_entity->colormap_shirtcolor[2]; } else VectorClear(lightcolorshirt); switch (r_shadow_rendermode) { case R_SHADOW_RENDERMODE_VISIBLELIGHTING: - R_Shadow_RenderSurfacesLighting_VisibleLighting(ent, texture, numsurfaces, surfacelist, lightcolorbase, lightcolorpants, lightcolorshirt, texture->basetexture, texture->skin.pants, texture->skin.shirt, texture->skin.nmap, texture->glosstexture, r_shadow_rtlight->specularscale * texture->specularscale, dopants, doshirt); + GL_DepthTest(!(rsurface_texture->currentmaterialflags & MATERIALFLAG_NODEPTHTEST) && !r_showdisabledepthtest.integer); + R_Shadow_RenderSurfacesLighting_VisibleLighting(numsurfaces, surfacelist, lightcolorbase, lightcolorpants, lightcolorshirt, rsurface_texture->basetexture, rsurface_texture->currentskinframe->pants, rsurface_texture->currentskinframe->shirt, rsurface_texture->currentskinframe->nmap, rsurface_texture->glosstexture, r_shadow_rtlight->specularscale * rsurface_texture->specularscale, dopants, doshirt); break; case R_SHADOW_RENDERMODE_LIGHT_GLSL: - R_Shadow_RenderSurfacesLighting_Light_GLSL(ent, texture, numsurfaces, surfacelist, lightcolorbase, lightcolorpants, lightcolorshirt, texture->basetexture, texture->skin.pants, texture->skin.shirt, texture->skin.nmap, texture->glosstexture, r_shadow_rtlight->specularscale * texture->specularscale, dopants, doshirt); + R_Shadow_RenderSurfacesLighting_Light_GLSL(numsurfaces, surfacelist, lightcolorbase, lightcolorpants, lightcolorshirt, rsurface_texture->basetexture, rsurface_texture->currentskinframe->pants, rsurface_texture->currentskinframe->shirt, rsurface_texture->currentskinframe->nmap, rsurface_texture->glosstexture, r_shadow_rtlight->specularscale * rsurface_texture->specularscale, dopants, doshirt); break; case R_SHADOW_RENDERMODE_LIGHT_DOT3: - R_Shadow_RenderSurfacesLighting_Light_Dot3(ent, texture, numsurfaces, surfacelist, lightcolorbase, lightcolorpants, lightcolorshirt, texture->basetexture, texture->skin.pants, texture->skin.shirt, texture->skin.nmap, texture->glosstexture, r_shadow_rtlight->specularscale * texture->specularscale, dopants, doshirt); + R_Shadow_RenderSurfacesLighting_Light_Dot3(numsurfaces, surfacelist, lightcolorbase, lightcolorpants, lightcolorshirt, rsurface_texture->basetexture, rsurface_texture->currentskinframe->pants, rsurface_texture->currentskinframe->shirt, rsurface_texture->currentskinframe->nmap, rsurface_texture->glosstexture, r_shadow_rtlight->specularscale * rsurface_texture->specularscale, dopants, doshirt); break; case R_SHADOW_RENDERMODE_LIGHT_VERTEX: - R_Shadow_RenderSurfacesLighting_Light_Vertex(ent, texture, numsurfaces, surfacelist, lightcolorbase, lightcolorpants, lightcolorshirt, texture->basetexture, texture->skin.pants, texture->skin.shirt, texture->skin.nmap, texture->glosstexture, r_shadow_rtlight->specularscale * texture->specularscale, dopants, doshirt); + R_Shadow_RenderSurfacesLighting_Light_Vertex(numsurfaces, surfacelist, lightcolorbase, lightcolorpants, lightcolorshirt, rsurface_texture->basetexture, rsurface_texture->currentskinframe->pants, rsurface_texture->currentskinframe->shirt, rsurface_texture->currentskinframe->nmap, rsurface_texture->glosstexture, r_shadow_rtlight->specularscale * rsurface_texture->specularscale, dopants, doshirt); break; default: Con_Printf("R_Shadow_RenderSurfacesLighting: unknown r_shadow_rendermode %i\n", r_shadow_rendermode); @@ -1991,16 +2077,17 @@ void R_Shadow_RenderSurfacesLighting(const entity_render_t *ent, const texture_t switch (r_shadow_rendermode) { case R_SHADOW_RENDERMODE_VISIBLELIGHTING: - R_Shadow_RenderSurfacesLighting_VisibleLighting(ent, texture, numsurfaces, surfacelist, lightcolorbase, vec3_origin, vec3_origin, texture->basetexture, r_texture_black, r_texture_black, texture->skin.nmap, texture->glosstexture, r_shadow_rtlight->specularscale * texture->specularscale, false, false); + GL_DepthTest(!(rsurface_texture->currentmaterialflags & MATERIALFLAG_NODEPTHTEST) && !r_showdisabledepthtest.integer); + R_Shadow_RenderSurfacesLighting_VisibleLighting(numsurfaces, surfacelist, lightcolorbase, vec3_origin, vec3_origin, rsurface_texture->basetexture, r_texture_black, r_texture_black, rsurface_texture->currentskinframe->nmap, rsurface_texture->glosstexture, r_shadow_rtlight->specularscale * rsurface_texture->specularscale, false, false); break; case R_SHADOW_RENDERMODE_LIGHT_GLSL: - R_Shadow_RenderSurfacesLighting_Light_GLSL(ent, texture, numsurfaces, surfacelist, lightcolorbase, vec3_origin, vec3_origin, texture->basetexture, r_texture_black, r_texture_black, texture->skin.nmap, texture->glosstexture, r_shadow_rtlight->specularscale * texture->specularscale, false, false); + R_Shadow_RenderSurfacesLighting_Light_GLSL(numsurfaces, surfacelist, lightcolorbase, vec3_origin, vec3_origin, rsurface_texture->basetexture, r_texture_black, r_texture_black, rsurface_texture->currentskinframe->nmap, rsurface_texture->glosstexture, r_shadow_rtlight->specularscale * rsurface_texture->specularscale, false, false); break; case R_SHADOW_RENDERMODE_LIGHT_DOT3: - R_Shadow_RenderSurfacesLighting_Light_Dot3(ent, texture, numsurfaces, surfacelist, lightcolorbase, vec3_origin, vec3_origin, texture->basetexture, r_texture_black, r_texture_black, texture->skin.nmap, texture->glosstexture, r_shadow_rtlight->specularscale * texture->specularscale, false, false); + R_Shadow_RenderSurfacesLighting_Light_Dot3(numsurfaces, surfacelist, lightcolorbase, vec3_origin, vec3_origin, rsurface_texture->basetexture, r_texture_black, r_texture_black, rsurface_texture->currentskinframe->nmap, rsurface_texture->glosstexture, r_shadow_rtlight->specularscale * rsurface_texture->specularscale, false, false); break; case R_SHADOW_RENDERMODE_LIGHT_VERTEX: - R_Shadow_RenderSurfacesLighting_Light_Vertex(ent, texture, numsurfaces, surfacelist, lightcolorbase, vec3_origin, vec3_origin, texture->basetexture, r_texture_black, r_texture_black, texture->skin.nmap, texture->glosstexture, r_shadow_rtlight->specularscale * texture->specularscale, false, false); + R_Shadow_RenderSurfacesLighting_Light_Vertex(numsurfaces, surfacelist, lightcolorbase, vec3_origin, vec3_origin, rsurface_texture->basetexture, r_texture_black, r_texture_black, rsurface_texture->currentskinframe->nmap, rsurface_texture->glosstexture, r_shadow_rtlight->specularscale * rsurface_texture->specularscale, false, false); break; default: Con_Printf("R_Shadow_RenderSurfacesLighting: unknown r_shadow_rendermode %i\n", r_shadow_rendermode); @@ -2011,8 +2098,7 @@ void R_Shadow_RenderSurfacesLighting(const entity_render_t *ent, const texture_t void R_RTLight_Update(dlight_t *light, int isstatic) { - int j, k; - float scale; + double scale; rtlight_t *rtlight = &light->rtlight; R_RTLight_Uncompile(rtlight); memset(rtlight, 0, sizeof(*rtlight)); @@ -2030,7 +2116,7 @@ void R_RTLight_Update(dlight_t *light, int isstatic) rtlight->cullmaxs[2] = rtlight->shadoworigin[2] + rtlight->radius; rtlight->cubemapname[0] = 0; if (light->cubemapname[0]) - strcpy(rtlight->cubemapname, light->cubemapname); + strlcpy(rtlight->cubemapname, light->cubemapname, sizeof(rtlight->cubemapname)); else if (light->cubemapnum > 0) sprintf(rtlight->cubemapname, "cubemaps/%i", light->cubemapnum); rtlight->shadow = light->shadow; @@ -2043,12 +2129,11 @@ void R_RTLight_Update(dlight_t *light, int isstatic) rtlight->specularscale = light->specularscale; rtlight->flags = light->flags; Matrix4x4_Invert_Simple(&rtlight->matrix_worldtolight, &light->matrix); - // ConcatScale won't work here because this needs to scale rotate and - // translate, not just rotate - scale = 1.0f / rtlight->radius; - for (k = 0;k < 3;k++) - for (j = 0;j < 4;j++) - rtlight->matrix_worldtolight.m[k][j] *= scale; + // this has to scale both rotate and translate because this is an already + // inverted matrix (it transforms from world to light space, not the other + // way around) + scale = 1.0 / rtlight->radius; + Matrix4x4_Scale(&rtlight->matrix_worldtolight, scale, scale); } // compiles rtlight geometry @@ -2096,7 +2181,7 @@ void R_RTLight_Compile(rtlight_t *rtlight) if (numsurfaces) memcpy(rtlight->static_surfacelist, r_shadow_buffer_surfacelist, rtlight->static_numsurfaces * sizeof(*rtlight->static_surfacelist)); if (model->CompileShadowVolume && rtlight->shadow) - model->CompileShadowVolume(ent, rtlight->shadoworigin, rtlight->radius, numsurfaces, r_shadow_buffer_surfacelist); + model->CompileShadowVolume(ent, rtlight->shadoworigin, NULL, rtlight->radius, numsurfaces, r_shadow_buffer_surfacelist); // now we're done compiling the rtlight r_shadow_compilingrtlight = NULL; } @@ -2160,29 +2245,31 @@ void R_Shadow_DrawEntityShadow(entity_render_t *ent, int numsurfaces, int *surfa { shadowmesh_t *mesh; R_Mesh_Matrix(&ent->matrix); + CHECKGLERROR for (mesh = r_shadow_rtlight->static_meshchain_shadow;mesh;mesh = mesh->next) { - renderstats.lights_shadowtriangles += mesh->numtriangles; + r_refdef.stats.lights_shadowtriangles += mesh->numtriangles; R_Mesh_VertexPointer(mesh->vertex3f); GL_LockArrays(0, mesh->numverts); if (r_shadow_rendermode == R_SHADOW_RENDERMODE_STENCIL) { // decrement stencil if backface is behind depthbuffer - qglCullFace(GL_BACK); // quake is backwards, this culls front faces - qglStencilOp(GL_KEEP, GL_DECR, GL_KEEP); + GL_CullFace(GL_BACK); // quake is backwards, this culls front faces + qglStencilOp(GL_KEEP, GL_DECR, GL_KEEP);CHECKGLERROR R_Mesh_Draw(0, mesh->numverts, mesh->numtriangles, mesh->element3i); // increment stencil if frontface is behind depthbuffer - qglCullFace(GL_FRONT); // quake is backwards, this culls back faces - qglStencilOp(GL_KEEP, GL_INCR, GL_KEEP); + GL_CullFace(GL_FRONT); // quake is backwards, this culls back faces + qglStencilOp(GL_KEEP, GL_INCR, GL_KEEP);CHECKGLERROR } R_Mesh_Draw(0, mesh->numverts, mesh->numtriangles, mesh->element3i); GL_LockArrays(0, 0); } + CHECKGLERROR } else if (numsurfaces) { R_Mesh_Matrix(&ent->matrix); - model->DrawShadowVolume(ent, r_shadow_rtlight->shadoworigin, r_shadow_rtlight->radius, numsurfaces, surfacelist, r_shadow_rtlight->cullmins, r_shadow_rtlight->cullmaxs); + model->DrawShadowVolume(ent, r_shadow_rtlight->shadoworigin, NULL, r_shadow_rtlight->radius, numsurfaces, surfacelist, r_shadow_rtlight->cullmins, r_shadow_rtlight->cullmaxs); } } else @@ -2196,19 +2283,20 @@ void R_Shadow_DrawEntityShadow(entity_render_t *ent, int numsurfaces, int *surfa relativeshadowmaxs[1] = relativeshadoworigin[1] + relativeshadowradius; relativeshadowmaxs[2] = relativeshadoworigin[2] + relativeshadowradius; R_Mesh_Matrix(&ent->matrix); - model->DrawShadowVolume(ent, relativeshadoworigin, relativeshadowradius, model->nummodelsurfaces, model->surfacelist, relativeshadowmins, relativeshadowmaxs); + model->DrawShadowVolume(ent, relativeshadoworigin, NULL, relativeshadowradius, model->nummodelsurfaces, model->surfacelist, relativeshadowmins, relativeshadowmaxs); } } void R_Shadow_SetupEntityLight(const entity_render_t *ent) { // set up properties for rendering light onto this entity + RSurf_ActiveEntity(ent, true, true); Matrix4x4_Concat(&r_shadow_entitytolight, &r_shadow_rtlight->matrix_worldtolight, &ent->matrix); Matrix4x4_Concat(&r_shadow_entitytoattenuationxyz, &matrix_attenuationxyz, &r_shadow_entitytolight); Matrix4x4_Concat(&r_shadow_entitytoattenuationz, &matrix_attenuationz, &r_shadow_entitytolight); Matrix4x4_Transform(&ent->inversematrix, r_shadow_rtlight->shadoworigin, r_shadow_entitylightorigin); - Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, r_shadow_entityeyeorigin); - R_Mesh_Matrix(&ent->matrix); + if (r_shadow_lightingrendermode == R_SHADOW_RENDERMODE_LIGHT_GLSL) + R_Mesh_TexMatrix(3, &r_shadow_entitytolight); } void R_Shadow_DrawEntityLight(entity_render_t *ent, int numsurfaces, int *surfacelist) @@ -2304,7 +2392,7 @@ void R_DrawRTLight(rtlight_t *rtlight, qboolean visible) if (numleafs) { for (i = 0;i < numleafs;i++) - if (r_worldleafvisible[leaflist[i]]) + if (r_viewcache.world_leafvisible[leaflist[i]]) break; if (i == numleafs) return; @@ -2335,9 +2423,11 @@ void R_DrawRTLight(rtlight_t *rtlight, qboolean visible) && (r_refdef.worldmodel == NULL || r_refdef.worldmodel->brush.BoxTouchingLeafPVS == NULL || r_refdef.worldmodel->brush.BoxTouchingLeafPVS(r_refdef.worldmodel, leafpvs, ent->mins, ent->maxs))) { // about the VectorDistance2 - light emitting entities should not cast their own shadow - if ((ent->flags & RENDER_SHADOW) && model->DrawShadowVolume && VectorDistance2(ent->origin, rtlight->shadoworigin) > 0.1) + vec3_t org; + Matrix4x4_OriginFromMatrix(&ent->matrix, org); + if ((ent->flags & RENDER_SHADOW) && model->DrawShadowVolume && VectorDistance2(org, rtlight->shadoworigin) > 0.1) shadowentities[numshadowentities++] = ent; - if (ent->visframe == r_framecount && (ent->flags & RENDER_LIGHT) && model->DrawLight) + if (r_viewcache.entityvisible[i] && (ent->flags & RENDER_LIGHT) && model->DrawLight) lightentities[numlightentities++] = ent; } } @@ -2354,10 +2444,10 @@ void R_DrawRTLight(rtlight_t *rtlight, qboolean visible) // make this the active rtlight for rendering purposes R_Shadow_RenderMode_ActiveLight(rtlight); // count this light in the r_speeds - renderstats.lights++; + r_refdef.stats.lights++; usestencil = false; - if (numshadowentities && rtlight->shadow && (rtlight->isstatic ? r_rtworldshadows : r_rtdlightshadows)) + if (numshadowentities && rtlight->shadow && (rtlight->isstatic ? r_refdef.rtworldshadows : r_refdef.rtdlightshadows)) { // draw stencil shadow volumes to mask off pixels that are in shadow // so that they won't receive lighting @@ -2407,7 +2497,7 @@ void R_ShadowVolumeLighting(qboolean visible) R_Shadow_RenderMode_Begin(); - flag = r_rtworld ? LIGHTFLAG_REALTIMEMODE : LIGHTFLAG_NORMALMODE; + flag = r_refdef.rtworld ? LIGHTFLAG_REALTIMEMODE : LIGHTFLAG_NORMALMODE; if (r_shadow_debuglight.integer >= 0) { for (lnum = 0, light = r_shadow_worldlightchain;light;lnum++, light = light->next) @@ -2418,13 +2508,100 @@ void R_ShadowVolumeLighting(qboolean visible) for (lnum = 0, light = r_shadow_worldlightchain;light;lnum++, light = light->next) if (light->flags & flag) R_DrawRTLight(&light->rtlight, visible); - if (r_rtdlight) + if (r_refdef.rtdlight) for (lnum = 0;lnum < r_refdef.numlights;lnum++) R_DrawRTLight(&r_refdef.lights[lnum]->rtlight, visible); R_Shadow_RenderMode_End(); } +extern void R_SetupView(const matrix4x4_t *matrix); +extern cvar_t r_shadows_throwdistance; +void R_DrawModelShadows(void) +{ + int i; + float relativethrowdistance; + entity_render_t *ent; + vec3_t relativelightorigin; + vec3_t relativelightdirection; + vec3_t relativeshadowmins, relativeshadowmaxs; + float vertex3f[12]; + + if (!r_drawentities.integer || !gl_stencil) + return; + + CHECKGLERROR + GL_Scissor(r_view.x, r_view.y, r_view.width, r_view.height); + + r_shadow_rendermode = R_SHADOW_RENDERMODE_NONE; + + if (gl_ext_stenciltwoside.integer) + r_shadow_shadowingrendermode = R_SHADOW_RENDERMODE_STENCILTWOSIDE; + else + r_shadow_shadowingrendermode = R_SHADOW_RENDERMODE_STENCIL; + + R_Shadow_RenderMode_StencilShadowVolumes(); + + for (i = 0;i < r_refdef.numentities;i++) + { + ent = r_refdef.entities[i]; + // cast shadows from anything that is not a submodel of the map + if (ent->model && ent->model->DrawShadowVolume != NULL && !ent->model->brush.submodel && (ent->flags & RENDER_SHADOW)) + { + relativethrowdistance = r_shadows_throwdistance.value * Matrix4x4_ScaleFromMatrix(&ent->inversematrix); + VectorSet(relativeshadowmins, -relativethrowdistance, -relativethrowdistance, -relativethrowdistance); + VectorSet(relativeshadowmaxs, relativethrowdistance, relativethrowdistance, relativethrowdistance); + VectorNegate(ent->modellight_lightdir, relativelightdirection); + VectorScale(relativelightdirection, -relativethrowdistance, relativelightorigin); + R_Mesh_Matrix(&ent->matrix); + ent->model->DrawShadowVolume(ent, relativelightorigin, relativelightdirection, relativethrowdistance, ent->model->nummodelsurfaces, ent->model->surfacelist, relativeshadowmins, relativeshadowmaxs); + } + } + + // not really the right mode, but this will disable any silly stencil features + R_Shadow_RenderMode_VisibleLighting(true, true); + + // vertex coordinates for a quad that covers the screen exactly + vertex3f[0] = 0;vertex3f[1] = 0;vertex3f[2] = 0; + vertex3f[3] = 1;vertex3f[4] = 0;vertex3f[5] = 0; + vertex3f[6] = 1;vertex3f[7] = 1;vertex3f[8] = 0; + vertex3f[9] = 0;vertex3f[10] = 1;vertex3f[11] = 0; + + // set up ortho view for rendering this pass + GL_SetupView_Mode_Ortho(0, 0, 1, 1, -10, 100); + GL_Scissor(r_view.x, r_view.y, r_view.width, r_view.height); + GL_ColorMask(r_view.colormask[0], r_view.colormask[1], r_view.colormask[2], 1); + GL_ScissorTest(true); + R_Mesh_Matrix(&identitymatrix); + R_Mesh_ResetTextureState(); + R_Mesh_VertexPointer(vertex3f); + R_Mesh_ColorPointer(NULL); + + // set up a 50% darkening blend on shadowed areas + GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + GL_DepthTest(false); + GL_DepthMask(false); + qglPolygonOffset(r_refdef.polygonfactor, r_refdef.polygonoffset);CHECKGLERROR + GL_Color(0, 0, 0, 0.5); + GL_ColorMask(r_view.colormask[0], r_view.colormask[1], r_view.colormask[2], 1); + qglDepthFunc(GL_ALWAYS);CHECKGLERROR + qglEnable(GL_STENCIL_TEST);CHECKGLERROR + qglStencilMask(~0);CHECKGLERROR + qglStencilOp(GL_KEEP, GL_KEEP, GL_KEEP);CHECKGLERROR + qglStencilFunc(GL_NOTEQUAL, 128, ~0);CHECKGLERROR + + // apply the blend to the shadowed areas + R_Mesh_Draw(0, 4, 2, polygonelements); + + // restore perspective view + R_SetupView(&r_view.matrix); + + // restore other state to normal + GL_DepthTest(true); + R_Shadow_RenderMode_End(); +} + + //static char *suffix[6] = {"ft", "bk", "rt", "lf", "up", "dn"}; typedef struct suffixinfo_s { @@ -2532,7 +2709,7 @@ rtexture_t *R_Shadow_Cubemap(const char *basename) if (i >= MAX_CUBEMAPS) return r_texture_whitecube; numcubemaps++; - strcpy(cubemaps[i].basename, basename); + strlcpy(cubemaps[i].basename, basename, sizeof(cubemaps[i].basename)); cubemaps[i].texture = R_Shadow_LoadCubemap(cubemaps[i].basename); if (!cubemaps[i].texture) cubemaps[i].texture = r_texture_whitecube; @@ -2613,14 +2790,17 @@ void R_Shadow_SelectLight(dlight_t *light) r_shadow_selectedlight->selected = true; } -void R_Shadow_DrawCursor_TransparentCallback(const entity_render_t *ent, int surfacenumber, const rtlight_t *rtlight) +void R_Shadow_DrawCursor_TransparentCallback(const entity_render_t *ent, const rtlight_t *rtlight, int numsurfaces, int *surfacelist) { + // this is never batched (there can be only one) float scale = r_editlights_cursorgrid.value * 0.5f; - R_DrawSprite(GL_SRC_ALPHA, GL_ONE, r_crosshairs[1]->tex, NULL, false, r_editlights_cursorlocation, r_viewright, r_viewup, scale, -scale, -scale, scale, 1, 1, 1, 0.5f); + R_DrawSprite(GL_SRC_ALPHA, GL_ONE, r_crosshairs[1]->tex, NULL, false, r_editlights_cursorlocation, r_view.right, r_view.up, scale, -scale, -scale, scale, 1, 1, 1, 0.5f); } -void R_Shadow_DrawLightSprite_TransparentCallback(const entity_render_t *ent, int surfacenumber, const rtlight_t *rtlight) +void R_Shadow_DrawLightSprite_TransparentCallback(const entity_render_t *ent, const rtlight_t *rtlight, int numsurfaces, int *surfacelist) { + // this is never batched (due to the ent parameter changing every time) + // so numsurfaces == 1 and surfacelist[0] == lightnumber float intensity; const dlight_t *light = (dlight_t *)ent; intensity = 0.5; @@ -2628,7 +2808,7 @@ void R_Shadow_DrawLightSprite_TransparentCallback(const entity_render_t *ent, in intensity = 0.75 + 0.25 * sin(realtime * M_PI * 4.0); if (!light->shadow) intensity *= 0.5f; - R_DrawSprite(GL_SRC_ALPHA, GL_ONE, r_crosshairs[surfacenumber]->tex, NULL, false, light->origin, r_viewright, r_viewup, 8, -8, -8, 8, intensity, intensity, intensity, 0.5); + R_DrawSprite(GL_SRC_ALPHA, GL_ONE, r_crosshairs[surfacelist[0]]->tex, NULL, false, light->origin, r_view.right, r_view.up, 8, -8, -8, 8, intensity, intensity, intensity, 0.5); } void R_Shadow_DrawLightSprites(void) @@ -2649,12 +2829,12 @@ void R_Shadow_SelectLightInView(void) bestrating = 0; for (light = r_shadow_worldlightchain;light;light = light->next) { - VectorSubtract(light->origin, r_vieworigin, temp); - rating = (DotProduct(temp, r_viewforward) / sqrt(DotProduct(temp, temp))); + VectorSubtract(light->origin, r_view.origin, temp); + rating = (DotProduct(temp, r_view.forward) / sqrt(DotProduct(temp, temp))); if (rating >= 0.95) { rating /= (1 + 0.0625f * sqrt(DotProduct(temp, temp))); - if (bestrating < rating && CL_TraceBox(light->origin, vec3_origin, vec3_origin, r_vieworigin, true, NULL, SUPERCONTENTS_SOLID, false).fraction == 1.0f) + if (bestrating < rating && CL_TraceBox(light->origin, vec3_origin, vec3_origin, r_view.origin, true, NULL, SUPERCONTENTS_SOLID, false).fraction == 1.0f) { bestrating = rating; best = light; @@ -2734,8 +2914,10 @@ void R_Shadow_LoadWorldLights(void) // remove quotes on cubemapname if (cubemapname[0] == '"' && cubemapname[strlen(cubemapname) - 1] == '"') { - cubemapname[strlen(cubemapname)-1] = 0; - strcpy(cubemapname, cubemapname + 1); + size_t namelen; + namelen = strlen(cubemapname) - 2; + memmove(cubemapname, cubemapname + 1, namelen); + cubemapname[namelen] = '\0'; } if (a < 8) { @@ -2879,7 +3061,7 @@ void R_Shadow_LoadWorldLightsFromMap_LightArghliteTyrlite(void) data = r_refdef.worldmodel->brush.entities; if (!data) return; - for (entnum = 0;COM_ParseToken(&data, false) && com_token[0] == '{';entnum++) + for (entnum = 0;COM_ParseTokenConsole(&data) && com_token[0] == '{';entnum++) { type = LIGHTTYPE_MINUSX; origin[0] = origin[1] = origin[2] = 0; @@ -2897,19 +3079,19 @@ void R_Shadow_LoadWorldLightsFromMap_LightArghliteTyrlite(void) islight = false; while (1) { - if (!COM_ParseToken(&data, false)) + if (!COM_ParseTokenConsole(&data)) break; // error if (com_token[0] == '}') break; // end of entity if (com_token[0] == '_') - strcpy(key, com_token + 1); + strlcpy(key, com_token + 1, sizeof(key)); else - strcpy(key, com_token); + strlcpy(key, com_token, sizeof(key)); while (key[strlen(key)-1] == ' ') // remove trailing spaces key[strlen(key)-1] = 0; - if (!COM_ParseToken(&data, false)) + if (!COM_ParseTokenConsole(&data)) break; // error - strcpy(value, com_token); + strlcpy(value, com_token, sizeof(value)); // now that we have the key pair worked out... if (!strcmp("light", key)) @@ -3080,8 +3262,8 @@ void R_Shadow_SetCursorLocationForView(void) vec_t dist, push; vec3_t dest, endpos; trace_t trace; - VectorMA(r_vieworigin, r_editlights_cursordistance.value, r_viewforward, dest); - trace = CL_TraceBox(r_vieworigin, vec3_origin, vec3_origin, dest, true, NULL, SUPERCONTENTS_SOLID, false); + VectorMA(r_view.origin, r_editlights_cursordistance.value, r_view.forward, dest); + trace = CL_TraceBox(r_view.origin, vec3_origin, vec3_origin, dest, true, NULL, SUPERCONTENTS_SOLID, false); if (trace.fraction < 1) { dist = trace.fraction * r_editlights_cursordistance.value; @@ -3089,7 +3271,7 @@ void R_Shadow_SetCursorLocationForView(void) if (push > dist) push = dist; push = -push; - VectorMA(trace.endpos, push, r_viewforward, endpos); + VectorMA(trace.endpos, push, r_view.forward, endpos); VectorMA(endpos, r_editlights_cursorpushoff.value, trace.plane.normal, endpos); } else @@ -3384,7 +3566,7 @@ void R_Shadow_EditLights_Edit_f(void) return; } if (Cmd_Argc() == 3) - strcpy(cubemapname, Cmd_Argv(2)); + strlcpy(cubemapname, Cmd_Argv(2), sizeof(cubemapname)); else cubemapname[0] = 0; } @@ -3654,7 +3836,7 @@ void R_Shadow_EditLights_CopyInfo_f(void) r_shadow_bufferlight.radius = r_shadow_selectedlight->radius; r_shadow_bufferlight.style = r_shadow_selectedlight->style; if (r_shadow_selectedlight->cubemapname) - strcpy(r_shadow_bufferlight.cubemapname, r_shadow_selectedlight->cubemapname); + strlcpy(r_shadow_bufferlight.cubemapname, r_shadow_selectedlight->cubemapname, sizeof(r_shadow_bufferlight.cubemapname)); else r_shadow_bufferlight.cubemapname[0] = 0; r_shadow_bufferlight.shadow = r_shadow_selectedlight->shadow;