Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

[IMaterial] Fix for material remap fails

Browse Source
This commit is contained in:
momo5502 2017-05-30 10:03:12 +02:00
parent d0663eaefc
commit 7570ad055e
1 changed files with 72 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
src/Components/Modules/AssetInterfaces/IMaterial.cpp
View File

@ -13,6 +13,20 @@ namespace Assets
void IMaterial::loadBinary(Game::XAssetHeader* header, std::string name, Components::ZoneBuilder::Zone* builder) void IMaterial::loadBinary(Game::XAssetHeader* header, std::string name, Components::ZoneBuilder::Zone* builder)
{ {
static const char* techsetSuffix[] =
{
"_lin",
"_add_lin",
"_replace",
"_eyeoffset",
"_blend",
"_blend_nofog",
"_add",
"_nofog",
"_nocast",
};
Components::FileSystem::File materialFile(Utils::String::VA("materials/%s.iw4xMaterial", name.data())); Components::FileSystem::File materialFile(Utils::String::VA("materials/%s.iw4xMaterial", name.data()));
if (!materialFile.exists()) return; if (!materialFile.exists()) return;
@ -44,18 +58,6 @@ namespace Assets
if (!techset.empty() && techset.front() == ',') techset.erase(techset.begin()); if (!techset.empty() && techset.front() == ',') techset.erase(techset.begin());
asset->techniqueSet = Components::AssetHandler::FindAssetForZone(Game::XAssetType::ASSET_TYPE_TECHNIQUE_SET, techset.data(), builder).techniqueSet; asset->techniqueSet = Components::AssetHandler::FindAssetForZone(Game::XAssetType::ASSET_TYPE_TECHNIQUE_SET, techset.data(), builder).techniqueSet;
const char* techsetSuffix[] =
{
"_lin",
"_add_lin",
"_replace",
"_eyeoffset",
"_blend",
"_blend_nofog",
"_add",
};
if (!asset->techniqueSet) if (!asset->techniqueSet)
{ {
// Workaround for effect techsets having _nofog suffix // Workaround for effect techsets having _nofog suffix
@ -167,8 +169,66 @@ namespace Assets
} }
}, false, false); }, false, false);
for (int i = 0; i < ARRAYSIZE(techsetSuffix) && !replacementFound && asset->techniqueSet; ++i)
{
const char* _name = asset->techniqueSet->name;
if (_name[0] == ',') ++_name;
std::string modifiedTechsetName = _name;
if (!Utils::String::EndsWith(modifiedTechsetName, techsetSuffix[i])) continue;
modifiedTechsetName = modifiedTechsetName.substr(0, modifiedTechsetName.size() - strlen(techsetSuffix[i]));
Game::DB_EnumXAssetEntries(Game::XAssetType::ASSET_TYPE_MATERIAL, [asset, modifiedTechsetName](Game::XAssetEntry* entry)
{
if (!replacementFound)
{
Game::XAssetHeader header = entry->asset.header;
if (modifiedTechsetName == header.material->techniqueSet->name)
{
asset->sortKey = header.material->sortKey;
// This is temp, as nobody has time to fix materials
// asset->stateBitsCount = header.material->stateBitsCount;
// asset->stateBitTable = header.material->stateBitTable;
// std::memcpy(asset->stateBitsEntry, header.material->stateBitsEntry, 48);
// asset->constantCount = header.material->constantCount;
// asset->constantTable = header.material->constantTable;
replacementFound = true;
}
}
}, false, false);
if (!replacementFound)
{
Game::DB_EnumXAssetEntries(Game::XAssetType::ASSET_TYPE_MATERIAL, [asset, modifiedTechsetName](Game::XAssetEntry* entry)
{
if (!replacementFound)
{
Game::XAssetHeader header = entry->asset.header;
if (Utils::String::StartsWith(header.material->techniqueSet->name, modifiedTechsetName))
{
asset->sortKey = header.material->sortKey;
// This is temp, as nobody has time to fix materials
// asset->stateBitsCount = header.material->stateBitsCount;
// asset->stateBitTable = header.material->stateBitTable;
// std::memcpy(asset->stateBitsEntry, header.material->stateBitsEntry, 48);
// asset->constantCount = header.material->constantCount;
// asset->constantTable = header.material->constantTable;
replacementFound = true;
}
}
}, false, false);
}
}
if (!replacementFound && asset->techniqueSet) if (!replacementFound && asset->techniqueSet)
{ {
Components::Logger::Print("No replacement found for material %s with techset %s\n", asset->name, asset->techniqueSet->name); Components::Logger::Print("No replacement found for material %s with techset %s\n", asset->name, asset->techniqueSet->name);
} }