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 r 3261:

Browse source 
Removed unneeded includes of r_local.h.
    Removed more r_ header dependencies from the rest of the code.
    took all includes of farchive.h out of headers. This file will have to be included explicitly in each source file that needs it.
    Changed AlterWeaponSprite so that it doesn't take a full vissprite as parameter.
    FCoverageBuffer is only used in r_things.cpp, so its declaration does not need to be in a global header that's included everywhere.

git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@1223 b0f79afe-0144-0410-b225-9a4edf0717df
This commit is contained in:
Christoph Oelckers 2011-07-06 18:59:20 +00:00
parent 5540b6fefc
commit 4e74a881b6
133 changed files with 737 additions and 623 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/r_main.cpp
View file

@ -39,6 +39,7 @@
#include "r_sky.h"
#include "st_stuff.h"
#include "c_cvars.h"
#include "c_dispatch.h"
#include "v_video.h"
#include "stats.h"
#include "i_video.h"
@ -52,10 +53,11 @@
#include "r_3dfloors.h"
#include "v_palette.h"
#include "po_man.h"
#include "p_effect.h"
#include "st_start.h"
#include "v_font.h"
#include "r_data/colormaps.h"
//#include "gl/data/gl_data.h"
#include "farchive.h"
#include "gl/gl_functions.h"
EXTERN_CVAR(Int, vid_renderer)
@ -99,7 +101,6 @@ extern bool DrawFSHUD; // [RH] Defined in d_main.cpp
extern short *openings;
extern bool r_fakingunderwater;
extern "C" int fuzzviewheight;
EXTERN_CVAR (Bool, r_particles)
EXTERN_CVAR (Bool, cl_capfps)
// PRIVATE DATA DECLARATIONS -----------------------------------------------
@ -628,6 +629,32 @@ float R_GetVisibility ()
return CurrentVisibility;
}
//==========================================================================
//
// CCMD r_visibility
//
// Controls how quickly light ramps across a 1/z range. Set this, and it
// sets all the r_*Visibility variables (except r_SkyVisibilily, which is
// currently unused).
//
//==========================================================================
CCMD (r_visibility)
{
if (argv.argc() < 2)
{
Printf ("Visibility is %g\n", R_GetVisibility());
}
else if (!netgame)
{
R_SetVisibility ((float)atof (argv[1]));
}
else
{
Printf ("Visibility cannot be changed in net games.\n");
}
}
//==========================================================================
//
// R_SetViewSize
@ -833,7 +860,6 @@ void R_Init ()
R_InitPlanes ();
R_InitTranslationTables ();
R_InitShadeMaps();
R_InitParticles (); // [RH] Setup particle engine
R_InitColumnDrawers ();
colfunc = basecolfunc = R_DrawColumn;
@ -857,7 +883,6 @@ void R_Init ()
static void R_Shutdown ()
{
R_DeinitParticles();
R_DeinitTranslationTables();
R_DeinitPlanes();
R_DeinitColormaps ();
@ -1599,7 +1624,7 @@ void R_RenderActorView (AActor *actor, bool dontmaplines)
r_fakingunderwater = false;
// [RH] Setup particles for this frame
R_FindParticleSubsectors ();
P_FindParticleSubsectors ();
WallCycles.Clock();
DWORD savedflags = camera->renderflags;