OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- floatified the remaining parts of gl_walls.cpp.

Browse source
This commit is contained in:
Christoph Oelckers 2016-04-08 00:19:51 +02:00
commit eaf055dff4
6 changed files with 50 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/gl/textures/gl_texture.cpp
View file

@ -177,7 +177,7 @@ void gl_GenerateGlobalBrightmapFromColormap()
// component becomes one.
//
//===========================================================================
PalEntry averageColor(const DWORD *data, int size, fixed_t maxout_factor)
PalEntry averageColor(const DWORD *data, int size, int maxout)
{
int i;
unsigned int r, g, b;
@ -203,12 +203,11 @@ PalEntry averageColor(const DWORD *data, int size, fixed_t maxout_factor)
int maxv=MAX(MAX(r,g),b);
if(maxv && maxout_factor)
if(maxv && maxout)
{
maxout_factor = FixedMul(maxout_factor, 255);
r = Scale(r, maxout_factor, maxv);
g = Scale(g, maxout_factor, maxv);
b = Scale(b, maxout_factor, maxv);
r = Scale(r, maxout, maxv);
g = Scale(g, maxout, maxv);
b = Scale(b, maxout, maxv);
}
return PalEntry(255,r,g,b);
}
@ -366,7 +365,7 @@ void FTexture::GetGlowColor(float *data)
if (buffer)
{
gl_info.GlowColor = averageColor((DWORD *) buffer, w*h, 6*FRACUNIT/10);
gl_info.GlowColor = averageColor((DWORD *) buffer, w*h, 153);
delete[] buffer;
}