BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'Networking' of github.com:teamfisk/TacticalZ into Networking

Browse Source
This commit is contained in:
Jocke
2015-12-08 16:42:32 +01:00
parent 94adaf8ae3 27b44d2511
commit d1880754f5
4 changed files with 47 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Game/Game.cpp
+12 -9
View File
@@ -39,7 +39,8 @@ Game::Game(int argc, char* argv[])
m_World = new HardcodedTestWorld();
// TEMP: Invoke network
boost::thread workerThread(&Game::NetworkFunction, this);
boost::thread workerThread(&Game::NetworkFunction, this);
m_LastTime = glfwGetTime();
}
@@ -59,11 +60,13 @@ void Game::Tick()
m_EventBroker->Swap();
m_InputManager->Update(dt);
m_Renderer->Update(dt);
m_EventBroker->Swap();
m_RenderQueueFactory->Update(m_World);
// DO SYSTEM SHIT HERE
m_EventBroker->Process<Client>();
m_Renderer->Update(dt);
m_RenderQueueFactory->Update(m_World);
m_Renderer->Draw(m_RenderQueueFactory->RenderQueues());
m_EventBroker->Swap();
@@ -74,12 +77,12 @@ void Game::Tick()
void Game::NetworkFunction()
{
std::string inputMessage;
std::cout << "Start client or server? (c/s)" << std::endl;
std::cin >> inputMessage;
if (inputMessage == "c" || inputMessage == "C") {
m_Client.Start();
}
std::string inputMessage;
std::cout << "Start client or server? (c/s)" << std::endl;
std::cin >> inputMessage;
if (inputMessage == "c" || inputMessage == "C") {
m_Client.Start(m_EventBroker);
}
if (inputMessage == "s" || inputMessage == "S") {
m_Server.Start(m_World);
}