mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-14 10:49:56 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1780 from akortunov/persistanims

Browse source 
Ignore movement from scripted animations
This commit is contained in:
Bret Curtis 2018-06-27 12:18:48 +02:00 committed by GitHub
commit f64d949169
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -50,6 +50,7 @@
Bug #4469: Abot Silt Striders – Model turn 90 degrees on horizontal Bug #4469: Abot Silt Striders – Model turn 90 degrees on horizontal
Bug #4471: Retrieve SDL window settings instead of using magic numbers Bug #4471: Retrieve SDL window settings instead of using magic numbers
Bug #4474: No fallback when getVampireHead fails Bug #4474: No fallback when getVampireHead fails
Bug #4475: Scripted animations should not cause movement
Feature #3276: Editor: Search- Show number of (remaining) search results and indicate a search without any results Feature #3276: Editor: Search- Show number of (remaining) search results and indicate a search without any results
Feature #4222: 360° screenshots Feature #4222: 360° screenshots
Feature #4256: Implement ToggleBorders (TB) console command Feature #4256: Implement ToggleBorders (TB) console command

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

@ -2141,7 +2141,7 @@ void CharacterController::unpersistAnimationState()
bool loopfallback = (mAnimQueue.front().mGroup.compare(0,4,"idle") == 0); bool loopfallback = (mAnimQueue.front().mGroup.compare(0,4,"idle") == 0);
mAnimation->play(anim.mGroup, mAnimation->play(anim.mGroup,
Priority_Default, MWRender::Animation::BlendMask_All, false, 1.0f, Priority_Persistent, MWRender::Animation::BlendMask_All, false, 1.0f,
"start", "stop", complete, anim.mLoopCount, loopfallback); "start", "stop", complete, anim.mLoopCount, loopfallback);
} }
} }

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

@ -1190,6 +1190,10 @@ namespace MWRender
mHeadController->setRotate(osg::Quat(mHeadPitchRadians, osg::Vec3f(1,0,0)) * osg::Quat(mHeadYawRadians, osg::Vec3f(0,0,1))); mHeadController->setRotate(osg::Quat(mHeadPitchRadians, osg::Vec3f(1,0,0)) * osg::Quat(mHeadYawRadians, osg::Vec3f(0,0,1)));
} }
// Scripted animations should not cause movement
if (hasScriptedAnims)
return osg::Vec3f(0, 0, 0);
return movement; return movement;
} }