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

[IMaterial] Sortkey workaround

Browse Source 
Search a material with the same techset and copy its sortkey
This commit is contained in:
momo5502 2016-12-27 19:17:52 +01:00
parent 021ec9f1c4
commit e909329910
3 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -118,6 +118,16 @@ namespace Assets
material->stateBitTable = reader.readArray<Game::GfxStateBits>(material->stateBitsCount); material->stateBitTable = reader.readArray<Game::GfxStateBits>(material->stateBitsCount);
header->material = material; header->material = material;
// Find correct sortkey by comparing techsets
Game::DB_EnumXAssets_Internal(Game::XAssetType::ASSET_TYPE_MATERIAL, [](Game::XAssetHeader header, void* data)
{
Game::Material* material = reinterpret_cast<Game::Material*>(data);
if (std::string(material->techniqueSet->name) == header.material->techniqueSet->name)
{
material->sortKey = header.material->sortKey;
}
}, material, false);
} }
void IMaterial::loadJson(Game::XAssetHeader* header, std::string name, Components::ZoneBuilder::Zone* builder) void IMaterial::loadJson(Game::XAssetHeader* header, std::string name, Components::ZoneBuilder::Zone* builder)

15
src/Components/Modules/Materials.cpp
View File

@ -131,17 +131,8 @@ namespace Components
{ {
static Game::Material* a = m1; static Game::Material* a = m1;
static Game::Material* b = m2; static Game::Material* b = m2;
int result = 0;
__asm return Utils::Hook::Call<int(Game::Material*, Game::Material*)>(0x5235B0)(m1, m2);
{
push m1
push m2
mov eax, 0x5235B0
call eax
add esp, 8
mov result, eax
}
return result;
} }
#endif #endif
@ -180,7 +171,7 @@ namespace Components
} }
Logger::Print("%d\n", sizeof(int (*)(Game::Material*, Game::Material*))); Logger::Print("%d\n", sizeof(int (*)(Game::Material*, Game::Material*)));
Utils::Hook::Set<int (*)(Game::Material*, Game::Material*)>(0x523894, static_cast<int (*)(Game::Material*, Game::Material*)>(Materials::MaterialComparePrint)); Utils::Hook::Set<void*>(0x523894, Materials::MaterialComparePrint);
#endif #endif
// Renderer::OnFrame([] () // Renderer::OnFrame([] ()

4
src/Game/Structs.hpp
View File

@ -494,7 +494,9 @@ namespace Game
struct MaterialTechniqueSet struct MaterialTechniqueSet
{ {
const char* name; const char* name;
char pad[4]; char worldVertFormat;
bool hasBeenUploaded;
char unused[1];
MaterialTechniqueSet* remappedTechniques; MaterialTechniqueSet* remappedTechniques;
MaterialTechnique* techniques[48]; MaterialTechnique* techniques[48];
}; };