Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 11:48:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix warnings on osx

Browse source
This commit is contained in:
SamGondelman 2016-08-04 13:09:09 -07:00
parent ac9a80131a
commit 004b0158a4
1 changed files with 35 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
libraries/entities-renderer/src/RenderablePolyVoxEntityItem.h
View file

@ -50,7 +50,7 @@ public:
void initializePolyVox(); void initializePolyVox();
virtual void somethingChangedNotification() { virtual void somethingChangedNotification() override {
// This gets called from EnityItem::readEntityDataFromBuffer every time a packet describing // This gets called from EnityItem::readEntityDataFromBuffer every time a packet describing
// this entity comes from the entity-server. It gets called even if nothing has actually changed // this entity comes from the entity-server. It gets called even if nothing has actually changed
// (see the comment in EntityItem.cpp). If that gets fixed, this could be used to know if we // (see the comment in EntityItem.cpp). If that gets fixed, this could be used to know if we
@ -58,19 +58,19 @@ public:
// _needsModelReload = true; // _needsModelReload = true;
} }
virtual uint8_t getVoxel(int x, int y, int z); virtual uint8_t getVoxel(int x, int y, int z) override;
virtual bool setVoxel(int x, int y, int z, uint8_t toValue); virtual bool setVoxel(int x, int y, int z, uint8_t toValue) override;
void render(RenderArgs* args); 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;
virtual void setVoxelData(QByteArray voxelData); virtual void setVoxelData(QByteArray voxelData) override;
virtual void setVoxelVolumeSize(glm::vec3 voxelVolumeSize); virtual void setVoxelVolumeSize(glm::vec3 voxelVolumeSize) override;
virtual void setVoxelSurfaceStyle(PolyVoxSurfaceStyle voxelSurfaceStyle); virtual void setVoxelSurfaceStyle(PolyVoxSurfaceStyle voxelSurfaceStyle) override;
glm::vec3 getSurfacePositionAdjustment() const; glm::vec3 getSurfacePositionAdjustment() const;
glm::mat4 voxelToWorldMatrix() const; glm::mat4 voxelToWorldMatrix() const;
@ -78,45 +78,45 @@ public:
glm::mat4 voxelToLocalMatrix() const; glm::mat4 voxelToLocalMatrix() const;
glm::mat4 localToVoxelMatrix() const; glm::mat4 localToVoxelMatrix() const;
virtual ShapeType getShapeType() const; virtual ShapeType getShapeType() const override;
virtual bool shouldBePhysical() const { return !isDead(); } virtual bool shouldBePhysical() const override { return !isDead(); }
virtual bool isReadyToComputeShape(); virtual bool isReadyToComputeShape() override;
virtual void computeShapeInfo(ShapeInfo& info); virtual void computeShapeInfo(ShapeInfo& info) override;
virtual glm::vec3 voxelCoordsToWorldCoords(glm::vec3& voxelCoords) const; virtual glm::vec3 voxelCoordsToWorldCoords(glm::vec3& voxelCoords) const override;
virtual glm::vec3 worldCoordsToVoxelCoords(glm::vec3& worldCoords) const; virtual glm::vec3 worldCoordsToVoxelCoords(glm::vec3& worldCoords) const override;
virtual glm::vec3 voxelCoordsToLocalCoords(glm::vec3& voxelCoords) const; virtual glm::vec3 voxelCoordsToLocalCoords(glm::vec3& voxelCoords) const override;
virtual glm::vec3 localCoordsToVoxelCoords(glm::vec3& localCoords) const; virtual glm::vec3 localCoordsToVoxelCoords(glm::vec3& localCoords) const override;
// coords are in voxel-volume space // coords are in voxel-volume space
virtual bool setSphereInVolume(glm::vec3 center, float radius, uint8_t toValue); virtual bool setSphereInVolume(glm::vec3 center, float radius, uint8_t toValue) override;
virtual bool setVoxelInVolume(glm::vec3 position, uint8_t toValue); virtual bool setVoxelInVolume(glm::vec3 position, uint8_t toValue) override;
// coords are in world-space // coords are in world-space
virtual bool setSphere(glm::vec3 center, float radius, uint8_t toValue); virtual bool setSphere(glm::vec3 center, float radius, uint8_t toValue) override;
virtual bool setAll(uint8_t toValue); virtual bool setAll(uint8_t toValue) override;
virtual bool setCuboid(const glm::vec3& lowPosition, const glm::vec3& cuboidSize, int toValue); virtual bool setCuboid(const glm::vec3& lowPosition, const glm::vec3& cuboidSize, int toValue) override;
virtual void setXTextureURL(QString xTextureURL); virtual void setXTextureURL(QString xTextureURL) override;
virtual void setYTextureURL(QString yTextureURL); virtual void setYTextureURL(QString yTextureURL) override;
virtual void setZTextureURL(QString zTextureURL); virtual void setZTextureURL(QString zTextureURL) override;
virtual bool addToScene(EntityItemPointer self, virtual bool addToScene(EntityItemPointer self,
std::shared_ptr<render::Scene> scene, std::shared_ptr<render::Scene> scene,
render::PendingChanges& pendingChanges); render::PendingChanges& pendingChanges) override;
virtual void removeFromScene(EntityItemPointer self, virtual void removeFromScene(EntityItemPointer self,
std::shared_ptr<render::Scene> scene, std::shared_ptr<render::Scene> scene,
render::PendingChanges& pendingChanges); render::PendingChanges& pendingChanges) override;
virtual void setXNNeighborID(const EntityItemID& xNNeighborID); virtual void setXNNeighborID(const EntityItemID& xNNeighborID) override;
virtual void setYNNeighborID(const EntityItemID& yNNeighborID); virtual void setYNNeighborID(const EntityItemID& yNNeighborID) override;
virtual void setZNNeighborID(const EntityItemID& zNNeighborID); virtual void setZNNeighborID(const EntityItemID& zNNeighborID) override;
virtual void setXPNeighborID(const EntityItemID& xPNeighborID); virtual void setXPNeighborID(const EntityItemID& xPNeighborID) override;
virtual void setYPNeighborID(const EntityItemID& yPNeighborID); virtual void setYPNeighborID(const EntityItemID& yPNeighborID) override;
virtual void setZPNeighborID(const EntityItemID& zPNeighborID); virtual void setZPNeighborID(const EntityItemID& zPNeighborID) override;
virtual void updateRegistrationPoint(const glm::vec3& value); virtual void updateRegistrationPoint(const glm::vec3& value) override;
void setVoxelsFromData(QByteArray uncompressedData, quint16 voxelXSize, quint16 voxelYSize, quint16 voxelZSize); void setVoxelsFromData(QByteArray uncompressedData, quint16 voxelXSize, quint16 voxelYSize, quint16 voxelZSize);
void forEachVoxelValue(quint16 voxelXSize, quint16 voxelYSize, quint16 voxelZSize, void forEachVoxelValue(quint16 voxelXSize, quint16 voxelYSize, quint16 voxelZSize,
@ -163,7 +163,7 @@ private:
// these are run off the main thread // these are run off the main thread
void decompressVolumeData(); void decompressVolumeData();
void compressVolumeDataAndSendEditPacket(); void compressVolumeDataAndSendEditPacket();
virtual void getMesh(); // recompute mesh virtual void getMesh() override; // recompute mesh
void computeShapeInfoWorker(); void computeShapeInfoWorker();
// these are cached lookups of _xNNeighborID, _yNNeighborID, _zNNeighborID, _xPNeighborID, _yPNeighborID, _zPNeighborID // these are cached lookups of _xNNeighborID, _yNNeighborID, _zNNeighborID, _xPNeighborID, _yPNeighborID, _zPNeighborID