Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch

2015-10-20 11:53:05 +02:00
parent b38fdf2183 dd6c5443eb
commit b4f098c80d
30 changed files with 1422 additions and 27 deletions
@@ -206,6 +206,7 @@ public:
 		m_World->ComponentFactory.Register<Components::ParticleEmitter>();
 		m_World->Initialize();

+		//auto particleEmitter= m_World->AddComponent<Components::Emitter>(Pe);
 		//EVENT_SUBSCRIBE_MEMBER(m_EGameStart, &Engine::OnGameStart);
 		m_EGameStart = decltype(m_EGameStart)(std::bind(&Engine::OnGameStart, this, std::placeholders::_1));
 		m_EventBroker->Subscribe(m_EGameStart);