Drop obsolete configuration macros

[irrlicht.git] / source / Irrlicht / CSceneManager.cpp

diff --git a/source/Irrlicht/CSceneManager.cpp b/source/Irrlicht/CSceneManager.cpp
index 664e672d082100eba18c5b99516c9609752a1b95..b664c7720a7110c2c350a65bce4d9035da15c911 100644 (file)
--- a/source/Irrlicht/CSceneManager.cpp
+++ b/source/Irrlicht/CSceneManager.cpp
@@ -15,27 +15,11 @@
 \r
 #include "os.h"\r
 \r
-// We need this include for the case of skinned mesh support without\r
-// any such loader\r
-#ifdef _IRR_COMPILE_WITH_SKINNED_MESH_SUPPORT_\r
 #include "CSkinnedMesh.h"\r
-#endif\r
-\r
-#ifdef _IRR_COMPILE_WITH_X_LOADER_\r
 #include "CXMeshFileLoader.h"\r
-#endif\r
-\r
-#ifdef _IRR_COMPILE_WITH_OBJ_LOADER_\r
 #include "COBJMeshFileLoader.h"\r
-#endif\r
-\r
-#ifdef _IRR_COMPILE_WITH_B3D_LOADER_\r
 #include "CB3DMeshFileLoader.h"\r
-#endif\r
-\r
-#ifdef _IRR_COMPILE_WITH_BILLBOARD_SCENENODE_\r
 #include "CBillboardSceneNode.h"\r
-#endif // _IRR_COMPILE_WITH_BILLBOARD_SCENENODE_\r
 #include "CAnimatedMeshSceneNode.h"\r
 #include "CCameraSceneNode.h"\r
 #include "CMeshSceneNode.h"\r
@@ -96,15 +80,9 @@ 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
-       #ifdef _IRR_COMPILE_WITH_X_LOADER_\r
        MeshLoaderList.push_back(new CXMeshFileLoader(this, FileSystem));\r
-       #endif\r
-       #ifdef _IRR_COMPILE_WITH_OBJ_LOADER_\r
        MeshLoaderList.push_back(new COBJMeshFileLoader(this, FileSystem));\r
-       #endif\r
-       #ifdef _IRR_COMPILE_WITH_B3D_LOADER_\r
        MeshLoaderList.push_back(new CB3DMeshFileLoader(this));\r
-       #endif\r
 }\r
 \r
 \r
@@ -316,7 +294,6 @@ IBillboardSceneNode* CSceneManager::addBillboardSceneNode(ISceneNode* parent,
        video::SColor colorTop, video::SColor colorBottom\r
        )\r
 {\r
-#ifdef _IRR_COMPILE_WITH_BILLBOARD_SCENENODE_\r
        if (!parent)\r
                parent = this;\r
 \r
@@ -325,9 +302,6 @@ IBillboardSceneNode* CSceneManager::addBillboardSceneNode(ISceneNode* parent,
        node->drop();\r
 \r
        return node;\r
-#else\r
-       return 0;\r
-#endif\r
 }\r
 \r
 \r
@@ -971,49 +945,12 @@ const video::SColorf& CSceneManager::getAmbientLight() const
 //! Get a skinned mesh, which is not available as header-only code\r
 ISkinnedMesh* CSceneManager::createSkinnedMesh()\r
 {\r
-#ifdef _IRR_COMPILE_WITH_SKINNED_MESH_SUPPORT_\r
        return new CSkinnedMesh();\r
-#else\r
-       return 0;\r
-#endif\r
 }\r
 \r
 //! Returns a mesh writer implementation if available\r
 IMeshWriter* CSceneManager::createMeshWriter(EMESH_WRITER_TYPE type)\r
 {\r
-       switch(type)\r
-       {\r
-       case EMWT_IRR_MESH:\r
-       case EMWT_COLLADA:\r
-               return 0;\r
-       case EMWT_STL:\r
-#ifdef _IRR_COMPILE_WITH_STL_WRITER_\r
-               return new CSTLMeshWriter(this);\r
-#else\r
-               return 0;\r
-#endif\r
-       case EMWT_OBJ:\r
-#ifdef _IRR_COMPILE_WITH_OBJ_WRITER_\r
-               return new COBJMeshWriter(this, FileSystem);\r
-#else\r
-               return 0;\r
-#endif\r
-\r
-       case EMWT_PLY:\r
-#ifdef _IRR_COMPILE_WITH_PLY_WRITER_\r
-               return new CPLYMeshWriter();\r
-#else\r
-               return 0;\r
-#endif\r
-\r
-       case EMWT_B3D:\r
-#ifdef _IRR_COMPILE_WITH_B3D_WRITER_\r
-               return new CB3DMeshWriter();\r
-#else\r
-               return 0;\r
-#endif\r
-       }\r
-\r
        return 0;\r
 }\r
 \r