Drop IrrCompileConfig (#163)

1 files changed, 2 insertions, 96 deletions

diff --git a/source/Irrlicht/CSceneManager.cpp b/source/Irrlicht/CSceneManager.cpp
index 664e672..e22ddd5 100644
--- a/source/Irrlicht/CSceneManager.cpp
+++ b/source/Irrlicht/CSceneManager.cpp
@@ -2,7 +2,6 @@
 // This file is part of the "Irrlicht Engine".

 // For conditions of distribution and use, see copyright notice in irrlicht.h

 

-#include "IrrCompileConfig.h"

 #include "CSceneManager.h"

 #include "IVideoDriver.h"

 #include "IFileSystem.h"

@@ -15,27 +14,11 @@
 

 #include "os.h"

 

-// We need this include for the case of skinned mesh support without

-// any such loader

-#ifdef _IRR_COMPILE_WITH_SKINNED_MESH_SUPPORT_

 #include "CSkinnedMesh.h"

-#endif

-

-#ifdef _IRR_COMPILE_WITH_X_LOADER_

 #include "CXMeshFileLoader.h"

-#endif

-

-#ifdef _IRR_COMPILE_WITH_OBJ_LOADER_

 #include "COBJMeshFileLoader.h"

-#endif

-

-#ifdef _IRR_COMPILE_WITH_B3D_LOADER_

 #include "CB3DMeshFileLoader.h"

-#endif

-

-#ifdef _IRR_COMPILE_WITH_BILLBOARD_SCENENODE_

 #include "CBillboardSceneNode.h"

-#endif // _IRR_COMPILE_WITH_BILLBOARD_SCENENODE_

 #include "CAnimatedMeshSceneNode.h"

 #include "CCameraSceneNode.h"

 #include "CMeshSceneNode.h"

@@ -96,15 +79,9 @@ CSceneManager::CSceneManager(video::IVideoDriver* driver, io::IFileSystem* fs,
 	// TODO: now that we have multiple scene managers, these should be

 	// shallow copies from the previous manager if there is one.

 

-	#ifdef _IRR_COMPILE_WITH_X_LOADER_

 	MeshLoaderList.push_back(new CXMeshFileLoader(this, FileSystem));

-	#endif

-	#ifdef _IRR_COMPILE_WITH_OBJ_LOADER_

 	MeshLoaderList.push_back(new COBJMeshFileLoader(this, FileSystem));

-	#endif

-	#ifdef _IRR_COMPILE_WITH_B3D_LOADER_

 	MeshLoaderList.push_back(new CB3DMeshFileLoader(this));

-	#endif

 }

 

 

@@ -316,7 +293,6 @@ IBillboardSceneNode* CSceneManager::addBillboardSceneNode(ISceneNode* parent,
 	video::SColor colorTop, video::SColor colorBottom

 	)

 {

-#ifdef _IRR_COMPILE_WITH_BILLBOARD_SCENENODE_

 	if (!parent)

 		parent = this;

 

@@ -325,9 +301,6 @@ IBillboardSceneNode* CSceneManager::addBillboardSceneNode(ISceneNode* parent,
 	node->drop();

 

 	return node;

-#else

-	return 0;

-#endif

 }

 

 

@@ -575,17 +548,6 @@ u32 CSceneManager::registerNodeForRendering(ISceneNode* node, E_SCENE_NODE_RENDE
 		break;

 	}

 

-#ifdef _IRR_SCENEMANAGER_DEBUG

-	s32 index = Parameters->findAttribute("calls");

-	Parameters->setAttribute(index, Parameters->getAttributeAsInt(index)+1);

-

-	if (!taken)

-	{

-		index = Parameters->findAttribute("culled");

-		Parameters->setAttribute(index, Parameters->getAttributeAsInt(index)+1);

-	}

-#endif

-

 	return taken;

 }

 

@@ -606,15 +568,6 @@ void CSceneManager::drawAll()
 	if (!Driver)

 		return;

 

-#ifdef _IRR_SCENEMANAGER_DEBUG

-	// reset attributes

-	Parameters->setAttribute("culled", 0);

-	Parameters->setAttribute("calls", 0);

-	Parameters->setAttribute("drawn_solid", 0);

-	Parameters->setAttribute("drawn_transparent", 0);

-	Parameters->setAttribute("drawn_transparent_effect", 0);

-#endif

-

 	u32 i; // new ISO for scoping problem in some compilers

 

 	// reset all transforms

@@ -676,9 +629,6 @@ void CSceneManager::drawAll()
 		for (i=0; i<SolidNodeList.size(); ++i)

 			SolidNodeList[i].Node->render();

 

-#ifdef _IRR_SCENEMANAGER_DEBUG

-		Parameters->setAttribute("drawn_solid", (s32) SolidNodeList.size() );

-#endif

 		SolidNodeList.set_used(0);

 	}

 

@@ -691,9 +641,6 @@ void CSceneManager::drawAll()
 		for (i=0; i<TransparentNodeList.size(); ++i)

 			TransparentNodeList[i].Node->render();

 

-#ifdef _IRR_SCENEMANAGER_DEBUG

-		Parameters->setAttribute ( "drawn_transparent", (s32) TransparentNodeList.size() );

-#endif

 		TransparentNodeList.set_used(0);

 	}

 

@@ -706,9 +653,7 @@ void CSceneManager::drawAll()
 

 		for (i=0; i<TransparentEffectNodeList.size(); ++i)

 			TransparentEffectNodeList[i].Node->render();

-#ifdef _IRR_SCENEMANAGER_DEBUG

-		Parameters->setAttribute("drawn_transparent_effect", (s32) TransparentEffectNodeList.size());

-#endif

+

 		TransparentEffectNodeList.set_used(0);

 	}

 

@@ -719,9 +664,7 @@ void CSceneManager::drawAll()
 

 		for (i=0; i<GuiNodeList.size(); ++i)

 			GuiNodeList[i]->render();

-#ifdef _IRR_SCENEMANAGER_DEBUG

-		Parameters->setAttribute("drawn_gui_nodes", (s32) GuiNodeList.size());

-#endif

+

 		GuiNodeList.set_used(0);

 	}

 	clearDeletionList();

@@ -971,49 +914,12 @@ const video::SColorf& CSceneManager::getAmbientLight() const
 //! Get a skinned mesh, which is not available as header-only code

 ISkinnedMesh* CSceneManager::createSkinnedMesh()

 {

-#ifdef _IRR_COMPILE_WITH_SKINNED_MESH_SUPPORT_

 	return new CSkinnedMesh();

-#else

-	return 0;

-#endif

 }

 

 //! Returns a mesh writer implementation if available

 IMeshWriter* CSceneManager::createMeshWriter(EMESH_WRITER_TYPE type)

 {

-	switch(type)

-	{

-	case EMWT_IRR_MESH:

-	case EMWT_COLLADA:

-		return 0;

-	case EMWT_STL:

-#ifdef _IRR_COMPILE_WITH_STL_WRITER_

-		return new CSTLMeshWriter(this);

-#else

-		return 0;

-#endif

-	case EMWT_OBJ:

-#ifdef _IRR_COMPILE_WITH_OBJ_WRITER_

-		return new COBJMeshWriter(this, FileSystem);

-#else

-		return 0;

-#endif

-

-	case EMWT_PLY:

-#ifdef _IRR_COMPILE_WITH_PLY_WRITER_

-		return new CPLYMeshWriter();

-#else

-		return 0;

-#endif

-

-	case EMWT_B3D:

-#ifdef _IRR_COMPILE_WITH_B3D_WRITER_

-		return new CB3DMeshWriter();

-#else

-		return 0;

-#endif

-	}

-

 	return 0;

 }