olegpz
/
ericw-tools
mirror of https://github.com/ericwa/ericw-tools.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

non-recursive method for animated textures; makes it easier to follow and makes sure the chain ends in -1

This commit is contained in:
Jonathan 2022-06-01 17:42:37 -04:00
parent 487c0fa1c6
commit 8b4bd6deeb
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/qbsp/map.hh
View File

@ -204,11 +204,11 @@ struct quark_tx_info_t
std::optional<extended_texinfo_t> info; std::optional<extended_texinfo_t> info;
}; };
int FindMiptex(const char *name, std::optional<extended_texinfo_t> &extended_info, bool internal = false); int FindMiptex(const char *name, std::optional<extended_texinfo_t> &extended_info, bool internal = false, bool recursive = true);
inline int FindMiptex(const char *name, bool internal = false) inline int FindMiptex(const char *name, bool internal = false, bool recursive = true)
{ {
std::optional<extended_texinfo_t> extended_info; std::optional<extended_texinfo_t> extended_info;
return FindMiptex(name, extended_info, internal); return FindMiptex(name, extended_info, internal, recursive);
} }
int FindTexinfo(const mtexinfo_t &texinfo); int FindTexinfo(const mtexinfo_t &texinfo);

27
qbsp/map.cc
View File

@ -167,7 +167,7 @@ static std::optional<img::texture_meta> LoadWal(const char *name)
return map.wal_cache.emplace(name, img::load_wal(name, wal, true)->meta).first->second; return map.wal_cache.emplace(name, img::load_wal(name, wal, true)->meta).first->second;
} }
int FindMiptex(const char *name, std::optional<extended_texinfo_t> &extended_info, bool internal) int FindMiptex(const char *name, std::optional<extended_texinfo_t> &extended_info, bool internal, bool recursive)
{ {
const char *pathsep; const char *pathsep;
int i; int i;
@ -223,8 +223,29 @@ int FindMiptex(const char *name, std::optional<extended_texinfo_t> &extended_inf
map.miptex.push_back({name, extended_info->flags, extended_info->value, extended_info->animation}); map.miptex.push_back({name, extended_info->flags, extended_info->value, extended_info->animation});
/* Handle animating textures carefully */ /* Handle animating textures carefully */
if (!extended_info->animation.empty()) { if (!extended_info->animation.empty() && recursive) {
map.miptex[i].animation_miptex = FindMiptex(extended_info->animation.data(), internal);
int last_i = i;
// recursively load animated textures until we loop back to us
while (true)
{
// looped back
if (wal->animation == name)
break;
// texinfo base for animated wal
std::optional<extended_texinfo_t> animation_info = extended_info;
animation_info->animation = wal->animation;
// fetch animation chain
int next_i = FindMiptex(wal->animation.data(), animation_info, internal, false);
map.miptex[last_i].animation_miptex = next_i;
last_i = next_i;
// wal for next chain
wal = LoadWal(wal->animation.c_str());
}
} }
} }