From 2561d38d9303b8ef9cc68df29d2e3ed3f4101b25 Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Mon, 10 Apr 2017 17:10:06 -0700 Subject: [PATCH] Fix GCC warning --- .../script-engine/src/ScriptAvatarData.cpp | 56 +++++++------------ .../script-engine/src/ScriptAvatarData.h | 48 ++++++++-------- 2 files changed, 44 insertions(+), 60 deletions(-) diff --git a/libraries/script-engine/src/ScriptAvatarData.cpp b/libraries/script-engine/src/ScriptAvatarData.cpp index 89dd70507c..14688a75a1 100644 --- a/libraries/script-engine/src/ScriptAvatarData.cpp +++ b/libraries/script-engine/src/ScriptAvatarData.cpp @@ -41,70 +41,70 @@ glm::vec3 ScriptAvatarData::getPosition() const { return glm::vec3(); } } -const float ScriptAvatarData::getTargetScale() { +float ScriptAvatarData::getTargetScale() const { if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) { return sharedAvatarData->getTargetScale(); } else { return 0.0f; } } -const glm::vec3 ScriptAvatarData::getHandPosition() { +glm::vec3 ScriptAvatarData::getHandPosition() const { if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) { return sharedAvatarData->getHandPosition(); } else { return glm::vec3(); } } -const float ScriptAvatarData::getBodyPitch() { +float ScriptAvatarData::getBodyPitch() const { if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) { return sharedAvatarData->getBodyPitch(); } else { return 0.0f; } } -const float ScriptAvatarData::getBodyYaw() { +float ScriptAvatarData::getBodyYaw() const { if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) { return sharedAvatarData->getBodyYaw(); } else { return 0.0f; } } -const float ScriptAvatarData::getBodyRoll() { +float ScriptAvatarData::getBodyRoll() const { if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) { return sharedAvatarData->getBodyRoll(); } else { return 0.0f; } } -const glm::quat ScriptAvatarData::getOrientation() { +glm::quat ScriptAvatarData::getOrientation() const { if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) { return sharedAvatarData->getOrientation(); } else { return glm::quat(); } } -const glm::quat ScriptAvatarData::getHeadOrientation() { +glm::quat ScriptAvatarData::getHeadOrientation() const { if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) { return sharedAvatarData->getHeadOrientation(); } else { return glm::quat(); } } -const float ScriptAvatarData::getHeadPitch() { +float ScriptAvatarData::getHeadPitch() const { if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) { return sharedAvatarData->getHeadPitch(); } else { return 0.0f; } } -const float ScriptAvatarData::getHeadYaw() { +float ScriptAvatarData::getHeadYaw() const { if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) { return sharedAvatarData->getHeadYaw(); } else { return 0.0f; } } -const float ScriptAvatarData::getHeadRoll() { +float ScriptAvatarData::getHeadRoll() const { if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) { return sharedAvatarData->getHeadRoll(); } else { @@ -120,14 +120,14 @@ const float ScriptAvatarData::getHeadRoll() { // PHYSICAL PROPERTIES: VELOCITY // START // -const glm::vec3 ScriptAvatarData::getVelocity() { +glm::vec3 ScriptAvatarData::getVelocity() const { if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) { return sharedAvatarData->getVelocity(); } else { return glm::vec3(); } } -const glm::vec3 ScriptAvatarData::getAngularVelocity() { +glm::vec3 ScriptAvatarData::getAngularVelocity() const { if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) { return sharedAvatarData->getAngularVelocity(); } else { @@ -144,21 +144,21 @@ const glm::vec3 ScriptAvatarData::getAngularVelocity() { // IDENTIFIER PROPERTIES // START // -const QUuid ScriptAvatarData::getSessionUUID() const { +QUuid ScriptAvatarData::getSessionUUID() const { if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) { return sharedAvatarData->getSessionUUID(); } else { return QUuid(); } } -const QString ScriptAvatarData::getDisplayName() { +QString ScriptAvatarData::getDisplayName() const { if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) { return sharedAvatarData->getDisplayName(); } else { return QString(); } } -const QString ScriptAvatarData::getSessionDisplayName() { +QString ScriptAvatarData::getSessionDisplayName() const { if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) { return sharedAvatarData->getSessionDisplayName(); } else { @@ -174,27 +174,13 @@ const QString ScriptAvatarData::getSessionDisplayName() { // ATTACHMENT AND JOINT PROPERTIES // START // -const QString ScriptAvatarData::getSkeletonModelURLFromScript() { +QString ScriptAvatarData::getSkeletonModelURLFromScript() const { if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) { return sharedAvatarData->getSkeletonModelURLFromScript(); } else { return QString(); } } -const QVector ScriptAvatarData::getAttachmentData() { - if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) { - return sharedAvatarData->getAttachmentData(); - } else { - return QVector(); - } -} -const QStringList ScriptAvatarData::getJointNames() { - if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) { - return sharedAvatarData->getJointNames(); - } else { - return QStringList(); - } -} char ScriptAvatarData::getHandState() const { if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) { return sharedAvatarData->getHandState(); @@ -275,14 +261,14 @@ QVector ScriptAvatarData::getAttachmentData() const { // AUDIO PROPERTIES // START // -const float ScriptAvatarData::getAudioLoudness() { +float ScriptAvatarData::getAudioLoudness() const { if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) { return sharedAvatarData->getAudioLoudness(); } else { return 0.0f; } } -const float ScriptAvatarData::getAudioAverageLoudness() { +float ScriptAvatarData::getAudioAverageLoudness() const { if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) { return sharedAvatarData->getAudioAverageLoudness(); } else { @@ -298,21 +284,21 @@ const float ScriptAvatarData::getAudioAverageLoudness() { // MATRIX PROPERTIES // START // -const glm::mat4 ScriptAvatarData::getSensorToWorldMatrix() { +glm::mat4 ScriptAvatarData::getSensorToWorldMatrix() const { if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) { return sharedAvatarData->getSensorToWorldMatrix(); } else { return glm::mat4(); } } -const glm::mat4 ScriptAvatarData::getControllerLeftHandMatrix() { +glm::mat4 ScriptAvatarData::getControllerLeftHandMatrix() const { if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) { return sharedAvatarData->getControllerLeftHandMatrix(); } else { return glm::mat4(); } } -const glm::mat4 ScriptAvatarData::getControllerRightHandMatrix() { +glm::mat4 ScriptAvatarData::getControllerRightHandMatrix() const { if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) { return sharedAvatarData->getControllerRightHandMatrix(); } else { diff --git a/libraries/script-engine/src/ScriptAvatarData.h b/libraries/script-engine/src/ScriptAvatarData.h index 74e1e44301..8f3f7595e4 100644 --- a/libraries/script-engine/src/ScriptAvatarData.h +++ b/libraries/script-engine/src/ScriptAvatarData.h @@ -74,35 +74,33 @@ public: // using SpatiallyNestable::getPosition; virtual glm::vec3 getPosition() const override; - const float getTargetScale(); - const glm::vec3 getHandPosition(); - const float getBodyPitch(); - const float getBodyYaw(); - const float getBodyRoll(); - const glm::quat getOrientation(); - const glm::quat getHeadOrientation(); - const float getHeadPitch(); - const float getHeadYaw(); - const float getHeadRoll(); + float getTargetScale() const; + glm::vec3 getHandPosition() const; + float getBodyPitch() const; + float getBodyYaw() const; + float getBodyRoll() const; + virtual glm::quat getOrientation() const override; + glm::quat getHeadOrientation() const; + float getHeadPitch() const; + float getHeadYaw() const; + float getHeadRoll() const; // // PHYSICAL PROPERTIES: VELOCITY // - const glm::vec3 getVelocity(); - const glm::vec3 getAngularVelocity(); + virtual glm::vec3 getVelocity() const override; + virtual glm::vec3 getAngularVelocity() const override; // // IDENTIFIER PROPERTIES // - const QUuid getSessionUUID() const; - const QString getDisplayName(); - const QString getSessionDisplayName(); + QUuid getSessionUUID() const; + QString getDisplayName() const; + QString getSessionDisplayName() const; // // ATTACHMENT AND JOINT PROPERTIES // - const QString getSkeletonModelURLFromScript(); - const QVector getAttachmentData(); - const QStringList getJointNames(); + QString getSkeletonModelURLFromScript() const; Q_INVOKABLE char getHandState() const; Q_INVOKABLE virtual glm::quat getJointRotation(int index) const; Q_INVOKABLE virtual glm::vec3 getJointTranslation(int index) const; @@ -117,22 +115,22 @@ public: // // AUDIO PROPERTIES // - const float getAudioLoudness(); - const float getAudioAverageLoudness(); + float getAudioLoudness() const; + float getAudioAverageLoudness() const; // // MATRIX PROPERTIES // - const glm::mat4 getSensorToWorldMatrix(); - const glm::mat4 getControllerLeftHandMatrix(); - const glm::mat4 getControllerRightHandMatrix(); + glm::mat4 getSensorToWorldMatrix() const; + glm::mat4 getControllerLeftHandMatrix() const; + glm::mat4 getControllerRightHandMatrix() const; signals: void displayNameChanged(); public slots: - glm::quat getAbsoluteJointRotationInObjectFrame(int index) const; - glm::vec3 getAbsoluteJointTranslationInObjectFrame(int index) const; + virtual glm::quat getAbsoluteJointRotationInObjectFrame(int index) const override; + virtual glm::vec3 getAbsoluteJointTranslationInObjectFrame(int index) const override; private: std::weak_ptr _avatarData;