From e184e4aedb51a48c8748285feccf787bff6ae9bf Mon Sep 17 00:00:00 2001 From: cutealien Date: Sat, 22 Apr 2023 21:30:14 +0000 Subject: [PATCH] Fix compiler warnings git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6466 dfc29bdd-3216-0410-991c-e03cc46cb475 --- source/Irrlicht/Android/CAndroidAssetFileArchive.h | 10 +++++----- source/Irrlicht/COGLES2Driver.cpp | 4 ++-- source/Irrlicht/COGLES2MaterialRenderer.h | 10 +++++----- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/source/Irrlicht/Android/CAndroidAssetFileArchive.h b/source/Irrlicht/Android/CAndroidAssetFileArchive.h index db63eeb2..06ee8214 100644 --- a/source/Irrlicht/Android/CAndroidAssetFileArchive.h +++ b/source/Irrlicht/Android/CAndroidAssetFileArchive.h @@ -37,21 +37,21 @@ namespace io virtual ~CAndroidAssetFileArchive(); //! opens a file by file name - virtual IReadFile* createAndOpenFile(const io::path& filename); + virtual IReadFile* createAndOpenFile(const io::path& filename) IRR_OVERRIDE; //! opens a file by index - virtual IReadFile* createAndOpenFile(u32 index); + virtual IReadFile* createAndOpenFile(u32 index) IRR_OVERRIDE; //! returns the list of files - virtual const IFileList* getFileList() const; + virtual const IFileList* getFileList() const IRR_OVERRIDE; //! get the archive type - virtual E_FILE_ARCHIVE_TYPE getType() const; + virtual E_FILE_ARCHIVE_TYPE getType() const IRR_OVERRIDE; //! Add a directory to read files from. Since the Android //! API does not return names of directories, they need to //! be added manually. - virtual void addDirectoryToFileList(const io::path &filename); + virtual void addDirectoryToFileList(const io::path &filename) IRR_OVERRIDE; //! return the name (id) of the file Archive virtual const io::path& getArchiveName() const IRR_OVERRIDE {return Path;} diff --git a/source/Irrlicht/COGLES2Driver.cpp b/source/Irrlicht/COGLES2Driver.cpp index 62050486..0041e8af 100644 --- a/source/Irrlicht/COGLES2Driver.cpp +++ b/source/Irrlicht/COGLES2Driver.cpp @@ -1029,8 +1029,8 @@ COGLES2Driver::~COGLES2Driver() IRR_PROFILE(CProfileScope p1(EPID_ES2_DRAW_2DIMAGE);) - // texcoords need to be flipped horizontally for RTTs - const bool isRTT = texture->isRenderTarget(); + // texcoords need to be flipped horizontally for RTTs + const bool isRTT = texture->isRenderTarget(); const core::dimension2du& ss = texture->getOriginalSize(); const f32 invW = 1.f / static_cast(ss.Width); const f32 invH = 1.f / static_cast(ss.Height); diff --git a/source/Irrlicht/COGLES2MaterialRenderer.h b/source/Irrlicht/COGLES2MaterialRenderer.h index c911d51e..490b43b3 100644 --- a/source/Irrlicht/COGLES2MaterialRenderer.h +++ b/source/Irrlicht/COGLES2MaterialRenderer.h @@ -43,15 +43,15 @@ public: GLuint getProgram() const; virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial, - bool resetAllRenderstates, IMaterialRendererServices* services); + bool resetAllRenderstates, IMaterialRendererServices* services) IRR_OVERRIDE; - virtual bool OnRender(IMaterialRendererServices* service, E_VERTEX_TYPE vtxtype); + virtual bool OnRender(IMaterialRendererServices* service, E_VERTEX_TYPE vtxtype) IRR_OVERRIDE; - virtual void OnUnsetMaterial(); + virtual void OnUnsetMaterial() IRR_OVERRIDE; - virtual bool isTransparent() const; + virtual bool isTransparent() const IRR_OVERRIDE; - virtual s32 getRenderCapability() const; + virtual s32 getRenderCapability() const IRR_OVERRIDE; virtual void setBasicRenderStates(const SMaterial& material, const SMaterial& lastMaterial, bool resetAllRenderstates) IRR_OVERRIDE;