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/CSceneLoaderIrr.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_SCENE_LOADER_IRR_H_INCLUDED__
#define __C_SCENE_LOADER_IRR_H_INCLUDED__
#ifndef IRR_C_SCENE_LOADER_IRR_H_INCLUDED
#define IRR_C_SCENE_LOADER_IRR_H_INCLUDED
#include "ISceneLoader.h"
@@ -34,15 +34,15 @@ public:
virtual ~CSceneLoaderIrr();
//! Returns true if the class might be able to load this file.
virtual bool isALoadableFileExtension(const io::path& filename) const _IRR_OVERRIDE_;
virtual bool isALoadableFileExtension(const io::path& filename) const IRR_OVERRIDE;
//! Returns true if the class might be able to load this file.
virtual bool isALoadableFileFormat(io::IReadFile *file) const _IRR_OVERRIDE_;
virtual bool isALoadableFileFormat(io::IReadFile *file) const IRR_OVERRIDE;
//! Loads the scene into the scene manager.
virtual bool loadScene(io::IReadFile* file,
ISceneUserDataSerializer* userDataSerializer=0,
ISceneNode* rootNode=0) _IRR_OVERRIDE_;
ISceneNode* rootNode=0) IRR_OVERRIDE;
private:
@@ -80,4 +80,3 @@ private:
} // end namespace irr
#endif