From 3832abffeeb3cb04792428650ca8c47c917e094f Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Mon, 10 Apr 2017 15:54:25 -0700 Subject: [PATCH] Almost theregit add -A --- .../script-engine/src/ScriptAvatarData.cpp | 56 ++++++++++++++++--- .../script-engine/src/ScriptAvatarData.h | 9 ++- 2 files changed, 56 insertions(+), 9 deletions(-) diff --git a/libraries/script-engine/src/ScriptAvatarData.cpp b/libraries/script-engine/src/ScriptAvatarData.cpp index 2717caaf59..22b4e06c21 100644 --- a/libraries/script-engine/src/ScriptAvatarData.cpp +++ b/libraries/script-engine/src/ScriptAvatarData.cpp @@ -195,13 +195,6 @@ const QStringList ScriptAvatarData::getJointNames() { return QStringList(); } } -int ScriptAvatarData::getJointIndex(const QString& name) const { - if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) { - return sharedAvatarData->getJointIndex(name); - } else { - return -1; - } -} char ScriptAvatarData::getHandState() const { if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) { return sharedAvatarData->getHandState(); @@ -223,6 +216,55 @@ glm::vec3 ScriptAvatarData::getJointTranslation(int index) const { return glm::vec3(); } } +glm::quat ScriptAvatarData::getJointRotation(const QString& name) const { + if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) { + return sharedAvatarData->getJointRotation(name); + } else { + return glm::quat(); + } +} +glm::vec3 ScriptAvatarData::getJointTranslation(const QString& name) const { + if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) { + return sharedAvatarData->getJointTranslation(name); + } else { + return glm::vec3(); + } +} +QVector ScriptAvatarData::getJointRotations() const { + if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) { + return sharedAvatarData->getJointRotations(); + } else { + return QVector(); + } +} +bool ScriptAvatarData::isJointDataValid(const QString& name) const { + if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) { + return sharedAvatarData->isJointDataValid(name); + } else { + return false; + } +} +int ScriptAvatarData::getJointIndex(const QString& name) const { + if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) { + return sharedAvatarData->getJointIndex(name); + } else { + return -1; + } +} +QStringList ScriptAvatarData::getJointNames() const { + if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) { + return sharedAvatarData->getJointNames(); + } else { + return QStringList(); + } +} +QVector ScriptAvatarData::getAttachmentData() const { + if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) { + return sharedAvatarData->getAttachmentData(); + } else { + return QVector(); + } +} // // ATTACHMENT AND JOINT PROPERTIES // END diff --git a/libraries/script-engine/src/ScriptAvatarData.h b/libraries/script-engine/src/ScriptAvatarData.h index aff75745da..74e1e44301 100644 --- a/libraries/script-engine/src/ScriptAvatarData.h +++ b/libraries/script-engine/src/ScriptAvatarData.h @@ -103,11 +103,16 @@ public: const QString getSkeletonModelURLFromScript(); const QVector getAttachmentData(); const QStringList getJointNames(); - /// Returns the index of the joint with the specified name, or -1 if not found/unknown. - Q_INVOKABLE virtual int getJointIndex(const QString& name) const; Q_INVOKABLE char getHandState() const; Q_INVOKABLE virtual glm::quat getJointRotation(int index) const; Q_INVOKABLE virtual glm::vec3 getJointTranslation(int index) const; + Q_INVOKABLE glm::quat getJointRotation(const QString& name) const; + Q_INVOKABLE glm::vec3 getJointTranslation(const QString& name) const; + Q_INVOKABLE virtual QVector getJointRotations() const; + Q_INVOKABLE bool isJointDataValid(const QString& name) const; + Q_INVOKABLE virtual int getJointIndex(const QString& name) const; + Q_INVOKABLE virtual QStringList getJointNames() const; + Q_INVOKABLE QVector getAttachmentData() const; // // AUDIO PROPERTIES