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

renderer: use shared_ptr

Browse Source
This commit is contained in:
Simon Pribylski
2025-08-19 17:19:57 +02:00
parent a50898a88b
commit cd33ea28dc
7 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/td/render/renderer/EntityRenderer.h
View File

@@ -9,11 +9,11 @@ namespace render {
class EntityRenderer : public Renderer<shader::EntityShader> { class EntityRenderer : public Renderer<shader::EntityShader> {
private: private:
const game::World& m_World; game::WorldPtr m_World;
std::unique_ptr<GL::VertexArray> m_EntityVao; std::unique_ptr<GL::VertexArray> m_EntityVao;
public: public:
EntityRenderer(Camera& a_Camera, const game::World& a_World); EntityRenderer(Camera& a_Camera, const game::WorldPtr& a_World);
virtual ~EntityRenderer(); virtual ~EntityRenderer();
virtual void Render(float a_Lerp) override; virtual void Render(float a_Lerp) override;

4
include/td/render/renderer/TowerRenderer.h
View File

@@ -9,11 +9,11 @@ namespace render {
class TowerRenderer : public Renderer<shader::EntityShader> { class TowerRenderer : public Renderer<shader::EntityShader> {
private: private:
const game::World& m_World; game::WorldPtr m_World;
std::unique_ptr<GL::VertexArray> m_EntityVao; std::unique_ptr<GL::VertexArray> m_EntityVao;
public: public:
TowerRenderer(Camera& a_Camera, const game::World& a_World); TowerRenderer(Camera& a_Camera, const game::WorldPtr& a_World);
virtual ~TowerRenderer(); virtual ~TowerRenderer();
virtual void Render(float a_Lerp) override; virtual void Render(float a_Lerp) override;

2
include/td/render/renderer/WorldRenderer.h
View File

@@ -13,7 +13,7 @@ class WorldRenderer : public Renderer<shader::WorldShader> {
std::unique_ptr<GL::VertexArray> m_WorldVao; std::unique_ptr<GL::VertexArray> m_WorldVao;
public: public:
WorldRenderer(Camera& a_Camera, const game::World& a_World); WorldRenderer(Camera& a_Camera, const game::WorldPtr& a_World);
virtual ~WorldRenderer(); virtual ~WorldRenderer();
virtual void Render(float a_Lerp) override; virtual void Render(float a_Lerp) override;

6
src/td/display/state/DebugWorldState.cpp
View File

@@ -74,9 +74,9 @@ DebugWorldState::DebugWorldState(Display& a_Display) : DisplayState(a_Display) {
m_Client = std::make_unique<client::Client>(clientFakeSocket, "Player0"); m_Client = std::make_unique<client::Client>(clientFakeSocket, "Player0");
// render // render
m_Renderer.AddRenderer<render::WorldRenderer>(m_Camera, *clientWorld); m_Renderer.AddRenderer<render::WorldRenderer>(m_Camera, clientWorld);
m_Renderer.AddRenderer<render::EntityRenderer>(m_Camera, *clientWorld); m_Renderer.AddRenderer<render::EntityRenderer>(m_Camera, clientWorld);
m_Renderer.AddRenderer<render::TowerRenderer>(m_Camera, *clientWorld); m_Renderer.AddRenderer<render::TowerRenderer>(m_Camera, clientWorld);
// camera // camera
m_Camera.SetCamPos({77, 7, 13}); m_Camera.SetCamPos({77, 7, 13});

4
src/td/render/renderer/EntityRenderer.cpp
View File

@@ -5,7 +5,7 @@
namespace td { namespace td {
namespace render { namespace render {
EntityRenderer::EntityRenderer(Camera& a_Camera, const game::World& a_World) : Renderer(a_Camera), m_World(a_World) { EntityRenderer::EntityRenderer(Camera& a_Camera, const game::WorldPtr& a_World) : Renderer(a_Camera), m_World(a_World) {
m_EntityVao = std::make_unique<GL::VertexArray>(WorldLoader::LoadMobModel()); m_EntityVao = std::make_unique<GL::VertexArray>(WorldLoader::LoadMobModel());
m_Shader->Start(); m_Shader->Start();
m_Shader->SetColorEffect({1, 0, 1}); m_Shader->SetColorEffect({1, 0, 1});
@@ -17,7 +17,7 @@ EntityRenderer::~EntityRenderer() {}
void EntityRenderer::Render(float a_Lerp) { void EntityRenderer::Render(float a_Lerp) {
m_Shader->Start(); 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 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); }); float z = Lerp<game::Mob>(*mob, a_Lerp, [](const game::Mob& a_Mob) { return static_cast<float>(a_Mob.m_Position.y); });

4
src/td/render/renderer/TowerRenderer.cpp
View File

@@ -5,7 +5,7 @@
namespace td { namespace td {
namespace render { namespace render {
TowerRenderer::TowerRenderer(Camera& a_Camera, const game::World& a_World) : Renderer(a_Camera), m_World(a_World) { TowerRenderer::TowerRenderer(Camera& a_Camera, const game::WorldPtr& a_World) : Renderer(a_Camera), m_World(a_World) {
m_EntityVao = std::make_unique<GL::VertexArray>(WorldLoader::LoadMobModel()); m_EntityVao = std::make_unique<GL::VertexArray>(WorldLoader::LoadMobModel());
m_Shader->Start(); m_Shader->Start();
m_Shader->SetColorEffect({0, 0, 1}); m_Shader->SetColorEffect({0, 0, 1});
@@ -17,7 +17,7 @@ TowerRenderer::~TowerRenderer() {}
void TowerRenderer::Render(float a_Lerp) { void TowerRenderer::Render(float a_Lerp) {
m_Shader->Start(); m_Shader->Start();
for (const auto& tower : m_World.GetTowers()) { for (const auto& tower : m_World->GetTowers()) {
m_Shader->SetModelPos({tower->GetCenterX(), 1, tower->GetCenterY()}); m_Shader->SetModelPos({tower->GetCenterX(), 1, tower->GetCenterY()});
Renderer::Render(*m_EntityVao); Renderer::Render(*m_EntityVao);
} }

4
src/td/render/renderer/WorldRenderer.cpp
View File

@@ -7,8 +7,8 @@
namespace td { namespace td {
namespace render { namespace render {
WorldRenderer::WorldRenderer(Camera& a_Camera, const game::World& a_World) : Renderer(a_Camera) { WorldRenderer::WorldRenderer(Camera& a_Camera, const game::WorldPtr& a_World) : Renderer(a_Camera) {
m_WorldVao = std::make_unique<GL::VertexArray>(WorldLoader::LoadWorldModel(&a_World)); m_WorldVao = std::make_unique<GL::VertexArray>(WorldLoader::LoadWorldModel(a_World.get()));
} }
WorldRenderer::~WorldRenderer() {} WorldRenderer::~WorldRenderer() {}