From d3d5d3a19e4970707e5c552585aa336c638beece Mon Sep 17 00:00:00 2001 From: samcake Date: Tue, 10 Nov 2015 12:02:20 -0800 Subject: [PATCH] Removing useless code --- interface/src/avatar/Avatar.cpp | 11 ----------- interface/src/avatar/Avatar.h | 1 - interface/src/avatar/MyAvatar.cpp | 8 -------- interface/src/avatar/MyAvatar.h | 1 - libraries/avatars/src/AvatarData.cpp | 15 --------------- libraries/avatars/src/AvatarData.h | 1 - libraries/avatars/src/Recording.cpp | 2 +- 7 files changed, 1 insertion(+), 38 deletions(-) diff --git a/interface/src/avatar/Avatar.cpp b/interface/src/avatar/Avatar.cpp index a5ae8cddda..b979334383 100644 --- a/interface/src/avatar/Avatar.cpp +++ b/interface/src/avatar/Avatar.cpp @@ -888,17 +888,6 @@ glm::quat Avatar::getJointRotation(int index) const { return rotation; } -QVector Avatar::getJointTranslations() const { - if (QThread::currentThread() != thread()) { - return AvatarData::getJointTranslations(); - } - QVector jointTranslations(_skeletonModel.getJointStateCount()); - for (int i = 0; i < _skeletonModel.getJointStateCount(); ++i) { - _skeletonModel.getJointTranslation(i, jointTranslations[i]); - } - return jointTranslations; -} - glm::vec3 Avatar::getJointTranslation(int index) const { if (QThread::currentThread() != thread()) { return AvatarData::getJointTranslation(index); diff --git a/interface/src/avatar/Avatar.h b/interface/src/avatar/Avatar.h index cb7c533db6..44b5d91015 100644 --- a/interface/src/avatar/Avatar.h +++ b/interface/src/avatar/Avatar.h @@ -103,7 +103,6 @@ public: virtual QVector getJointRotations() const; virtual glm::quat getJointRotation(int index) const; - virtual QVector getJointTranslations() const; virtual glm::vec3 getJointTranslation(int index) const; virtual int getJointIndex(const QString& name) const; virtual QStringList getJointNames() const; diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index 8595fa850e..6f60ad179c 100644 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -1132,14 +1132,6 @@ void MyAvatar::setJointRotations(QVector jointRotations) { } } -void MyAvatar::setJointTranslations(QVector jointTranslations) { - int numStates = glm::min(_skeletonModel.getJointStateCount(), jointTranslations.size()); - for (int i = 0; i < numStates; ++i) { - // HACK: ATM only Recorder calls setJointTranslations() so we hardcode its priority here - _skeletonModel.setJointTranslation(i, true, jointTranslations[i], RECORDER_PRIORITY); - } -} - void MyAvatar::setJointData(int index, const glm::quat& rotation, const glm::vec3& translation) { if (QThread::currentThread() != thread()) { QMetaObject::invokeMethod(this, "setJointData", Q_ARG(int, index), Q_ARG(const glm::quat&, rotation), diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h index d6f51636f3..da836b7f15 100644 --- a/interface/src/avatar/MyAvatar.h +++ b/interface/src/avatar/MyAvatar.h @@ -192,7 +192,6 @@ public: void clearLookAtTargetAvatar(); virtual void setJointRotations(QVector jointRotations) override; - virtual void setJointTranslations(QVector jointTranslations) override; virtual void setJointData(int index, const glm::quat& rotation, const glm::vec3& translation) override; virtual void setJointRotation(int index, const glm::quat& rotation) override; virtual void setJointTranslation(int index, const glm::vec3& translation) override; diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp index a13c01901e..a698c6f374 100644 --- a/libraries/avatars/src/AvatarData.cpp +++ b/libraries/avatars/src/AvatarData.cpp @@ -1146,21 +1146,6 @@ void AvatarData::setJointRotations(QVector jointRotations) { } } -QVector AvatarData::getJointTranslations() const { - if (QThread::currentThread() != thread()) { - QVector result; - QMetaObject::invokeMethod(const_cast(this), - "getJointTranslations", Qt::BlockingQueuedConnection, - Q_RETURN_ARG(QVector, result)); - return result; - } - QVector jointTranslations(_jointData.size()); - for (int i = 0; i < _jointData.size(); ++i) { - jointTranslations[i] = _jointData[i].translation; - } - return jointTranslations; -} - void AvatarData::setJointTranslations(QVector jointTranslations) { if (QThread::currentThread() != thread()) { QVector result; diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h index 766f31dda1..9079f15f53 100644 --- a/libraries/avatars/src/AvatarData.h +++ b/libraries/avatars/src/AvatarData.h @@ -261,7 +261,6 @@ public: Q_INVOKABLE virtual QVector getJointRotations() const; Q_INVOKABLE virtual void setJointRotations(QVector jointRotations); - Q_INVOKABLE virtual QVector getJointTranslations() const; Q_INVOKABLE virtual void setJointTranslations(QVector jointTranslations); Q_INVOKABLE virtual void clearJointsData(); diff --git a/libraries/avatars/src/Recording.cpp b/libraries/avatars/src/Recording.cpp index fa343630ed..26c5ab66dd 100644 --- a/libraries/avatars/src/Recording.cpp +++ b/libraries/avatars/src/Recording.cpp @@ -238,7 +238,7 @@ void writeRecordingToFile(RecordingPointer recording, const QString& filename) { } for (quint32 j = 0; j < numJoints; j++) { const auto& joint = jointArray[j]; - if (joint.rotationSet) { + if (true) { //(joint.rotationSet) { writeQuat(stream, joint.rotation); mask.setBit(maskIndex); }