Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 03:24:00 +02: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();
}
}
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<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 {
if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) {
return sharedAvatarData->getHandState();
@ -275,14 +261,14 @@ QVector<AttachmentData> 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 {

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

@ -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<AttachmentData> 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> _avatarData;