From 48339934b6e2aa50dfc97ba9ee662a469cc774e4 Mon Sep 17 00:00:00 2001 From: stiffly Date: Mon, 7 Dec 2015 14:32:49 +0100 Subject: [PATCH 1/3] Created skeleton for Server/Client logic. --- include/Engine/Networking/Client.h | 15 +++++++++++++++ include/Engine/Networking/Server.h | 13 +++++++++++++ src/Engine/Networking/Client.cpp | 11 +++++++++++ src/Engine/Networking/Server.cpp | 11 +++++++++++ 4 files changed, 50 insertions(+) create mode 100644 include/Engine/Networking/Client.h create mode 100644 include/Engine/Networking/Server.h create mode 100644 src/Engine/Networking/Client.cpp create mode 100644 src/Engine/Networking/Server.cpp diff --git a/include/Engine/Networking/Client.h b/include/Engine/Networking/Client.h new file mode 100644 index 00000000..af7c9072 --- /dev/null +++ b/include/Engine/Networking/Client.h @@ -0,0 +1,15 @@ +#ifndef Client_h__ +#define Client_h__ + +#include + +class Client +{ + Client(); + ~Client(); + + +}; + +#endif + diff --git a/include/Engine/Networking/Server.h b/include/Engine/Networking/Server.h new file mode 100644 index 00000000..bb198b7e --- /dev/null +++ b/include/Engine/Networking/Server.h @@ -0,0 +1,13 @@ +#ifndef Server_h__ +#define Server_h__ + +#include + +class Server +{ + Server(); + ~Server(); +}; + +#endif + diff --git a/src/Engine/Networking/Client.cpp b/src/Engine/Networking/Client.cpp new file mode 100644 index 00000000..71b7ef67 --- /dev/null +++ b/src/Engine/Networking/Client.cpp @@ -0,0 +1,11 @@ +#include "Networking\Client.h" + +Client::Client() +{ + +} + +Client::~Client() +{ + +} diff --git a/src/Engine/Networking/Server.cpp b/src/Engine/Networking/Server.cpp new file mode 100644 index 00000000..5061084c --- /dev/null +++ b/src/Engine/Networking/Server.cpp @@ -0,0 +1,11 @@ +#include "Networking\Server.h" + +Server::Server() +{ + +} + +Server::~Server() +{ + +} From dbac9a96691842aea4b3ddd81b6569151dc0e419 Mon Sep 17 00:00:00 2001 From: stiffly Date: Mon, 7 Dec 2015 15:03:03 +0100 Subject: [PATCH 2/3] Added filter to CMakeLists.txt. --- src/Engine/CMakeLists.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/Engine/CMakeLists.txt b/src/Engine/CMakeLists.txt index c5067d10..70f3e7f9 100644 --- a/src/Engine/CMakeLists.txt +++ b/src/Engine/CMakeLists.txt @@ -46,6 +46,12 @@ file(GLOB SOURCE_FILES_Input ) source_group(Input FILES ${SOURCE_FILES_Input}) +file(GLOB SOURCE_FILES_Networking + "${INCLUDE_PATH}/Networking/*.h" + "Networking/*.cpp" +) +source_group(Networking FILES ${SOURCE_FILES_Networking}) + file(GLOB SOURCE_FILES_Rendering "${INCLUDE_PATH}/Rendering/*.h" "Rendering/*.cpp" @@ -68,9 +74,11 @@ set(SOURCE_FILES ${SOURCE_FILES_Core} ${SOURCE_FILES_Core_Util} #${SOURCE_FILES_Input} + ${SOURCE_FILES_Networking} ${SOURCE_FILES_GUI} ${SOURCE_FILES_Rendering} ${SOURCE_FILES_Rendering_Util} + ) set(LIBRARIES From 6991a2be26935f2e08fb21c4b5e10f87694f2561 Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Mon, 7 Dec 2015 15:22:26 +0100 Subject: [PATCH 3/3] Renamed Networking -> Network --- include/Engine/{Networking => Network}/Client.h | 0 include/Engine/{Networking => Network}/Server.h | 0 src/Engine/CMakeLists.txt | 11 +++++------ src/Engine/{Networking => Network}/Client.cpp | 0 src/Engine/{Networking => Network}/Server.cpp | 0 5 files changed, 5 insertions(+), 6 deletions(-) rename include/Engine/{Networking => Network}/Client.h (100%) rename include/Engine/{Networking => Network}/Server.h (100%) rename src/Engine/{Networking => Network}/Client.cpp (100%) rename src/Engine/{Networking => Network}/Server.cpp (100%) diff --git a/include/Engine/Networking/Client.h b/include/Engine/Network/Client.h similarity index 100% rename from include/Engine/Networking/Client.h rename to include/Engine/Network/Client.h diff --git a/include/Engine/Networking/Server.h b/include/Engine/Network/Server.h similarity index 100% rename from include/Engine/Networking/Server.h rename to include/Engine/Network/Server.h diff --git a/src/Engine/CMakeLists.txt b/src/Engine/CMakeLists.txt index 70f3e7f9..de24b9cf 100644 --- a/src/Engine/CMakeLists.txt +++ b/src/Engine/CMakeLists.txt @@ -46,11 +46,11 @@ file(GLOB SOURCE_FILES_Input ) source_group(Input FILES ${SOURCE_FILES_Input}) -file(GLOB SOURCE_FILES_Networking - "${INCLUDE_PATH}/Networking/*.h" - "Networking/*.cpp" +file(GLOB SOURCE_FILES_Network + "${INCLUDE_PATH}/Network/*.h" + "Network/*.cpp" ) -source_group(Networking FILES ${SOURCE_FILES_Networking}) +source_group(Network FILES ${SOURCE_FILES_Network}) file(GLOB SOURCE_FILES_Rendering "${INCLUDE_PATH}/Rendering/*.h" @@ -74,11 +74,10 @@ set(SOURCE_FILES ${SOURCE_FILES_Core} ${SOURCE_FILES_Core_Util} #${SOURCE_FILES_Input} - ${SOURCE_FILES_Networking} + ${SOURCE_FILES_Network} ${SOURCE_FILES_GUI} ${SOURCE_FILES_Rendering} ${SOURCE_FILES_Rendering_Util} - ) set(LIBRARIES diff --git a/src/Engine/Networking/Client.cpp b/src/Engine/Network/Client.cpp similarity index 100% rename from src/Engine/Networking/Client.cpp rename to src/Engine/Network/Client.cpp diff --git a/src/Engine/Networking/Server.cpp b/src/Engine/Network/Server.cpp similarity index 100% rename from src/Engine/Networking/Server.cpp rename to src/Engine/Network/Server.cpp