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

Implemented MyAvatar.prefetchAnimation() JS method

Browse source
This commit is contained in:
Anthony J. Thibault 2015-11-10 16:51:48 -08:00
parent 936c55a94e
commit e1d0a97807
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
examples/theBird.js
View file

@ -20,7 +20,9 @@ for (i = 0; i < l; i++) {
print(roles[i]); print(roles[i]);
} }
// replace point with the bird! MyAvatar.prefetchAnimation(THE_BIRD_RIGHT_URL);
// replace point animations with the bird!
MyAvatar.overrideRoleAnimation("rightHandPointIntro", THE_BIRD_RIGHT_URL, 30, false, 0, 12); MyAvatar.overrideRoleAnimation("rightHandPointIntro", THE_BIRD_RIGHT_URL, 30, false, 0, 12);
MyAvatar.overrideRoleAnimation("rightHandPointHold", THE_BIRD_RIGHT_URL, 30, false, 12, 12); MyAvatar.overrideRoleAnimation("rightHandPointHold", THE_BIRD_RIGHT_URL, 30, false, 12, 12);
MyAvatar.overrideRoleAnimation("rightHandPointOutro", THE_BIRD_RIGHT_URL, 30, false, 19, 30); MyAvatar.overrideRoleAnimation("rightHandPointOutro", THE_BIRD_RIGHT_URL, 30, false, 19, 30);

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

@ -180,7 +180,10 @@ void Rig::restoreRoleAnimation(const QString& role) {
void Rig::prefetchAnimation(const QString& url) { void Rig::prefetchAnimation(const QString& url) {
if (_enableAnimGraph) { if (_enableAnimGraph) {
// TODO: // 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);
_prefetchedAnimations.push_back(clipNode);
} }
} }

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

@ -265,6 +265,7 @@ public:
SimpleMovingAverage _averageLateralSpeed { 10 }; SimpleMovingAverage _averageLateralSpeed { 10 };
std::map<QString, AnimNode::Pointer> _origRoleAnimations; std::map<QString, AnimNode::Pointer> _origRoleAnimations;
std::vector<AnimNode::Pointer> _prefetchedAnimations;
private: private:
QMap<int, StateHandler> _stateHandlers; QMap<int, StateHandler> _stateHandlers;