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

Fix override warnings on XCode 7

Browse source
This commit is contained in:
Atlante45 2015-12-04 08:55:43 -08:00
parent cd26422ca0
commit cb758ca6b4
8 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
assignment-client/src/entities/EntityServer.h
View file

@ -50,10 +50,10 @@ public:
virtual void entityCreated(const EntityItem& newEntity, const SharedNodePointer& senderNode) override; virtual void entityCreated(const EntityItem& newEntity, const SharedNodePointer& senderNode) override;
virtual void readAdditionalConfiguration(const QJsonObject& settingsSectionObject) override; virtual void readAdditionalConfiguration(const QJsonObject& settingsSectionObject) override;
virtual QString serverSubclassStats(); virtual QString serverSubclassStats() override;
virtual void trackSend(const QUuid& dataID, quint64 dataLastEdited, const QUuid& viewerNode); virtual void trackSend(const QUuid& dataID, quint64 dataLastEdited, const QUuid& viewerNode) override;
virtual void trackViewerGone(const QUuid& viewerNode); virtual void trackViewerGone(const QUuid& viewerNode) override;
public slots: public slots:
void pruneDeletedEntities(); void pruneDeletedEntities();

4
libraries/controllers/src/controllers/impl/endpoints/ActionEndpoint.h
View file

@ -23,10 +23,10 @@ class ActionEndpoint : public Endpoint {
public: public:
ActionEndpoint(const Input& id = Input::INVALID_INPUT) : Endpoint(id) { } ActionEndpoint(const Input& id = Input::INVALID_INPUT) : Endpoint(id) { }
virtual float peek() const { return _currentValue; } virtual float peek() const override { return _currentValue; }
virtual void apply(float newValue, const Pointer& source) override; virtual void apply(float newValue, const Pointer& source) override;
virtual Pose peekPose() const { return _currentPose; } virtual Pose peekPose() const override { return _currentPose; }
virtual void apply(const Pose& value, const Pointer& source) override; virtual void apply(const Pose& value, const Pointer& source) override;
virtual void reset() override; virtual void reset() override;

6
libraries/controllers/src/controllers/impl/endpoints/InputEndpoint.h
View file

@ -28,9 +28,9 @@ public:
virtual Pose pose() override; virtual Pose pose() override;
virtual void apply(const Pose& value, const Pointer& source) override { } virtual void apply(const Pose& value, const Pointer& source) override { }
virtual bool writeable() const { return false; } virtual bool writeable() const override { return false; }
virtual bool readable() const { return !_read; } virtual bool readable() const override { return !_read; }
virtual void reset() { _read = false; } virtual void reset() override { _read = false; }
private: private:
bool _read { false }; bool _read { false };

2
libraries/controllers/src/controllers/impl/filters/PulseFilter.h
View file

@ -23,7 +23,7 @@ public:
virtual float apply(float value) const override; virtual float apply(float value) const override;
virtual bool parseParameters(const QJsonValue& parameters); virtual bool parseParameters(const QJsonValue& parameters) override;
private: private:
static const float DEFAULT_LAST_EMIT_TIME; static const float DEFAULT_LAST_EMIT_TIME;

2
libraries/controllers/src/controllers/impl/filters/ScaleFilter.h
View file

@ -23,7 +23,7 @@ public:
virtual float apply(float value) const override { virtual float apply(float value) const override {
return value * _scale; return value * _scale;
} }
virtual bool parseParameters(const QJsonValue& parameters); virtual bool parseParameters(const QJsonValue& parameters) override;
private: private:
float _scale = 1.0f; float _scale = 1.0f;

30
libraries/entities-renderer/src/RenderableModelEntityItem.h
View file

@ -30,42 +30,42 @@ public:
virtual void setDimensions(const glm::vec3& value) override; virtual void setDimensions(const glm::vec3& value) override;
virtual EntityItemProperties getProperties(EntityPropertyFlags desiredProperties = EntityPropertyFlags()) const; virtual EntityItemProperties getProperties(EntityPropertyFlags desiredProperties = EntityPropertyFlags()) const override;
virtual bool setProperties(const EntityItemProperties& properties); virtual bool setProperties(const EntityItemProperties& properties) override;
virtual int readEntitySubclassDataFromBuffer(const unsigned char* data, int bytesLeftToRead, virtual int readEntitySubclassDataFromBuffer(const unsigned char* data, int bytesLeftToRead,
ReadBitstreamToTreeParams& args, ReadBitstreamToTreeParams& args,
EntityPropertyFlags& propertyFlags, bool overwriteLocalData, EntityPropertyFlags& propertyFlags, bool overwriteLocalData,
bool& somethingChanged); bool& somethingChanged) override;
virtual void somethingChangedNotification() { virtual void somethingChangedNotification() override {
// FIX ME: this is overly aggressive. We only really need to simulate() if something about // FIX ME: this is overly aggressive. We only really need to simulate() if something about
// the world space transform has changed and/or if some animation is occurring. // the world space transform has changed and/or if some animation is occurring.
_needsInitialSimulation = true; _needsInitialSimulation = true;
} }
virtual bool readyToAddToScene(RenderArgs* renderArgs = nullptr); virtual bool readyToAddToScene(RenderArgs* renderArgs = nullptr);
virtual bool addToScene(EntityItemPointer self, std::shared_ptr<render::Scene> scene, render::PendingChanges& pendingChanges); virtual bool addToScene(EntityItemPointer self, std::shared_ptr<render::Scene> scene, render::PendingChanges& pendingChanges) override;
virtual void removeFromScene(EntityItemPointer self, std::shared_ptr<render::Scene> scene, render::PendingChanges& pendingChanges); virtual void removeFromScene(EntityItemPointer self, std::shared_ptr<render::Scene> scene, render::PendingChanges& pendingChanges) override;
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;
Model* getModel(EntityTreeRenderer* renderer); Model* getModel(EntityTreeRenderer* renderer);
virtual bool needsToCallUpdate() const; virtual bool needsToCallUpdate() const override;
virtual void update(const quint64& now); virtual void update(const quint64& now) override;
virtual void setCompoundShapeURL(const QString& url); virtual void setCompoundShapeURL(const QString& url) override;
bool isReadyToComputeShape(); virtual bool isReadyToComputeShape() override;
void computeShapeInfo(ShapeInfo& info); virtual void computeShapeInfo(ShapeInfo& info) override;
virtual bool contains(const glm::vec3& point) const; virtual bool contains(const glm::vec3& point) const override;
private: private:
void remapTextures(); void remapTextures();

4
libraries/recording/src/recording/impl/ArrayClip.h
View file

@ -32,7 +32,7 @@ public:
return _frames.size(); return _frames.size();
} }
Clip::Pointer duplicate() const { virtual Clip::Pointer duplicate() const override {
auto result = newClip(); auto result = newClip();
Locker lock(_mutex); Locker lock(_mutex);
for (size_t i = 0; i < _frames.size(); ++i) { for (size_t i = 0; i < _frames.size(); ++i) {
@ -41,7 +41,7 @@ public:
return result; return result;
} }
virtual void seekFrameTime(Frame::Time offset) { virtual void seekFrameTime(Frame::Time offset) override {
Locker lock(_mutex); Locker lock(_mutex);
auto itr = std::lower_bound(_frames.begin(), _frames.end(), offset, auto itr = std::lower_bound(_frames.begin(), _frames.end(), offset,
[](const T& a, Frame::Time b)->bool { [](const T& a, Frame::Time b)->bool {

2
libraries/recording/src/recording/impl/PointerClip.h
View file

@ -45,7 +45,7 @@ public:
// FIXME move to frame? // FIXME move to frame?
static const qint64 MINIMUM_FRAME_SIZE = sizeof(FrameType) + sizeof(Frame::Time) + sizeof(FrameSize); static const qint64 MINIMUM_FRAME_SIZE = sizeof(FrameType) + sizeof(Frame::Time) + sizeof(FrameSize);
protected: protected:
void reset(); void reset() override;
virtual FrameConstPointer readFrame(size_t index) const override; virtual FrameConstPointer readFrame(size_t index) const override;
QJsonDocument _header; QJsonDocument _header;
uchar* _data { nullptr }; uchar* _data { nullptr };