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

Rm prefetchAnimation from avatar/rig

Browse source
This commit is contained in:
Zach Pomerantz 2016-04-19 21:25:59 -07:00
parent 66235acac2
commit e3131d2098
4 changed files with 0 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/src/avatar/MyAvatar.cpp
View file

@ -627,14 +627,6 @@ void MyAvatar::restoreRoleAnimation(const QString& role) {
_rig->restoreRoleAnimation(role); _rig->restoreRoleAnimation(role);
} }
void MyAvatar::prefetchAnimation(const QString& url) {
if (QThread::currentThread() != thread()) {
QMetaObject::invokeMethod(this, "prefetchAnimation", Q_ARG(const QString&, url));
return;
}
_rig->prefetchAnimation(url);
}
void MyAvatar::saveData() { void MyAvatar::saveData() {
Settings settings; Settings settings;
settings.beginGroup("Avatar"); settings.beginGroup("Avatar");

3
interface/src/avatar/MyAvatar.h
View file

@ -143,9 +143,6 @@ public:
// remove an animation role override and return to the standard animation. // remove an animation role override and return to the standard animation.
Q_INVOKABLE void restoreRoleAnimation(const QString& role); Q_INVOKABLE void restoreRoleAnimation(const QString& role);
// prefetch animation
Q_INVOKABLE void prefetchAnimation(const QString& url);
// Adds handler(animStateDictionaryIn) => animStateDictionaryOut, which will be invoked just before each animGraph state update. // Adds handler(animStateDictionaryIn) => animStateDictionaryOut, which will be invoked just before each animGraph state update.
// The handler will be called with an animStateDictionaryIn that has all those properties specified by the (possibly empty) // The handler will be called with an animStateDictionaryIn that has all those properties specified by the (possibly empty)
// propertiesList argument. However for debugging, if the properties argument is null, all internal animGraph state is provided. // propertiesList argument. However for debugging, if the properties argument is null, all internal animGraph state is provided.

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

@ -152,14 +152,6 @@ void Rig::restoreRoleAnimation(const QString& role) {
} }
} }
void Rig::prefetchAnimation(const QString& url) {
// This will begin loading the NetworkGeometry for the given URL.
// which should speed us up if we request it later via overrideAnimation.
auto clipNode = std::make_shared<AnimClip>("prefetch", url, 0, 0, 1.0, false, false);
_prefetchedAnimations.push_back(clipNode);
}
void Rig::destroyAnimGraph() { void Rig::destroyAnimGraph() {
_animSkeleton.reset(); _animSkeleton.reset();
_animLoader.reset(); _animLoader.reset();

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

@ -94,7 +94,6 @@ public:
QStringList getAnimationRoles() const; QStringList getAnimationRoles() const;
void overrideRoleAnimation(const QString& role, const QString& url, float fps, bool loop, float firstFrame, float lastFrame); void overrideRoleAnimation(const QString& role, const QString& url, float fps, bool loop, float firstFrame, float lastFrame);
void restoreRoleAnimation(const QString& role); void restoreRoleAnimation(const QString& role);
void prefetchAnimation(const QString& url);
void initJointStates(const FBXGeometry& geometry, const glm::mat4& modelOffset); void initJointStates(const FBXGeometry& geometry, const glm::mat4& modelOffset);
void reset(const FBXGeometry& geometry); void reset(const FBXGeometry& geometry);
@ -322,7 +321,6 @@ protected:
SimpleMovingAverage _averageLateralSpeed { 10 }; SimpleMovingAverage _averageLateralSpeed { 10 };
std::map<QString, AnimNode::Pointer> _origRoleAnimations; std::map<QString, AnimNode::Pointer> _origRoleAnimations;
std::vector<AnimNode::Pointer> _prefetchedAnimations;
bool _lastEnableInverseKinematics { true }; bool _lastEnableInverseKinematics { true };
bool _enableInverseKinematics { true }; bool _enableInverseKinematics { true };