From: havoc Date: Sun, 14 Mar 2004 09:58:53 +0000 (+0000) Subject: fixed 2d attenuation texturing (it was all black due to an attenuationz matrix bug) X-Git-Tag: xonotic-v0.1.0preview~5991 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=97a90fe3eba97cf8de7163ddc018bdff04ace6cb;p=xonotic%2Fdarkplaces.git fixed 2d attenuation texturing (it was all black due to an attenuationz matrix bug) git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@4019 d7cf8633-e32d-0410-b094-e92efae38249 --- diff --git a/r_shadow.c b/r_shadow.c index 2c077ffb..e62ff118 100644 --- a/r_shadow.c +++ b/r_shadow.c @@ -352,8 +352,8 @@ matrix4x4_t matrix_attenuationz = { { {0.0, 0.0, 0.5, 0.5}, - {0.0, 0.0, 0.0, 0.0}, - {0.0, 0.0, 0.0, 0.0}, + {0.0, 0.0, 0.0, 0.5}, + {0.0, 0.0, 0.0, 0.5}, {0.0, 0.0, 0.0, 1.0} } }; @@ -1223,6 +1223,8 @@ void R_Shadow_RenderLighting(int numverts, int numtriangles, const int *elements bumptexture = r_shadow_blankbumptexture; if (!glosstexture) glosstexture = r_shadow_blankglosstexture; + GL_DepthMask(false); + GL_DepthTest(true); if (gl_dot3arb && gl_texturecubemap && gl_combine.integer && gl_stencil) { if (lighting & LIGHTING_DIFFUSE) @@ -1745,8 +1747,6 @@ void R_Shadow_RenderLighting(int numverts, int numtriangles, const int *elements if (lighting & LIGHTING_DIFFUSE) { GL_BlendFunc(GL_SRC_ALPHA, GL_ONE); - GL_DepthMask(false); - GL_DepthTest(true); VectorScale(lightcolor, r_shadow_lightintensityscale.value, color2); memset(&m, 0, sizeof(m)); m.pointer_vertex = vertex3f; diff --git a/todo b/todo index 5cb49ca0..97bc7503 100644 --- a/todo +++ b/todo @@ -45,6 +45,9 @@ d darkplaces: typing ip in join game menu should show 'trying' and 'no response' -n darkplaces: write a readme (Antti) -n dpmod: make grapple off-hand (joe hill) -n darkplaces: add DP_SV_ROTATINGBMODEL extension to explain that MOVETYPE_PUSH/SOLID_BSP support rotation in darkplaces and a demonstration of how to use it without qc modifications (Uffe, Supajoe) +d darkplaces: fix 2D attenuation texturing which is all black +0 darkplaces: allow typing characters > 128 to allow Latin1 fonts to be used properly (Urre) +0 darkplaces: make sure the engine uses only the first 32 special chars, so the high set can be replaced (Urre) 0 dpmod: make spawning use viewzoom to start zoomed out 2.0 and then zoom in to 1.0 (Urre) 0 darkplaces: add DP_SENSITIVITYSCALE extension which scales sensitivity on client like viewzoom does, but without affecting fov, note if this is non-zero it overrides viewzoom sensitivity entirely, it does not scale it (Urre) 0 darkplaces: bump protocol number again and expand viewzoom to two bytes (8bit.8bit fixedpoint instead of 0.8bit like it is now) (Urre)