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

Animated material support.

Browse Source
This commit is contained in:
momo5502 2016-01-22 20:26:00 +01:00
parent bf80c3fd61
commit c55c3b7364
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Components/Modules/AssetInterfaces/IGfxImage.cpp
View File

@ -30,7 +30,7 @@ namespace Assets
if (!iwi.Exists())
{
Components::Logger::Error("Loading image '%s' failed!", iwi.GetName());
Components::Logger::Error("Loading image '%s' failed!", iwi.GetName().data());
return;
}

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

@ -45,6 +45,32 @@ namespace Assets
memcpy(material, baseMaterial, sizeof(Game::Material));
material->name = builder->GetAllocator()->DuplicateString(name);
material->textureAtlasRowCount = 0;
material->textureAtlasColumnCount = 0;
// Load animation frames
auto anims = infoData["anims"];
if (anims.is_array())
{
auto animCoords = anims.array_items();
if (animCoords.size() >= 2)
{
auto animCoordX = animCoords[0];
auto animCoordY = animCoords[1];
if (animCoordX.is_number())
{
material->textureAtlasColumnCount = (char)animCoordX.number_value() & 0xFF;
}
if (animCoordY.is_number())
{
material->textureAtlasRowCount = (char)animCoordY.number_value() & 0xFF;
}
}
}
// Load referenced textures
auto textures = infoData["textures"];
if (textures.is_array())