ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow animated meshes in LOD, fixes #1747

Browse Source
This commit is contained in:
Marianne Gagnon 2014-12-06 19:51:46 -05:00
parent 1bd83f4140
commit 7686628401
2 changed files with 48 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/tracks/model_definition_loader.cpp
View File

@ -45,13 +45,13 @@ void ModelDefinitionLoader::addModelDefinition(const XMLNode* xml)
std::string lodgroup; std::string lodgroup;
xml->get("lod_group", &lodgroup); xml->get("lod_group", &lodgroup);
bool tangent = false; bool skeletal_animation = false;
xml->get("tangents", &tangent); xml->get("skeletal-animation", &skeletal_animation);
std::string model_name; std::string model_name;
xml->get("model", &model_name); xml->get("model", &model_name);
m_lod_groups[lodgroup].push_back(ModelDefinition(xml, (int)lod_distance, model_name, tangent)); m_lod_groups[lodgroup].push_back(ModelDefinition(xml, (int)lod_distance, model_name, false, skeletal_animation));
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@ -72,28 +72,51 @@ LODNode* ModelDefinitionLoader::instanciateAsLOD(const XMLNode* node, scene::ISc
lod_node->updateAbsolutePosition(); lod_node->updateAbsolutePosition();
for (unsigned int m=0; m<group.size(); m++) for (unsigned int m=0; m<group.size(); m++)
{ {
// TODO: check whether the mesh contains animations or not? if (group[m].m_skeletal_animation)
scene::IMesh* a_mesh = irr_driver->getMesh(group[m].m_model_file);
if (!a_mesh)
{ {
Log::warn("LODNodeLoad", "Warning: object model '%s' not found, ignored.\n", scene::IAnimatedMesh* a_mesh = irr_driver->getAnimatedMesh(group[m].m_model_file);
group[m].m_model_file.c_str()); if (!a_mesh)
continue; {
Log::warn("LODNodeLoad", "Warning: object model '%s' not found, ignored.\n",
group[m].m_model_file.c_str());
continue;
}
irr_driver->setAllMaterialFlags(a_mesh);
a_mesh->grab();
//cache.push_back(a_mesh);
irr_driver->grabAllTextures(a_mesh);
m_track->addCachedMesh(a_mesh);
scene::IAnimatedMeshSceneNode* scene_node = irr_driver->addAnimatedMesh(a_mesh, group[m].m_model_file);
m_track->handleAnimatedTextures(scene_node, *group[m].m_xml);
lod_node->add(group[m].m_distance, scene_node, true);
} }
else
{
scene::IMesh* a_mesh = irr_driver->getMesh(group[m].m_model_file);
if (!a_mesh)
{
Log::warn("LODNodeLoad", "Warning: object model '%s' not found, ignored.\n",
group[m].m_model_file.c_str());
continue;
}
a_mesh = MeshTools::createMeshWithTangents(a_mesh, &MeshTools::isNormalMap); a_mesh = MeshTools::createMeshWithTangents(a_mesh, &MeshTools::isNormalMap);
irr_driver->setAllMaterialFlags(a_mesh); irr_driver->setAllMaterialFlags(a_mesh);
a_mesh->grab(); a_mesh->grab();
//cache.push_back(a_mesh); //cache.push_back(a_mesh);
irr_driver->grabAllTextures(a_mesh); irr_driver->grabAllTextures(a_mesh);
m_track->addCachedMesh(a_mesh); m_track->addCachedMesh(a_mesh);
scene::IMeshSceneNode* scene_node = irr_driver->addMesh(a_mesh, group[m].m_model_file); scene::IMeshSceneNode* scene_node = irr_driver->addMesh(a_mesh, group[m].m_model_file);
m_track->handleAnimatedTextures( scene_node, *group[m].m_xml ); m_track->handleAnimatedTextures(scene_node, *group[m].m_xml);
lod_node->add( group[m].m_distance, scene_node, true ); lod_node->add(group[m].m_distance, scene_node, true);
}
} }
#ifdef DEBUG #ifdef DEBUG

8
src/tracks/model_definition_loader.hpp
View File

@ -42,26 +42,30 @@ namespace irr
struct ModelDefinition struct ModelDefinition
{ {
std::string m_model_file; std::string m_model_file;
bool m_tangent; bool m_tangent; // obsolete, TODO remove
const XMLNode* m_xml; const XMLNode* m_xml;
/** For LOD */ /** For LOD */
int m_distance; int m_distance;
bool m_skeletal_animation;
/** Constructor to allow storing this in STL containers */ /** Constructor to allow storing this in STL containers */
ModelDefinition() ModelDefinition()
{ {
m_tangent = false; m_tangent = false;
m_skeletal_animation = false;
m_distance = 0; m_distance = 0;
m_xml = NULL; m_xml = NULL;
} }
ModelDefinition(const XMLNode* xml, int distance, std::string& model, bool tangent) ModelDefinition(const XMLNode* xml, int distance, std::string& model, bool tangent, bool skeletal_animation)
{ {
m_model_file = model; m_model_file = model;
m_tangent = tangent; m_tangent = tangent;
m_xml = xml; m_xml = xml;
m_distance = distance; m_distance = distance;
m_skeletal_animation = skeletal_animation;
} }
~ModelDefinition() ~ModelDefinition()