luanti-org/irrlicht-archive
Archived
1
0
Fork 0
Code Activity

Merging r6250 through r6254 from trunk to ogl-es branch

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6255 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien
2021-08-27 19:14:39 +00:00
parent 21302d038a
commit ee3579015b
275 changed files with 4166 additions and 3846 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
source/Irrlicht/CMemoryFile.h
View File

@@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_MEMORY_READ_FILE_H_INCLUDED__
#define __C_MEMORY_READ_FILE_H_INCLUDED__
#ifndef IRR_C_MEMORY_READ_FILE_H_INCLUDED
#define IRR_C_MEMORY_READ_FILE_H_INCLUDED
#include "IMemoryReadFile.h"
#include "IWriteFile.h"
@@ -29,28 +29,28 @@ namespace io
virtual ~CMemoryReadFile();
//! returns how much was read
virtual size_t read(void* buffer, size_t sizeToRead) _IRR_OVERRIDE_;
virtual size_t read(void* buffer, size_t sizeToRead) IRR_OVERRIDE;
//! changes position in file, returns true if successful
virtual bool seek(long finalPos, bool relativeMovement = false) _IRR_OVERRIDE_;
virtual bool seek(long finalPos, bool relativeMovement = false) IRR_OVERRIDE;
//! returns size of file
virtual long getSize() const _IRR_OVERRIDE_;
virtual long getSize() const IRR_OVERRIDE;
//! returns where in the file we are.
virtual long getPos() const _IRR_OVERRIDE_;
virtual long getPos() const IRR_OVERRIDE;
//! returns name of file
virtual const io::path& getFileName() const _IRR_OVERRIDE_;
virtual const io::path& getFileName() const IRR_OVERRIDE;
//! Get the type of the class implementing this interface
virtual EREAD_FILE_TYPE getType() const _IRR_OVERRIDE_
virtual EREAD_FILE_TYPE getType() const IRR_OVERRIDE
{
return ERFT_MEMORY_READ_FILE;
}
//! Get direct access to internal buffer
virtual const void *getBuffer() const _IRR_OVERRIDE_
virtual const void *getBuffer() const IRR_OVERRIDE
{
return Buffer;
}
@@ -78,18 +78,18 @@ namespace io
virtual ~CMemoryWriteFile();
//! returns how much was written
virtual size_t write(const void* buffer, size_t sizeToWrite) _IRR_OVERRIDE_;
virtual size_t write(const void* buffer, size_t sizeToWrite) IRR_OVERRIDE;
//! changes position in file, returns true if successful
virtual bool seek(long finalPos, bool relativeMovement = false) _IRR_OVERRIDE_;
virtual bool seek(long finalPos, bool relativeMovement = false) IRR_OVERRIDE;
//! returns where in the file we are.
virtual long getPos() const _IRR_OVERRIDE_;
virtual long getPos() const IRR_OVERRIDE;
//! returns name of file
virtual const io::path& getFileName() const _IRR_OVERRIDE_;
virtual const io::path& getFileName() const IRR_OVERRIDE;
virtual bool flush() _IRR_OVERRIDE_;
virtual bool flush() IRR_OVERRIDE;
private:
@@ -104,4 +104,3 @@ namespace io
} // end namespace irr
#endif