Added camera to PickingPass and fixed memory leak
This commit is contained in:
@@ -59,6 +59,8 @@ void PickingPass::Draw(RenderFrame& rf)
|
||||
|
||||
for(auto scene : rf.RenderScenes)
|
||||
{
|
||||
m_Camera = scene->Camera;
|
||||
|
||||
for (auto &job : scene->Forward) {
|
||||
auto modelJob = std::dynamic_pointer_cast<ModelJob>(job);
|
||||
|
||||
@@ -99,8 +101,8 @@ void PickingPass::Draw(RenderFrame& rf)
|
||||
Events::Picking pickEvent = Events::Picking(
|
||||
&m_PickingBuffer,
|
||||
&m_DepthBuffer,
|
||||
m_Renderer->Camera()->ProjectionMatrix(),
|
||||
m_Renderer->Camera()->ViewMatrix(),
|
||||
m_Camera->ProjectionMatrix(),
|
||||
m_Camera->ViewMatrix(),
|
||||
Rectangle(fbWidth, fbHeight),
|
||||
&m_PickingColorsToEntity);
|
||||
|
||||
@@ -109,6 +111,8 @@ void PickingPass::Draw(RenderFrame& rf)
|
||||
delete state;
|
||||
}
|
||||
|
||||
|
||||
|
||||
void PickingPass::GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type) const
|
||||
{
|
||||
//TODO: Renderer: Make this in a sparate class
|
||||
|
||||
@@ -263,4 +263,5 @@ void RenderSystem::Update(World* world, double dt)
|
||||
rs->Camera = m_Camera;
|
||||
FillModels(&rs->Forward);
|
||||
m_RenderFrame->Add(*rs);
|
||||
delete rs;
|
||||
}
|
||||
|
||||
@@ -92,7 +92,7 @@ void Renderer::Update(double dt)
|
||||
|
||||
void Renderer::Draw(RenderFrame& rf)
|
||||
{
|
||||
m_Camera = (*rf.begin())->Camera;
|
||||
m_Camera = (*rf.begin())->Camera; // Fix this with some better solution
|
||||
m_PickingPass->Draw(rf);
|
||||
|
||||
glClearColor(255.f / 255, 163.f / 255, 176.f / 255, 1.f);
|
||||
|
||||
Reference in New Issue
Block a user