renderer: use shared_ptr
This commit is contained in:
@@ -5,7 +5,7 @@
|
||||
namespace td {
|
||||
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_Shader->Start();
|
||||
m_Shader->SetColorEffect({1, 0, 1});
|
||||
@@ -17,7 +17,7 @@ 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); });
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
namespace td {
|
||||
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_Shader->Start();
|
||||
m_Shader->SetColorEffect({0, 0, 1});
|
||||
@@ -17,7 +17,7 @@ TowerRenderer::~TowerRenderer() {}
|
||||
|
||||
void TowerRenderer::Render(float a_Lerp) {
|
||||
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()});
|
||||
Renderer::Render(*m_EntityVao);
|
||||
}
|
||||
|
||||
@@ -7,8 +7,8 @@
|
||||
namespace td {
|
||||
namespace render {
|
||||
|
||||
WorldRenderer::WorldRenderer(Camera& a_Camera, const game::World& a_World) : Renderer(a_Camera) {
|
||||
m_WorldVao = std::make_unique<GL::VertexArray>(WorldLoader::LoadWorldModel(&a_World));
|
||||
WorldRenderer::WorldRenderer(Camera& a_Camera, const game::WorldPtr& a_World) : Renderer(a_Camera) {
|
||||
m_WorldVao = std::make_unique<GL::VertexArray>(WorldLoader::LoadWorldModel(a_World.get()));
|
||||
}
|
||||
|
||||
WorldRenderer::~WorldRenderer() {}
|
||||
|
||||
Reference in New Issue
Block a user