restructure project

include/client/Client.h

@@ -1,17 +1,17 @@
 #pragma once
 
-#include "ClientConnexion.h"
+#include "client/ClientConnexion.h"
-#include "ClientGame.h"
+#include "client/game/ClientGame.h"
 
-#include "game/Team.h"
+#include "td/game/Team.h"
-#include "game/Player.h"
+#include "td/game/Player.h"
 
-#include "protocol/Protocol.h"
+#include "td/protocol/Protocol.h"
-#include "protocol/packets/SendMobsPacket.h"
+#include "td/protocol/packets/SendMobsPacket.h"
 
-#include "render/Renderer.h"
+#include "client/render/Renderer.h"
 
-#include "network/Network.h"
+#include "td/network/Network.h"
 
 namespace td {
 namespace client {

include/client/ClientConnexion.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include "protocol/PacketHandler.h"
+#include "td/protocol/PacketHandler.h"
-#include "network/TCPSocket.h"
+#include "td/network/TCPSocket.h"
-#include "game/Connexion.h"
+#include "td/network/Connexion.h"
 
 namespace td {
 namespace client {

include/client/game/ClientGame.h

@@ -1,13 +1,13 @@
 #pragma once
 
-#include "game/BaseGame.h"
+#include "td/game/BaseGame.h"
 
-#include "protocol/PacketHandler.h"
+#include "td/protocol/PacketHandler.h"
 
 #include "WorldClient.h"
 
-#include "render/WorldRenderer.h"
+#include "client/render/WorldRenderer.h"
-#include "render/Renderer.h"
+#include "client/render/Renderer.h"
 
 namespace td {
 namespace client {

include/client/game/WorldClient.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "game/World.h"
+#include "td/game/World.h"
-#include "protocol/PacketHandler.h"
+#include "td/protocol/PacketHandler.h"
 
 namespace td {
 namespace client {

include/client/render/Renderer.h

@@ -1,10 +1,10 @@
 #pragma once
 
-#include "Defines.h"
+#include "td/Defines.h"
 #include <memory>
 #include "loader/GLLoader.h"
-#include "render/shaders/WorldShader.h"
+#include "client/render/shaders/WorldShader.h"
-#include "render/shaders/EntityShader.h"
+#include "client/render/shaders/EntityShader.h"
 
 namespace td {
 namespace render {

include/client/render/VertexCache.h

@@ -2,7 +2,7 @@
 #include <cstdint>
 #include <memory>
 
-#include "render/loader/GLLoader.h"
+#include "client/render/loader/GLLoader.h"
 
 
 namespace td {

include/client/render/WorldRenderer.h

@@ -1,14 +1,14 @@
 #pragma once
 
-#include "game/World.h"
+#include "td/game/World.h"
 
-#include "render/Renderer.h"
+#include "client/render/Renderer.h"
-#include "render/VertexCache.h"
+#include "client/render/VertexCache.h"
 
-#include "render/gui/TowerPlacePopup.h"
+#include "client/render/gui/TowerPlacePopup.h"
-#include "render/gui/TowerUpgradePopup.h"
+#include "client/render/gui/TowerUpgradePopup.h"
-#include "render/gui/MobTooltip.h"
+#include "client/render/gui/MobTooltip.h"
-#include "render/gui/CastleTooltip.h"
+#include "client/render/gui/CastleTooltip.h"
 
 namespace td {
 

include/client/render/gui/ImGuiTeamColor.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "render/gui/imgui/imgui.h"
+#include "client/render/gui/imgui/imgui.h"
-#include "game/Team.h"
+#include "td/game/Team.h"
 
 namespace td {
 namespace render {

include/client/render/gui/MainMenu.h

@@ -4,7 +4,7 @@
 
 #include "imgui/imgui_filebrowser.h"
 
-#include "game/server/Server.h"
+#include "server/Server.h"
 
 #include <memory>
 

include/client/render/gui/SummonMenu.h

@@ -3,7 +3,7 @@
 #include "GuiWidget.h"
 
 #include <array>
-#include "game/Mobs.h"
+#include "td/game/Mobs.h"
 
 namespace td {
 namespace gui {

include/client/render/gui/TowerGui.h

@@ -9,7 +9,7 @@
 
 #include <memory>
 
-#include "render/gui/GuiManager.h"
+#include "client/render/gui/GuiManager.h"
 
 struct SDL_Window;
 typedef void* SDL_GLContext;

include/client/render/gui/TowerPlacePopup.h

@@ -2,7 +2,7 @@
 
 #include "GuiWidget.h"
 
-#include "Defines.h"
+#include "td/Defines.h"
 
 namespace td {
 namespace gui {

include/client/render/gui/TowerUpgradePopup.h

@@ -2,7 +2,7 @@
 
 #include "GuiWidget.h"
 
-#include "Defines.h"
+#include "td/Defines.h"
 
 namespace td {
 namespace gui {

include/client/render/gui/imgui/imconfig.h

@@ -107,7 +107,7 @@ namespace ImGui
 }
 */
 
-#include "render/GL.h"
+#include "client/render/GL.h"
 
 #if defined(__ANDROID__)
 #define IMGUI_IMPL_OPENGL_LOADER_ES3

include/client/render/gui/imgui/imgui_filebrowser.h

@@ -1,7 +1,7 @@
 #ifndef IMGUIFILEBROWSER_H
 #define IMGUIFILEBROWSER_H
 
-#include "render/gui/imgui/imgui.h"
+#include "client/render/gui/imgui/imgui.h"
 #include <string>
 #include <vector>
 

include/client/render/loader/WorldLoader.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "game/World.h"
+#include "td/game/World.h"
 #include "GLLoader.h"
 
 namespace td {

include/client/render/shaders/ShaderProgram.h

@@ -1,8 +1,8 @@
 #pragma once
 
 #include <string>
-#include "Defines.h"
+#include "td/Defines.h"
-#include "render/GL.h"
+#include "client/render/GL.h"
 
 namespace td {
 namespace shader {

include/client/updater/Updater.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "misc/DataBuffer.h"
+#include "td/misc/DataBuffer.h"
 
 #define TD_VERSION "alpha-0.3.0"
 

include/server/Lobby.h

@@ -2,7 +2,7 @@
 
 #include <vector>
 
-#include "misc/Time.h"
+#include "td/misc/Time.h"
 
 namespace td {
 namespace server {

include/server/Server.h

@@ -3,13 +3,13 @@
 #include <map>
 #include <thread>
 
-#include "network/TCPListener.h"
+#include "td/network/TCPListener.h"
-#include "protocol/Protocol.h"
+#include "td/protocol/Protocol.h"
-#include "protocol/PacketDispatcher.h"
+#include "td/protocol/PacketDispatcher.h"
-#include "protocol/PacketHandler.h"
+#include "td/protocol/PacketHandler.h"
-#include "ServerGame.h"
+#include "server/game/ServerGame.h"
-#include "ServerConnexion.h"
+#include "server/ServerConnexion.h"
-#include "Lobby.h"
+#include "server/Lobby.h"
 
 #define SERVER_TPS 20
 #define SERVER_TICK 1000 / SERVER_TPS

include/server/ServerConnexion.h

@@ -1,10 +1,10 @@
 #pragma once
 
-#include "network/TCPSocket.h"
+#include "td/network/TCPSocket.h"
-#include "protocol/PacketHandler.h"
+#include "td/protocol/PacketHandler.h"
-#include "protocol/PacketDispatcher.h"
+#include "td/protocol/PacketDispatcher.h"
-#include "game/Player.h"
+#include "td/game/Player.h"
-#include "game/Connexion.h"
+#include "td/network/Connexion.h"
 
 namespace td {
 namespace server {

include/server/game/ServerGame.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "game/BaseGame.h"
+#include "td/game/BaseGame.h"
-#include "misc/Time.h"
+#include "td/misc/Time.h"
 #include "ServerWorld.h"
 
 namespace td {

include/server/game/ServerWorld.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "game/World.h"
+#include "td/game/World.h"
 
 namespace td {
 namespace server {

include/td/game/BaseGame.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include "game/Team.h"
+#include "td/game/Team.h"
-#include "game/World.h"
+#include "td/game/World.h"
-#include "game/Player.h"
+#include "td/game/Player.h"
 
 namespace td {
 namespace game {

include/td/game/Mobs.h

@@ -1,11 +1,11 @@
 #pragma once
 
-#include "Defines.h"
+#include "td/Defines.h"
 #include "Towers.h"
 #include "Types.h"
 #include "Team.h"
 
-#include "misc/ObjectNotifier.h"
+#include "td/misc/ObjectNotifier.h"
 
 #include <vector>
 #include <memory>

include/td/game/Player.h

@@ -2,8 +2,8 @@
 
 #include <string>
 
-#include "game/Team.h"
+#include "td/game/Team.h"
-#include "game/PlayerUpgrades.h"
+#include "td/game/PlayerUpgrades.h"
 
 namespace td {
 namespace game {

include/td/game/Team.h

@@ -2,7 +2,7 @@
 
 #include "Types.h"
 
-#include "misc/Shapes.h"
+#include "td/misc/Shapes.h"
 
 #include <vector>
 #include <memory>

include/td/game/Towers.h

@@ -3,10 +3,10 @@
 #include <string>
 #include <memory>
 
-#include "misc/Time.h"
+#include "td/misc/Time.h"
-#include "misc/Shapes.h"
+#include "td/misc/Shapes.h"
 
-#include "game/Types.h"
+#include "td/game/Types.h"
 
 namespace td {
 namespace game {

include/td/game/Types.h

@@ -3,7 +3,7 @@
 #include <cstdint>
 
 // include Log for every files
-#include "misc/Log.h"
+#include "td/misc/Log.h"
 
 namespace td {
 namespace game {

include/td/misc/Maths.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Defines.h"
+#include "td/Defines.h"
 #include <cmath>
 
 namespace td {

include/td/network/Connexion.h

@@ -1,9 +1,9 @@
 #pragma once
 
-#include "network/TCPSocket.h"
+#include "td/network/TCPSocket.h"
-#include "protocol/PacketHandler.h"
+#include "td/protocol/PacketHandler.h"
-#include "protocol/PacketDispatcher.h"
+#include "td/protocol/PacketDispatcher.h"
-#include "game/Player.h"
+#include "td/game/Player.h"
 
 namespace td {
 namespace protocol {

include/td/network/Network.h

@@ -12,10 +12,10 @@
 #include <fcntl.h>
 #endif
 
-#include "network/Socket.h"
+#include "td/network/Socket.h"
-#include "network/IPAddress.h"
+#include "td/network/IPAddress.h"
-#include "network/UDPSocket.h"
+#include "td/network/UDPSocket.h"
-#include "network/TCPSocket.h"
+#include "td/network/TCPSocket.h"
 
 namespace td {
 namespace network {

include/td/network/Socket.h

@@ -5,7 +5,7 @@
 #include <vector>
 #include <memory>
 
-#include "misc/DataBuffer.h"
+#include "td/misc/DataBuffer.h"
 
 #ifdef _WIN32
 #include <ws2tcpip.h>

include/td/network/TCPSocket.h

@@ -1,8 +1,8 @@
 #ifndef NETWORK_TCP_SOCKET_H_
 #define NETWORK_TCP_SOCKET_H_
 
-#include "network/IPAddress.h"
+#include "td/network/IPAddress.h"
-#include "network/Socket.h"
+#include "td/network/Socket.h"
 
 #include <cstdint>
 

include/td/network/UDPSocket.h

@@ -1,8 +1,8 @@
 #ifndef NETWORK_UDP_SOCKET_H_
 #define NETWORK_UDP_SOCKET_H_
 
-#include "network/IPAddress.h"
+#include "td/network/IPAddress.h"
-#include "network/Socket.h"
+#include "td/network/Socket.h"
 
 #include <cstdint>
 

include/td/protocol/PacketDispatcher.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "protocol/Protocol.h"
+#include "td/protocol/Protocol.h"
 
 #include <map>
 #include <vector>

include/td/protocol/PacketFactory.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "protocol/Protocol.h"
+#include "td/protocol/Protocol.h"
 
 namespace td {
 namespace protocol {

include/td/protocol/PacketHandler.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "protocol/Protocol.h"
+#include "td/protocol/Protocol.h"
-#include "protocol/PacketsForward.h"
+#include "td/protocol/PacketsForward.h"
 
 namespace td {
 namespace protocol {

include/td/protocol/Protocol.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "misc/DataBuffer.h"
+#include "td/misc/DataBuffer.h"
 
 #include <memory>
 

include/td/protocol/packets/ConnectionInfoPacket.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "protocol/Protocol.h"
+#include "td/protocol/Protocol.h"
 
 namespace td {
 namespace protocol {

include/td/protocol/packets/DisconnectPacket.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "protocol/Protocol.h"
+#include "td/protocol/Protocol.h"
 
 namespace td {
 namespace protocol {

include/td/protocol/packets/KeepAlivePacket.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "protocol/Protocol.h"
+#include "td/protocol/Protocol.h"
 
 namespace td {
 namespace protocol {

include/td/protocol/packets/PlaceTowerPacket.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "protocol/Protocol.h"
+#include "td/protocol/Protocol.h"
-#include "game/BaseGame.h"
+#include "td/game/BaseGame.h"
 
 namespace td {
 namespace protocol {

include/td/protocol/packets/PlayerBuyItemPacket.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "protocol/Protocol.h"
+#include "td/protocol/Protocol.h"
 
 namespace td {
 namespace protocol {

include/td/protocol/packets/PlayerBuyMobUpgradePacket.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "protocol/Protocol.h"
+#include "td/protocol/Protocol.h"
-#include "game/BaseGame.h"
+#include "td/game/BaseGame.h"
 
 namespace td {
 namespace protocol {

include/td/protocol/packets/PlayerJoinPacket.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "protocol/Protocol.h"
+#include "td/protocol/Protocol.h"
 
 namespace td {
 namespace protocol {

include/td/protocol/packets/PlayerLeavePacket.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "protocol/Protocol.h"
+#include "td/protocol/Protocol.h"
 
 namespace td {
 namespace protocol {

include/td/protocol/packets/PlayerListPacket.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "protocol/Protocol.h"
+#include "td/protocol/Protocol.h"
-#include "game/BaseGame.h"
+#include "td/game/BaseGame.h"
 
 namespace td {
 namespace protocol {

include/td/protocol/packets/PlayerLoginPacket.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "protocol/Protocol.h"
+#include "td/protocol/Protocol.h"
 
 namespace td {
 namespace protocol {

include/td/protocol/packets/RemoveTowerPacket.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "protocol/Protocol.h"
+#include "td/protocol/Protocol.h"
-#include "game/BaseGame.h"
+#include "td/game/BaseGame.h"
 
 namespace td {
 namespace protocol {

include/td/protocol/packets/SelectTeamPacket.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "protocol/Protocol.h"
+#include "td/protocol/Protocol.h"
-#include "game/BaseGame.h"
+#include "td/game/BaseGame.h"
 
 namespace td {
 namespace protocol {

include/td/protocol/packets/SendMobsPacket.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "protocol/Protocol.h"
+#include "td/protocol/Protocol.h"
-#include "game/BaseGame.h"
+#include "td/game/BaseGame.h"
 
 namespace td {
 namespace protocol {

include/td/protocol/packets/ServerTpsPacket.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "protocol/Protocol.h"
+#include "td/protocol/Protocol.h"
 
 namespace td {
 namespace protocol {

include/td/protocol/packets/SpawnMobPacket.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "protocol/Protocol.h"
+#include "td/protocol/Protocol.h"
-#include "game/BaseGame.h"
+#include "td/game/BaseGame.h"
 
 namespace td {
 namespace protocol {

include/td/protocol/packets/UpdateCastleLifePacket.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "protocol/Protocol.h"
+#include "td/protocol/Protocol.h"
-#include "game/BaseGame.h"
+#include "td/game/BaseGame.h"
 
 namespace td {
 namespace protocol {

include/td/protocol/packets/UpdateExpPacket.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "protocol/Protocol.h"
+#include "td/protocol/Protocol.h"
 
 namespace td {
 namespace protocol {

include/td/protocol/packets/UpdateGameStatePacket.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "protocol/Protocol.h"
+#include "td/protocol/Protocol.h"
-#include "game/BaseGame.h"
+#include "td/game/BaseGame.h"
 
 namespace td {
 namespace protocol {

include/td/protocol/packets/UpdateLobbyTimePacket.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "protocol/Protocol.h"
+#include "td/protocol/Protocol.h"
 
 namespace td {
 namespace protocol {

include/td/protocol/packets/UpdateMobStatesPacket.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "protocol/Protocol.h"
+#include "td/protocol/Protocol.h"
-#include "game/BaseGame.h"
+#include "td/game/BaseGame.h"
 
 namespace td {
 namespace protocol {

include/td/protocol/packets/UpdateMoneyPacket.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "protocol/Protocol.h"
+#include "td/protocol/Protocol.h"
 
 namespace td {
 namespace protocol {

include/td/protocol/packets/UpdatePlayerTeamPacket.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "protocol/Protocol.h"
+#include "td/protocol/Protocol.h"
-#include "game/BaseGame.h"
+#include "td/game/BaseGame.h"
 
 namespace td {
 namespace protocol {

include/td/protocol/packets/UpgradeTowerPacket.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "protocol/Protocol.h"
+#include "td/protocol/Protocol.h"
-#include "game/BaseGame.h"
+#include "td/game/BaseGame.h"
 
 namespace td {
 namespace protocol {

include/td/protocol/packets/WorldAddTowerPacket.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "protocol/Protocol.h"
+#include "td/protocol/Protocol.h"
-#include "game/BaseGame.h"
+#include "td/game/BaseGame.h"
 
 namespace td {
 namespace protocol {

include/td/protocol/packets/WorldBeginDataPacket.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "protocol/Protocol.h"
+#include "td/protocol/Protocol.h"
-#include "game/BaseGame.h"
+#include "td/game/BaseGame.h"
 
 namespace td {
 namespace protocol {