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

20
source/Irrlicht/CMeshTextureLoader.h
View File

@@ -24,26 +24,26 @@ public:
//! Set a custom texture path.
/** This is the first path the texture-loader should search. */
virtual void setTexturePath(const irr::io::path& path) _IRR_OVERRIDE_;
virtual void setTexturePath(const irr::io::path& path) IRR_OVERRIDE;
//! Get the current custom texture path.
virtual const irr::io::path& getTexturePath() const _IRR_OVERRIDE_;
virtual const irr::io::path& getTexturePath() const IRR_OVERRIDE;
//! Get the texture by searching for it in all paths that makes sense for the given textureName.
/** Usually you do not have to use this method, it is used internally by IMeshLoader's.
\param textureName Texturename as used in the mesh-format
\return Pointer to the texture. Returns 0 if loading failed.*/
virtual irr::video::ITexture* getTexture(const irr::io::path& textureName) _IRR_OVERRIDE_;
virtual irr::video::ITexture* getTexture(const irr::io::path& textureName) IRR_OVERRIDE;
//! Meshloaders will search paths relative to the meshFile.
/** Usually you do not have to use this method, it is used internally by IMeshLoader's.
Any values you set here will likely be overwritten internally. */
virtual void setMeshFile(const irr::io::IReadFile* meshFile) _IRR_OVERRIDE_;
virtual void setMeshFile(const irr::io::IReadFile* meshFile) IRR_OVERRIDE;
//! Meshloaders will try to look relative to the path of the materialFile
/** Usually you do not have to use this method, it is used internally by IMeshLoader's.
Any values you set here will likely be overwritten internally. */
virtual void setMaterialFile(const irr::io::IReadFile* materialFile) _IRR_OVERRIDE_;
virtual void setMaterialFile(const irr::io::IReadFile* materialFile) IRR_OVERRIDE;
protected:
// make certain path's have a certain internal format
@@ -51,12 +51,12 @@ protected:
{
if (!directory.empty())
{
if (directory == _IRR_TEXT("."))
directory = _IRR_TEXT("");
if (directory == IRR_TEXT("."))
directory = IRR_TEXT("");
directory.replace(_IRR_TEXT('\\'),_IRR_TEXT('/'));
if (directory.lastChar() != _IRR_TEXT('/'))
directory.append(_IRR_TEXT('/'));
directory.replace(IRR_TEXT('\\'),IRR_TEXT('/'));
if (directory.lastChar() != IRR_TEXT('/'))
directory.append(IRR_TEXT('/'));
}
}