OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- more hw_cvars cleanup.

Browse source 
Copied several range checks from Raze, moved vid_gamma to hw_cvars.cpp and removed some old and no longer necessary gamma setup code.
This commit is contained in:
Christoph Oelckers 2020-04-26 10:58:44 +02:00
commit 61c94c25ed
4 changed files with 39 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/r_data/v_palette.cpp
View file

@ -34,12 +34,6 @@
#include "g_level.h"
#ifdef _WIN32
#include <io.h>
#else
#define O_BINARY 0
#endif
#include "templates.h"
#include "v_video.h"
#include "filesystem.h"
@ -54,39 +48,6 @@
/* Current color blending values */
int BlendR, BlendG, BlendB, BlendA;
/**************************/
/* Gamma correction stuff */
/**************************/
uint8_t newgamma[256];
CUSTOM_CVAR (Float, vid_gamma, 1.f, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
{
if (self == 0.f)
{ // Gamma values of 0 are illegal.
self = 1.f;
return;
}
if (screen != NULL)
{
screen->SetGamma ();
}
}
CCMD (bumpgamma)
{
// [RH] Gamma correction tables are now generated on the fly for *any* gamma level
// Q: What are reasonable limits to use here?
float newgamma = vid_gamma + 0.1f;
if (newgamma > 3.0)
newgamma = 1.0;
vid_gamma = newgamma;
Printf ("Gamma correction level %g\n", *vid_gamma);
}
void InitPalette ()
@ -103,8 +64,6 @@ void InitPalette ()
if (lump != -1)
{
FileData cmap = fileSystem.ReadFile(lump);
uint8_t palbuffer[768];
ReadPalette(fileSystem.GetNumForName("PLAYPAL"), palbuffer);
const unsigned char* cmapdata = (const unsigned char*)cmap.GetMem();
GPalette.GenerateGlobalBrightmapFromColormap(cmapdata, 32);
}