zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-05-30 08:51:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

- added a reverse tile map so that the tile manager can retrieve special info even when a tile texture is passed by object to the render code and not by index.

Browse source
This commit is contained in:
Christoph Oelckers 2020-05-24 10:30:09 +02:00
parent cbeb481d59
commit db4850a028
6 changed files with 28 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
source/glbackend/gl_texture.cpp
View file

@ -230,6 +230,7 @@ bool GLInstance::SetTextureInternal(int picnum, FTexture* tex, int palette, int
auto& h = hictinting[palette];
bool applytint = false;
// Canvas textures must be treated like hightile replacements in the following code.
if (picnum < 0) picnum = TileFiles.GetTileIndex(tex); // Allow getting replacements also when the texture is not passed by its tile number.
auto rep = (picnum >= 0 && hw_hightile && !(h.f & HICTINT_ALWAYSUSEART)) ? TileFiles.FindReplacement(picnum, palette) : nullptr;
if (rep || tex->GetUseType() == FTexture::Canvas)
{
@ -292,7 +293,7 @@ bool GLInstance::SetTextureInternal(int picnum, FTexture* tex, int palette, int
}
// Also load additional layers needed for this texture.
if (hw_detailmapping && hw_hightile)
if (hw_detailmapping && hw_hightile && picnum > -1)
{
float detscalex = detscale, detscaley = detscale;
if (!(method & DAMETH_MODEL))
@ -325,7 +326,7 @@ bool GLInstance::SetTextureInternal(int picnum, FTexture* tex, int palette, int
*/
}
}
if (hw_glowmapping && hw_hightile)
if (hw_glowmapping && hw_hightile && picnum > -1)
{
if (!(method & DAMETH_MODEL))
{
@ -344,7 +345,7 @@ bool GLInstance::SetTextureInternal(int picnum, FTexture* tex, int palette, int
}
}
#if 1
if (!(tex->PicAnim.sf & PICANM_NOFULLBRIGHT_BIT) && !(globalflags & GLOBAL_NO_GL_FULLBRIGHT) && !tex->NoBrightmapFlag[usepalswap])
if (!(tex->PicAnim.sf & PICANM_NOFULLBRIGHT_BIT) && !(globalflags & GLOBAL_NO_GL_FULLBRIGHT) && !tex->NoBrightmapFlag[usepalswap] && picnum > -1)
{
if (TextureType == TT_HICREPLACE)
{