raylib-cpp progress

.gitattributes

@@ -0,0 +1,3 @@
+*.obj filter=lfs diff=lfs merge=lfs -text
+*.png filter=lfs diff=lfs merge=lfs -text
+*.glb filter=lfs diff=lfs merge=lfs -text

.vscode/c_cpp_properties.json

@@ -0,0 +1,13 @@
+{
+  "configurations": [
+    {
+      "name": "TD2",
+      "cppStandard": "c++20",
+      "includePath": [
+        "include"
+      ],
+      "compileCommands": ".vscode/compile_commands.json"
+    }
+  ],
+  "version": 4
+}

README.md

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

include/client/Client.h

@@ -0,0 +1,41 @@
+#pragma once
+
+#include <client/IClientSocket.h>
+#include <client/PlayerManager.h>
+#include <td/common/StateMachine.h>
+#include <optional>
+
+namespace td {
+namespace client {
+
+class ClientState;
+class LoggingState;
+
+class Client : public StateMachine<Client, void, float> {
+  private:
+	std::shared_ptr<IClientSocket> m_Socket;
+	PlayerManager m_Players;
+	std::optional<PlayerID> m_Id;
+
+  public:
+	Client(const std::shared_ptr<IClientSocket>& a_Socket);
+	~Client();
+
+	void SendPacket(const protocol::PacketBase& a_Packet);
+
+	void Disconnect();
+
+	const PlayerManager& GetPlayers() const {
+		return m_Players;
+	}
+
+	const std::optional<PlayerID> GetId() const {
+		return m_Id;
+	}
+
+	friend class ClientState;
+	friend class LoggingState;
+};
+
+}  // namespace client
+}  // namespace td

include/client/ClientState.h

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

include/client/IClientSocket.h

@@ -0,0 +1,24 @@
+#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;
+	virtual void Disconnect() = 0;
+
+	IClientSocket() {}
+	virtual ~IClientSocket() {}
+};
+
+}  // namespace client
+}  // namespace td

include/client/PlayerManager.h

@@ -0,0 +1,39 @@
+#pragma once
+
+#include <td/protocol/packet/Packets.h>
+#include <td/misc/Signal.h>
+
+namespace td {
+namespace client {
+
+class IClientSocket;
+
+class PlayerManager : public protocol::PacketHandler {
+  private:
+	std::map<PlayerID, PlayerInfo> m_Players;
+	std::shared_ptr<IClientSocket> m_Socket;
+
+  public:
+	utils::Signal<const PlayerInfo&> OnPlayerJoin;
+	utils::Signal<PlayerID> OnPlayerLeave;
+
+	PlayerManager(const std::shared_ptr<IClientSocket>& a_Socket);
+	~PlayerManager();
+
+	PlayerInfo GetPlayer(PlayerID a_Player);
+
+	auto begin() const {
+		return m_Players.begin();
+	}
+
+	auto end() const {
+		return m_Players.end();
+	}
+
+	virtual void Handle(const protocol::packets::PlayerJoinPacket&) override;
+	virtual void Handle(const protocol::packets::PlayerListPacket&) override;
+	virtual void Handle(const protocol::packets::PlayerLeavePacket&) override;
+};
+
+}  // namespace client
+}  // namespace td

include/client/socket/FakeSocket.h

@@ -0,0 +1,34 @@
+#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;
+	virtual void Disconnect() override;
+};
+
+}  // namespace client
+}  // namespace td

include/client/state/GameState.h

@@ -0,0 +1,40 @@
+#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:
+	game::WorldPtr m_World;
+	sim::ClientSimulation m_Simulation;
+	float m_CurrentLerp;
+	float m_ElapsedTime;
+
+  public:
+	GameState(Client& a_Client, const game::WorldPtr& a_World, std::uint64_t a_StepTime, const std::vector<protocol::LockStep> a_FirstSteps);
+	~GameState();
+
+	virtual void Update(float a_Delta) override;
+
+	float GetCurrentLerp() const {
+		return m_CurrentLerp;
+	}
+
+	float GetElapsedTime() const {
+		return m_ElapsedTime;
+	}
+
+	game::WorldPtr GetWorld() const {
+		return m_World;
+	}
+
+	virtual void Handle(const protocol::packets::LockStepsPacket& a_LockStep) override;
+	virtual void Handle(const protocol::packets::LockStepResponsePacket& a_LockStep) override;
+};
+
+}  // namespace client
+}  // namespace td

include/client/state/LobbyState.h

@@ -0,0 +1,25 @@
+#pragma once
+
+#include <client/ClientState.h>
+#include <td/game/World.h>
+#include <td/simulation/ClientSimulation.h>
+
+namespace td {
+namespace client {
+
+class LobbyState : public ClientState {
+  private:
+	std::shared_ptr<game::World> m_World;
+  public:
+	LobbyState(Client& a_Client);
+	~LobbyState();
+
+	virtual void Update(float a_Delta) override;
+
+	virtual void Handle(const protocol::packets::WorldHeaderPacket& a_Packet) override;
+	virtual void Handle(const protocol::packets::WorldDataPacket& a_Packet) override;
+	virtual void Handle(const protocol::packets::BeginGamePacket& a_Packet) override;
+};
+
+}  // namespace client
+}  // namespace td

include/client/state/LoggingState.h

@@ -0,0 +1,22 @@
+#pragma once
+
+#include <client/ClientState.h>
+#include <td/game/World.h>
+#include <td/simulation/ClientSimulation.h>
+
+namespace td {
+namespace client {
+
+class LoggingState : public ClientState {
+  public:
+	LoggingState(Client& a_Client, const std::string& a_PlayerName);
+	~LoggingState();
+
+	virtual void Update(float a_Delta) override;
+
+	virtual void Handle(const protocol::packets::PlayerJoinPacket& a_Packet) override;
+	virtual void Handle(const protocol::packets::LoggingSuccessPacket& a_Packet) override;
+};
+
+}  // namespace client
+}  // namespace td

include/server/IServerSocket.h

@@ -9,22 +9,33 @@ namespace server {
 
 class IServerSocket {
   public:
-	utils::Signal<PlayerID> OnConnect;
-	utils::Signal<PlayerID> OnDisconnect;
+	using PlayerPacketHandlerType = std::unique_ptr<protocol::PacketHandler>(PlayerID);
+	using PlayerPacketHandler = std::function<PlayerPacketHandlerType>;
+
+	utils::Signal<PlayerID> OnPlayerConnect;
+	utils::Signal<PlayerID> OnPlayerDisconnect;
 	utils::Signal<PlayerID, const protocol::PacketBase&> OnReceive;
 
-	virtual void Send(PlayerID, const protocol::PacketBase&) = 0;
+	void Send(PlayerID a_PlayerId, const protocol::PacketBase& a_Packet);
+	void Broadcast(const protocol::PacketBase& a_Packet);
 
-	IServerSocket() {}
+	void Disconnect(PlayerID a_PlayerId);
+
+	void RegisterHandler(const PlayerPacketHandler& a_Handler);
+	void UnregisterHandler(const PlayerPacketHandler& a_Handler);
+
+	IServerSocket();
 	virtual ~IServerSocket() {}
 
   private:
 	PlayerIds m_Ids;
+	std::vector<PlayerPacketHandler> m_Handlers;
 
   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

include/server/IServerState.h

@@ -1,34 +0,0 @@
-#pragma once
-
-#include <server/IServerSocket.h>
-#include <td/misc/SlotGuard.h>
-
-namespace td {
-namespace server {
-
-class Server;
-
-class IServerState : public utils::SlotGuard {
-  protected:
-	void SendPacket(PlayerID a_Id, const protocol::PacketBase& a_Packet);
-	void SetNewState(const std::shared_ptr<IServerState>& a_NewState);
-
-  public:
-	virtual void HandlePacket(PlayerID a_Id, const protocol::PacketBase& a_Packet) = 0;
-	virtual void Update(float a_Delta) = 0;
-	virtual void OnPlayerJoin(PlayerID a_Id) = 0;
-	virtual void OnPlayerLeave(PlayerID a_Id) = 0;
-
-	IServerState();
-	virtual ~IServerState();
-
-  private:
-	Server* m_Server;
-
-	void SetServer(Server* a_Server);
-
-	friend class Server;
-};
-
-}  // namespace server
-}  // namespace td

include/server/PlayerIds.h

@@ -35,6 +35,14 @@ class PlayerIds {
 		m_PeerToPlayer.erase(a_PeerId);
 		m_PlayerToPeer.erase(playerId);
 	}
+
+	auto begin() {
+		return m_PeerToPlayer.begin();
+	}
+
+	auto end() {
+		return m_PeerToPlayer.end();
+	}
 };
 
 }  // namespace server

include/server/PlayerManager.h

@@ -0,0 +1,44 @@
+#pragma once
+
+#include <td/misc/Signal.h>
+#include <td/protocol/packet/Packets.h>
+
+namespace td {
+namespace server {
+
+class IServerSocket;
+
+class PlayerManager {
+  private:
+	std::map<PlayerID, PlayerInfo> m_Players;
+	std::shared_ptr<IServerSocket> m_Socket;
+
+  public:
+	utils::Signal<PlayerID, const PlayerInfo&> OnPlayerJoin;
+	utils::Signal<PlayerID> OnPlayerLeave;
+
+	PlayerManager(const std::shared_ptr<IServerSocket>& a_Socket);
+	~PlayerManager();
+
+	void RemovePlayer(PlayerID a_Player);
+	PlayerInfo GetPlayer(PlayerID a_Player);
+
+  private:
+	void Disconnect(PlayerID a_Player);
+	
+	class ConnectionHandler : public protocol::PacketHandler {
+	  private:
+		PlayerManager& m_PlayerManager;
+		PlayerID m_Player;
+
+	  public:
+		ConnectionHandler(PlayerManager& a_PlayerManager, PlayerID a_Player);
+		~ConnectionHandler() = default;
+
+		virtual void Handle(const protocol::packets::PlayerLoginPacket& a_Packet) override;
+		virtual void Handle(const protocol::packets::DisconnectPacket& a_Packet) override;
+	};
+};
+
+}  // namespace server
+}  // namespace td

include/server/Server.h

@@ -1,30 +1,30 @@
 #pragma once
 
-#include <memory>
 #include <server/IServerSocket.h>
-#include <server/IServerState.h>
+#include <td/common/StateMachine.h>
+#include <server/PlayerManager.h>
 
 namespace td {
 namespace server {
 
-class Server {
+class ServerState;
+
+class Server : public StateMachine<Server, void, float> {
   private:
 	std::shared_ptr<IServerSocket> m_Socket;
-	std::shared_ptr<IServerState> m_State;
+	PlayerManager m_Players;
+	float m_LastMspt;
 
   public:
-	Server(const std::shared_ptr<IServerSocket>& a_Socket) : m_Socket(a_Socket) {}
+	Server(const std::shared_ptr<IServerSocket>& a_Socket);
 
-	void Update(float a_Delta) {
-		m_State->Update(a_Delta);
+	virtual void Update(float a_Delta);
+
+	const PlayerManager& GetPlayers() const {
+		return m_Players;
 	}
 
-	void UpdateState(const std::shared_ptr<IServerState>& a_State) {
-		m_State = a_State;
-		m_State->SetServer(this);
-	}
-
-	friend class IServerState;
+	friend class ServerState;
 };
 
 }  // namespace server

include/server/ServerState.h

@@ -0,0 +1,25 @@
+#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;
+	virtual void OnPlayerJoin(PlayerID a_Id, const td::PlayerInfo& a_Info) {}
+	virtual void OnPlayerLeave(PlayerID a_Id) {}
+
+	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/socket/TcpSocket.h

@@ -1,19 +0,0 @@
-#pragma once
-
-#include <server/IServerSocket.h>
-
-namespace td {
-namespace server {
-
-class TcpSocket : public IServerSocket {
-  private:
-	/* data */
-  public:
-	TcpSocket(/* args */) {}
-	~TcpSocket() {}
-
-	virtual void Send(PlayerID, const protocol::PacketBase&) {}
-};
-
-}  // namespace server
-}  // namespace td

include/server/state/EndGameState.h

@@ -1,11 +1,11 @@
 #pragma once
 
-#include <server/IServerState.h>
+#include <server/ServerState.h>
 
 namespace td {
 namespace server {
 
-class EndGameState : public IServerState {
+class EndGameState : public ServerState {
   private:
 	/* data */
   public:

include/server/state/GameState.h

@@ -1,21 +1,30 @@
 #pragma once
 
-#include <server/IServerState.h>
+#include <server/ServerState.h>
+#include <td/game/World.h>
+#include <td/simulation/ServerSimulation.h>
 
 namespace td {
 namespace server {
 
-class GameState : public IServerState{
+class GameStateHandler;
+
+class GameState : public ServerState {
   private:
-	/* data */
+	std::shared_ptr<game::World> m_World;
+	sim::ServerSimulation m_Simulation;
+	float m_Time;
+
   public:
-	GameState(/* args */) {}
+	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;
-	virtual void OnPlayerJoin(PlayerID a_Id) override;
-	virtual void OnPlayerLeave(PlayerID a_Id) override;
+
+	virtual void OnPlayerJoin(PlayerID a_Id, const td::PlayerInfo& a_Info) override;
+
+	friend class GameStateHandler;
 };
 
 }  // namespace server

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

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

include/td/Maths.h

@@ -1,10 +1,10 @@
 #pragma once
 
-#include <cstdint>
+#include <sp/common/DataBufferOperators.h>
 
 namespace td {
 
-static constexpr float PI = 3.141592653f;
+// static constexpr float PI = 3.141592653f;
 
 template <typename T>
 struct Vec2 {
@@ -183,6 +183,80 @@ T Lerp(T v0, T v1, T t) {
 
 }  // namespace maths
 
+template<typename T>
+Vec2<T> operator+(const Vec2<T>& vect, const Vec2<T>& other) {
+	return {vect.x + other.x, vect.y + other.y};
+}
 
+template<typename T>
+Vec2<T> operator- (const Vec2<T>& vect) {
+	return { -vect.x, -vect.y };
+}
+
+template<typename T>
+Vec2<T> operator- (const Vec2<T>& vect, const Vec2<T>& other) {
+	return vect + (-other);
+}
+
+template<typename T>
+Vec3<T> operator- (const Vec3<T>& vect) {
+	return { -vect.x, -vect.y, -vect.z };
+}
+
+template<typename T>
+Vec3<T> operator+ (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> operator- (const Vec3<T>& vect, const Vec3<T>& other) {
+	return vect + (-other);
+}
+
+template<typename T>
+Vec4<T> operator- (const Vec4<T>& vect) {
+	return { -vect.x, -vect.y, -vect.z, -vect.w };
+}
+
+template<typename T>
+Vec4<T> operator+ (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>
+Vec4<T> operator- (const Vec4<T>& vect, const Vec4<T>& other) {
+	return vect + (-other);
+}
+
+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

@@ -12,6 +12,10 @@ namespace td {
 
 using FpFloat = fpm::fixed_16_16;
 
+using StepTime = std::uint16_t;
+
+constexpr int STEP_TIME = 50;
+
 enum class TeamColor : std::int8_t {
 	None = -1,
 	Blue,
@@ -61,15 +65,11 @@ 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>;
 
 using EntityCoords = Vec2<FpFloat>;
 
 using PeerID = std::uint16_t;
-using StepsType = std::uint16_t;
 
 enum class Direction : std::uint8_t {
 	PositiveX = 1 << 0,
@@ -78,6 +78,11 @@ enum class Direction : std::uint8_t {
 	NegativeY = 1 << 3,
 };
 
+struct PlayerInfo {
+	PlayerID m_PlayerId;
+	std::string m_PlayerName;
+};
+
 sp::DataBuffer& operator<<(sp::DataBuffer& a_Buffer, const EntityCoords& a_Coords);
 sp::DataBuffer& operator<<(sp::DataBuffer& a_Buffer, const FpFloat& a_Float);
 

include/td/common/Event.h

@@ -0,0 +1,37 @@
+#pragma once
+
+namespace td {
+
+class EventDispatcher;
+
+class Event {
+
+};
+
+struct WindowResizeEvent {
+	int m_Width;
+	int m_Height;
+};
+
+class EventDispatcher {
+public:
+	EventDispatcher(const Event& event);
+
+	template<typename E>
+	void Dispatch();
+};
+
+// template<typename Event>
+// class ConcreteEvent : public Event {
+// public:
+// 	void Accept(EventDispatcher& a_Dispatcher) {
+// 		a_Dispatcher.Handle(*this);
+// 	}
+// };
+
+void OnEvent(const Event& event) {
+	EventDispatcher dispatcher(event);
+	dispatcher.Dispatch<WindowResizeEvent>();
+}
+
+}

include/td/common/StateMachine.h

@@ -0,0 +1,54 @@
+#pragma once
+
+#include <cassert>
+#include <td/misc/Signal.h>
+
+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>
+		void ChangeState(Args... args) {
+			m_StateMachine.template ChangeState<T>(std::forward<Args>(args)...);
+		}
+
+	  protected:
+		TDerived& m_StateMachine;
+	};
+
+	utils::Signal<State&> OnStateChange;
+
+	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(std::forward<TArgs>(args)...);
+	}
+
+	template <typename T, typename... Args>
+	void ChangeState(Args... args) {
+		auto* currentState = m_State.get();
+		auto newState = std::make_unique<T>(static_cast<TDerived&>(*this), std::forward<Args>(args)...);
+		// This allows chaining
+		if (m_State.get() == currentState) {
+			m_State = std::move(newState);
+			OnStateChange(*m_State);
+		}
+	}
+
+  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/display/Display.h

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

include/td/display/DisplayState.h

@@ -0,0 +1,19 @@
+#pragma once
+
+#include <td/display/Display.h>
+#include <td/misc/SlotGuard.h>
+#include <client/ClientState.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(int a_Key) {}
+};
+
+}  // namespace td

include/td/display/ImGuiTheme.h

@@ -0,0 +1,7 @@
+#pragma once
+
+namespace td {
+
+void LoadTheme();
+
+}  // 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,37 @@
+#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>
+#include <server/socket/FakeSocket.h>
+
+namespace td {
+
+class DebugWorldState : public DisplayState {
+  private:
+	render::RenderPipeline m_Renderer;
+	Camera m_Camera;
+	std::unique_ptr<server::Server> m_Server;
+	std::unique_ptr<client::Client> m_Client;
+	client::GameState* m_ClientState;
+
+	std::vector<std::unique_ptr<client::Client>> m_FakeClients;
+	std::shared_ptr<server::FakeSocket> m_ServerSocket;
+
+	unsigned int m_PlaySpeed = 1;
+
+  public:
+	DebugWorldState(Display& a_Display);
+	~DebugWorldState();
+
+	virtual void Update(float a_Delta) override;
+
+  protected:
+	virtual void OnAspectRatioChange(float a_Ratio) override;
+	virtual void OnKeyDown(int 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(int a_Key) override;
+};
+
+}  // namespace td

include/td/game/Mobs.h

@@ -79,9 +79,10 @@ class Mob : public sp::MessageBase<MobType, MobHandler> {
 	Vec2fp m_Position;
 	Direction m_Direction;
 	std::vector<EffectDuration> m_Effects;
-	const Tower* m_LastDamage;	// the last tower that damaged the mob
+	std::shared_ptr<Tower> m_LastDamage;	// the last tower that damaged the mob
 	float m_HitCooldown;
-	TeamCastle* m_CastleTarget;
+	std::shared_ptr<TeamCastle> m_CastleTarget;
+	bool m_HasReachedCastle = false;
 	// utils::CooldownTimer m_AttackTimer;
 
 	MobPtr m_Next;

include/td/game/Team.h

@@ -77,7 +77,7 @@ public:
 struct TeamList {
 	std::array<Team, 2> m_Teams;
 
-	TeamList() : m_Teams{Team{TeamColor::Red}, Team{TeamColor::Blue}}{
+	TeamList() : m_Teams{Team{TeamColor::Blue}, Team{TeamColor::Red}}{
 		
 	}
 

include/td/game/World.h

@@ -1,25 +1,25 @@
 #pragma once
 
-#include <td/simulation/WorldTicker.h>
 #include <td/game/WorldTypes.h>
 #include <td/protocol/packet/Packets.h>
+#include <td/simulation/WorldTicker.h>
 
 namespace td {
 namespace game {
 
 class World {
   protected:
+	// header
 	TowerTileColorPalette m_TowerPlacePalette;
 	Color m_WalkablePalette;
 	std::vector<Color> m_DecorationPalette;
 	Color m_Background;
-
-	ChunkList m_Chunks;
-
 	SpawnColorPalette m_SpawnColorPalette;
-
 	TilePalette m_TilePalette;
 
+	//data
+	ChunkList m_Chunks;
+
 	std::shared_ptr<sim::WorldSnapshot> m_CurrentState;
 	std::shared_ptr<sim::WorldSnapshot> m_NextState;
 
@@ -28,10 +28,14 @@ class World {
 
   public:
 	World();
+	World(World&&) = default;
 
 	bool LoadMap(const protocol::pdata::WorldHeader& worldHeader);
 	bool LoadMap(const protocol::pdata::WorldData& worldData);
 
+	protocol::packets::WorldHeaderPacket GetPacketHeader() const;
+	protocol::packets::WorldDataPacket GetPacketData() const;
+
 	bool LoadMapFromFile(const std::string& fileName);
 	bool SaveMap(const std::string& fileName) const;
 
@@ -101,7 +105,7 @@ class World {
 		return m_CurrentState->m_Teams[TeamColor::Blue];
 	}
 	const Team& GetBlueTeam() const {
-		return m_CurrentState->m_Teams[TeamColor::Red];
+		return m_CurrentState->m_Teams[TeamColor::Blue];
 	}
 
 	Team& GetTeam(TeamColor team) {
@@ -130,8 +134,9 @@ class World {
   private:
 	void TickMobs(std::uint64_t delta);
 	void CleanDeadMobs();
-
 };
 
+using WorldPtr = std::shared_ptr<World>;
+
 }  // namespace game
 }  // namespace td

include/td/game/WorldTypes.h

@@ -25,12 +25,12 @@ enum class TileType : std::uint8_t {
 	Ice,*/
 };
 
-static constexpr Color BLACK{0, 0, 0};
-static constexpr Color WHITE{255, 255, 255};
+// 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};
+// static constexpr Color RED(255, 0, 0);
+// static constexpr Color GREEN(0, 255, 0);
+// static constexpr Color BLUE(0, 0, 255);
 
 class TileHandler;
 

include/td/misc/Signal.h

@@ -2,17 +2,21 @@
 
 #include <algorithm>
 #include <functional>
+#include <memory>
 #include <td/common/NonCopyable.h>
 #include <vector>
 
 namespace td {
 namespace utils {
 
+/**
+ * \brief Signal class
+ */
 template <typename... Args>
-class Signal : private NonCopyable {
+class SignalRaw : private NonCopyable {
   public:
 	using FnType = void(Args...);
-	using CallBack = std::function<FnType>;
+	using CallBack = std::shared_ptr<std::function<FnType>>;
 
   private:
 	std::vector<CallBack> m_Callbacks;
@@ -23,17 +27,79 @@ class Signal : private NonCopyable {
 	}
 
 	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>(); });
+		auto it = std::find(m_Callbacks.begin(), m_Callbacks.end(), a_Callback);
 		m_Callbacks.erase(it);
 	}
 
 	void operator()(Args... args) const {
 		for (const CallBack& callback : m_Callbacks) {
-			callback(args...);
+			callback->operator()(std::forward<Args>(args)...);
 		}
 	}
 };
 
+/**
+ * \brief Memory managed Signal class
+ */
+template <typename... Args>
+class Signal {
+  public:
+	using SignalBase = SignalRaw<Args...>;
+	using CallBack = typename SignalBase::CallBack;
+	using CallBackRaw = typename CallBack::element_type;
+	using SignalPtr = std::shared_ptr<SignalBase>;
+	class ConnectionGuard;
+
+  private:
+	SignalPtr m_Signal;
+
+  public:
+	Signal() : m_Signal(std::make_shared<SignalBase>()) {}
+	Signal(const Signal&) = default;
+
+	/**
+	 * \warning The callback won't be disconnectable, use it wisely!
+	 */
+	void Connect(const CallBackRaw& a_Callback) {
+		m_Signal->Connect(std::make_shared<CallBackRaw>(a_Callback));
+	}
+
+	[[nodiscard]] std::shared_ptr<ConnectionGuard> ConnectSafe(const CallBack& a_Callback) {
+		m_Signal->Connect(a_Callback);
+		return std::make_shared<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

@@ -1,32 +1,31 @@
 #pragma once
 
-#include <td/misc/SlotGuard.h>
+#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::function<void()>> m_Deleters;
+	std::vector<std::shared_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) {
-		a_Signal.Connect(a_Callback);
-		m_Deleters.push_back([&a_Signal, &a_Callback]() { a_Signal.Disconnect(a_Callback); });
+	void Connect(Signal<Args...> a_Signal, const typename Signal<Args...>::CallBack::element_type& a_Callback) {
+		auto ptr = std::make_shared<typename Signal<Args...>::CallBack::element_type>(a_Callback);
+		m_Connections.emplace_back(a_Signal.ConnectSafe(ptr));
 	}
 
-	~SlotGuard() {
-		for (auto& deleter : m_Deleters) {
-			deleter();
-		}
+	void Disconnect() {
+		m_Connections.clear();
 	}
 };
 

include/td/misc/Time.h

@@ -0,0 +1,22 @@
+#pragma once
+
+#include <chrono>
+
+namespace td {
+
+class Timer {
+  private:
+	std::chrono::time_point<std::chrono::system_clock> m_LastTime;
+
+  public:
+	Timer() : m_LastTime(std::chrono::system_clock::now()) {}
+
+	float GetDelta() {
+		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;
+	}
+};
+
+}  // namespace td

include/td/protocol/packet/PacketData.h

@@ -7,32 +7,31 @@
 #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 {
 
-struct PlayerInfo {
-	PlayerID m_PlayerId;
-	std::string m_PlayerName;
-};
-
 struct MapData {
 
 };
 
 namespace pdata {
 
-/** Client attempts to login (very basic) */
-struct PlayerLogin {
-	std::string m_PlayerName;
-};
-
 /** Server indicates success */
 struct LoggingSuccess {
 	PlayerID m_PlayerId;
 };
 
+/** Client attempts to login (very basic) */
+struct PlayerLogin {
+	std::string m_PlayerName;
+};
+
 /** Player joins the lobby */
 struct PlayerJoin {
 	PlayerInfo m_Player;
@@ -43,9 +42,14 @@ struct PlayerLeave {
 	PlayerID m_PlayerId;
 };
 
+/** List of players who joined before */
+struct PlayerList {
+	std::vector<PlayerInfo> m_Players;
+};
+
 struct PredictCommand {
 	CommandPtr m_Command;
-	std::uint16_t m_FrameNumber;
+	StepTime m_FrameNumber;
 };
 
 /** Keep alive */
@@ -63,8 +67,6 @@ struct ChatMessage {
 	std::string m_Text;
 };
 
-// TODO: handle players joining in the first second
-
 struct BeginGame {
 	std::vector<PlayerInfo> m_BlueTeam;
 	std::vector<PlayerInfo> m_RedTeam;
@@ -73,7 +75,7 @@ struct BeginGame {
 };
 
 struct LockSteps {
-	std::uint16_t m_FirstFrameNumber;
+	StepTime m_FirstFrameNumber;
 	std::array<LockStep, LOCKSTEP_BUFFER_SIZE> m_LockSteps;
 };
 
@@ -95,6 +97,7 @@ 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;
@@ -105,6 +108,14 @@ struct PlaceTower {
 	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/PacketSerialize.h

@@ -4,36 +4,7 @@
 
 namespace td {
 
-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 game {
 

include/td/protocol/packet/Packets.h

@@ -22,11 +22,14 @@ enum class PacketID : std::uint8_t {
 	BeginGame,
 	Disconnect,
 	KeepAlive,
+	LockStepRequest,
+	LockStepResponse,
 	LockSteps,
 	LoggingSuccess,
 	PlaceTower,
 	PlayerJoin,
 	PlayerLeave,
+	PlayerList,
 	PlayerLogin,
 	PredictCommand,
 	SpawnTroop,
@@ -49,11 +52,14 @@ 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 PlayerListPacket = PacketMessage<pdata::PlayerList, PacketID::PlayerList>;
 using PlayerLoginPacket = PacketMessage<pdata::PlayerLogin, PacketID::PlayerLogin>;
 using PredictCommandPacket = PacketMessage<pdata::PredictCommand, PacketID::PredictCommand>;
 using SpawnTroopPacket = PacketMessage<pdata::SpawnTroop, PacketID::SpawnTroop>;
@@ -63,11 +69,17 @@ using WorldDataPacket = PacketMessage<pdata::WorldData, PacketID::WorldData>;
 }  // namespace packets
 
 using AllPackets = std::tuple<packets::BeginGamePacket, packets::ChatMessagePacket, packets::DisconnectPacket,
-	packets::KeepAlivePacket, packets::LockStepsPacket, packets::LoggingSuccessPacket, packets::PlaceTowerPacket,
-	packets::PlayerJoinPacket, packets::PlayerLeavePacket, packets::PlayerLoginPacket, packets::PredictCommandPacket,
-	packets::SpawnTroopPacket, packets::WorldHeaderPacket, packets::WorldDataPacket>;
+	packets::KeepAlivePacket, packets::LockStepRequestPacket, packets::LockStepResponsePacket, packets::LockStepsPacket,
+	packets::LoggingSuccessPacket, packets::PlaceTowerPacket, packets::PlayerJoinPacket, packets::PlayerLeavePacket,
+	packets::PlayerListPacket, packets::PlayerLoginPacket, packets::PredictCommandPacket, packets::SpawnTroopPacket,
+	packets::WorldHeaderPacket, packets::WorldDataPacket>;
 
-class PacketHandler : public sp::GenericHandler<AllPackets> {};
+class PacketHandler : public sp::GenericHandler<AllPackets> {
+  public:
+	void HandleBase(const PacketBase& a_Packet) {
+		a_Packet.Dispatch(*this);
+	}
+};
 
 using PacketDispatcher = sp::MessageDispatcher<PacketBase>;
 

include/td/render/Camera.h

@@ -1,41 +0,0 @@
-#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

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

include/td/render/RayGui.h

@@ -0,0 +1,11 @@
+#pragma once
+
+// extern "C" {
+// 	#include <raygui.h>
+// }
+
+extern "C" {
+	#include <rlImGui.h>
+}
+
+#include <imgui.h>

include/td/render/Renderer.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <memory>
-#include <td/render/Camera.h>
+#include <raylib-cpp/Camera3D.hpp>
 #include <td/render/loader/GLLoader.h>
 #include <td/render/shader/CameraShaderProgram.h>
 #include <td/misc/SlotGuard.h>
@@ -18,13 +18,13 @@ class BasicRenderer {
 };
 
 template <typename TShader>
-class Renderer : public BasicRenderer, public utils::SlotGuard {
+class Renderer : public BasicRenderer, private utils::SlotGuard {
   protected:
 	std::unique_ptr<TShader> m_Shader;
-	Camera& m_Camera;
+	raylib::Camera& m_Camera;
 
   public:
-	Renderer(Camera& a_Camera);
+	Renderer(raylib::Camera& a_Camera);
 	virtual ~Renderer() {}
 
 	template <typename T>
@@ -42,8 +42,11 @@ class RenderPipeline {
 	virtual ~RenderPipeline() {}
 
 	template <typename T, typename... Args>
-	void AddRenderer(Args&&... args) {
-		m_Renderers.push_back(std::make_unique<T>(args...));
+	T& AddRenderer(Args... args) {
+		auto ptr = std::make_unique<T>(args...);
+		auto rawPtr = ptr.get();
+		m_Renderers.push_back(std::move(ptr));
+		return *rawPtr;
 	}
 
 	void Clear() {
@@ -62,16 +65,16 @@ class RenderPipeline {
 
 
 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());
-	});
+Renderer<TShader>::Renderer(raylib::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());
-	});
+	// Connect(a_Camera.OnViewChange, [this]() {
+	// 	// m_Shader->Start();
+	// 	m_Shader->SetViewMatrix(m_Camera.GetViewMatrix());
+	// });
 }
 
 }  // namespace render

include/td/render/loader/WorldLoader.h

@@ -1,22 +1,14 @@
 #pragma once
 
 #include <td/game/World.h>
-#include <td/render/loader/GLLoader.h>
+#include <raylib-cpp/Mesh.hpp>
 
 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);
+Mesh LoadWorldModel(const td::game::World* world);
 
 } // namespace WorldLoader
 

include/td/render/renderer/EntityRenderer.h

@@ -3,17 +3,19 @@
 #include <td/render/Renderer.h>
 #include <td/render/shader/EntityShader.h>
 #include <td/game/World.h>
+#include <raylib-cpp/Model.hpp>
 
 namespace td {
 namespace render {
 
 class EntityRenderer : public Renderer<shader::EntityShader> {
   private:
-	const game::World& m_World;
-	std::unique_ptr<GL::VertexArray> m_EntityVao;
+	game::WorldPtr m_World;
+	raylib::Model m_ZombieModel;
+	Texture2D m_ZombieTexture;
 
   public:
-	EntityRenderer(Camera& a_Camera, const game::World& a_World);
+	EntityRenderer(raylib::Camera& a_Camera, const game::WorldPtr& a_World);
 	virtual ~EntityRenderer();
 
 	virtual void Render(float a_Lerp) override;

include/td/render/renderer/PlayerListRenderer.h

@@ -0,0 +1,27 @@
+#pragma once
+
+#include <td/render/Renderer.h>
+#include <client/PlayerManager.h>
+
+namespace td {
+namespace render {
+
+/**
+ * \brief This is a debug class
+ */
+class PlayerListRenderer : public BasicRenderer {
+  private:
+	const client::PlayerManager& m_Players;
+  public:
+	utils::Signal<> OnPlayerCreate;
+	// utils::Signal<> OnRequestPOV;
+	utils::Signal<PlayerID> OnPlayerKick;
+
+	virtual void Render(float a_Lerp) override;
+
+	PlayerListRenderer(const client::PlayerManager& a_Players);
+	~PlayerListRenderer() {}
+};
+
+}  // namespace render
+}  // namespace td

include/td/render/renderer/TimerRenderer.h

@@ -0,0 +1,21 @@
+#pragma once
+
+#include "client/state/GameState.h"
+#include <td/render/Renderer.h>
+#include <client/PlayerManager.h>
+
+namespace td {
+namespace render {
+
+class TimerRenderer : public BasicRenderer {
+  private:
+	const client::GameState& m_State;
+  public:
+	virtual void Render(float a_Lerp) override;
+
+	TimerRenderer(const client::GameState& a_State);
+	~TimerRenderer() {}
+};
+
+}  // namespace render
+}  // namespace td

include/td/render/renderer/TowerRenderer.h

@@ -3,17 +3,20 @@
 #include <td/render/Renderer.h>
 #include <td/render/shader/EntityShader.h>
 #include <td/game/World.h>
+#include <raylib-cpp/Model.hpp>
+#include <raylib-cpp/Texture.hpp>
 
 namespace td {
 namespace render {
 
 class TowerRenderer : public Renderer<shader::EntityShader> {
   private:
-	const game::World& m_World;
-	std::unique_ptr<GL::VertexArray> m_EntityVao;
+	game::WorldPtr m_World;
+	raylib::Model m_TowerModel;
+	raylib::Texture2D m_TowerTexture;
 
   public:
-	TowerRenderer(Camera& a_Camera, const game::World& a_World);
+	TowerRenderer(raylib::Camera& a_Camera, const game::WorldPtr& a_World);
 	virtual ~TowerRenderer();
 
 	virtual void Render(float a_Lerp) override;

include/td/render/renderer/WorldRenderer.h

@@ -4,19 +4,23 @@
 #include <td/render/Renderer.h>
 #include <td/render/loader/GLLoader.h>
 #include <td/render/shader/WorldShader.h>
+#include <raylib-cpp/Model.hpp>
 
 namespace td {
 namespace render {
 
 class WorldRenderer : public Renderer<shader::WorldShader> {
   private:
-	std::unique_ptr<GL::VertexArray> m_WorldVao;
+	std::unique_ptr<raylib::Model> m_WorldModel;
 
   public:
-	WorldRenderer(Camera& a_Camera, const game::World& a_World);
+	WorldRenderer(raylib::Camera& a_Camera, const game::WorldPtr& a_World);
 	virtual ~WorldRenderer();
 
 	virtual void Render(float a_Lerp) override;
+
+  private:
+	void UpdateControls();
 };
 
 }  // namespace render

include/td/render/shader/CameraShaderProgram.h

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

include/td/render/shader/ShaderProgram.h

@@ -1,43 +0,0 @@
-#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/simulation/ClientSimulation.h

@@ -2,6 +2,7 @@
 
 #include <td/game/World.h>
 #include <optional>
+#include <td/misc/Signal.h>
 
 namespace td {
 namespace sim {
@@ -13,47 +14,51 @@ using GameBuffer = std::vector<std::optional<td::protocol::LockStep>>;
 class ClientSimulation : public protocol::PacketHandler {
   private:
 	std::uint64_t m_StepTime;
-	game::World& m_World;
+	std::shared_ptr<game::World> m_World;
 	GameBuffer m_History;
-	std::uint64_t m_CurrentTime;
-	std::uint64_t m_LastTime;
-	std::size_t m_CurrentStep;
+	float m_CurrentTime;
+	StepTime m_CurrentStep;
 
 	std::shared_ptr<WorldSnapshot> m_LastSnapshot;
-	std::uint64_t m_LastValidStep;
+	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(game::World& a_World, GameHistory&& a_History, std::uint64_t a_StepTime);
+	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(game::World& a_World, std::uint64_t a_StepTime);
+	ClientSimulation(std::shared_ptr<game::World> a_World, std::uint64_t a_StepTime, const std::vector<protocol::LockStep>& a_FirstSteps);
 
 	/**
 	 * \return the progress [0-1] between two steps
 	 */
-	float Update();
+	float Update(float a_Delta);
 
 	virtual void Handle(const protocol::packets::LockStepsPacket& a_LockSteps) override;
-	virtual void Handle(const protocol::packets::PredictCommandPacket& a_Predict) override;
+	virtual void Handle(const protocol::packets::LockStepResponsePacket& a_LockSteps) override;
 
   private:
-	void Step();
+	/**
+	 * \returns false if the empty lockstep was used
+	 */
+	bool Step();
 
 	/**
 	 * \brief Ticks a_Count times
 	 */
-	void FastForward(std::size_t a_Count);
+	std::size_t FastForward(std::size_t a_Count);
 
 	/**
 	 * \brief Tries to recompute simulation if needed (for example in late command receival)

include/td/simulation/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::LockStepsPacket ToPacket(HistorySizeType a_StartIndex);
-};
-
-}  // namespace game
-}  // namespace td

include/td/simulation/ServerSimulation.h

@@ -16,7 +16,7 @@ class ServerSimulation : public protocol::CommandHandler {
 	game::World& m_World;
 	std::uint64_t m_StepTime;
 	std::uint64_t m_CurrentTime;
-	std::vector<td::protocol::LockStep> m_History;
+	std::vector<protocol::LockStep> m_History;
 
 	using protocol::CommandHandler::Handle;
 
@@ -25,10 +25,16 @@ class ServerSimulation : public protocol::CommandHandler {
 
 	protocol::packets::LockStepsPacket Update();
 
+	protocol::packets::LockStepsPacket MakePacket();
+
+	std::vector<protocol::LockStep> GetFirstLocksteps();
+
 	// 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

src/client/Client.cpp

@@ -0,0 +1,25 @@
+#include <client/Client.h>
+
+#include <client/state/LoggingState.h>
+
+namespace td {
+namespace client {
+
+Client::Client(const std::shared_ptr<IClientSocket>& a_Socket) : m_Socket(a_Socket), m_Players(a_Socket) {
+	// ChangeState<LoggingState>(a_PlayerName);
+}
+
+Client::~Client() {
+	Disconnect();
+}
+
+void Client::SendPacket(const protocol::PacketBase& a_Packet) {
+	m_Socket->Send(a_Packet);
+}
+
+void Client::Disconnect() {
+	m_Socket->Disconnect();
+}
+
+}  // 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::HandleBase, 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/PlayerManager.cpp

@@ -0,0 +1,44 @@
+#include <client/PlayerManager.h>
+
+#include <client/IClientSocket.h>
+
+#include <iostream>
+
+namespace td {
+namespace client {
+
+PlayerManager::PlayerManager(const std::shared_ptr<IClientSocket>& a_Socket) : m_Socket(a_Socket) {
+	a_Socket->OnReceive.Connect(std::bind(&PlayerManager::HandleBase, this, std::placeholders::_1));
+	OnPlayerJoin.Connect([this](const PlayerInfo& a_Player){
+		std::cout << "[Client " << this << "] " << a_Player.m_PlayerName << " joined !\n";
+	});
+	OnPlayerLeave.Connect([this](const PlayerID a_Player){
+		std::cout << "[Client " << this << "] " << GetPlayer(a_Player).m_PlayerName << "(" << +a_Player << ") left !\n";
+	});
+}
+
+PlayerManager::~PlayerManager() {}
+
+PlayerInfo PlayerManager::GetPlayer(PlayerID a_Player) {
+	return m_Players.at(a_Player);
+}
+
+void PlayerManager::Handle(const protocol::packets::PlayerJoinPacket& a_Packet) {
+	m_Players.emplace(a_Packet->m_Player.m_PlayerId, a_Packet->m_Player);
+	OnPlayerJoin(a_Packet->m_Player);
+}
+
+void PlayerManager::Handle(const protocol::packets::PlayerListPacket& a_Packet) {
+	for (auto pInfo : a_Packet->m_Players) {
+		m_Players.emplace(pInfo.m_PlayerId, pInfo);
+		OnPlayerJoin(pInfo);
+	}
+}
+
+void PlayerManager::Handle(const protocol::packets::PlayerLeavePacket& a_Packet) {
+	OnPlayerLeave(a_Packet->m_PlayerId);
+	m_Players.erase(a_Packet->m_PlayerId);
+}
+
+}  // namespace client
+}  // namespace td

src/client/socket/FakeSocket.cpp

@@ -0,0 +1,23 @@
+#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;
+}
+
+void FakeSocket::Disconnect() {
+	m_Server->DisconnectFakePeer(m_PeerId);
+}
+
+}  // namespace client
+}  // namespace td

src/client/state/GameState.cpp

@@ -0,0 +1,31 @@
+#include <client/state/GameState.h>
+
+
+namespace td {
+namespace client {
+
+GameState::GameState(Client& a_Client, const std::shared_ptr<game::World>& a_World, std::uint64_t a_StepTime,
+	const std::vector<protocol::LockStep> a_FirstSteps) :
+	ClientState(a_Client), m_World(a_World), m_Simulation(a_World, a_StepTime, a_FirstSteps) {
+	m_Simulation.OnMissingLockSteps.Connect([this](const std::vector<td::StepTime>& a_MissingSteps) {
+		SendPacket(protocol::packets::LockStepRequestPacket(a_MissingSteps));
+	});
+}
+
+GameState::~GameState() {}
+
+void GameState::Handle(const protocol::packets::LockStepsPacket& a_LockStep) {
+	m_Simulation.Handle(a_LockStep);
+}
+
+void GameState::Handle(const protocol::packets::LockStepResponsePacket& a_LockStep) {
+	m_Simulation.Handle(a_LockStep);
+}
+
+void GameState::Update(float a_Delta) {
+	m_CurrentLerp = m_Simulation.Update(a_Delta);
+	m_ElapsedTime += a_Delta;
+}
+
+}  // namespace client
+}  // namespace td

src/client/state/LobbyState.cpp

@@ -0,0 +1,27 @@
+#include <client/state/LobbyState.h>
+
+#include <client/state/GameState.h>
+
+namespace td {
+namespace client {
+
+LobbyState::LobbyState(Client& a_Client) : ClientState(a_Client), m_World(std::make_shared<game::World>()) {}
+
+LobbyState::~LobbyState() {}
+
+void LobbyState::Handle(const protocol::packets::WorldHeaderPacket& a_Packet) {
+	m_World->LoadMap(*a_Packet);
+}
+
+void LobbyState::Handle(const protocol::packets::WorldDataPacket& a_Packet) {
+	m_World->LoadMap(*a_Packet);
+}
+
+void LobbyState::Handle(const protocol::packets::BeginGamePacket& a_Packet) {
+	ChangeState<GameState>(m_World, STEP_TIME, a_Packet->m_FirstLocksteps);
+}
+
+void LobbyState::Update(float a_Delta) {}
+
+}  // namespace client
+}  // namespace td

src/client/state/LoggingState.cpp

@@ -0,0 +1,27 @@
+#include <client/state/LoggingState.h>
+
+#include <client/state/LobbyState.h>
+
+namespace td {
+namespace client {
+
+LoggingState::LoggingState(Client& a_Client, const std::string& a_PlayerName) : ClientState(a_Client) {
+	SendPacket(td::protocol::packets::PlayerLoginPacket(a_PlayerName));
+}
+
+void LoggingState::Update(float a_Delta) {
+}
+
+LoggingState::~LoggingState() {}
+
+void LoggingState::Handle(const protocol::packets::PlayerJoinPacket& a_Packet) {
+	// TODO: check if id matches client id
+}
+
+void LoggingState::Handle(const protocol::packets::LoggingSuccessPacket& a_Packet) {
+	m_StateMachine.m_Id = a_Packet->m_PlayerId;
+	ChangeState<LobbyState>();
+}
+
+}  // namespace client
+}  // namespace td

src/main.cpp

@@ -1,150 +1,16 @@
-#include <iostream>
-
-#include <td/protocol/packet/PacketSerialize.h>
-#include <fstream>
-#include <td/game/World.h>
-#include <td/input/Display.h>
-#include <td/protocol/packet/Packets.h>
-#include <td/render/renderer/EntityRenderer.h>
-#include <td/render/renderer/TowerRenderer.h>
-#include <td/render/renderer/WorldRenderer.h>
-#include <td/simulation/ClientSimulation.h>
-
-#include <sp/common/DataBuffer.h>
-#include <sp/extensions/Compress.h>
-#include <sp/io/MessageStream.h>
-#include <sp/io/StdIo.h>
-
-#include <server/Server.h>
-#include <server/socket/TcpSocket.h>
-#include <server/state/LobbyState.h>
-
-class WorldApply : public td::protocol::PacketHandler {
-  private:
-	td::game::World& m_World;
-	using td::protocol::PacketHandler::Handle;
-
-  public:
-	WorldApply(td::game::World& a_World) : m_World(a_World) {}
-
-	void Handle(const td::protocol::packets::WorldHeaderPacket& a_Header) override {
-		m_World.LoadMap(*a_Header);
-	}
-
-	void Handle(const td::protocol::packets::WorldDataPacket& a_Data) override {
-		m_World.LoadMap(*a_Data);
-	}
-};
-
-void Save(const td::protocol::PacketBase& header, const td::protocol::PacketBase& data) {
-	auto comp = std::make_shared<sp::ZlibCompress>();
-
-	std::ofstream fStream("test/tdmap.tdmap3");
-	auto out = std::make_shared<sp::StdOuput>(fStream);
-
-	sp::MessageStream<td::protocol::PacketFactory> stream(std::move(out), std::move(comp));
-
-	stream.WriteMessage(header, false);
-	stream.WriteMessage(data, false);
-}
-
-td::game::World GetWorld() {
-	auto comp = std::make_shared<sp::ZlibCompress>();
-
-	std::ifstream fStream("test/tdmap.tdmap2");
-	auto out = std::make_shared<sp::StdInput>(fStream);
-
-	sp::MessageStream<td::protocol::PacketFactory> stream(std::move(out), std::move(comp));
-
-	auto header = stream.ReadMessage(td::protocol::PacketID::WorldHeader);
-	auto data = stream.ReadMessage(td::protocol::PacketID::WorldData);
-
-	td::game::World w;
-	auto wa = std::make_shared<WorldApply>(w);
-
-	td::protocol::PacketDispatcher d;
-	d.RegisterHandler(wa);
-
-	d.Dispatch(*header);
-	d.Dispatch(*data);
-
-	Save(*header, *data);
-
-	return w;
-}
-
-void FastForward(td::game::World& a_World, const td::sim::GameHistory& a_LockSteps) {
-	const td::FpFloat delta = td::FpFloat(1) / td::FpFloat(75);
-	for (const auto& lockstep : a_LockSteps) {
-		a_World.Tick(lockstep, delta);
-	}
-}
-
-td::sim::GameHistory GetCustomHistory() {
-	constexpr std::size_t MAX_COUNT = 20 * 60 * 40;
-
-	td::sim::GameHistory gh(MAX_COUNT);
-
-	auto spawn = td::protocol::CommandPtr(
-		std::make_shared<td::protocol::commands::SpawnTroopCommand>(td::EntityType::Zombie, 0, td::Vec2fp{td::FpFloat(77), td::FpFloat(13)}, 0));
-	gh[0].push_back(spawn);
-
-	auto tower = td::protocol::CommandPtr(
-		std::make_shared<td::protocol::commands::PlaceTowerCommand>(td::TowerType::Archer, 0, td::TowerCoords{77, 13}));
-	gh[0].push_back(tower);
-
-	return gh;
-}
+#include <td/display/state/MainMenuState.h>
+#include <td/misc/Time.h>
 
 int main(int argc, char** argv) {
-	td::game::World w = GetWorld();
-
 	// init GL context
 	td::Display display(1920, 1080, "Tower-Defense 2");
 
-	td::render::Camera cam;
-
-	display.OnAspectRatioChange.Connect([&cam](float a_AspectRatio) { cam.UpdatePerspective(a_AspectRatio); });
-
-	td::sim::GameHistory gh = GetCustomHistory();
-
-	td::render::RenderPipeline renderer;
-	renderer.AddRenderer<td::render::WorldRenderer>(cam, w);
-	renderer.AddRenderer<td::render::EntityRenderer>(cam, w);
-	renderer.AddRenderer<td::render::TowerRenderer>(cam, w);
-
-	cam.SetCamPos({77, 7, 13});
-	cam.UpdatePerspective(display.GetAspectRatio());
-
-	td::sim::ClientSimulation simulation(w, 50);
-
-	display.OnKeyDown.Connect([&simulation](SDL_Keycode key) {
-		static int counter = 0;
-		if (key == SDLK_A) {
-			auto spawn = td::protocol::CommandPtr(
-				std::make_shared<td::protocol::commands::SpawnTroopCommand>(td::EntityType::Zombie, 0, td::Vec2fp{td::FpFloat(77), td::FpFloat(13)}, 0));
-			std::array<td::protocol::LockStep, LOCKSTEP_BUFFER_SIZE> steps{};
-			steps[0].push_back(spawn);
-			td::protocol::packets::LockStepsPacket packet{counter * LOCKSTEP_BUFFER_SIZE * 3, steps};
-			simulation.Handle(packet);
-			counter++;
-		}
-	});
-
-
-	// server
-	auto socket = std::make_shared<td::server::TcpSocket>();
-	td::server::Server server(socket);
-	server.UpdateState(std::make_shared<td::server::LobbyState>());
-	server.Update(1.0f);
-	server.Update(1.0f);
-	socket->OnDisconnect(0);
+	display.ChangeState<td::MainMenuState>();
 
+	td::Timer timer;
 	while (!display.IsCloseRequested()) {
 		display.PollEvents();
-		float lerp = simulation.Update();
-		renderer.Render(lerp);
-		display.Update();
+		display.Update(timer.GetDelta());
 	}
 
 	return 0;

src/server/IServerSocket.cpp

@@ -3,18 +3,53 @@
 namespace td {
 namespace server {
 
+IServerSocket::IServerSocket() {
+}
+
+void IServerSocket::RegisterHandler(const PlayerPacketHandler& a_Handler) {
+	m_Handlers.push_back(a_Handler);
+}
+
+void IServerSocket::UnregisterHandler(const PlayerPacketHandler& a_Handler) {
+	auto it = std::find_if(m_Handlers.begin(), m_Handlers.end(),
+		[&a_Handler](PlayerPacketHandler& handler) { return a_Handler.template target<PlayerPacketHandlerType>() == handler.template target<PlayerPacketHandlerType>(); });
+	m_Handlers.erase(it);
+}
+
 void IServerSocket::OnConnectPeer(PeerID a_PeerId) {
+	// here, the client is not a player yet (we need to wait for auth)
 	m_Ids.AddConnection(a_PeerId);
-	OnConnect(m_Ids.GetPlayerId(a_PeerId));
+	OnPlayerConnect(m_Ids.GetPlayerId(a_PeerId));
 }
 
 void IServerSocket::OnDisconnectPeer(PeerID a_PeerId) {
-	OnDisconnect(m_Ids.GetPlayerId(a_PeerId));
+	OnPlayerDisconnect(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);
+	auto playerId = m_Ids.GetPlayerId(a_PeerId);
+
+	for (const auto& factory : m_Handlers) {
+		auto handler = factory(playerId);
+		a_Packet.Dispatch(*handler);
+	}
+
+	OnReceive(playerId, 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);
+	}
+}
+
+void IServerSocket::Disconnect(PlayerID a_PlayerId) {
+	OnDisconnectPeer(m_Ids.GetPeerId(a_PlayerId));
 }
 
 }  // namespace server

src/server/IServerState.cpp

@@ -1,28 +0,0 @@
-#include <server/IServerState.h>
-#include <server/Server.h>
-
-namespace td {
-namespace server {
-
-void IServerState::SetServer(Server* a_Server) {
-	assert(a_Server);
-	m_Server = a_Server;
-	Connect(m_Server->m_Socket->OnConnect, std::bind(&IServerState::OnPlayerJoin, this, std::placeholders::_1));
-	Connect(m_Server->m_Socket->OnDisconnect, std::bind(&IServerState::OnPlayerLeave, this, std::placeholders::_1));
-	Connect(m_Server->m_Socket->OnReceive, std::bind(&IServerState::HandlePacket, this, std::placeholders::_1, std::placeholders::_2));
-}
-
-IServerState::IServerState() : m_Server(nullptr) {}
-
-IServerState::~IServerState() {}
-
-void IServerState::SendPacket(PlayerID a_Id, const protocol::PacketBase& a_Packet) {
-	m_Server->m_Socket->Send(a_Id, a_Packet);
-}
-
-void IServerState::SetNewState(const std::shared_ptr<IServerState>& a_NewState) {
-	m_Server->UpdateState(a_NewState);
-}
-
-}  // namespace server
-}  // namespace td

src/server/PlayerManager.cpp

@@ -0,0 +1,62 @@
+#include <server/PlayerManager.h>
+
+#include <iostream>
+#include <server/IServerSocket.h>
+
+namespace td {
+namespace server {
+
+PlayerManager::ConnectionHandler::ConnectionHandler(PlayerManager& a_PlayerManager, PlayerID a_Player) :
+	m_PlayerManager(a_PlayerManager), m_Player(a_Player) {}
+
+void PlayerManager::ConnectionHandler::Handle(const protocol::packets::PlayerLoginPacket& a_Packet) {
+	PlayerInfo pInfo{m_Player, a_Packet->m_PlayerName};
+
+	auto& socket = *m_PlayerManager.m_Socket;
+	auto& players = m_PlayerManager.m_Players;
+
+	std::vector<PlayerInfo> playerInfos;
+	playerInfos.reserve(players.size());
+	for (auto& [id, player] : players) {
+		playerInfos.push_back(player);
+	}
+
+	socket.Send(m_Player, protocol::packets::LoggingSuccessPacket(m_Player));
+	socket.Send(m_Player, protocol::packets::PlayerListPacket(playerInfos));
+	socket.Broadcast(protocol::packets::PlayerJoinPacket(pInfo));
+
+	players.emplace(m_Player, pInfo);
+	m_PlayerManager.OnPlayerJoin(m_Player, pInfo);
+	std::cout << "[Server] " << a_Packet->m_PlayerName << " joined !\n";
+}
+
+void PlayerManager::ConnectionHandler::Handle(const protocol::packets::DisconnectPacket& a_Packet) {
+	m_PlayerManager.Disconnect(m_Player);
+}
+
+PlayerManager::PlayerManager(const std::shared_ptr<IServerSocket>& a_Socket) : m_Socket(a_Socket) {
+	a_Socket->RegisterHandler([this](PlayerID a_PlayerId) { return std::make_unique<ConnectionHandler>(*this, a_PlayerId); });
+	a_Socket->OnPlayerDisconnect.Connect(std::bind(&PlayerManager::Disconnect, this, std::placeholders::_1));
+}
+
+void PlayerManager::Disconnect(PlayerID a_Player) {
+	if (!m_Players.contains(a_Player))
+		return;
+	std::cout << "[Server] " << +a_Player << " wants to disconnect !\n";
+	m_Socket->Broadcast(protocol::packets::PlayerLeavePacket(a_Player));
+	m_Players.erase(a_Player);
+}
+
+PlayerManager::~PlayerManager() {}
+
+void PlayerManager::RemovePlayer(PlayerID a_Player) {
+	m_Socket->Disconnect(a_Player);
+	Disconnect(a_Player);
+}
+
+PlayerInfo PlayerManager::GetPlayer(PlayerID a_Player) {
+	return m_Players.at(a_Player);
+}
+
+}  // namespace server
+}  // namespace td

src/server/Server.cpp

@@ -1 +1,22 @@
-#include <server/Server.h>
+#include <server/Server.h>
+
+#include <chrono>
+
+#include <server/state/LobbyState.h>
+
+namespace td {
+namespace server {
+
+Server::Server(const std::shared_ptr<IServerSocket>& a_Socket) : m_Socket(a_Socket), m_Players(a_Socket), m_LastMspt(0) {
+	ChangeState<LobbyState>();
+}
+
+void Server::Update(float a_Delta) {
+	auto before = std::chrono::system_clock::now();
+	StateMachine<Server, void, float>::Update(a_Delta);
+	m_LastMspt = std::chrono::duration<float, std::chrono::milliseconds::period>(std::chrono::system_clock::now() - before).count();
+	// std::cout << "Tick : " << m_LastMspt << "ms\n";
+}
+
+}  // namespace server
+}  // namespace td

src/server/ServerState.cpp

@@ -0,0 +1,26 @@
+#include <server/Server.h>
+#include <server/ServerState.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));
+	Connect(m_StateMachine.m_Players.OnPlayerJoin, std::bind(&ServerState::OnPlayerJoin, this, std::placeholders::_1, std::placeholders::_2));
+	Connect(m_StateMachine.m_Players.OnPlayerLeave, std::bind(&ServerState::OnPlayerLeave, this, std::placeholders::_1));
+}
+
+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 td

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/socket/TcpSocket.cpp

@@ -1,8 +0,0 @@
-#include <server/socket/TcpSocket.h>
-
-namespace td {
-namespace server {
-
-
-}  // namespace server
-}  // namespace td

src/server/state/GameState.cpp

@@ -1,24 +1,46 @@
 #include <server/state/GameState.h>
+#include <server/state/GameStateHandler.h>
+#include <td/protocol/packet/PacketSerialize.h>
 
 #include <iostream>
 
 namespace td {
 namespace server {
 
-void GameState::HandlePacket(PlayerID a_Id, const protocol::PacketBase& a_Packet) {
+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 << "[Server] Switched to Game state !\n";
+	BroadcastPacket(a_World->GetPacketHeader());
+	BroadcastPacket(a_World->GetPacketData());
+	BroadcastPacket(protocol::packets::BeginGamePacket());
+	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;
+	while (m_Time > stepTimeSecond) {
+		m_Time -= stepTimeSecond;
+		auto lockStepPacket = m_Simulation.Update();
+		BroadcastPacket(lockStepPacket);
+	}
 }
 
-void GameState::OnPlayerJoin(PlayerID a_Id) {
+void GameState::OnPlayerJoin(PlayerID a_Id, const td::PlayerInfo& a_Info) {
+	SendPacket(a_Id, m_World->GetPacketHeader());
+	SendPacket(a_Id, m_World->GetPacketData());
 
-}
+	// TODO: real teams
+	std::vector<PlayerInfo> team;
+	std::vector<protocol::LockStep> locksteps = m_Simulation.GetFirstLocksteps();
 
-void GameState::OnPlayerLeave(PlayerID a_Id) {
-	std::cout << "Game leave !" << std::endl;
+	BroadcastPacket(protocol::packets::BeginGamePacket(team, team, locksteps));
 }
 
 }  // namespace server

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

@@ -1,26 +1,60 @@
-#include <server/state/LobbyState.h>
 #include <server/state/GameState.h>
+#include <server/state/LobbyState.h>
 
 #include <iostream>
+#include <fstream>
+#include <td/protocol/packet/PacketSerialize.h>
+
+#include <sp/common/DataBuffer.h>
+#include <sp/extensions/Compress.h>
+#include <sp/io/MessageStream.h>
+#include <sp/io/StdIo.h>
 
 namespace td {
 namespace server {
 
-void LobbyState::HandlePacket(PlayerID a_Id, const protocol::PacketBase& a_Packet) {
+void Save(const protocol::PacketBase& header, const protocol::PacketBase& data) {
+	auto comp = std::make_shared<sp::ZlibCompress>();
 
+	std::ofstream fStream("test/tdmap.tdmap3");
+	auto out = std::make_shared<sp::StdOuput>(fStream);
+
+	sp::MessageStream<protocol::PacketFactory> stream(std::move(out), std::move(comp));
+
+	stream.WriteMessage(header, false);
+	stream.WriteMessage(data, false);
 }
 
-void LobbyState::Update(float a_Delta) {
-	SetNewState(std::make_shared<GameState>());
+game::WorldPtr GetWorld() {
+	auto comp = std::make_shared<sp::ZlibCompress>();
+
+	std::ifstream fStream("test/tdmap.tdmap2");
+	auto out = std::make_shared<sp::StdInput>(fStream);
+
+	sp::MessageStream<protocol::PacketFactory> stream(std::move(out), std::move(comp));
+
+	auto header = stream.ReadConcreteMessage<protocol::packets::WorldHeaderPacket>();
+	auto data = stream.ReadConcreteMessage<protocol::packets::WorldDataPacket>();
+
+	auto w = std::make_shared<game::World>();
+
+	w->LoadMap(**header);
+	w->LoadMap(**data);
+
+	// Save(*header, *data);
+
+	return w;
 }
 
-void LobbyState::OnPlayerJoin(PlayerID a_Id) {
+LobbyState::LobbyState(Server& a_Server) : ServerState(a_Server) {}
 
+void LobbyState::HandlePacket(PlayerID a_Id, const protocol::PacketBase& a_Packet) {}
+
+void LobbyState::OnPlayerJoin(PlayerID a_Id, const td::PlayerInfo& a_Info) {
+	m_StateMachine.ChangeState<GameState>(GetWorld());
 }
 
-void LobbyState::OnPlayerLeave(PlayerID a_Id) {
-	std::cout << "Lobby leave !" << std::endl;
-}
+void LobbyState::Update(float a_Delta) {}
 
 }  // namespace server
 }  // namespace td

src/td/display/Display.cpp

@@ -0,0 +1,102 @@
+#include <td/display/Display.h>
+
+#include <td/display/ImGuiTheme.h>
+#include <td/misc/Format.h>
+#include <td/misc/Log.h>
+
+#include <raylib-cpp/raylib.hpp>
+#include <td/render/RayGui.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) {
+
+	InitWindow(a_Width, a_Height, a_Title.c_str());
+
+	m_LastWidth = a_Width;
+	m_LastHeight = a_Height;
+	m_AspectRatio = (float)m_LastWidth / m_LastHeight;
+
+	// WindowResizeEvent(WindowWidth, WindowHeight);
+
+	// vsync
+	SetTargetFPS(60);
+
+	rlImGuiSetup(true);
+
+	float main_scale = 1.5f;
+
+	ImGui::GetStyle().FontScaleMain = main_scale;
+
+	LoadTheme();
+}
+
+void Display::Close() {
+	m_ShouldClose = true;
+}
+
+void Display::PollEvents() {
+	// PollInputEvents();
+	// 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();
+	if (WindowShouldClose())
+		m_ShouldClose = true;
+	BeginDrawing();
+	rlImGuiBegin();
+}
+
+void Display::Update(float a_Delta) {
+	StateMachine::Update(a_Delta);
+	#ifndef NDEBUG
+		ImGui::ShowDemoWindow();
+	#endif
+	ImGui::Render();
+	rlImGuiEnd();
+	EndDrawing();
+	ClearBackground(DARKGRAY);
+	// 	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() {
+	rlImGuiShutdown();
+	CloseWindow();
+}
+
+}  // 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/ImGuiTheme.cpp

@@ -0,0 +1,87 @@
+#include <td/display/ImGuiTheme.h>
+
+#include <td/render/RayGui.h>
+
+namespace td {
+
+void LoadTheme() {
+	static const bool bStyleDark_ = true;
+	static const float alpha_ = 0.8f;
+
+	ImGuiStyle& style = ImGui::GetStyle();
+
+	// light style from Pacôme Danhiez (user itamago) https://github.com/ocornut/imgui/pull/511#issuecomment-175719267
+	style.Alpha = 1.0f;
+	style.FrameRounding = 3.0f;
+	style.Colors[ImGuiCol_Text] = ImVec4(0.00f, 0.00f, 0.00f, 1.00f);
+	style.Colors[ImGuiCol_TextDisabled] = ImVec4(0.60f, 0.60f, 0.60f, 1.00f);
+	style.Colors[ImGuiCol_WindowBg] = ImVec4(0.94f, 0.94f, 0.94f, 0.94f);
+	// style.Colors[ImGuiCol_ChildWindowBg] = ImVec4(0.00f, 0.00f, 0.00f, 0.00f);
+	style.Colors[ImGuiCol_PopupBg] = ImVec4(1.00f, 1.00f, 1.00f, 0.94f);
+	style.Colors[ImGuiCol_Border] = ImVec4(0.00f, 0.00f, 0.00f, 0.39f);
+	style.Colors[ImGuiCol_BorderShadow] = ImVec4(1.00f, 1.00f, 1.00f, 0.10f);
+	style.Colors[ImGuiCol_FrameBg] = ImVec4(1.00f, 1.00f, 1.00f, 0.94f);
+	style.Colors[ImGuiCol_FrameBgHovered] = ImVec4(0.26f, 0.59f, 0.98f, 0.40f);
+	style.Colors[ImGuiCol_FrameBgActive] = ImVec4(0.26f, 0.59f, 0.98f, 0.67f);
+	style.Colors[ImGuiCol_TitleBg] = ImVec4(0.96f, 0.96f, 0.96f, 1.00f);
+	style.Colors[ImGuiCol_TitleBgCollapsed] = ImVec4(1.00f, 1.00f, 1.00f, 0.51f);
+	style.Colors[ImGuiCol_TitleBgActive] = ImVec4(0.82f, 0.82f, 0.82f, 1.00f);
+	style.Colors[ImGuiCol_MenuBarBg] = ImVec4(0.86f, 0.86f, 0.86f, 1.00f);
+	style.Colors[ImGuiCol_ScrollbarBg] = ImVec4(0.98f, 0.98f, 0.98f, 0.53f);
+	style.Colors[ImGuiCol_ScrollbarGrab] = ImVec4(0.69f, 0.69f, 0.69f, 1.00f);
+	style.Colors[ImGuiCol_ScrollbarGrabHovered] = ImVec4(0.59f, 0.59f, 0.59f, 1.00f);
+	style.Colors[ImGuiCol_ScrollbarGrabActive] = ImVec4(0.49f, 0.49f, 0.49f, 1.00f);
+	// style.Colors[ImGuiCol_ComboBg] = ImVec4(0.86f, 0.86f, 0.86f, 0.99f);
+	style.Colors[ImGuiCol_CheckMark] = ImVec4(0.26f, 0.59f, 0.98f, 1.00f);
+	style.Colors[ImGuiCol_SliderGrab] = ImVec4(0.24f, 0.52f, 0.88f, 1.00f);
+	style.Colors[ImGuiCol_SliderGrabActive] = ImVec4(0.26f, 0.59f, 0.98f, 1.00f);
+	style.Colors[ImGuiCol_Button] = ImVec4(0.26f, 0.59f, 0.98f, 0.40f);
+	style.Colors[ImGuiCol_ButtonHovered] = ImVec4(0.26f, 0.59f, 0.98f, 1.00f);
+	style.Colors[ImGuiCol_ButtonActive] = ImVec4(0.06f, 0.53f, 0.98f, 1.00f);
+	style.Colors[ImGuiCol_Header] = ImVec4(0.26f, 0.59f, 0.98f, 0.31f);
+	style.Colors[ImGuiCol_HeaderHovered] = ImVec4(0.26f, 0.59f, 0.98f, 0.80f);
+	style.Colors[ImGuiCol_HeaderActive] = ImVec4(0.26f, 0.59f, 0.98f, 1.00f);
+	// style.Colors[ImGuiCol_Column] = ImVec4(0.39f, 0.39f, 0.39f, 1.00f);
+	// style.Colors[ImGuiCol_ColumnHovered] = ImVec4(0.26f, 0.59f, 0.98f, 0.78f);
+	// style.Colors[ImGuiCol_ColumnActive] = ImVec4(0.26f, 0.59f, 0.98f, 1.00f);
+	style.Colors[ImGuiCol_ResizeGrip] = ImVec4(1.00f, 1.00f, 1.00f, 0.50f);
+	style.Colors[ImGuiCol_ResizeGripHovered] = ImVec4(0.26f, 0.59f, 0.98f, 0.67f);
+	style.Colors[ImGuiCol_ResizeGripActive] = ImVec4(0.26f, 0.59f, 0.98f, 0.95f);
+	// style.Colors[ImGuiCol_CloseButton] = ImVec4(0.59f, 0.59f, 0.59f, 0.50f);
+	// style.Colors[ImGuiCol_CloseButtonHovered] = ImVec4(0.98f, 0.39f, 0.36f, 1.00f);
+	// style.Colors[ImGuiCol_CloseButtonActive] = ImVec4(0.98f, 0.39f, 0.36f, 1.00f);
+	style.Colors[ImGuiCol_PlotLines] = ImVec4(0.39f, 0.39f, 0.39f, 1.00f);
+	style.Colors[ImGuiCol_PlotLinesHovered] = ImVec4(1.00f, 0.43f, 0.35f, 1.00f);
+	style.Colors[ImGuiCol_PlotHistogram] = ImVec4(0.90f, 0.70f, 0.00f, 1.00f);
+	style.Colors[ImGuiCol_PlotHistogramHovered] = ImVec4(1.00f, 0.60f, 0.00f, 1.00f);
+	style.Colors[ImGuiCol_TextSelectedBg] = ImVec4(0.26f, 0.59f, 0.98f, 0.35f);
+	// style.Colors[ImGuiCol_ModalWindowDarkening] = ImVec4(0.20f, 0.20f, 0.20f, 0.35f);
+
+	if (bStyleDark_) {
+		for (int i = 0; i <= ImGuiCol_COUNT; i++) {
+			ImVec4& col = style.Colors[i];
+			float H, S, V;
+			ImGui::ColorConvertRGBtoHSV(col.x, col.y, col.z, H, S, V);
+
+			if (S < 0.1f) {
+				V = 1.0f - V;
+			}
+			ImGui::ColorConvertHSVtoRGB(H, S, V, col.x, col.y, col.z);
+			if (col.w < 1.00f) {
+				col.w *= alpha_;
+			}
+		}
+	} else {
+		for (int i = 0; i <= ImGuiCol_COUNT; i++) {
+			ImVec4& col = style.Colors[i];
+			if (col.w < 1.00f) {
+				col.x *= alpha_;
+				col.y *= alpha_;
+				col.z *= alpha_;
+				col.w *= alpha_;
+			}
+		}
+	}
+}
+
+}  // namespace td

src/td/display/menu/CreatePartyMenu.cpp

@@ -0,0 +1,16 @@
+#include <td/display/menu/CreatePartyMenu.h>
+
+#include <td/render/RayGui.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 <td/render/RayGui.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 <td/render/RayGui.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 <td/render/RayGui.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

src/td/display/state/DebugWorldState.cpp

@@ -0,0 +1,119 @@
+#include <td/display/state/DebugWorldState.h>
+
+#include <td/display/Display.h>
+#include <td/display/state/DebugWorldState.h>
+#include <td/game/World.h>
+#include <td/protocol/packet/Packets.h>
+#include <td/render/renderer/EntityRenderer.h>
+#include <td/render/renderer/PlayerListRenderer.h>
+#include <td/render/renderer/TimerRenderer.h>
+#include <td/render/renderer/TowerRenderer.h>
+#include <td/render/renderer/WorldRenderer.h>
+
+#include <server/Server.h>
+#include <server/socket/FakeSocket.h>
+#include <server/state/LobbyState.h>
+
+#include <client/Client.h>
+#include <client/socket/FakeSocket.h>
+#include <client/state/GameState.h>
+#include <client/state/LoggingState.h>
+
+namespace td {
+
+DebugWorldState::DebugWorldState(Display& a_Display) : DisplayState(a_Display), m_ClientState(nullptr) {
+	// server
+	m_ServerSocket = std::make_shared<server::FakeSocket>();
+	m_Server = std::make_unique<server::Server>(m_ServerSocket);
+
+	// client
+	auto clientFakeSocket = client::FakeSocket::Connect(m_ServerSocket);
+	m_Client = std::make_unique<client::Client>(clientFakeSocket);
+
+	// TODO: make it better
+	m_Client->OnStateChange.Connect([this](client::Client::State& a_State) {
+		if (auto gameState = dynamic_cast<client::GameState*>(&a_State)) {
+			// render
+			auto clientWorld = gameState->GetWorld();
+			m_Renderer.AddRenderer<render::WorldRenderer>(static_cast<raylib::Camera&>(m_Camera), clientWorld);
+			m_Renderer.AddRenderer<render::EntityRenderer>(static_cast<raylib::Camera&>(m_Camera), clientWorld);
+			m_Renderer.AddRenderer<render::TowerRenderer>(static_cast<raylib::Camera&>(m_Camera), clientWorld);
+			m_Renderer.AddRenderer<render::TimerRenderer, client::GameState&>(*gameState);
+
+			auto& list = m_Renderer.AddRenderer<render::PlayerListRenderer, const td::client::PlayerManager&>(m_Client->GetPlayers());
+
+			list.OnPlayerCreate.Connect([this]() {
+				auto newSocket = client::FakeSocket::Connect(m_ServerSocket);
+				auto newClient = std::make_unique<client::Client>(newSocket);
+				newClient->ChangeState<client::LoggingState>("Bot");
+				m_FakeClients.push_back(std::move(newClient));
+			});
+
+			list.OnPlayerKick.Connect([this](PlayerID a_Player) {
+				auto it = std::find_if(m_FakeClients.begin(), m_FakeClients.end(), [a_Player](auto& clientPtr) {
+					if (!clientPtr->GetId().has_value())
+						return false;
+					return clientPtr->GetId().value() == a_Player;
+				});
+				m_FakeClients.erase(it);
+			});
+
+			// update state
+			m_ClientState = gameState;
+		}
+	});
+
+	m_Client->ChangeState<client::LoggingState>("Player0");
+
+	// camera
+	// m_Camera = Camera{{0}};
+	m_Camera.position = (Vector3){77.0f, 7.0f, 13.0f};  // Camera position
+	m_Camera.target = (Vector3){0.0f, 1.0f, -1.0f};	  // Camera looking at point
+	m_Camera.up = (Vector3){0.0f, 1.0f, 0.0f};		  // Camera up vector (rotation towards target)
+	m_Camera.fovy = 45.0f;							  // Camera field-of-view Y
+	m_Camera.projection = CAMERA_PERSPECTIVE;		  // Camera projection type
+
+	// m_Camera.SetCamPos({77, 7, 13});
+	// m_Camera.UpdatePerspective(m_StateMachine.GetAspectRatio());
+}
+
+void DebugWorldState::Update(float a_Delta) {
+	m_Server->Update(a_Delta * m_PlaySpeed);
+	m_Client->Update(a_Delta * m_PlaySpeed);
+	UpdateCamera(&m_Camera, CAMERA_FREE);
+
+	if (m_ClientState) {
+		float lerp = m_ClientState->GetCurrentLerp();
+		BeginMode3D(m_Camera);
+		m_Renderer.Render(lerp);
+		EndMode3D();
+	}
+
+	constexpr int SECONDS = 10;
+	if (IsKeyPressed(KEY_Q)) {
+		m_Client->SendPacket(td::protocol::packets::SpawnTroopPacket(td::EntityType::Zombie, 1));
+	}
+
+	if (IsKeyPressed(KEY_Z))
+		m_Client->SendPacket(td::protocol::packets::PlaceTowerPacket(td::TowerType::Archer, td::TowerCoords(77, 13)));
+
+	if (IsKeyPressed(KEY_F)) {
+		m_Server->Update(SECONDS);
+		m_Client->Update(SECONDS);
+	}
+
+	if (IsKeyPressed(KEY_P))
+		m_PlaySpeed = 1 - m_PlaySpeed;
+}
+
+void DebugWorldState::OnAspectRatioChange(float a_Ratio) {
+	// m_Camera.UpdatePerspective(a_Ratio);
+}
+
+void DebugWorldState::OnKeyDown(int a_Key) {
+	// temporary tests
+}
+
+DebugWorldState::~DebugWorldState() {}
+
+}  // namespace td

src/td/display/state/MainMenuState.cpp

@@ -0,0 +1,42 @@
+#include <td/display/state/MainMenuState.h>
+
+#include <td/render/RayGui.h>
+#include <td/display/menu/MainMenu.h>
+#include <td/display/state/DebugWorldState.h>
+
+namespace td {
+
+MainMenuState::MainMenuState(Display& a_Display) : DisplayState(a_Display) {
+	PushState<MainMenu>();
+}
+
+MainMenuState::~MainMenuState() {}
+
+static int GetWindowFullScreenFlags() {
+	return ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_NoBackground;
+}
+
+static void SetNextWindowFullScreen() {
+	const ImGuiViewport* viewport = ImGui::GetMainViewport();
+	ImGui::SetNextWindowPos(viewport->WorkPos);
+	ImGui::SetNextWindowSize(viewport->WorkSize);
+}
+
+void MainMenuState::Update(float a_Delta) {
+	SetNextWindowFullScreen();
+	ImGui::Begin("MainWindow", nullptr, GetWindowFullScreenFlags());
+	MainMenuStateStack::Update();
+	ImGui::End();
+}
+
+void MainMenuState::RenderBackButton() {
+	if (ImGui::Button("Back"))
+		PopState();
+}
+
+void MainMenuState::OnKeyDown(int a_Key) {
+	if (a_Key == KEY_ESCAPE)
+		PopState();
+}
+
+}  // namespace td

src/td/game/World.cpp

@@ -1,5 +1,9 @@
+#include <cassert>
+#include <td/Maths.h>
 #include <td/game/World.h>
+#include <td/game/WorldTypes.h>
 
+#include <td/protocol/packet/PacketSerialize.h>
 #include <td/simulation/WorldTicker.h>
 
 namespace td {
@@ -14,7 +18,7 @@ class ColorTileVisitor : public TileHandler {
 	ColorTileVisitor(const World& a_World) : m_World(a_World), m_Result(nullptr) {}
 
 	virtual void Handle(const EmptyTile& a_Tile) override {}
-	
+
 	virtual void Handle(const TowerTile& a_Tile) override {
 		m_Result = &m_World.GetTowerTileColorPalette()[a_Tile->m_ColorPaletteRef];
 	}
@@ -62,6 +66,16 @@ bool World::LoadMap(const protocol::pdata::WorldHeader& a_WorldHeader) {
 	return true;
 }
 
+protocol::packets::WorldHeaderPacket World::GetPacketHeader() const {
+	return protocol::packets::WorldHeaderPacket(m_TowerPlacePalette, m_WalkablePalette, m_DecorationPalette, m_Background,
+		m_SpawnColorPalette, m_TilePalette, GetRedTeam().GetSpawn(), GetBlueTeam().GetSpawn(), GetRedTeam().GetCastle(),
+		GetBlueTeam().GetCastle());
+}
+
+protocol::packets::WorldDataPacket World::GetPacketData() const {
+	return protocol::packets::WorldDataPacket(m_Chunks);
+}
+
 bool World::LoadMap(const protocol::pdata::WorldData& a_WorldData) {
 	m_Chunks = a_WorldData.m_Chunks;
 	return true;
@@ -78,5 +92,14 @@ void World::ResetSnapshots(std::shared_ptr<sim::WorldSnapshot>& a_Current, std::
 	m_NextState = a_Next;
 }
 
+TilePtr World::GetTile(std::int32_t x, std::int32_t y) const {
+	ChunkCoord coords{static_cast<std::int16_t>(x / Chunk::ChunkWidth), static_cast<std::int16_t>(y / Chunk::ChunkHeight)};
+	auto it = m_Chunks.find(coords);
+	assert(it != m_Chunks.end());
+	auto chunk = it->second;
+	Vec2i inchunkCoords{x % Chunk::ChunkWidth, y % Chunk::ChunkHeight};
+	return GetTilePtr(chunk->GetTileIndex(inchunkCoords.y * Chunk::ChunkWidth + inchunkCoords.x));
+}
+
 }  // namespace game
 }  // namespace td

src/td/input/Display.cpp

@@ -1,184 +0,0 @@
-#include <td/input/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::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() {
-	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/render/Camera.cpp

@@ -1,28 +0,0 @@
-#include <td/render/Camera.h>
-
-#include <cmath>
-
-namespace td {
-namespace render {
-
-void Camera::UpdatePerspective(float a_AspectRatio) {
-	m_ProjectionMatrix = maths::Perspective(80.0f / 180.0f * PI, a_AspectRatio, 0.1f, 160.0f);
-	m_InvProjectionMatrix = maths::Inverse(m_ProjectionMatrix);
-	OnPerspectiveChange();
-}
-
-void Camera::SetCamPos(const Vec3f& a_NewPos) {
-	Vec3f front = {
-		std::cos(m_Yaw) * std::cos(m_Pitch),
-		std::sin(m_Pitch),
-		std::sin(m_Yaw) * std::cos(m_Pitch)
-	};
-
-	m_CamPos = a_NewPos;
-	m_ViewMatrix = maths::Look(m_CamPos, front, { 0, 1, 0 });
-	m_InvViewMatrix = maths::Transpose(maths::Inverse(m_ViewMatrix));  // why transpose ? I don't know
-	OnViewChange();
-}
-
-}  // namespace render
-}  // namespace td

src/td/render/Renderer.cpp

@@ -1,25 +1,23 @@
 #include <td/render/Renderer.h>
 
-#include <td/render/OpenGL.h>
-
 namespace td {
 namespace render {
 
 void BasicRenderer::Render(const GL::VertexArray& a_Vao) {
 	a_Vao.Bind();
-	glDrawArrays(GL_TRIANGLES, 0, a_Vao.GetVertexCount());
-	// glDrawElements(GL_TRIANGLES, a_Vao.GetVertexCount(), GL_UNSIGNED_INT, nullptr);
+	// rlDrawArrays(RL_TRIANGLES, 0, a_Vao.GetVertexCount());
+	// rlDrawElements(RL_TRIANrlES, a_Vao.GetVertexCount(), RL_UNSIGNED_INT, nullptr);
 	a_Vao.Unbind();
 }
 
 RenderPipeline::RenderPipeline() {
-	glEnable(GL_TEXTURE_2D);
-	glEnable(GL_BLEND);
-	glEnable(GL_DEPTH_TEST);
-	glEnable(GL_CULL_FACE);
-	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-	glDepthFunc(GL_LESS);
-	glFrontFace(GL_CCW);
+	// rlEnable(RL_TEXTURE_2D);
+	// rlEnable(RL_BLEND);
+	// rlEnable(RL_DEPTH_TEST);
+	// rlEnable(RL_CULL_FACE);
+	// rlBlendFunc(RL_SRC_ALPHA, RL_ONE_MINUS_SRC_ALPHA);
+	// rlDepthFunc(RL_LESS);
+	// rlFrontFace(RL_CCW);
 }
 
 }  // namespace render

src/td/render/loader/GLLoader.cpp

@@ -1,28 +1,26 @@
 #include <td/render/loader/GLLoader.h>
 
-#include <td/render/OpenGL.h>
-
 namespace td {
 namespace GL {
 
 VertexArray::~VertexArray() {
-	if (m_ID != 0)
-		glDeleteVertexArrays(1, &m_ID);
+	// if (m_ID != 0)
+		// glDeleteVertexArrays(1, &m_ID);
 }
 
 VertexArray::VertexArray(ElementBuffer&& indicies) : m_ElementBuffer(std::move(indicies)) {
-	glGenVertexArrays(1, &m_ID);
+	// glGenVertexArrays(1, &m_ID);
 	Bind();
 	BindElementArrayBuffer();
 	// Unbind();
 }
 
 void VertexArray::Bind() const {
-	glBindVertexArray(m_ID);
+	// glBindVertexArray(m_ID);
 }
 
 void VertexArray::Unbind() const {
-	glBindVertexArray(0);
+	// glBindVertexArray(0);
 }
 
 void VertexArray::BindVertexBuffer(VertexBuffer&& VertexBuffer) {
@@ -36,24 +34,24 @@ void VertexArray::BindElementArrayBuffer() {
 }
 
 VertexBuffer::~VertexBuffer() {
-	if (m_ID != 0)
-		glDeleteBuffers(1, &m_ID);
+	// if (m_ID != 0)
+		// glDeleteBuffers(1, &m_ID);
 }
 
 VertexBuffer::VertexBuffer(const std::vector<float>& data, unsigned int stride) : m_DataStride(stride) {
-	glGenBuffers(1, &m_ID);
+	// glGenBuffers(1, &m_ID);
 	Bind();
-	glBufferData(GL_ARRAY_BUFFER, static_cast<GLsizeiptr>(data.size() * sizeof(float)), nullptr, GL_STATIC_DRAW);
-	glBufferSubData(GL_ARRAY_BUFFER, 0, static_cast<GLsizeiptr>(data.size() * sizeof(float)), data.data());
+	// glBufferData(GL_ARRAY_BUFFER, static_cast<GLsizeiptr>(data.size() * sizeof(float)), nullptr, GL_STATIC_DRAW);
+	// glBufferSubData(GL_ARRAY_BUFFER, 0, static_cast<GLsizeiptr>(data.size() * sizeof(float)), data.data());
 	Unbind();
 }
 
 void VertexBuffer::Bind() const {
-	glBindBuffer(GL_ARRAY_BUFFER, m_ID);
+	// glBindBuffer(GL_ARRAY_BUFFER, m_ID);
 }
 
 void VertexBuffer::Unbind() const {
-	glBindBuffer(GL_ARRAY_BUFFER, 0);
+	// glBindBuffer(GL_ARRAY_BUFFER, 0);
 }
 
 void VertexBuffer::AddVertexAttribPointer(unsigned int index, unsigned int coordinateSize, unsigned int offset) {
@@ -67,32 +65,32 @@ void VertexBuffer::AddVertexAttribPointer(unsigned int index, unsigned int coord
 
 void VertexBuffer::BindVertexAttribs() const {
 	for (const VertexAttribPointer& pointer : m_VertexAttribs) {
-		glVertexAttribPointer(pointer.m_Index, static_cast<GLint>(pointer.m_Size), GL_FLOAT, false, m_DataStride * sizeof(float),
-		reinterpret_cast<GLvoid*>(static_cast<std::size_t>(pointer.m_Offset)));
-		glEnableVertexAttribArray(pointer.m_Index);
+		// glVertexAttribPointer(pointer.m_Index, static_cast<GLint>(pointer.m_Size), GL_FLOAT, false, m_DataStride * sizeof(float),
+		// reinterpret_cast<GLvoid*>(static_cast<std::size_t>(pointer.m_Offset)));
+		// glEnableVertexAttribArray(pointer.m_Index);
 	}
 }
 
 ElementBuffer::ElementBuffer(const std::vector<unsigned int>& indicies) {
 	m_TriangleCount = indicies.size();
-	glGenBuffers(1, &m_ID);
+	// glGenBuffers(1, &m_ID);
 	Bind();
-	glBufferData(GL_ELEMENT_ARRAY_BUFFER, static_cast<GLsizeiptr>(indicies.size() * sizeof(unsigned int)), nullptr, GL_STATIC_DRAW);
-	glBufferSubData(GL_ELEMENT_ARRAY_BUFFER, 0, static_cast<GLsizeiptr>(indicies.size() * sizeof(unsigned int)), indicies.data());
+	// glBufferData(GL_ELEMENT_ARRAY_BUFFER, static_cast<GLsizeiptr>(indicies.size() * sizeof(unsigned int)), nullptr, GL_STATIC_DRAW);
+	// glBufferSubData(GL_ELEMENT_ARRAY_BUFFER, 0, static_cast<GLsizeiptr>(indicies.size() * sizeof(unsigned int)), indicies.data());
 	Unbind();
 }
 
 ElementBuffer::~ElementBuffer() {
-	if (m_ID != 0)
-		glDeleteBuffers(1, &m_ID);
+	// if (m_ID != 0)
+		// glDeleteBuffers(1, &m_ID);
 }
 
 void ElementBuffer::Bind() const {
-	glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_ID);
+	// glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_ID);
 }
 
 void ElementBuffer::Unbind() const {
-	glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
+	// glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
 }
 
 }  // namespace GL

src/td/render/loader/WorldLoader.cpp

@@ -1,8 +1,6 @@
 #include <td/render/loader/WorldLoader.h>
 
-#include <iostream>
-#include <string.h>
-
+#include <cstring>
 #include <td/game/World.h>
 
 namespace td {
@@ -11,11 +9,12 @@ namespace render {
 namespace WorldLoader {
 
 const static int POSITION_VERTEX_SIZE = 3;
-// const static int TEXTURE_VERTEX_SIZE = 2;
+const static int COLOR_VERTEX_SIZE = 4;
 
-GL::VertexArray LoadWorldModel(const td::game::World* world) {
+Mesh LoadWorldModel(const td::game::World* world) {
+	Mesh mesh = {0};
 	std::vector<float> positions;
-	std::vector<float> colors;
+	std::vector<unsigned char> colors;
 
 	for (const auto& [coords, chunk] : world->GetChunks()) {
 		std::int32_t chunkX = coords.x * td::game::Chunk::ChunkWidth;
@@ -42,15 +41,10 @@ GL::VertexArray LoadWorldModel(const td::game::World* world) {
 				const td::Color* tileColor = world->GetTileColor(tile);
 
 				for (int i = 0; i < 6; i++) {
-					int color = 255;
-					color |= tileColor->r << 24;
-					color |= tileColor->g << 16;
-					color |= tileColor->b << 8;
-
-					int newColorIndex = colors.size();
-					colors.push_back(0);
-
-					memcpy(colors.data() + newColorIndex, &color, 1 * sizeof(int));
+					colors.push_back(tileColor->r);
+					colors.push_back(tileColor->g);
+					colors.push_back(tileColor->b);
+					colors.push_back(255);
 				}
 			}
 		}
@@ -64,15 +58,10 @@ GL::VertexArray LoadWorldModel(const td::game::World* world) {
 		positions.insert(positions.end(), {fromX, 0, fromY, fromX, 0, toY, toX, 0, fromY, fromX, 0, toY, toX, 0, toY, toX, 0, fromY});
 
 		for (int i = 0; i < 6; i++) {
-			int color = 255;
-			color |= world->GetSpawnColor(TeamColor(spawnColor)).r << 24;
-			color |= world->GetSpawnColor(TeamColor(spawnColor)).g << 16;
-			color |= world->GetSpawnColor(TeamColor(spawnColor)).b << 8;
-
-			int newColorIndex = colors.size();
-			colors.push_back(0);
-
-			memcpy(colors.data() + newColorIndex, &color, 1 * sizeof(int));
+			colors.push_back(world->GetSpawnColor(TeamColor(spawnColor)).r);
+			colors.push_back(world->GetSpawnColor(TeamColor(spawnColor)).g);
+			colors.push_back(world->GetSpawnColor(TeamColor(spawnColor)).b);
+			colors.push_back(255);
 		}
 	}
 
@@ -84,162 +73,31 @@ GL::VertexArray LoadWorldModel(const td::game::World* world) {
 		positions.insert(positions.end(), {fromX, 0, fromY, fromX, 0, toY, toX, 0, fromY, fromX, 0, toY, toX, 0, toY, toX, 0, fromY});
 
 		for (int i = 0; i < 6; i++) {
-			int color = 255;
-			color |= world->GetSpawnColor(TeamColor(castleColor)).r << 24;
-			color |= world->GetSpawnColor(TeamColor(castleColor)).g << 16;
-			color |= world->GetSpawnColor(TeamColor(castleColor)).b << 8;
-
-			int newColorIndex = colors.size();
-			colors.push_back(0);
-
-			memcpy(colors.data() + newColorIndex, &color, 1 * sizeof(int));
+			colors.push_back(world->GetSpawnColor(TeamColor(castleColor)).r);
+			colors.push_back(world->GetSpawnColor(TeamColor(castleColor)).g);
+			colors.push_back(world->GetSpawnColor(TeamColor(castleColor)).b);
+			colors.push_back(255);
 		}
 	}
 
-	GL::VertexBuffer positionVBO(positions, POSITION_VERTEX_SIZE);
-	positionVBO.AddVertexAttribPointer(0, POSITION_VERTEX_SIZE, 0);
-	GL::VertexBuffer colorVBO(colors, 1);
-	colorVBO.AddVertexAttribPointer(1, 1, 0);
+	mesh.vertexCount = positions.size() / 3;
+	mesh.triangleCount = mesh.vertexCount / 3;
 
-	std::vector<unsigned int> indexes(positions.size() / 3, 0);
-	for (size_t i = 0; i < indexes.size(); i++) {
-		indexes[i] = i + 1;
-	}
+	const std::size_t verteciesSize = mesh.vertexCount * POSITION_VERTEX_SIZE * sizeof(float);
+	const std::size_t colorsSize = mesh.vertexCount * COLOR_VERTEX_SIZE * sizeof(unsigned char);
 
-	GL::ElementBuffer indexVBO(indexes);
+	mesh.vertices = (float*)MemAlloc(verteciesSize);
+	mesh.colors = (unsigned char*)MemAlloc(colorsSize);
 
-	GL::VertexArray worldVao(std::move(indexVBO));	// each pos = 3 vertecies
-	worldVao.Bind();
-	worldVao.BindVertexBuffer(std::move(positionVBO));
-	worldVao.BindVertexBuffer(std::move(colorVBO));
-	worldVao.Unbind();
-	return worldVao;
+	std::memcpy(reinterpret_cast<char*>(mesh.vertices), reinterpret_cast<const char*>(positions.data()), verteciesSize);
+	std::memcpy(reinterpret_cast<char*>(mesh.colors), reinterpret_cast<const char*>(colors.data()), colorsSize);
+
+	UploadMesh(&mesh, false);
+
+	return mesh;
 }
 
-GL::VertexArray LoadTileSelectModel() {
-	std::vector<float> positions = {
-		-0.5f,
-		-0.5f,
-		-1.0f,
-
-		0.5f,
-		-0.5f,
-		-1.0f,
-
-		0.0f,
-		0.5f,
-		-1.0f,
-
-		1,
-		.01,
-		1,
-
-		0,
-		.01,
-		1,
-		
-		0,
-		1,
-		1,
-	};
-
-	int color = 255 << 24 | 255 << 16 | 255 << 8 | 150;
-	float colorFloat;
-
-	memcpy(reinterpret_cast<std::uint8_t*>(&colorFloat), &color, sizeof(float));
-
-	std::vector<float> colors(6, colorFloat);
-
-	GL::VertexBuffer positionVBO(positions, POSITION_VERTEX_SIZE);
-	positionVBO.AddVertexAttribPointer(0, POSITION_VERTEX_SIZE, 0);
-	GL::VertexBuffer colorVBO(colors, 1);
-	colorVBO.AddVertexAttribPointer(1, 1, 0);
-
-	std::vector<unsigned int> indexes(positions.size() / 3, 0);
-	// for (size_t i = 0; i < indexes.size(); i++) {
-	// 	indexes[i] = i + 1;
-	// }
-	GL::ElementBuffer indexVBO(indexes);
-
-	GL::VertexArray tileSelectVao(std::move(indexVBO));
-	tileSelectVao.Bind();
-	tileSelectVao.BindVertexBuffer(std::move(positionVBO));
-	tileSelectVao.BindVertexBuffer(std::move(colorVBO));
-	tileSelectVao.Unbind();
-
-	return tileSelectVao;
-}
-
-RenderData LoadTowerModel(const game::TowerPtr& tower) {
-	RenderData renderData;
-
-	float towerX, towerDX;
-	float towerY, towerDY;
-
-	if (tower->GetSize() == game::TowerSize::Little) {
-		towerX = tower->GetCenterX() - 1.5f;
-		towerDX = tower->GetCenterX() + 1.5f;
-
-		towerY = tower->GetCenterY() - 1.5f;
-		towerDY = tower->GetCenterY() + 1.5f;
-	} else {
-		towerX = tower->GetCenterX() - 2.5f;
-		towerDX = tower->GetCenterX() + 2.5f;
-
-		towerY = tower->GetCenterY() - 2.5f;
-		towerDY = tower->GetCenterY() + 2.5f;
-	}
-	std::vector<float> positions = {towerDX, 0.001, towerY, towerX, 0.001, towerY, towerX, 0.001, towerDY, towerDX, 0.001, towerY,
-		towerX, 0.001, towerDY, towerDX, 0.001, towerDY};
-
-	renderData.positions = positions;
-
-	std::uint8_t towerType = static_cast<std::uint8_t>(tower->GetType());
-	std::uint8_t r = 10 * towerType + 40, g = 5 * towerType + 30, b = 10 * towerType + 20;
-
-	float colorFloat;
-	int color = r << 24 | g << 16 | b << 8 | 255;
-	memcpy(&colorFloat, &color, sizeof(int));
-
-	std::vector<float> colors(6, colorFloat);
-	renderData.colors = colors;
-
-	return renderData;
-}
-
-
-
-GL::VertexArray LoadMobModel() {
-	std::vector<float> positions = {
-		-0.5, 0, -0.5,
-		-0.5, 0, 0.5,
-		0.5, 0, -0.5,
-
-		0.5, 0, -0.5,
-		-0.5, 0, 0.5,
-		0.5, 0, 0.5
-	};
-
-	std::vector<unsigned int> indexes(positions.size() / 3, 0);
-	// for (size_t i = 0; i < indexes.size(); i++) {
-	// 	indexes[i] = i + 1;
-	// }
-	GL::ElementBuffer indexVBO(indexes);
-
-	GL::VertexBuffer positionVBO(positions, POSITION_VERTEX_SIZE);
-	positionVBO.AddVertexAttribPointer(0, POSITION_VERTEX_SIZE, 0);
-	
-	GL::VertexArray mobVao(std::move(indexVBO)); // each pos = 1 color
-	mobVao.Bind();
-	mobVao.BindVertexBuffer(std::move(positionVBO));
-	mobVao.Unbind();
-	return mobVao;
-}
-
-
-
 }  // namespace WorldLoader
 
-
 }  // namespace render
 }  // namespace td

src/td/render/renderer/EntityRenderer.cpp

@@ -1,3 +1,4 @@
+#include <cassert>
 #include <td/render/renderer/EntityRenderer.h>
 
 #include <td/render/loader/WorldLoader.h>
@@ -5,25 +6,21 @@
 namespace td {
 namespace render {
 
-EntityRenderer::EntityRenderer(Camera& a_Camera, const game::World& a_World) : Renderer(a_Camera), m_World(a_World) {
-	m_EntityVao = std::make_unique<GL::VertexArray>(WorldLoader::LoadMobModel());
-	m_Shader->Start();
-	m_Shader->SetColorEffect({1, 0, 1});
+EntityRenderer::EntityRenderer(raylib::Camera& a_Camera, const game::WorldPtr& a_World) : Renderer(a_Camera), m_World(a_World), m_ZombieModel("assets/zombie.glb") {
 }
 
-EntityRenderer::~EntityRenderer() {}
+EntityRenderer::~EntityRenderer() {
+}
 
 
 
 void EntityRenderer::Render(float a_Lerp) {
-	m_Shader->Start();
-	for (const auto& mob : m_World.GetMobList()) {
+	for (const auto& mob : m_World->GetMobList()) {
 
 		float x = Lerp<game::Mob>(*mob, a_Lerp, [](const game::Mob& a_Mob) { return static_cast<float>(a_Mob.m_Position.x); });
 		float z = Lerp<game::Mob>(*mob, a_Lerp, [](const game::Mob& a_Mob) { return static_cast<float>(a_Mob.m_Position.y); });
 
-		m_Shader->SetModelPos({x, 1, z});
-		Renderer::Render(*m_EntityVao);
+		m_ZombieModel.Draw({x, .001, z}, 1.0f, {255, 255, 255, 255});
 	}
 }