teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Disjointed free part fix

Browse source
This commit is contained in:
Jason Hooks 2012-01-13 02:19:28 -05:00
parent 41769f202c
commit e35aee0f89
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
apps/openmw/mwrender/animation.cpp
View file

@ -9,11 +9,15 @@ namespace MWRender{
std::string Animation::getUniqueID(std::string mesh){ std::string Animation::getUniqueID(std::string mesh){
int counter; int counter;
if(mUniqueIDs.find(mesh) == mUniqueIDs.end()){ std::string copy = mesh;
counter = mUniqueIDs[mesh] = 0; 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; std::stringstream out;
if(counter > 99 && counter < 1000) if(counter > 99 && counter < 1000)
@ -463,7 +467,7 @@ namespace MWRender{
base->getAllAnimationStates()->_notifyDirty(); base->getAllAnimationStates()->_notifyDirty();
//base->_updateAnimation(); //base->_updateAnimation();
base->_notifyMoved(); base->_notifyMoved();
for(unsigned int i = 0; i < entityparts.size(); i++){ for(unsigned int i = 0; i < entityparts.size(); i++){
Ogre::SkeletonInstance* skel = entityparts[i]->getSkeleton(); Ogre::SkeletonInstance* skel = entityparts[i]->getSkeleton();

2
apps/openmw/mwrender/renderingmanager.cpp
View file

@ -233,13 +233,11 @@ void RenderingManager::toggleLight()
void RenderingManager::playAnimationGroup (const MWWorld::Ptr& ptr, const std::string& groupName, void RenderingManager::playAnimationGroup (const MWWorld::Ptr& ptr, const std::string& groupName,
int mode, int number) int mode, int number)
{ {
std::cout<<"play animation " << groupName << ", " << mode << ", " << number << std::endl;
mActors.playAnimationGroup(ptr, groupName, mode, number); mActors.playAnimationGroup(ptr, groupName, mode, number);
} }
void RenderingManager::skipAnimation (const MWWorld::Ptr& ptr) void RenderingManager::skipAnimation (const MWWorld::Ptr& ptr)
{ {
std::cout<<"skip animation"<<std::endl;
mActors.skipAnimation(ptr); mActors.skipAnimation(ptr);
} }
void RenderingManager::addTime(){ void RenderingManager::addTime(){