From e3131d20989d3770791e5a67dd2fcbaeaff1061e Mon Sep 17 00:00:00 2001
From: Zach Pomerantz <zach@highfidelity.io>
Date: Tue, 19 Apr 2016 21:25:59 -0700
Subject: [PATCH] Rm prefetchAnimation from avatar/rig

---
 interface/src/avatar/MyAvatar.cpp | 8 --------
 interface/src/avatar/MyAvatar.h   | 3 ---
 libraries/animation/src/Rig.cpp   | 8 --------
 libraries/animation/src/Rig.h     | 2 --
 4 files changed, 21 deletions(-)

diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index ea713e2d96..06d863eaac 100644
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -627,14 +627,6 @@ void MyAvatar::restoreRoleAnimation(const QString& 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() {
     Settings settings;
     settings.beginGroup("Avatar");
diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h
index 35caabe0f7..2de8aa9405 100644
--- a/interface/src/avatar/MyAvatar.h
+++ b/interface/src/avatar/MyAvatar.h
@@ -143,9 +143,6 @@ public:
     // remove an animation role override and return to the standard animation.
     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.
     // 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.
diff --git a/libraries/animation/src/Rig.cpp b/libraries/animation/src/Rig.cpp
index b3f5e30d40..a7115199a2 100644
--- a/libraries/animation/src/Rig.cpp
+++ b/libraries/animation/src/Rig.cpp
@@ -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() {
     _animSkeleton.reset();
     _animLoader.reset();
diff --git a/libraries/animation/src/Rig.h b/libraries/animation/src/Rig.h
index 897fa358e8..f50ea04b1d 100644
--- a/libraries/animation/src/Rig.h
+++ b/libraries/animation/src/Rig.h
@@ -94,7 +94,6 @@ 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);
-    void prefetchAnimation(const QString& url);
 
     void initJointStates(const FBXGeometry& geometry, const glm::mat4& modelOffset);
     void reset(const FBXGeometry& geometry);
@@ -322,7 +321,6 @@ protected:
     SimpleMovingAverage _averageLateralSpeed { 10 };
 
     std::map<QString, AnimNode::Pointer> _origRoleAnimations;
-    std::vector<AnimNode::Pointer> _prefetchedAnimations;
 
     bool _lastEnableInverseKinematics { true };
     bool _enableInverseKinematics { true };