Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-23 22:44:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #7006 from birarda/final-overrides

Browse source 
fix the last of the current override warnings for OS X
This commit is contained in:
Ryan Huffman 2016-02-03 11:26:46 -08:00
commit 77b86e654e
13 changed files with 33 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
interface/src/Application.h
View file

@ -167,11 +167,11 @@ public:
virtual controller::ScriptingInterface* getControllerScriptingInterface() { return _controllerScriptingInterface; } virtual controller::ScriptingInterface* getControllerScriptingInterface() { return _controllerScriptingInterface; }
virtual void registerScriptEngineWithApplicationServices(ScriptEngine* scriptEngine) override; virtual void registerScriptEngineWithApplicationServices(ScriptEngine* scriptEngine) override;
virtual ViewFrustum* getCurrentViewFrustum() { return getDisplayViewFrustum(); } virtual ViewFrustum* getCurrentViewFrustum() override { return getDisplayViewFrustum(); }
virtual QThread* getMainThread() { return thread(); } virtual QThread* getMainThread() override { return thread(); }
virtual PickRay computePickRay(float x, float y) const; virtual PickRay computePickRay(float x, float y) const override;
virtual glm::vec3 getAvatarPosition() const; virtual glm::vec3 getAvatarPosition() const override;
virtual qreal getDevicePixelRatio(); virtual qreal getDevicePixelRatio() override;
void setActiveDisplayPlugin(const QString& pluginName); void setActiveDisplayPlugin(const QString& pluginName);

8
interface/src/avatar/Avatar.h
View file

@ -164,10 +164,10 @@ public:
virtual void setOrientation(const glm::quat& orientation) override; virtual void setOrientation(const glm::quat& orientation) override;
// these call through to the SpatiallyNestable versions, but they are here to expose these to javascript. // these call through to the SpatiallyNestable versions, but they are here to expose these to javascript.
Q_INVOKABLE virtual const QUuid getParentID() const { return SpatiallyNestable::getParentID(); } Q_INVOKABLE virtual const QUuid getParentID() const override { return SpatiallyNestable::getParentID(); }
Q_INVOKABLE virtual void setParentID(const QUuid& parentID); Q_INVOKABLE virtual void setParentID(const QUuid& parentID) override;
Q_INVOKABLE virtual quint16 getParentJointIndex() const { return SpatiallyNestable::getParentJointIndex(); } Q_INVOKABLE virtual quint16 getParentJointIndex() const override { return SpatiallyNestable::getParentJointIndex(); }
Q_INVOKABLE virtual void setParentJointIndex(quint16 parentJointIndex); Q_INVOKABLE virtual void setParentJointIndex(quint16 parentJointIndex) override;
// NOT thread safe, must be called on main thread. // NOT thread safe, must be called on main thread.
glm::vec3 getUncachedLeftPalmPosition() const; glm::vec3 getUncachedLeftPalmPosition() const;

4
interface/src/avatar/AvatarMotionState.h
View file

@ -61,7 +61,7 @@ public:
void addDirtyFlags(uint32_t flags) { _dirtyFlags |= flags; } void addDirtyFlags(uint32_t flags) { _dirtyFlags |= flags; }
virtual void computeCollisionGroupAndMask(int16_t& group, int16_t& mask) const; virtual void computeCollisionGroupAndMask(int16_t& group, int16_t& mask) const override;
friend class AvatarManager; friend class AvatarManager;
friend class Avatar; friend class Avatar;
@ -72,7 +72,7 @@ protected:
~AvatarMotionState(); ~AvatarMotionState();
virtual bool isReadyToComputeShape() const override { return true; } virtual bool isReadyToComputeShape() const override { return true; }
virtual btCollisionShape* computeNewShape(); virtual btCollisionShape* computeNewShape() override;
// The AvatarMotionState keeps a RAW backpointer to its Avatar because all AvatarMotionState // The AvatarMotionState keeps a RAW backpointer to its Avatar because all AvatarMotionState
// instances are "owned" by their corresponding Avatar instance and are deleted in the Avatar dtor. // instances are "owned" by their corresponding Avatar instance and are deleted in the Avatar dtor.

2
interface/src/ui/overlays/ImageOverlay.h
View file

@ -20,7 +20,7 @@ class ImageOverlay : public QmlOverlay {
public: public:
static QString const TYPE; static QString const TYPE;
virtual QString getType() const { return TYPE; } virtual QString getType() const override { return TYPE; }
static QUrl const URL; static QUrl const URL;
ImageOverlay(); ImageOverlay();

2
interface/src/ui/overlays/TextOverlay.h
View file

@ -30,7 +30,7 @@ public:
void setText(const QString& text); void setText(const QString& text);
TextOverlay* createClone() const; TextOverlay* createClone() const override;
QSizeF textSize(const QString& text) const; // Pixels QSizeF textSize(const QString& text) const; // Pixels
}; };

2
libraries/animation/src/SwingTwistConstraint.h
View file

@ -51,7 +51,7 @@ public:
virtual bool apply(glm::quat& rotation) const override; virtual bool apply(glm::quat& rotation) const override;
void setLowerSpine(bool lowerSpine) { _lowerSpine = lowerSpine; } void setLowerSpine(bool lowerSpine) { _lowerSpine = lowerSpine; }
virtual bool isLowerSpine() const { return _lowerSpine; } virtual bool isLowerSpine() const override { return _lowerSpine; }
// SwingLimitFunction is an implementation of the constraint check described in the paper: // SwingLimitFunction is an implementation of the constraint check described in the paper:
// "The Parameterization of Joint Rotation with the Unit Quaternion" by Quang Liu and Edmond C. Prakash // "The Parameterization of Joint Rotation with the Unit Quaternion" by Quang Liu and Edmond C. Prakash

4
libraries/entities-renderer/src/RenderableBoxEntityItem.h
View file

@ -22,8 +22,8 @@ public:
static EntityItemPointer factory(const EntityItemID& entityID, const EntityItemProperties& properties); static EntityItemPointer factory(const EntityItemID& entityID, const EntityItemProperties& properties);
RenderableBoxEntityItem(const EntityItemID& entityItemID) : BoxEntityItem(entityItemID) { } RenderableBoxEntityItem(const EntityItemID& entityItemID) : BoxEntityItem(entityItemID) { }
virtual void render(RenderArgs* args); virtual void render(RenderArgs* args) override;
virtual void setUserData(const QString& value); virtual void setUserData(const QString& value) override;
SIMPLE_RENDERABLE() SIMPLE_RENDERABLE()
private: private:

6
libraries/entities-renderer/src/RenderableLightEntityItem.h
View file

@ -20,12 +20,12 @@ public:
static EntityItemPointer factory(const EntityItemID& entityID, const EntityItemProperties& properties); static EntityItemPointer factory(const EntityItemID& entityID, const EntityItemProperties& properties);
RenderableLightEntityItem(const EntityItemID& entityItemID) : LightEntityItem(entityItemID) { } RenderableLightEntityItem(const EntityItemID& entityItemID) : LightEntityItem(entityItemID) { }
virtual void render(RenderArgs* args); virtual void render(RenderArgs* args) override;
virtual bool supportsDetailedRayIntersection() const { return true; } virtual bool supportsDetailedRayIntersection() const override { return true; }
virtual bool findDetailedRayIntersection(const glm::vec3& origin, const glm::vec3& direction, virtual bool findDetailedRayIntersection(const glm::vec3& origin, const glm::vec3& direction,
bool& keepSearching, OctreeElementPointer& element, float& distance, bool& keepSearching, OctreeElementPointer& element, float& distance,
BoxFace& face, glm::vec3& surfaceNormal, BoxFace& face, glm::vec3& surfaceNormal,
void** intersectedObject, bool precisionPicking) const; void** intersectedObject, bool precisionPicking) const override;
SIMPLE_RENDERABLE(); SIMPLE_RENDERABLE();
}; };

2
libraries/entities-renderer/src/RenderableLineEntityItem.h
View file

@ -24,7 +24,7 @@ public:
_lineVerticesID(GeometryCache::UNKNOWN_ID) _lineVerticesID(GeometryCache::UNKNOWN_ID)
{ } { }
virtual void render(RenderArgs* args); virtual void render(RenderArgs* args) override;
SIMPLE_RENDERABLE(); SIMPLE_RENDERABLE();

4
libraries/entities-renderer/src/RenderableSphereEntityItem.h
View file

@ -22,8 +22,8 @@ public:
static EntityItemPointer factory(const EntityItemID& entityID, const EntityItemProperties& properties); static EntityItemPointer factory(const EntityItemID& entityID, const EntityItemProperties& properties);
RenderableSphereEntityItem(const EntityItemID& entityItemID) : SphereEntityItem(entityItemID) { } RenderableSphereEntityItem(const EntityItemID& entityItemID) : SphereEntityItem(entityItemID) { }
virtual void render(RenderArgs* args); virtual void render(RenderArgs* args) override;
virtual void setUserData(const QString& value); virtual void setUserData(const QString& value) override;
SIMPLE_RENDERABLE(); SIMPLE_RENDERABLE();

2
libraries/entities-renderer/src/RenderableTextEntityItem.h
View file

@ -25,7 +25,7 @@ public:
RenderableTextEntityItem(const EntityItemID& entityItemID) : TextEntityItem(entityItemID) { } RenderableTextEntityItem(const EntityItemID& entityItemID) : TextEntityItem(entityItemID) { }
~RenderableTextEntityItem() { delete _textRenderer; } ~RenderableTextEntityItem() { delete _textRenderer; }
virtual void render(RenderArgs* args); virtual void render(RenderArgs* args) override;
SIMPLE_RENDERABLE(); SIMPLE_RENDERABLE();

4
libraries/entities-renderer/src/RenderableWebEntityItem.h
View file

@ -25,8 +25,8 @@ public:
RenderableWebEntityItem(const EntityItemID& entityItemID); RenderableWebEntityItem(const EntityItemID& entityItemID);
~RenderableWebEntityItem(); ~RenderableWebEntityItem();
virtual void render(RenderArgs* args); virtual void render(RenderArgs* args) override;
virtual void setSourceUrl(const QString& value); virtual void setSourceUrl(const QString& value) override;
void setProxyWindow(QWindow* proxyWindow); void setProxyWindow(QWindow* proxyWindow);
QObject* getEventHandler(); QObject* getEventHandler();

16
libraries/physics/src/EntityMotionState.h
View file

@ -29,13 +29,13 @@ public:
virtual ~EntityMotionState(); virtual ~EntityMotionState();
void updateServerPhysicsVariables(); void updateServerPhysicsVariables();
virtual bool handleEasyChanges(uint32_t& flags); virtual bool handleEasyChanges(uint32_t& flags) override;
virtual bool handleHardAndEasyChanges(uint32_t& flags, PhysicsEngine* engine); virtual bool handleHardAndEasyChanges(uint32_t& flags, PhysicsEngine* engine) override;
/// \return PhysicsMotionType based on params set in EntityItem /// \return PhysicsMotionType based on params set in EntityItem
virtual PhysicsMotionType computePhysicsMotionType() const; virtual PhysicsMotionType computePhysicsMotionType() const override;
virtual bool isMoving() const; virtual bool isMoving() const override;
// this relays incoming position/rotation to the RigidBody // this relays incoming position/rotation to the RigidBody
virtual void getWorldTransform(btTransform& worldTrans) const override; virtual void getWorldTransform(btTransform& worldTrans) const override;
@ -48,8 +48,8 @@ public:
bool shouldSendUpdate(uint32_t simulationStep, const QUuid& sessionID); bool shouldSendUpdate(uint32_t simulationStep, const QUuid& sessionID);
void sendUpdate(OctreeEditPacketSender* packetSender, const QUuid& sessionID, uint32_t step); void sendUpdate(OctreeEditPacketSender* packetSender, const QUuid& sessionID, uint32_t step);
virtual uint32_t getIncomingDirtyFlags(); virtual uint32_t getIncomingDirtyFlags() override;
virtual void clearIncomingDirtyFlags(); virtual void clearIncomingDirtyFlags() override;
void incrementAccelerationNearlyGravityCount() { _accelerationNearlyGravityCount++; } void incrementAccelerationNearlyGravityCount() { _accelerationNearlyGravityCount++; }
void resetAccelerationNearlyGravityCount() { _accelerationNearlyGravityCount = 0; } void resetAccelerationNearlyGravityCount() { _accelerationNearlyGravityCount = 0; }
@ -80,7 +80,7 @@ public:
virtual QString getName() const override; virtual QString getName() const override;
virtual void computeCollisionGroupAndMask(int16_t& group, int16_t& mask) const; virtual void computeCollisionGroupAndMask(int16_t& group, int16_t& mask) const override;
// eternal logic can suggest a simuator priority bid for the next outgoing update // eternal logic can suggest a simuator priority bid for the next outgoing update
void setOutgoingPriority(quint8 priority); void setOutgoingPriority(quint8 priority);
@ -93,7 +93,7 @@ protected:
#endif #endif
virtual bool isReadyToComputeShape() const override; virtual bool isReadyToComputeShape() const override;
virtual btCollisionShape* computeNewShape(); virtual btCollisionShape* computeNewShape() override;
virtual void setMotionType(PhysicsMotionType motionType); virtual void setMotionType(PhysicsMotionType motionType);
// In the glorious future (when entities lib depends on physics lib) the EntityMotionState will be // In the glorious future (when entities lib depends on physics lib) the EntityMotionState will be