diff --git a/interface/src/avatar/AvatarManager.h b/interface/src/avatar/AvatarManager.h index bedd089c93..94a66782f2 100644 --- a/interface/src/avatar/AvatarManager.h +++ b/interface/src/avatar/AvatarManager.h @@ -78,11 +78,11 @@ private: void simulateAvatarFades(float deltaTime); // virtual overrides - virtual AvatarSharedPointer newSharedAvatar(); - virtual AvatarSharedPointer addAvatar(const QUuid& sessionUUID, const QWeakPointer& mixerWeakPointer); + virtual AvatarSharedPointer newSharedAvatar() override; + virtual AvatarSharedPointer addAvatar(const QUuid& sessionUUID, const QWeakPointer& mixerWeakPointer) override; - virtual void removeAvatar(const QUuid& sessionUUID); - virtual void handleRemovedAvatar(const AvatarSharedPointer& removedAvatar); + virtual void removeAvatar(const QUuid& sessionUUID) override; + virtual void handleRemovedAvatar(const AvatarSharedPointer& removedAvatar) override; QVector _avatarFades; std::shared_ptr _myAvatar; diff --git a/interface/src/ui/overlays/Base3DOverlay.h b/interface/src/ui/overlays/Base3DOverlay.h index c001d39f69..41e7e517b7 100644 --- a/interface/src/ui/overlays/Base3DOverlay.h +++ b/interface/src/ui/overlays/Base3DOverlay.h @@ -23,7 +23,7 @@ public: Base3DOverlay(const Base3DOverlay* base3DOverlay); // getters - virtual bool is3D() const { return true; } + virtual bool is3D() const override { return true; } const glm::vec3& getPosition() const { return _transform.getTranslation(); } const glm::quat& getRotation() const { return _transform.getRotation(); } const glm::vec3& getScale() const { return _transform.getScale(); } @@ -50,7 +50,7 @@ public: void setIgnoreRayIntersection(bool value) { _ignoreRayIntersection = value; } void setDrawInFront(bool value) { _drawInFront = value; } - virtual AABox getBounds() const = 0; + virtual AABox getBounds() const override = 0; void setProperties(const QVariantMap& properties) override; QVariant getProperty(const QString& property) override; diff --git a/interface/src/ui/overlays/Billboard3DOverlay.h b/interface/src/ui/overlays/Billboard3DOverlay.h index 1d4d60bf5b..d256a92afe 100644 --- a/interface/src/ui/overlays/Billboard3DOverlay.h +++ b/interface/src/ui/overlays/Billboard3DOverlay.h @@ -27,7 +27,7 @@ public: QVariant getProperty(const QString& property) override; protected: - virtual void applyTransformTo(Transform& transform, bool force = false); + virtual void applyTransformTo(Transform& transform, bool force = false) override; }; #endif // hifi_Billboard3DOverlay_h diff --git a/interface/src/ui/overlays/Circle3DOverlay.h b/interface/src/ui/overlays/Circle3DOverlay.h index f0bc49c313..c0e84ef1c6 100644 --- a/interface/src/ui/overlays/Circle3DOverlay.h +++ b/interface/src/ui/overlays/Circle3DOverlay.h @@ -19,12 +19,12 @@ class Circle3DOverlay : public Planar3DOverlay { public: static QString const TYPE; - virtual QString getType() const { return TYPE; } + virtual QString getType() const override { return TYPE; } Circle3DOverlay(); Circle3DOverlay(const Circle3DOverlay* circle3DOverlay); - virtual void render(RenderArgs* args); + virtual void render(RenderArgs* args) override; virtual const render::ShapeKey getShapeKey() override; void setProperties(const QVariantMap& properties) override; QVariant getProperty(const QString& property) override; @@ -54,9 +54,9 @@ public: void setMinorTickMarksColor(const xColor& value) { _minorTickMarksColor = value; } virtual bool findRayIntersection(const glm::vec3& origin, const glm::vec3& direction, float& distance, - BoxFace& face, glm::vec3& surfaceNormal); + BoxFace& face, glm::vec3& surfaceNormal) override; - virtual Circle3DOverlay* createClone() const; + virtual Circle3DOverlay* createClone() const override; protected: float _startAt; diff --git a/interface/src/ui/overlays/Cube3DOverlay.h b/interface/src/ui/overlays/Cube3DOverlay.h index 93ea46db4d..78b8b06582 100644 --- a/interface/src/ui/overlays/Cube3DOverlay.h +++ b/interface/src/ui/overlays/Cube3DOverlay.h @@ -18,15 +18,15 @@ class Cube3DOverlay : public Volume3DOverlay { public: static QString const TYPE; - virtual QString getType() const { return TYPE; } + virtual QString getType() const override { return TYPE; } Cube3DOverlay() {} Cube3DOverlay(const Cube3DOverlay* cube3DOverlay); - virtual void render(RenderArgs* args); + virtual void render(RenderArgs* args) override; virtual const render::ShapeKey getShapeKey() override; - virtual Cube3DOverlay* createClone() const; + virtual Cube3DOverlay* createClone() const override; float getBorderSize() const { return _borderSize; } diff --git a/interface/src/ui/overlays/Grid3DOverlay.h b/interface/src/ui/overlays/Grid3DOverlay.h index aa372436de..90e3083dba 100644 --- a/interface/src/ui/overlays/Grid3DOverlay.h +++ b/interface/src/ui/overlays/Grid3DOverlay.h @@ -19,22 +19,22 @@ class Grid3DOverlay : public Planar3DOverlay { public: static QString const TYPE; - virtual QString getType() const { return TYPE; } + virtual QString getType() const override { return TYPE; } Grid3DOverlay(); Grid3DOverlay(const Grid3DOverlay* grid3DOverlay); - virtual AABox getBounds() const; + virtual AABox getBounds() const override; - virtual void render(RenderArgs* args); + virtual void render(RenderArgs* args) override; virtual const render::ShapeKey getShapeKey() override; void setProperties(const QVariantMap& properties) override; QVariant getProperty(const QString& property) override; - virtual Grid3DOverlay* createClone() const; + virtual Grid3DOverlay* createClone() const override; // Grids are UI tools, and may not be intersected (pickable) - virtual bool findRayIntersection(const glm::vec3&, const glm::vec3&, float&, BoxFace&, glm::vec3&) { return false; } + virtual bool findRayIntersection(const glm::vec3&, const glm::vec3&, float&, BoxFace&, glm::vec3&) override { return false; } private: void updateGrid(); diff --git a/interface/src/ui/overlays/Image3DOverlay.h b/interface/src/ui/overlays/Image3DOverlay.h index 2bdc58709a..159c6b4ccb 100644 --- a/interface/src/ui/overlays/Image3DOverlay.h +++ b/interface/src/ui/overlays/Image3DOverlay.h @@ -22,14 +22,14 @@ class Image3DOverlay : public Billboard3DOverlay { public: static QString const TYPE; - virtual QString getType() const { return TYPE; } + virtual QString getType() const override { return TYPE; } Image3DOverlay(); Image3DOverlay(const Image3DOverlay* image3DOverlay); - virtual void render(RenderArgs* args); + virtual void render(RenderArgs* args) override; - virtual void update(float deltatime); + virtual void update(float deltatime) override; virtual const render::ShapeKey getShapeKey() override; @@ -41,9 +41,9 @@ public: QVariant getProperty(const QString& property) override; virtual bool findRayIntersection(const glm::vec3& origin, const glm::vec3& direction, float& distance, - BoxFace& face, glm::vec3& surfaceNormal); + BoxFace& face, glm::vec3& surfaceNormal) override; - virtual Image3DOverlay* createClone() const; + virtual Image3DOverlay* createClone() const override; private: QString _url; diff --git a/interface/src/ui/overlays/Line3DOverlay.h b/interface/src/ui/overlays/Line3DOverlay.h index 8ff38859a2..db50d11276 100644 --- a/interface/src/ui/overlays/Line3DOverlay.h +++ b/interface/src/ui/overlays/Line3DOverlay.h @@ -18,14 +18,14 @@ class Line3DOverlay : public Base3DOverlay { public: static QString const TYPE; - virtual QString getType() const { return TYPE; } + virtual QString getType() const override { return TYPE; } Line3DOverlay(); Line3DOverlay(const Line3DOverlay* line3DOverlay); ~Line3DOverlay(); - virtual void render(RenderArgs* args); + virtual void render(RenderArgs* args) override; virtual const render::ShapeKey getShapeKey() override; - virtual AABox getBounds() const; + virtual AABox getBounds() const override; // getters const glm::vec3& getStart() const { return _start; } @@ -38,7 +38,7 @@ public: void setProperties(const QVariantMap& properties) override; QVariant getProperty(const QString& property) override; - virtual Line3DOverlay* createClone() const; + virtual Line3DOverlay* createClone() const override; protected: glm::vec3 _start; diff --git a/interface/src/ui/overlays/ModelOverlay.h b/interface/src/ui/overlays/ModelOverlay.h index 36ff75cb6a..dc4b4a853b 100644 --- a/interface/src/ui/overlays/ModelOverlay.h +++ b/interface/src/ui/overlays/ModelOverlay.h @@ -20,24 +20,24 @@ class ModelOverlay : public Volume3DOverlay { Q_OBJECT public: static QString const TYPE; - virtual QString getType() const { return TYPE; } + virtual QString getType() const override { return TYPE; } ModelOverlay(); ModelOverlay(const ModelOverlay* modelOverlay); - virtual void update(float deltatime); - virtual void render(RenderArgs* args); + virtual void update(float deltatime) override; + virtual void render(RenderArgs* args) override; void setProperties(const QVariantMap& properties) override; QVariant getProperty(const QString& property) override; virtual bool findRayIntersection(const glm::vec3& origin, const glm::vec3& direction, float& distance, - BoxFace& face, glm::vec3& surfaceNormal); - virtual bool findRayIntersectionExtraInfo(const glm::vec3& origin, const glm::vec3& direction, - float& distance, BoxFace& face, glm::vec3& surfaceNormal, QString& extraInfo); + BoxFace& face, glm::vec3& surfaceNormal) override; + virtual bool findRayIntersectionExtraInfo(const glm::vec3& origin, const glm::vec3& direction, + float& distance, BoxFace& face, glm::vec3& surfaceNormal, QString& extraInfo) override; - virtual ModelOverlay* createClone() const; + virtual ModelOverlay* createClone() const override; - virtual bool addToScene(Overlay::Pointer overlay, std::shared_ptr scene, render::PendingChanges& pendingChanges); - virtual void removeFromScene(Overlay::Pointer overlay, std::shared_ptr scene, render::PendingChanges& pendingChanges); + virtual bool addToScene(Overlay::Pointer overlay, std::shared_ptr scene, render::PendingChanges& pendingChanges) override; + virtual void removeFromScene(Overlay::Pointer overlay, std::shared_ptr scene, render::PendingChanges& pendingChanges) override; private: diff --git a/interface/src/ui/overlays/Overlay2D.h b/interface/src/ui/overlays/Overlay2D.h index 3fd11f79f0..a1efe8a6de 100644 --- a/interface/src/ui/overlays/Overlay2D.h +++ b/interface/src/ui/overlays/Overlay2D.h @@ -22,9 +22,9 @@ public: Overlay2D() {} Overlay2D(const Overlay2D* overlay2D); - virtual AABox getBounds() const; + virtual AABox getBounds() const override; - virtual bool is3D() const { return false; } + virtual bool is3D() const override { return false; } // getters int getX() const { return _bounds.x(); } diff --git a/interface/src/ui/overlays/Planar3DOverlay.h b/interface/src/ui/overlays/Planar3DOverlay.h index ef391e61e4..9c502ab75e 100644 --- a/interface/src/ui/overlays/Planar3DOverlay.h +++ b/interface/src/ui/overlays/Planar3DOverlay.h @@ -20,7 +20,7 @@ public: Planar3DOverlay(); Planar3DOverlay(const Planar3DOverlay* planar3DOverlay); - virtual AABox getBounds() const; + virtual AABox getBounds() const override; glm::vec2 getDimensions() const { return _dimensions; } void setDimensions(float value) { _dimensions = glm::vec2(value); } @@ -30,7 +30,7 @@ public: QVariant getProperty(const QString& property) override; virtual bool findRayIntersection(const glm::vec3& origin, const glm::vec3& direction, float& distance, - BoxFace& face, glm::vec3& surfaceNormal); + BoxFace& face, glm::vec3& surfaceNormal) override; protected: glm::vec2 _dimensions; diff --git a/interface/src/ui/overlays/Rectangle3DOverlay.h b/interface/src/ui/overlays/Rectangle3DOverlay.h index 31ccac45a3..525224ef29 100644 --- a/interface/src/ui/overlays/Rectangle3DOverlay.h +++ b/interface/src/ui/overlays/Rectangle3DOverlay.h @@ -18,16 +18,16 @@ class Rectangle3DOverlay : public Planar3DOverlay { public: static QString const TYPE; - virtual QString getType() const { return TYPE; } + virtual QString getType() const override { return TYPE; } Rectangle3DOverlay(); Rectangle3DOverlay(const Rectangle3DOverlay* rectangle3DOverlay); ~Rectangle3DOverlay(); - virtual void render(RenderArgs* args); + virtual void render(RenderArgs* args) override; virtual const render::ShapeKey getShapeKey() override; void setProperties(const QVariantMap& properties) override; - virtual Rectangle3DOverlay* createClone() const; + virtual Rectangle3DOverlay* createClone() const override; private: int _geometryCacheID; glm::vec2 _previousHalfDimensions; diff --git a/interface/src/ui/overlays/Sphere3DOverlay.h b/interface/src/ui/overlays/Sphere3DOverlay.h index ec2efa9f04..991b2ab51e 100644 --- a/interface/src/ui/overlays/Sphere3DOverlay.h +++ b/interface/src/ui/overlays/Sphere3DOverlay.h @@ -18,15 +18,15 @@ class Sphere3DOverlay : public Volume3DOverlay { public: static QString const TYPE; - virtual QString getType() const { return TYPE; } + virtual QString getType() const override { return TYPE; } Sphere3DOverlay() {} Sphere3DOverlay(const Sphere3DOverlay* Sphere3DOverlay); - virtual void render(RenderArgs* args); + virtual void render(RenderArgs* args) override; virtual const render::ShapeKey getShapeKey() override; - virtual Sphere3DOverlay* createClone() const; + virtual Sphere3DOverlay* createClone() const override; }; diff --git a/interface/src/ui/overlays/Text3DOverlay.h b/interface/src/ui/overlays/Text3DOverlay.h index 181e9d526c..b7756d0400 100644 --- a/interface/src/ui/overlays/Text3DOverlay.h +++ b/interface/src/ui/overlays/Text3DOverlay.h @@ -22,14 +22,14 @@ class Text3DOverlay : public Billboard3DOverlay { public: static QString const TYPE; - virtual QString getType() const { return TYPE; } + virtual QString getType() const override { return TYPE; } Text3DOverlay(); Text3DOverlay(const Text3DOverlay* text3DOverlay); ~Text3DOverlay(); - virtual void render(RenderArgs* args); + virtual void render(RenderArgs* args) override; - virtual void update(float deltatime); + virtual void update(float deltatime) override; virtual const render::ShapeKey getShapeKey() override; @@ -59,9 +59,9 @@ public: QSizeF textSize(const QString& test) const; // Meters virtual bool findRayIntersection(const glm::vec3& origin, const glm::vec3& direction, float& distance, - BoxFace& face, glm::vec3& surfaceNormal); + BoxFace& face, glm::vec3& surfaceNormal) override; - virtual Text3DOverlay* createClone() const; + virtual Text3DOverlay* createClone() const override; private: TextRenderer3D* _textRenderer = nullptr; diff --git a/interface/src/ui/overlays/Volume3DOverlay.h b/interface/src/ui/overlays/Volume3DOverlay.h index 42b3d439d6..4d087615d2 100644 --- a/interface/src/ui/overlays/Volume3DOverlay.h +++ b/interface/src/ui/overlays/Volume3DOverlay.h @@ -20,7 +20,7 @@ public: Volume3DOverlay() {} Volume3DOverlay(const Volume3DOverlay* volume3DOverlay); - virtual AABox getBounds() const; + virtual AABox getBounds() const override; const glm::vec3& getDimensions() const { return _localBoundingBox.getDimensions(); } void setDimensions(float value) { _localBoundingBox.setBox(glm::vec3(-value / 2.0f), value); } @@ -30,7 +30,7 @@ public: QVariant getProperty(const QString& property) override; virtual bool findRayIntersection(const glm::vec3& origin, const glm::vec3& direction, float& distance, - BoxFace& face, glm::vec3& surfaceNormal); + BoxFace& face, glm::vec3& surfaceNormal) override; protected: // Centered local bounding box diff --git a/interface/src/ui/overlays/Web3DOverlay.h b/interface/src/ui/overlays/Web3DOverlay.h index 062cff61d6..a828626715 100644 --- a/interface/src/ui/overlays/Web3DOverlay.h +++ b/interface/src/ui/overlays/Web3DOverlay.h @@ -18,16 +18,16 @@ class Web3DOverlay : public Billboard3DOverlay { public: static QString const TYPE; - virtual QString getType() const { return TYPE; } + virtual QString getType() const override { return TYPE; } Web3DOverlay(); Web3DOverlay(const Web3DOverlay* Web3DOverlay); virtual ~Web3DOverlay(); - virtual void render(RenderArgs* args); + virtual void render(RenderArgs* args) override; virtual const render::ShapeKey getShapeKey() override; - virtual void update(float deltatime); + virtual void update(float deltatime) override; // setters void setURL(const QString& url); @@ -36,9 +36,9 @@ public: QVariant getProperty(const QString& property) override; virtual bool findRayIntersection(const glm::vec3& origin, const glm::vec3& direction, float& distance, - BoxFace& face, glm::vec3& surfaceNormal); + BoxFace& face, glm::vec3& surfaceNormal) override; - virtual Web3DOverlay* createClone() const; + virtual Web3DOverlay* createClone() const override; private: OffscreenQmlSurface* _webSurface{ nullptr }; diff --git a/libraries/entities-renderer/src/RenderableWebEntityItem.h b/libraries/entities-renderer/src/RenderableWebEntityItem.h index 49a55b6b27..4125be61dd 100644 --- a/libraries/entities-renderer/src/RenderableWebEntityItem.h +++ b/libraries/entities-renderer/src/RenderableWebEntityItem.h @@ -33,7 +33,7 @@ public: QObject* getEventHandler(); void update(const quint64& now) override; - bool needsToCallUpdate() const { return _webSurface != nullptr; } + bool needsToCallUpdate() const override { return _webSurface != nullptr; } SIMPLE_RENDERABLE(); diff --git a/libraries/entities-renderer/src/RenderableZoneEntityItem.h b/libraries/entities-renderer/src/RenderableZoneEntityItem.h index 241a066341..58aa951e64 100644 --- a/libraries/entities-renderer/src/RenderableZoneEntityItem.h +++ b/libraries/entities-renderer/src/RenderableZoneEntityItem.h @@ -27,19 +27,19 @@ public: _needsInitialSimulation(true) { } - virtual bool setProperties(const EntityItemProperties& properties); + virtual bool setProperties(const EntityItemProperties& properties) override; virtual void somethingChangedNotification() override; virtual int readEntitySubclassDataFromBuffer(const unsigned char* data, int bytesLeftToRead, ReadBitstreamToTreeParams& args, EntityPropertyFlags& propertyFlags, bool overwriteLocalData, - bool& somethingChanged); + bool& somethingChanged) override; - virtual void render(RenderArgs* args); - virtual bool contains(const glm::vec3& point) const; + virtual void render(RenderArgs* args) override; + virtual bool contains(const glm::vec3& point) const override; - virtual bool addToScene(EntityItemPointer self, std::shared_ptr scene, render::PendingChanges& pendingChanges); - virtual void removeFromScene(EntityItemPointer self, std::shared_ptr scene, render::PendingChanges& pendingChanges); + virtual bool addToScene(EntityItemPointer self, std::shared_ptr scene, render::PendingChanges& pendingChanges) override; + virtual void removeFromScene(EntityItemPointer self, std::shared_ptr scene, render::PendingChanges& pendingChanges) override; private: virtual void locationChanged(bool tellPhysics = true) override { EntityItem::locationChanged(tellPhysics); notifyBoundChanged(); } diff --git a/libraries/entities/src/EntityItem.h b/libraries/entities/src/EntityItem.h index b3689b9b56..742ab337d0 100644 --- a/libraries/entities/src/EntityItem.h +++ b/libraries/entities/src/EntityItem.h @@ -361,7 +361,7 @@ public: void setPhysicsInfo(void* data) { _physicsInfo = data; } EntityTreeElementPointer getElement() const { return _element; } EntityTreePointer getTree() const; - virtual SpatialParentTree* getParentTree() const; + virtual SpatialParentTree* getParentTree() const override; bool wantTerseEditLogging() const; glm::mat4 getEntityToWorldMatrix() const; diff --git a/libraries/entities/src/EntityTree.h b/libraries/entities/src/EntityTree.h index 1937bf6daf..54e516d01d 100644 --- a/libraries/entities/src/EntityTree.h +++ b/libraries/entities/src/EntityTree.h @@ -127,7 +127,7 @@ public: EntityItemPointer findClosestEntity(glm::vec3 position, float targetRadius); EntityItemPointer findEntityByID(const QUuid& id); EntityItemPointer findEntityByEntityItemID(const EntityItemID& entityID); - virtual SpatiallyNestablePointer findByID(const QUuid& id) { return findEntityByID(id); } + virtual SpatiallyNestablePointer findByID(const QUuid& id) override { return findEntityByID(id); } EntityItemID assignEntityID(const EntityItemID& entityItemID); /// Assigns a known ID for a creator token ID diff --git a/libraries/model-networking/src/model-networking/ModelCache.h b/libraries/model-networking/src/model-networking/ModelCache.h index f479dc9ce2..88e89a57a9 100644 --- a/libraries/model-networking/src/model-networking/ModelCache.h +++ b/libraries/model-networking/src/model-networking/ModelCache.h @@ -98,7 +98,7 @@ public: GeometryResource(const QUrl& url, const QUrl& textureBaseUrl = QUrl()) : Resource(url), _textureBaseUrl(textureBaseUrl) {} - virtual bool areTexturesLoaded() const { return isLoaded() && Geometry::areTexturesLoaded(); } + virtual bool areTexturesLoaded() const override { return isLoaded() && Geometry::areTexturesLoaded(); } virtual void deleter() override; diff --git a/libraries/procedural/src/procedural/ProceduralSkybox.h b/libraries/procedural/src/procedural/ProceduralSkybox.h index 2b8f2327a0..b38e481317 100644 --- a/libraries/procedural/src/procedural/ProceduralSkybox.h +++ b/libraries/procedural/src/procedural/ProceduralSkybox.h @@ -26,7 +26,7 @@ public: virtual void clear() override; - virtual void render(gpu::Batch& batch, const ViewFrustum& frustum) const; + virtual void render(gpu::Batch& batch, const ViewFrustum& frustum) const override; static void render(gpu::Batch& batch, const ViewFrustum& frustum, const ProceduralSkybox& skybox); protected: