diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp b/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp index 0e44ac8e..d05ece2e 100644 --- a/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp +++ b/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp @@ -109,13 +109,13 @@ namespace SHADE defaultViewport = AddViewport(vk::Viewport(0.0f, 0.0f, window->GetWindowSize().first, window->GetWindowSize().second, 0.0f, 1.0f)); // Create Debug Renderers - debugScreenRenderer = defaultViewport->AddRenderer(resourceManager); + debugScreenRenderer = defaultViewport->AddRenderer(resourceManager,); debugScreenRenderer->SetCamera(screenCamera); - debugWorldRenderer = defaultViewport->AddRenderer(resourceManager); + debugWorldRenderer = defaultViewport->AddRenderer(resourceManager, ); debugWorldRenderer->SetCamera(worldCamera); // Add world renderer to default viewport - worldRenderer = defaultViewport->AddRenderer(resourceManager); + worldRenderer = defaultViewport->AddRenderer(resourceManager, ); worldRenderer->SetCamera(worldCamera); // Get render graph from default viewport world renderer diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHRenderer.cpp b/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHRenderer.cpp index ab6a97d2..d2c447d1 100644 --- a/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHRenderer.cpp +++ b/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHRenderer.cpp @@ -21,35 +21,33 @@ of DigiPen Institute of Technology is prohibited. namespace SHADE { - /*---------------------------------------------------------------------------------*/ - /* Constructor/Destructors */ - /*---------------------------------------------------------------------------------*/ - SHRenderer::SHRenderer(Handle viewport, ResourceManager& resourceManager) - : viewport { viewport } - , renderGraph { resourceManager.Create ()} - { - - } + /*-----------------------------------------------------------------------------------*/ + /* Constructor/Destructors */ + /*-----------------------------------------------------------------------------------*/ + SHRenderer::SHRenderer(Handle viewport, Handle renderGraph) + : viewport { viewport } + , renderGraph { renderGraph } + {} - /*-----------------------------------------------------------------------------*/ - /* Camera Registration */ - /*-----------------------------------------------------------------------------*/ - void SHRenderer::SetCamera(Handle _camera) - { - camera = _camera; - } + /*-----------------------------------------------------------------------------------*/ + /* Camera Registration */ + /*-----------------------------------------------------------------------------------*/ + void SHRenderer::SetCamera(Handle _camera) + { + camera = _camera; + } - /*---------------------------------------------------------------------------------*/ - /* Drawing Functions */ - /*---------------------------------------------------------------------------------*/ - void SHRenderer::Draw(uint32_t frameIndex) noexcept - { - renderGraph->Execute(frameIndex); - } + /*-----------------------------------------------------------------------------------*/ + /* Drawing Functions */ + /*-----------------------------------------------------------------------------------*/ + void SHRenderer::Draw(uint32_t frameIndex) noexcept + { + renderGraph->Execute(frameIndex); + } - Handle SHRenderer::GetRenderGraph(void) const noexcept - { - return renderGraph; - } + Handle SHRenderer::GetRenderGraph(void) const noexcept + { + return renderGraph; + } } diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHRenderer.h b/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHRenderer.h index ed0c6ec3..4b7e354f 100644 --- a/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHRenderer.h +++ b/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHRenderer.h @@ -52,7 +52,7 @@ namespace SHADE /*-----------------------------------------------------------------------------*/ /* Constructor/Destructors */ /*-----------------------------------------------------------------------------*/ - SHRenderer(Handle viewport, ResourceManager& resourceManager); + SHRenderer(Handle viewport, Handle renderGraph); /*-----------------------------------------------------------------------------*/ /* Camera Registration */ diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHViewport.cpp b/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHViewport.cpp index 565ee04f..56265a3f 100644 --- a/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHViewport.cpp +++ b/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHViewport.cpp @@ -48,10 +48,10 @@ namespace SHADE /*---------------------------------------------------------------------------------*/ /* Renderer Registration Functions */ /*---------------------------------------------------------------------------------*/ - Handle SHViewport::AddRenderer(ResourceManager& resourceManager) + Handle SHViewport::AddRenderer(ResourceManager& resourceManager, Handle renderGraph) { // Create the renderer - auto renderer = SHVkInstance::GetResourceManager().Create(GetHandle(), resourceManager); + auto renderer = SHVkInstance::GetResourceManager().Create(GetHandle(), renderGraph); // Store renderers.emplace_back(renderer); diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHViewport.h b/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHViewport.h index 33179477..0e378c54 100644 --- a/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHViewport.h +++ b/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHViewport.h @@ -55,7 +55,7 @@ namespace SHADE /*-----------------------------------------------------------------------------*/ /* Renderers Registration Functions */ /*-----------------------------------------------------------------------------*/ - Handle AddRenderer(ResourceManager& resourceManager); + Handle AddRenderer(ResourceManager& resourceManager, Handle renderGraph); void RemoveRenderer(Handle renderer); /*-----------------------------------------------------------------------------*/