-Dev: Advances on Procedural Sky

Author: AEspinosaDev

examples/sponza/application.cpp

@@ -19,9 +19,10 @@ void Application::init(Systems::RendererSettings settings) {
                                          std::placeholders::_4));
 
     Systems::DeferredRenderer* rndr = new Systems::DeferredRenderer(m_window, ShadowResolution::MEDIUM, settings);
-    m_renderer = rndr;
+    m_renderer                      = rndr;
 
     setup();
+    m_renderer->init();
     setup_gui();
 }
 
@@ -58,15 +59,14 @@ void Application::setup() {
     m_scene->set_ambient_intensity(0.1f);
     m_scene->use_IBL(false);
 
-    m_camera = m_scene->get_active_camera();
+    m_camera     = m_scene->get_active_camera();
     m_controller = new Tools::Controller(m_camera, m_window, ControllerMovementType::WASD);
 }
 
 void Application::setup_gui() {
     m_interface.overlay = new Tools::GUIOverlay(
         (float)m_window->get_extent().width, (float)m_window->get_extent().height, GuiColorProfileType::DARK);
 
-
     Tools::Panel* explorerPanel = new Tools::Panel("EXPLORER", 0, 0, 0.2f, 0.7f, PanelWidgetFlags::NoMove, false);
     m_interface.scene           = new Tools::ExplorerWidget(m_scene, m_renderer);
     explorerPanel->add_child(m_interface.scene);
@@ -87,7 +87,6 @@ void Application::setup_gui() {
 
     m_interface.overlay->add_panel(propertiesPanel);
     m_interface.properties = propertiesPanel;
-
 }
 
 void Application::update() {

include/engine/core/passes/sky_pass.h

@@ -0,0 +1,44 @@
+/*
+    This file is part of Vulkan-Engine, a simple to use Vulkan based 3D library
+
+    MIT License
+
+    Copyright (c) 2023 Antonio Espinosa Garcia
+
+*/
+#ifndef SKY_PASS_H
+#define SKY_PASS_H
+#include <engine/core/passes/pass.h>
+
+VULKAN_ENGINE_NAMESPACE_BEGIN
+
+namespace Core {
+/*
+Procedural Physically Based Sky generation pass.
+*/
+class SkyPass : public GraphicPass
+{
+  protected:
+    Mesh* m_vignette;
+    Graphics::DescriptorSet m_LUTdescriptor;
+
+  public:
+    SkyPass(Graphics::Device* ctx, Extent2D extent, Mesh* vignette)
+        : BasePass(ctx, extent, 2, 1, false, "SKY GENERATION")
+        , m_vignette(vignette) {
+    }
+
+    virtual void setup_attachments(std::vector<Graphics::AttachmentInfo>&    attachments,
+                                   std::vector<Graphics::SubPassDependency>& dependencies);
+
+    virtual void setup_uniforms(std::vector<Graphics::Frame>& frames);
+
+    virtual void setup_shader_passes();
+
+    virtual void render(Graphics::Frame& currentFrame, Scene* const scene, uint32_t presentImageIndex = 0);
+};
+
+} // namespace Core
+VULKAN_ENGINE_NAMESPACE_END
+
+#endif

include/engine/systems/renderers/deferred.h

@@ -12,6 +12,7 @@
 #include <engine/core/passes/tonemapping_pass.h>
 #include <engine/core/passes/variance_shadow_pass.h>
 #include <engine/core/passes/voxelization_pass.h>
+#include <engine/core/passes/sky_pass.h>
 
 VULKAN_ENGINE_NAMESPACE_BEGIN
 
@@ -22,30 +23,36 @@ Renders a given scene data to a given window using deferred rendering. Fully par
 */
 class DeferredRenderer : public BaseRenderer
 {
+  protected:
     enum RendererPasses
     {
-        ENVIROMENT_PASS     = 0,
-        SHADOW_PASS         = 1,
-        VOXELIZATION_PASS   = 2,
-        GEOMETRY_PASS       = 3,
-        PRECOMPOSITION_PASS = 4,
-        COMPOSITION_PASS    = 5,
-        BLOOM_PASS          = 6,
-        TONEMAPPIN_PASS     = 7,
-        FXAA_PASS           = 8,
+        SKY_PASS            = 0, 
+        ENVIROMENT_PASS     = 1,
+        SHADOW_PASS         = 2,
+        VOXELIZATION_PASS   = 3,
+        GEOMETRY_PASS       = 4,
+        PRECOMPOSITION_PASS = 5,
+        COMPOSITION_PASS    = 6,
+        BLOOM_PASS          = 7,
+        TONEMAPPIN_PASS     = 8,
+        FXAA_PASS           = 9,
     };
 
     // Graphic Settings
     ShadowResolution m_shadowQuality = ShadowResolution::MEDIUM;
-    Core::SSR        m_SSR           = {};
-    Core::VXGI       m_VXGI          = {};
-    Core::AO         m_AO            = {};
-    float            m_bloomStrength = 0.05f;
 
     // Query
     bool m_updateShadows = false;
     bool m_updateGI      = false;
 
+    virtual void on_before_render(Core::Scene* const scene);
+
+    virtual void on_after_render(RenderResult& renderResult, Core::Scene* const scene);
+
+    virtual void create_passes();
+
+    virtual void update_enviroment(Core::Skybox* const skybox);
+
   public:
     DeferredRenderer(Core::IWindow* window)
         : BaseRenderer(window) {
@@ -57,39 +64,43 @@ class DeferredRenderer : public BaseRenderer
         , m_shadowQuality(shadowQuality) {
     }
 
-    inline ShadowResolution get_shadow_quality() const {
+    inline ShadowResolution get_shadow_quality() {
         return m_shadowQuality;
     }
     inline void set_shadow_quality(ShadowResolution quality) {
         m_shadowQuality = quality;
         if (m_initialized)
             m_updateShadows = true;
     }
-    inline float get_bloom_strength() const {
-        return m_bloomStrength;
+    inline float get_bloom_strength() {
+        return get_pass<Core::BloomPass*>(BLOOM_PASS)->get_bloom_strength();
     }
     inline void set_bloom_strength(float st) {
-        m_bloomStrength = st;
+        get_pass<Core::BloomPass*>(BLOOM_PASS)->set_bloom_strength(st);
     }
     inline void set_SSR_settings(Core::SSR settings) {
-        m_SSR = settings;
+        get_pass<Core::CompositionPass*>(COMPOSITION_PASS)->set_SSR_settings(settings);
     };
-    inline Core::SSR get_SSR_settings() const {
-        return m_SSR;
+    inline Core::SSR get_SSR_settings() {
+        return get_pass<Core::CompositionPass*>(COMPOSITION_PASS)->get_SSR_settings();
     };
     inline void set_VXGI_settings(Core::VXGI settings) {
-        if (m_VXGI.resolution != settings.resolution)
+        if (get_pass<Core::CompositionPass*>(COMPOSITION_PASS)->get_VXGI_settings().resolution != settings.resolution)
             m_updateGI = true;
-        m_VXGI = settings;
+        get_pass<Core::CompositionPass*>(COMPOSITION_PASS)->set_VXGI_settings(settings);
+        m_passes[VOXELIZATION_PASS]->set_active(settings.enabled);
     };
-    inline Core::VXGI get_VXGI_settings() const {
-        return m_VXGI;
+    inline Core::VXGI get_VXGI_settings() {
+        return get_pass<Core::CompositionPass*>(COMPOSITION_PASS)->get_VXGI_settings();
     };
     inline void set_SSAO_settings(Core::AO settings) {
-        m_AO = settings;
+        get_pass<Core::PreCompositionPass*>(PRECOMPOSITION_PASS)->set_SSAO_settings(settings);
+        get_pass<Core::CompositionPass*>(COMPOSITION_PASS)->enable_AO(settings.enabled);
+        get_pass<Core::CompositionPass*>(COMPOSITION_PASS)->set_AO_type(static_cast<int>(settings.type));
+        m_passes[PRECOMPOSITION_PASS]->set_active(settings.enabled && settings.type != Core::AOType::VXAO);
     };
-    inline Core::AO get_SSAO_settings() const {
-        return m_AO;
+    inline Core::AO get_SSAO_settings() {
+        return get_pass<Core::PreCompositionPass*>(PRECOMPOSITION_PASS)->get_SSAO_settings();
     };
     inline void set_shading_output(Core::OutputBuffer output) {
         get_pass<Core::CompositionPass*>(COMPOSITION_PASS)->set_output_buffer(output);
@@ -110,15 +121,6 @@ class DeferredRenderer : public BaseRenderer
     inline void set_tonemapping_type(Core::TonemappingType type) {
         get_pass<Core::TonemappingPass*>(TONEMAPPIN_PASS)->set_tonemapping_type(type);
     }
-
-  protected:
-    virtual void on_before_render(Core::Scene* const scene);
-
-    virtual void on_after_render(RenderResult& renderResult, Core::Scene* const scene);
-
-    virtual void create_passes();
-
-    virtual void update_enviroment(Core::Skybox* const skybox);
 };
 } // namespace Systems
 VULKAN_ENGINE_NAMESPACE_END

include/engine/systems/renderers/renderer.h

@@ -69,13 +69,11 @@ class BaseRenderer
     BaseRenderer(Core::IWindow* window)
         : m_window(window)
         , m_device(nullptr) {
-        on_instance();
     }
     BaseRenderer(Core::IWindow* window, RendererSettings settings)
         : m_window(window)
         , m_settings(settings)
         , m_device(nullptr) {
-        on_instance();
     }
 
 #pragma region Getters & Setters
@@ -116,11 +114,6 @@ class BaseRenderer
     virtual inline void set_clearcolor(Vec4 c) {
         m_settings.clearColor = c;
     }
-    template <typename T> inline T get_pass(uint32_t id) {
-        T pass = id < m_passes.size() ? static_cast<T>(m_passes[id]) : nullptr;
-        ASSERT_PTR(pass);
-        return pass;
-    }
 
 #pragma endregion
 #pragma region Public Functions
@@ -150,11 +143,6 @@ class BaseRenderer
      */
     virtual void create_passes();
     /*
-    What to do when instancing the renderer
-    */
-    virtual void on_instance() {
-    }
-    /*
     What to do when initiating the renderer
     */
     virtual void on_init() {
@@ -194,6 +182,14 @@ class BaseRenderer
     */
     void init_gui();
 #pragma endregion
+#pragma region Utility
+
+    template <typename T> inline T get_pass(uint32_t id) {
+        T pass = id < m_passes.size() ? static_cast<T>(m_passes[id]) : nullptr;
+        ASSERT_PTR(pass);
+        return pass;
+    }
+#pragma endregion
 };
 } // namespace Systems
 VULKAN_ENGINE_NAMESPACE_END

resources/shaders/deferred/skybox.glsl

@@ -30,7 +30,6 @@ void main()
 
 #shader fragment
 #version 460 
-#include reindhart.glsl
 #include light.glsl
 #include scene.glsl
 #include material_defines.glsl

resources/shaders/env/panorama_converter.glsl

@@ -43,7 +43,6 @@ void main() {
 
 #shader fragment
 #version 460 core
-#include reindhart.glsl
 
 #define MATH_PI 3.1415926535897932384626433832795
 #define MATH_INV_PI (1.0 / MATH_PI)