Drop unused dependency on FileSystem in mesh loaders

diff --git a/source/Irrlicht/COBJMeshFileLoader.cpp b/source/Irrlicht/COBJMeshFileLoader.cpp
index c4be102d20a7e3201a49878217fe847fbabb0267..740f8e5f4b213d88ecee634a0ee4793f29899e49 100644 (file)
--- a/source/Irrlicht/COBJMeshFileLoader.cpp
+++ b/source/Irrlicht/COBJMeshFileLoader.cpp
@@ -24,23 +24,18 @@ namespace scene
 #endif\r
 \r
 //! Constructor\r
-COBJMeshFileLoader::COBJMeshFileLoader(scene::ISceneManager* smgr, io::IFileSystem* fs)\r
-: SceneManager(smgr), FileSystem(fs)\r
+COBJMeshFileLoader::COBJMeshFileLoader(scene::ISceneManager* smgr)\r
+: SceneManager(smgr)\r
 {\r
        #ifdef _DEBUG\r
        setDebugName("COBJMeshFileLoader");\r
        #endif\r
-\r
-       if (FileSystem)\r
-               FileSystem->grab();\r
 }\r
 \r
 \r
 //! destructor\r
 COBJMeshFileLoader::~COBJMeshFileLoader()\r
 {\r
-       if (FileSystem)\r
-               FileSystem->drop();\r
 }\r
 \r
 \r
@@ -76,7 +71,6 @@ IAnimatedMesh* COBJMeshFileLoader::createMesh(io::IReadFile* file)
        u32 smoothingGroup=0;\r
 \r
        const io::path fullName = file->getFileName();\r
-       const io::path relPath = FileSystem->getFileDir(fullName)+"/";\r
 \r
        c8* buf = new c8[filesize];\r
        memset(buf, 0, filesize);\r

diff --git a/source/Irrlicht/COBJMeshFileLoader.h b/source/Irrlicht/COBJMeshFileLoader.h
index c03197a714bf00717f14cb2be2be9444d2695f8a..c706a5d64924b96eca1ed097fdbd684bdc44c70d 100644 (file)
--- a/source/Irrlicht/COBJMeshFileLoader.h
+++ b/source/Irrlicht/COBJMeshFileLoader.h
@@ -7,7 +7,6 @@
 \r
 #include <map>\r
 #include "IMeshLoader.h"\r
-#include "IFileSystem.h"\r
 #include "ISceneManager.h"\r
 #include "irrString.h"\r
 #include "SMeshBuffer.h"\r
@@ -23,7 +22,7 @@ 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
@@ -104,7 +103,6 @@ private:
        void cleanUp();\r
 \r
        scene::ISceneManager* SceneManager;\r
-       io::IFileSystem* FileSystem;\r
 \r
        core::array<SObjMtl*> Materials;\r
 };\r

diff --git a/source/Irrlicht/CSceneManager.cpp b/source/Irrlicht/CSceneManager.cpp
index e22ddd5949a36598d5ea3a6e88b84dff17f235ea..440a44ddeea9a2487cc15e278c67b71d37b7ded8 100644 (file)
--- a/source/Irrlicht/CSceneManager.cpp
+++ b/source/Irrlicht/CSceneManager.cpp
@@ -79,8 +79,8 @@ CSceneManager::CSceneManager(video::IVideoDriver* driver, io::IFileSystem* fs,
        // TODO: now that we have multiple scene managers, these should be\r
        // shallow copies from the previous manager if there is one.\r
 \r
-       MeshLoaderList.push_back(new CXMeshFileLoader(this, FileSystem));\r
-       MeshLoaderList.push_back(new COBJMeshFileLoader(this, FileSystem));\r
+       MeshLoaderList.push_back(new CXMeshFileLoader(this));\r
+       MeshLoaderList.push_back(new COBJMeshFileLoader(this));\r
        MeshLoaderList.push_back(new CB3DMeshFileLoader(this));\r
 }\r
 \r

diff --git a/source/Irrlicht/CXMeshFileLoader.cpp b/source/Irrlicht/CXMeshFileLoader.cpp
index 7603ec58f704ad06ae7d8db70611652456a85cfc..2a365ac16a9865661e6ba11f3efd5b8966774c3f 100644 (file)
--- a/source/Irrlicht/CXMeshFileLoader.cpp
+++ b/source/Irrlicht/CXMeshFileLoader.cpp
@@ -10,7 +10,6 @@
 #include "coreutil.h"\r
 #include "ISceneManager.h"\r
 #include "IVideoDriver.h"\r
-#include "IFileSystem.h"\r
 #include "IReadFile.h"\r
 \r
 #ifdef _DEBUG\r
@@ -24,7 +23,7 @@ namespace scene
 {\r
 \r
 //! Constructor\r
-CXMeshFileLoader::CXMeshFileLoader(scene::ISceneManager* smgr, io::IFileSystem* fs)\r
+CXMeshFileLoader::CXMeshFileLoader(scene::ISceneManager* smgr)\r
 : AnimatedMesh(0), Buffer(0), P(0), End(0), BinaryNumCount(0), Line(0),\r
        CurFrame(0), MajorVersion(0), MinorVersion(0), BinaryFormat(false), FloatSize(0)\r
 {\r

diff --git a/source/Irrlicht/CXMeshFileLoader.h b/source/Irrlicht/CXMeshFileLoader.h
index cfedfd04be9b049420fea9a16ffb300597cac510..ca934a8809835d5aca5a43a6ea39c2804ae165eb 100644 (file)
--- a/source/Irrlicht/CXMeshFileLoader.h
+++ b/source/Irrlicht/CXMeshFileLoader.h
@@ -14,7 +14,6 @@ namespace irr
 {\r
 namespace io\r
 {\r
-       class IFileSystem;\r
        class IReadFile;\r
 } // end namespace io\r
 namespace scene\r
@@ -27,7 +26,7 @@ class CXMeshFileLoader : public IMeshLoader
 public:\r
 \r
        //! Constructor\r
-       CXMeshFileLoader(scene::ISceneManager* smgr, io::IFileSystem* fs);\r
+       CXMeshFileLoader(scene::ISceneManager* smgr);\r
 \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