OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- we don't really need a bBrightmap in a texture. All it did was duplicate some functionality of bMasked.

Browse source 
- renamed bBrightmapDisablesFullbright flag.
This commit is contained in:
Christoph Oelckers 2014-10-26 08:41:52 +01:00
commit 3c7664a460
4 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -158,7 +158,7 @@ void gl_GenerateGlobalBrightmapFromColormap()
if (cmapdata[i+j*256]!=i || (paldata[3*i]<10 && paldata[3*i+1]<10 && paldata[3*i+2]<10))
{
GlobalBrightmap.Remap[i]=black;
GlobalBrightmap.Palette[i]=PalEntry(0,0,0);
GlobalBrightmap.Palette[i] = PalEntry(255, 0, 0, 0);
}
}
}
@ -232,8 +232,7 @@ FTexture::MiscGLInfo::MiscGLInfo() throw()
bFullbright = false;
bSkyColorDone = false;
bBrightmapChecked = false;
bBrightmap = false;
bBrightmapDisablesFullbright = false;
bDisableFullbright = false;
bNoFilter = false;
bNoCompress = false;
areas = NULL;
@ -594,7 +593,7 @@ bool FTexture::SmoothEdges(unsigned char * buffer,int w, int h)
bool FTexture::ProcessData(unsigned char * buffer, int w, int h, bool ispatch)
{
if (bMasked && !gl_info.bBrightmap)
if (bMasked)
{
bMasked = SmoothEdges(buffer, w, h);
if (bMasked && !ispatch) FindHoles(buffer, w, h);
@ -620,7 +619,7 @@ FBrightmapTexture::FBrightmapTexture (FTexture *source)
bNoDecals = source->bNoDecals;
Rotations = source->Rotations;
UseType = source->UseType;
gl_info.bBrightmap = true;
bMasked = false;
id.SetInvalid();
SourceLump = -1;
}
@ -737,10 +736,10 @@ void gl_ParseBrightmap(FScanner &sc, int deflump)
return;
}
bmtex->gl_info.bBrightmap = true;
bmtex->bMasked = false;
tex->gl_info.Brightmap = bmtex;
}
tex->gl_info.bBrightmapDisablesFullbright = disable_fullbright;
tex->gl_info.bDisableFullbright = disable_fullbright;
}
//==========================================================================