Scene

anki/scene/Scene.cpp

@@ -1,171 +1,50 @@
-#include <boost/foreach.hpp>
-#include <algorithm>
-#include "anki/util/Exception.h"
 #include "anki/scene/Scene.h"
+#include "anki/util/Exception.h"
 #include "anki/scene/VisibilityTester.h"
 
-#include "anki/scene/Camera.h"
-#include "anki/scene/Light.h"
-#include "anki/scene/Controller.h"
-#include "anki/resource/Material.h"
-#include "anki/scene/ParticleEmitterNode.h"
-#include "anki/scene/ModelNode.h"
-#include "anki/scene/SkinNode.h"
-
 
 namespace anki {
 
 
 //==============================================================================
-// Constructors & destructor                                                   =
-//==============================================================================
-
 Scene::Scene()
 {
 	ambientCol = Vec3(0.1, 0.05, 0.05) * 4;
-	//sunPos = Vec3(0.0, 1.0, -1.0) * 50.0;
 
-	physPhysWorld.reset(new PhysWorld);
-	visibilityTester.reset(new VisibilityTester(*this));
+	//physPhysWorld.reset(new PhysWorld);
+	//visibilityTester.reset(new VisibilityTester(*this));
 }
 
 
+//==============================================================================
 Scene::~Scene()
 {}
 
 
-//==============================================================================
-// registerNode                                                                =
 //==============================================================================
 void Scene::registerNode(SceneNode* node)
 {
-	putBackNode(nodes, node);
-	
-	switch(node->getSceneNodeType())
+	if(nodeExists(node->getName().c_str()))
 	{
-		case SceneNode::SNT_LIGHT:
-			putBackNode(lights, static_cast<Light*>(node));
-			break;
-		case SceneNode::SNT_CAMERA:
-			putBackNode(cams, static_cast<Camera*>(node));
-			break;
-		case SceneNode::SNT_PARTICLE_EMITTER_NODE:
-			putBackNode(particleEmitterNodes,
-				static_cast<ParticleEmitterNode*>(node));
-			break;
-		case SceneNode::SNT_MODEL_NODE:
-			putBackNode(modelNodes, static_cast<ModelNode*>(node));
-			break;
-		case SceneNode::SNT_SKIN_NODE:
-			putBackNode(skinNodes, static_cast<SkinNode*>(node));
-			break;
-		case SceneNode::SNT_RENDERABLE_NODE:
-		case SceneNode::SNT_GHOST_NODE:
-			break;
-	};
-}
-
-
-//==============================================================================
-// unregisterNode                                                              =
-//==============================================================================
-void Scene::unregisterNode(SceneNode* node)
-{
-	eraseNode(nodes, node);
-	
-	switch(node->getSceneNodeType())
-	{
-		case SceneNode::SNT_LIGHT:
-			eraseNode(lights, static_cast<Light*>(node));
-			break;
-		case SceneNode::SNT_CAMERA:
-			eraseNode(cams, static_cast<Camera*>(node));
-			break;
-		case SceneNode::SNT_PARTICLE_EMITTER_NODE:
-			eraseNode(particleEmitterNodes,
-				static_cast<ParticleEmitterNode*>(node));
-			break;
-		case SceneNode::SNT_MODEL_NODE:
-			eraseNode(modelNodes, static_cast<ModelNode*>(node));
-			break;
-		case SceneNode::SNT_SKIN_NODE:
-			eraseNode(skinNodes, static_cast<SkinNode*>(node));
-			break;
-		case SceneNode::SNT_RENDERABLE_NODE:
-		case SceneNode::SNT_GHOST_NODE:
-			break;
-	};
-}
-
-
-//==============================================================================
-// Register and Unregister controllers                                         =
-//==============================================================================
-void Scene::registerController(Controller* controller)
-{
-	ANKI_ASSERT(std::find(controllers.begin(), controllers.end(), controller) ==
-		controllers.end());
-	controllers.push_back(controller);
-}
+		throw ANKI_EXCEPTION("Scene node already exists: " + node.getName());
+	}
 
-void Scene::unregisterController(Controller* controller)
-{
-	std::vector<Controller*>::iterator it = std::find(controllers.begin(),
-		controllers.end(), controller);
-	ANKI_ASSERT(it != controllers.end());
-	controllers.erase(it);
+	nodes.push_back(node);
+	nameToNode[node->getName().c_str()] = node;
 }
 
 
 //==============================================================================
-// updateAllWorldStuff                                                         =
-//==============================================================================
-void Scene::updateAllWorldStuff(float prevUpdateTime, float crntTime)
+void Scene::unregisterNode(SceneNode* node)
 {
-	ANKI_ASSERT(nodes.size() <= 1024);
-	boost::array<SceneNode*, 1024> queue;
-	uint head = 0, tail = 0;
-	uint num = 0;
-
-
-	// put the roots
-	BOOST_FOREACH(SceneNode* node, nodes)
-	{
-		if(node->getParent() == NULL)
-		{
-			queue[tail++] = node; // queue push
-		}
-	}
-
-	// loop
-	while(head != tail) // while queue not empty
+	Types<SceneNode>::Iterator it;
+	for(it : nodes)
 	{
-		SceneNode* pnode = queue[head++]; // queue pop
-
-		pnode->updateWorldTransform();
-		pnode->frameUpdate(prevUpdateTime, crntTime);
-		pnode->moveUpdate();
-		++num;
-
-		BOOST_FOREACH(SceneNode* node, pnode->getChildren())
+		if(*it == node)
 		{
-			queue[tail++] = node;
+			break;
 		}
 	}
-
-	ANKI_ASSERT(num == nodes.size());
-}
-
-
-//==============================================================================
-// updateAllControllers                                                        =
-//==============================================================================
-void Scene::updateAllControllers()
-{
-	BOOST_FOREACH(Controller* ctl, controllers)
-	{
-		ctl->update(0.0);
-	}
 }
 
 

anki/scene/Scene.h

@@ -25,6 +25,8 @@ public:
 		typedef boost::iterator_range<ConstIterator> ConstRange;
 	};
 
+	typedef ConstCharPtrHashMap<SceneNode*>::Type NameToSceneNodeMap;
+
 	/// @name Constructors/Destructor
 	/// @{
 	Scene();
@@ -67,6 +69,11 @@ public:
 	}
 	/// @}
 
+	bool nodeExists(const char* name) const
+	{
+		return nameToNode.find(name) != nameToNode.end();
+	}
+
 private:
 	/// @name Containers of scene's data
 	/// @{
@@ -77,6 +84,8 @@ private:
 	Types<Frustumable>::Container frustumables;
 	/// @}
 
+	NameToSceneNodeMap nameToNode;
+
 	Vec3 ambientCol; ///< The global ambient color
 };