Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-20 10:20:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rig: save and restore user animations across resets

Browse source
This commit is contained in:
Anthony J. Thibault 2016-04-12 14:51:17 -07:00
parent b758acb7d8
commit a1bbb63ec4
2 changed files with 61 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
libraries/animation/src/Rig.cpp
View file

@ -48,16 +48,23 @@ const glm::vec3 DEFAULT_NECK_POS(0.0f, 0.70f, 0.0f);
void Rig::overrideAnimation(const QString& url, float fps, bool loop, float firstFrame, float lastFrame) { void Rig::overrideAnimation(const QString& url, float fps, bool loop, float firstFrame, float lastFrame) {
UserAnimState::ClipNodeEnum clipNodeEnum;
if (_userAnimState.clipNodeEnum == UserAnimState::None || _userAnimState.clipNodeEnum == UserAnimState::B) {
clipNodeEnum = UserAnimState::A;
} else {
clipNodeEnum = UserAnimState::B;
}
if (_animNode) {
// find an unused AnimClip clipNode // find an unused AnimClip clipNode
std::shared_ptr<AnimClip> clip; std::shared_ptr<AnimClip> clip;
if (_userAnimState == UserAnimState::None || _userAnimState == UserAnimState::B) { if (clipNodeEnum == UserAnimState::A) {
_userAnimState = UserAnimState::A;
clip = std::dynamic_pointer_cast<AnimClip>(_animNode->findByName("userAnimA")); clip = std::dynamic_pointer_cast<AnimClip>(_animNode->findByName("userAnimA"));
} else if (_userAnimState == UserAnimState::A) { } else {
_userAnimState = UserAnimState::B;
clip = std::dynamic_pointer_cast<AnimClip>(_animNode->findByName("userAnimB")); clip = std::dynamic_pointer_cast<AnimClip>(_animNode->findByName("userAnimB"));
} }
if (clip) {
// set parameters // set parameters
clip->setLoopFlag(loop); clip->setLoopFlag(loop);
clip->setStartFrame(firstFrame); clip->setStartFrame(firstFrame);
@ -66,18 +73,22 @@ void Rig::overrideAnimation(const QString& url, float fps, bool loop, float firs
float timeScale = fps / REFERENCE_FRAMES_PER_SECOND; float timeScale = fps / REFERENCE_FRAMES_PER_SECOND;
clip->setTimeScale(timeScale); clip->setTimeScale(timeScale);
clip->loadURL(url); clip->loadURL(url);
}
}
_currentUserAnimURL = url; // store current user anim state.
_userAnimState = { clipNodeEnum, url, fps, loop, firstFrame, lastFrame };
// notify the userAnimStateMachine the desired state. // notify the userAnimStateMachine the desired state.
_animVars.set("userAnimNone", false); _animVars.set("userAnimNone", false);
_animVars.set("userAnimA", _userAnimState == UserAnimState::A); _animVars.set("userAnimA", clipNodeEnum == UserAnimState::A);
_animVars.set("userAnimB", _userAnimState == UserAnimState::B); _animVars.set("userAnimB", clipNodeEnum == UserAnimState::B);
} }
void Rig::restoreAnimation() { void Rig::restoreAnimation() {
if (_currentUserAnimURL != "") { if (_userAnimState.clipNodeEnum != UserAnimState::None) {
_currentUserAnimURL = ""; _userAnimState.clipNodeEnum = UserAnimState::None;
// notify the userAnimStateMachine the desired state. // notify the userAnimStateMachine the desired state.
_animVars.set("userAnimNone", true); _animVars.set("userAnimNone", true);
_animVars.set("userAnimA", false); _animVars.set("userAnimA", false);
@ -1129,6 +1140,14 @@ void Rig::initAnimGraph(const QUrl& url) {
connect(_animLoader.get(), &AnimNodeLoader::success, [this](AnimNode::Pointer nodeIn) { connect(_animLoader.get(), &AnimNodeLoader::success, [this](AnimNode::Pointer nodeIn) {
_animNode = nodeIn; _animNode = nodeIn;
_animNode->setSkeleton(_animSkeleton); _animNode->setSkeleton(_animSkeleton);
if (_userAnimState.clipNodeEnum != UserAnimState::None) {
// restore the user animation we had before reset.
UserAnimState origState = _userAnimState;
_userAnimState = { UserAnimState::None, "", 30.0f, false, 0.0f, 0.0f };
overrideAnimation(origState.url, origState.fps, origState.loop, origState.firstFrame, origState.lastFrame);
}
}); });
connect(_animLoader.get(), &AnimNodeLoader::error, [url](int error, QString str) { connect(_animLoader.get(), &AnimNodeLoader::error, [url](int error, QString str) {
qCCritical(animation) << "Error loading" << url.toDisplayString() << "code = " << error << "str =" << str; qCCritical(animation) << "Error loading" << url.toDisplayString() << "code = " << error << "str =" << str;

21
libraries/animation/src/Rig.h
View file

@ -289,13 +289,28 @@ public:
RigRole _state { RigRole::Idle }; RigRole _state { RigRole::Idle };
RigRole _desiredState { RigRole::Idle }; RigRole _desiredState { RigRole::Idle };
float _desiredStateAge { 0.0f }; float _desiredStateAge { 0.0f };
enum class UserAnimState {
struct UserAnimState {
enum ClipNodeEnum {
None = 0, None = 0,
A, A,
B B
}; };
UserAnimState _userAnimState { UserAnimState::None };
QString _currentUserAnimURL; UserAnimState() : clipNodeEnum(UserAnimState::None) {}
UserAnimState(ClipNodeEnum clipNodeEnumIn, const QString& urlIn, float fpsIn, bool loopIn, float firstFrameIn, float lastFrameIn) :
clipNodeEnum(clipNodeEnumIn), url(urlIn), fps(fpsIn), loop(loopIn), firstFrame(firstFrameIn), lastFrame(lastFrameIn) {}
ClipNodeEnum clipNodeEnum;
QString url;
float fps;
bool loop;
float firstFrame;
float lastFrame;
};
UserAnimState _userAnimState;
float _leftHandOverlayAlpha { 0.0f }; float _leftHandOverlayAlpha { 0.0f };
float _rightHandOverlayAlpha { 0.0f }; float _rightHandOverlayAlpha { 0.0f };