Drop unused dependency of SceneManager on GUIEnvironment

diff --git a/include/ISceneManager.h b/include/ISceneManager.h
index 660d0aa80dbd96e02e7ceb579087cc209bb2dfbd..60d2d49c305835f9fd27784c9dff30b74f1da894 100644 (file)
--- a/include/ISceneManager.h
+++ b/include/ISceneManager.h
@@ -345,11 +345,6 @@ namespace scene
                This pointer should not be dropped. See IReferenceCounted::drop() for more information. */\r
                virtual video::IVideoDriver* getVideoDriver() = 0;\r
 \r
-               //! Get the active GUIEnvironment\r
-               /** \return Pointer to the GUIEnvironment\r
-               This pointer should not be dropped. See IReferenceCounted::drop() for more information. */\r
-               virtual gui::IGUIEnvironment* getGUIEnvironment() = 0;\r
-\r
                //! Get the active FileSystem\r
                /** \return Pointer to the FileSystem\r
                This pointer should not be dropped. See IReferenceCounted::drop() for more information. */\r

diff --git a/source/Irrlicht/CIrrDeviceStub.cpp b/source/Irrlicht/CIrrDeviceStub.cpp
index 92cda75d4baaa0bfe0e8470af07983ae7db417f9..69906737bae5775a76d353ab923c000b746a0dda 100644 (file)
--- a/source/Irrlicht/CIrrDeviceStub.cpp
+++ b/source/Irrlicht/CIrrDeviceStub.cpp
@@ -92,7 +92,7 @@ void CIrrDeviceStub::createGUIAndScene()
        GUIEnvironment = gui::createGUIEnvironment(FileSystem, VideoDriver, Operator);\r
 \r
        // create Scene manager\r
-       SceneManager = scene::createSceneManager(VideoDriver, FileSystem, CursorControl, GUIEnvironment);\r
+       SceneManager = scene::createSceneManager(VideoDriver, FileSystem, CursorControl);\r
 \r
        setEventReceiver(UserReceiver);\r
 }\r

diff --git a/source/Irrlicht/CIrrDeviceStub.h b/source/Irrlicht/CIrrDeviceStub.h
index 5b7d92ff589b234f43391a1831cabebd8b824fc6..fd069b1a1f65caee5f15749ccd633431ce805240 100644 (file)
--- a/source/Irrlicht/CIrrDeviceStub.h
+++ b/source/Irrlicht/CIrrDeviceStub.h
@@ -24,8 +24,7 @@ namespace irr
 \r
        namespace scene\r
        {\r
-               ISceneManager* createSceneManager(video::IVideoDriver* driver,\r
-                       io::IFileSystem* fs, gui::ICursorControl* cc, gui::IGUIEnvironment *gui);\r
+               ISceneManager* createSceneManager(video::IVideoDriver* driver, io::IFileSystem* fs, gui::ICursorControl* cc);\r
        }\r
 \r
        namespace io\r

diff --git a/source/Irrlicht/CSceneManager.cpp b/source/Irrlicht/CSceneManager.cpp
index 440a44ddeea9a2487cc15e278c67b71d37b7ded8..568c754359a9b9bd99594e665d860bdacd9fe758 100644 (file)
--- a/source/Irrlicht/CSceneManager.cpp
+++ b/source/Irrlicht/CSceneManager.cpp
@@ -34,9 +34,8 @@ namespace scene
 \r
 //! constructor\r
 CSceneManager::CSceneManager(video::IVideoDriver* driver, io::IFileSystem* fs,\r
-               gui::ICursorControl* cursorControl, IMeshCache* cache,\r
-               gui::IGUIEnvironment* gui)\r
-: ISceneNode(0, 0), Driver(driver), FileSystem(fs), GUIEnvironment(gui),\r
+               gui::ICursorControl* cursorControl, IMeshCache* cache)\r
+: ISceneNode(0, 0), Driver(driver), FileSystem(fs),\r
        CursorControl(cursorControl),\r
        ActiveCamera(0), ShadowColor(150,0,0,0), AmbientLight(0,0,0,0), Parameters(0),\r
        MeshCache(cache), CurrentRenderPass(ESNRP_NONE)\r
@@ -58,9 +57,6 @@ CSceneManager::CSceneManager(video::IVideoDriver* driver, io::IFileSystem* fs,
        if (CursorControl)\r
                CursorControl->grab();\r
 \r
-       if (GUIEnvironment)\r
-               GUIEnvironment->grab();\r
-\r
        // create mesh cache if not there already\r
        if (!MeshCache)\r
                MeshCache = new CMeshCache();\r
@@ -105,9 +101,6 @@ CSceneManager::~CSceneManager()
        if (CollisionManager)\r
                CollisionManager->drop();\r
 \r
-       if (GUIEnvironment)\r
-               GUIEnvironment->drop();\r
-\r
        u32 i;\r
        for (i=0; i<MeshLoaderList.size(); ++i)\r
                MeshLoaderList[i]->drop();\r
@@ -209,12 +202,6 @@ video::IVideoDriver* CSceneManager::getVideoDriver()
 }\r
 \r
 \r
-//! returns the GUI Environment\r
-gui::IGUIEnvironment* CSceneManager::getGUIEnvironment()\r
-{\r
-       return GUIEnvironment;\r
-}\r
-\r
 //! Get the active FileSystem\r
 /** \return Pointer to the FileSystem\r
 This pointer should not be dropped. See IReferenceCounted::drop() for more information. */\r
@@ -888,7 +875,7 @@ IMeshCache* CSceneManager::getMeshCache()
 //! Creates a new scene manager.\r
 ISceneManager* CSceneManager::createNewSceneManager(bool cloneContent)\r
 {\r
-       CSceneManager* manager = new CSceneManager(Driver, FileSystem, CursorControl, MeshCache, GUIEnvironment);\r
+       CSceneManager* manager = new CSceneManager(Driver, FileSystem, CursorControl, MeshCache);\r
 \r
        if (cloneContent)\r
                manager->cloneMembers(this, manager);\r
@@ -926,10 +913,9 @@ IMeshWriter* CSceneManager::createMeshWriter(EMESH_WRITER_TYPE type)
 \r
 // creates a scenemanager\r
 ISceneManager* createSceneManager(video::IVideoDriver* driver,\r
-               io::IFileSystem* fs, gui::ICursorControl* cursorcontrol,\r
-               gui::IGUIEnvironment *guiEnvironment)\r
+               io::IFileSystem* fs, gui::ICursorControl* cursorcontrol)\r
 {\r
-       return new CSceneManager(driver, fs, cursorcontrol, 0, guiEnvironment );\r
+       return new CSceneManager(driver, fs, cursorcontrol, nullptr);\r
 }\r
 \r
 \r

diff --git a/source/Irrlicht/CSceneManager.h b/source/Irrlicht/CSceneManager.h
index caf9dbeafc6d830441d080d01efacd64c7c8d952..1a749954677b485c76ad6e9dcea23a64c2bb67d3 100644 (file)
--- a/source/Irrlicht/CSceneManager.h
+++ b/source/Irrlicht/CSceneManager.h
@@ -32,8 +32,7 @@ namespace scene
 \r
                //! constructor\r
                CSceneManager(video::IVideoDriver* driver, io::IFileSystem* fs,\r
-                       gui::ICursorControl* cursorControl, IMeshCache* cache = 0,\r
-                       gui::IGUIEnvironment *guiEnvironment = 0);\r
+                       gui::ICursorControl* cursorControl, IMeshCache* cache = nullptr);\r
 \r
                //! destructor\r
                virtual ~CSceneManager();\r
@@ -50,9 +49,6 @@ namespace scene
                //! returns the video driver\r
                video::IVideoDriver* getVideoDriver() override;\r
 \r
-               //! return the gui environment\r
-               gui::IGUIEnvironment* getGUIEnvironment() override;\r
-\r
                //! return the filesystem\r
                io::IFileSystem* getFileSystem() override;\r
 \r
@@ -285,9 +281,6 @@ namespace scene
                //! file system\r
                io::IFileSystem* FileSystem;\r
 \r
-               //! GUI Enviroment ( Debug Purpose )\r
-               gui::IGUIEnvironment* GUIEnvironment;\r
-\r
                //! cursor control\r
                gui::ICursorControl* CursorControl;\r
 \r