Refactoring

src/Main.cpp

@@ -274,6 +274,8 @@ void mainLoopExtra()
 	if(InputSingleton::getInstance().getKey(SDL_SCANCODE_4)) mover = point_lights[1];
 	if(InputSingleton::getInstance().getKey(SDL_SCANCODE_5)) mover = spot_lights[1];
 	if(InputSingleton::getInstance().getKey(SDL_SCANCODE_6)) mover = imp;
+	if(InputSingleton::getInstance().getKey(SDL_SCANCODE_7)) mover =
+		SceneSingleton::getInstance().getParticleEmitterNodes()[0];
 	//if(InputSingleton::getInstance().getKey(SDL_SCANCODE_M) == 1) InputSingleton::getInstance().warpMouse = !InputSingleton::getInstance().warpMouse;
 
 	if(InputSingleton::getInstance().getKey(SDL_SCANCODE_A)) mover->moveLocalX(-dist);

src/Renderer/Dbg.cpp

@@ -290,7 +290,8 @@ void Dbg::run()
 				sceneDbgDrawer.drawLight(static_cast<const Light&>(*node));
 				break;
 			case SceneNode::SNT_PARTICLE_EMITTER:
-				sceneDbgDrawer.drawParticleEmitter(static_cast<const ParticleEmitterNode&>(*node));
+				sceneDbgDrawer.drawParticleEmitter(
+					static_cast<const ParticleEmitterNode&>(*node));
 				break;
 			case SceneNode::SNT_RENDERABLE:
 				/*if(showVisibilityBoundingShapesFlag)

src/Renderer/Drawers/SceneDbgDrawer.h

@@ -38,8 +38,10 @@ class SceneDbgDrawer
 	private:
 		Dbg& dbg; ///< The debug stage
 
-		virtual void drawPerspectiveCamera(const PerspectiveCamera& cam) const;
-		virtual void drawOrthographicCamera(const OrthographicCamera& cam) const;
+		virtual void drawPerspectiveCamera(const
+			PerspectiveCamera& cam) const;
+		virtual void drawOrthographicCamera(
+			const OrthographicCamera& cam) const;
 };
 
 

src/Scene/ParticleEmitterNode.cpp

@@ -68,19 +68,19 @@ void ParticleEmitterNode::init(const char* filename)
 
 	for(uint i = 0; i < maxNumOfParticles; i++)
 	{
-		ModelNode* md = new ModelNode(false, this);
+		/*ModelNode* md = new ModelNode(false, this);
 		md->init(modelName.c_str());
 		md->setLocalTransform(Transform(Vec3(Util::randFloat(i * 1.0)),
 			Mat3::getIdentity(), 1.0));
 
-		continue;
+		continue;*/
 
-		Particle* particle = new Particle(-1.0, this);
+		Particle* particle = new Particle(-1.0, NULL);
 		particle->init(modelName.c_str());
-		particle->setLocalTransform(Transform(Vec3(Util::randFloat(i * 1.0)),
-			Mat3::getIdentity(), 1.0));
+		/*particle->setLocalTransform(Transform(Vec3(Util::randFloat(i * 1.0)),
+			Mat3::getIdentity(), 1.0));*/
 
-		continue;
+		//continue;
 
 		particles.push_back(particle);
 
@@ -92,7 +92,7 @@ void ParticleEmitterNode::init(const char* filename)
 		init.mass = mass;
 		init.startTrf = toAnki(startingTrf);
 		init.shape = collShape.get();
-		init.sceneNode = NULL;
+		init.sceneNode = particle;
 		init.group = Phys::MasterContainer::CG_PARTICLE;
 		init.mask = Phys::MasterContainer::CG_ALL ^
 			Phys::MasterContainer::CG_PARTICLE;

src/Scene/Scene.cpp

@@ -135,13 +135,12 @@ void Scene::updateAllWorldStuff(float prevUpdateTime, float crntTime)
 	{
 		SceneNode* pnode = queue[head++]; // queue pop
 
-		if(pnode->getSceneNodeName() == "PerspectiveCamera:Camera:0")
+		/*if(pnode->getSceneNodeName() == "PerspectiveCamera:Camera:0")
 		{
 			INFO("Delete me");
 		}
 
-
-/*		if(pnode->getSceneNodeType() == SceneNode::SNT_PARTICLE_EMITTER)
+		if(pnode->getSceneNodeType() == SceneNode::SNT_PARTICLE_EMITTER)
 		{
 			INFO("Delete me");
 		}

src/Scene/Scene.h

@@ -55,7 +55,7 @@ class Scene
 		GETTER_RW(Types<Light>::Container, lights, getLights)
 		GETTER_RW(Types<Camera>::Container, cameras, getCameras)
 		GETTER_RW(Types<ParticleEmitterNode>::Container, particleEmitterNodes,
-			getParticleEmitters)
+			getParticleEmitterNodes)
 		GETTER_RW(Types<ModelNode>::Container, modelNodes, getModelNodes)
 		GETTER_RW(Types<SkinNode>::Container, skinNodes, getSkinNodes)
 		GETTER_RW(Types<Controller>::Container, controllers, getControllers)