From 739e184b526f9a16a25ea07d243701e8bc4f3399 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Thu, 10 Dec 2015 11:19:11 -0800
Subject: [PATCH] Fix attachments jitter

---
 interface/src/Application.cpp     | 1 +
 interface/src/avatar/Avatar.cpp   | 1 -
 interface/src/avatar/Avatar.h     | 4 +---
 interface/src/avatar/MyAvatar.cpp | 5 -----
 4 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 1a03cad62a..b3385a3744 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -2963,6 +2963,7 @@ void Application::update(float deltaTime) {
             }
 
             myAvatar->harvestResultsFromPhysicsSimulation();
+            myAvatar->simulateAttachments(deltaTime);
         }
     }
 
diff --git a/interface/src/avatar/Avatar.cpp b/interface/src/avatar/Avatar.cpp
index e2b92cc06f..218d679898 100644
--- a/interface/src/avatar/Avatar.cpp
+++ b/interface/src/avatar/Avatar.cpp
@@ -200,7 +200,6 @@ void Avatar::simulate(float deltaTime) {
             PerformanceTimer perfTimer("skeleton");
             _skeletonModel.getRig()->copyJointsFromJointData(_jointData);
             _skeletonModel.simulate(deltaTime, _hasNewJointRotations || _hasNewJointTranslations);
-            simulateAttachments(deltaTime);
             locationChanged(); // joints changed, so if there are any children, update them.
             _hasNewJointRotations = false;
             _hasNewJointTranslations = false;
diff --git a/interface/src/avatar/Avatar.h b/interface/src/avatar/Avatar.h
index 99a4fc52a9..09685c318e 100644
--- a/interface/src/avatar/Avatar.h
+++ b/interface/src/avatar/Avatar.h
@@ -69,6 +69,7 @@ public:
 
     void init();
     void simulate(float deltaTime);
+    void simulateAttachments(float deltaTime);
 
     virtual void render(RenderArgs* renderArgs, const glm::vec3& cameraPosition);
 
@@ -87,7 +88,6 @@ public:
     bool isInitialized() const { return _initialized; }
     SkeletonModel& getSkeletonModel() { return _skeletonModel; }
     const SkeletonModel& getSkeletonModel() const { return _skeletonModel; }
-    const QVector<Model*>& getAttachmentModels() const { return _attachmentModels; }
     glm::vec3 getChestPosition() const;
     float getAvatarScale() const { return getScale().y; }
     const Head* getHead() const { return static_cast<const Head*>(_headData); }
@@ -217,8 +217,6 @@ protected:
     virtual bool shouldRenderHead(const RenderArgs* renderArgs) const;
     virtual void fixupModelsInScene();
 
-    void simulateAttachments(float deltaTime);
-
     virtual void updateJointMappings();
 
     render::ItemID _renderItemID;
diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index 6637331b64..29f81ae47e 100644
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -323,11 +323,6 @@ void MyAvatar::simulate(float deltaTime) {
         return;
     }
 
-    {
-        PerformanceTimer perfTimer("attachments");
-        simulateAttachments(deltaTime);
-    }
-
     {
         PerformanceTimer perfTimer("joints");
         // copy out the skeleton joints from the model