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

11
source/Irrlicht/CSMFMeshFileLoader.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_SMF_MESH_LOADER_H_INCLUDED__
#define __C_SMF_MESH_LOADER_H_INCLUDED__
#ifndef IRR_C_SMF_MESH_LOADER_H_INCLUDED
#define IRR_C_SMF_MESH_LOADER_H_INCLUDED
#include "IMeshLoader.h"
#include "SMesh.h"
@@ -31,10 +31,10 @@ public:
CSMFMeshFileLoader(irr::io::IFileSystem* fs, video::IVideoDriver* driver);
//! Returns true if the file might be loaded by this class.
virtual bool isALoadableFileExtension(const io::path& filename) const _IRR_OVERRIDE_;
virtual bool isALoadableFileExtension(const io::path& filename) const IRR_OVERRIDE;
//! Creates/loads an animated mesh from the file.
virtual IAnimatedMesh* createMesh(io::IReadFile* file) _IRR_OVERRIDE_;
virtual IAnimatedMesh* createMesh(io::IReadFile* file) IRR_OVERRIDE;
private:
void loadLimb(io::IReadFile* file, scene::SMesh* mesh, const core::matrix4 &parentTransformation);
@@ -65,5 +65,4 @@ namespace io
} // end namespace irr
#endif // __C_SMF_MESH_LOADER_H_INCLUDED__
#endif // IRR_C_SMF_MESH_LOADER_H_INCLUDED