Persson-dev/Tower-Defense
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

fix: change renderer to class

Browse Source
This commit is contained in:
Simon Pribylski
2021-09-18 18:58:32 +02:00
parent 519c6e33e7
commit a8b6a646af
10 changed files with 150 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/game/client/Client.h
View File

@@ -6,16 +6,19 @@
#include "game/Team.h"
#include "game/Player.h"
#include "render/Renderer.h"
namespace td {
namespace client {
class Client{
private:
render::Renderer* m_Renderer;
ClientConnexion m_Connexion;
ClientGame m_Game{m_Connexion.GetDispatcher()};
ClientGame m_Game;
bool m_Connected;
public:
Client() : m_Connected(false){}
Client(render::Renderer* renderer) : m_Renderer(renderer), m_Game(m_Connexion.GetDispatcher(), m_Renderer), m_Connected(false){}
const ClientGame& getGame() const{ return m_Game; }
const ClientConnexion& getConnexion() const{ return m_Connexion; }

11
include/game/client/ClientGame.h
View File

@@ -1,9 +1,13 @@
#pragma once
#include "game/BaseGame.h"
#include "protocol/PacketHandler.h"
#include "WorldClient.h"
#include "render/WorldRenderer.h"
#include "render/Renderer.h"
namespace td {
namespace client {
@@ -13,10 +17,11 @@ private:
std::uint8_t m_ConnexionID;
std::uint32_t m_LobbyTime = 0;
game::Player* m_Player = nullptr;
client::WorldClient m_WorldClient{this};
render::WorldRenderer m_WorldRenderer{&m_WorldClient};
render::Renderer* m_Renderer;
client::WorldClient m_WorldClient;
render::WorldRenderer m_WorldRenderer;
public:
ClientGame(protocol::PacketDispatcher* dispatcher);
ClientGame(protocol::PacketDispatcher* dispatcher, render::Renderer* renderer);
virtual ~ClientGame();
virtual void tick(std::uint64_t delta);