minetest/irrlicht
1
0
Fork 0
mirror of https://github.com/minetest/irrlicht.git synced 2024-11-14 06:20:26 +01:00
Code Issues Projects Releases Wiki Activity

Fix compiler warnings

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6466 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien 2023-04-22 21:30:14 +00:00
parent 9622a8b138
commit e184e4aedb
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/Irrlicht/Android/CAndroidAssetFileArchive.h
View File

@ -37,21 +37,21 @@ namespace io
virtual ~CAndroidAssetFileArchive(); virtual ~CAndroidAssetFileArchive();
//! opens a file by file name //! 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 //! opens a file by index
virtual IReadFile* createAndOpenFile(u32 index); virtual IReadFile* createAndOpenFile(u32 index) IRR_OVERRIDE;
//! returns the list of files //! returns the list of files
virtual const IFileList* getFileList() const; virtual const IFileList* getFileList() const IRR_OVERRIDE;
//! get the archive type //! 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 //! Add a directory to read files from. Since the Android
//! API does not return names of directories, they need to //! API does not return names of directories, they need to
//! be added manually. //! 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 //! return the name (id) of the file Archive
virtual const io::path& getArchiveName() const IRR_OVERRIDE {return Path;} virtual const io::path& getArchiveName() const IRR_OVERRIDE {return Path;}

4
source/Irrlicht/COGLES2Driver.cpp
View File

@ -1029,8 +1029,8 @@ COGLES2Driver::~COGLES2Driver()
IRR_PROFILE(CProfileScope p1(EPID_ES2_DRAW_2DIMAGE);) IRR_PROFILE(CProfileScope p1(EPID_ES2_DRAW_2DIMAGE);)
// texcoords need to be flipped horizontally for RTTs // texcoords need to be flipped horizontally for RTTs
const bool isRTT = texture->isRenderTarget(); const bool isRTT = texture->isRenderTarget();
const core::dimension2du& ss = texture->getOriginalSize(); const core::dimension2du& ss = texture->getOriginalSize();
const f32 invW = 1.f / static_cast<f32>(ss.Width); const f32 invW = 1.f / static_cast<f32>(ss.Width);
const f32 invH = 1.f / static_cast<f32>(ss.Height); const f32 invH = 1.f / static_cast<f32>(ss.Height);

10
source/Irrlicht/COGLES2MaterialRenderer.h
View File

@ -43,15 +43,15 @@ public:
GLuint getProgram() const; GLuint getProgram() const;
virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial, 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; virtual void setBasicRenderStates(const SMaterial& material, const SMaterial& lastMaterial, bool resetAllRenderstates) IRR_OVERRIDE;