mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-19 16:21:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2912 from akortunov/warnfix

Browse Source 
Fix Clang warnings about invalid overrides
This commit is contained in:
Bret Curtis 2020-06-16 16:31:11 +02:00 committed by GitHub
commit 66124272d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/terrain/chunkmanager.hpp
View File

@ -35,7 +35,7 @@ namespace Terrain
public: public:
ChunkManager(Storage* storage, Resource::SceneManager* sceneMgr, TextureManager* textureManager, CompositeMapRenderer* renderer); ChunkManager(Storage* storage, Resource::SceneManager* sceneMgr, TextureManager* textureManager, CompositeMapRenderer* renderer);
osg::ref_ptr<osg::Node> getChunk(float size, const osg::Vec2f& center, unsigned char lod, unsigned int lodFlags, bool far, const osg::Vec3f& viewPoint, bool compile); osg::ref_ptr<osg::Node> getChunk(float size, const osg::Vec2f& center, unsigned char lod, unsigned int lodFlags, bool far, const osg::Vec3f& viewPoint, bool compile) override;
void setCompositeMapSize(unsigned int size) { mCompositeMapSize = size; } void setCompositeMapSize(unsigned int size) { mCompositeMapSize = size; }
void setCompositeMapLevel(float level) { mCompositeMapLevel = level; } void setCompositeMapLevel(float level) { mCompositeMapLevel = level; }

18
components/terrain/quadtreeworld.hpp
View File

@ -26,22 +26,22 @@ namespace Terrain
void accept(osg::NodeVisitor& nv); void accept(osg::NodeVisitor& nv);
virtual void enable(bool enabled); void enable(bool enabled) override;
virtual void setViewDistance(float distance) { mViewDistance = distance; } void setViewDistance(float distance) override { mViewDistance = distance; }
void cacheCell(View *view, int x, int y) {} void cacheCell(View *view, int x, int y) override {}
/// @note Not thread safe. /// @note Not thread safe.
virtual void loadCell(int x, int y); void loadCell(int x, int y) override;
/// @note Not thread safe. /// @note Not thread safe.
virtual void unloadCell(int x, int y); void unloadCell(int x, int y) override;
View* createView(); View* createView() override;
void preload(View* view, const osg::Vec3f& eyePoint, const osg::Vec4i &cellgrid, std::atomic<bool>& abort, std::atomic<int>& progress, int& progressRange); void preload(View* view, const osg::Vec3f& eyePoint, const osg::Vec4i &cellgrid, std::atomic<bool>& abort, std::atomic<int>& progress, int& progressRange) override;
bool storeView(const View* view, double referenceTime); bool storeView(const View* view, double referenceTime) override;
void rebuildViews() override; void rebuildViews() override;
void reportStats(unsigned int frameNumber, osg::Stats* stats); void reportStats(unsigned int frameNumber, osg::Stats* stats) override;
class ChunkManager class ChunkManager
{ {