diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp index fbe30bbb0..3bd160e6d 100644 --- a/apps/openmw/mwrender/animation.cpp +++ b/apps/openmw/mwrender/animation.cpp @@ -9,11 +9,15 @@ namespace MWRender{ std::string Animation::getUniqueID(std::string mesh){ int counter; - if(mUniqueIDs.find(mesh) == mUniqueIDs.end()){ - counter = mUniqueIDs[mesh] = 0; + std::string copy = mesh; + std::transform(copy.begin(), copy.end(), copy.begin(), ::tolower); + if(mUniqueIDs.find(copy) == mUniqueIDs.end()){ + counter = mUniqueIDs[copy] = 0; + } + else{ + mUniqueIDs[copy] = mUniqueIDs[copy] + 1; + counter = mUniqueIDs[copy]; } - else - counter = mUniqueIDs[mesh]++; std::stringstream out; if(counter > 99 && counter < 1000) @@ -463,7 +467,7 @@ namespace MWRender{ base->getAllAnimationStates()->_notifyDirty(); //base->_updateAnimation(); - base->_notifyMoved(); + base->_notifyMoved(); for(unsigned int i = 0; i < entityparts.size(); i++){ Ogre::SkeletonInstance* skel = entityparts[i]->getSkeleton(); diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp index ae2e0f791..fff141263 100644 --- a/apps/openmw/mwrender/renderingmanager.cpp +++ b/apps/openmw/mwrender/renderingmanager.cpp @@ -233,13 +233,11 @@ void RenderingManager::toggleLight() void RenderingManager::playAnimationGroup (const MWWorld::Ptr& ptr, const std::string& groupName, int mode, int number) { -std::cout<<"play animation " << groupName << ", " << mode << ", " << number << std::endl; mActors.playAnimationGroup(ptr, groupName, mode, number); } void RenderingManager::skipAnimation (const MWWorld::Ptr& ptr) { -std::cout<<"skip animation"<