Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-08 04:08:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

More OS X warning cleanup

Browse source
This commit is contained in:
Atlante45 2015-12-10 17:08:34 -08:00
parent 64dd36d140
commit a07d7494f0
8 changed files with 45 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -100,25 +100,25 @@ public:
/// Returns the distance to use as a LOD parameter. /// Returns the distance to use as a LOD parameter.
float getLODDistance() const; float getLODDistance() const;
virtual bool isMyAvatar() const { return false; } virtual bool isMyAvatar() const override { return false; }
virtual QVector<glm::quat> getJointRotations() const; virtual QVector<glm::quat> getJointRotations() const override;
virtual glm::quat getJointRotation(int index) const; virtual glm::quat getJointRotation(int index) const override;
virtual glm::vec3 getJointTranslation(int index) const; virtual glm::vec3 getJointTranslation(int index) const override;
virtual int getJointIndex(const QString& name) const; virtual int getJointIndex(const QString& name) const override;
virtual QStringList getJointNames() const; virtual QStringList getJointNames() const override;
virtual glm::quat getAbsoluteJointRotationInObjectFrame(int index) const override; virtual glm::quat getAbsoluteJointRotationInObjectFrame(int index) const override;
virtual glm::vec3 getAbsoluteJointTranslationInObjectFrame(int index) const override; virtual glm::vec3 getAbsoluteJointTranslationInObjectFrame(int index) const override;
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;
virtual void setAttachmentData(const QVector<AttachmentData>& attachmentData); virtual void setAttachmentData(const QVector<AttachmentData>& attachmentData) override;
virtual void setBillboard(const QByteArray& billboard); virtual void setBillboard(const QByteArray& billboard) override;
void setShowDisplayName(bool showDisplayName); void setShowDisplayName(bool showDisplayName);
virtual int parseDataFromBuffer(const QByteArray& buffer); virtual int parseDataFromBuffer(const QByteArray& buffer) override;
static void renderJointConnectingCone( gpu::Batch& batch, glm::vec3 position1, glm::vec3 position2, static void renderJointConnectingCone( gpu::Batch& batch, glm::vec3 position1, glm::vec3 position2,
float radius1, float radius2, const glm::vec4& color); float radius1, float radius2, const glm::vec4& color);
@ -144,7 +144,7 @@ public:
void scaleVectorRelativeToPosition(glm::vec3 &positionToScale) const; void scaleVectorRelativeToPosition(glm::vec3 &positionToScale) const;
void slamPosition(const glm::vec3& position); void slamPosition(const glm::vec3& position);
virtual void updateAttitude() { _skeletonModel.updateAttitude(); } virtual void updateAttitude() override { _skeletonModel.updateAttitude(); }
// Call this when updating Avatar position with a delta. This will allow us to // Call this when updating Avatar position with a delta. This will allow us to
// _accurately_ measure position changes and compute the resulting velocity // _accurately_ measure position changes and compute the resulting velocity
@ -217,7 +217,7 @@ protected:
virtual bool shouldRenderHead(const RenderArgs* renderArgs) const; virtual bool shouldRenderHead(const RenderArgs* renderArgs) const;
virtual void fixupModelsInScene(); virtual void fixupModelsInScene();
virtual void updateJointMappings(); virtual void updateJointMappings() override;
render::ItemID _renderItemID; render::ItemID _renderItemID;

5
libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
View file

@ -15,7 +15,8 @@
#include <QtOpenGL/QGLWidget> #include <QtOpenGL/QGLWidget>
#include <QtGui/QImage> #include <QtGui/QImage>
#include <QtGui/QOpenGLContext>
#include <QOpenGLContextWrapper.h>
#include <gl/GLWidget.h> #include <gl/GLWidget.h>
#include <NumericalConstants.h> #include <NumericalConstants.h>
@ -104,7 +105,7 @@ public:
// take the latest texture and present it // take the latest texture and present it
_context->makeCurrent(); _context->makeCurrent();
if (QOpenGLContext::currentContext() == _context->contextHandle()) { if (isCurrentContext(_context->contextHandle())) {
currentPlugin->present(); currentPlugin->present();
_context->doneCurrent(); _context->doneCurrent();
} else { } else {

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

@ -29,7 +29,7 @@ public:
virtual ~RenderableModelEntityItem(); virtual ~RenderableModelEntityItem();
virtual void setDimensions(const glm::vec3& value) override; virtual void setDimensions(const glm::vec3& value) override;
virtual void setModelURL(const QString& url); virtual void setModelURL(const QString& url) override;
virtual EntityItemProperties getProperties(EntityPropertyFlags desiredProperties = EntityPropertyFlags()) const override; virtual EntityItemProperties getProperties(EntityPropertyFlags desiredProperties = EntityPropertyFlags()) const override;
virtual bool setProperties(const EntityItemProperties& properties) override; virtual bool setProperties(const EntityItemProperties& properties) override;

2
libraries/entities/src/EntityItem.h
View file

@ -389,7 +389,7 @@ protected:
const QByteArray getActionDataInternal() const; const QByteArray getActionDataInternal() const;
void setActionDataInternal(QByteArray actionData); void setActionDataInternal(QByteArray actionData);
virtual void locationChanged(); virtual void locationChanged() override;
EntityTypes::EntityType _type; EntityTypes::EntityType _type;
quint64 _lastSimulated; // last time this entity called simulate(), this includes velocity, angular velocity, quint64 _lastSimulated; // last time this entity called simulate(), this includes velocity, angular velocity,
// and physics changes // and physics changes

46
libraries/entities/src/EntityTree.h
View file

@ -58,7 +58,7 @@ public:
void createRootElement(); void createRootElement();
/// Implements our type specific root element factory /// Implements our type specific root element factory
virtual OctreeElementPointer createNewElement(unsigned char* octalCode = NULL); virtual OctreeElementPointer createNewElement(unsigned char* octalCode = NULL) override;
/// Type safe version of getRoot() /// Type safe version of getRoot()
EntityTreeElementPointer getRoot() { EntityTreeElementPointer getRoot() {
@ -68,15 +68,15 @@ public:
return std::static_pointer_cast<EntityTreeElement>(_rootElement); return std::static_pointer_cast<EntityTreeElement>(_rootElement);
} }
virtual void eraseAllOctreeElements(bool createNewRoot = true); virtual void eraseAllOctreeElements(bool createNewRoot = true) override;
// These methods will allow the OctreeServer to send your tree inbound edit packets of your // These methods will allow the OctreeServer to send your tree inbound edit packets of your
// own definition. Implement these to allow your octree based server to support editing // own definition. Implement these to allow your octree based server to support editing
virtual bool getWantSVOfileVersions() const { return true; } virtual bool getWantSVOfileVersions() const override { return true; }
virtual PacketType expectedDataPacketType() const { return PacketType::EntityData; } virtual PacketType expectedDataPacketType() const override { return PacketType::EntityData; }
virtual bool canProcessVersion(PacketVersion thisVersion) const virtual bool canProcessVersion(PacketVersion thisVersion) const override
{ return thisVersion >= VERSION_ENTITIES_USE_METERS_AND_RADIANS; } { return thisVersion >= VERSION_ENTITIES_USE_METERS_AND_RADIANS; }
virtual bool handlesEditPacketType(PacketType packetType) const; virtual bool handlesEditPacketType(PacketType packetType) const override;
void fixupTerseEditLogging(EntityItemProperties& properties, QList<QString>& changedProperties); void fixupTerseEditLogging(EntityItemProperties& properties, QList<QString>& changedProperties);
virtual int processEditPacketData(ReceivedMessage& message, const unsigned char* editData, int maxLength, virtual int processEditPacketData(ReceivedMessage& message, const unsigned char* editData, int maxLength,
const SharedNodePointer& senderNode) override; const SharedNodePointer& senderNode) override;
@ -89,18 +89,18 @@ public:
bool* accurateResult = NULL, bool* accurateResult = NULL,
bool precisionPicking = false); bool precisionPicking = false);
virtual bool rootElementHasData() const { return true; } virtual bool rootElementHasData() const override { return true; }
// the root at least needs to store the number of entities in the packet/buffer // the root at least needs to store the number of entities in the packet/buffer
virtual int minimumRequiredRootDataBytes() const { return sizeof(uint16_t); } virtual int minimumRequiredRootDataBytes() const override { return sizeof(uint16_t); }
virtual bool suppressEmptySubtrees() const { return false; } virtual bool suppressEmptySubtrees() const override { return false; }
virtual void releaseSceneEncodeData(OctreeElementExtraEncodeData* extraEncodeData) const; virtual void releaseSceneEncodeData(OctreeElementExtraEncodeData* extraEncodeData) const override;
virtual bool mustIncludeAllChildData() const { return false; } virtual bool mustIncludeAllChildData() const override { return false; }
virtual bool versionHasSVOfileBreaks(PacketVersion thisVersion) const virtual bool versionHasSVOfileBreaks(PacketVersion thisVersion) const override
{ return thisVersion >= VERSION_ENTITIES_HAS_FILE_BREAKS; } { return thisVersion >= VERSION_ENTITIES_HAS_FILE_BREAKS; }
virtual void update(); virtual void update() override;
// The newer API... // The newer API...
void postAddEntity(EntityItemPointer entityItem); void postAddEntity(EntityItemPointer entityItem);
@ -177,8 +177,8 @@ public:
EntityTreeElementPointer getContainingElement(const EntityItemID& entityItemID) /*const*/; EntityTreeElementPointer getContainingElement(const EntityItemID& entityItemID) /*const*/;
void setContainingElement(const EntityItemID& entityItemID, EntityTreeElementPointer element); void setContainingElement(const EntityItemID& entityItemID, EntityTreeElementPointer element);
void debugDumpMap(); void debugDumpMap();
virtual void dumpTree(); virtual void dumpTree() override;
virtual void pruneTree(); virtual void pruneTree() override;
QVector<EntityItemID> sendEntities(EntityEditPacketSender* packetSender, EntityTreePointer localTree, QVector<EntityItemID> sendEntities(EntityEditPacketSender* packetSender, EntityTreePointer localTree,
float x, float y, float z); float x, float y, float z);
@ -198,12 +198,12 @@ public:
void remapIDs(); void remapIDs();
bool writeToMap(QVariantMap& entityDescription, OctreeElementPointer element, bool skipDefaultValues); virtual bool writeToMap(QVariantMap& entityDescription, OctreeElementPointer element, bool skipDefaultValues) override;
bool readFromMap(QVariantMap& entityDescription); virtual bool readFromMap(QVariantMap& entityDescription) override;
float getContentsLargestDimension(); float getContentsLargestDimension();
virtual void resetEditStats() { virtual void resetEditStats() override {
_totalEditMessages = 0; _totalEditMessages = 0;
_totalUpdates = 0; _totalUpdates = 0;
_totalCreates = 0; _totalCreates = 0;
@ -214,11 +214,11 @@ public:
_totalLoggingTime = 0; _totalLoggingTime = 0;
} }
virtual quint64 getAverageDecodeTime() const { return _totalEditMessages == 0 ? 0 : _totalDecodeTime / _totalEditMessages; } virtual quint64 getAverageDecodeTime() const override { return _totalEditMessages == 0 ? 0 : _totalDecodeTime / _totalEditMessages; }
virtual quint64 getAverageLookupTime() const { return _totalEditMessages == 0 ? 0 : _totalLookupTime / _totalEditMessages; } virtual quint64 getAverageLookupTime() const override { return _totalEditMessages == 0 ? 0 : _totalLookupTime / _totalEditMessages; }
virtual quint64 getAverageUpdateTime() const { return _totalUpdates == 0 ? 0 : _totalUpdateTime / _totalUpdates; } virtual quint64 getAverageUpdateTime() const override { return _totalUpdates == 0 ? 0 : _totalUpdateTime / _totalUpdates; }
virtual quint64 getAverageCreateTime() const { return _totalCreates == 0 ? 0 : _totalCreateTime / _totalCreates; } virtual quint64 getAverageCreateTime() const override { return _totalCreates == 0 ? 0 : _totalCreateTime / _totalCreates; }
virtual quint64 getAverageLoggingTime() const { return _totalEditMessages == 0 ? 0 : _totalLoggingTime / _totalEditMessages; } virtual quint64 getAverageLoggingTime() const override { return _totalEditMessages == 0 ? 0 : _totalLoggingTime / _totalEditMessages; }
void trackIncomingEntityLastEdited(quint64 lastEditedTime, int bytesRead); void trackIncomingEntityLastEdited(quint64 lastEditedTime, int bytesRead);
quint64 getAverageEditDeltas() const quint64 getAverageEditDeltas() const

2
libraries/octree/src/JurisdictionListener.h
View file

@ -32,7 +32,7 @@ public:
JurisdictionListener(NodeType_t type = NodeType::EntityServer); JurisdictionListener(NodeType_t type = NodeType::EntityServer);
virtual bool process(); virtual bool process() override;
NodeToJurisdictionMap* getJurisdictions() { return &_jurisdictions; } NodeToJurisdictionMap* getJurisdictions() { return &_jurisdictions; }

2
libraries/octree/src/JurisdictionSender.h
View file

@ -32,7 +32,7 @@ public:
void setJurisdiction(JurisdictionMap* map) { _jurisdictionMap = map; } void setJurisdiction(JurisdictionMap* map) { _jurisdictionMap = map; }
virtual bool process(); virtual bool process() override;
NodeType_t getNodeType() const { return _nodeType; } NodeType_t getNodeType() const { return _nodeType; }
void setNodeType(NodeType_t type) { _nodeType = type; } void setNodeType(NodeType_t type) { _nodeType = type; }

4
libraries/physics/src/CharacterController.h
View file

@ -43,7 +43,7 @@ public:
virtual void updateShapeIfNecessary() = 0; virtual void updateShapeIfNecessary() = 0;
// overrides from btCharacterControllerInterface // overrides from btCharacterControllerInterface
virtual void setWalkDirection(const btVector3 &walkDirection) { assert(false); } virtual void setWalkDirection(const btVector3 &walkDirection) override { assert(false); }
virtual void setVelocityForTimeInterval(const btVector3 &velocity, btScalar timeInterval) override { assert(false); } virtual void setVelocityForTimeInterval(const btVector3 &velocity, btScalar timeInterval) override { assert(false); }
virtual void reset(btCollisionWorld* collisionWorld) override { } virtual void reset(btCollisionWorld* collisionWorld) override { }
virtual void warp(const btVector3& origin) override { } virtual void warp(const btVector3& origin) override { }
@ -57,7 +57,7 @@ public:
virtual void playerStep(btCollisionWorld *collisionWorld, btScalar dt) override; virtual void playerStep(btCollisionWorld *collisionWorld, btScalar dt) override;
virtual bool canJump() const override { assert(false); return false; } // never call this virtual bool canJump() const override { assert(false); return false; } // never call this
virtual void jump() override; virtual void jump() override;
virtual bool onGround() const; virtual bool onGround() const override;
void preSimulation(); void preSimulation();
void postSimulation(); void postSimulation();