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

Added a class that client and server inherits from.

Browse Source 
Class and server now share the same pointer i game.
You are now able to start a client and a server on the same computer.
This commit is contained in:
Jocke
2015-12-16 14:56:53 +01:00
parent a2d55feed1
commit 58a9d38e26
7 changed files with 64 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Game/Game.cpp
+24 -16
View File
@@ -20,7 +20,7 @@ Game::Game(int argc, char* argv[])
m_Renderer = new Renderer(m_EventBroker);
m_Renderer->SetFullscreen(m_Config->Get<bool>("Video.Fullscreen", false));
m_Renderer->SetVSYNC(m_Config->Get<bool>("Video.VSYNC", false));
m_Renderer->SetResolution(Rectangle::Rectangle(
m_Renderer->SetResolution(Rectangle::Rectangle(
0,
0,
m_Config->Get<int>("Video.Width", 1280),
@@ -53,9 +53,9 @@ Game::Game(int argc, char* argv[])
m_SystemPipeline->AddSystem<RaptorCopterSystem>();
m_SystemPipeline->AddSystem<PlayerSystem>();
m_SystemPipeline->AddSystem<EditorSystem>();
// Invoke network
if(m_Config->Get<bool>("Networking.StartNetwork", false) == true)
boost::thread workerThread(&Game::NetworkFunction, this);
// Invoke network
if (m_Config->Get<bool>("Networking.StartNetwork", false) == true)
boost::thread workerThread(&Game::NetworkFunction, this);
m_LastTime = glfwGetTime();
debugInitialize();
@@ -90,7 +90,9 @@ void Game::Tick()
m_EventBroker->Swap();
// Update network
m_IsClient ? m_Client.Update() : m_Server.Update();
if (m_IsClientOrServer)
m_ClientOrServer->Update();
// Iterate through systems and update world!
m_SystemPipeline->Update(m_World, dt);
@@ -133,16 +135,22 @@ void Game::debugTick(double dt)
}
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_IsClient = true;
m_Client.Start(m_World, m_EventBroker);
}
if (inputMessage == "s" || inputMessage == "S") {
m_IsClient = false;
m_Server.Start(m_World, m_EventBroker);
{
std::string inputMessage;
std::cout << "Start client or server? (c/s)" << std::endl;
std::cin >> inputMessage;
if (inputMessage == "c" || inputMessage == "C") {
m_IsClientOrServer = true;
m_ClientOrServer = new Client();
}
if (inputMessage == "s" || inputMessage == "S") {
m_IsClientOrServer = true;
m_ClientOrServer = new Server();
}
m_ClientOrServer->Start(m_World, m_EventBroker);
// I don't think we are reaching this part of the code right now.
// When server or client is done set it to false.
m_IsClientOrServer = false;
// Destroy it! (with fire)
delete m_ClientOrServer;
}