From 4ebb114a8e5ba230c4aac16e1f914331c02afca1 Mon Sep 17 00:00:00 2001
From: Brad Hefta-Gaub <brad@highfidelity.io>
Date: Fri, 25 Mar 2016 11:43:32 -0700
Subject: [PATCH] also fix joint simulation from 3rd party editors

---
 .../src/RenderableModelEntityItem.cpp         | 21 +++++++++++++++++++
 .../src/RenderableModelEntityItem.h           |  5 +++++
 libraries/entities/src/ModelEntityItem.h      |  8 +++----
 3 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
index 2881682ad2..312e1fcea5 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
@@ -795,6 +795,27 @@ bool RenderableModelEntityItem::setAbsoluteJointTranslationInObjectFrame(int ind
     return result;
 }
 
+void RenderableModelEntityItem::setJointRotations(const QVector<glm::quat>& rotations) {
+    ModelEntityItem::setJointRotations(rotations);
+    _needsJointSimulation = true;
+}
+
+void RenderableModelEntityItem::setJointRotationsSet(const QVector<bool>& rotationsSet) {
+    ModelEntityItem::setJointRotationsSet(rotationsSet);
+    _needsJointSimulation = true;
+}
+
+void RenderableModelEntityItem::setJointTranslations(const QVector<glm::vec3>& translations) {
+    ModelEntityItem::setJointTranslations(translations);
+    _needsJointSimulation = true;
+}
+
+void RenderableModelEntityItem::setJointTranslationsSet(const QVector<bool>& translationsSet) {
+    ModelEntityItem::setJointTranslationsSet(translationsSet);
+    _needsJointSimulation = true;
+}
+
+
 void RenderableModelEntityItem::locationChanged() {
     EntityItem::locationChanged();
     if (_model && _model->isActive()) {
diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.h b/libraries/entities-renderer/src/RenderableModelEntityItem.h
index 03e59e97c1..ac82be83d8 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.h
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.h
@@ -69,6 +69,11 @@ public:
     virtual bool setAbsoluteJointRotationInObjectFrame(int index, const glm::quat& rotation) override;
     virtual bool setAbsoluteJointTranslationInObjectFrame(int index, const glm::vec3& translation) override;
 
+    virtual void setJointRotations(const QVector<glm::quat>& rotations) override;
+    virtual void setJointRotationsSet(const QVector<bool>& rotationsSet) override;
+    virtual void setJointTranslations(const QVector<glm::vec3>& translations) override;
+    virtual void setJointTranslationsSet(const QVector<bool>& translationsSet) override;
+
     virtual void loader() override;
     virtual void locationChanged() override;
 
diff --git a/libraries/entities/src/ModelEntityItem.h b/libraries/entities/src/ModelEntityItem.h
index 686fb1f72d..bce27f1cca 100644
--- a/libraries/entities/src/ModelEntityItem.h
+++ b/libraries/entities/src/ModelEntityItem.h
@@ -120,10 +120,10 @@ public:
     virtual glm::vec3 getJointPosition(int jointIndex) const { return glm::vec3(); }
     virtual glm::quat getJointRotation(int jointIndex) const { return glm::quat(); }
 
-    void setJointRotations(const QVector<glm::quat>& rotations);
-    void setJointRotationsSet(const QVector<bool>& rotationsSet);
-    void setJointTranslations(const QVector<glm::vec3>& translations);
-    void setJointTranslationsSet(const QVector<bool>& translationsSet);
+    virtual void setJointRotations(const QVector<glm::quat>& rotations);
+    virtual void setJointRotationsSet(const QVector<bool>& rotationsSet);
+    virtual void setJointTranslations(const QVector<glm::vec3>& translations);
+    virtual void setJointTranslationsSet(const QVector<bool>& translationsSet);
     QVector<glm::quat> getJointRotations() const;
     QVector<bool> getJointRotationsSet() const;
     QVector<glm::vec3> getJointTranslations() const;