zdoom/gzdoom-last-svn
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-last-svn.git synced 2025-06-02 02:01:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

- update to ZDoom r3205:

Browse source 
Fixed: The sign in Eternall.wad, map25 on line 2236 rendered at the wrong height because Doom ignored the Y locations of patches drawn on two-sided midtextures and always drew them at the top of the texture. Added a compatibility flag.
    Added FDARI's ACS savestring submission.
    Added optional fullthrustdistance to A_RadiusThrust to specify the distance at which thrust starts diminishing.
    Added r_shadercolormaps cvar. Set it to false to disable shaders for fixed colormap effects (e.g. invulnerability). This should only be necessary for SM1.4 cards with buggy drivers. I doubt the problem is very widespread. The one piece of SM1.4 hardware I obtained specifically for testing purposes has no problems using shaders for these effects.
    Added Gez's A_WolfAttack submission.

git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@1213 b0f79afe-0144-0410-b225-9a4edf0717df
This commit is contained in:
Christoph Oelckers 2011-05-13 07:03:52 +00:00
parent 84ef9ea80c
commit da70509e65
20 changed files with 277 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/r_main.cpp
View file

@ -117,6 +117,7 @@ CVAR (String, r_viewsize, "", CVAR_NOSET)
CVAR (Int, r_polymost, 0, 0)
CVAR (Bool, r_deathcamera, false, CVAR_ARCHIVE)
CVAR (Int, r_clearbuffer, 0, 0)
CVAR (Bool, r_shadercolormaps, true, CVAR_ARCHIVE)
fixed_t r_BaseVisibility;
fixed_t r_WallVisibility;
@ -1264,7 +1265,7 @@ void R_SetupFrame (AActor *actor)
if (player->fixedcolormap >= 0 && player->fixedcolormap < (int)SpecialColormaps.Size())
{
realfixedcolormap = &SpecialColormaps[player->fixedcolormap];
if (RenderTarget == screen && (DFrameBuffer *)screen->Accel2D)
if (RenderTarget == screen && (DFrameBuffer *)screen->Accel2D && r_shadercolormaps)
{
// Render everything fullbright. The copy to video memory will
// apply the special colormap, so it won't be restricted to the
@ -1657,6 +1658,13 @@ void R_RenderActorView (AActor *actor, bool dontmaplines)
WallMirrors.Clear ();
interpolator.RestoreInterpolations ();
R_SetupBuffer ();
// If we don't want shadered colormaps, NULL it now so that the
// copy to the screen does not use a special colormap shader.
if (!r_shadercolormaps)
{
realfixedcolormap = NULL;
}
}
//==========================================================================