Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 00:36:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix overrides and warnings (finally?)

Browse source
This commit is contained in:
Zach Fox 2017-04-10 17:39:46 -07:00
parent 2561d38d93
commit 0aa1e633fe
2 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -23,8 +23,7 @@ void avatarDataFromScriptValue(const QScriptValue& object, AvatarSharedPointer&
} }
ScriptAvatarData::ScriptAvatarData(AvatarSharedPointer avatarData) : ScriptAvatarData::ScriptAvatarData(AvatarSharedPointer avatarData) :
_avatarData(avatarData), _avatarData(avatarData)
SpatiallyNestable(NestableType::Avatar, QUuid())
{ {
QObject::connect(avatarData.get(), &AvatarData::displayNameChanged, this, &ScriptAvatarData::displayNameChanged); QObject::connect(avatarData.get(), &AvatarData::displayNameChanged, this, &ScriptAvatarData::displayNameChanged);
} }

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

@ -16,7 +16,7 @@
#include <AvatarData.h> #include <AvatarData.h>
#include <SpatiallyNestable.h> #include <SpatiallyNestable.h>
class ScriptAvatarData : public QObject, public SpatiallyNestable { class ScriptAvatarData : public QObject {
Q_OBJECT Q_OBJECT
// //
@ -72,14 +72,13 @@ public:
// //
// PHYSICAL PROPERTIES: POSITION AND ORIENTATION // PHYSICAL PROPERTIES: POSITION AND ORIENTATION
// //
using SpatiallyNestable::getPosition; glm::vec3 getPosition() const;
virtual glm::vec3 getPosition() const override;
float getTargetScale() const; float getTargetScale() const;
glm::vec3 getHandPosition() const; glm::vec3 getHandPosition() const;
float getBodyPitch() const; float getBodyPitch() const;
float getBodyYaw() const; float getBodyYaw() const;
float getBodyRoll() const; float getBodyRoll() const;
virtual glm::quat getOrientation() const override; glm::quat getOrientation() const;
glm::quat getHeadOrientation() const; glm::quat getHeadOrientation() const;
float getHeadPitch() const; float getHeadPitch() const;
float getHeadYaw() const; float getHeadYaw() const;
@ -87,8 +86,8 @@ public:
// //
// PHYSICAL PROPERTIES: VELOCITY // PHYSICAL PROPERTIES: VELOCITY
// //
virtual glm::vec3 getVelocity() const override; glm::vec3 getVelocity() const;
virtual glm::vec3 getAngularVelocity() const override; glm::vec3 getAngularVelocity() const;
// //
// IDENTIFIER PROPERTIES // IDENTIFIER PROPERTIES
@ -102,14 +101,14 @@ public:
// //
QString getSkeletonModelURLFromScript() const; QString getSkeletonModelURLFromScript() const;
Q_INVOKABLE char getHandState() const; Q_INVOKABLE char getHandState() const;
Q_INVOKABLE virtual glm::quat getJointRotation(int index) const; Q_INVOKABLE glm::quat getJointRotation(int index) const;
Q_INVOKABLE virtual glm::vec3 getJointTranslation(int index) const; Q_INVOKABLE glm::vec3 getJointTranslation(int index) const;
Q_INVOKABLE glm::quat getJointRotation(const QString& name) const; Q_INVOKABLE glm::quat getJointRotation(const QString& name) const;
Q_INVOKABLE glm::vec3 getJointTranslation(const QString& name) const; Q_INVOKABLE glm::vec3 getJointTranslation(const QString& name) const;
Q_INVOKABLE virtual QVector<glm::quat> getJointRotations() const; Q_INVOKABLE QVector<glm::quat> getJointRotations() const;
Q_INVOKABLE bool isJointDataValid(const QString& name) const; Q_INVOKABLE bool isJointDataValid(const QString& name) const;
Q_INVOKABLE virtual int getJointIndex(const QString& name) const; Q_INVOKABLE int getJointIndex(const QString& name) const;
Q_INVOKABLE virtual QStringList getJointNames() const; Q_INVOKABLE QStringList getJointNames() const;
Q_INVOKABLE QVector<AttachmentData> getAttachmentData() const; Q_INVOKABLE QVector<AttachmentData> getAttachmentData() const;
// //
@ -129,8 +128,8 @@ signals:
void displayNameChanged(); void displayNameChanged();
public slots: public slots:
virtual glm::quat getAbsoluteJointRotationInObjectFrame(int index) const override; glm::quat getAbsoluteJointRotationInObjectFrame(int index) const;
virtual glm::vec3 getAbsoluteJointTranslationInObjectFrame(int index) const override; glm::vec3 getAbsoluteJointTranslationInObjectFrame(int index) const;
private: private:
std::weak_ptr<AvatarData> _avatarData; std::weak_ptr<AvatarData> _avatarData;