From 57406e43783f505dda876114be63175a7bb95245 Mon Sep 17 00:00:00 2001 From: havoc Date: Tue, 21 Mar 2006 10:31:54 +0000 Subject: [PATCH] fixed bug that made deluxemapping gloss appear even with rtworld on git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@6163 d7cf8633-e32d-0410-b094-e92efae38249 --- gl_rmain.c | 2 +- todo | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gl_rmain.c b/gl_rmain.c index 721b27ab..4bc35ef4 100644 --- a/gl_rmain.c +++ b/gl_rmain.c @@ -1065,7 +1065,7 @@ void R_SetupSurfaceShader(const entity_render_t *ent, const texture_t *texture, { if (r_glsl_permutation->loc_AmbientScale >= 0) qglUniform1fARB(r_glsl_permutation->loc_AmbientScale, r_ambient.value * 2.0f / 128.0f); if (r_glsl_permutation->loc_DiffuseScale >= 0) qglUniform1fARB(r_glsl_permutation->loc_DiffuseScale, r_lightmapintensity * 2.0f); - if (r_glsl_permutation->loc_SpecularScale >= 0) qglUniform1fARB(r_glsl_permutation->loc_SpecularScale, specularscale * 2.0f); + if (r_glsl_permutation->loc_SpecularScale >= 0) qglUniform1fARB(r_glsl_permutation->loc_SpecularScale, r_lightmapintensity * specularscale * 2.0f); } if (r_glsl_permutation->loc_Texture_Normal >= 0) R_Mesh_TexBind(0, R_GetTexture(texture->skin.nmap)); if (r_glsl_permutation->loc_Texture_Color >= 0) R_Mesh_TexBind(1, R_GetTexture(texture->basetexture)); diff --git a/todo b/todo index a25e73b3..7af9f1b8 100644 --- a/todo +++ b/todo @@ -47,8 +47,8 @@ 0 bug darkplaces csqc: engine-based rocket entities have a trail but they don't glow if csqc is used 0 bug darkplaces loader: make rtlight entity loader support q3map/q3map2 lights properly, they use a spawnflag for LINEAR mode, by default they use 1/(x*x) falloff (Carni, motorsep) 0 bug darkplaces loader: occasional crash due to memory corruption when doing "deathmatch 1;map start" during demo loop (Willis) -0 bug darkplaces renderer: glsl lighting path is not using GL_SRC_ALPHA, GL_ONE -0 bug darkplaces renderer: in full rtlighting mode, deluxemapping gloss still shows up (the diffuse and ambient does not) +d bug darkplaces renderer: glsl lighting path is not using GL_SRC_ALPHA, GL_ONE +d bug darkplaces renderer: in full rtlighting mode, deluxemapping gloss still shows up (the diffuse and ambient does not) 0 bug darkplaces renderer: modify r_showtris_polygonoffset to push back all filled geometry, not lines, because polygonoffset will not affect GL_LINES at all 0 bug darkplaces renderer: monsters teleporting in really slow down rendering, perhaps the teleport light is casting huge shadows? new information suggests it is the particles. (romi, lcatlnx) 0 bug darkplaces renderer: r_glsl 1 mode has black grapple beam in nexuiz (SavageX) -- 2.39.2