Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion Syndra/src/Engine/Renderer/Buffer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#include "Engine/Renderer/Buffer.h"
#include "Engine/Renderer/Renderer.h"
#include "Platform/OpenGL/OpenGLBuffer.h"
#include "Platform/Vulkan/VulkanBuffer.h"


namespace Syndra {
Expand All @@ -15,6 +16,8 @@ namespace Syndra {
return nullptr;
case RendererAPI::API::OpenGL:
return CreateRef<OpenGLVertexBuffer>(vertices, size);
case RendererAPI::API::Vulkan:
return CreateRef<VulkanVertexBuffer>(vertices, size);
}

SN_CORE_ASSERT(false, "Unknown API!");
Expand All @@ -30,10 +33,12 @@ namespace Syndra {
return nullptr;
case RendererAPI::API::OpenGL:
return CreateRef<OpenGLIndexBuffer>(vertices, count);
case RendererAPI::API::Vulkan:
return CreateRef<VulkanIndexBuffer>(vertices, count);
}

SN_CORE_ASSERT(false, "Unknown API!");
return nullptr;
}

}
}
69 changes: 47 additions & 22 deletions Syndra/src/Engine/Renderer/DeferredRenderer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,24 @@
#include "imgui_internal.h"
#include "Engine/Utils/PlatformUtils.h"
#include "Engine/Core/Application.h"
#include "Engine/Renderer/Renderer.h"

#include "Engine/Scene/Entity.h"
#include "Engine/Scene/Scene.h"
#include <glad/glad.h>

namespace Syndra {

static bool IsVulkan()
{
return Renderer::GetAPI() == RendererAPI::API::Vulkan;
}

static DeferredRenderer::RenderData r_Data;

void DeferredRenderer::Init(const Ref<Scene>& scene, const ShaderLibrary& shaders, const Ref<Environment>& env)
{
if (IsVulkan())
return;
r_Data.scene = scene;
r_Data.shaders = shaders;
r_Data.environment = env;
Expand Down Expand Up @@ -132,6 +139,8 @@ namespace Syndra {

void DeferredRenderer::Render()
{
if (IsVulkan())
return;
auto view = r_Data.scene->m_Registry.view<TransformComponent, MeshComponent>();
//---------------------------------------------------------SHADOW PASS------------------------------------------//
r_Data.shadowPass->BindTargetFrameBuffer();
Expand Down Expand Up @@ -193,6 +202,8 @@ namespace Syndra {

void DeferredRenderer::End()
{
if (IsVulkan())
return;
//-------------------------------------------------Lighting and post-processing pass---------------------------------------------------//

r_Data.lightingPass->BindTargetFrameBuffer();
Expand Down Expand Up @@ -260,12 +271,16 @@ namespace Syndra {
Renderer::EndScene();
}

void DeferredRenderer::ShutDown()
{
}
void DeferredRenderer::ShutDown()
{
if (IsVulkan())
return;
}

void DeferredRenderer::OnImGuiRender(bool* rendererOpen, bool* environmentOpen)
{
if (IsVulkan())
return;
//Renderer settings
if (*rendererOpen) {
ImGui::Begin(ICON_FA_COGS" Renderer Settings", rendererOpen);
Expand Down Expand Up @@ -397,16 +412,20 @@ namespace Syndra {
}
}

void DeferredRenderer::OnResize(uint32_t width, uint32_t height)
{
r_Data.geoPass->GetSpecification().TargetFrameBuffer->Resize(width, height);
void DeferredRenderer::OnResize(uint32_t width, uint32_t height)
{
if (IsVulkan())
return;
r_Data.geoPass->GetSpecification().TargetFrameBuffer->Resize(width, height);
r_Data.lightingPass->GetSpecification().TargetFrameBuffer->Resize(width, height);
r_Data.aaPass->GetSpecification().TargetFrameBuffer->Resize(width, height);
}

void DeferredRenderer::UpdateLights()
{
r_Data.lightManager->IntitializeLights();
void DeferredRenderer::UpdateLights()
{
if (IsVulkan())
return;
r_Data.lightManager->IntitializeLights();
auto viewLights = r_Data.scene->m_Registry.view<TransformComponent, LightComponent>();
//point light index
int pIndex = 0;
Expand Down Expand Up @@ -448,25 +467,31 @@ namespace Syndra {
r_Data.lightManager->UpdateBuffer();
}

uint32_t DeferredRenderer::GetFinalTextureID(int index)
{
if (r_Data.useFxaa) {
return r_Data.aaPass->GetSpecification().TargetFrameBuffer->GetColorAttachmentRendererID(index);
uint32_t DeferredRenderer::GetFinalTextureID(int index)
{
if (IsVulkan())
return 0;
if (r_Data.useFxaa) {
return r_Data.aaPass->GetSpecification().TargetFrameBuffer->GetColorAttachmentRendererID(index);
}
else
{
return r_Data.lightingPass->GetSpecification().TargetFrameBuffer->GetColorAttachmentRendererID(index);
}
}

uint32_t DeferredRenderer::GetMouseTextureID()
{
return 4;
}
uint32_t DeferredRenderer::GetMouseTextureID()
{
if (IsVulkan())
return 0;
return 4;
}

Ref<FrameBuffer> DeferredRenderer::GetMainFrameBuffer()
{
return r_Data.geoPass->GetSpecification().TargetFrameBuffer;
}
Ref<FrameBuffer> DeferredRenderer::GetMainFrameBuffer()
{
if (IsVulkan())
return nullptr;
return r_Data.geoPass->GetSpecification().TargetFrameBuffer;
}

}
49 changes: 30 additions & 19 deletions Syndra/src/Engine/Renderer/Environment.cpp
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
#include "lpch.h"
#include "Engine/Renderer/Environment.h"
#include "Engine/Renderer/Renderer.h"
#include "glad/glad.h"

namespace Syndra {

Environment::Environment(const Ref<Texture2D>& hdri)
:m_HDRSkyMap(hdri)
{
if (Renderer::GetAPI() == RendererAPI::API::Vulkan)
return;
m_EquirectangularToCube = Shader::Create("assets/shaders/EquirectangularToCube.glsl");
m_BackgroundShader = Shader::Create("assets/shaders/BackgroundSky.glsl");
m_PrefilterShader = Shader::Create("assets/shaders/Prefilter.glsl");
Expand Down Expand Up @@ -199,21 +202,27 @@ namespace Syndra {

}

void Environment::RenderCube()
{
m_CubeVAO->Bind();
glDrawArrays(GL_TRIANGLES, 0, 36);
}

void Environment::RenderQuad()
{
m_QuadVAO->Bind();
glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_INT, 0);
}

void Environment::RenderBackground()
{
m_BackgroundShader->Bind();
void Environment::RenderCube()
{
if (Renderer::GetAPI() == RendererAPI::API::Vulkan)
return;
m_CubeVAO->Bind();
glDrawArrays(GL_TRIANGLES, 0, 36);
}

void Environment::RenderQuad()
{
if (Renderer::GetAPI() == RendererAPI::API::Vulkan)
return;
m_QuadVAO->Bind();
glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_INT, 0);
}

void Environment::RenderBackground()
{
if (Renderer::GetAPI() == RendererAPI::API::Vulkan)
return;
m_BackgroundShader->Bind();
Texture2D::BindTexture(envCubemap, 0);
//Texture2D::BindTexture(m_IrradianceFBO->GetColorAttachmentRendererID(), 1);
m_BackgroundShader->SetMat4("cam.view", m_View);
Expand All @@ -222,9 +231,11 @@ namespace Syndra {
m_BackgroundShader->Unbind();
}

void Environment::SetIntensity(float intensity)
{
m_BackgroundShader->Bind();
void Environment::SetIntensity(float intensity)
{
if (Renderer::GetAPI() == RendererAPI::API::Vulkan)
return;
m_BackgroundShader->Bind();
m_BackgroundShader->SetFloat("push.intensity", intensity);
m_BackgroundShader->Unbind();
}
Expand Down Expand Up @@ -323,4 +334,4 @@ namespace Syndra {
//m_IrradianceFBO = FrameBuffer::Create(spec);
}

}
}
Loading