mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-10 15:45:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2271 from Capostrophic/animation

Browse Source 
Minor NpcAnimation cleanup
This commit is contained in:
Bret Curtis 2019-03-20 21:03:12 +01:00 committed by GitHub
commit a38c5cd240
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 79 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

169
apps/openmw/mwrender/npcanimation.cpp
View File

@ -54,10 +54,8 @@ std::string getVampireHead(const std::string& race, bool female)
if (sVampireMapping.find(thisCombination) == sVampireMapping.end()) if (sVampireMapping.find(thisCombination) == sVampireMapping.end())
{ {
const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore(); const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
const MWWorld::Store<ESM::BodyPart> &partStore = store.get<ESM::BodyPart>(); for (const ESM::BodyPart& bodypart : store.get<ESM::BodyPart>())
for(MWWorld::Store<ESM::BodyPart>::iterator it = partStore.begin(); it != partStore.end(); ++it)
{ {
const ESM::BodyPart& bodypart = *it;
if (!bodypart.mData.mVampire) if (!bodypart.mData.mVampire)
continue; continue;
if (bodypart.mData.mType != ESM::BodyPart::MT_Skin) if (bodypart.mData.mType != ESM::BodyPart::MT_Skin)
@ -68,12 +66,11 @@ std::string getVampireHead(const std::string& race, bool female)
continue; continue;
if (!Misc::StringUtils::ciEqual(bodypart.mRace, race)) if (!Misc::StringUtils::ciEqual(bodypart.mRace, race))
continue; continue;
sVampireMapping[thisCombination] = &*it; sVampireMapping[thisCombination] = &bodypart;
} }
} }
if (sVampireMapping.find(thisCombination) == sVampireMapping.end()) sVampireMapping.emplace(thisCombination, nullptr);
sVampireMapping[thisCombination] = nullptr;
const ESM::BodyPart* bodyPart = sVampireMapping[thisCombination]; const ESM::BodyPart* bodyPart = sVampireMapping[thisCombination];
if (!bodyPart) if (!bodyPart)
@ -448,37 +445,34 @@ void NpcAnimation::updateNpcBase()
bool isVampire = (curType == Type_Vampire); bool isVampire = (curType == Type_Vampire);
bool isFemale = !mNpc->isMale(); bool isFemale = !mNpc->isMale();
if (isWerewolf) mHeadModel.clear();
{ mHairModel.clear();
mHeadModel = "meshes\\" + store.get<ESM::BodyPart>().find("WerewolfHead")->mModel;
mHairModel = "meshes\\" + store.get<ESM::BodyPart>().find("WerewolfHair")->mModel;
}
else
{
mHeadModel = "";
const std::string& vampireHead = getVampireHead(mNpc->mRace, isFemale);
if (isVampire && !vampireHead.empty())
mHeadModel = vampireHead;
else if (!mNpc->mHead.empty())
{
const ESM::BodyPart* bp = store.get<ESM::BodyPart>().search(mNpc->mHead);
if (bp)
mHeadModel = "meshes\\" + bp->mModel;
else
Log(Debug::Warning) << "Warning: Failed to load body part '" << mNpc->mHead << "'";
}
mHairModel = ""; std::string headName = isWerewolf ? "WerewolfHead" : mNpc->mHead;
if (!mNpc->mHair.empty()) std::string hairName = isWerewolf ? "WerewolfHair" : mNpc->mHair;
{
const ESM::BodyPart* bp = store.get<ESM::BodyPart>().search(mNpc->mHair); if (!headName.empty())
if (bp) {
mHairModel = "meshes\\" + bp->mModel; const ESM::BodyPart* bp = store.get<ESM::BodyPart>().search(headName);
else if (bp)
Log(Debug::Warning) << "Warning: Failed to load body part '" << mNpc->mHair << "'"; mHeadModel = "meshes\\" + bp->mModel;
} else
Log(Debug::Warning) << "Warning: Failed to load body part '" << headName << "'";
} }
if (!hairName.empty())
{
const ESM::BodyPart* bp = store.get<ESM::BodyPart>().search(hairName);
if (bp)
mHairModel = "meshes\\" + bp->mModel;
else
Log(Debug::Warning) << "Warning: Failed to load body part '" << hairName << "'";
}
const std::string& vampireHead = getVampireHead(mNpc->mRace, isFemale);
if (!isWerewolf && isVampire && !vampireHead.empty())
mHeadModel = vampireHead;
bool is1stPerson = mViewMode == VM_FirstPerson; bool is1stPerson = mViewMode == VM_FirstPerson;
bool isBeast = (race->mData.mFlags & ESM::Race::Beast) != 0; bool isBeast = (race->mData.mFlags & ESM::Race::Beast) != 0;
@ -486,7 +480,7 @@ void NpcAnimation::updateNpcBase()
defaultSkeleton = Misc::ResourceHelpers::correctActorModelPath(defaultSkeleton, mResourceSystem->getVFS()); defaultSkeleton = Misc::ResourceHelpers::correctActorModelPath(defaultSkeleton, mResourceSystem->getVFS());
std::string smodel = defaultSkeleton; std::string smodel = defaultSkeleton;
if (!is1stPerson && !isWerewolf & !mNpc->mModel.empty()) if (!is1stPerson && !isWerewolf && !mNpc->mModel.empty())
smodel = Misc::ResourceHelpers::correctActorModelPath("meshes\\" + mNpc->mModel, mResourceSystem->getVFS()); smodel = Misc::ResourceHelpers::correctActorModelPath("meshes\\" + mNpc->mModel, mResourceSystem->getVFS());
setObjectRoot(smodel, true, true, false); setObjectRoot(smodel, true, true, false);
@ -736,10 +730,7 @@ void NpcAnimation::removePartGroup(int group)
bool NpcAnimation::isFirstPersonPart(const ESM::BodyPart* bodypart) bool NpcAnimation::isFirstPersonPart(const ESM::BodyPart* bodypart)
{ {
return (bodypart->mId.size() >= 3) return bodypart->mId.size() >= 3 && bodypart->mId.substr(bodypart->mId.size()-3, 3) == "1st";
&& bodypart->mId[bodypart->mId.size()-3] == '1'
&& bodypart->mId[bodypart->mId.size()-2] == 's'
&& bodypart->mId[bodypart->mId.size()-1] == 't';
} }
bool NpcAnimation::isFemalePart(const ESM::BodyPart* bodypart) bool NpcAnimation::isFemalePart(const ESM::BodyPart* bodypart)
@ -799,16 +790,16 @@ bool NpcAnimation::addOrReplaceIndividualPart(ESM::PartReferenceType type, int g
osg::Object* obj = node->getUserDataContainer()->getUserObject(i); osg::Object* obj = node->getUserDataContainer()->getUserObject(i);
if (NifOsg::TextKeyMapHolder* keys = dynamic_cast<NifOsg::TextKeyMapHolder*>(obj)) if (NifOsg::TextKeyMapHolder* keys = dynamic_cast<NifOsg::TextKeyMapHolder*>(obj))
{ {
for (NifOsg::TextKeyMap::const_iterator it = keys->mTextKeys.begin(); it != keys->mTextKeys.end(); ++it) for (const std::pair<float, std::string> &key : keys->mTextKeys)
{ {
if (Misc::StringUtils::ciEqual(it->second, "talk: start")) if (Misc::StringUtils::ciEqual(key.second, "talk: start"))
mHeadAnimationTime->setTalkStart(it->first); mHeadAnimationTime->setTalkStart(key.first);
if (Misc::StringUtils::ciEqual(it->second, "talk: stop")) if (Misc::StringUtils::ciEqual(key.second, "talk: stop"))
mHeadAnimationTime->setTalkStop(it->first); mHeadAnimationTime->setTalkStop(key.first);
if (Misc::StringUtils::ciEqual(it->second, "blink: start")) if (Misc::StringUtils::ciEqual(key.second, "blink: start"))
mHeadAnimationTime->setBlinkStart(it->first); mHeadAnimationTime->setBlinkStart(key.first);
if (Misc::StringUtils::ciEqual(it->second, "blink: stop")) if (Misc::StringUtils::ciEqual(key.second, "blink: stop"))
mHeadAnimationTime->setBlinkStop(it->first); mHeadAnimationTime->setBlinkStop(key.first);
} }
break; break;
@ -834,16 +825,15 @@ void NpcAnimation::addPartGroup(int group, int priority, const std::vector<ESM::
const MWWorld::Store<ESM::BodyPart> &partStore = store.get<ESM::BodyPart>(); const MWWorld::Store<ESM::BodyPart> &partStore = store.get<ESM::BodyPart>();
const char *ext = (mViewMode == VM_FirstPerson) ? ".1st" : ""; const char *ext = (mViewMode == VM_FirstPerson) ? ".1st" : "";
std::vector<ESM::PartReference>::const_iterator part(parts.begin()); for(const ESM::PartReference& part : parts)
for(;part != parts.end();++part)
{ {
const ESM::BodyPart *bodypart = 0; const ESM::BodyPart *bodypart = nullptr;
if(!mNpc->isMale() && !part->mFemale.empty()) if(!mNpc->isMale() && !part.mFemale.empty())
{ {
bodypart = partStore.search(part->mFemale+ext); bodypart = partStore.search(part.mFemale+ext);
if(!bodypart && mViewMode == VM_FirstPerson) if(!bodypart && mViewMode == VM_FirstPerson)
{ {
bodypart = partStore.search(part->mFemale); bodypart = partStore.search(part.mFemale);
if(bodypart && !(bodypart->mData.mPart == ESM::BodyPart::MP_Hand || if(bodypart && !(bodypart->mData.mPart == ESM::BodyPart::MP_Hand ||
bodypart->mData.mPart == ESM::BodyPart::MP_Wrist || bodypart->mData.mPart == ESM::BodyPart::MP_Wrist ||
bodypart->mData.mPart == ESM::BodyPart::MP_Forearm || bodypart->mData.mPart == ESM::BodyPart::MP_Forearm ||
@ -851,14 +841,14 @@ void NpcAnimation::addPartGroup(int group, int priority, const std::vector<ESM::
bodypart = nullptr; bodypart = nullptr;
} }
else if (!bodypart) else if (!bodypart)
Log(Debug::Warning) << "Warning: Failed to find body part '" << part->mFemale << "'"; Log(Debug::Warning) << "Warning: Failed to find body part '" << part.mFemale << "'";
} }
if(!bodypart && !part->mMale.empty()) if(!bodypart && !part.mMale.empty())
{ {
bodypart = partStore.search(part->mMale+ext); bodypart = partStore.search(part.mMale+ext);
if(!bodypart && mViewMode == VM_FirstPerson) if(!bodypart && mViewMode == VM_FirstPerson)
{ {
bodypart = partStore.search(part->mMale); bodypart = partStore.search(part.mMale);
if(bodypart && !(bodypart->mData.mPart == ESM::BodyPart::MP_Hand || if(bodypart && !(bodypart->mData.mPart == ESM::BodyPart::MP_Hand ||
bodypart->mData.mPart == ESM::BodyPart::MP_Wrist || bodypart->mData.mPart == ESM::BodyPart::MP_Wrist ||
bodypart->mData.mPart == ESM::BodyPart::MP_Forearm || bodypart->mData.mPart == ESM::BodyPart::MP_Forearm ||
@ -866,13 +856,13 @@ void NpcAnimation::addPartGroup(int group, int priority, const std::vector<ESM::
bodypart = nullptr; bodypart = nullptr;
} }
else if (!bodypart) else if (!bodypart)
Log(Debug::Warning) << "Warning: Failed to find body part '" << part->mMale << "'"; Log(Debug::Warning) << "Warning: Failed to find body part '" << part.mMale << "'";
} }
if(bodypart) if(bodypart)
addOrReplaceIndividualPart((ESM::PartReferenceType)part->mPart, group, priority, "meshes\\"+bodypart->mModel, enchantedGlow, glowColor); addOrReplaceIndividualPart((ESM::PartReferenceType)part.mPart, group, priority, "meshes\\"+bodypart->mModel, enchantedGlow, glowColor);
else else
reserveIndividualPart((ESM::PartReferenceType)part->mPart, group, priority); reserveIndividualPart((ESM::PartReferenceType)part.mPart, group, priority);
} }
} }
@ -891,7 +881,7 @@ void NpcAnimation::addControllers()
osg::MatrixTransform* node = found->second.get(); osg::MatrixTransform* node = found->second.get();
mFirstPersonNeckController = new NeckController(mObjectRoot.get()); mFirstPersonNeckController = new NeckController(mObjectRoot.get());
node->addUpdateCallback(mFirstPersonNeckController); node->addUpdateCallback(mFirstPersonNeckController);
mActiveControllers.insert(std::make_pair(node, mFirstPersonNeckController)); mActiveControllers.emplace(node, mFirstPersonNeckController);
} }
} }
else if (mViewMode == VM_Normal) else if (mViewMode == VM_Normal)
@ -1093,40 +1083,39 @@ const std::vector<const ESM::BodyPart *>& NpcAnimation::getBodyParts(const std::
std::vector<const ESM::BodyPart*>& parts = sRaceMapping[std::make_pair(race, flags)]; std::vector<const ESM::BodyPart*>& parts = sRaceMapping[std::make_pair(race, flags)];
typedef std::multimap<ESM::BodyPart::MeshPart,ESM::PartReferenceType> BodyPartMapType; typedef std::multimap<ESM::BodyPart::MeshPart,ESM::PartReferenceType> BodyPartMapType;
static BodyPartMapType sBodyPartMap; static const BodyPartMapType sBodyPartMap =
if(sBodyPartMap.empty())
{ {
sBodyPartMap.insert(std::make_pair(ESM::BodyPart::MP_Neck, ESM::PRT_Neck)); {ESM::BodyPart::MP_Neck, ESM::PRT_Neck},
sBodyPartMap.insert(std::make_pair(ESM::BodyPart::MP_Chest, ESM::PRT_Cuirass)); {ESM::BodyPart::MP_Chest, ESM::PRT_Cuirass},
sBodyPartMap.insert(std::make_pair(ESM::BodyPart::MP_Groin, ESM::PRT_Groin)); {ESM::BodyPart::MP_Groin, ESM::PRT_Groin},
sBodyPartMap.insert(std::make_pair(ESM::BodyPart::MP_Hand, ESM::PRT_RHand)); {ESM::BodyPart::MP_Hand, ESM::PRT_RHand},
sBodyPartMap.insert(std::make_pair(ESM::BodyPart::MP_Hand, ESM::PRT_LHand)); {ESM::BodyPart::MP_Hand, ESM::PRT_LHand},
sBodyPartMap.insert(std::make_pair(ESM::BodyPart::MP_Wrist, ESM::PRT_RWrist)); {ESM::BodyPart::MP_Wrist, ESM::PRT_RWrist},
sBodyPartMap.insert(std::make_pair(ESM::BodyPart::MP_Wrist, ESM::PRT_LWrist)); {ESM::BodyPart::MP_Wrist, ESM::PRT_LWrist},
sBodyPartMap.insert(std::make_pair(ESM::BodyPart::MP_Forearm, ESM::PRT_RForearm)); {ESM::BodyPart::MP_Forearm, ESM::PRT_RForearm},
sBodyPartMap.insert(std::make_pair(ESM::BodyPart::MP_Forearm, ESM::PRT_LForearm)); {ESM::BodyPart::MP_Forearm, ESM::PRT_LForearm},
sBodyPartMap.insert(std::make_pair(ESM::BodyPart::MP_Upperarm, ESM::PRT_RUpperarm)); {ESM::BodyPart::MP_Upperarm, ESM::PRT_RUpperarm},
sBodyPartMap.insert(std::make_pair(ESM::BodyPart::MP_Upperarm, ESM::PRT_LUpperarm)); {ESM::BodyPart::MP_Upperarm, ESM::PRT_LUpperarm},
sBodyPartMap.insert(std::make_pair(ESM::BodyPart::MP_Foot, ESM::PRT_RFoot)); {ESM::BodyPart::MP_Foot, ESM::PRT_RFoot},
sBodyPartMap.insert(std::make_pair(ESM::BodyPart::MP_Foot, ESM::PRT_LFoot)); {ESM::BodyPart::MP_Foot, ESM::PRT_LFoot},
sBodyPartMap.insert(std::make_pair(ESM::BodyPart::MP_Ankle, ESM::PRT_RAnkle)); {ESM::BodyPart::MP_Ankle, ESM::PRT_RAnkle},
sBodyPartMap.insert(std::make_pair(ESM::BodyPart::MP_Ankle, ESM::PRT_LAnkle)); {ESM::BodyPart::MP_Ankle, ESM::PRT_LAnkle},
sBodyPartMap.insert(std::make_pair(ESM::BodyPart::MP_Knee, ESM::PRT_RKnee)); {ESM::BodyPart::MP_Knee, ESM::PRT_RKnee},
sBodyPartMap.insert(std::make_pair(ESM::BodyPart::MP_Knee, ESM::PRT_LKnee)); {ESM::BodyPart::MP_Knee, ESM::PRT_LKnee},
sBodyPartMap.insert(std::make_pair(ESM::BodyPart::MP_Upperleg, ESM::PRT_RLeg)); {ESM::BodyPart::MP_Upperleg, ESM::PRT_RLeg},
sBodyPartMap.insert(std::make_pair(ESM::BodyPart::MP_Upperleg, ESM::PRT_LLeg)); {ESM::BodyPart::MP_Upperleg, ESM::PRT_LLeg},
sBodyPartMap.insert(std::make_pair(ESM::BodyPart::MP_Tail, ESM::PRT_Tail)); {ESM::BodyPart::MP_Tail, ESM::PRT_Tail}
} };
parts.resize(ESM::PRT_Count, nullptr); parts.resize(ESM::PRT_Count, nullptr);
if (werewolf)
return parts;
const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore(); const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
const MWWorld::Store<ESM::BodyPart> &partStore = store.get<ESM::BodyPart>();
for(MWWorld::Store<ESM::BodyPart>::iterator it = partStore.begin(); it != partStore.end(); ++it) for(const ESM::BodyPart& bodypart : store.get<ESM::BodyPart>())
{ {
if(werewolf)
break;
const ESM::BodyPart& bodypart = *it;
if (bodypart.mData.mFlags & ESM::BodyPart::BPF_NotPlayable) if (bodypart.mData.mFlags & ESM::BodyPart::BPF_NotPlayable)
continue; continue;
if (bodypart.mData.mType != ESM::BodyPart::MT_Skin) if (bodypart.mData.mType != ESM::BodyPart::MT_Skin)