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

Support animated textures in non-static objects too

Browse Source
This commit is contained in:
Marianne Gagnon 2014-06-23 20:02:31 -04:00
parent d4bbb50e0a
commit 1be98dc5db
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/animations/animation_base.cpp
View File

@ -33,6 +33,8 @@ AnimationBase::AnimationBase(const XMLNode &node)
node.get("fps", &fps); node.get("fps", &fps);
for(unsigned int i=0; i<node.getNumNodes(); i++) for(unsigned int i=0; i<node.getNumNodes(); i++)
{ {
if (node.getNode(i)->getName() == "animated-texture")
continue;
Ipo *ipo = new Ipo(*node.getNode(i), fps); Ipo *ipo = new Ipo(*node.getNode(i), fps);
m_all_ipos.push_back(ipo); m_all_ipos.push_back(ipo);
} }

5
src/tracks/track_object_presentation.cpp
View File

@ -254,7 +254,7 @@ TrackObjectPresentationMesh::TrackObjectPresentationMesh(const XMLNode& xml_node
else else
{ {
m_mesh = irr_driver->getMesh(model_name); m_mesh = irr_driver->getMesh(model_name);
if (tangent) if (tangent)
{ {
scene::IMeshManipulator* manip = irr_driver->getVideoDriver()->getMeshManipulator(); scene::IMeshManipulator* manip = irr_driver->getVideoDriver()->getMeshManipulator();
@ -368,6 +368,9 @@ void TrackObjectPresentationMesh::init(const XMLNode* xml_node, scene::ISceneNod
m_node = irr_driver->addMesh(m_mesh, parent); m_node = irr_driver->addMesh(m_mesh, parent);
m_frame_start = 0; m_frame_start = 0;
m_frame_end = 0; m_frame_end = 0;
if (World::getWorld() != NULL && World::getWorld()->getTrack() != NULL)
World::getWorld()->getTrack()->handleAnimatedTextures(m_node, *xml_node);
} }
//#ifdef DEBUG //#ifdef DEBUG
// std::string debug_name = model_name+" (track-object)"; // std::string debug_name = model_name+" (track-object)";