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

[IMaterial] Fix materials

Browse Source
This commit is contained in:
momo5502 2018-05-09 11:18:31 +02:00
parent 2d59faf31b
commit c3083ea78c
1 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -160,9 +160,9 @@ namespace Assets
asset->sortKey = header.material->sortKey; asset->sortKey = header.material->sortKey;
// This is temp, as nobody has time to fix materials // This is temp, as nobody has time to fix materials
asset->stateBitsCount = header.material->stateBitsCount; // asset->stateBitsCount = header.material->stateBitsCount;
asset->stateBitTable = header.material->stateBitTable; // asset->stateBitTable = header.material->stateBitTable;
std::memcpy(asset->stateBitsEntry, header.material->stateBitsEntry, 48); // std::memcpy(asset->stateBitsEntry, header.material->stateBitsEntry, 48);
asset->constantCount = header.material->constantCount; asset->constantCount = header.material->constantCount;
asset->constantTable = header.material->constantTable; asset->constantTable = header.material->constantTable;
@ -217,6 +217,31 @@ namespace Assets
{ {
Components::Logger::Error("Material data left!"); Components::Logger::Error("Material data left!");
} }
char baseIndex = 0;
for (char i = 0; i < asset->stateBitsCount; ++i)
{
auto stateBits = asset->stateBitTable[i];
if (stateBits.loadBits[0] == 0x18128812 &&
stateBits.loadBits[1] == 0xD) // Seems to be like a default stateBit causing a 'generic' initialization
{
baseIndex = i;
break;
}
}
for (int i = 0; i < 48; ++i)
{
if (!asset->techniqueSet->techniques[i] && asset->stateBitsEntry[i] != -1)
{
asset->stateBitsEntry[i] = -1;
}
if (asset->techniqueSet->techniques[i] && asset->stateBitsEntry[i] == -1)
{
asset->stateBitsEntry[i] = baseIndex;
}
}
} }
void IMaterial::loadNative(Game::XAssetHeader* header, std::string name, Components::ZoneBuilder::Zone* /*builder*/) void IMaterial::loadNative(Game::XAssetHeader* header, std::string name, Components::ZoneBuilder::Zone* /*builder*/)