WIP trying to get Eventsystem to work in client.

include/Engine/Network/Client.h

@@ -10,6 +10,8 @@
 
 #include "Network/MessageType.h"
 #include "Network/NetworkDefines.h"
+#include "Core/EventBroker.h"
+#include "Core/EKeyDown.h"
 
 
 class Client
@@ -17,7 +19,7 @@ class Client
 public:
 	Client();
 	~Client();
-	void Start();
+	void Start(EventBroker* eventBroker);
     void Close();
 
 private:
@@ -54,6 +56,11 @@ private:
 	bool m_ShouldDrawGameBoard = true;
 	std::string m_PlayerName;
     bool m_ThreadIsRunning = true;
+
+	// Events
+	EventBroker* m_EventBroker;
+	EventRelay<Client, Events::KeyDown> m_EKeyDown;
+	bool OnKeyDown(const Events::KeyDown &e);
 };
 
 #endif

include/Game/Game.h

@@ -37,6 +37,8 @@ private:
 
     // Network methods
     void NetworkFunction();
+	// Network events
+	EventRelay<Client, Events::KeyDown> m_EKeyDown;
 
 };
 

src/Engine/Network/Client.cpp

@@ -5,9 +5,12 @@ using namespace boost::asio::ip;
 
 Client::Client() : m_Socket(m_IOService)
 {
+	//m_EventBroker = eventBroker;
 	// Set up network stream
 	m_ReceiverEndpoint = udp::endpoint(boost::asio::ip::address::from_string("192.168.1.6"), 13);
-	//Start(); // All logic happens here
+	
+
+	//EVENT_SUBSCRIBE_MEMBER(m_EKeyDown, &Client::OnKeyDown);
 }
 
 Client::~Client()
@@ -15,8 +18,12 @@ Client::~Client()
 
 }
 
-void Client::Start()
+void Client::Start(EventBroker* eventBroker)
 {
+	// Subscribe to events
+	m_EventBroker = eventBroker;
+	m_EKeyDown = decltype(m_EKeyDown)(std::bind(&Client::OnKeyDown, this, std::placeholders::_1));
+	m_EventBroker->Subscribe(m_EKeyDown);
 	std::cout << "Please enter you name: ";
 	std::cin >> m_PlayerName;
 	while (m_PlayerName.size() > 7) {
@@ -91,7 +98,7 @@ void Client::DisplayLoop()
 			}
 		}
 		if (m_ShouldDrawGameBoard)
-			DrawBoard();
+			//DrawBoard();
 		boost::this_thread::sleep(boost::posix_time::millisec(100));
 	}
 }
@@ -331,4 +338,10 @@ void Client::SendInput()
 
 	memset(dataPackage, 0, INPUTSIZE);
 	delete[] dataPackage;
+}
+
+bool Client::OnKeyDown(const Events::KeyDown& event)
+{
+	std::cout << event.KeyCode;
+	return true;
 }

src/Game/Game.cpp

@@ -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();
 }
@@ -56,6 +57,7 @@ void Game::Tick()
 	double currentTime = glfwGetTime();
 	double dt = currentTime - m_LastTime;
 	m_LastTime = currentTime;
+	m_EventBroker->Process<Client>();
 
 	m_EventBroker->Swap();
 	m_InputManager->Update(dt);
@@ -74,10 +76,10 @@ 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);
+	}
 }