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

restoring previous roles

Browse source
This commit is contained in:
luiscuenca 2017-11-01 19:38:37 -07:00
parent da63e85699
commit 6a2dc38fdd
4 changed files with 24 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -144,27 +144,6 @@ QStringList Rig::getAnimationRoles() const {
}
}
QVector<std::shared_ptr<AnimClip>> Rig::getAnimationClips() const {
QVector<std::shared_ptr<AnimClip>> list;
if (_animNode) {
_animNode->traverse([&](AnimNode::Pointer node) {
// only report clip nodes as valid roles.
auto clipNode = std::dynamic_pointer_cast<AnimClip>(node);
if (clipNode) {
// filter out the userAnims, they are for internal use only.
if (!clipNode->getID().startsWith("userAnim")) {
list.append(clipNode);
}
}
return true;
});
return list;
}
else {
return list;
}
}
void Rig::overrideRoleAnimation(const QString& role, const QString& url, float fps, bool loop, float firstFrame, float lastFrame) {
if (_animNode) {
AnimNode::Pointer node = _animNode->findByName(role);
@ -173,6 +152,7 @@ void Rig::overrideRoleAnimation(const QString& role, const QString& url, float f
const float REFERENCE_FRAMES_PER_SECOND = 30.0f;
float timeScale = fps / REFERENCE_FRAMES_PER_SECOND;
auto clipNode = std::make_shared<AnimClip>(role, url, firstFrame, lastFrame, timeScale, loop, false);
_roleAnimState[role] = { role, url, fps, loop, firstFrame, lastFrame };
AnimNode::Pointer parent = node->getParent();
parent->replaceChild(node, clipNode);
} else {
@ -1659,8 +1639,14 @@ void Rig::initAnimGraph(const QUrl& url) {
_userAnimState = { UserAnimState::None, "", 30.0f, false, 0.0f, 0.0f };
overrideAnimation(origState.url, origState.fps, origState.loop, origState.firstFrame, origState.lastFrame);
}
// restore the role animations we had before reset.
for (auto ite = _roleAnimState.begin(); ite != _roleAnimState.end(); ite++) {
auto role = ite->first;
auto roleState = _roleAnimState[role];
overrideRoleAnimation(roleState.role, roleState.url, roleState.fps, roleState.loop, roleState.firstFrame, roleState.lastFrame);
}
_animLoading = false;
emit onLoadComplete();
});
connect(_animLoader.get(), &AnimNodeLoader::error, [url](int error, QString str) {

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

@ -21,7 +21,6 @@
#include <JointData.h>
#include <QReadWriteLock>
#include "AnimClip.h"
#include "AnimNode.h"
#include "AnimNodeLoader.h"
#include "SimpleMovingAverage.h"
@ -108,7 +107,7 @@ public:
QStringList getAnimationRoles() const;
void overrideRoleAnimation(const QString& role, const QString& url, float fps, bool loop, float firstFrame, float lastFrame);
void restoreRoleAnimation(const QString& role);
QVector<std::shared_ptr<AnimClip>> getAnimationClips() const;
//QVector<std::shared_ptr<AnimClip>> getAnimationClips() const;
void initJointStates(const FBXGeometry& geometry, const glm::mat4& modelOffset);
void reset(const FBXGeometry& geometry);
@ -337,8 +336,22 @@ protected:
float firstFrame;
float lastFrame;
};
struct RoleAnimState {
RoleAnimState() {}
RoleAnimState(const QString& roleId, const QString& urlIn, float fpsIn, bool loopIn, float firstFrameIn, float lastFrameIn) :
role(roleId), url(urlIn), fps(fpsIn), loop(loopIn), firstFrame(firstFrameIn), lastFrame(lastFrameIn) {}
QString role;
QString url;
float fps;
bool loop;
float firstFrame;
float lastFrame;
};
UserAnimState _userAnimState;
std::map<QString, RoleAnimState> _roleAnimState;
float _leftHandOverlayAlpha { 0.0f };
float _rightHandOverlayAlpha { 0.0f };

12
libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
View file

@ -139,7 +139,6 @@ Avatar::~Avatar() {
void Avatar::init() {
getHead()->init();
_skeletonModel->init();
connect(&_skeletonModel->getRig(), &Rig::onLoadComplete, this, &Avatar::restoreAnimations);
_initialized = true;
}
@ -199,16 +198,6 @@ void Avatar::setTargetScale(float targetScale) {
}
}
void Avatar::restoreAnimations() {
for (int i = 0; i < _animationCache.size(); i++) {
auto clip = _animationCache[i];
const float REFERENCE_FRAMES_PER_SECOND = 30.0f;
float fps = REFERENCE_FRAMES_PER_SECOND / clip->getTimeScale();
qDebug() << clip->getID() << " " << clip->getURL() << " " << fps << " " << clip->getLoopFlag() << " " << clip->getStartFrame() << " " << clip->getEndFrame();
_skeletonModel->getRig().overrideRoleAnimation(clip->getID(), clip->getURL(), fps, clip->getLoopFlag(), clip->getStartFrame(), clip->getEndFrame());
}
}
void Avatar::updateAvatarEntities() {
PerformanceTimer perfTimer("attachments");
// - if queueEditEntityMessage sees clientOnly flag it does _myAvatar->updateAvatarEntity()
@ -1188,7 +1177,6 @@ void Avatar::scaleVectorRelativeToPosition(glm::vec3 &positionToScale) const {
}
void Avatar::setSkeletonModelURL(const QUrl& skeletonModelURL) {
_animationCache = _skeletonModel->getRig().getAnimationClips();
AvatarData::setSkeletonModelURL(skeletonModelURL);
if (QThread::currentThread() == thread()) {
_skeletonModel->setURL(_skeletonModelURL);

4
libraries/avatars-renderer/src/avatars-renderer/Avatar.h
View file

@ -274,7 +274,7 @@ public slots:
glm::vec3 getRightPalmPosition() const;
glm::quat getRightPalmRotation() const;
void restoreAnimations();
//void restoreAnimations();
void setModelURLFinished(bool success);
protected:
@ -378,8 +378,6 @@ private:
float _displayNameTargetAlpha { 1.0f };
float _displayNameAlpha { 1.0f };
QVector<std::shared_ptr<AnimClip>> _animationCache;
};
#endif // hifi_Avatar_h