mirror of
https://github.com/overte-org/overte.git
synced 2025-08-09 11:28:03 +02:00
Merge pull request #5998 from birarda/qt-5.5
suppress warnings for overriden methods in Xcode 7
This commit is contained in:
commit
5eda3095bb
12 changed files with 49 additions and 68 deletions
|
@ -26,28 +26,28 @@ public:
|
||||||
~EntityServer();
|
~EntityServer();
|
||||||
|
|
||||||
// Subclasses must implement these methods
|
// Subclasses must implement these methods
|
||||||
virtual OctreeQueryNode* createOctreeQueryNode();
|
virtual OctreeQueryNode* createOctreeQueryNode() override ;
|
||||||
virtual char getMyNodeType() const { return NodeType::EntityServer; }
|
virtual char getMyNodeType() const override { return NodeType::EntityServer; }
|
||||||
virtual PacketType getMyQueryMessageType() const { return PacketType::EntityQuery; }
|
virtual PacketType getMyQueryMessageType() const override { return PacketType::EntityQuery; }
|
||||||
virtual const char* getMyServerName() const { return MODEL_SERVER_NAME; }
|
virtual const char* getMyServerName() const override { return MODEL_SERVER_NAME; }
|
||||||
virtual const char* getMyLoggingServerTargetName() const { return MODEL_SERVER_LOGGING_TARGET_NAME; }
|
virtual const char* getMyLoggingServerTargetName() const override { return MODEL_SERVER_LOGGING_TARGET_NAME; }
|
||||||
virtual const char* getMyDefaultPersistFilename() const { return LOCAL_MODELS_PERSIST_FILE; }
|
virtual const char* getMyDefaultPersistFilename() const override { return LOCAL_MODELS_PERSIST_FILE; }
|
||||||
virtual PacketType getMyEditNackType() const { return PacketType::EntityEditNack; }
|
virtual PacketType getMyEditNackType() const override { return PacketType::EntityEditNack; }
|
||||||
virtual QString getMyDomainSettingsKey() const { return QString("entity_server_settings"); }
|
virtual QString getMyDomainSettingsKey() const override { return QString("entity_server_settings"); }
|
||||||
|
|
||||||
// subclass may implement these method
|
// subclass may implement these method
|
||||||
virtual void beforeRun();
|
virtual void beforeRun() override;
|
||||||
virtual bool hasSpecialPacketsToSend(const SharedNodePointer& node);
|
virtual bool hasSpecialPacketsToSend(const SharedNodePointer& node) override;
|
||||||
virtual int sendSpecialPackets(const SharedNodePointer& node, OctreeQueryNode* queryNode, int& packetsSent);
|
virtual int sendSpecialPackets(const SharedNodePointer& node, OctreeQueryNode* queryNode, int& packetsSent) override;
|
||||||
|
|
||||||
virtual void entityCreated(const EntityItem& newEntity, const SharedNodePointer& senderNode);
|
virtual void entityCreated(const EntityItem& newEntity, const SharedNodePointer& senderNode) override;
|
||||||
virtual bool readAdditionalConfiguration(const QJsonObject& settingsSectionObject) override;
|
virtual bool readAdditionalConfiguration(const QJsonObject& settingsSectionObject) override;
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
void pruneDeletedEntities();
|
void pruneDeletedEntities();
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
virtual OctreePointer createTree();
|
virtual OctreePointer createTree() override;
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
void handleEntityPacket(QSharedPointer<NLPacket> packet, SharedNodePointer senderNode);
|
void handleEntityPacket(QSharedPointer<NLPacket> packet, SharedNodePointer senderNode);
|
||||||
|
|
|
@ -133,33 +133,14 @@ bool DomainServer::optionallyReadX509KeyAndCertificate() {
|
||||||
QString keyPath = _settingsManager.getSettingsMap().value(X509_PRIVATE_KEY_OPTION).toString();
|
QString keyPath = _settingsManager.getSettingsMap().value(X509_PRIVATE_KEY_OPTION).toString();
|
||||||
|
|
||||||
if (!certPath.isEmpty() && !keyPath.isEmpty()) {
|
if (!certPath.isEmpty() && !keyPath.isEmpty()) {
|
||||||
// the user wants to use DTLS to encrypt communication with nodes
|
// the user wants to use the following cert and key for HTTPS
|
||||||
|
// this is used for Oauth callbacks when authorizing users against a data server
|
||||||
// let's make sure we can load the key and certificate
|
// let's make sure we can load the key and certificate
|
||||||
// _x509Credentials = new gnutls_certificate_credentials_t;
|
|
||||||
// gnutls_certificate_allocate_credentials(_x509Credentials);
|
|
||||||
|
|
||||||
QString keyPassphraseString = QProcessEnvironment::systemEnvironment().value(X509_KEY_PASSPHRASE_ENV);
|
QString keyPassphraseString = QProcessEnvironment::systemEnvironment().value(X509_KEY_PASSPHRASE_ENV);
|
||||||
|
|
||||||
qDebug() << "Reading certificate file at" << certPath << "for DTLS.";
|
qDebug() << "Reading certificate file at" << certPath << "for HTTPS.";
|
||||||
qDebug() << "Reading key file at" << keyPath << "for DTLS.";
|
qDebug() << "Reading key file at" << keyPath << "for HTTPS.";
|
||||||
|
|
||||||
// int gnutlsReturn = gnutls_certificate_set_x509_key_file2(*_x509Credentials,
|
|
||||||
// certPath.toLocal8Bit().constData(),
|
|
||||||
// keyPath.toLocal8Bit().constData(),
|
|
||||||
// GNUTLS_X509_FMT_PEM,
|
|
||||||
// keyPassphraseString.toLocal8Bit().constData(),
|
|
||||||
// 0);
|
|
||||||
//
|
|
||||||
// if (gnutlsReturn < 0) {
|
|
||||||
// qDebug() << "Unable to load certificate or key file." << "Error" << gnutlsReturn << "- domain-server will now quit.";
|
|
||||||
// QMetaObject::invokeMethod(this, "quit", Qt::QueuedConnection);
|
|
||||||
// return false;
|
|
||||||
// }
|
|
||||||
|
|
||||||
// qDebug() << "Successfully read certificate and private key.";
|
|
||||||
|
|
||||||
// we need to also pass this certificate and private key to the HTTPS manager
|
|
||||||
// this is used for Oauth callbacks when authorizing users against a data server
|
|
||||||
|
|
||||||
QFile certFile(certPath);
|
QFile certFile(certPath);
|
||||||
certFile.open(QIODevice::ReadOnly);
|
certFile.open(QIODevice::ReadOnly);
|
||||||
|
|
|
@ -16,7 +16,7 @@ class PluginContainerProxy : public QObject, PluginContainer {
|
||||||
virtual QAction* addMenuItem(const QString& path, const QString& name, std::function<void(bool)> onClicked, bool checkable = false, bool checked = false, const QString& groupName = "") override;
|
virtual QAction* addMenuItem(const QString& path, const QString& name, std::function<void(bool)> onClicked, bool checkable = false, bool checked = false, const QString& groupName = "") override;
|
||||||
virtual void removeMenuItem(const QString& menuName, const QString& menuItem) override;
|
virtual void removeMenuItem(const QString& menuName, const QString& menuItem) override;
|
||||||
virtual bool isOptionChecked(const QString& name) override;
|
virtual bool isOptionChecked(const QString& name) override;
|
||||||
virtual void setIsOptionChecked(const QString& path, bool checked);
|
virtual void setIsOptionChecked(const QString& path, bool checked) override;
|
||||||
virtual void setFullscreen(const QScreen* targetScreen, bool hideMenu = true) override;
|
virtual void setFullscreen(const QScreen* targetScreen, bool hideMenu = true) override;
|
||||||
virtual void unsetFullscreen(const QScreen* avoidScreen = nullptr) override;
|
virtual void unsetFullscreen(const QScreen* avoidScreen = nullptr) override;
|
||||||
virtual void showDisplayPluginsTools() override;
|
virtual void showDisplayPluginsTools() override;
|
||||||
|
|
|
@ -139,19 +139,19 @@ public:
|
||||||
void updateLookAtTargetAvatar();
|
void updateLookAtTargetAvatar();
|
||||||
void clearLookAtTargetAvatar();
|
void clearLookAtTargetAvatar();
|
||||||
|
|
||||||
virtual void setJointRotations(QVector<glm::quat> jointRotations);
|
virtual void setJointRotations(QVector<glm::quat> jointRotations) override;
|
||||||
virtual void setJointTranslations(QVector<glm::vec3> jointTranslations);
|
virtual void setJointTranslations(QVector<glm::vec3> jointTranslations) override;
|
||||||
virtual void setJointData(int index, const glm::quat& rotation, const glm::vec3& translation);
|
virtual void setJointData(int index, const glm::quat& rotation, const glm::vec3& translation) override;
|
||||||
virtual void setJointRotation(int index, const glm::quat& rotation);
|
virtual void setJointRotation(int index, const glm::quat& rotation) override;
|
||||||
virtual void setJointTranslation(int index, const glm::vec3& translation);
|
virtual void setJointTranslation(int index, const glm::vec3& translation) override;
|
||||||
virtual void clearJointData(int index);
|
virtual void clearJointData(int index) override;
|
||||||
virtual void clearJointsData();
|
virtual void clearJointsData() override;
|
||||||
|
|
||||||
Q_INVOKABLE void useFullAvatarURL(const QUrl& fullAvatarURL, const QString& modelName = QString());
|
Q_INVOKABLE void useFullAvatarURL(const QUrl& fullAvatarURL, const QString& modelName = QString());
|
||||||
Q_INVOKABLE const QUrl& getFullAvatarURLFromPreferences() const { return _fullAvatarURLFromPreferences; }
|
Q_INVOKABLE const QUrl& getFullAvatarURLFromPreferences() const { return _fullAvatarURLFromPreferences; }
|
||||||
Q_INVOKABLE const QString& getFullAvatarModelName() const { return _fullAvatarModelName; }
|
Q_INVOKABLE const QString& getFullAvatarModelName() const { return _fullAvatarModelName; }
|
||||||
|
|
||||||
virtual void setAttachmentData(const QVector<AttachmentData>& attachmentData);
|
virtual void setAttachmentData(const QVector<AttachmentData>& attachmentData) override;
|
||||||
|
|
||||||
DynamicCharacterController* getCharacterController() { return &_characterController; }
|
DynamicCharacterController* getCharacterController() { return &_characterController; }
|
||||||
|
|
||||||
|
@ -218,7 +218,7 @@ public slots:
|
||||||
void saveRecording(QString filename);
|
void saveRecording(QString filename);
|
||||||
void loadLastRecording();
|
void loadLastRecording();
|
||||||
|
|
||||||
virtual void rebuildSkeletonBody();
|
virtual void rebuildSkeletonBody() override;
|
||||||
|
|
||||||
bool getEnableRigAnimations() const { return _rig->getEnableRig(); }
|
bool getEnableRigAnimations() const { return _rig->getEnableRig(); }
|
||||||
void setEnableRigAnimations(bool isEnabled);
|
void setEnableRigAnimations(bool isEnabled);
|
||||||
|
@ -243,7 +243,7 @@ private:
|
||||||
|
|
||||||
glm::vec3 getWorldBodyPosition() const;
|
glm::vec3 getWorldBodyPosition() const;
|
||||||
glm::quat getWorldBodyOrientation() const;
|
glm::quat getWorldBodyOrientation() const;
|
||||||
QByteArray toByteArray(bool cullSmallChanges, bool sendAll);
|
QByteArray toByteArray(bool cullSmallChanges, bool sendAll) override;
|
||||||
void simulate(float deltaTime);
|
void simulate(float deltaTime);
|
||||||
void updateFromTrackers(float deltaTime);
|
void updateFromTrackers(float deltaTime);
|
||||||
virtual void render(RenderArgs* renderArgs, const glm::vec3& cameraPositio) override;
|
virtual void render(RenderArgs* renderArgs, const glm::vec3& cameraPositio) override;
|
||||||
|
@ -252,9 +252,9 @@ private:
|
||||||
void setShouldRenderLocally(bool shouldRender) { _shouldRender = shouldRender; }
|
void setShouldRenderLocally(bool shouldRender) { _shouldRender = shouldRender; }
|
||||||
bool getShouldRenderLocally() const { return _shouldRender; }
|
bool getShouldRenderLocally() const { return _shouldRender; }
|
||||||
bool getDriveKeys(int key) { return _driveKeys[key] != 0.0f; };
|
bool getDriveKeys(int key) { return _driveKeys[key] != 0.0f; };
|
||||||
bool isMyAvatar() const { return true; }
|
bool isMyAvatar() const override { return true; }
|
||||||
virtual int parseDataFromBuffer(const QByteArray& buffer);
|
virtual int parseDataFromBuffer(const QByteArray& buffer) override;
|
||||||
virtual glm::vec3 getSkeletonPosition() const;
|
virtual glm::vec3 getSkeletonPosition() const override;
|
||||||
|
|
||||||
glm::vec3 getScriptedMotorVelocity() const { return _scriptedMotorVelocity; }
|
glm::vec3 getScriptedMotorVelocity() const { return _scriptedMotorVelocity; }
|
||||||
float getScriptedMotorTimescale() const { return _scriptedMotorTimescale; }
|
float getScriptedMotorTimescale() const { return _scriptedMotorTimescale; }
|
||||||
|
@ -264,7 +264,7 @@ private:
|
||||||
void setScriptedMotorFrame(QString frame);
|
void setScriptedMotorFrame(QString frame);
|
||||||
virtual void attach(const QString& modelURL, const QString& jointName = QString(),
|
virtual void attach(const QString& modelURL, const QString& jointName = QString(),
|
||||||
const glm::vec3& translation = glm::vec3(), const glm::quat& rotation = glm::quat(), float scale = 1.0f,
|
const glm::vec3& translation = glm::vec3(), const glm::quat& rotation = glm::quat(), float scale = 1.0f,
|
||||||
bool allowDuplicates = false, bool useSaved = true);
|
bool allowDuplicates = false, bool useSaved = true) override;
|
||||||
|
|
||||||
void renderLaserPointers(gpu::Batch& batch);
|
void renderLaserPointers(gpu::Batch& batch);
|
||||||
const RecorderPointer getRecorder() const { return _recorder; }
|
const RecorderPointer getRecorder() const { return _recorder; }
|
||||||
|
@ -273,8 +273,8 @@ private:
|
||||||
bool cameraInsideHead() const;
|
bool cameraInsideHead() const;
|
||||||
|
|
||||||
// These are made private for MyAvatar so that you will use the "use" methods instead
|
// These are made private for MyAvatar so that you will use the "use" methods instead
|
||||||
virtual void setFaceModelURL(const QUrl& faceModelURL);
|
virtual void setFaceModelURL(const QUrl& faceModelURL) override;
|
||||||
virtual void setSkeletonModelURL(const QUrl& skeletonModelURL);
|
virtual void setSkeletonModelURL(const QUrl& skeletonModelURL) override;
|
||||||
|
|
||||||
void setVisibleInSceneIfReady(Model* model, render::ScenePointer scene, bool visiblity);
|
void setVisibleInSceneIfReady(Model* model, render::ScenePointer scene, bool visiblity);
|
||||||
|
|
||||||
|
|
|
@ -27,10 +27,10 @@ public:
|
||||||
SkeletonModel(Avatar* owningAvatar, QObject* parent = nullptr, RigPointer rig = nullptr);
|
SkeletonModel(Avatar* owningAvatar, QObject* parent = nullptr, RigPointer rig = nullptr);
|
||||||
~SkeletonModel();
|
~SkeletonModel();
|
||||||
|
|
||||||
virtual void initJointStates(QVector<JointState> states);
|
virtual void initJointStates(QVector<JointState> states) override;
|
||||||
|
|
||||||
virtual void simulate(float deltaTime, bool fullUpdate = true);
|
virtual void simulate(float deltaTime, bool fullUpdate = true) override;
|
||||||
virtual void updateRig(float deltaTime, glm::mat4 parentTransform);
|
virtual void updateRig(float deltaTime, glm::mat4 parentTransform) override;
|
||||||
void updateAttitude();
|
void updateAttitude();
|
||||||
|
|
||||||
void renderIKConstraints(gpu::Batch& batch);
|
void renderIKConstraints(gpu::Batch& batch);
|
||||||
|
|
|
@ -25,8 +25,8 @@ public:
|
||||||
|
|
||||||
void updateRenderItem();
|
void updateRenderItem();
|
||||||
|
|
||||||
virtual bool addToScene(EntityItemPointer self, render::ScenePointer scene, render::PendingChanges& pendingChanges);
|
virtual bool addToScene(EntityItemPointer self, render::ScenePointer scene, render::PendingChanges& pendingChanges) override;
|
||||||
virtual void removeFromScene(EntityItemPointer self, render::ScenePointer scene, render::PendingChanges& pendingChanges);
|
virtual void removeFromScene(EntityItemPointer self, render::ScenePointer scene, render::PendingChanges& pendingChanges) override;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
render::ItemID _renderItemId;
|
render::ItemID _renderItemId;
|
||||||
|
|
|
@ -59,7 +59,7 @@ public:
|
||||||
// Plugin functions
|
// Plugin functions
|
||||||
virtual bool isSupported() const override { return true; }
|
virtual bool isSupported() const override { return true; }
|
||||||
virtual bool isJointController() const override { return false; }
|
virtual bool isJointController() const override { return false; }
|
||||||
const QString& getName() const { return NAME; }
|
const QString& getName() const override { return NAME; }
|
||||||
|
|
||||||
virtual void activate() override {};
|
virtual void activate() override {};
|
||||||
virtual void deactivate() override {};
|
virtual void deactivate() override {};
|
||||||
|
|
|
@ -30,7 +30,7 @@ public:
|
||||||
// Plugin functions
|
// Plugin functions
|
||||||
virtual bool isSupported() const override;
|
virtual bool isSupported() const override;
|
||||||
virtual bool isJointController() const override { return false; }
|
virtual bool isJointController() const override { return false; }
|
||||||
const QString& getName() const { return NAME; }
|
const QString& getName() const override { return NAME; }
|
||||||
|
|
||||||
virtual void init() override;
|
virtual void init() override;
|
||||||
virtual void deinit() override;
|
virtual void deinit() override;
|
||||||
|
|
|
@ -63,7 +63,7 @@ public:
|
||||||
// Plugin functions
|
// Plugin functions
|
||||||
virtual bool isSupported() const override;
|
virtual bool isSupported() const override;
|
||||||
virtual bool isJointController() const override { return true; }
|
virtual bool isJointController() const override { return true; }
|
||||||
const QString& getName() const { return NAME; }
|
const QString& getName() const override { return NAME; }
|
||||||
|
|
||||||
virtual void activate() override;
|
virtual void activate() override;
|
||||||
virtual void deactivate() override;
|
virtual void deactivate() override;
|
||||||
|
|
|
@ -53,7 +53,7 @@ public:
|
||||||
// Plugin functions
|
// Plugin functions
|
||||||
virtual bool isSupported() const override;
|
virtual bool isSupported() const override;
|
||||||
virtual bool isJointController() const override { return true; }
|
virtual bool isJointController() const override { return true; }
|
||||||
const QString& getName() const { return NAME; }
|
const QString& getName() const override { return NAME; }
|
||||||
|
|
||||||
virtual void activate() override;
|
virtual void activate() override;
|
||||||
virtual void deactivate() override;
|
virtual void deactivate() override;
|
||||||
|
|
|
@ -30,9 +30,9 @@ class OctreeHeadlessViewer : public OctreeRenderer {
|
||||||
public:
|
public:
|
||||||
OctreeHeadlessViewer();
|
OctreeHeadlessViewer();
|
||||||
virtual ~OctreeHeadlessViewer() {};
|
virtual ~OctreeHeadlessViewer() {};
|
||||||
virtual void renderElement(OctreeElementPointer element, RenderArgs* args) { /* swallow these */ }
|
virtual void renderElement(OctreeElementPointer element, RenderArgs* args) override { /* swallow these */ }
|
||||||
|
|
||||||
virtual void init();
|
virtual void init() override ;
|
||||||
virtual void render(RenderArgs* renderArgs) override { /* swallow these */ }
|
virtual void render(RenderArgs* renderArgs) override { /* swallow these */ }
|
||||||
|
|
||||||
void setJurisdictionListener(JurisdictionListener* jurisdictionListener) { _jurisdictionListener = jurisdictionListener; }
|
void setJurisdictionListener(JurisdictionListener* jurisdictionListener) { _jurisdictionListener = jurisdictionListener; }
|
||||||
|
@ -58,7 +58,7 @@ public slots:
|
||||||
|
|
||||||
// getters for LOD and PPS
|
// getters for LOD and PPS
|
||||||
float getVoxelSizeScale() const { return _voxelSizeScale; }
|
float getVoxelSizeScale() const { return _voxelSizeScale; }
|
||||||
int getBoundaryLevelAdjust() const { return _boundaryLevelAdjust; }
|
int getBoundaryLevelAdjust() const override { return _boundaryLevelAdjust; }
|
||||||
int getMaxPacketsPerSecond() const { return _maxPacketsPerSecond; }
|
int getMaxPacketsPerSecond() const { return _maxPacketsPerSecond; }
|
||||||
|
|
||||||
unsigned getOctreeElementsCount() const { return _tree->getOctreeElementsCount(); }
|
unsigned getOctreeElementsCount() const { return _tree->getOctreeElementsCount(); }
|
||||||
|
|
|
@ -260,7 +260,7 @@ protected:
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void keyPressEvent(QKeyEvent* event) {
|
void keyPressEvent(QKeyEvent* event) override {
|
||||||
_altPressed = Qt::Key_Alt == event->key();
|
_altPressed = Qt::Key_Alt == event->key();
|
||||||
switch (event->key()) {
|
switch (event->key()) {
|
||||||
case Qt::Key_B:
|
case Qt::Key_B:
|
||||||
|
@ -292,13 +292,13 @@ protected:
|
||||||
QWindow::keyPressEvent(event);
|
QWindow::keyPressEvent(event);
|
||||||
}
|
}
|
||||||
QQmlContext* menuContext{ nullptr };
|
QQmlContext* menuContext{ nullptr };
|
||||||
void keyReleaseEvent(QKeyEvent *event) {
|
void keyReleaseEvent(QKeyEvent *event) override {
|
||||||
if (_altPressed && Qt::Key_Alt == event->key()) {
|
if (_altPressed && Qt::Key_Alt == event->key()) {
|
||||||
VrMenu::toggle();
|
VrMenu::toggle();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void moveEvent(QMoveEvent* event) {
|
void moveEvent(QMoveEvent* event) override {
|
||||||
static qreal oldPixelRatio = 0.0;
|
static qreal oldPixelRatio = 0.0;
|
||||||
if (devicePixelRatio() != oldPixelRatio) {
|
if (devicePixelRatio() != oldPixelRatio) {
|
||||||
oldPixelRatio = devicePixelRatio();
|
oldPixelRatio = devicePixelRatio();
|
||||||
|
|
Loading…
Reference in a new issue