fixed black fullbrights on models in realtime mode

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@3923 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/gl_models.c b/gl_models.c
index 46e13975a01b0de58ec0b8bcaa01351520f1af35..8757229ba9fe52c46e9e9de6eb1691b979a3bada 100644 (file)
--- a/gl_models.c
+++ b/gl_models.c
@@ -247,11 +247,6 @@ void R_DrawAliasModelCallback (const void *calldata1, int calldata2)
                else
                {
                        fullbright = !(layer->flags & ALIASLAYER_DIFFUSE) || r_fullbright.integer || (ent->effects & EF_FULLBRIGHT);
-                       if (r_shadow_realtime_world.integer && r_shadow_realtime_world_lightmaps.value <= 0 && !fullbright)
-                       {
-                               colorscale *= r_ambient.value * (2.0f / 128.0f);
-                               fullbright = true;
-                       }
                        if (layer->flags & (ALIASLAYER_COLORMAP_PANTS | ALIASLAYER_COLORMAP_SHIRT))
                        {
                                // 128-224 are backwards ranges
@@ -266,7 +261,7 @@ void R_DrawAliasModelCallback (const void *calldata1, int calldata2)
                        }
                        else
                                tint[0] = tint[1] = tint[2] = 1;
-                       if (r_shadow_realtime_world.integer)
+                       if (r_shadow_realtime_world.integer && !fullbright)
                                VectorScale(tint, r_shadow_realtime_world_lightmaps.value, tint);
                        colorscale *= ifog;
                        if (fullbright)

diff --git a/todo b/todo
index f8f0c158f1d9bf3b74e15984553c3c87c8251746..34c163c590c821c7ef0c2b3feacfc9c9b8ea9129 100644 (file)
--- a/todo
+++ b/todo
@@ -34,6 +34,14 @@
 -n darkplaces: segfault reading memory in windows when starting a new server from menu (yummyluv)
 -n darkplaces: server is starting before the "port" cvar is set by commandline and scripts? (yummyluv)
 -n darkplaces: typing ip in join game menu should show 'trying' and 'no response' after a while, or 'no network' if networking is not initialized (yummyluv)
+d darkplaces: figure out why fullbrights are black on models (romi)
+0 darkplaces: add support for .float corona and corona_radius to control corona intensity and radius on dlights (Electro) 
+0 darkplaces: add "skin" and "pflags" parsing to light entity loader in rtlights mode (Electro)  
+0 darkplaces: fix the mouse move when console is raised, probably by ignoring the first move after console raise (mashakos)
+0 darkplaces: optimize Collision_TraceBrushBrush to compare enterfrac changes to realfraction and skip out if further, also leavefrac changes to skip out (Vic)
+0 darkplaces: clean up Collision_TraceBrushBrush to have another temp variable besides f and clean up the enterfrac2 handling (Vic)
+0 darkplaces: generate tvectors the same as svectors in bumpvector calculations (Riot)
+0 darkplaces: corona on your own muzzleflash is annoying when looking down because it can be seen (flum)
 0 darkplaces: add procedural ripple distortion texture of some sort for use with envmap reflections (FrikaC)
 0 darkplaces: fix q3bsp fogging (Sajt)
 0 darkplaces: add fov to menu