Reduce IrrCompileConfig usage to files that actually need it

[irrlicht.git] / source / Irrlicht / CXMeshFileLoader.h

diff --git a/source/Irrlicht/CXMeshFileLoader.h b/source/Irrlicht/CXMeshFileLoader.h
index a4806d7b2723018c695d5b38606aefc8469b270a..cfedfd04be9b049420fea9a16ffb300597cac510 100644 (file)
--- a/source/Irrlicht/CXMeshFileLoader.h
+++ b/source/Irrlicht/CXMeshFileLoader.h
@@ -31,19 +31,13 @@ public:
 \r
        //! returns true if the file maybe is able to be loaded by this class\r
        //! based on the file extension (e.g. ".cob")\r
-       virtual bool isALoadableFileExtension(const io::path& filename) const _IRR_OVERRIDE_;\r
+       bool isALoadableFileExtension(const io::path& filename) const override;\r
 \r
        //! creates/loads an animated mesh from the file.\r
        //! \return Pointer to the created mesh. Returns 0 if loading failed.\r
        //! If you no longer need the mesh, you should call IAnimatedMesh::drop().\r
        //! See IReferenceCounted::drop() for more information.\r
-       virtual IAnimatedMesh* createMesh(io::IReadFile* file) _IRR_OVERRIDE_;\r
-\r
-       struct SXTemplateMaterial\r
-       {\r
-               core::stringc Name; // template name from Xfile\r
-               video::SMaterial Material; // material\r
-       };\r
+       IAnimatedMesh* createMesh(io::IReadFile* file) override;\r
 \r
        struct SXMesh\r
        {\r
@@ -114,8 +108,6 @@ private:
 \r
        bool parseDataObjectMeshMaterialList(SXMesh &mesh);\r
 \r
-       bool parseDataObjectMaterial(video::SMaterial& material);\r
-\r
        bool parseDataObjectAnimationSet();\r
 \r
        bool parseDataObjectAnimationTicksPerSecond();\r
@@ -167,9 +159,6 @@ private:
        bool readRGB(video::SColor& color);\r
        bool readRGBA(video::SColor& color);\r
 \r
-       ISceneManager* SceneManager;\r
-       io::IFileSystem* FileSystem;\r
-\r
        CSkinnedMesh* AnimatedMesh;\r
 \r
        c8* Buffer;\r
@@ -184,8 +173,6 @@ private:
 \r
        core::array<SXMesh*> Meshes;\r
 \r
-       core::array<SXTemplateMaterial> TemplateMaterials;\r
-\r
        u32 MajorVersion;\r
        u32 MinorVersion;\r
        bool BinaryFormat;\r