Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix GCC warning

Browse source
This commit is contained in:
Zach Fox 2017-04-10 17:10:06 -07:00
parent 04792bf3bc
commit 2561d38d93
2 changed files with 44 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
libraries/script-engine/src/ScriptAvatarData.cpp
View file

@ -41,70 +41,70 @@ glm::vec3 ScriptAvatarData::getPosition() const {
return glm::vec3(); return glm::vec3();
} }
} }
const float ScriptAvatarData::getTargetScale() { float ScriptAvatarData::getTargetScale() const {
if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) { if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) {
return sharedAvatarData->getTargetScale(); return sharedAvatarData->getTargetScale();
} else { } else {
return 0.0f; return 0.0f;
} }
} }
const glm::vec3 ScriptAvatarData::getHandPosition() { glm::vec3 ScriptAvatarData::getHandPosition() const {
if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) { if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) {
return sharedAvatarData->getHandPosition(); return sharedAvatarData->getHandPosition();
} else { } else {
return glm::vec3(); return glm::vec3();
} }
} }
const float ScriptAvatarData::getBodyPitch() { float ScriptAvatarData::getBodyPitch() const {
if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) { if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) {
return sharedAvatarData->getBodyPitch(); return sharedAvatarData->getBodyPitch();
} else { } else {
return 0.0f; return 0.0f;
} }
} }
const float ScriptAvatarData::getBodyYaw() { float ScriptAvatarData::getBodyYaw() const {
if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) { if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) {
return sharedAvatarData->getBodyYaw(); return sharedAvatarData->getBodyYaw();
} else { } else {
return 0.0f; return 0.0f;
} }
} }
const float ScriptAvatarData::getBodyRoll() { float ScriptAvatarData::getBodyRoll() const {
if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) { if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) {
return sharedAvatarData->getBodyRoll(); return sharedAvatarData->getBodyRoll();
} else { } else {
return 0.0f; return 0.0f;
} }
} }
const glm::quat ScriptAvatarData::getOrientation() { glm::quat ScriptAvatarData::getOrientation() const {
if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) { if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) {
return sharedAvatarData->getOrientation(); return sharedAvatarData->getOrientation();
} else { } else {
return glm::quat(); return glm::quat();
} }
} }
const glm::quat ScriptAvatarData::getHeadOrientation() { glm::quat ScriptAvatarData::getHeadOrientation() const {
if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) { if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) {
return sharedAvatarData->getHeadOrientation(); return sharedAvatarData->getHeadOrientation();
} else { } else {
return glm::quat(); return glm::quat();
} }
} }
const float ScriptAvatarData::getHeadPitch() { float ScriptAvatarData::getHeadPitch() const {
if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) { if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) {
return sharedAvatarData->getHeadPitch(); return sharedAvatarData->getHeadPitch();
} else { } else {
return 0.0f; return 0.0f;
} }
} }
const float ScriptAvatarData::getHeadYaw() { float ScriptAvatarData::getHeadYaw() const {
if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) { if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) {
return sharedAvatarData->getHeadYaw(); return sharedAvatarData->getHeadYaw();
} else { } else {
return 0.0f; return 0.0f;
} }
} }
const float ScriptAvatarData::getHeadRoll() { float ScriptAvatarData::getHeadRoll() const {
if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) { if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) {
return sharedAvatarData->getHeadRoll(); return sharedAvatarData->getHeadRoll();
} else { } else {
@ -120,14 +120,14 @@ const float ScriptAvatarData::getHeadRoll() {
// PHYSICAL PROPERTIES: VELOCITY // PHYSICAL PROPERTIES: VELOCITY
// START // START
// //
const glm::vec3 ScriptAvatarData::getVelocity() { glm::vec3 ScriptAvatarData::getVelocity() const {
if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) { if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) {
return sharedAvatarData->getVelocity(); return sharedAvatarData->getVelocity();
} else { } else {
return glm::vec3(); return glm::vec3();
} }
} }
const glm::vec3 ScriptAvatarData::getAngularVelocity() { glm::vec3 ScriptAvatarData::getAngularVelocity() const {
if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) { if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) {
return sharedAvatarData->getAngularVelocity(); return sharedAvatarData->getAngularVelocity();
} else { } else {
@ -144,21 +144,21 @@ const glm::vec3 ScriptAvatarData::getAngularVelocity() {
// IDENTIFIER PROPERTIES // IDENTIFIER PROPERTIES
// START // START
// //
const QUuid ScriptAvatarData::getSessionUUID() const { QUuid ScriptAvatarData::getSessionUUID() const {
if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) { if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) {
return sharedAvatarData->getSessionUUID(); return sharedAvatarData->getSessionUUID();
} else { } else {
return QUuid(); return QUuid();
} }
} }
const QString ScriptAvatarData::getDisplayName() { QString ScriptAvatarData::getDisplayName() const {
if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) { if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) {
return sharedAvatarData->getDisplayName(); return sharedAvatarData->getDisplayName();
} else { } else {
return QString(); return QString();
} }
} }
const QString ScriptAvatarData::getSessionDisplayName() { QString ScriptAvatarData::getSessionDisplayName() const {
if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) { if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) {
return sharedAvatarData->getSessionDisplayName(); return sharedAvatarData->getSessionDisplayName();
} else { } else {
@ -174,27 +174,13 @@ const QString ScriptAvatarData::getSessionDisplayName() {
// ATTACHMENT AND JOINT PROPERTIES // ATTACHMENT AND JOINT PROPERTIES
// START // START
// //
const QString ScriptAvatarData::getSkeletonModelURLFromScript() { QString ScriptAvatarData::getSkeletonModelURLFromScript() const {
if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) { if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) {
return sharedAvatarData->getSkeletonModelURLFromScript(); return sharedAvatarData->getSkeletonModelURLFromScript();
} else { } else {
return QString(); return QString();
} }
} }
const QVector<AttachmentData> ScriptAvatarData::getAttachmentData() {
if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) {
return sharedAvatarData->getAttachmentData();
} else {
return QVector<AttachmentData>();
}
}
const QStringList ScriptAvatarData::getJointNames() {
if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) {
return sharedAvatarData->getJointNames();
} else {
return QStringList();
}
}
char ScriptAvatarData::getHandState() const { char ScriptAvatarData::getHandState() const {
if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) { if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) {
return sharedAvatarData->getHandState(); return sharedAvatarData->getHandState();
@ -275,14 +261,14 @@ QVector<AttachmentData> ScriptAvatarData::getAttachmentData() const {
// AUDIO PROPERTIES // AUDIO PROPERTIES
// START // START
// //
const float ScriptAvatarData::getAudioLoudness() { float ScriptAvatarData::getAudioLoudness() const {
if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) { if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) {
return sharedAvatarData->getAudioLoudness(); return sharedAvatarData->getAudioLoudness();
} else { } else {
return 0.0f; return 0.0f;
} }
} }
const float ScriptAvatarData::getAudioAverageLoudness() { float ScriptAvatarData::getAudioAverageLoudness() const {
if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) { if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) {
return sharedAvatarData->getAudioAverageLoudness(); return sharedAvatarData->getAudioAverageLoudness();
} else { } else {
@ -298,21 +284,21 @@ const float ScriptAvatarData::getAudioAverageLoudness() {
// MATRIX PROPERTIES // MATRIX PROPERTIES
// START // START
// //
const glm::mat4 ScriptAvatarData::getSensorToWorldMatrix() { glm::mat4 ScriptAvatarData::getSensorToWorldMatrix() const {
if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) { if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) {
return sharedAvatarData->getSensorToWorldMatrix(); return sharedAvatarData->getSensorToWorldMatrix();
} else { } else {
return glm::mat4(); return glm::mat4();
} }
} }
const glm::mat4 ScriptAvatarData::getControllerLeftHandMatrix() { glm::mat4 ScriptAvatarData::getControllerLeftHandMatrix() const {
if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) { if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) {
return sharedAvatarData->getControllerLeftHandMatrix(); return sharedAvatarData->getControllerLeftHandMatrix();
} else { } else {
return glm::mat4(); return glm::mat4();
} }
} }
const glm::mat4 ScriptAvatarData::getControllerRightHandMatrix() { glm::mat4 ScriptAvatarData::getControllerRightHandMatrix() const {
if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) { if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) {
return sharedAvatarData->getControllerRightHandMatrix(); return sharedAvatarData->getControllerRightHandMatrix();
} else { } else {

48
libraries/script-engine/src/ScriptAvatarData.h
View file

@ -74,35 +74,33 @@ public:
// //
using SpatiallyNestable::getPosition; using SpatiallyNestable::getPosition;
virtual glm::vec3 getPosition() const override; virtual glm::vec3 getPosition() const override;
const float getTargetScale(); float getTargetScale() const;
const glm::vec3 getHandPosition(); glm::vec3 getHandPosition() const;
const float getBodyPitch(); float getBodyPitch() const;
const float getBodyYaw(); float getBodyYaw() const;
const float getBodyRoll(); float getBodyRoll() const;
const glm::quat getOrientation(); virtual glm::quat getOrientation() const override;
const glm::quat getHeadOrientation(); glm::quat getHeadOrientation() const;
const float getHeadPitch(); float getHeadPitch() const;
const float getHeadYaw(); float getHeadYaw() const;
const float getHeadRoll(); float getHeadRoll() const;
// //
// PHYSICAL PROPERTIES: VELOCITY // PHYSICAL PROPERTIES: VELOCITY
// //
const glm::vec3 getVelocity(); virtual glm::vec3 getVelocity() const override;
const glm::vec3 getAngularVelocity(); virtual glm::vec3 getAngularVelocity() const override;
// //
// IDENTIFIER PROPERTIES // IDENTIFIER PROPERTIES
// //
const QUuid getSessionUUID() const; QUuid getSessionUUID() const;
const QString getDisplayName(); QString getDisplayName() const;
const QString getSessionDisplayName(); QString getSessionDisplayName() const;
// //
// ATTACHMENT AND JOINT PROPERTIES // ATTACHMENT AND JOINT PROPERTIES
// //
const QString getSkeletonModelURLFromScript(); QString getSkeletonModelURLFromScript() const;
const QVector<AttachmentData> getAttachmentData();
const QStringList getJointNames();
Q_INVOKABLE char getHandState() const; Q_INVOKABLE char getHandState() const;
Q_INVOKABLE virtual glm::quat getJointRotation(int index) const; Q_INVOKABLE virtual glm::quat getJointRotation(int index) const;
Q_INVOKABLE virtual glm::vec3 getJointTranslation(int index) const; Q_INVOKABLE virtual glm::vec3 getJointTranslation(int index) const;
@ -117,22 +115,22 @@ public:
// //
// AUDIO PROPERTIES // AUDIO PROPERTIES
// //
const float getAudioLoudness(); float getAudioLoudness() const;
const float getAudioAverageLoudness(); float getAudioAverageLoudness() const;
// //
// MATRIX PROPERTIES // MATRIX PROPERTIES
// //
const glm::mat4 getSensorToWorldMatrix(); glm::mat4 getSensorToWorldMatrix() const;
const glm::mat4 getControllerLeftHandMatrix(); glm::mat4 getControllerLeftHandMatrix() const;
const glm::mat4 getControllerRightHandMatrix(); glm::mat4 getControllerRightHandMatrix() const;
signals: signals:
void displayNameChanged(); void displayNameChanged();
public slots: public slots:
glm::quat getAbsoluteJointRotationInObjectFrame(int index) const; virtual glm::quat getAbsoluteJointRotationInObjectFrame(int index) const override;
glm::vec3 getAbsoluteJointTranslationInObjectFrame(int index) const; virtual glm::vec3 getAbsoluteJointTranslationInObjectFrame(int index) const override;
private: private:
std::weak_ptr<AvatarData> _avatarData; std::weak_ptr<AvatarData> _avatarData;