Revert "Fix: Listbox was sometimes sending EGET_LISTBOX_SELECTED_AGAIN instead of...

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

diff --git a/source/Irrlicht/COBJMeshFileLoader.h b/source/Irrlicht/COBJMeshFileLoader.h
index 22183eb6af96ac866488dc52f3dafd3340dd466c..c706a5d64924b96eca1ed097fdbd684bdc44c70d 100644 (file)
--- a/source/Irrlicht/COBJMeshFileLoader.h
+++ b/source/Irrlicht/COBJMeshFileLoader.h
@@ -5,12 +5,11 @@
 #ifndef __C_OBJ_MESH_FILE_LOADER_H_INCLUDED__\r
 #define __C_OBJ_MESH_FILE_LOADER_H_INCLUDED__\r
 \r
+#include <map>\r
 #include "IMeshLoader.h"\r
-#include "IFileSystem.h"\r
 #include "ISceneManager.h"\r
 #include "irrString.h"\r
 #include "SMeshBuffer.h"\r
-#include "irrMap.h"\r
 \r
 namespace irr\r
 {\r
@@ -23,20 +22,20 @@ class COBJMeshFileLoader : public IMeshLoader
 public:\r
 \r
        //! Constructor\r
-       COBJMeshFileLoader(scene::ISceneManager* smgr, io::IFileSystem* fs);\r
+       COBJMeshFileLoader(scene::ISceneManager* smgr);\r
 \r
        //! destructor\r
        virtual ~COBJMeshFileLoader();\r
 \r
        //! returns true if the file maybe is able to be loaded by this class\r
        //! based on the file extension (e.g. ".obj")\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
+       IAnimatedMesh* createMesh(io::IReadFile* file) override;\r
 \r
 private:\r
 \r
@@ -61,7 +60,7 @@ private:
                        Meshbuffer->Material = o.Meshbuffer->Material;\r
                }\r
 \r
-               core::map<video::S3DVertex, int> VertMap;\r
+               std::map<video::S3DVertex, int> VertMap;\r
                scene::SMeshBuffer *Meshbuffer;\r
                core::stringc Name;\r
                core::stringc Group;\r
@@ -70,9 +69,6 @@ private:
                bool RecalculateNormals;\r
        };\r
 \r
-       // helper method for material reading\r
-       const c8* readTextures(const c8* bufPtr, const c8* const bufEnd, SObjMtl* currMaterial, const io::path& relPath);\r
-\r
        // returns a pointer to the first printable character available in the buffer\r
        const c8* goFirstWord(const c8* buf, const c8* const bufEnd, bool acrossNewlines=true);\r
        // returns a pointer to the first printable character after the first non-printable\r
@@ -87,9 +83,6 @@ private:
        // combination of goNextWord followed by copyWord\r
        const c8* goAndCopyNextWord(c8* outBuf, const c8* inBuf, u32 outBufLength, const c8* const pBufEnd);\r
 \r
-       //! Read the material from the given file\r
-       void readMTL(const c8* fileName, const io::path& relPath);\r
-\r
        //! Find and return the material with the given name\r
        SObjMtl* findMtl(const core::stringc& mtlName, const core::stringc& grpName);\r
 \r
@@ -110,7 +103,6 @@ private:
        void cleanUp();\r
 \r
        scene::ISceneManager* SceneManager;\r
-       io::IFileSystem* FileSystem;\r
 \r
        core::array<SObjMtl*> Materials;\r
 };\r