mirror of
https://github.com/ZDoom/gzdoom-last-svn.git
synced 2025-06-02 02:01:19 +00:00
* Updated to ZDoom r3257:
- Removed some unnecessary r_ header #includes. - Separated sprite and skin maintenance code from r_things.cpp into a separate file. - Moved r_interpolate.cpp and r_translate.cpp to r_data. - Merged r_jpeg.h into jpegtexture.cpp because that's the only place where it's ever used. - Rename src/resources to src/r_data. - Fixed: p_sectors.cpp wouldn't compile. - Moved side_t::GetLightLevel out of software rendering code. - Moved render style and border drawing code out of r_draw.cpp. - Moved all code not specific to the software renderer out of r_bsp.cpp. * Adapted GL files to changes. git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@1222 b0f79afe-0144-0410-b225-9a4edf0717df
This commit is contained in:
parent
05888b9577
commit
5540b6fefc
110 changed files with 1795 additions and 1737 deletions
|
@ -44,9 +44,9 @@
|
|||
#include "i_video.h"
|
||||
#include "i_system.h"
|
||||
#include "a_sharedglobal.h"
|
||||
#include "r_translate.h"
|
||||
#include "r_data/r_translate.h"
|
||||
#include "p_3dmidtex.h"
|
||||
#include "r_interpolate.h"
|
||||
#include "r_data/r_interpolate.h"
|
||||
#include "r_bsp.h"
|
||||
#include "r_plane.h"
|
||||
#include "r_3dfloors.h"
|
||||
|
@ -54,7 +54,7 @@
|
|||
#include "po_man.h"
|
||||
#include "st_start.h"
|
||||
#include "v_font.h"
|
||||
#include "resources/colormaps.h"
|
||||
#include "r_data/colormaps.h"
|
||||
//#include "gl/data/gl_data.h"
|
||||
#include "gl/gl_functions.h"
|
||||
|
||||
|
@ -816,6 +816,8 @@ void R_Init ()
|
|||
{
|
||||
atterm (R_Shutdown);
|
||||
|
||||
clearbufshort (zeroarray, MAXWIDTH, 0);
|
||||
|
||||
StartScreen->Progress();
|
||||
V_InitFonts();
|
||||
StartScreen->Progress();
|
||||
|
@ -830,6 +832,7 @@ void R_Init ()
|
|||
R_SetViewSize (screenblocks);
|
||||
R_InitPlanes ();
|
||||
R_InitTranslationTables ();
|
||||
R_InitShadeMaps();
|
||||
R_InitParticles (); // [RH] Setup particle engine
|
||||
R_InitColumnDrawers ();
|
||||
|
||||
|
@ -1408,35 +1411,6 @@ void R_SetupFrame (AActor *actor)
|
|||
}
|
||||
}
|
||||
|
||||
//==========================================================================
|
||||
//
|
||||
// R_RefreshViewBorder
|
||||
//
|
||||
// Draws the border around the player view, if needed.
|
||||
//
|
||||
//==========================================================================
|
||||
|
||||
void R_RefreshViewBorder ()
|
||||
{
|
||||
if (setblocks < 10)
|
||||
{
|
||||
if (BorderNeedRefresh)
|
||||
{
|
||||
BorderNeedRefresh--;
|
||||
if (BorderTopRefresh)
|
||||
{
|
||||
BorderTopRefresh--;
|
||||
}
|
||||
R_DrawViewBorder();
|
||||
}
|
||||
else if (BorderTopRefresh)
|
||||
{
|
||||
BorderTopRefresh--;
|
||||
R_DrawTopBorder();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//==========================================================================
|
||||
//
|
||||
// R_EnterMirror
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue