add basic README

.clang-tidy

@@ -0,0 +1,27 @@
+Checks: >-
+  -*,
+  readability-identifier-naming,
+  readability-redundant-string-cstr,
+  readability-redundant-string-init,
+  readability-simplify-boolean-expr,
+  performance-unnecessary-value-param,
+  performance-unnecessary-copy-initialization,
+  performance-for-range-copy,
+  performance-implicit-conversion-in-loop,
+CheckOptions:
+- key:             readability-identifier-naming.PrivateMemberPrefix
+  value:           'm_'
+- key:             readability-identifier-naming.ClassConstantCase
+  value:           aNy_CasE
+# an empty *Prefix needs a *Case to work
+- key:             readability-identifier-naming.ClassConstantPrefix
+  value:           ''
+#- key:             readability-identifier-naming.PrivateMemberCase
+#  value:           CamelCase
+#- key:             readability-identifier-naming.FunctionCase
+#  value:           CamelCase
+#- key:             readability-identifier-naming.EnumCase
+#  value:           camelBack
+
+WarningsAsErrors: '*'
+FormatStyle: 'file'

.gitignore

@@ -7,3 +7,7 @@ build/
 
 
 .vscode
+
+imgui.ini
+
+test/tdmap.tdmap3

README.md

@@ -0,0 +1,3 @@
+# (CubeCraft) Tower Defense
+
+## Currently in contruction 🏗️👷⚙️

include/client/Client.h

@@ -0,0 +1,24 @@
+#pragma once
+
+#include <client/IClientSocket.h>
+#include <td/common/StateMachine.h>
+
+namespace td {
+namespace client {
+
+class ClientState;
+
+class Client : public StateMachine<Client, void, float> {
+  private:
+	std::shared_ptr<IClientSocket> m_Socket;
+
+  public:
+	Client(const std::shared_ptr<IClientSocket>& a_Socket) : m_Socket(a_Socket) {}
+
+	void SendPacket(const protocol::PacketBase& a_Packet);
+
+	friend class ClientState;
+};
+
+}  // namespace client
+}  // namespace td

include/client/ClientState.h

@@ -0,0 +1,20 @@
+#pragma once
+
+#include <client/Client.h>
+#include <td/misc/SlotGuard.h>
+
+namespace td {
+namespace client {
+
+class ClientState : public Client::State, private utils::SlotGuard {
+  public:
+	ClientState(Client& a_Client);
+	virtual ~ClientState() {}
+
+  protected:
+	void SendPacket(const protocol::PacketBase& a_Packet);
+	virtual void HandlePacket(const protocol::PacketBase& a_Packet) {}
+};
+
+}  // namespace server
+}  // namespace td

include/client/IClientSocket.h

@@ -0,0 +1,23 @@
+#pragma once
+
+#include <td/Types.h>
+#include <td/misc/Signal.h>
+#include <td/protocol/packet/Packets.h>
+
+namespace td {
+namespace client {
+
+class IClientSocket {
+  public:
+	utils::Signal<> OnConnect;
+	utils::Signal<> OnDisconnect;
+	utils::Signal<const protocol::PacketBase&> OnReceive;
+
+	virtual void Send(const protocol::PacketBase& a_Packet) = 0;
+
+	IClientSocket() {}
+	virtual ~IClientSocket() {}
+};
+
+}  // namespace client
+}  // namespace td

include/client/socket/FakeSocket.h

@@ -0,0 +1,33 @@
+#pragma once
+
+#include <client/IClientSocket.h>
+
+namespace td {
+
+namespace server {
+class FakeSocket;
+}  // namespace server
+
+
+namespace client {
+
+class FakeSocket : public IClientSocket {
+  private:
+	std::shared_ptr<server::FakeSocket> m_Server;
+	PeerID m_PeerId;
+
+	struct Private{ explicit Private() = default; };
+
+  public:
+	FakeSocket(Private) {}
+	~FakeSocket() {}
+
+	static std::shared_ptr<FakeSocket> Connect(const std::shared_ptr<server::FakeSocket>& a_Server);
+
+	void ReceiveFromFakePeer(PeerID a_Peer, const protocol::PacketBase& a_Packet);
+
+	virtual void Send(const protocol::PacketBase& a_Packet) override;
+};
+
+}  // namespace client
+}  // namespace td

include/client/state/GameState.h

@@ -0,0 +1,31 @@
+#pragma once
+
+#include <client/ClientState.h>
+#include <td/game/World.h>
+#include <td/simulation/ClientSimulation.h>
+
+namespace td {
+namespace client {
+
+class GameState : public ClientState {
+  private:
+	std::shared_ptr<game::World> m_World;
+	sim::ClientSimulation m_Simulation;
+	float m_CurrentLerp;
+
+  public:
+	GameState(Client& a_Client, const std::shared_ptr<game::World>& a_World, std::uint64_t a_StepTime);
+	~GameState() {}
+
+	virtual void Update(float a_Delta) override;
+
+	float GetCurrentLerp() const {
+		return m_CurrentLerp;
+	}
+
+  protected:
+	virtual void HandlePacket(const protocol::PacketBase& a_Packet) override;
+};
+
+}  // namespace client
+}  // namespace td

include/server/IServerSocket.h

@@ -0,0 +1,33 @@
+#pragma once
+
+#include <server/PlayerIds.h>
+#include <td/misc/Signal.h>
+#include <td/protocol/packet/Packets.h>
+
+namespace td {
+namespace server {
+
+class IServerSocket {
+  public:
+	utils::Signal<PlayerID> OnConnect;
+	utils::Signal<PlayerID> OnDisconnect;
+	utils::Signal<PlayerID, const protocol::PacketBase&> OnReceive;
+
+	void Send(PlayerID a_PlayerId, const protocol::PacketBase& a_Packet);
+	void Broadcast(const protocol::PacketBase& a_Packet);
+
+	IServerSocket() {}
+	virtual ~IServerSocket() {}
+
+  private:
+	PlayerIds m_Ids;
+
+  protected:
+	void OnConnectPeer(PeerID a_PeerId);
+	void OnDisconnectPeer(PeerID a_PeerId);
+	void OnReceivePeer(PeerID a_PeerId, const protocol::PacketBase& a_Packet);
+	virtual void SendPeer(PeerID a_PeerId, const protocol::PacketBase& a_Packet) = 0;
+};
+
+}  // namespace server
+}  // namespace td

include/server/PlayerIds.h

@@ -0,0 +1,49 @@
+#pragma once
+
+#include <map>
+#include <td/Types.h>
+
+namespace td {
+namespace server {
+
+class PlayerIds {
+  private:
+	std::map<PeerID, PlayerID> m_PeerToPlayer;
+	std::map<PlayerID, PeerID> m_PlayerToPeer;
+	PlayerID m_NextId;
+
+  public:
+	PlayerIds() : m_NextId(0) {}
+	~PlayerIds() {}
+
+	void AddConnection(PeerID a_PeerId) {
+		m_PeerToPlayer.emplace(a_PeerId, m_NextId);
+		m_PlayerToPeer.emplace(m_NextId, a_PeerId);
+		m_NextId++;
+	}
+
+	PlayerID GetPlayerId(PeerID a_PeerId) const {
+		return m_PeerToPlayer.at(a_PeerId);
+	}
+
+	PeerID GetPeerId(PlayerID a_PlayerId) const {
+		return m_PlayerToPeer.at(a_PlayerId);
+	}
+
+	void RemovePeer(PeerID a_PeerId) {
+		PlayerID playerId = GetPlayerId(a_PeerId);
+		m_PeerToPlayer.erase(a_PeerId);
+		m_PlayerToPeer.erase(playerId);
+	}
+
+	auto begin() {
+		return m_PeerToPlayer.begin();
+	}
+
+	auto end() {
+		return m_PeerToPlayer.end();
+	}
+};
+
+}  // namespace server
+}  // namespace td

include/server/Server.h

@@ -0,0 +1,22 @@
+#pragma once
+
+#include <server/IServerSocket.h>
+#include <td/common/StateMachine.h>
+
+namespace td {
+namespace server {
+
+class ServerState;
+
+class Server : public StateMachine<Server, void, float> {
+  private:
+	std::shared_ptr<IServerSocket> m_Socket;
+
+  public:
+	Server(const std::shared_ptr<IServerSocket>& a_Socket) : m_Socket(a_Socket) {}
+
+	friend class ServerState;
+};
+
+}  // namespace server
+}  // namespace td

include/server/ServerState.h

@@ -0,0 +1,23 @@
+#pragma once
+
+#include <server/Server.h>
+#include <td/misc/SlotGuard.h>
+
+namespace td {
+namespace server {
+
+class ServerState : public Server::State, private utils::SlotGuard {
+  public:
+	virtual void HandlePacket(PlayerID a_Id, const protocol::PacketBase& a_Packet) = 0;
+	virtual void Update(float a_Delta) = 0;
+
+	ServerState(Server& a_Server);
+	virtual ~ServerState();
+
+  protected:
+	void SendPacket(PlayerID a_Id, const protocol::PacketBase& a_Packet);
+	void BroadcastPacket(const protocol::PacketBase& a_Packet);
+};
+
+}  // namespace server
+}  // namespace td

include/server/socket/FakeSocket.h

@@ -0,0 +1,35 @@
+#pragma once
+
+#include <client/socket/FakeSocket.h>
+#include <optional>
+#include <server/IServerSocket.h>
+
+namespace td {
+namespace server {
+
+class FakeSocket : public IServerSocket {
+  private:
+	std::vector<std::optional<std::weak_ptr<client::FakeSocket>>> m_Clients;
+
+  public:
+	FakeSocket() {}
+	~FakeSocket() {}
+
+	PeerID ConnectFakePeer(const std::shared_ptr<client::FakeSocket>& a_Socket);
+	void DisconnectFakePeer(PeerID a_Peer);
+	void ReceiveFromFakePeer(PeerID a_Peer, const protocol::PacketBase& a_Packet);
+
+  protected:
+	virtual void SendPeer(PeerID a_Peer, const protocol::PacketBase& a_Packet) override;
+
+  private:
+	/**
+	 * \return -1 if all previous ids are not free
+	 */
+	int GetNextFreeId();
+
+	friend class client::FakeSocket;
+};
+
+}  // namespace server
+}  // namespace td

include/server/state/EndGameState.h

@@ -0,0 +1,17 @@
+#pragma once
+
+#include <server/ServerState.h>
+
+namespace td {
+namespace server {
+
+class EndGameState : public ServerState {
+  private:
+	/* data */
+  public:
+	EndGameState(/* args */) {}
+	~EndGameState() {}
+};
+
+}  // namespace server
+}  // namespace td

include/server/state/GameState.h

@@ -0,0 +1,29 @@
+#pragma once
+
+#include <server/ServerState.h>
+#include <td/game/World.h>
+#include <td/simulation/ServerSimulation.h>
+
+namespace td {
+namespace server {
+
+class GameStateHandler;
+
+class GameState : public ServerState {
+  private:
+	std::shared_ptr<game::World> m_World;
+	sim::ServerSimulation m_Simulation;
+	float m_Time;
+
+  public:
+	GameState(Server& a_Server, const std::shared_ptr<game::World>& a_World);
+	~GameState() {}
+
+	virtual void HandlePacket(PlayerID a_Id, const protocol::PacketBase& a_Packet) override;
+	virtual void Update(float a_Delta) override;
+
+	friend class GameStateHandler;
+};
+
+}  // namespace server
+}  // namespace td

include/server/state/GameStateHandler.h

@@ -0,0 +1,26 @@
+#pragma once
+
+#include <td/protocol/packet/Packets.h>
+
+namespace td {
+namespace server {
+
+class GameState;
+
+class GameStateHandler : public protocol::PacketHandler {
+  private:
+	GameState& m_GameState;
+	PlayerID m_PlayerId;
+
+	using protocol::PacketHandler::Handle;
+
+  public:
+	GameStateHandler(GameState& a_GameState, PlayerID a_PlayerId);
+
+	virtual void Handle(const protocol::packets::SpawnTroopPacket& a_Packet) override;
+	virtual void Handle(const protocol::packets::PlaceTowerPacket& a_Packet) override;
+	virtual void Handle(const protocol::packets::LockStepRequestPacket& a_Packet) override;
+};
+
+}  // namespace server
+}  // namespace td

include/server/state/LobbyState.h

@@ -0,0 +1,21 @@
+#pragma once
+
+#include <server/ServerState.h>
+
+namespace td {
+namespace server {
+
+// this class is temporary useless
+class LobbyState : public ServerState {
+  private:
+	std::shared_ptr<game::World> m_World;
+  public:
+	LobbyState(Server& a_Server, const std::shared_ptr<game::World>& a_World);
+	~LobbyState() {}
+
+	virtual void HandlePacket(PlayerID a_Id, const protocol::PacketBase& a_Packet) override;
+	virtual void Update(float a_Delta) override;
+};
+
+}  // namespace server
+}  // namespace td

include/td/Maths.h

@@ -0,0 +1,217 @@
+#pragma once
+
+#include <sp/common/DataBufferOperators.h>
+
+namespace td {
+
+static constexpr float PI = 3.141592653f;
+
+template <typename T>
+struct Vec2 {
+	union {
+		T x;
+		T r;
+	};
+
+	union {
+		T y;
+		T g;
+	};
+
+	constexpr Vec2(T X = T(0), T Y = T(0)) : x(X), y(Y) {}
+};
+
+template <typename T>
+inline bool operator==(const Vec2<T>& vec2, const Vec2<T>& other) {
+	return vec2.x == other.x && vec2.y == other.y;
+}
+
+template <typename T>
+struct Vec3 {
+	union {
+		T x;
+		T r;
+	};
+
+	union {
+		T y;
+		T g;
+	};
+
+	union {
+		T z;
+		T b;
+	};
+
+	constexpr Vec3(T X = 0, T Y = 0, T Z = 0) : x(X), y(Y), z(Z) {}
+};
+
+template <typename T>
+inline bool operator==(const Vec3<T>& vec3, const Vec3<T>& other) {
+	return vec3.x == other.x && vec3.y == other.y && vec3.z == other.z;
+}
+
+template <typename T>
+struct Vec4 {
+	union {
+		T x;
+		T r;
+	};
+
+	union {
+		T y;
+		T g;
+	};
+
+	union {
+		T z;
+		T b;
+	};
+
+	union {
+		T w;
+		T a;
+	};
+
+	constexpr Vec4(Vec3<T> vec, T W = 1) : x(vec.x), y(vec.y), z(vec.z), w(W) {}
+	constexpr Vec4(T X = 0, T Y = 0, T Z = 0, T W = 0) : x(X), y(Y), z(Z), w(W) {}
+};
+
+template <typename T>
+inline bool operator==(const Vec4<T>& vec4, const Vec4<T>& other) {
+	return vec4.x == other.x && vec4.y == other.y && vec4.z == other.z && vec4.w = other.w;
+}
+
+using Vec2i = Vec2<int>;
+using Vec2u = Vec2<unsigned int>;
+using Vec2f = Vec2<float>;
+using Vec2d = Vec2<double>;
+
+using Vec3i = Vec3<int>;
+using Vec3u = Vec3<unsigned int>;
+using Vec3f = Vec3<float>;
+using Vec3d = Vec3<double>;
+
+using Vec4i = Vec4<int>;
+using Vec4u = Vec4<unsigned int>;
+using Vec4f = Vec4<float>;
+using Vec4d = Vec4<double>;
+
+using Color = Vec3<unsigned char>;
+
+template <typename T>
+struct Mat4 {
+	static const std::size_t MATRIX_SIZE = 4;
+
+	T x0, x1, x2, x3;
+	T y0, y1, y2, y3;
+	T z0, z1, z2, z3;
+	T w0, w1, w2, w3;
+
+	T operator[](std::size_t offset) const {
+		return reinterpret_cast<const T*>(this)[offset];
+	}
+
+	T& operator[](std::size_t offset) {
+		return reinterpret_cast<T*>(this)[offset];
+	}
+
+	T* data() {
+		return reinterpret_cast<T*>(this);
+	}
+
+	const T* data() const {
+		return reinterpret_cast<const T*>(this);
+	}
+
+	T at(std::size_t row, std::size_t column) const {
+		return operator[](row * MATRIX_SIZE + column);
+	}
+
+	T& at(std::size_t row, std::size_t column) {
+		return operator[](row * MATRIX_SIZE + column);
+	}
+};
+
+typedef Mat4<float> Mat4f;
+typedef Mat4<int> Mat4i;
+typedef Mat4<double> Mat4d;
+
+template <typename T>
+inline bool operator==(const Mat4<T>& mat, const Mat4<T>& other) {
+	return mat.x0 == other.x0 && mat.y0 == other.y0 && mat.z0 == other.z0 && mat.w0 == other.w0 && mat.x1 == other.x1 &&
+		   mat.y1 == other.y1 && mat.z1 == other.z1 && mat.w1 == other.w1 && mat.x2 == other.x2 && mat.y2 == other.y2 &&
+		   mat.z2 == other.z2 && mat.w2 == other.w2 && mat.x3 == other.x3 && mat.y3 == other.y3 && mat.z3 == other.z3 &&
+		   mat.w3 == other.w3;
+}
+
+namespace maths {
+
+template<typename T>
+Mat4<T> Transpose(const Mat4<T>& mat) {
+	Mat4<T> result;
+
+	result.x1 = mat.y0;
+	result.x2 = mat.z0;
+	result.x3 = mat.w0;
+	result.y0 = mat.x1;
+	result.y2 = mat.z1;
+	result.y3 = mat.w1;
+	result.z0 = mat.x2;
+	result.z1 = mat.y2;
+	result.z3 = mat.w2;
+	result.w0 = mat.x3;
+	result.w1 = mat.y3;
+	result.w2 = mat.z3;
+	result.x0 = mat.x0;
+	result.y1 = mat.y1;
+	result.z2 = mat.z2;
+	result.w3 = mat.w3;
+
+	return result;
+}
+
+Mat4f Perspective(float fovY, float aspectRatio, float zNear, float zFar);
+Mat4f Look(const Vec3f& eye, const Vec3f& center, const Vec3f& up);
+
+Mat4f Inverse(const Mat4f& mat);
+
+template<typename T>
+T Lerp(T v0, T v1, T t) {
+	return (T(1) - t) * v0 + t * v1;
+}
+
+}  // namespace maths
+
+template <typename T>
+sp::DataBuffer& operator<<(sp::DataBuffer& a_Buffer, const Vec2<T>& a_Vec) {
+	return a_Buffer << a_Vec.x << a_Vec.y;
+}
+
+template <typename T>
+sp::DataBuffer& operator>>(sp::DataBuffer& a_Buffer, Vec2<T>& a_Vec) {
+	return a_Buffer >> a_Vec.x >> a_Vec.y;
+}
+
+template <typename T>
+sp::DataBuffer& operator<<(sp::DataBuffer& a_Buffer, const Vec3<T>& a_Vec) {
+	return a_Buffer << a_Vec.x << a_Vec.y << a_Vec.z;
+}
+
+template <typename T>
+sp::DataBuffer& operator>>(sp::DataBuffer& a_Buffer, Vec3<T>& a_Vec) {
+	return a_Buffer >> a_Vec.x >> a_Vec.y >> a_Vec.z;
+}
+
+
+template <typename T>
+sp::DataBuffer& operator<<(sp::DataBuffer& a_Buffer, const Vec4<T>& a_Vec) {
+	return a_Buffer << a_Vec.x << a_Vec.y << a_Vec.z << a_Vec.w;
+}
+
+template <typename T>
+sp::DataBuffer& operator>>(sp::DataBuffer& a_Buffer, Vec4<T>& a_Vec) {
+	return a_Buffer >> a_Vec.x >> a_Vec.y >> a_Vec.z >> a_Vec.w;
+}
+
+}  // namespace td

include/td/Types.h

@@ -2,13 +2,23 @@
 
 #include <cstdint>
 #include <fpm/fixed.hpp>
+#include <td/Maths.h>
+
+namespace sp {
+class DataBuffer;
+} // namespace sp
 
 namespace td {
 
 using FpFloat = fpm::fixed_16_16;
 
-enum class Team : std::uint8_t {
-	Blue = 0,
+using StepTime = std::uint16_t;
+
+constexpr int STEP_TIME = 50;
+
+enum class TeamColor : std::int8_t {
+	None = -1,
+	Blue,
 	Red,
 };
 
@@ -30,7 +40,7 @@ enum class EntityType : std::uint8_t {
 	Zombie = 0,
 	Spider,
 	Pigman,
-	Skeleton,
+	Skelon,
 	Creeper,
 	Silverfish,
 	Blaze,
@@ -55,17 +65,23 @@ using TowerID = std::uint16_t;
 using PlayerID = std::uint8_t;
 using EntityID = std::uint16_t;
 
-struct TowerCoords {
-	std::int16_t x;
-	std::int16_t y;
-};
+using TowerCoords = Vec2<std::int16_t>;
 
-struct EntityCoords {
-	FpFloat x;
-	FpFloat y;
-};
+using EntityCoords = Vec2<FpFloat>;
 
 using PeerID = std::uint16_t;
-using StepsType = std::uint16_t;
+
+enum class Direction : std::uint8_t {
+	PositiveX = 1 << 0,
+	NegativeX = 1 << 1,
+	PositiveY = 1 << 2,
+	NegativeY = 1 << 3,
+};
+
+sp::DataBuffer& operator<<(sp::DataBuffer& a_Buffer, const EntityCoords& a_Coords);
+sp::DataBuffer& operator<<(sp::DataBuffer& a_Buffer, const FpFloat& a_Float);
+
+sp::DataBuffer& operator>>(sp::DataBuffer& a_Buffer, EntityCoords& a_Coords);
+sp::DataBuffer& operator>>(sp::DataBuffer& a_Buffer, FpFloat& a_Float);
 
 }  // namespace td

include/td/common/Array.h

@@ -0,0 +1,60 @@
+#pragma once
+
+#include <cstdint>
+
+namespace td {
+
+/**
+ * Reflectable std::array
+ */
+template <typename T, std::size_t S>
+class Array {
+  private:
+	T* m_Data;
+
+  public:
+	Array() : m_Data(new T[S]) {}
+
+	Array(const Array& a_Other) : Array() {
+		*this = a_Other;
+	}
+
+	Array(Array&& a_Other) {
+		m_Data = a_Other.m_Data;
+		a_Other.m_Data = nullptr;
+	}
+
+	Array(const std::initializer_list<T>& args) {
+		std::size_t i = 0;
+		for(const T& element : args) {
+			m_Data[i] = element;
+			i++;
+		}
+	}
+
+	Array& operator=(const Array& a_Other) {
+		for (std::size_t i = 0; i < S; i++) {
+			m_Data[i] = a_Other.m_Data[i];
+		}
+		return *this;
+	}
+
+	Array& operator=(Array&& a_Other) {
+		std::swap(m_Data, a_Other.m_Data);
+		return *this;
+	}
+
+	T& operator[](std::size_t a_Index) {
+		return m_Data[a_Index];
+	}
+
+	const T& operator[](std::size_t a_Index) const {
+		return m_Data[a_Index];
+	}
+
+	~Array() {
+		delete [] m_Data;
+	}
+};
+
+}  // namespace td

include/td/common/DataBuffer.h

@@ -1,300 +0,0 @@
-#pragma once
-
-/**
- * \file DataBuffer.h
- * \brief File containing the td::DataBuffer class
- */
-
-#include <algorithm>
-#include <array>
-#include <cassert>
-#include <cstdint>
-#include <cstring>
-#include <string>
-#include <td/common/VarInt.h>
-#include <vector>
-
-namespace td {
-
-/**
- * \class DataBuffer
- * \brief Class used to manipulate memory
- */
-class DataBuffer {
-  private:
-	typedef std::vector<std::uint8_t> Data;
-	Data m_Buffer;
-	std::size_t m_ReadOffset;
-
-  public:
-	typedef Data::iterator iterator;
-	typedef Data::const_iterator const_iterator;
-	typedef Data::reference reference;
-	typedef Data::const_reference const_reference;
-	typedef Data::difference_type difference_type;
-
-	DataBuffer();
-	DataBuffer(const DataBuffer& other);
-	DataBuffer(const DataBuffer& other, difference_type offset);
-	DataBuffer(DataBuffer&& other);
-	DataBuffer(const std::string& str);
-
-	DataBuffer& operator=(const DataBuffer& other);
-	DataBuffer& operator=(DataBuffer&& other);
-
-	/**
-	 * \brief Append data to the buffer
-	 */
-	template <typename T>
-	void Append(const T& data) {
-		std::size_t size = sizeof(data);
-		std::size_t end_pos = m_Buffer.size();
-		m_Buffer.resize(m_Buffer.size() + size);
-		std::memcpy(&m_Buffer[end_pos], &data, size);
-	}
-
-	/**
-	 * \brief Append data to the buffer
-	 */
-	template <typename T>
-	DataBuffer& operator<<(const T& data) {
-		Append(data);
-		return *this;
-	}
-
-	/**
-	 * \brief Append a string to the buffer
-	 * \warning Don't use it for binary data !
-	 * \param str The string to append
-	 */
-	DataBuffer& operator<<(const std::string& str);
-
-	/**
-	 * \brief Append data to the buffer from another const buffer
-	 * \param data The buffer to append
-	 */
-	DataBuffer& operator<<(const DataBuffer& data);
-
-	/**
-	 * \brief Append a vector to the buffer by first writing the size
-	 * \param data The vector to append
-	 */
-	template <typename T>
-	DataBuffer& operator<<(const std::vector<T>& data) {
-		*this << VarInt{data.size()};
-		for (const auto& element : data) {
-			*this << element;
-		}
-		return *this;
-	}
-
-	/**
-	 * \brief Append an array to the buffer by first writing the size
-	 * \param data The buffer to append
-	 */
-	template <typename T, std::size_t Size>
-	DataBuffer& operator<<(const std::array<T, Size>& data) {
-		for (const auto& element : data) {
-			*this << element;
-		}
-		return *this;
-	}
-
-	/**
-	 * \brief Read some data from the buffer and assign to desired variable
-	 */
-	template <typename T>
-	DataBuffer& operator>>(T& data) {
-		assert(m_ReadOffset + sizeof(T) <= GetSize());
-		data = *(reinterpret_cast<T*>(&m_Buffer[m_ReadOffset]));
-		m_ReadOffset += sizeof(T);
-		return *this;
-	}
-
-	/**
-	 * \brief Read some data from the buffer and assign to the new buffer
-	 * \param data The buffer to assign
-	 */
-	DataBuffer& operator>>(DataBuffer& data);
-
-	/**
-	 * \brief Read a string from the buffer
-	 * \param str The string to assign in the new buffer
-	 * \warning Don't use it for binary data !
-	 */
-	DataBuffer& operator>>(std::string& str);
-
-	/**
-	 * \brief Read a vector (size + data) from the buffer
-	 * \pre The vector is assumed to be empty
-	 */
-	template <typename T>
-	DataBuffer& operator>>(std::vector<T>& data) {
-		VarInt arraySize;
-		*this >> arraySize;
-		for (std::size_t i = 0; i < arraySize.GetValue(); i++) {
-			T newElement;
-			*this >> newElement;
-			data.push_back(newElement);
-		}
-		return *this;
-	}
-
-	/**
-	 * \brief Read an array from the buffer
-	 */
-	template <std::size_t Size, typename T>
-	DataBuffer& operator>>(std::array<T, Size>& data) {
-		for (std::size_t i = 0; i < Size; i++) {
-			T newElement;
-			*this >> newElement;
-			data[i] = newElement;
-		}
-		return *this;
-	}
-
-	/**
-	 * \brief Write some data to the buffer
-	 * \param buffer The buffer to write
-	 * \param amount The amount of data to write
-	 */
-	void WriteSome(const char* buffer, std::size_t amount);
-
-	/**
-	 * \brief Write some data to the buffer
-	 * \param buffer The buffer to write
-	 * \param amount The amount of data to write
-	 */
-	void WriteSome(const std::uint8_t* buffer, std::size_t amount);
-
-	/**
-	 * \brief Read some data from the buffer
-	 * \param buffer The buffer to Read
-	 * \param amount The amount of data from the buffer
-	 */
-	void ReadSome(char* buffer, std::size_t amount);
-
-	/**
-	 * \brief Read some data from the buffer
-	 * \param buffer The buffer to Read
-	 * \param amount The amount of data from the buffer
-	 */
-	void ReadSome(std::uint8_t* buffer, std::size_t amount);
-
-	/**
-	 * \brief Read some data from the buffer
-	 * \param buffer The buffer to Read
-	 * \param amount The amount of data from the buffer
-	 */
-	void ReadSome(DataBuffer& buffer, std::size_t amount);
-
-	/**
-	 * \brief Resize the buffer
-	 * \param size The new size of the buffer
-	 */
-	void Resize(std::size_t size) {
-		m_Buffer.resize(size);
-	}
-
-	/**
-	 * \brief Reserve some space in the buffer
-	 * \param amount The amount of space to reserve
-	 */
-	void Reserve(std::size_t amount) {
-		m_Buffer.reserve(amount);
-	}
-
-
-	/**
-	 * \brief Clear the buffer
-	 */
-	void Clear() {
-		m_Buffer.clear();
-		m_ReadOffset = 0;
-	}
-
-	/**
-	 * \brief When the buffer has been read entirely
-	 */
-	bool IsFinished() const {
-		return m_ReadOffset >= m_Buffer.size();
-	}
-
-	/**
-	 * \brief Get the buffer data
-	 */
-	std::uint8_t* data() {
-		return m_Buffer.data();
-	}
-
-	/**
-	 * \brief Get the buffer data
-	 */
-	const std::uint8_t* data() const {
-		return m_Buffer.data();
-	}
-
-	/**
-	 * \brief Get the read offset
-	 */
-	std::size_t GetReadOffset() const {
-		return m_ReadOffset;
-	}
-
-	/**
-	 * \brief Set the read offset
-	 * \param pos The new read offset
-	 */
-	void SetReadOffset(std::size_t pos);
-
-	/**
-	 * \brief Get the size of the buffer
-	 */
-	std::size_t GetSize() const;
-
-	/**
-	 * \brief Get the remaining size of the buffer
-	 */
-	std::size_t GetRemaining() const;
-
-	/**
-	 * \brief Read a file into the buffer
-	 * \param fileName The name of the file to read
-	 */
-	bool ReadFile(const std::string& fileName);
-
-	/**
-	 * \brief Write a file into the buffer
-	 * \param fileName The name of the file to write to
-	 */
-	bool WriteFile(const std::string& fileName) const;
-
-	/**
-	 * \brief Allocate the buffer on the heap
-	 * \warning Don't forget to free the data !
-	 */
-	std::uint8_t* HeapAllocatedData() const {
-		std::uint8_t* newBuffer = new std::uint8_t[GetSize()];
-		std::memcpy(newBuffer, data(), GetSize());
-		return newBuffer;
-	}
-
-	/**
-	 * \brief Operator == to compare two DataBuffer
-	 */
-	bool operator==(const DataBuffer& other) const {
-		return m_Buffer == other.m_Buffer;
-	}
-
-	iterator begin();
-	iterator end();
-	const_iterator begin() const;
-	const_iterator end() const;
-};
-
-/**
- * \brief Operator << to write a DataBuffer to an ostream
- */
-std::ostream& operator<<(std::ostream& os, const DataBuffer& buffer);
-
-}  // namespace td

include/td/common/StateMachine.h

@@ -0,0 +1,47 @@
+#pragma once
+
+#include <cassert>
+#include <memory>
+
+namespace td {
+
+template <typename TDerived, typename TReturn, typename... TArgs>
+class StateMachine {
+  public:
+	class State {
+	  public:
+		State(TDerived& a_StateMachine) : m_StateMachine(a_StateMachine) {}
+		virtual ~State() {}
+
+		virtual TReturn Update(TArgs... args) = 0;
+
+		template <typename T, typename... Args>
+		T* ChangeState(Args&&... args) {
+			return m_StateMachine.template ChangeState<T>(std::forward<Args>(args)...);
+		}
+
+	  protected:
+		TDerived& m_StateMachine;
+	};
+
+	StateMachine() {}
+	StateMachine(StateMachine&&) = default;
+	virtual ~StateMachine() {}
+
+	virtual TReturn Update(TArgs... args) {
+		assert(m_State && "You must change state at least once before updating !");
+		return m_State->Update(args...);
+	}
+
+	template <typename T, typename... Args>
+	T* ChangeState(Args&&... args) {
+		m_State = std::make_unique<T>(static_cast<TDerived&>(*this), std::forward<Args>(args)...);
+		return static_cast<T*>(m_State.get());
+	}
+
+  private:
+	std::unique_ptr<State> m_State;
+};
+
+
+}  // namespace td

include/td/common/StateStack.h

@@ -0,0 +1,69 @@
+#pragma once
+
+#include <cassert>
+#include <vector>
+#include <memory>
+
+namespace td {
+
+template <typename TDerived, typename TReturn, typename... TArgs>
+class StateStack {
+  public:
+	class State {
+	  public:
+		State(TDerived& a_StateStack) : m_StateStack(a_StateStack) {}
+		virtual ~State() {}
+
+		virtual TReturn Update(TArgs... args) = 0;
+
+	  protected:
+		/**
+		 * \brief Called when enabled (can be used to connect signals)
+		 */
+		virtual void OnEnable() {}
+
+		/**
+		 * \brief Called when disabled (can be used to disconnect signals)
+		 */
+		virtual void OnDisable() {}
+
+	  protected:
+		TDerived& m_StateStack;
+
+		friend class StateStack;
+	};
+
+	StateStack() {}
+	StateStack(StateStack&&) = default;
+	virtual ~StateStack() {}
+
+	virtual TReturn Update(TArgs... args) {
+		assert(!m_States.empty() && "You must push at least one state before updating !");
+		return m_States.back()->Update(args...);
+	}
+
+	void PopState() {
+		assert(!m_States.empty() && "You must push at least one state before poping !");
+		m_States.back()->OnDisable();
+		m_States.pop_back();
+		if (m_States.empty())
+			return;
+		m_States.back()->OnEnable();
+	}
+
+	template <typename T, typename... Args>
+	T* PushState(Args&&... args) {
+		if (!m_States.empty())
+			m_States.back()->OnDisable();
+		auto newState = std::make_unique<T>(static_cast<TDerived&>(*this), std::forward<Args>(args)...);
+		newState->OnEnable();
+		m_States.push_back(std::move(newState));
+		return static_cast<T*>(newState.get());
+	}
+
+  private:
+	std::vector<std::unique_ptr<State>> m_States;
+};
+
+
+}  // namespace td

include/td/common/VarInt.h

@@ -1,58 +0,0 @@
-#pragma once
-
-/**
- * \file VarInt.h
- * \brief File containing the td::VarInt class
- */
-
-#include <cstddef>
-#include <cstdint>
-
-namespace td {
-
-class DataBuffer;
-
-/**
- * \class VarInt
- * \brief Variable-length format such that smaller numbers use fewer bytes.
- */
-class VarInt {
-  private:
-	std::uint64_t m_Value;
-
-  public:
-	VarInt() : m_Value(0) {}
-	/**
-	 * \brief Construct a variable integer from a value
-	 * \param value The value of the variable integer
-	 */
-	VarInt(std::uint64_t value) : m_Value(value) {}
-
-	/**
-	 * \brief Get the value of the variable integer
-	 */
-	std::uint64_t GetValue() const {
-		return m_Value;
-	}
-
-	/**
-	 * \brief Get the length of the serialized variable integer
-	 */
-	std::size_t GetSerializedLength() const;
-
-	/**
-	 * \brief Serialize the variable integer
-	 * \param out The buffer to write the serialized variable integer to
-	 * \param var The variable integer to serialize
-	 */
-	friend DataBuffer& operator<<(DataBuffer& out, const VarInt& var);
-
-	/**
-	 * \brief Deserialize the variable integer
-	 * \param in The buffer to read the serialized variable integer from
-	 * \param var The variable integer to deserialize
-	 */
-	friend DataBuffer& operator>>(DataBuffer& in, VarInt& var);
-};
-
-}  // namespace td

include/td/display/Display.h

@@ -0,0 +1,50 @@
+#pragma once
+
+#include <string>
+
+#include <SDL3/SDL_keycode.h>
+#include <SDL3/SDL_video.h>
+#include <td/common/StateMachine.h>
+#include <td/misc/Signal.h>
+
+namespace td {
+
+class Display : public StateMachine<Display, void, float> {
+  private:
+	SDL_Window* m_Window;
+	SDL_GLContext m_GLContext;
+
+	int m_LastWidth, m_LastHeight;
+	float m_AspectRatio;
+
+	bool m_ShouldClose;
+
+  public:
+	utils::Signal<float> OnAspectRatioChange;
+	utils::Signal<SDL_Keycode> OnKeyDown;
+
+	Display(int a_Width, int a_Height, const std::string& a_Title);
+	~Display();
+
+	void PollEvents();
+	void Update(float a_Delta) override;
+	void Close();
+
+	bool IsCloseRequested() {
+		return m_ShouldClose;
+	}
+
+	float GetAspectRatio() {
+		return m_AspectRatio;
+	}
+
+	int GetWindowWidth() {
+		return m_LastWidth;
+	}
+
+	int GetWindowHeight() {
+		return m_LastHeight;
+	}
+};
+
+}  // namespace td

include/td/display/DisplayState.h

@@ -0,0 +1,16 @@
+#pragma once
+
+#include <td/display/Display.h>
+#include <td/misc/SlotGuard.h>
+
+namespace td {
+class DisplayState : public Display::State, private utils::SlotGuard {
+  public:
+	DisplayState(Display& a_Display);
+	virtual ~DisplayState() {}
+
+  protected:
+	virtual void OnAspectRatioChange(float a_Ratio) {}
+	virtual void OnKeyDown(SDL_Keycode a_Key) {}
+};
+}  // namespace td

include/td/display/menu/CreatePartyMenu.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#include <td/display/state/MainMenuState.h>
+
+namespace td {
+
+class CreatePartyMenu : public MainMenuState::Menu {
+  public:
+	CreatePartyMenu(MainMenuState& a_MainMenu);
+	~CreatePartyMenu();
+
+	virtual void Update() override;
+};
+
+}  // namespace td

include/td/display/menu/JoinPartyMenu.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#include <td/display/state/MainMenuState.h>
+
+namespace td {
+
+class JoinPartyMenu : public MainMenuState::Menu {
+  public:
+	JoinPartyMenu(MainMenuState& a_MainMenu);
+	~JoinPartyMenu();
+
+	virtual void Update() override;
+};
+
+}  // namespace td

include/td/display/menu/MainMenu.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#include <td/display/state/MainMenuState.h>
+
+namespace td {
+
+class MainMenu : public MainMenuState::Menu {
+  public:
+	MainMenu(MainMenuState& a_MainMenu);
+	~MainMenu();
+
+	virtual void Update() override;
+};
+
+}  // namespace td

include/td/display/menu/SettingsMenu.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#include <td/display/state/MainMenuState.h>
+
+namespace td {
+
+class SettingsMenu : public MainMenuState::Menu {
+  public:
+	SettingsMenu(MainMenuState& a_MainMenu);
+	~SettingsMenu();
+
+	virtual void Update() override;
+};
+
+}  // namespace td

include/td/display/state/DebugWorldState.h

@@ -0,0 +1,31 @@
+#pragma once
+
+#include <client/Client.h>
+#include <server/Server.h>
+#include <td/display/DisplayState.h>
+#include <td/render/Renderer.h>
+#include <td/simulation/ClientSimulation.h>
+#include <client/state/GameState.h>
+
+namespace td {
+
+class DebugWorldState : public DisplayState {
+  private:
+	render::RenderPipeline m_Renderer;
+	render::Camera m_Camera;
+	std::unique_ptr<client::Client> m_Client;
+	std::unique_ptr<server::Server> m_Server;
+	client::GameState* m_ClientState;
+
+  public:
+	DebugWorldState(Display& a_Display);
+	~DebugWorldState();
+
+	virtual void Update(float a_Delta) override;
+
+  protected:
+	virtual void OnAspectRatioChange(float a_Ratio) override;
+	virtual void OnKeyDown(SDL_Keycode a_Key) override;
+};
+
+}  // namespace td

include/td/display/state/MainMenuState.h

@@ -0,0 +1,27 @@
+#pragma once
+
+#include <td/common/StateStack.h>
+#include <td/display/DisplayState.h>
+
+namespace td {
+
+class MainMenuState;
+
+using MainMenuStateStack = StateStack<MainMenuState, void>;
+
+class MainMenuState : public DisplayState, public MainMenuStateStack {
+  public:
+	using Menu = MainMenuStateStack::State;
+
+	MainMenuState(Display& a_Display);
+	~MainMenuState();
+
+	virtual void Update(float a_Delta) override;
+
+	void RenderBackButton();
+
+  protected:
+	virtual void OnKeyDown(SDL_Keycode a_Key) override;
+};
+
+}  // namespace td

include/td/game/Game.h

@@ -0,0 +1,46 @@
+#pragma once
+
+#include <td/game/World.h>
+
+namespace td {
+namespace game {
+
+enum class GameState : std::uint8_t {
+	Lobby,
+	Game,
+	EndGame,
+	Disconnected,
+	Closed
+};
+
+typedef std::map<std::uint8_t, Player> PlayerList;
+
+
+class Game {
+protected:
+	World* m_World;
+	
+	GameState m_GameState = GameState::Lobby;
+	PlayerList m_Players;
+public:
+	Game(World* world);
+	virtual ~Game();
+
+	virtual void Tick(std::uint64_t delta);
+
+	GameState GetGameState() const { return m_GameState; }
+	void SetGameState(GameState gameState) { m_GameState = gameState; };
+
+	const World* GetWorld() const { return m_World; }
+	World* GetWorld() { return m_World; }
+
+	const PlayerList& GetPlayers() const { return m_Players; }
+	PlayerList& GetPlayers() { return m_Players; }
+
+	const Player* GetPlayerById(PlayerID id) const;
+	Player* GetPlayerById(PlayerID id);
+
+};
+
+} // namespace game 
+} // namespace td

include/td/game/GameHistory.h

@@ -1,31 +0,0 @@
-#pragma once
-
-#include <optional>
-#include <td/protocol/command/Commands.h>
-#include <td/protocol/packet/Packets.h>
-
-namespace td {
-namespace game {
-
-class GameHistory {
-  private:
-	using HistorySizeType = StepsType;
-
-	std::vector<std::optional<protocol::LockStep>> m_History;
-	
-  public:
-	GameHistory();
-
-	void SetLockStep(HistorySizeType a_Index, protocol::LockStep&& a_LockStep);
-
-	const protocol::LockStep& GetLockStep(HistorySizeType a_Index) const;
-
-	bool HasLockStep(HistorySizeType a_Index) const;
-
-	void FromPacket(td::protocol::pdata::LockSteps&& a_Steps);
-
-	td::protocol::packets::LockSteps ToPacket(HistorySizeType a_StartIndex);
-};
-
-}  // namespace game
-}  // namespace td

include/td/game/Mobs.h

@@ -0,0 +1,132 @@
+#pragma once
+
+#include <td/game/Towers.h>
+
+#include <td/Maths.h>
+#include <td/Types.h>
+#include <td/game/Team.h>
+
+#include <memory>
+#include <vector>
+
+#include <sp/protocol/ConcreteMessage.h>
+#include <sp/common/GenericHandler.h>
+#include <sp/protocol/MessageFactory.h>
+
+namespace td {
+using Vec2fp = Vec2<FpFloat>;
+
+namespace game {
+
+enum class EffectType : std::uint8_t {
+	Slowness = 0,
+	Stun,
+	Fire,
+	Poison,
+	Heal,
+};
+
+enum class MobType : std::uint8_t {
+	Zombie = 0,
+	Spider,
+	Skeleton,
+	Pigman,
+	Creeper,
+	Silverfish,
+	Blaze,
+	Witch,
+	Slime,
+	Giant,
+
+	MOB_COUNT
+};
+
+typedef std::uint32_t MobID;
+typedef std::uint8_t MobLevel;
+typedef std::vector<TowerType> TowerImmunities;
+typedef std::vector<EffectType> EffectImmunities;
+
+struct MobStats {
+	float m_Damage;
+	float m_Speed;
+	Vec2f m_Size;
+	std::uint16_t m_MoneyCost;
+	std::uint16_t m_ExpCost;
+	std::uint16_t m_MaxLife;
+	std::uint16_t m_ExpReward;
+};
+
+struct EffectDuration {
+	EffectType type;
+	float duration;	 // in seconds
+	Tower* tower;	 // the tower that gived the effect
+};
+
+const MobStats* GetMobStats(MobType type, std::uint8_t level);
+const TowerImmunities& GetMobTowerImmunities(MobType type, std::uint8_t level);
+const EffectImmunities& GetMobEffectImmunities(MobType type, std::uint8_t level);
+
+class MobHandler;
+
+struct MobData {};
+
+class Mob : public sp::MessageBase<MobType, MobHandler> {
+  public:
+	MobID m_ID;
+	MobLevel m_Level;
+	PlayerID m_Sender;
+	float m_Health;
+	Vec2fp m_Position;
+	Direction m_Direction;
+	std::vector<EffectDuration> m_Effects;
+	const Tower* m_LastDamage;	// the last tower that damaged the mob
+	float m_HitCooldown;
+	TeamCastle* m_CastleTarget;
+	// utils::CooldownTimer m_AttackTimer;
+
+	MobPtr m_Next;
+
+	Mob() {}
+
+	Mob& operator=(const Mob& a_Other) = default;
+};
+
+template <MobType ID>
+using ConcreteMob = sp::ConcreteMessage<MobData, Mob, ID>;
+
+using Zombie = ConcreteMob<MobType::Zombie>;
+using Spider = ConcreteMob<MobType::Spider>;
+using Skeleton = ConcreteMob<MobType::Skeleton>;
+using PigMan = ConcreteMob<MobType::Pigman>;
+using Creeper = ConcreteMob<MobType::Creeper>;
+using Silverfish = ConcreteMob<MobType::Silverfish>;
+using Blaze = ConcreteMob<MobType::Blaze>;
+using Witch = ConcreteMob<MobType::Witch>;
+using Slime = ConcreteMob<MobType::Slime>;
+using Giant = ConcreteMob<MobType::Giant>;
+
+using AllMobs = std::tuple<Zombie, Spider, Skeleton, PigMan, Creeper, Silverfish, Blaze, Witch, Slime, Giant>;
+
+class MobHandler : public sp::GenericHandler<AllMobs> {};
+
+using MobFactory = sp::MessageFactory<Mob, AllMobs>;
+
+class MobListener {
+  public:
+	virtual void OnMobSpawn(Mob* mob) {
+		MobHandler h;
+	}
+	virtual void OnMobDie(Mob* mob) {}
+
+	virtual void OnMobDamage(Mob* target, float damage, Tower* damager) {}
+
+	virtual void OnMobTouchCastle(Mob* damager, TeamCastle* enemyCastle) {}
+	virtual void OnMobCastleDamage(Mob* damager, TeamCastle* enemyCastle, float damage) {}
+};
+
+using MobList = std::vector<MobPtr>;
+
+// typedef utils::ObjectNotifier<MobListener> MobNotifier;
+
+}  // namespace game
+}  // namespace td

include/td/game/Team.h

@@ -0,0 +1,102 @@
+#pragma once
+
+#include <td/Types.h>
+
+#include <td/misc/Shapes.h>
+
+#include <vector>
+#include <memory>
+#include <cmath>
+
+namespace td {
+namespace game {
+
+class Player;
+
+class Spawn : public utils::shape::Rectangle {
+private:
+	Direction m_Direction;
+public:
+	Spawn() : m_Direction(Direction::PositiveX) {
+		SetWidth(5);
+		SetHeight(5);
+	}
+
+	Direction GetDirection() const { return m_Direction; }
+
+	void SetDirection(Direction direction) { m_Direction = direction; }
+};
+
+class Team;
+
+class TeamCastle : public utils::shape::Rectangle {
+private:
+	float m_Life;
+public:
+	static constexpr int CastleMaxLife = 1000;
+
+	TeamCastle() : m_Life(CastleMaxLife) {
+		SetWidth(5);
+		SetHeight(5);
+	}
+
+	float GetLife() const { return m_Life; }
+
+	void SetLife(float life) { m_Life = life; }
+	void Damage(float damage) { m_Life = std::max(0.0f, m_Life - damage); }
+
+	void SetShape(utils::shape::Rectangle rect) {
+		SetCenter(rect.GetCenter());
+		SetSize(rect.GetSize());
+	}
+};
+
+class Team {
+private:
+	std::vector<Player*> m_Players;
+	TeamColor m_Color;
+	Spawn m_Spawn;
+	TeamCastle m_TeamCastle;
+public:
+	Team(TeamColor color) : m_Color(color) {}
+
+	void AddPlayer(Player* newPlayer);
+	void RemovePlayer(const Player* player);
+
+	TeamColor GetColor() const;
+
+	const Spawn& GetSpawn() const { return m_Spawn; }
+	Spawn& GetSpawn() { return m_Spawn; }
+
+	const TeamCastle& GetCastle() const { return m_TeamCastle; }
+	TeamCastle& GetCastle() { return m_TeamCastle; }
+
+	std::uint8_t GetPlayerCount() const;
+};
+
+struct TeamList {
+	std::array<Team, 2> m_Teams;
+
+	TeamList() : m_Teams{Team{TeamColor::Red}, Team{TeamColor::Blue}}{
+		
+	}
+
+	Team& operator[](std::size_t a_Index) {
+		return m_Teams[a_Index];
+	}
+
+	Team& operator[](TeamColor a_Index) {
+		return m_Teams[static_cast<std::size_t>(a_Index)];
+	}
+
+	const Team& operator[](std::size_t a_Index) const {
+		return m_Teams[a_Index];
+	}
+
+	const Team& operator[](TeamColor a_Index) const {
+		return m_Teams[static_cast<std::size_t>(a_Index)];
+	}
+};
+
+} // namespace game
+} // namespace td

include/td/game/Towers.h

@@ -0,0 +1,147 @@
+#pragma once
+
+#include <memory>
+#include <string>
+
+#include <td/misc/Shapes.h>
+
+#include <td/Types.h>
+
+#include <sp/common/GenericHandler.h>
+#include <sp/protocol/ConcreteMessage.h>
+#include <sp/protocol/MessageFactory.h>
+
+namespace td {
+namespace game {
+
+class World;
+class Mob;
+
+typedef std::shared_ptr<Mob> MobPtr;
+
+enum class TowerSize : std::uint8_t {
+	Little = 3,	 // 3x3
+	Big = 5,	 // 5x5
+};
+
+enum class TowerPath : std::uint8_t {
+	Top = 0,
+	Base,  // Base Path
+	Bottom
+};
+
+class TowerStats {
+  private:
+	float m_Rate;
+	float m_Damage;
+	std::uint8_t m_Range;
+
+  public:
+	TowerStats(float rate, float damage, std::uint8_t range) : m_Rate(rate), m_Damage(damage), m_Range(range) {}
+
+	float GetDamageRate() const {
+		return m_Rate;
+	}
+	float GetDamage() const {
+		return m_Damage;
+	}
+	std::uint8_t GetRange() const {
+		return m_Range;
+	}
+};
+
+class TowerLevel {
+  private:
+	// 1, 2, 3, 4
+	std::uint8_t m_Level : 3;
+	// 0 : base path       1 : top path (if there is bottom path)     2 : bottom path (if there is top path)
+	TowerPath m_Path : 2;
+
+  public:
+	TowerLevel() : m_Level(1), m_Path(TowerPath::Base) {}
+	TowerLevel(std::uint8_t level, TowerPath path) : m_Level(level), m_Path(path) {}
+
+	std::uint8_t GetLevel() const {
+		return m_Level;
+	}
+	TowerPath GetPath() const {
+		return m_Path;
+	}
+
+	void SetLevel(std::uint8_t level) {
+		m_Level = level;
+	}
+	void SetPath(TowerPath path) {
+		m_Path = path;
+	}
+
+	// operator to sort maps
+	friend bool operator<(const TowerLevel& level, const TowerLevel& other) {
+		return level.GetLevel() + static_cast<std::uint8_t>(level.GetPath()) * 4 <
+			   other.GetLevel() + static_cast<std::uint8_t>(other.GetPath()) * 4;
+	}
+};
+
+using TowerID = std::uint16_t;
+
+class TowerHandler;
+
+class Tower : public utils::shape::Circle, public sp::MessageBase<TowerType, TowerHandler> {
+  public:
+	TowerID m_ID;
+	TowerLevel m_Level{};
+	PlayerID m_Builder;
+
+  public:
+	Tower() : m_ID(0), m_Level({}), m_Builder(0) {}
+
+	virtual TowerType GetType() const = 0;
+	virtual TowerSize GetSize() const = 0;
+	virtual void Tick(std::uint64_t delta, World* world) = 0;
+};
+
+struct TowerData {};
+
+template <TowerType Type, TowerSize Size>
+class ConcreteTower : public sp::ConcreteMessage<TowerData, Tower, Type, false> {
+  public:
+	using HandlerType = typename sp::ConcreteMessage<TowerData, Tower, Type, false>::HandlerType;
+
+	virtual TowerSize GetSize() const override {
+		return Size;
+	}
+
+	virtual TowerType GetType() const override {
+		return Type;
+	}
+
+	virtual void Tick(std::uint64_t delta, World* world) override {}
+
+	virtual void Dispatch(HandlerType& handler) const override {
+		handler.Handle(*this);
+	}
+};
+
+using TowerPtr = std::shared_ptr<Tower>;
+
+using ArcherTower = ConcreteTower<TowerType::Archer, TowerSize::Little>;
+using ArtilleryTower = ConcreteTower<TowerType::Artillery, TowerSize::Little>;
+using IceTower = ConcreteTower<TowerType::Ice, TowerSize::Little>;
+using LeachTower = ConcreteTower<TowerType::Leach, TowerSize::Big>;
+using MageTower = ConcreteTower<TowerType::Mage, TowerSize::Little>;
+using NecromancerTower = ConcreteTower<TowerType::Necromancer, TowerSize::Big>;
+using PoisonTower = ConcreteTower<TowerType::Poison, TowerSize::Little>;
+using QuakeTower = ConcreteTower<TowerType::Quake, TowerSize::Little>;
+using SorcererTower = ConcreteTower<TowerType::Sorcerer, TowerSize::Little>;
+using TurretTower = ConcreteTower<TowerType::Turret, TowerSize::Big>;
+using ZeusTower = ConcreteTower<TowerType::Zeus, TowerSize::Little>;
+
+using AllTowers = std::tuple<ArcherTower, ArtilleryTower, IceTower, LeachTower, MageTower, NecromancerTower, PoisonTower, QuakeTower,
+	SorcererTower, TurretTower, ZeusTower>;
+
+using TowerFactory = sp::MessageFactory<Tower, AllTowers>;
+
+class TowerHandler : public sp::GenericHandler<AllTowers> {};
+
+}  // namespace game
+}  // namespace td

include/td/game/World.h

@@ -1,27 +1,139 @@
 #pragma once
 
-#include <td/game/GameHistory.h>
-#include <td/game/WorldState.h>
-#include <vector>
+#include <td/game/WorldTypes.h>
+#include <td/protocol/packet/Packets.h>
+#include <td/simulation/WorldTicker.h>
 
 namespace td {
 namespace game {
 
 class World {
-  private:
-	std::vector<WorldState> m_WorldStates;
-	GameHistory m_GameHistory;
+  protected:
+	// header
+	TowerTileColorPalette m_TowerPlacePalette;
+	Color m_WalkablePalette;
+	std::vector<Color> m_DecorationPalette;
+	Color m_Background;
+	SpawnColorPalette m_SpawnColorPalette;
+	TilePalette m_TilePalette;
 
-	float m_OffsetTime;
+	//data
+	ChunkList m_Chunks;
+
+	std::shared_ptr<sim::WorldSnapshot> m_CurrentState;
+	std::shared_ptr<sim::WorldSnapshot> m_NextState;
+
+  private:
+	sim::WorldTicker m_Ticker;
 
   public:
 	World();
+	World(World&&) = default;
 
-	void Tick(float a_Delta);
+	bool LoadMap(const protocol::pdata::WorldHeader& worldHeader);
+	bool LoadMap(const protocol::pdata::WorldData& worldData);
+
+	bool LoadMapFromFile(const std::string& fileName);
+	bool SaveMap(const std::string& fileName) const;
+
+	void SpawnMobAt(MobID id, MobType type, std::uint8_t level, PlayerID sender, float x, float y, Direction dir);
+
+	TowerPtr PlaceTowerAt(TowerID id, TowerType type, std::int32_t x, std::int32_t y, PlayerID builder);
+	TowerPtr RemoveTower(TowerID id);
+
+	TilePtr GetTile(std::int32_t x, std::int32_t y) const;
+
+	const TowerTileColorPalette& GetTowerTileColorPalette() const {
+		return m_TowerPlacePalette;
+	}
+	const Color& GetWalkableTileColor() const {
+		return m_WalkablePalette;
+	}
+	const std::vector<Color>& GetDecorationPalette() const {
+		return m_DecorationPalette;
+	}
+	const Color& GetBackgroundColor() const {
+		return m_Background;
+	}
+
+	const TilePalette& GetTilePalette() const {
+		return m_TilePalette;
+	}
+
+	TilePtr GetTilePtr(TileIndex index) const {
+		if (index == 0)
+			return TilePtr(nullptr);
+		return m_TilePalette.at(index - 1);
+	}
+
+	bool CanPlaceLittleTower(const Vec2f& worldPos, PlayerID player) const;
+	bool CanPlaceBigTower(const Vec2f& worldPos, PlayerID player) const;
+
+	TowerPtr GetTower(const Vec2f& position) const;	 // returns null if no tower is here
+
+	const ChunkList& GetChunks() const {
+		return m_Chunks;
+	}
+
+	const Color& GetSpawnColor(TeamColor color) const {
+		return m_SpawnColorPalette[static_cast<std::size_t>(color)];
+	}
+	const SpawnColorPalette& GetSpawnColors() const {
+		return m_SpawnColorPalette;
+	}
+
+	const MobList& GetMobList() const {
+		return m_CurrentState->m_Mobs;
+	}
+	MobList& GetMobList() {
+		return m_CurrentState->m_Mobs;
+	}
+
+	const Color* GetTileColor(const TilePtr& tile) const;
+
+	Team& GetRedTeam() {
+		return m_CurrentState->m_Teams[TeamColor::Red];
+	}
+	const Team& GetRedTeam() const {
+		return m_CurrentState->m_Teams[TeamColor::Red];
+	}
+
+	Team& GetBlueTeam() {
+		return m_CurrentState->m_Teams[TeamColor::Blue];
+	}
+	const Team& GetBlueTeam() const {
+		return m_CurrentState->m_Teams[TeamColor::Red];
+	}
+
+	Team& GetTeam(TeamColor team) {
+		return m_CurrentState->m_Teams[team];
+	}
+	const Team& GetTeam(TeamColor team) const {
+		return m_CurrentState->m_Teams[team];
+	}
+
+	const TeamList& GetTeams() const {
+		return m_CurrentState->m_Teams;
+	}
+
+	const TowerList& GetTowers() const {
+		return m_CurrentState->m_Towers;
+	}
+
+	TowerPtr GetTowerById(TowerID tower);
+
+	const Player* GetPlayerById(PlayerID id) const;
+
+	const std::shared_ptr<sim::WorldSnapshot>& Tick(const protocol::LockStep& a_LockStep, FpFloat a_Delta);
+
+	void ResetSnapshots(std::shared_ptr<sim::WorldSnapshot>& a_Current, std::shared_ptr<sim::WorldSnapshot>& a_Next);
 
   private:
-	std::uint16_t GetCursorPos();
+	void TickMobs(std::uint64_t delta);
+	void CleanDeadMobs();
 };
 
+using WorldPtr = std::shared_ptr<World>;
+
 }  // namespace game
 }  // namespace td

include/td/game/WorldState.h

@@ -1,21 +0,0 @@
-#pragma once
-
-#include <td/protocol/command/Commands.h>
-
-namespace td {
-namespace game {
-
-class WorldState {
-  private:
-  	// list of players, mobs, towers, castles
-  public:
-	WorldState() {}
-
-	WorldState GetNextState(const protocol::LockStep& a_Step);
-
-  private:
-	void Tick(float a_Delta);
-};
-
-}  // namespace game
-}  // namespace td

include/td/game/WorldTypes.h

@@ -0,0 +1,117 @@
+#pragma once
+
+#include <td/Maths.h>
+#include <td/game/Team.h>
+#include <td/game/Towers.h>
+
+#include <sp/io/SerializableMessage.h>
+
+namespace td {
+namespace game {
+
+using ChunkCoord = Vec2<std::int16_t>;
+
+class Game;
+
+enum class TileType : std::uint8_t {
+	None = 0,
+	Tower,
+	Walk,
+	Decoration,
+	/*Heal,
+	Lava,
+	Bedrock,
+	Freeze,
+	Ice,*/
+};
+
+static constexpr Color BLACK{0, 0, 0};
+static constexpr Color WHITE{255, 255, 255};
+
+static constexpr Color RED{255, 0, 0};
+static constexpr Color GREEN{0, 255, 0};
+static constexpr Color BLUE{0, 0, 255};
+
+class TileHandler;
+
+using Tile = sp::MessageBase<TileType, TileHandler>;
+
+template <TileType ID, typename TileData>
+using ConcreteTile = sp::ConcreteMessage<TileData, Tile, ID>;
+
+namespace data {
+struct EmptyData {};
+
+struct TowerTileData {
+	std::uint8_t m_ColorPaletteRef;
+	TeamColor m_TeamOwner;
+};
+
+struct WalkableTileData {
+	Direction m_Direction;
+};
+
+struct DecorationTileData {
+	std::uint16_t m_ColorPaletteRef;
+};
+}  // namespace data
+
+using EmptyTile = ConcreteTile<TileType::None, data::EmptyData>;
+using TowerTile = ConcreteTile<TileType::Tower, data::TowerTileData>;
+using WalkableTile = ConcreteTile<TileType::Walk, data::WalkableTileData>;
+using DecorationTile = ConcreteTile<TileType::Decoration, data::DecorationTileData>;
+
+using AllTiles = std::tuple<EmptyTile, TowerTile, WalkableTile, DecorationTile>;
+
+using TileFactory = sp::MessageFactory<Tile, AllTiles>;
+
+class TileHandler : public sp::GenericHandler<AllTiles> {};
+
+using TilePtr = sp::SerializableMessage<TileFactory>;
+
+// typedef std::shared_ptr<Tile> TilePtr;
+typedef std::vector<std::uint16_t> ChunkPalette;
+
+typedef std::shared_ptr<WalkableTile> WalkableTilePtr;
+
+typedef std::uint32_t TileIndex;
+
+// 32 x 32 area
+struct Chunk {
+	enum { ChunkWidth = 32, ChunkHeight = 32, ChunkSize = ChunkWidth * ChunkHeight };
+	using ChunkData = std::array<std::uint16_t, ChunkSize>;
+	using ChunkPackedData = std::vector<uint64_t>;
+
+	// stores index of tile palette
+	ChunkPalette m_Palette;
+	ChunkPackedData m_Data;
+
+	TileIndex GetTileIndex(std::uint16_t tileNumber) const;
+};
+
+typedef std::shared_ptr<Chunk> ChunkPtr;
+
+typedef std::array<Color, 2> TowerTileColorPalette;
+
+typedef std::vector<TilePtr> TilePalette;
+
+typedef std::array<Color, 2> SpawnColorPalette;
+
+typedef std::vector<TowerPtr> TowerList;
+
+using ChunkList = std::unordered_map<ChunkCoord, ChunkPtr>;
+
+}  // namespace game
+
+}  // namespace td
+
+
+
+namespace std {
+template <>
+struct hash<td::game::ChunkCoord> {
+	std::size_t operator()(const td::game::ChunkCoord& key) const noexcept {
+		return std::hash<std::int16_t>()(key.x << 16 | key.y);
+	}
+};
+}  // namespace std

include/td/misc/Shapes.h

@@ -0,0 +1,96 @@
+#pragma once
+
+#include <cstdint>
+
+namespace td {
+namespace utils {
+namespace shape {
+
+class Point {
+private:
+	float m_X, m_Y;
+public:
+	Point() : m_X(0), m_Y(0) {}
+	Point(float x, float y) : m_X(x), m_Y(y) {}
+
+	float GetX() const { return m_X; }
+	float GetY() const { return m_Y; }
+
+	void SetX(float x) { m_X = x; }
+	void SetY(float y) { m_Y = y; }
+
+	float Distance(const Point& point) const;
+	float DistanceSquared(const Point& point) const;
+};
+
+class Circle;
+
+class Rectangle {
+private:
+	Point m_Center;
+	float m_Width, m_Height;
+public:
+	Rectangle() : m_Center(), m_Width(0), m_Height(0) {}
+
+	const Point& GetCenter() const { return m_Center; }
+	float GetCenterX() const { return m_Center.GetX(); }
+	float GetCenterY() const { return m_Center.GetY(); }
+
+	float GetWidth() const { return m_Width; }
+	float GetHeight() const { return m_Height; }
+
+	Point GetTopLeft() const { return { m_Center.GetX() - (m_Width / 2.0f), m_Center.GetY() - (m_Height / 2.0f) }; }
+	Point GetBottomRight() const { return { m_Center.GetX() + (m_Width / 2.0f), m_Center.GetY() + (m_Height / 2.0f) }; }
+
+	void SetCenter(const Point& center) { m_Center = center; }
+	void SetCenterX(float x) { m_Center.SetX(x); }
+	void SetCenterY(float y) { m_Center.SetY(y); }
+
+	void SetSize(float width, float height) { SetWidth(width); SetHeight(height); }
+	void SetSize(Point size) { SetSize(size.GetX(), size.GetY()); }
+	Point GetSize() { return { m_Width, m_Height }; }
+
+	void SetWidth(float width) { m_Width = width; }
+	void SetHeight(float height) { m_Height = height; }
+
+	bool CollidesWith(const Point& point) const;
+	bool CollidesWith(const Rectangle& rect) const;
+	bool CollidesWith(const Circle& circle) const;
+
+	// distance from the closest side of the rectangle
+	float Distance(const Circle& circle) const;
+	float DistanceSquared(const Circle& circle) const;
+};
+
+class Circle {
+private:
+	Point m_Center;
+	float m_Radius;
+public:
+	Circle(float x, float y, float radius) : m_Center(x, y), m_Radius(radius) {}
+	Circle() : m_Radius(0) {}
+
+	const Point& GetCenter() const { return m_Center; }
+	float GetCenterX() const { return m_Center.GetX(); }
+	float GetCenterY() const { return m_Center.GetY(); }
+
+	float GetRadius() const { return m_Radius; }
+
+	void SetCenter(const Point& center) { m_Center = center; }
+	void SetCenterX(float x) { m_Center.SetX(x); }
+	void SetCenterY(float y) { m_Center.SetY(y); }
+
+	void SetRadius(float radius) { m_Radius = radius; }
+
+	bool CollidesWith(const Point& point) const;
+	bool CollidesWith(const Rectangle& rect) const;
+	bool CollidesWith(const Circle& circle) const;
+
+	// distance from the closest side of the rectangle
+	float Distance(const Rectangle& rect) const;
+	float DistanceSquared(const Rectangle& rect) const;
+};
+
+} // namespace shape
+} // namespace utils
+} // namespace td

include/td/misc/Signal.h

@@ -0,0 +1,100 @@
+#pragma once
+
+#include <algorithm>
+#include <functional>
+#include <td/common/NonCopyable.h>
+#include <vector>
+
+namespace td {
+namespace utils {
+
+/**
+ * \brief Signal class
+ */
+template <typename... Args>
+class SignalRaw : private NonCopyable {
+  public:
+	using FnType = void(Args...);
+	using CallBack = std::function<FnType>;
+
+  private:
+	std::vector<CallBack> m_Callbacks;
+
+  public:
+	void Connect(const CallBack& a_Callback) {
+		m_Callbacks.push_back(a_Callback);
+	}
+
+	void Disconnect(const CallBack& a_Callback) {
+		auto it = std::find_if(m_Callbacks.begin(), m_Callbacks.end(),
+			[&a_Callback](CallBack& callback) { return a_Callback.template target<FnType>() == callback.template target<FnType>(); });
+		m_Callbacks.erase(it);
+	}
+
+	void operator()(Args... args) const {
+		for (const CallBack& callback : m_Callbacks) {
+			callback(args...);
+		}
+	}
+};
+
+/**
+ * \brief Memory managed Signal class
+ */
+template <typename... Args>
+class Signal {
+  public:
+	using SignalBase = SignalRaw<Args...>;
+	using CallBack = typename SignalBase::CallBack;
+	using SignalPtr = std::shared_ptr<SignalBase>;
+	class ConnectionGuard;
+
+  private:
+	SignalPtr m_Signal;
+
+  public:
+	Signal() : m_Signal(std::make_shared<SignalBase>()) {}
+	Signal(const Signal&) = default;
+
+	void Connect(const CallBack& a_Callback) {
+		m_Signal->Connect(a_Callback);
+	}
+
+	[[nodiscard]] std::unique_ptr<ConnectionGuard> ConnectSafe(const CallBack& a_Callback) {
+		Connect(a_Callback);
+		return std::make_unique<ConnectionGuard>(*this, a_Callback);
+	}
+
+	void Disconnect(const CallBack& a_Callback) {
+		m_Signal->Disconnect(a_Callback);
+	}
+
+	void operator()(Args... args) const {
+		m_Signal->operator()(args...);
+	}
+};
+
+class Connection {
+  public:
+	virtual ~Connection() {}
+};
+
+template <typename... Args>
+class Signal<Args...>::ConnectionGuard : public Connection {
+  private:
+	using CallBack = typename Signal<Args...>::CallBack;
+
+	std::weak_ptr<SignalRaw<Args...>> m_Signal;
+	CallBack m_Callback;
+
+  public:
+	ConnectionGuard(const Signal<Args...>& a_Signal, const CallBack& a_Callback) : m_Signal(a_Signal.m_Signal), m_Callback(a_Callback) {}
+
+	~ConnectionGuard() {
+		if (!m_Signal.expired())
+			m_Signal.lock()->Disconnect(m_Callback);
+	}
+};
+
+}  // namespace utils
+}  // namespace td

include/td/misc/SlotGuard.h

@@ -0,0 +1,32 @@
+#pragma once
+
+#include <td/misc/Signal.h>
+
+namespace td {
+namespace utils {
+
+/**
+ * \brief Wrapper class to automatically disconnect from a Signal on object destruction
+ * \note You should inherit this class privately
+ * \sa Signal
+ */
+class SlotGuard {
+  private:
+	std::vector<std::unique_ptr<Connection>> m_Connections;
+
+  public:
+	/**
+	 * \brief Connect a signal to a function (with the same signature)
+	 */
+	template <typename... Args>
+	void Connect(Signal<Args...> a_Signal, const typename Signal<Args...>::CallBack& a_Callback) {
+		m_Connections.push_back(a_Signal.ConnectSafe(a_Callback));
+	}
+
+	void Disconnect() {
+		m_Connections.clear();
+	}
+};
+
+}  // namespace utils
+}  // namespace td

include/td/protocol/Dispatcher.h

@@ -1,61 +0,0 @@
-#pragma once
-
-/**
- * \file PacketDispatcher.h
- * \brief File containing the td::protocol::PacketDispatcher class
- */
-
-#include <td/common/NonCopyable.h>
-#include <td/protocol/packet/Packets.h>
-
-#include <map>
-
-namespace td {
-namespace protocol {
-
-/**
- * \class Dispatcher
- * \brief Class used to dispatch things
- */
-template <typename T_Enum, typename T_Handler, typename T>
-class Dispatcher : private NonCopyable {
-  private:
-	std::map<T_Enum, std::vector<T_Handler*>> m_Handlers;
-
-  public:
-	/**
-	 * \brief Constructor
-	 */
-	Dispatcher() {}
-
-	/**
-	 * \brief Dispatch a packet
-	 * \param packet The packet to dispatch
-	 */
-	void Dispatch(const T& packet);
-
-	/**
-	 * \brief Register a packet handler
-	 * \param type The packet type
-	 * \param handler The packet handler
-	 */
-	void RegisterHandler(T_Enum type, T_Handler& handler);
-
-	/**
-	 * \brief Unregister a packet handler
-	 * \param type The packet type
-	 * \param handler The packet handler
-	 */
-	void UnregisterHandler(T_Enum type, T_Handler& handler);
-
-	/**
-	 * \brief Unregister a packet handler
-	 * \param handler The packet handler
-	 */
-	void UnregisterHandler(T_Handler& handler);
-};
-
-}  // namespace protocol
-}  // namespace td
-
-#include "Dispatcher.inl"

include/td/protocol/Dispatcher.inl

@@ -1,38 +0,0 @@
-#pragma once
-
-namespace td {
-namespace protocol {
-
-template <typename T_Enum, typename T_Handler, typename T>
-void Dispatcher<T_Enum, T_Handler, T>::Dispatch(const T& packet) {
-	T_Enum type = packet.GetType();
-	for (auto* handler : m_Handlers[type])
-		handler->Check(packet);
-}
-
-template <typename T_Enum, typename T_Handler, typename T>
-void Dispatcher<T_Enum, T_Handler, T>::RegisterHandler(T_Enum type, T_Handler& handler) {
-	auto found = std::find(m_Handlers[type].begin(), m_Handlers[type].end(), &handler);
-	if (found == m_Handlers[type].end())
-		m_Handlers[type].push_back(&handler);
-}
-
-template <typename T_Enum, typename T_Handler, typename T>
-void Dispatcher<T_Enum, T_Handler, T>::UnregisterHandler(T_Enum type, T_Handler& handler) {
-	m_Handlers[type].erase(std::remove(m_Handlers[type].begin(), m_Handlers[type].end(), &handler), m_Handlers[type].end());
-}
-
-template <typename T_Enum, typename T_Handler, typename T>
-void Dispatcher<T_Enum, T_Handler, T>::UnregisterHandler(T_Handler& handler) {
-	for (auto& pair : m_Handlers) {
-		if (pair.second.empty())
-			continue;
-
-		PacketType type = pair.first;
-
-		m_Handlers[type].erase(std::remove(m_Handlers[type].begin(), m_Handlers[type].end(), &handler), m_Handlers[type].end());
-	}
-}
-
-}  // namespace protocol
-}  // namespace td

include/td/protocol/command/CommandData.h

@@ -3,40 +3,40 @@
 #include <array>
 #include <string>
 #include <td/Types.h>
+#include <sp/protocol/BitField.h>
 
 namespace td {
 namespace protocol {
 
 namespace cdata {
 
-
 struct PlaceTower {
-	TowerType m_Type : 4;
-	PlayerID m_Placer : 4;
+	sp::BitField<TowerType, 4> m_Type;
+	sp::BitField<PlayerID, 4> m_Placer;
 	TowerCoords m_Position;
 };
 
 struct UpgradeTower {
-	TowerID m_Tower : 12;
-	std::uint8_t m_Upgrade : 4;
+	sp::BitField<TowerID, 12> m_Tower;
+	sp::BitField<std::uint8_t, 4> m_Upgrade;
 };
 
 struct SpawnTroop {
-	EntityType m_Type : 5;
-	std::uint8_t m_Level : 3;
+	sp::BitField<EntityType, 5> m_Type;
+	sp::BitField<std::uint8_t, 3> m_Level;
 	EntityCoords m_Position;
 	PlayerID m_Sender;
 };
 
 struct UseItem {
-	ShopItem m_Item : 4;
-	PlayerID m_User : 4;
+	sp::BitField<ShopItem, 4> m_Item;
+	sp::BitField<PlayerID, 4> m_User;
 	EntityCoords m_Position;
 };
 
 struct TeamChange {
-	PlayerID m_Player : 7;
-	Team m_NewTeam : 1;
+	sp::BitField<PlayerID, 7> m_Player;
+	sp::BitField<TeamColor, 1> m_NewTeam;
 };
 
 struct PlayerJoin {

include/td/protocol/command/CommandDeclare.h

@@ -1,22 +0,0 @@
-#pragma once
-
-
-namespace td {
-namespace protocol {
-
-/**
- * \def DeclareAllPacket
- * \brief Avoids repetitive operations on commands
- */
-#define DeclareAllCommand() \
-	DeclareCommand(End) \
-	DeclareCommand(PlaceTower) \
-	DeclareCommand(PlayerJoin) \
-	DeclareCommand(SpawnTroop) \
-	DeclareCommand(TeamChange) \
-	DeclareCommand(UpgradeTower) \
-	DeclareCommand(UseItem)
-
-
-}  // namespace protocol
-}  // namespace td

include/td/protocol/command/CommandDispatcher.h

@@ -1,17 +0,0 @@
-#pragma once
-
-/**
- * \file CommandDispatcher.h
- * \brief File containing the td::protocol::CommandDispatcher class
- */
-
-#include <td/protocol/Dispatcher.h>
-#include <td/protocol/command/Commands.h>
-
-namespace td {
-namespace protocol {
-
-using CommandDispatcher = Dispatcher<CommandType, CommandVisitor, Command>;
-
-}  // namespace protocol
-}  // namespace td

include/td/protocol/command/CommandFactory.h

@@ -1,19 +0,0 @@
-#pragma once
-
-#include <memory>
-#include <td/protocol/command/Commands.h>
-
-namespace td {
-namespace protocol {
-namespace CommandFactory {
-
-template <typename CommandDerived, typename = typename std::enable_if<std::is_base_of<Command, CommandDerived>::value>::type>
-std::shared_ptr<CommandDerived> CreateCommand() {
-	return std::make_shared<CommandDerived>();
-}
-
-const std::shared_ptr<Command>& CreateReadOnlyCommand(CommandType a_Type);
-
-}  // namespace CommandFactory
-}  // namespace protocol
-}  // namespace td

include/td/protocol/command/CommandSerializer.h

@@ -1,21 +0,0 @@
-#pragma once
-
-#include <memory>
-#include <td/common/DataBuffer.h>
-
-namespace td {
-namespace protocol {
-
-class Command;
-
-using CommandPtr = std::shared_ptr<Command>;
-
-namespace CommandSerializer {
-
-DataBuffer Serialize(const Command& a_Command);
-
-std::shared_ptr<Command> Deserialize(DataBuffer& a_Data);
-
-}  // namespace CommandSerializer
-}  // namespace protocol
-}  // namespace td

include/td/protocol/command/CommandVisitor.h

@@ -1,39 +0,0 @@
-#pragma once
-
-/**
- * \file CommandVisitor.h
- * \brief File containing the td::protocol::CommandVisitor class
- */
-
-#include <td/protocol/command/Commands.h>
-
-namespace td {
-namespace protocol {
-
-#define DeclareCommand(CommandName, ...)                                                                                              \
-	/** This function is called when the packet processed by CommandVisitor::Check is a CommandName */                                \
-	virtual void Visit(const commands::CommandName&) {}
-
-/**
- * \class CommandVisitor
- * \brief This class uses double-dispatch in order to find the real type of a packet
- */
-class CommandVisitor : private NonCopyable {
-  protected:
-	CommandVisitor() {}
-	virtual ~CommandVisitor() {}
-
-  public:
-	/**
-	 * \brief Calls the right CommandVisitor::Visit method corresponding to the real type of the packet
-	 * \param packet the Command to visit
-	 */
-	void Check(const Command& packet);
-
-	DeclareAllCommand()
-};
-
-#undef DeclareCommand
-
-}  // namespace protocol
-}  // namespace td

include/td/protocol/command/Commands.h

@@ -5,107 +5,63 @@
  * \brief File containing the definitions of the lockstep commands
  */
 
+#include <memory>
+#include <sp/common/GenericHandler.h>
+#include <sp/protocol/ConcreteMessage.h>
+#include <sp/protocol/MessageDispatcher.h>
+#include <sp/protocol/MessageFactory.h>
 #include <td/Types.h>
 #include <td/common/NonCopyable.h>
 #include <td/protocol/command/CommandData.h>
-#include <td/protocol/command/CommandDeclare.h>
-#include <memory>
+
+#include <sp/io/SerializableMessage.h>
 
 namespace td {
 namespace protocol {
 
-class CommandVisitor;
-
 /** A Command id is 8 bits wide */
-using CommandID = std::uint8_t;
-
-#define DeclareCommand(CommandName, ...) /** CommandName */ CommandName,
-
-/**
- * \enum CommandType
- * \brief Map a Command to an id
- */
-enum class CommandType : CommandID {
-
-	DeclareAllCommand()
-
-	/** The number of Commands */
-	COMMAND_COUNT
-};
-
-
-#undef DeclareCommand
-
-
-class Command : private NonCopyable {
-  public:
-	/**
-	 * \return The real type of the Command
-	 */
-	virtual CommandType GetType() const = 0;
-
-  private:
-	/** Use a CommandVisitor to make double-dispatch possible */
-	virtual void Accept(CommandVisitor& a_Visitor) const = 0;
-
-	friend class CommandVisitor;
+enum class CommandID : std::uint8_t {
+	End = 0,
+	PlaceTower,
+	PlayerJoin,
+	SpawnTroop,
+	TeamChange,
+	UpgradeTower,
+	UseItem,
 };
 
+class CommandHandler;
 
+using CommandBase = sp::MessageBase<CommandID, CommandHandler>;
 
+template <typename TData, CommandID ID>
+using CommandMessage = sp::ConcreteMessage<TData, CommandBase, ID>;
 
 
 namespace commands {
 
-/**
- * \class ConcreteCommand
- * \brief A Command associated with an id and holding data
- * \tparam PT The Command type
- * \tparam Data The structure holding the data of the Command (in td::protocol::data namespace)
- */
-template <CommandType CT, typename Data>
-class ConcreteCommand : public Command {
-  public:
-	/** The type of the struct holding the data */
-	using CommandDataType = Data;
-
-	/** The structure holding the actual data */
-	CommandDataType m_Data;
-
-	/** Construct the Command with data of type CommandDataType */
-	ConcreteCommand(const CommandDataType& a_Data = {});
-
-	constexpr CommandType GetType() const override {
-		return CT;
-	};
-
-  private:
-	void Accept(CommandVisitor& a_Visitor) const override;
-};
-
-
-
-
-
-// define TD_INSTANCIATE_COMMANDS
-// before including this file
-// if you want to instantiate templates
-#ifdef TD_INSTANCIATE_COMMANDS
-#define DeclareCommand(CommandName, ...)                                                                                              \
-	using CommandName = ConcreteCommand<CommandType::CommandName, cdata::CommandName>;                                                \
-	template class ConcreteCommand<CommandType::CommandName, cdata::CommandName>;
-#else
-#define DeclareCommand(CommandName, ...) /** Defines the CommandName Command */                                                       \
-	using CommandName = ConcreteCommand<CommandType::CommandName, cdata::CommandName>;
-#endif
-
-DeclareAllCommand()
-
-#undef DeclareCommand
+using EndCommand = CommandMessage<cdata::End, CommandID::End>;
+using PlaceTowerCommand = CommandMessage<cdata::PlaceTower, CommandID::PlaceTower>;
+using PlayerJoinCommand = CommandMessage<cdata::PlayerJoin, CommandID::PlayerJoin>;
+using SpawnTroopCommand = CommandMessage<cdata::SpawnTroop, CommandID::SpawnTroop>;
+using TeamChangeCommand = CommandMessage<cdata::TeamChange, CommandID::TeamChange>;
+using UpgradeTowerCommand = CommandMessage<cdata::UpgradeTower, CommandID::UpgradeTower>;
+using UseItemCommand = CommandMessage<cdata::UseItem, CommandID::UseItem>;
 
 }  // namespace commands
 
-using LockStep = std::vector<std::shared_ptr<protocol::Command>>;
+using AllCommands = std::tuple<commands::EndCommand, commands::PlaceTowerCommand, commands::PlayerJoinCommand,
+	commands::SpawnTroopCommand, commands::TeamChangeCommand, commands::UpgradeTowerCommand, commands::UseItemCommand>;
+
+class CommandHandler : public sp::GenericHandler<AllCommands> {};
+
+using CommandDispatcher = sp::MessageDispatcher<CommandBase>;
+
+using CommandFactory = sp::MessageFactory<CommandBase, AllCommands>;
+
+using CommandPtr = sp::SerializableMessage<CommandFactory>;
+
+using LockStep = std::vector<CommandPtr>;
 
 }  // namespace protocol
 }  // namespace td

include/td/protocol/packet/PacketData.h

@@ -3,9 +3,15 @@
 #include <td/Types.h>
 #include <vector>
 #include <td/protocol/command/Commands.h>
+#include <td/common/Array.h>
+#include <td/game/WorldTypes.h>
 
 // Make it dynamic ?
+#ifdef NDEBUG
 #define LOCKSTEP_BUFFER_SIZE 10
+#else
+#define LOCKSTEP_BUFFER_SIZE 1
+#endif
 
 namespace td {
 namespace protocol {
@@ -41,6 +47,11 @@ struct PlayerLeave {
 	PlayerID m_PlayerId;
 };
 
+struct PredictCommand {
+	CommandPtr m_Command;
+	StepTime m_FrameNumber;
+};
+
 /** Keep alive */
 struct KeepAlive {
 	std::uint64_t m_KeepAliveId;
@@ -59,7 +70,6 @@ struct ChatMessage {
 // TODO: handle players joining in the first second
 
 struct BeginGame {
-	MapData m_Map;
 	std::vector<PlayerInfo> m_BlueTeam;
 	std::vector<PlayerInfo> m_RedTeam;
 	// optional, used for players joining mid game
@@ -67,10 +77,47 @@ struct BeginGame {
 };
 
 struct LockSteps {
-	std::uint16_t m_FirstFrameNumber;
+	StepTime m_FirstFrameNumber;
 	std::array<LockStep, LOCKSTEP_BUFFER_SIZE> m_LockSteps;
 };
 
+struct WorldHeader {
+	game::TowerTileColorPalette m_TowerPlacePalette;
+	Color m_WalkablePalette;
+	std::vector<Color> m_DecorationPalette;
+	Color m_Background;
+
+	game::SpawnColorPalette m_SpawnColorPalette;
+
+	game::TilePalette m_TilePalette;
+
+	game::Spawn m_RedSpawn, m_BlueSpawn;
+	game::TeamCastle m_RedCastle, m_BlueCastle;
+};
+
+struct WorldData {
+	game::ChunkList m_Chunks;
+};
+
+// TODO: spawn multiple troops at the same time
+struct SpawnTroop {
+	sp::BitField<EntityType, 5> m_Type;
+	sp::BitField<std::uint8_t, 3> m_Level;
+};
+
+struct PlaceTower {
+	TowerType m_Type;
+	TowerCoords m_Position;
+};
+
+struct LockStepRequest {
+	std::vector<StepTime> m_Missing;
+};
+
+struct LockStepResponse {
+	std::map<StepTime, LockStep> m_Steps;
+};
+
 }  // namespace pdata
 }  // namespace protocol
 }  // namespace td

include/td/protocol/packet/PacketDeclare.h

@@ -1,48 +0,0 @@
-#pragma once
-
-/**
- * \file PacketDeclare.h
- * \brief Holds the definitions of the packets (but not their content)
- */
-
-namespace td {
-namespace protocol {
-
-/**
- * \enum PacketSender
- * \brief Indicate who should send a packet
- */
-enum class PacketSenderType {
-	/** Sent by clients and server */
-	Both = 1,
-	/** Sent by clients to the server */
-	Client,
-	/** Sent by server to the clients */
-	Server,
-};
-
-enum class PacketSendType {
-	Reliable = 1,
-	Unreliable,
-	UnreliableOrdered,
-};
-
-
-/**
- * \def DeclareAllPacket
- * \brief Avoids repetitive operations on packets
- */
-#define DeclareAllPacket() \
-	DeclarePacket(ChatMessage, Reliable, Both) \
-	DeclarePacket(BeginGame, Reliable, Server) \
-	DeclarePacket(Disconnect, Reliable, Both) \
-	DeclarePacket(KeepAlive, Reliable, Both)  \
-	DeclarePacket(LockSteps, Unreliable, Both)  \
-	DeclarePacket(LoggingSuccess, Reliable, Server) \
-	DeclarePacket(PlayerJoin, Reliable, Server) \
-	DeclarePacket(PlayerLeave, Reliable, Server) \
-	DeclarePacket(PlayerLogin, Reliable, Client) \
-
-
-}  // namespace protocol
-}  // namespace td

include/td/protocol/packet/PacketDispatcher.h

@@ -1,17 +0,0 @@
-#pragma once
-
-/**
- * \file PacketDispatcher.h
- * \brief File containing the td::protocol::PacketDispatcher class
- */
-
-#include <td/protocol/Dispatcher.h>
-#include <td/protocol/packet/Packets.h>
-
-namespace td {
-namespace protocol {
-
-using PacketDispatcher = Dispatcher<PacketType, PacketVisitor, Packet>;
-
-}  // namespace protocol
-}  // namespace td

include/td/protocol/packet/PacketFactory.h

@@ -1,19 +0,0 @@
-#pragma once
-
-#include <memory>
-#include <td/protocol/packet/Packets.h>
-
-namespace td {
-namespace protocol {
-namespace PacketFactory {
-
-template <typename PacketDerived, typename = typename std::enable_if<std::is_base_of<Packet, PacketDerived>::value>::type>
-std::unique_ptr<PacketDerived> CreatePacket() {
-	return std::make_unique<PacketDerived>();
-}
-
-const std::unique_ptr<Packet>& CreateReadOnlyPacket(PacketType a_Type);
-
-}  // namespace PacketFactory
-}  // namespace protocol
-}  // namespace td

include/td/protocol/packet/PacketSerialize.h

@@ -0,0 +1,18 @@
+#pragma once
+
+#include <td/protocol/packet/PacketData.h>
+
+namespace td {
+
+
+
+namespace game {
+
+sp::DataBuffer& operator<<(sp::DataBuffer& a_Buffer, const TeamCastle& a_Castle);
+sp::DataBuffer& operator>>(sp::DataBuffer& a_Buffer, TeamCastle& a_Castle);
+
+sp::DataBuffer& operator<<(sp::DataBuffer& a_Buffer, const Spawn& a_Spawn);
+sp::DataBuffer& operator>>(sp::DataBuffer& a_Buffer, Spawn& a_Spawn);
+
+}  // namespace game
+}  // namespace td

include/td/protocol/packet/PacketSerializer.h

@@ -1,21 +0,0 @@
-#pragma once
-
-#include <memory>
-#include <td/common/DataBuffer.h>
-
-namespace td {
-namespace protocol {
-
-class Packet;
-
-using PacketPtr = std::unique_ptr<Packet>;
-
-namespace PacketSerializer {
-
-DataBuffer Serialize(const Packet& a_Packet);
-
-std::unique_ptr<Packet> Deserialize(DataBuffer& a_Data);
-
-}  // namespace PacketSerializer
-}  // namespace protocol
-}  // namespace td

include/td/protocol/packet/PacketVisitor.h

@@ -1,39 +0,0 @@
-#pragma once
-
-/**
- * \file PacketVisitor.h
- * \brief File containing the td::protocol::PacketVisitor class
- */
-
-#include <td/protocol/packet/Packets.h>
-
-namespace td {
-namespace protocol {
-
-#define DeclarePacket(PacketName, ...)                                                                                                \
-	/** This function is called when the packet processed by PacketVisitor::Check is a PacketName */                                  \
-	virtual void Visit(const packets::PacketName&) {}
-
-/**
- * \class PacketVisitor
- * \brief This class uses double-dispatch in order to find the real type of a packet
- */
-class PacketVisitor : private NonCopyable {
-  protected:
-	PacketVisitor() {}
-	virtual ~PacketVisitor() {}
-
-  public:
-	/**
-	 * \brief Calls the right PacketVisitor::Visit method corresponding to the real type of the packet
-	 * \param packet the Packet to visit
-	 */
-	void Check(const Packet& packet);
-
-	DeclareAllPacket()
-};
-
-#undef DeclarePacket
-
-}  // namespace protocol
-}  // namespace td

include/td/protocol/packet/Packets.h

@@ -7,107 +7,75 @@
 
 #include <td/common/NonCopyable.h>
 #include <td/protocol/packet/PacketData.h>
-#include <td/protocol/packet/PacketDeclare.h>
+
+#include <sp/common/GenericHandler.h>
+#include <sp/protocol/ConcreteMessage.h>
+#include <sp/protocol/MessageBase.h>
+#include <sp/protocol/MessageDispatcher.h>
+#include <sp/protocol/MessageFactory.h>
 
 namespace td {
 namespace protocol {
 
-class PacketVisitor;
-
-/** A Packet id is 8 bits wide */
-using PacketID = std::uint8_t;
-using PeerID = std::uint16_t;
-
-#define DeclarePacket(PacketName, ...) /** PacketName */ PacketName,
-
-/**
- * \enum PacketType
- * \brief Map a Packet to an id
- */
-enum class PacketType : PacketID {
-
-	DeclareAllPacket()
-
-	/** The number of packets */
-	PACKET_COUNT
+enum class PacketID : std::uint8_t {
+	ChatMessage = 0,
+	BeginGame,
+	Disconnect,
+	KeepAlive,
+	LockStepRequest,
+	LockStepResponse,
+	LockSteps,
+	LoggingSuccess,
+	PlaceTower,
+	PlayerJoin,
+	PlayerLeave,
+	PlayerLogin,
+	PredictCommand,
+	SpawnTroop,
+	WorldHeader,
+	WorldData,
 };
 
+class PacketHandler;
 
-#undef DeclarePacket
-
-
-class Packet : private NonCopyable {
-  public:
-	/**
-	 * \return The real type of the packet
-	 */
-	virtual PacketType GetType() const = 0;
-
-	/**
-	 * \brief The network peer who sent the packet
-	 */
-	PeerID m_Sender;
-
-  private:
-	/** Use a PacketVisitor to make double-dispatch possible */
-	virtual void Accept(PacketVisitor& a_Visitor) const = 0;
-
-	friend class PacketVisitor;
-};
-
+using PacketBase = sp::MessageBase<PacketID, PacketHandler>;
 
 
+template <typename TData, PacketID ID>
+using PacketMessage = sp::ConcreteMessage<TData, PacketBase, ID>;
 
 
 namespace packets {
 
-/**
- * \class ConcretePacket
- * \brief A Packet associated with an id and holding data
- * \tparam PT The packet type
- * \tparam Data The structure holding the data of the packet (in td::protocol::data namespace)
- */
-template <PacketType PT, typename Data>
-class ConcretePacket : public Packet {
-  public:
-	/** The type of the struct holding the data */
-	using PacketDataType = Data;
-
-	/** The structure holding the actual data */
-	PacketDataType m_Data;
-
-	/** Construct the packet with data of type PacketDataType */
-	ConcretePacket(const PacketDataType& a_Data = {});
-
-	constexpr PacketType GetType() const override {
-		return PT;
-	};
-
-  private:
-	void Accept(PacketVisitor& a_Visitor) const override;
-};
-
-
-
-
-
-// define TD_INSTANCIATE_PACKETS
-// before including this file
-// if you want to instantiate templates
-#ifdef TD_INSTANCIATE_PACKETS
-#define DeclarePacket(PacketName, ...)                                                                                                \
-	using PacketName = ConcretePacket<PacketType::PacketName, pdata::PacketName>;                                                     \
-	template class ConcretePacket<PacketType::PacketName, pdata::PacketName>;
-#else
-#define DeclarePacket(PacketName, ...) /** Defines the PacketName packet */                                                           \
-	using PacketName = ConcretePacket<PacketType::PacketName, pdata::PacketName>;
-#endif
-
-DeclareAllPacket()
-
-#undef DeclarePacket
+using BeginGamePacket = PacketMessage<pdata::BeginGame, PacketID::BeginGame>;
+using ChatMessagePacket = PacketMessage<pdata::ChatMessage, PacketID::ChatMessage>;
+using DisconnectPacket = PacketMessage<pdata::Disconnect, PacketID::Disconnect>;
+using KeepAlivePacket = PacketMessage<pdata::KeepAlive, PacketID::KeepAlive>;
+using LockStepRequestPacket = PacketMessage<pdata::LockStepRequest, PacketID::LockStepRequest>;
+using LockStepResponsePacket = PacketMessage<pdata::LockStepResponse, PacketID::LockStepResponse>;
+using LockStepsPacket = PacketMessage<pdata::LockSteps, PacketID::LockSteps>;
+using LoggingSuccessPacket = PacketMessage<pdata::LoggingSuccess, PacketID::LoggingSuccess>;
+using PlaceTowerPacket = PacketMessage<pdata::PlaceTower, PacketID::PlaceTower>;
+using PlayerJoinPacket = PacketMessage<pdata::PlayerJoin, PacketID::PlayerJoin>;
+using PlayerLeavePacket = PacketMessage<pdata::PlayerLeave, PacketID::PlayerLeave>;
+using PlayerLoginPacket = PacketMessage<pdata::PlayerLogin, PacketID::PlayerLogin>;
+using PredictCommandPacket = PacketMessage<pdata::PredictCommand, PacketID::PredictCommand>;
+using SpawnTroopPacket = PacketMessage<pdata::SpawnTroop, PacketID::SpawnTroop>;
+using WorldHeaderPacket = PacketMessage<pdata::WorldHeader, PacketID::WorldHeader>;
+using WorldDataPacket = PacketMessage<pdata::WorldData, PacketID::WorldData>;
 
 }  // namespace packets
 
+using AllPackets = std::tuple<packets::BeginGamePacket, packets::ChatMessagePacket, packets::DisconnectPacket,
+	packets::KeepAlivePacket, packets::LockStepRequestPacket, packets::LockStepResponsePacket, packets::LockStepsPacket, packets::LoggingSuccessPacket, packets::PlaceTowerPacket,
+	packets::PlayerJoinPacket, packets::PlayerLeavePacket, packets::PlayerLoginPacket, packets::PredictCommandPacket,
+	packets::SpawnTroopPacket, packets::WorldHeaderPacket, packets::WorldDataPacket>;
+
+class PacketHandler : public sp::GenericHandler<AllPackets> {};
+
+using PacketDispatcher = sp::MessageDispatcher<PacketBase>;
+
+using PacketFactory = sp::MessageFactory<PacketBase, AllPackets>;
+
 }  // namespace protocol
 }  // namespace td

include/td/render/Camera.h

@@ -0,0 +1,41 @@
+#pragma once
+
+#include <td/Maths.h>
+#include <td/misc/Signal.h>
+
+namespace td {
+namespace render {
+
+class Camera {
+  private:
+	Mat4f m_ViewMatrix;
+	Mat4f m_ProjectionMatrix;
+	Mat4f m_InvViewMatrix;
+	Mat4f m_InvProjectionMatrix;
+
+	float m_CamDistance = 25.0f;
+	Vec3f m_CamPos{0, m_CamDistance, 0};
+	Vec2f m_CamLook{};
+
+	float m_Yaw = -PI / 2.0f;
+	float m_Pitch = -PI / 2.0f + 0.0000001f;
+
+  public:
+	utils::Signal<> OnPerspectiveChange;
+	utils::Signal<> OnViewChange;
+
+	const Mat4f& GetViewMatrix() const {
+		return m_ViewMatrix;
+	}
+
+	const Mat4f& GetProjectionMatrix() const {
+		return m_ProjectionMatrix;
+	}
+
+	void UpdatePerspective(float a_AspectRatio);
+
+	void SetCamPos(const Vec3f& a_NewPos);
+};
+
+}  // namespace render
+}  // namespace td

include/td/render/OpenGL.h

@@ -0,0 +1,8 @@
+#pragma once
+
+#ifdef TD_GL_LOADER_GLEW
+#include <GL/glew.h>
+#else
+#include <glbinding/gl/gl.h>
+using namespace gl;
+#endif

include/td/render/Renderer.h

@@ -0,0 +1,78 @@
+#pragma once
+
+#include <memory>
+#include <td/render/Camera.h>
+#include <td/render/loader/GLLoader.h>
+#include <td/render/shader/CameraShaderProgram.h>
+#include <td/misc/SlotGuard.h>
+
+namespace td {
+namespace render {
+
+class BasicRenderer {
+  public:
+	virtual void Render(float a_Lerp) = 0;
+	virtual ~BasicRenderer() {}
+
+	void Render(const GL::VertexArray& a_Vao);
+};
+
+template <typename TShader>
+class Renderer : public BasicRenderer, private utils::SlotGuard {
+  protected:
+	std::unique_ptr<TShader> m_Shader;
+	Camera& m_Camera;
+
+  public:
+	Renderer(Camera& a_Camera);
+	virtual ~Renderer() {}
+
+	template <typename T>
+	float Lerp(const T& a_Mob, float a_LerpFactor, const std::function<float(const T&)>& a_MemberGetter) {
+		return static_cast<float>(maths::Lerp(a_MemberGetter(a_Mob), a_MemberGetter(*a_Mob.m_Next), a_LerpFactor));
+	}
+};
+
+class RenderPipeline {
+  private:
+	std::vector<std::unique_ptr<BasicRenderer>> m_Renderers;
+
+  public:
+	RenderPipeline();
+	virtual ~RenderPipeline() {}
+
+	template <typename T, typename... Args>
+	void AddRenderer(Args&&... args) {
+		m_Renderers.push_back(std::make_unique<T>(args...));
+	}
+
+	void Clear() {
+		m_Renderers.clear();
+	}
+
+	void Render(float a_Lerp) {
+		for (auto& renderer : m_Renderers) {
+			renderer->Render(a_Lerp);
+		}
+	}
+};
+
+
+
+
+
+template <typename TShader>
+Renderer<TShader>::Renderer(Camera& a_Camera) : m_Shader(std::make_unique<TShader>()), m_Camera(a_Camera) {
+	Connect(a_Camera.OnPerspectiveChange, [this](){
+		m_Shader->Start();
+		m_Shader->SetProjectionMatrix(m_Camera.GetProjectionMatrix());
+	});
+
+	Connect(a_Camera.OnViewChange, [this]() {
+		m_Shader->Start();
+		m_Shader->SetViewMatrix(m_Camera.GetViewMatrix());
+	});
+}
+
+}  // namespace render
+}  // namespace td

include/td/render/loader/GLLoader.h

@@ -0,0 +1,86 @@
+#pragma once
+
+#include <sp/common/NonCopyable.h>
+
+#include <vector>
+
+namespace td {
+namespace GL {
+
+struct VertexAttribPointer {
+	unsigned int m_Index;
+	unsigned int m_Size;
+	unsigned int m_Offset;
+};
+
+class ElementBuffer : private sp::NonCopyable {
+  private:
+	unsigned int m_ID = 0;
+	std::size_t m_TriangleCount;
+
+  public:
+	ElementBuffer(ElementBuffer&& other) {
+		std::swap(m_ID, other.m_ID);
+		m_TriangleCount = other.m_TriangleCount;
+	}
+
+	explicit ElementBuffer(const std::vector<unsigned int>& indicies);
+	~ElementBuffer();
+
+	void Bind() const;
+	void Unbind() const;
+
+	std::size_t GetTriangleCount() const {
+		return m_TriangleCount;
+	}
+};
+
+class VertexBuffer : private sp::NonCopyable {
+  private:
+	unsigned int m_ID = 0, m_DataStride;
+	std::vector<VertexAttribPointer> m_VertexAttribs;
+
+  public:
+	VertexBuffer(VertexBuffer&& other) {
+		std::swap(m_ID, other.m_ID);
+		m_VertexAttribs = std::move(other.m_VertexAttribs);
+		m_DataStride = other.m_DataStride;
+	}
+
+	VertexBuffer(const std::vector<float>& data, unsigned int stride);
+	~VertexBuffer();
+
+	void Bind() const;
+	void Unbind() const;
+	void AddVertexAttribPointer(unsigned int index, unsigned int coordinateSize, unsigned int offset);
+	void BindVertexAttribs() const;
+};
+
+class VertexArray : private sp::NonCopyable {
+  private:
+	unsigned int m_ID = 0;
+	ElementBuffer m_ElementBuffer;
+	std::vector<VertexBuffer> m_VertexBuffers;	// use to destroy vbos when become unused
+  public:
+	VertexArray(VertexArray&& other) : m_ElementBuffer(std::move(other.m_ElementBuffer)) {
+		std::swap(m_ID, other.m_ID);
+		m_VertexBuffers = std::move(other.m_VertexBuffers);
+	}
+
+	VertexArray(ElementBuffer&& indicies);
+	~VertexArray();
+
+	std::size_t GetVertexCount() const {
+		return m_ElementBuffer.GetTriangleCount();
+	}
+
+	void BindVertexBuffer(VertexBuffer&& vbo);
+	void Bind() const;
+	void Unbind() const;
+
+  private:
+	void BindElementArrayBuffer();
+};
+
+}  // namespace GL
+}  // namespace td

include/td/render/loader/WorldLoader.h

@@ -0,0 +1,25 @@
+#pragma once
+
+#include <td/game/World.h>
+#include <td/render/loader/GLLoader.h>
+
+namespace td {
+namespace render {
+
+namespace WorldLoader {
+
+struct RenderData {
+	std::vector<float> positions;
+	std::vector<float> colors;
+};
+
+GL::VertexArray LoadMobModel();
+GL::VertexArray LoadWorldModel(const td::game::World* world);
+GL::VertexArray LoadTileSelectModel();
+RenderData LoadTowerModel(const game::TowerPtr& tower);
+
+} // namespace WorldLoader
+
+
+} // namespace render
+} // namespace td

include/td/render/renderer/EntityRenderer.h

@@ -0,0 +1,23 @@
+#pragma once
+
+#include <td/render/Renderer.h>
+#include <td/render/shader/EntityShader.h>
+#include <td/game/World.h>
+
+namespace td {
+namespace render {
+
+class EntityRenderer : public Renderer<shader::EntityShader> {
+  private:
+	const game::World& m_World;
+	std::unique_ptr<GL::VertexArray> m_EntityVao;
+
+  public:
+	EntityRenderer(Camera& a_Camera, const game::World& a_World);
+	virtual ~EntityRenderer();
+
+	virtual void Render(float a_Lerp) override;
+};
+
+}  // namespace render
+}  // namespace td

include/td/render/renderer/TowerRenderer.h

@@ -0,0 +1,23 @@
+#pragma once
+
+#include <td/render/Renderer.h>
+#include <td/render/shader/EntityShader.h>
+#include <td/game/World.h>
+
+namespace td {
+namespace render {
+
+class TowerRenderer : public Renderer<shader::EntityShader> {
+  private:
+	const game::World& m_World;
+	std::unique_ptr<GL::VertexArray> m_EntityVao;
+
+  public:
+	TowerRenderer(Camera& a_Camera, const game::World& a_World);
+	virtual ~TowerRenderer();
+
+	virtual void Render(float a_Lerp) override;
+};
+
+}  // namespace render
+}  // namespace td

include/td/render/renderer/WorldRenderer.h

@@ -0,0 +1,23 @@
+#pragma once
+
+#include <td/game/World.h>
+#include <td/render/Renderer.h>
+#include <td/render/loader/GLLoader.h>
+#include <td/render/shader/WorldShader.h>
+
+namespace td {
+namespace render {
+
+class WorldRenderer : public Renderer<shader::WorldShader> {
+  private:
+	std::unique_ptr<GL::VertexArray> m_WorldVao;
+
+  public:
+	WorldRenderer(Camera& a_Camera, const game::World& a_World);
+	virtual ~WorldRenderer();
+
+	virtual void Render(float a_Lerp) override;
+};
+
+}  // namespace render
+}  // namespace td

include/td/render/shader/CameraShaderProgram.h

@@ -0,0 +1,23 @@
+#pragma once
+
+#include <td/render/shader/ShaderProgram.h>
+
+namespace td {
+namespace shader {
+
+class CameraShaderProgram : public ShaderProgram {
+  private:
+	unsigned int m_LocationProjection = 0, m_LocationView = 0;
+
+  public:
+	CameraShaderProgram() {}
+
+	void SetProjectionMatrix(const Mat4f& proj) const;
+	void SetViewMatrix(const Mat4f& view) const;
+
+	virtual void GetAllUniformLocation();
+};
+
+
+}  // namespace shader
+}  // namespace td

include/td/render/shader/EntityShader.h

@@ -0,0 +1,24 @@
+#pragma once
+
+#include <td/render/shader/CameraShaderProgram.h>
+
+namespace td {
+namespace shader {
+
+class EntityShader : public CameraShaderProgram {
+  private:
+	unsigned int m_LocationPosition = 0;
+	unsigned int m_LocationColorEffect = 0;
+
+  protected:
+	virtual void GetAllUniformLocation();
+
+  public:
+	EntityShader();
+
+	void SetColorEffect(const Vec3f& color);
+	void SetModelPos(const Vec3f& pos) const;
+};
+
+}  // namespace shader
+}  // namespace td

include/td/render/shader/ShaderProgram.h

@@ -0,0 +1,43 @@
+#pragma once
+
+#include <string>
+#include <td/Maths.h>
+#include <td/render/OpenGL.h>
+
+namespace td {
+namespace shader {
+
+class ShaderProgram {
+  public:
+	ShaderProgram();
+	virtual ~ShaderProgram();
+
+	void Start() const;
+	void Stop() const;
+
+  protected:
+	void LoadProgramFile(const std::string& vertexFile, const std::string& fragmentFile);
+	void LoadProgram(const std::string& vertexSource, const std::string& fragmentSource);
+
+	virtual void GetAllUniformLocation() = 0;
+	int GetUniformLocation(const std::string& uniformName) const;
+
+	void LoadFloat(unsigned int location, float value) const;
+	void LoadInt(unsigned int location, int value) const;
+	void LoadVector(unsigned int location, const Vec2f& vector) const;
+	void LoadVector(unsigned int location, const Vec3f& vector) const;
+	void LoadBoolean(unsigned int location, bool value) const;
+	void LoadMat4(unsigned int location, const Mat4f& mat) const;
+	void CleanUp() const;
+
+  private:
+	unsigned int m_ProgramID;
+	unsigned int m_VertexShaderID;
+	unsigned int m_FragmentShaderID;
+
+	unsigned int LoadShaderFromFile(const std::string& file, GLenum type);
+	unsigned int LoadShader(const std::string& source, GLenum type);
+};
+
+}  // namespace shader
+}  // namespace td

include/td/render/shader/WorldShader.h

@@ -0,0 +1,14 @@
+#pragma once
+
+#include <td/render/shader/CameraShaderProgram.h>
+
+namespace td {
+namespace shader {
+
+class WorldShader : public CameraShaderProgram {
+public:
+	WorldShader();
+};
+
+} // namespace shader
+} // namespace td

include/td/simulation/ClientSimulation.h

@@ -0,0 +1,70 @@
+#pragma once
+
+#include <td/game/World.h>
+#include <optional>
+#include <td/misc/Signal.h>
+
+namespace td {
+namespace sim {
+
+using GameHistory = std::vector<td::protocol::LockStep>;
+using GameBuffer = std::vector<std::optional<td::protocol::LockStep>>;
+
+// TODO: OnEnd signal
+class ClientSimulation : public protocol::PacketHandler {
+  private:
+	std::uint64_t m_StepTime;
+	std::shared_ptr<game::World> m_World;
+	GameBuffer m_History;
+	float m_CurrentTime;
+	StepTime m_CurrentStep;
+
+	std::shared_ptr<WorldSnapshot> m_LastSnapshot;
+	StepTime m_LastValidStep;
+
+	static const protocol::LockStep EMPTY_LOCKSTEP;
+
+	using protocol::PacketHandler::Handle;
+
+  public:
+	utils::Signal<const std::vector<StepTime>&> OnMissingLockSteps;
+
+	/**
+	 * \brief Replay constructor
+	 * \param a_StepTime in ms
+	 */
+	ClientSimulation(std::shared_ptr<game::World> a_World, GameHistory&& a_History, std::uint64_t a_StepTime);
+
+	/**
+	 * \brief Live update constructor (continuous game updates)
+	 * \param a_StepTime in ms
+	 */
+	ClientSimulation(std::shared_ptr<game::World> a_World, std::uint64_t a_StepTime);
+
+	/**
+	 * \return the progress [0-1] between two steps
+	 */
+	float Update(float a_Delta);
+
+	virtual void Handle(const protocol::packets::LockStepsPacket& a_LockSteps) override;
+	virtual void Handle(const protocol::packets::LockStepResponsePacket& a_LockSteps) override;
+
+  private:
+	/**
+	 * \returns false if the empty lockstep was used
+	 */
+	bool Step();
+
+	/**
+	 * \brief Ticks a_Count times
+	 */
+	std::size_t FastForward(std::size_t a_Count);
+
+	/**
+	 * \brief Tries to recompute simulation if needed (for example in late command receival)
+	 */
+	void FastReplay();
+};
+
+}  // namespace sim
+}  // namespace td

include/td/simulation/CommandApply.h

@@ -0,0 +1,27 @@
+#pragma once
+
+#include <td/game/World.h>
+#include <td/protocol/command/Commands.h>
+
+namespace td {
+namespace sim {
+
+class CommandApply : public protocol::CommandHandler {
+  private:
+	const game::World& m_World;
+	WorldSnapshot& m_Snapshot;
+
+  public:
+	CommandApply(const game::World& a_World, WorldSnapshot& a_Snapshot);
+
+	virtual void Handle(const protocol::commands::EndCommand& a_End) override;
+	virtual void Handle(const protocol::commands::PlaceTowerCommand& a_PlaceTower) override;
+	virtual void Handle(const protocol::commands::PlayerJoinCommand& a_PlayerJoin) override;
+	virtual void Handle(const protocol::commands::SpawnTroopCommand& a_SpawnTroop) override;
+	virtual void Handle(const protocol::commands::TeamChangeCommand& a_TeamChange) override;
+	virtual void Handle(const protocol::commands::UpgradeTowerCommand& a_UpgradeTower) override;
+	virtual void Handle(const protocol::commands::UseItemCommand& a_UseItem) override;
+};
+
+}  // namespace sim
+}  // namespace td

include/td/simulation/ServerSimulation.h

@@ -0,0 +1,39 @@
+#pragma once
+
+#include <mutex>
+#include <td/game/World.h>
+
+namespace td {
+namespace sim {
+
+// TODO: OnEnd signal
+/**
+ * \note This class is thread safe
+ */
+class ServerSimulation : public protocol::CommandHandler {
+  private:
+	std::mutex m_Mutex;
+	game::World& m_World;
+	std::uint64_t m_StepTime;
+	std::uint64_t m_CurrentTime;
+	std::vector<td::protocol::LockStep> m_History;
+
+	using protocol::CommandHandler::Handle;
+
+  public:
+	ServerSimulation(game::World& a_World, std::uint64_t a_StepTime);
+
+	protocol::packets::LockStepsPacket Update();
+
+	protocol::packets::LockStepsPacket MakePacket();
+
+	// no checks are done !
+
+	virtual void Handle(const protocol::commands::SpawnTroopCommand& a_SpawnTroop) override;
+	virtual void Handle(const protocol::commands::PlaceTowerCommand& a_PlaceTower) override;
+
+	protocol::packets::LockStepResponsePacket GetResponse(const protocol::packets::LockStepRequestPacket& a_Missing) const;
+};
+
+}  // namespace sim
+}  // namespace td

include/td/simulation/WorldSnapshot.h

@@ -0,0 +1,18 @@
+#pragma once
+
+#include <td/game/WorldTypes.h>
+#include <td/game/Mobs.h>
+
+namespace td {
+namespace sim {
+
+struct WorldSnapshot {
+	game::MobList m_Mobs;
+
+	game::TowerList m_Towers;
+
+	game::TeamList m_Teams;
+};
+
+}  // namespace sim
+}  // namespace td

include/td/simulation/WorldTicker.h

@@ -0,0 +1,41 @@
+#pragma once
+
+#include <td/protocol/command/Commands.h>
+#include <td/simulation/WorldSnapshot.h>
+
+namespace td {
+namespace game {
+class World;
+}
+
+namespace sim {
+
+class IWorldSystem {
+  public:
+	virtual void Tick(const game::World& a_World, WorldSnapshot& a_State, FpFloat a_Delta) = 0;
+	virtual ~IWorldSystem() = default;
+};
+
+class WorldTicker {
+  private:
+	std::vector<std::unique_ptr<IWorldSystem>> m_Systems;
+
+  public:
+	WorldTicker();
+
+	WorldSnapshot NextStep(
+		const game::World& a_World, WorldSnapshot& a_PreviousState, const protocol::LockStep& a_LockStep, FpFloat a_Delta);
+
+  private:
+	void ApplySteps(const game::World& a_World, WorldSnapshot& a_State, const protocol::LockStep& a_LockStep);
+	void Tick(const game::World& a_World, WorldSnapshot& a_State, FpFloat a_Delta);
+	WorldSnapshot CreateNext(WorldSnapshot& a_PreviousState);
+
+	template <typename T>
+	void AddSystem() {
+		m_Systems.push_back(std::make_unique<T>());
+	}
+};
+
+}  // namespace sim
+}  // namespace td

include/td/simulation/system/EntityMove.h

@@ -0,0 +1,14 @@
+#pragma once
+
+#include <td/simulation/WorldTicker.h>
+
+namespace td {
+namespace sim {
+
+class EntityMove : public IWorldSystem {
+  public:
+	virtual void Tick(const game::World& a_World, WorldSnapshot& a_State, FpFloat a_Delta) override;
+};
+
+}  // namespace sim
+}  // namespace td

src/client/Client.cpp

@@ -0,0 +1,11 @@
+#include <client/Client.h>
+
+namespace td {
+namespace client {
+
+void Client::SendPacket(const protocol::PacketBase& a_Packet) {
+	m_Socket->Send(a_Packet);
+}
+
+}  // namespace client
+}  // namespace td

src/client/ClientState.cpp

@@ -0,0 +1,16 @@
+#include <client/ClientState.h>
+#include <client/Client.h>
+
+namespace td {
+namespace client {
+
+ClientState::ClientState(Client& a_Client) : Client::State(a_Client) {
+	Connect(m_StateMachine.m_Socket->OnReceive, std::bind(&ClientState::HandlePacket, this, std::placeholders::_1));
+}
+
+void ClientState::SendPacket(const protocol::PacketBase& a_Packet) {
+	m_StateMachine.m_Socket->Send(a_Packet);
+}
+
+}  // namespace server
+}  // namespace td

src/client/socket/FakeSocket.cpp

@@ -0,0 +1,19 @@
+#include <client/socket/FakeSocket.h>
+#include <server/socket/FakeSocket.h>
+
+namespace td {
+namespace client {
+
+void FakeSocket::Send(const protocol::PacketBase& a_Packet) {
+	m_Server->OnReceivePeer(m_PeerId, a_Packet);
+}
+
+std::shared_ptr<FakeSocket> FakeSocket::Connect(const std::shared_ptr<server::FakeSocket>& a_Server) {
+	auto socket = std::make_shared<FakeSocket>(Private());
+	socket->m_Server = a_Server;
+	socket->m_PeerId = a_Server->ConnectFakePeer(socket);
+	return socket;
+}
+
+}  // namespace client
+}  // namespace td

src/client/state/GameState.cpp

@@ -0,0 +1,41 @@
+#include <client/state/GameState.h>
+
+namespace td {
+namespace client {
+
+class ClientHandler : public protocol::PacketHandler {
+  private:
+	sim::ClientSimulation& m_Simulation;
+
+	using protocol::PacketHandler::Handle;
+
+  public:
+	ClientHandler(sim::ClientSimulation& a_Simulation) : m_Simulation(a_Simulation) {}
+
+	void Handle(const protocol::packets::LockStepsPacket& a_LockStep) {
+		m_Simulation.Handle(a_LockStep);
+	}
+
+	void Handle(const protocol::packets::LockStepResponsePacket& a_LockStep) {
+		m_Simulation.Handle(a_LockStep);
+	}
+};
+
+GameState::GameState(Client& a_Client, const std::shared_ptr<game::World>& a_World, std::uint64_t a_StepTime) :
+	ClientState(a_Client), m_World(a_World), m_Simulation(a_World, a_StepTime) {
+	m_Simulation.OnMissingLockSteps.Connect([this](const std::vector<td::StepTime>& a_MissingSteps) {
+		SendPacket(protocol::packets::LockStepRequestPacket(a_MissingSteps));
+	});
+}
+
+void GameState::HandlePacket(const protocol::PacketBase& a_Packet) {
+	ClientHandler handler(m_Simulation);
+	a_Packet.Dispatch(handler);
+}
+
+void GameState::Update(float a_Delta) {
+	m_CurrentLerp = m_Simulation.Update(a_Delta);
+}
+
+}  // namespace client
+}  // namespace td

src/main.cpp

@@ -1,21 +1,25 @@
-#include <iostream>
-// #include <td/protocol/packet/PacketVisitor.h>
-#include <td/game/GameHistory.h>
-#include <td/protocol/command/CommandDispatcher.h>
-#include <td/protocol/command/CommandFactory.h>
-#include <td/protocol/command/CommandSerializer.h>
-#include <td/protocol/command/CommandVisitor.h>
+#include <chrono>
+#include <td/display/state/MainMenuState.h>
 
-class Test : public td::protocol::CommandVisitor {};
+float GetDelta() {
+	static std::chrono::time_point<std::chrono::system_clock> m_LastTime = std::chrono::system_clock::now();
+	auto timeElapsed = std::chrono::system_clock::now() - m_LastTime;
+	float timeSeconds = std::chrono::duration<float, std::chrono::seconds::period>(timeElapsed).count();
+	m_LastTime = std::chrono::system_clock::now();
+	return timeSeconds;
+}
 
 int main(int argc, char** argv) {
-	// Test visitor;
-	// td::protocol::packets::ChatMessage chat{{"coucou"}};
-	// visitor.Check(chat);
+	// init GL context
+	td::Display display(1920, 1080, "Tower-Defense 2");
 
+	display.ChangeState<td::MainMenuState>();
+
+	while (!display.IsCloseRequested()) {
+		display.PollEvents();
+		float delta = GetDelta();
+		display.Update(delta);
+	}
 
-	td::protocol::commands::UpgradeTower com{{1, 2}};
-	std::cout << (unsigned)com.GetType() << std::endl;
-	td::protocol::CommandDispatcher disptacher;
 	return 0;
 }

src/server/IServerSocket.cpp

@@ -0,0 +1,31 @@
+#include <server/IServerSocket.h>
+
+namespace td {
+namespace server {
+
+void IServerSocket::OnConnectPeer(PeerID a_PeerId) {
+	m_Ids.AddConnection(a_PeerId);
+	OnConnect(m_Ids.GetPlayerId(a_PeerId));
+}
+
+void IServerSocket::OnDisconnectPeer(PeerID a_PeerId) {
+	OnDisconnect(m_Ids.GetPlayerId(a_PeerId));
+	m_Ids.RemovePeer(a_PeerId);
+}
+
+void IServerSocket::OnReceivePeer(PeerID a_PeerId, const protocol::PacketBase& a_Packet) {
+	OnReceive(m_Ids.GetPlayerId(a_PeerId), a_Packet);
+}
+
+void IServerSocket::Send(PlayerID a_PlayerId, const protocol::PacketBase& a_Packet) {
+	SendPeer(m_Ids.GetPeerId(a_PlayerId), a_Packet);
+}
+
+void IServerSocket::Broadcast(const protocol::PacketBase& a_Packet) {
+	for (auto [peerId, playerId] : m_Ids) {
+		SendPeer(peerId, a_Packet);
+	}
+}
+
+}  // namespace server
+}  // namespace td

src/server/Server.cpp

@@ -0,0 +1,9 @@
+#include <server/Server.h>
+
+namespace td {
+namespace server {
+
+
+
+}  // namespace server
+}  // namespace td

src/server/ServerState.cpp

@@ -0,0 +1,24 @@
+#include <server/ServerState.h>
+#include <server/Server.h>
+
+#include <td/common/StateMachine.h>
+
+namespace td {
+namespace server {
+
+ServerState::ServerState(Server& a_Server) : Server::State(a_Server) {
+	Connect(m_StateMachine.m_Socket->OnReceive, std::bind(&ServerState::HandlePacket, this, std::placeholders::_1, std::placeholders::_2));
+}
+
+ServerState::~ServerState() {}
+
+void ServerState::SendPacket(PlayerID a_Id, const protocol::PacketBase& a_Packet) {
+	m_StateMachine.m_Socket->Send(a_Id, a_Packet);
+}
+
+void ServerState::BroadcastPacket(const protocol::PacketBase& a_Packet) {
+	m_StateMachine.m_Socket->Broadcast(a_Packet);
+}
+
+}  // namespace server
+}  // namespace 

src/server/socket/FakeSocket.cpp

@@ -0,0 +1,48 @@
+#include <server/socket/FakeSocket.h>
+
+namespace td {
+namespace server {
+
+void FakeSocket::SendPeer(PeerID a_Peer, const protocol::PacketBase& a_Packet) {
+	auto socket = m_Clients.at(a_Peer);
+	assert(socket.has_value());
+	assert(!socket.value().expired());
+	socket.value().lock()->OnReceive(a_Packet);
+}
+
+void FakeSocket::ReceiveFromFakePeer(PeerID a_Peer, const protocol::PacketBase& a_Packet) {
+	OnReceivePeer(a_Peer, a_Packet);
+}
+
+PeerID FakeSocket::ConnectFakePeer(const std::shared_ptr<client::FakeSocket>& a_Socket) {
+	int peerId = GetNextFreeId();
+	if (peerId == -1) {
+		peerId = m_Clients.size();
+		m_Clients.push_back(a_Socket);
+	} else {
+		m_Clients.emplace(m_Clients.begin() + peerId, a_Socket);
+	}
+	a_Socket->OnConnect();
+	OnConnectPeer(peerId);
+	return peerId;
+}
+
+void FakeSocket::DisconnectFakePeer(PeerID a_Peer) {
+	auto socket = m_Clients.at(a_Peer);
+	assert(socket.has_value());
+	assert(!socket.value().expired());
+	socket.value().lock()->OnDisconnect();
+	OnDisconnectPeer(a_Peer);
+}
+
+int FakeSocket::GetNextFreeId() {
+	auto it = std::find_if(m_Clients.begin(), m_Clients.end(), [](const auto& a_Value) { return !a_Value.has_value(); });
+
+	if (it == m_Clients.end())
+		return -1;
+
+	return std::distance(m_Clients.begin(), it);
+}
+
+}  // namespace server
+}  // namespace td

src/server/state/GameState.cpp

@@ -0,0 +1,31 @@
+#include <server/state/GameState.h>
+#include <server/state/GameStateHandler.h>
+
+#include <iostream>
+
+namespace td {
+namespace server {
+
+GameState::GameState(Server& a_Server, const std::shared_ptr<game::World>& a_World) : ServerState(a_Server), m_World(a_World), m_Simulation(*m_World, STEP_TIME), m_Time(0) {
+	std::cout << "Switched to Game state !\n";
+	BroadcastPacket(m_Simulation.MakePacket());
+}
+
+void GameState::HandlePacket(PlayerID a_Id, const protocol::PacketBase& a_Packet) {
+	GameStateHandler handler(*this, a_Id);
+	a_Packet.Dispatch(handler);
+}
+
+void GameState::Update(float a_Delta) {
+	// TODO: don't make STEP_TIME constant
+	static const float stepTimeSecond = static_cast<float>(STEP_TIME) / 1000.0f;
+	m_Time += a_Delta;
+	if (m_Time > stepTimeSecond) {
+		m_Time = std::fmod(m_Time, stepTimeSecond);
+		auto lockStepPacket = m_Simulation.Update();
+		BroadcastPacket(lockStepPacket);
+	}
+}
+
+}  // namespace server
+}  // namespace td

src/server/state/GameStateHandler.cpp

@@ -0,0 +1,28 @@
+#include <server/state/GameState.h>
+#include <server/state/GameStateHandler.h>
+
+namespace td {
+namespace server {
+
+GameStateHandler::GameStateHandler(GameState& a_GameState, PlayerID a_PlayerId) : m_GameState(a_GameState), m_PlayerId(a_PlayerId) {}
+
+// TODO: redo this
+void GameStateHandler::Handle(const protocol::packets::SpawnTroopPacket& a_Packet) {
+	static const EntityCoords DEFAULT_POS(td::FpFloat(77), td::FpFloat(13));
+
+	td::protocol::commands::SpawnTroopCommand spawn(*a_Packet->m_Type, *a_Packet->m_Level, DEFAULT_POS, m_PlayerId);
+	m_GameState.m_Simulation.Handle(spawn);
+}
+
+// TODO: and this
+void GameStateHandler::Handle(const protocol::packets::PlaceTowerPacket& a_Packet) {
+	td::protocol::commands::PlaceTowerCommand place(a_Packet->m_Type, m_PlayerId, a_Packet->m_Position);
+	m_GameState.m_Simulation.Handle(place);
+}
+
+void GameStateHandler::Handle(const protocol::packets::LockStepRequestPacket& a_Packet) {
+	m_GameState.SendPacket(m_PlayerId, m_GameState.m_Simulation.GetResponse(a_Packet));
+}
+
+}  // namespace server
+}  // namespace td

src/server/state/LobbyState.cpp

@@ -0,0 +1,18 @@
+#include <server/state/LobbyState.h>
+#include <server/state/GameState.h>
+
+#include <iostream>
+
+namespace td {
+namespace server {
+
+void LobbyState::HandlePacket(PlayerID a_Id, const protocol::PacketBase& a_Packet) {
+
+}
+
+void LobbyState::Update(float a_Delta) {
+	m_StateMachine.ChangeState<GameState>(m_World);
+}
+
+}  // namespace server
+}  // namespace td

src/td/Maths.cpp

@@ -0,0 +1,169 @@
+#include <td/Maths.h>
+
+#include <cassert>
+#include <cmath>
+
+namespace td {
+namespace maths {
+
+template <typename T>
+T Length(const Vec3<T>& vect) {
+	return std::sqrt(vect.x * vect.x + vect.y * vect.y + vect.z * vect.z);
+}
+
+template <typename T>
+Vec3<T> Normalize(const Vec3<T>& vect) {
+	T length = Length(vect);
+
+	return {vect.x / length, vect.y / length, vect.z / length};
+}
+
+template <typename T>
+Vec4<T> Normalize(const Vec4<T>& vect) {
+	T length = std::sqrt(vect.x * vect.x + vect.y * vect.y + vect.z * vect.z + vect.w * vect.w);
+
+	return {vect.x / length, vect.y / length, vect.z / length, vect.w / length};
+}
+
+template <typename T>
+T Dot(const Vec3<T>& vect, const Vec3<T>& other) {
+	return vect.x * other.x + vect.y * other.y + vect.z * other.z;
+}
+
+template <typename T>
+Vec3<T> Cross(const Vec3<T>& vect, const Vec3<T>& other) {
+	return {
+		vect.y * other.z - vect.z * other.y,
+		vect.z * other.x - vect.x * other.z,
+		vect.x * other.y - vect.y * other.x,
+	};
+}
+
+template <typename T>
+T Dot(const Vec4<T>& vect, const Vec4<T>& other) {
+	return vect.x * other.x + vect.y * other.y + vect.z * other.z + vect.w * other.w;
+}
+
+template <typename T>
+T Distance(const Vec3<T>& vect, const Vec3<T>& other) {
+	return Length(vect - other);
+}
+
+template <typename T>
+Vec4<T> Dot(const Mat4<T>& mat, const Vec4<T>& vect) {
+	return {mat.x0 * vect.x + mat.x1 * vect.y + mat.x2 * vect.z + mat.x3 * vect.w,
+		mat.y0 * vect.x + mat.y1 * vect.y + mat.y2 * vect.z + mat.y3 * vect.w,
+		mat.z0 * vect.x + mat.z1 * vect.y + mat.z2 * vect.z + mat.z3 * vect.w,
+		mat.w0 * vect.x + mat.w1 * vect.y + mat.w2 * vect.z + mat.w3 * vect.w};
+}
+
+template <typename T>
+Mat4<T> Dot(const Mat4<T>& mat, const Mat4<T>& other) {
+	Mat4<T> result{};
+
+	for (std::size_t i = 0; i < Mat4<T>::MATRIX_SIZE; i++) {
+		for (std::size_t j = 0; j < Mat4<T>::MATRIX_SIZE; j++) {
+			for (std::size_t k = 0; k < Mat4<T>::MATRIX_SIZE; k++) {
+				result.at(i, j) += mat.at(i, k) * other.at(k, j);
+			}
+		}
+	}
+
+	return result;
+}
+
+template <typename T>
+Mat4<T> Identity() {
+	Mat4<T> result{};
+
+	result.x0 = static_cast<T>(1);
+	result.y1 = static_cast<T>(1);
+	result.z2 = static_cast<T>(1);
+	result.w3 = static_cast<T>(1);
+
+	return result;
+}
+
+Mat4f Perspective(float fovY, float aspectRatio, float zNear, float zFar) {
+	const float tanHalfFovy = std::tan(fovY / 2.0f);
+
+	Mat4f result{};
+	result.x0 = 1.0f / (aspectRatio * tanHalfFovy);
+	result.y1 = 1.0f / (tanHalfFovy);
+	result.z2 = -(zFar + zNear) / (zFar - zNear);
+	result.z3 = -1.0f;
+	result.w2 = -(2.0f * zFar * zNear) / (zFar - zNear);
+
+	return result;
+}
+
+Mat4f Look(const Vec3f& eye, const Vec3f& center, const Vec3f& up) {
+	const Vec3f f = Normalize(center);
+	const Vec3f s = Normalize(Cross(f, up));
+	const Vec3f u = Cross(s, f);
+
+	Mat4f result = Identity<float>();
+	result.x0 = s.x;
+	result.y0 = s.y;
+	result.z0 = s.z;
+	result.x1 = u.x;
+	result.y1 = u.y;
+	result.z1 = u.z;
+	result.x2 = -f.x;
+	result.y2 = -f.y;
+	result.z2 = -f.z;
+	result.w0 = -Dot(s, eye);
+	result.w1 = -Dot(u, eye);
+	result.w2 = Dot(f, eye);
+
+	return result;
+}
+
+Mat4f Inverse(const Mat4f& mat) {
+	float s0 = mat.at(0, 0) * mat.at(1, 1) - mat.at(1, 0) * mat.at(0, 1);
+	float s1 = mat.at(0, 0) * mat.at(1, 2) - mat.at(1, 0) * mat.at(0, 2);
+	float s2 = mat.at(0, 0) * mat.at(1, 3) - mat.at(1, 0) * mat.at(0, 3);
+	float s3 = mat.at(0, 1) * mat.at(1, 2) - mat.at(1, 1) * mat.at(0, 2);
+	float s4 = mat.at(0, 1) * mat.at(1, 3) - mat.at(1, 1) * mat.at(0, 3);
+	float s5 = mat.at(0, 2) * mat.at(1, 3) - mat.at(1, 2) * mat.at(0, 3);
+
+	float c5 = mat.at(2, 2) * mat.at(3, 3) - mat.at(3, 2) * mat.at(2, 3);
+	float c4 = mat.at(2, 1) * mat.at(3, 3) - mat.at(3, 1) * mat.at(2, 3);
+	float c3 = mat.at(2, 1) * mat.at(3, 2) - mat.at(3, 1) * mat.at(2, 2);
+	float c2 = mat.at(2, 0) * mat.at(3, 3) - mat.at(3, 0) * mat.at(2, 3);
+	float c1 = mat.at(2, 0) * mat.at(3, 2) - mat.at(3, 0) * mat.at(2, 2);
+	float c0 = mat.at(2, 0) * mat.at(3, 1) - mat.at(3, 0) * mat.at(2, 1);
+
+	float det = s0 * c5 - s1 * c4 + s2 * c3 + s3 * c2 - s4 * c1 + s5 * c0;
+
+	assert(det != 0 && "Determinant equals 0 !");
+
+	float invdet = 1.0 / det;
+
+	Mat4f result;
+
+	result.at(0, 0) = (mat.at(1, 1) * c5 - mat.at(1, 2) * c4 + mat.at(1, 3) * c3) * invdet;
+	result.at(0, 1) = (-mat.at(0, 1) * c5 + mat.at(0, 2) * c4 - mat.at(0, 3) * c3) * invdet;
+	result.at(0, 2) = (mat.at(3, 1) * s5 - mat.at(3, 2) * s4 + mat.at(3, 3) * s3) * invdet;
+	result.at(0, 3) = (-mat.at(2, 1) * s5 + mat.at(2, 2) * s4 - mat.at(2, 3) * s3) * invdet;
+
+	result.at(1, 0) = (-mat.at(1, 0) * c5 + mat.at(1, 2) * c2 - mat.at(1, 3) * c1) * invdet;
+	result.at(1, 1) = (mat.at(0, 0) * c5 - mat.at(0, 2) * c2 + mat.at(0, 3) * c1) * invdet;
+	result.at(1, 2) = (-mat.at(3, 0) * s5 + mat.at(3, 2) * s2 - mat.at(3, 3) * s1) * invdet;
+	result.at(1, 3) = (mat.at(2, 0) * s5 - mat.at(2, 2) * s2 + mat.at(2, 3) * s1) * invdet;
+
+	result.at(2, 0) = (mat.at(1, 0) * c4 - mat.at(1, 1) * c2 + mat.at(1, 3) * c0) * invdet;
+	result.at(2, 1) = (-mat.at(0, 0) * c4 + mat.at(0, 1) * c2 - mat.at(0, 3) * c0) * invdet;
+	result.at(2, 2) = (mat.at(3, 0) * s4 - mat.at(3, 1) * s2 + mat.at(3, 3) * s0) * invdet;
+	result.at(2, 3) = (-mat.at(2, 0) * s4 + mat.at(2, 1) * s2 - mat.at(2, 3) * s0) * invdet;
+
+	result.at(3, 0) = (-mat.at(1, 0) * c3 + mat.at(1, 1) * c1 - mat.at(1, 2) * c0) * invdet;
+	result.at(3, 1) = (mat.at(0, 0) * c3 - mat.at(0, 1) * c1 + mat.at(0, 2) * c0) * invdet;
+	result.at(3, 2) = (-mat.at(3, 0) * s3 + mat.at(3, 1) * s1 - mat.at(3, 2) * s0) * invdet;
+	result.at(3, 3) = (mat.at(2, 0) * s3 - mat.at(2, 1) * s1 + mat.at(2, 2) * s0) * invdet;
+
+	return result;
+}
+
+}  // namespace maths
+}  // namespace td

src/td/Types.cpp

@@ -0,0 +1,29 @@
+#include <td/Types.h>
+
+#include <sp/common/DataBuffer.h>
+#include <sp/common/ByteSwapping.h>
+#include <sp/common/DataBufferOperators.h>
+
+namespace td {
+
+sp::DataBuffer& operator<<(sp::DataBuffer& a_Buffer, const EntityCoords& a_Coords) {
+	return a_Buffer << a_Coords.x << a_Coords.y;
+}
+
+sp::DataBuffer& operator<<(sp::DataBuffer& a_Buffer, const FpFloat& a_Float) {
+	auto raw = a_Float.raw_value();
+	return a_Buffer << raw;
+}
+
+sp::DataBuffer& operator>>(sp::DataBuffer& a_Buffer, EntityCoords& a_Coords) {
+	return a_Buffer >> a_Coords.x >> a_Coords.y;
+}
+
+sp::DataBuffer& operator>>(sp::DataBuffer& a_Buffer, FpFloat& a_Float) {
+	auto raw = a_Float.raw_value();
+	a_Buffer >> raw;
+	a_Float = FpFloat::from_raw_value(raw);
+	return a_Buffer;
+}
+
+}  // namespace td

src/td/common/DataBuffer.cpp

@@ -1,163 +0,0 @@
-#include <td/common/DataBuffer.h>
-
-#include <fstream>
-#include <iomanip>
-#include <sstream>
-
-#include <td/misc/Format.h>
-#include <td/misc/Log.h>
-
-namespace td {
-
-DataBuffer::DataBuffer() : m_ReadOffset(0) {}
-
-DataBuffer::DataBuffer(const DataBuffer& other) : m_Buffer(other.m_Buffer), m_ReadOffset(other.m_ReadOffset) {}
-
-DataBuffer::DataBuffer(DataBuffer&& other) : m_Buffer(std::move(other.m_Buffer)), m_ReadOffset(std::move(other.m_ReadOffset)) {}
-
-DataBuffer::DataBuffer(const std::string& str) : m_Buffer(str.begin(), str.end()), m_ReadOffset(0) {}
-
-DataBuffer::DataBuffer(const DataBuffer& other, Data::difference_type offset) : m_ReadOffset(0) {
-	m_Buffer.reserve(other.GetSize() - static_cast<std::size_t>(offset));
-	std::copy(other.m_Buffer.begin() + offset, other.m_Buffer.end(), std::back_inserter(m_Buffer));
-}
-
-DataBuffer& DataBuffer::operator<<(const std::string& str) {
-	std::size_t strlen = str.length() + 1;	// including null character
-	Resize(GetSize() + strlen);
-	std::memcpy(m_Buffer.data() + GetSize() - strlen, str.data(), strlen);
-	return *this;
-}
-
-DataBuffer& DataBuffer::operator<<(const DataBuffer& data) {
-	m_Buffer.insert(m_Buffer.end(), data.begin(), data.end());
-	return *this;
-}
-
-DataBuffer& DataBuffer::operator>>(std::string& str) {
-	std::size_t stringSize = strlen(reinterpret_cast<const char*>(m_Buffer.data()) + m_ReadOffset) + 1;	 // including null character
-	str.resize(stringSize);
-	std::copy(m_Buffer.begin() + static_cast<difference_type>(m_ReadOffset),
-		m_Buffer.begin() + static_cast<difference_type>(m_ReadOffset + stringSize), str.begin());
-	m_ReadOffset += stringSize;
-	str.resize(stringSize - 1);
-	return *this;
-}
-
-DataBuffer& DataBuffer::operator>>(DataBuffer& data) {
-	data.Resize(GetSize() - m_ReadOffset);
-	std::copy(m_Buffer.begin() + static_cast<difference_type>(m_ReadOffset), m_Buffer.end(), data.begin());
-	m_ReadOffset = m_Buffer.size();
-	return *this;
-}
-
-void DataBuffer::WriteSome(const char* buffer, std::size_t amount) {
-	std::size_t end_pos = m_Buffer.size();
-	m_Buffer.resize(m_Buffer.size() + amount);
-	std::memcpy(m_Buffer.data() + end_pos, buffer, amount);
-}
-
-void DataBuffer::WriteSome(const std::uint8_t* buffer, std::size_t amount) {
-	std::size_t end_pos = m_Buffer.size();
-	m_Buffer.resize(m_Buffer.size() + amount);
-	std::memcpy(m_Buffer.data() + end_pos, buffer, amount);
-}
-
-void DataBuffer::ReadSome(char* buffer, std::size_t amount) {
-	assert(m_ReadOffset + amount <= GetSize());
-	std::copy_n(m_Buffer.begin() + static_cast<difference_type>(m_ReadOffset), amount, buffer);
-	m_ReadOffset += amount;
-}
-
-
-void DataBuffer::ReadSome(std::uint8_t* buffer, std::size_t amount) {
-	assert(m_ReadOffset + amount <= GetSize());
-	std::copy_n(m_Buffer.begin() + static_cast<difference_type>(m_ReadOffset), amount, buffer);
-	m_ReadOffset += amount;
-}
-
-
-void DataBuffer::ReadSome(DataBuffer& buffer, std::size_t amount) {
-	assert(m_ReadOffset + amount <= GetSize());
-	buffer.Resize(amount);
-	std::copy_n(m_Buffer.begin() + static_cast<difference_type>(m_ReadOffset), amount, buffer.begin());
-	m_ReadOffset += amount;
-}
-
-
-DataBuffer& DataBuffer::operator=(const DataBuffer& other) {
-	m_Buffer = other.m_Buffer;
-	m_ReadOffset = other.m_ReadOffset;
-	return *this;
-}
-
-DataBuffer& DataBuffer::operator=(DataBuffer&& other) {
-	m_Buffer = std::move(other.m_Buffer);
-	m_ReadOffset = std::move(other.m_ReadOffset);
-	return *this;
-}
-
-void DataBuffer::SetReadOffset(std::size_t pos) {
-	assert(pos <= GetSize());
-	m_ReadOffset = pos;
-}
-
-std::size_t DataBuffer::GetSize() const {
-	return m_Buffer.size();
-}
-
-std::size_t DataBuffer::GetRemaining() const {
-	return m_Buffer.size() - m_ReadOffset;
-}
-
-DataBuffer::iterator DataBuffer::begin() {
-	return m_Buffer.begin();
-}
-
-DataBuffer::iterator DataBuffer::end() {
-	return m_Buffer.end();
-}
-
-DataBuffer::const_iterator DataBuffer::begin() const {
-	return m_Buffer.begin();
-}
-
-DataBuffer::const_iterator DataBuffer::end() const {
-	return m_Buffer.end();
-}
-
-std::ostream& operator<<(std::ostream& os, const DataBuffer& buffer) {
-	for (unsigned char u : buffer)
-		os << std::hex << std::setfill('0') << std::setw(2) << static_cast<int>(u) << " ";
-	os << std::dec;
-	return os;
-}
-
-bool DataBuffer::ReadFile(const std::string& fileName) {
-	try {
-		std::ifstream file(fileName, std::istream::binary);
-		std::ostringstream ss;
-		ss << file.rdbuf();
-		const std::string& s = ss.str();
-		m_Buffer = DataBuffer::Data(s.begin(), s.end());
-		m_ReadOffset = 0;
-	} catch (std::exception& e) {
-		utils::LOGE(utils::Format("[IO] Failed to read file %s ! reason : %s", fileName.c_str(), e.what()));
-		return false;
-	}
-	return m_Buffer.size() > 0;
-}
-
-bool DataBuffer::WriteFile(const std::string& fileName) const {
-	try {
-		std::ofstream file(fileName, std::ostream::binary);
-		file.write(reinterpret_cast<const char*>(m_Buffer.data()), static_cast<std::streamsize>(m_Buffer.size()));
-		file.flush();
-	} catch (std::exception& e) {
-		utils::LOGE(utils::Format("[IO] Failed to read file %s ! reason : %s", fileName.c_str(), e.what()));
-		return false;
-	}
-	return true;
-}
-
-}  // namespace td

src/td/common/VarInt.cpp

@@ -1,52 +0,0 @@
-#include <td/common/VarInt.h>
-
-#include <stdexcept>
-#include <td/common/DataBuffer.h>
-
-namespace td {
-
-static constexpr int SEGMENT_BITS = 0x7F;
-static constexpr int CONTINUE_BIT = 0x80;
-
-std::size_t VarInt::GetSerializedLength() const {
-	DataBuffer buffer;
-	buffer << *this;
-	return buffer.GetSize();
-}
-
-DataBuffer& operator<<(DataBuffer& out, const VarInt& var) {
-	std::uint64_t value = var.m_Value;
-	while (true) {
-		if ((value & ~static_cast<std::uint64_t>(SEGMENT_BITS)) == 0) {
-			out << static_cast<std::uint8_t>(value);
-			return out;
-		}
-
-		out << static_cast<std::uint8_t>((value & SEGMENT_BITS) | CONTINUE_BIT);
-
-		value >>= 7;
-	}
-}
-
-DataBuffer& operator>>(DataBuffer& in, VarInt& var) {
-	var.m_Value = 0;
-	unsigned int position = 0;
-	std::uint8_t currentByte;
-
-	while (true) {
-		in.ReadSome(&currentByte, 1);
-		var.m_Value |= static_cast<std::uint64_t>(currentByte & SEGMENT_BITS) << position;
-
-		if ((currentByte & CONTINUE_BIT) == 0)
-			break;
-
-		position += 7;
-
-		if (position >= 8 * sizeof(var.m_Value))
-			throw std::runtime_error("VarInt is too big");
-	}
-
-	return in;
-}
-
-}  // namespace td

src/td/display/Display.cpp

@@ -0,0 +1,190 @@
+#include <td/display/Display.h>
+
+#include <GL/glew.h>
+#include <SDL3/SDL.h>
+#include <imgui.h>
+#include <imgui_impl_opengl3.h>
+#include <imgui_impl_sdl3.h>
+
+#include <td/misc/Format.h>
+#include <td/misc/Log.h>
+
+namespace td {
+
+Display::Display(int a_Width, int a_Height, const std::string& a_Title) :
+	m_LastWidth(0), m_LastHeight(0), m_AspectRatio(1), m_ShouldClose(false) {
+
+	m_Window = SDL_CreateWindow(a_Title.c_str(), a_Width, a_Height, SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE);
+
+	m_LastWidth = a_Width;
+	m_LastHeight = a_Height;
+	m_AspectRatio = (float)m_LastWidth / m_LastHeight;
+
+	// Prepare and create context
+#ifdef __ANDROID__
+	SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_ES);
+	SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3);
+	SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 0);
+#else
+	SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE);
+	SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3);
+	SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 0);
+#endif
+	SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 5);
+	SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 6);
+	SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 5);
+	SDL_GL_SetAttribute(SDL_GL_ALPHA_SIZE, 0);
+
+	SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 24);
+	SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 8);
+
+	SDL_GL_SetAttribute(SDL_GL_MULTISAMPLEBUFFERS, 1);
+	SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, 8);
+
+	m_GLContext = SDL_GL_CreateContext(m_Window);
+
+	if (!m_GLContext) {
+		utils::LOGE(utils::Format("Could not create context! SDL error: %s", SDL_GetError()));
+	}
+
+	int major, minor, mask;
+	int r, g, b, a, depth;
+	int mBuffers, mSamples;
+
+	SDL_GL_GetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, &mask);
+	SDL_GL_GetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, &major);
+	SDL_GL_GetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, &minor);
+
+	SDL_GL_GetAttribute(SDL_GL_RED_SIZE, &r);
+	SDL_GL_GetAttribute(SDL_GL_GREEN_SIZE, &g);
+	SDL_GL_GetAttribute(SDL_GL_BLUE_SIZE, &b);
+	SDL_GL_GetAttribute(SDL_GL_ALPHA_SIZE, &a);
+
+	SDL_GL_GetAttribute(SDL_GL_DEPTH_SIZE, &depth);
+
+	SDL_GL_GetAttribute(SDL_GL_MULTISAMPLEBUFFERS, &mBuffers);
+	SDL_GL_GetAttribute(SDL_GL_MULTISAMPLESAMPLES, &mSamples);
+
+	const char* mask_desc;
+
+	if (mask & SDL_GL_CONTEXT_PROFILE_CORE) {
+		mask_desc = "core";
+	} else if (mask & SDL_GL_CONTEXT_PROFILE_COMPATIBILITY) {
+		mask_desc = "compatibility";
+	} else if (mask & SDL_GL_CONTEXT_PROFILE_ES) {
+		mask_desc = "es";
+	} else {
+		mask_desc = "?";
+	}
+
+	utils::LOG(utils::Format(
+		"GL Context : %i.%i %s, Color : R:%i G:%i B:%i A:%i, Depth bits : %i", major, minor, mask_desc, r, g, b, a, depth));
+
+	utils::LOG(utils::Format("MultiSamples : Buffers : %i, Samples : %i", mBuffers, mSamples));
+
+	SDL_GL_MakeCurrent(m_Window, m_GLContext);
+
+	GLenum error = glewInit();
+	if (error) {
+		utils::LOGE(utils::Format("Error initializing glew : %s", glewGetErrorString(error)));
+	}
+
+	// WindowResizeEvent(WindowWidth, WindowHeight);
+
+	// vsync
+	SDL_GL_SetSwapInterval(1);
+
+	// Setup Dear ImGui context
+	IMGUI_CHECKVERSION();
+	ImGui::CreateContext();
+	ImGuiIO& io = ImGui::GetIO();
+	(void)io;
+	io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard;  // Enable Keyboard Controls
+	io.ConfigFlags |= ImGuiConfigFlags_NavEnableGamepad;   // Enable Gamepad Controls
+
+	// Setup Dear ImGui style
+	ImGui::StyleColorsDark();
+	// ImGui::StyleColorsLight();
+
+	// Setup scaling
+	float main_scale = SDL_GetDisplayContentScale(SDL_GetPrimaryDisplay());
+	// ImGuiStyle& style = ImGui::GetStyle();
+	// style.ScaleAllSizes(main_scale);  // Bake a fixed style scale. (until we have a solution for dynamic style scaling, changing this
+	// 								  // requires resetting Style + calling this again)
+	// style.FontSizeBase = 13 * main_scale;  // Set initial font scale. (using io.ConfigDpiScaleFonts=true makes this unnecessary. We leave
+	// 								  // both here for documentation purpose)
+
+
+	ImFontConfig cfg;
+	cfg.SizePixels = 13 * main_scale * 2;
+	io.Fonts->AddFontDefault(&cfg);
+
+	// Setup Platform/Renderer backends
+	ImGui_ImplSDL3_InitForOpenGL(m_Window, m_GLContext);
+	ImGui_ImplOpenGL3_Init("#version 330");
+}
+
+void Display::Close() {
+	m_ShouldClose = true;
+}
+
+void Display::PollEvents() {
+	SDL_Event event;
+	while (SDL_PollEvent(&event)) {
+		switch (event.type) {
+			case SDL_EVENT_QUIT:
+			case SDL_EVENT_WINDOW_CLOSE_REQUESTED: {
+				m_ShouldClose = true;
+				break;
+			}
+
+			case SDL_EVENT_WINDOW_RESIZED: {
+				m_LastWidth = event.window.data1;
+				m_LastHeight = event.window.data2;
+				m_AspectRatio = (float)m_LastWidth / m_LastHeight;
+				OnAspectRatioChange(m_AspectRatio);
+				break;
+			}
+
+			case SDL_EVENT_KEY_DOWN: {
+				if (!event.key.repeat)
+					OnKeyDown(event.key.key);
+				break;
+			}
+
+			default:
+				break;
+		}
+		ImGui_ImplSDL3_ProcessEvent(&event);
+	}
+	// Start the Dear ImGui frame
+	ImGui_ImplOpenGL3_NewFrame();
+	ImGui_ImplSDL3_NewFrame();
+	ImGui::NewFrame();
+}
+
+void Display::Update(float a_Delta) {
+	StateMachine::Update(a_Delta);
+#ifndef NDEBUG
+	ImGui::ShowDemoWindow();
+#endif
+	ImGui::Render();
+	ImGuiIO& io = ImGui::GetIO();
+	glViewport(0, 0, (int)io.DisplaySize.x, (int)io.DisplaySize.y);
+	// glClearColor(clear_color.x * clear_color.w, clear_color.y * clear_color.w, clear_color.z * clear_color.w, clear_color.w);
+	ImGui_ImplOpenGL3_RenderDrawData(ImGui::GetDrawData());
+	SDL_GL_SwapWindow(m_Window);
+	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+}
+
+
+Display::~Display() {
+	ImGui_ImplOpenGL3_Shutdown();
+	ImGui_ImplSDL3_Shutdown();
+	ImGui::DestroyContext();
+	SDL_GL_DestroyContext(m_GLContext);
+	SDL_DestroyWindow(m_Window);
+	SDL_Quit();
+}
+
+}  // namespace td

src/td/display/DisplayState.cpp

@@ -0,0 +1,10 @@
+#include <td/display/DisplayState.h>
+
+namespace td {
+
+DisplayState::DisplayState(Display& a_Display) : Display::State(a_Display) {
+	Connect(m_StateMachine.OnKeyDown, std::bind(&DisplayState::OnKeyDown, this, std::placeholders::_1));
+	Connect(m_StateMachine.OnAspectRatioChange, std::bind(&DisplayState::OnAspectRatioChange, this, std::placeholders::_1));
+}
+
+}  // namespace td

src/td/display/menu/CreatePartyMenu.cpp

@@ -0,0 +1,16 @@
+#include <td/display/menu/CreatePartyMenu.h>
+
+#include <imgui.h>
+
+namespace td {
+
+CreatePartyMenu::CreatePartyMenu(MainMenuState& a_MainMenu) : MainMenuState::Menu(a_MainMenu) {}
+
+CreatePartyMenu::~CreatePartyMenu() {}
+
+void CreatePartyMenu::Update() {
+	ImGui::Text("CreatePartyMenu");
+	m_StateStack.RenderBackButton();
+}
+
+}  // namespace td

src/td/display/menu/JoinPartyMenu.cpp

@@ -0,0 +1,16 @@
+#include <td/display/menu/JoinPartyMenu.h>
+
+#include <imgui.h>
+
+namespace td {
+
+JoinPartyMenu::JoinPartyMenu(MainMenuState& a_MainMenu) : MainMenuState::Menu(a_MainMenu) {}
+
+JoinPartyMenu::~JoinPartyMenu() {}
+
+void JoinPartyMenu::Update() {
+	ImGui::Text("JoinPartyMenu");
+	m_StateStack.RenderBackButton();
+}
+
+}  // namespace td

src/td/display/menu/MainMenu.cpp

@@ -0,0 +1,28 @@
+#include <td/display/menu/MainMenu.h>
+
+#include <imgui.h>
+#include <td/display/menu/CreatePartyMenu.h>
+#include <td/display/menu/JoinPartyMenu.h>
+#include <td/display/menu/SettingsMenu.h>
+#include <td/display/state/DebugWorldState.h>
+
+namespace td {
+
+MainMenu::MainMenu(MainMenuState& a_MainMenu) : MainMenuState::Menu(a_MainMenu) {}
+
+MainMenu::~MainMenu() {}
+
+void MainMenu::Update() {
+	if (ImGui::Button("Create Party"))
+		m_StateStack.PushState<CreatePartyMenu>();
+	if (ImGui::Button("Join Party"))
+		m_StateStack.PushState<JoinPartyMenu>();
+	if (ImGui::Button("Settings"))
+		m_StateStack.PushState<SettingsMenu>();
+#ifndef NDEBUG
+	if (ImGui::Button("Debug world"))
+		m_StateStack.ChangeState<DebugWorldState>();
+#endif
+}
+
+}  // namespace td

src/td/display/menu/SettingsMenu.cpp

@@ -0,0 +1,16 @@
+#include <td/display/menu/SettingsMenu.h>
+
+#include <imgui.h>
+
+namespace td {
+
+SettingsMenu::SettingsMenu(MainMenuState& a_MainMenu) : MainMenuState::Menu(a_MainMenu) {}
+
+SettingsMenu::~SettingsMenu() {}
+
+void SettingsMenu::Update() {
+	ImGui::Text("SettingsMenu");
+	m_StateStack.RenderBackButton();
+}
+
+}  // namespace td