zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-16 09:31:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

- precache switch textures from ANIMATED lump

Browse source 
For example, SW1SKULL and SW2SKULL switches are animated in TNT: Evilution
Their frames are defined in ANIMATED lump which is old BOOM binary format
Textures other than base were not cached because the corresponding switch definitions (in ANIMDEFS lump) have one frame only and BOOM style animations were not taken into account

https://forum.zdoom.org/viewtopic.php?t=66652

# Conflicts:
#	src/p_setup.cpp
This commit is contained in:
alexey.lysiuk 2019-12-23 13:17:16 +02:00 committed by drfrag
parent 98b00b0c79
commit e4110ded3c
1 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/p_setup.cpp
View file

@ -2999,27 +2999,43 @@ static void AddToList(uint8_t *hitlist, FTextureID texid, int bitmask)
if (hitlist[texid.GetIndex()] & bitmask) return; // already done, no need to process everything again.
hitlist[texid.GetIndex()] |= (uint8_t)bitmask;
for (auto anim : TexMan.mAnimations)
const auto addAnimations = [hitlist, bitmask](const FTextureID texid)
{
if (texid == anim->BasePic || (!anim->bDiscrete && anim->BasePic < texid && texid < anim->BasePic + anim->NumFrames))
for (auto anim : TexMan.mAnimations)
{
for (int i = anim->BasePic.GetIndex(); i < anim->BasePic.GetIndex() + anim->NumFrames; i++)
if (texid == anim->BasePic || (!anim->bDiscrete && anim->BasePic < texid && texid < anim->BasePic + anim->NumFrames))
{
hitlist[i] |= (uint8_t)bitmask;
for (int i = anim->BasePic.GetIndex(); i < anim->BasePic.GetIndex() + anim->NumFrames; i++)
{
hitlist[i] |= (uint8_t)bitmask;
}
}
}
}
};
addAnimations(texid);
auto switchdef = TexMan.FindSwitch(texid);
if (switchdef)
{
for (int i = 0; i < switchdef->NumFrames; i++)
const FSwitchDef *const pair = switchdef->PairDef;
const uint16_t numFrames = switchdef->NumFrames;
const uint16_t pairNumFrames = pair->NumFrames;
for (int i = 0; i < numFrames; i++)
{
hitlist[switchdef->frames[i].Texture.GetIndex()] |= (uint8_t)bitmask;
}
for (int i = 0; i < switchdef->PairDef->NumFrames; i++)
for (int i = 0; i < pairNumFrames; i++)
{
hitlist[switchdef->PairDef->frames[i].Texture.GetIndex()] |= (uint8_t)bitmask;
hitlist[pair->frames[i].Texture.GetIndex()] |= (uint8_t)bitmask;
}
if (numFrames == 1 && pairNumFrames == 1)
{
// Switch can still be animated via BOOM binary definition from ANIMATED lump
addAnimations(switchdef->frames[0].Texture);
addAnimations(pair->frames[0].Texture);
}
}