mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-17 10:21:11 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'noalloc_dance_for_npcanimation' into 'master'

Browse Source 
Don't do an unnecessarily complex memory allocation dance in npcanimation.cpp

See merge request OpenMW/openmw!1042
This commit is contained in:
Evil Eye 2021-07-28 17:25:28 +00:00
commit a366a85c4e
1 changed files with 29 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -286,37 +286,36 @@ NpcAnimation::NpcType NpcAnimation::getNpcType(const MWWorld::Ptr& ptr)
return curType; return curType;
} }
static NpcAnimation::PartBoneMap createPartListMap() static const inline NpcAnimation::PartBoneMap createPartListMap()
{ {
NpcAnimation::PartBoneMap result; return {
result.insert(std::make_pair(ESM::PRT_Head, "Head")); {ESM::PRT_Head, "Head"},
result.insert(std::make_pair(ESM::PRT_Hair, "Head")); // note it uses "Head" as attach bone, but "Hair" as filter {ESM::PRT_Hair, "Head"}, // note it uses "Head" as attach bone, but "Hair" as filter
result.insert(std::make_pair(ESM::PRT_Neck, "Neck")); {ESM::PRT_Neck, "Neck"},
result.insert(std::make_pair(ESM::PRT_Cuirass, "Chest")); {ESM::PRT_Cuirass, "Chest"},
result.insert(std::make_pair(ESM::PRT_Groin, "Groin")); {ESM::PRT_Groin, "Groin"},
result.insert(std::make_pair(ESM::PRT_Skirt, "Groin")); {ESM::PRT_Skirt, "Groin"},
result.insert(std::make_pair(ESM::PRT_RHand, "Right Hand")); {ESM::PRT_RHand, "Right Hand"},
result.insert(std::make_pair(ESM::PRT_LHand, "Left Hand")); {ESM::PRT_LHand, "Left Hand"},
result.insert(std::make_pair(ESM::PRT_RWrist, "Right Wrist")); {ESM::PRT_RWrist, "Right Wrist"},
result.insert(std::make_pair(ESM::PRT_LWrist, "Left Wrist")); {ESM::PRT_LWrist, "Left Wrist"},
result.insert(std::make_pair(ESM::PRT_Shield, "Shield Bone")); {ESM::PRT_Shield, "Shield Bone"},
result.insert(std::make_pair(ESM::PRT_RForearm, "Right Forearm")); {ESM::PRT_RForearm, "Right Forearm"},
result.insert(std::make_pair(ESM::PRT_LForearm, "Left Forearm")); {ESM::PRT_LForearm, "Left Forearm"},
result.insert(std::make_pair(ESM::PRT_RUpperarm, "Right Upper Arm")); {ESM::PRT_RUpperarm, "Right Upper Arm"},
result.insert(std::make_pair(ESM::PRT_LUpperarm, "Left Upper Arm")); {ESM::PRT_LUpperarm, "Left Upper Arm"},
result.insert(std::make_pair(ESM::PRT_RFoot, "Right Foot")); {ESM::PRT_RFoot, "Right Foot"},
result.insert(std::make_pair(ESM::PRT_LFoot, "Left Foot")); {ESM::PRT_LFoot, "Left Foot"},
result.insert(std::make_pair(ESM::PRT_RAnkle, "Right Ankle")); {ESM::PRT_RAnkle, "Right Ankle"},
result.insert(std::make_pair(ESM::PRT_LAnkle, "Left Ankle")); {ESM::PRT_LAnkle, "Left Ankle"},
result.insert(std::make_pair(ESM::PRT_RKnee, "Right Knee")); {ESM::PRT_RKnee, "Right Knee"},
result.insert(std::make_pair(ESM::PRT_LKnee, "Left Knee")); {ESM::PRT_LKnee, "Left Knee"},
result.insert(std::make_pair(ESM::PRT_RLeg, "Right Upper Leg")); {ESM::PRT_RLeg, "Right Upper Leg"},
result.insert(std::make_pair(ESM::PRT_LLeg, "Left Upper Leg")); {ESM::PRT_LLeg, "Left Upper Leg"},
result.insert(std::make_pair(ESM::PRT_RPauldron, "Right Clavicle")); {ESM::PRT_RPauldron, "Right Clavicle"},
result.insert(std::make_pair(ESM::PRT_LPauldron, "Left Clavicle")); {ESM::PRT_LPauldron, "Left Clavicle"},
result.insert(std::make_pair(ESM::PRT_Weapon, "Weapon Bone")); // Fallback. The real node name depends on the current weapon type. {ESM::PRT_Weapon, "Weapon Bone"}, // Fallback. The real node name depends on the current weapon type.
result.insert(std::make_pair(ESM::PRT_Tail, "Tail")); {ESM::PRT_Tail, "Tail"}};
return result;
} }
const NpcAnimation::PartBoneMap NpcAnimation::sPartList = createPartListMap(); const NpcAnimation::PartBoneMap NpcAnimation::sPartList = createPartListMap();