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

Add convenience operator [] to AnimPriority

Browse source
This commit is contained in:
scrawl 2015-09-16 15:43:42 +02:00
parent 84747fbdd7
commit 5692ef1eae
3 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw/mwmechanics/character.cpp
View file

@ -278,7 +278,7 @@ void CharacterController::refreshCurrentAnims(CharacterState idle, CharacterStat
mHitState = CharState_Block;
mCurrentHit = "shield";
MWRender::Animation::AnimPriority priorityBlock (Priority_Hit);
priorityBlock.mPriority[MWRender::Animation::BoneGroup_LeftArm] = Priority_Block;
priorityBlock[MWRender::Animation::BoneGroup_LeftArm] = Priority_Block;
mAnimation->play(mCurrentHit, priorityBlock, MWRender::Animation::BlendMask_All, true, 1, "block start", "block stop", 0.0f, 0);
}
@ -1063,7 +1063,7 @@ bool CharacterController::updateWeaponState()
}
MWRender::Animation::AnimPriority priorityWeapon(Priority_Weapon);
priorityWeapon.mPriority[MWRender::Animation::BoneGroup_LowerBody] = Priority_WeaponLowerBody;
priorityWeapon[MWRender::Animation::BoneGroup_LowerBody] = Priority_WeaponLowerBody;
bool forcestateupdate = false;
if(weaptype != mWeaponType && mHitState != CharState_KnockDown && mHitState != CharState_KnockOut

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

@ -680,7 +680,7 @@ namespace MWRender
if(!(state->second.mBlendMask&(1<<blendMask)))
continue;
if(active == mStates.end() || active->second.mPriority.mPriority[blendMask] < state->second.mPriority.mPriority[blendMask])
if(active == mStates.end() || active->second.mPriority[blendMask] < state->second.mPriority[blendMask])
active = state;
}

10
apps/openmw/mwrender/animation.hpp
View file

@ -105,6 +105,16 @@ public:
return true;
}
int& operator[] (int n)
{
return mPriority[n];
}
const int& operator[] (int n) const
{
return mPriority[n];
}
bool contains(int priority) const
{
for (unsigned int i=0; i<sNumBlendMasks; ++i)