mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-22 12:39:59 +00:00
Code Issues Projects Releases Wiki Activity

Merged pull request #1937

Browse Source
This commit is contained in:
Marc Zinnschlag 2018-09-27 11:06:21 +02:00
commit 5fa9b32e76
2 changed files with 58 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
apps/openmw/mwmechanics/character.cpp
View File

@ -351,64 +351,69 @@ void CharacterController::refreshHitRecoilAnims(CharacterState& idle)
idle = CharState_None; idle = CharState_None;
} }
void CharacterController::refreshJumpAnims(const WeaponInfo* weap, JumpingState jump, CharacterState& idle, bool force) void CharacterController::refreshJumpAnims(const WeaponInfo* weap, JumpingState jump, CharacterState& idle, CharacterState& movement, bool force)
{ {
if(force || jump != mJumpState) if (!force && jump == mJumpState && idle == CharState_None && movement == CharState_None)
return;
if (jump != JumpState_None && !(mPtr == MWMechanics::getPlayer() && MWBase::Environment::get().getWorld()->isFirstPerson())) // FIXME
{ {
if (jump != JumpState_None) idle = CharState_None;
idle = CharState_None; movement = CharState_None;
}
bool startAtLoop = (jump == mJumpState); std::string jumpAnimName;
mJumpState = jump; MWRender::Animation::BlendMask jumpmask = MWRender::Animation::BlendMask_All;
if (jump != JumpState_None)
std::string jumpAnimName; {
MWRender::Animation::BlendMask jumpmask = MWRender::Animation::BlendMask_All; jumpAnimName = "jump";
if(mJumpState != JumpState_None) if(weap != sWeaponTypeListEnd)
{ {
jumpAnimName = "jump"; jumpAnimName += weap->shortgroup;
if(weap != sWeaponTypeListEnd) if(!mAnimation->hasAnimation(jumpAnimName))
{ {
jumpAnimName += weap->shortgroup; jumpmask = MWRender::Animation::BlendMask_LowerBody;
if(!mAnimation->hasAnimation(jumpAnimName)) jumpAnimName = "jump";
{
jumpmask = MWRender::Animation::BlendMask_LowerBody;
jumpAnimName = "jump";
// Since we apply movement only for lower body, do not reset idle animations. // Since we apply movement only for lower body, do not reset idle animations.
// For upper body there will be idle animation. // For upper body there will be idle animation.
if (idle == CharState_None) if (idle == CharState_None)
idle = CharState_Idle; idle = CharState_Idle;
// For crossbow animations use 1h ones as fallback // For crossbow animations use 1h ones as fallback
if (mWeaponType == WeapType_Crossbow) if (mWeaponType == WeapType_Crossbow)
jumpAnimName += "1h"; jumpAnimName += "1h";
}
} }
} }
}
if (!mCurrentJump.empty()) if (!force && jump == mJumpState)
{ return;
mAnimation->disable(mCurrentJump);
mCurrentJump.clear();
}
if(mJumpState == JumpState_InAir) mJumpState = jump;
if (!mCurrentJump.empty())
{
mAnimation->disable(mCurrentJump);
mCurrentJump.clear();
}
if(mJumpState == JumpState_InAir)
{
if (mAnimation->hasAnimation(jumpAnimName))
{ {
if (mAnimation->hasAnimation(jumpAnimName)) mAnimation->play(jumpAnimName, Priority_Jump, jumpmask, false,
{ 1.0f, "start", "stop", 0.f, ~0ul);
mAnimation->play(jumpAnimName, Priority_Jump, jumpmask, false, mCurrentJump = jumpAnimName;
1.0f, (startAtLoop?"loop start":"start"), "stop", 0.0f, ~0ul);
mCurrentJump = jumpAnimName;
}
} }
else if (mJumpState == JumpState_Landing) }
else if (mJumpState == JumpState_Landing)
{
if (mAnimation->hasAnimation(jumpAnimName))
{ {
if (mAnimation->hasAnimation(jumpAnimName)) mAnimation->play(jumpAnimName, Priority_Jump, jumpmask, true,
{ 1.0f, "loop stop", "stop", 0.0f, 0);
mAnimation->play(jumpAnimName, Priority_Jump, jumpmask, true, mCurrentJump = jumpAnimName;
1.0f, "loop stop", "stop", 0.0f, 0);
mCurrentJump = jumpAnimName;
}
} }
} }
} }
@ -494,10 +499,9 @@ void CharacterController::refreshMovementAnims(const WeaponInfo* weap, Character
} }
// If we're playing the same animation, start it from the point it ended // If we're playing the same animation, start it from the point it ended
bool sameAnim = (movementAnimName == mCurrentMovement); float startpoint = 0.f;
float startPoint = 0.f; if (!mCurrentMovement.empty() && movementAnimName == mCurrentMovement)
if (sameAnim) mAnimation->getInfo(mCurrentMovement, &startpoint);
mAnimation->getInfo(mCurrentMovement, &startPoint);
mMovementAnimationControlled = true; mMovementAnimationControlled = true;
@ -546,7 +550,7 @@ void CharacterController::refreshMovementAnims(const WeaponInfo* weap, Character
} }
mAnimation->play(mCurrentMovement, Priority_Movement, movemask, false, mAnimation->play(mCurrentMovement, Priority_Movement, movemask, false,
1.f, (!sameAnim ? "start" : "loop start"), "stop", startPoint, ~0ul, true); 1.f, "start", "stop", startpoint, ~0ul, true);
} }
} }
} }
@ -626,7 +630,7 @@ void CharacterController::refreshCurrentAnims(CharacterState idle, CharacterStat
if (!mPtr.getClass().hasInventoryStore(mPtr)) if (!mPtr.getClass().hasInventoryStore(mPtr))
weap = sWeaponTypeListEnd; weap = sWeaponTypeListEnd;
refreshJumpAnims(weap, jump, idle, force); refreshJumpAnims(weap, jump, idle, movement, force);
refreshMovementAnims(weap, movement, idle, force); refreshMovementAnims(weap, movement, idle, force);
// idle handled last as it can depend on the other states // idle handled last as it can depend on the other states
@ -2164,12 +2168,12 @@ void CharacterController::update(float duration)
if(mAnimQueue.empty() || inwater || sneak) if(mAnimQueue.empty() || inwater || sneak)
{ {
// Note: turning animations should not interrupt idle ones // Note: turning animations should not interrupt idle ones
if (inwater) if (movestate != CharState_None && !isTurning())
idlestate = CharState_None;
else if (inwater)
idlestate = CharState_IdleSwim; idlestate = CharState_IdleSwim;
else if (sneak && !inJump) else if (sneak && !inJump)
idlestate = CharState_IdleSneak; idlestate = CharState_IdleSneak;
else if (movestate != CharState_None && !isTurning())
idlestate = CharState_None;
else else
idlestate = CharState_Idle; idlestate = CharState_Idle;
} }

2
apps/openmw/mwmechanics/character.hpp
View File

@ -214,7 +214,7 @@ class CharacterController : public MWRender::Animation::TextKeyListener
void refreshCurrentAnims(CharacterState idle, CharacterState movement, JumpingState jump, bool force=false); void refreshCurrentAnims(CharacterState idle, CharacterState movement, JumpingState jump, bool force=false);
void refreshHitRecoilAnims(CharacterState& idle); void refreshHitRecoilAnims(CharacterState& idle);
void refreshJumpAnims(const WeaponInfo* weap, JumpingState jump, CharacterState& idle, bool force=false); void refreshJumpAnims(const WeaponInfo* weap, JumpingState jump, CharacterState& idle, CharacterState& movement, bool force=false);
void refreshMovementAnims(const WeaponInfo* weap, CharacterState movement, CharacterState& idle, bool force=false); void refreshMovementAnims(const WeaponInfo* weap, CharacterState movement, CharacterState& idle, bool force=false);
void refreshIdleAnims(const WeaponInfo* weap, CharacterState idle, bool force=false); void refreshIdleAnims(const WeaponInfo* weap, CharacterState idle, bool force=false);