-Dev: Procedural PBR sky done. Problems with sun direction...

AEspinosaDev · AEspinosaDev · commit e67971550764 · 2025-02-06T19:23:43.000+01:00
diff --git a/examples/resources/scenes/sponza.xml b/examples/resources/scenes/sponza.xml
@@ -383,11 +383,11 @@
 
         <intensity value="10.0" />
         <color r="1.0" g="0.9" b="0.8" />
-        <direction x="2.0" y="30.0" z="5.0" />
+        <direction x="0.086" y="-0.97" z="0.21" />
 
         <Shadow type="rt">
-            <samples value="2" />
-            <area value="0.1" />
+            <samples value="1" />
+            <area value="0.0" />
         </Shadow>
     </Light>
 
diff --git a/include/engine/core/passes/sky_pass.h b/include/engine/core/passes/sky_pass.h
@@ -14,8 +14,8 @@ VULKAN_ENGINE_NAMESPACE_BEGIN
 
 namespace Core {
 /*
-Procedural Physically Based Sky generation pass. Based on "A Scalable and Production Ready Sky and Atmosphere Rendering Technique"
-by Sébastien Hillaire (2020).
+Procedural Physically Based Sky generation pass. Based on "A Scalable and Production Ready Sky and Atmosphere Rendering
+Technique" by Sébastien Hillaire (2020).
 
 Transmittance LUT is based on "Precomputed Atmospheric Scattering" by Eric Bruneton and Fabrice Neyret (2008).
 
@@ -26,6 +26,29 @@ class SkyPass : public GraphicPass
   protected:
     Graphics::DescriptorSet m_imageDescriptor;
 
+    /*
+     * Every aerosol type expects 5 parameters:
+     * - Scattering cross section
+     * - Absorption cross section
+     * - Base density (km^-3)
+     * - Background density (km^-3)
+     * - Height scaling parameter
+     * These parameters can be sent as uniforms.
+     *
+     * This model for aerosols and their corresponding parameters come from
+     * "A Physically-Based Spatio-Temporal Sky Model"
+     * by Guimera et al. (2018).
+     */
+    struct AerosolParams {
+        Vec4  aerosolAbsorptionCrossSection = Vec4(0.0);
+        Vec4  aerosolScatteringCrossSection = Vec4(0.0);
+        float aerosolBaseDensity            = 0.0f;
+        float aerosolBackgroundDensity      = 0.0f;
+        float aerosolHeightScale            = 0.0f;
+    };
+
+    AerosolParams get_aerosol_params(AerosolType type);
+
   public:
     SkyPass(Graphics::Device* ctx, Extent2D extent)
         : BasePass(ctx, extent, 3, 1, false, "SKY GENERATION") {
@@ -40,6 +63,8 @@ class SkyPass : public GraphicPass
 
     virtual void setup_shader_passes();
 
+    virtual void update_framebuffer();
+
     virtual void render(Graphics::Frame& currentFrame, Scene* const scene, uint32_t presentImageIndex = 0);
 };
 
diff --git a/include/engine/core/scene/light.h b/include/engine/core/scene/light.h
@@ -200,6 +200,8 @@ class PointLight : public Light
 class DirectionalLight : public Light
 {
     Vec3 m_direction;
+    // Only works if using procedural sky as enviroment
+    bool m_useAsSun = false;
 
     static int m_instanceCount;
 
@@ -212,13 +214,22 @@ class DirectionalLight : public Light
         , m_direction(direction) {
         DirectionalLight::m_instanceCount++;
     }
-   
+
     inline Vec3 get_direction() const {
         return m_direction;
     }
     inline void set_direction(Vec3 d) {
         m_direction = d;
+        m_direction = math::normalize(m_direction); 
+    }
+    inline bool use_as_sun() const {
+        return m_useAsSun;
     }
+    inline void use_as_sun(bool op) {
+        m_useAsSun = op;
+    }
+
+    static Vec3 get_sun_direction(float elevationDeg, float rotationDeg);
 
     virtual Graphics::LightUniforms get_uniforms(Mat4 cameraView) const;
 };
diff --git a/resources/shaders/VXGI/voxelization.glsl b/resources/shaders/VXGI/voxelization.glsl
@@ -192,7 +192,7 @@ void main() {
             //Diffuse Component ________________________
             vec3 lighting = vec3(0.0);
             lighting = evalDiffuseLighting( 
-                scene.lights[i].type != DIRECTIONAL_LIGHT ? normalize(scene.lights[i].worldPosition.xyz - _pos) : normalize(scene.lights[i].worldPosition.xyz), //wi                                                                                          //wo
+                scene.lights[i].type != DIRECTIONAL_LIGHT ? normalize(scene.lights[i].worldPosition.xyz - _pos) : normalize(-scene.lights[i].worldPosition.xyz), //wi                                                                                          //wo
                 scene.lights[i].color * computeAttenuation(scene.lights[i].worldPosition.xyz, _pos,scene.lights[i].areaEffect,int(scene.lights[i].type)) *  scene.lights[i].intensity             
                 );
 
@@ -207,10 +207,12 @@ void main() {
                                 TLAS, 
                                 samplerMap,
                                 _pos, 
-                                scene.lights[i].type != DIRECTIONAL_LIGHT ? scene.lights[i].worldPosition.xyz - _pos : scene.lights[i].shadowData.xyz,
+                                scene.lights[i].type != DIRECTIONAL_LIGHT ? scene.lights[i].worldPosition.xyz - _pos : -scene.lights[i].shadowData.xyz,
                                 1, 
-                                0.0, 
+                                0.0,
+                                scene.lights[i].type != DIRECTIONAL_LIGHT ? length(scene.lights[i].worldPosition.xyz - _pos) : 30.0, 
                                 0);
+                            
                     }
             
             color += lighting;
diff --git a/resources/shaders/deferred/composition.glsl b/resources/shaders/deferred/composition.glsl
@@ -183,7 +183,7 @@ void main()
                         //Direct Component ________________________
                         vec3 lighting = vec3(0.0);
                         lighting = evalCookTorranceBRDF( 
-                            scene.lights[i].type != DIRECTIONAL_LIGHT ? normalize(scene.lights[i].position - g_pos) : normalize(scene.lights[i].position.xyz), //wi
+                            scene.lights[i].type != DIRECTIONAL_LIGHT ? normalize(scene.lights[i].position - g_pos) : normalize(-scene.lights[i].position.xyz), //wi
                             normalize(-g_pos),                                                                                           //wo
                             scene.lights[i].color * computeAttenuation(scene.lights[i].position, g_pos,scene.lights[i].areaEffect,int(scene.lights[i].type)) *  scene.lights[i].intensity,              //radiance
                             brdf
@@ -200,9 +200,10 @@ void main()
                                     TLAS, 
                                     samplerMap,
                                     modelPos, 
-                                    scene.lights[i].type != DIRECTIONAL_LIGHT ? scene.lights[i].worldPosition.xyz - modelPos : scene.lights[i].shadowData.xyz,
+                                    scene.lights[i].type != DIRECTIONAL_LIGHT ? scene.lights[i].worldPosition.xyz - modelPos : -scene.lights[i].shadowData.xyz,
                                     int(scene.lights[i].shadowData.w), 
                                     scene.lights[i].area, 
+                                    scene.lights[i].type != DIRECTIONAL_LIGHT ? length(scene.lights[i].worldPosition.xyz - modelPos) : 30.0,
                                     0);
                         }
                     direct += lighting;
diff --git a/resources/shaders/env/sky_generation.glsl b/resources/shaders/env/sky_generation.glsl
@@ -20,6 +20,7 @@ layout(location = 0) in  vec2 v_uv;
 
 layout(push_constant) uniform Settings {
     SkySettings sky;
+    AerosolParams aerosolParams;
 } settings;
 layout(set = 0, binding = 0) uniform sampler2D transmitanceLUT;
 
@@ -56,6 +57,7 @@ vec4 compute_inscattering(vec3 ray_origin, vec3 ray_dir, float t_d, out vec4 tra
             altitude,
             settings.sky.month,
             settings.sky.aerosolTurbidity,
+            settings.aerosolParams,
             aerosol_absorption, aerosol_scattering,
             molecular_absorption, molecular_scattering,
             extinction);
diff --git a/resources/shaders/env/sky_tt_compute.glsl b/resources/shaders/env/sky_tt_compute.glsl
@@ -28,6 +28,7 @@ layout(location = 0) in  vec2 v_uv;
 
 layout(push_constant) uniform Settings {
     SkySettings sky;
+    AerosolParams aerosolParams;
 } settings;
 
 layout(location = 0) out vec4 outColor;
@@ -61,6 +62,7 @@ void main()
             altitude,
             settings.sky.month,
             settings.sky.aerosolTurbidity,
+            settings.aerosolParams,
             aerosol_absorption, aerosol_scattering,
             molecular_absorption, molecular_scattering,
             extinction);
diff --git a/resources/shaders/forward/physically_based.glsl b/resources/shaders/forward/physically_based.glsl
@@ -214,7 +214,8 @@ void main() {
                         v_modelPos, 
                         scene.lights[i].type != DIRECTIONAL_LIGHT ? scene.lights[i].shadowData.xyz - v_modelPos : scene.lights[i].shadowData.xyz,
                         int(scene.lights[i].shadowData.w), 
-                        scene.lights[i].area, 
+                        scene.lights[i].area,
+                        scene.lights[i].type != DIRECTIONAL_LIGHT ? lenght(scene.lights[i].shadowData.xyz - v_modelPos) : 30.0, 
                         0);
             }
 
diff --git a/resources/shaders/include/raytracing.glsl b/resources/shaders/include/raytracing.glsl
@@ -11,7 +11,7 @@
 #define EPSILON         0.001
 #endif  
 
-float computeRaytracedShadow(accelerationStructureEXT TLAS, sampler2D randomPool, vec3 O, vec3 L, int numSamples, float area, int ditherFactor){
+float computeRaytracedShadow(accelerationStructureEXT TLAS, sampler2D randomPool, vec3 O, vec3 L, int numSamples, float area, float tMax, int ditherFactor){
 	if(numSamples == 0) return 1.0;
 
 	//Shadow occlusion contribution
@@ -26,7 +26,7 @@ float computeRaytracedShadow(accelerationStructureEXT TLAS, sampler2D randomPool
 		vec2 rng = blueNoiseSample(randomPool,i,ditherFactor).rg;
 		vec2 dsample = diskSample(rng,radius);
 
-		float tMax = length(L);
+		// float tMax = length(L);
 		vec3 dir = normalize(L + dsample.x * LTangent + dsample.y * LBitangent);
 
     	rayQueryEXT rayQuery;
diff --git a/resources/shaders/include/sky.glsl b/resources/shaders/include/sky.glsl
@@ -13,13 +13,15 @@ struct SkySettings {
     int            updateType; 
 };
 
-#define ANIMATE_SUN 0
+struct AerosolParams {
+    vec4 aerosol_absorption_cross_section;
 
-// 0=Background, 1=Desert Dust, 2=Maritime Clean, 3=Maritime Mineral,
-// 4=Polar Antarctic, 5=Polar Artic, 6=Remote Continental, 7=Rural, 8=Urban
-#define AEROSOL_TYPE 8
+    vec4 aerosol_scattering_cross_section;
 
-const float AEROSOL_TURBIDITY     = 1.0;
+    float aerosol_base_density;
+    float aerosol_background_density;
+    float aerosol_height_scale;
+};
 
 // Ray marching steps. More steps mean better accuracy but worse performance
 const int TRANSMITTANCE_STEPS     = 32;
@@ -38,7 +40,6 @@ const float CAMERA_ROLL  =   0.0;
 #define ENABLE_MULTIPLE_SCATTERING 1
 #define ENABLE_AEROSOLS 1
 #define SHOW_RELATIVE_LUMINANCE 0
-#define TONEMAPPING_TECHNIQUE 0 // 0=ACES, 1=simple
 
 //-----------------------------------------------------------------------------
 // Constants
@@ -98,75 +99,6 @@ const float ozone_mean_monthly_dobson[] = float[](
     315.0  // December
 );
 
-/*
- * Every aerosol type expects 5 parameters:
- * - Scattering cross section
- * - Absorption cross section
- * - Base density (km^-3)
- * - Background density (km^-3)
- * - Height scaling parameter
- * These parameters can be sent as uniforms.
- *
- * This model for aerosols and their corresponding parameters come from
- * "A Physically-Based Spatio-Temporal Sky Model"
- * by Guimera et al. (2018).
- */
-#if   AEROSOL_TYPE == 0 // Background
-const vec4 aerosol_absorption_cross_section = vec4(4.5517e-19, 5.9269e-19, 6.9143e-19, 8.5228e-19);
-const vec4 aerosol_scattering_cross_section = vec4(1.8921e-26, 1.6951e-26, 1.7436e-26, 2.1158e-26);
-const float aerosol_base_density = 2.584e17;
-const float aerosol_background_density = 2e6;
-#elif AEROSOL_TYPE == 1 // Desert Dust
-const vec4 aerosol_absorption_cross_section = vec4(4.6758e-16, 4.4654e-16, 4.1989e-16, 4.1493e-16);
-const vec4 aerosol_scattering_cross_section = vec4(2.9144e-16, 3.1463e-16, 3.3902e-16, 3.4298e-16);
-const float aerosol_base_density = 1.8662e18;
-const float aerosol_background_density = 2e6;
-const float aerosol_height_scale = 2.0;
-#elif AEROSOL_TYPE == 2 // Maritime Clean
-const vec4 aerosol_absorption_cross_section = vec4(6.3312e-19, 7.5567e-19, 9.2627e-19, 1.0391e-18);
-const vec4 aerosol_scattering_cross_section = vec4(4.6539e-26, 2.721e-26, 4.1104e-26, 5.6249e-26);
-const float aerosol_base_density = 2.0266e17;
-const float aerosol_background_density = 2e6;
-const float aerosol_height_scale = 0.9;
-#elif AEROSOL_TYPE == 3 // Maritime Mineral
-const vec4 aerosol_absorption_cross_section = vec4(6.9365e-19, 7.5951e-19, 8.2423e-19, 8.9101e-19);
-const vec4 aerosol_scattering_cross_section = vec4(2.3699e-19, 2.2439e-19, 2.2126e-19, 2.021e-19);
-const float aerosol_base_density = 2.0266e17;
-const float aerosol_background_density = 2e6;
-const float aerosol_height_scale = 2.0;
-#elif AEROSOL_TYPE == 4 // Polar Antarctic
-const vec4 aerosol_absorption_cross_section = vec4(1.3399e-16, 1.3178e-16, 1.2909e-16, 1.3006e-16);
-const vec4 aerosol_scattering_cross_section = vec4(1.5506e-19, 1.809e-19, 2.3069e-19, 2.5804e-19);
-const float aerosol_base_density = 2.3864e16;
-const float aerosol_background_density = 2e6;
-const float aerosol_height_scale = 30.0;
-#elif AEROSOL_TYPE == 5 // Polar Arctic
-const vec4 aerosol_absorption_cross_section = vec4(1.0364e-16, 1.0609e-16, 1.0193e-16, 1.0092e-16);
-const vec4 aerosol_scattering_cross_section = vec4(2.1609e-17, 2.2759e-17, 2.5089e-17, 2.6323e-17);
-const float aerosol_base_density = 2.3864e16;
-const float aerosol_background_density = 2e6;
-const float aerosol_height_scale = 30.0;
-#elif AEROSOL_TYPE == 6 // Remote Continental
-const vec4 aerosol_absorption_cross_section = vec4(4.5307e-18, 5.0662e-18, 4.4877e-18, 3.7917e-18);
-const vec4 aerosol_scattering_cross_section = vec4(1.8764e-18, 1.746e-18, 1.6902e-18, 1.479e-18);
-const float aerosol_base_density = 6.103e18;
-const float aerosol_background_density = 2e6;
-const float aerosol_height_scale = 0.73;
-#elif AEROSOL_TYPE == 7 // Rural
-const vec4 aerosol_absorption_cross_section = vec4(5.0393e-23, 8.0765e-23, 1.3823e-22, 2.3383e-22);
-const vec4 aerosol_scattering_cross_section = vec4(2.6004e-22, 2.4844e-22, 2.8362e-22, 2.7494e-22);
-const float aerosol_base_density = 8.544e18;
-const float aerosol_background_density = 2e6;
-const float aerosol_height_scale = 0.73;
-#elif AEROSOL_TYPE == 8 // Urban
-const vec4 aerosol_absorption_cross_section = vec4(2.8722e-24, 4.6168e-24, 7.9706e-24, 1.3578e-23);
-const vec4 aerosol_scattering_cross_section = vec4(1.5908e-22, 1.7711e-22, 2.0942e-22, 2.4033e-22);
-const float aerosol_base_density = 1.3681e20;
-const float aerosol_background_density = 2e6;
-const float aerosol_height_scale = 0.73;
-#endif
-const float aerosol_background_divided_by_base_density = aerosol_background_density / aerosol_base_density;
-
 //-----------------------------------------------------------------------------
 
 vec3 get_sun_direction(float sunElevationDeg)
@@ -265,14 +197,15 @@ vec4 get_molecular_absorption_coefficient(float h, int month)
     return ozone_absorption_cross_section * ozone_mean_monthly_dobson[month] * density;
 }
 
-float get_aerosol_density(float h)
+float get_aerosol_density(float h, AerosolParams params)
 {
-#if AEROSOL_TYPE == 0 // Only for the Background aerosol type, no dependency on height
-    return aerosol_base_density * (1.0 + aerosol_background_divided_by_base_density);
-#else
-    return aerosol_base_density * (exp(-h / aerosol_height_scale)
+    const float aerosol_background_divided_by_base_density = params.aerosol_background_density / params.aerosol_base_density;
+    
+    if(params.aerosol_height_scale != 0.0)
+        return params.aerosol_base_density * (exp(-h / params.aerosol_height_scale)
         + aerosol_background_divided_by_base_density);
-#endif
+    else
+        return params.aerosol_base_density * (1.0 + aerosol_background_divided_by_base_density);
 }
 
 /*
@@ -282,6 +215,7 @@ float get_aerosol_density(float h)
 void get_atmosphere_collision_coefficients(in float h,
                                            in int month,
                                            in float turbidity,
+                                           in AerosolParams params,
                                            out vec4 aerosol_absorption,
                                            out vec4 aerosol_scattering,
                                            out vec4 molecular_absorption,
@@ -293,9 +227,9 @@ void get_atmosphere_collision_coefficients(in float h,
     aerosol_absorption = vec4(0.0);
     aerosol_scattering = vec4(0.0);
 #else
-    float aerosol_density = get_aerosol_density(h);
-    aerosol_absorption = aerosol_absorption_cross_section * aerosol_density * turbidity;
-    aerosol_scattering = aerosol_scattering_cross_section * aerosol_density * turbidity;
+    float aerosol_density = get_aerosol_density(h, params);
+    aerosol_absorption = params.aerosol_absorption_cross_section * aerosol_density * turbidity;
+    aerosol_scattering = params.aerosol_scattering_cross_section * aerosol_density * turbidity;
 #endif
     molecular_absorption = get_molecular_absorption_coefficient(h, month);
     molecular_scattering = get_molecular_scattering_coefficient(h);
diff --git a/src/core/passes/enviroment_pass.cpp b/src/core/passes/enviroment_pass.cpp
@@ -129,6 +129,8 @@ void EnviromentPass::render(Graphics::Frame& currentFrame, Scene* const scene, u
 
     CommandBuffer cmd = currentFrame.commandBuffer;
 
+    SkySettings skySettings = scene->get_skybox()->get_sky_settings();
+
     /*Draw Cubemap*/
     cmd.begin_renderpass(m_renderpass, m_framebuffers[0]);
     cmd.set_viewport(m_imageExtent);
@@ -141,8 +143,7 @@ void EnviromentPass::render(Graphics::Frame& currentFrame, Scene* const scene, u
     cmd.end_renderpass(m_renderpass, m_framebuffers[0]);
 
     /*Draw Diffuse Irradiance*/
-    if (scene->get_skybox()->get_sky_type() == EnviromentType::PROCEDURAL_ENV &&
-        !scene->get_skybox()->get_sky_settings().useForIBL)
+    if (scene->get_skybox()->get_sky_type() == EnviromentType::PROCEDURAL_ENV && !skySettings.useForIBL)
         goto jump;
 
     cmd.begin_renderpass(m_renderpass, m_framebuffers[1]);
@@ -154,9 +155,11 @@ void EnviromentPass::render(Graphics::Frame& currentFrame, Scene* const scene, u
     cmd.end_renderpass(m_renderpass, m_framebuffers[1]);
 
 jump:
+
     /* Everything is updated, set to sleep */
     scene->get_skybox()->update_enviroment(false);
-    set_active(false);
+    if (skySettings.updateType == UpdateType::ON_DEMAND)
+        set_active(false);
 }
 
 void EnviromentPass::link_previous_images(std::vector<Graphics::Image> images) {
diff --git a/src/core/passes/sky_pass.cpp b/src/core/passes/sky_pass.cpp
diff --git a/src/core/resource_manager.cpp b/src/core/resource_manager.cpp
diff --git a/src/core/scene/light.cpp b/src/core/scene/light.cpp
diff --git a/src/systems/renderers/deferred.cpp b/src/systems/renderers/deferred.cpp
diff --git a/src/tools/widgets.cpp b/src/tools/widgets.cpp

Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,8 @@ void main() {`
`214`	`214`	`v_modelPos,`
`215`	`215`	`scene.lights[i].type != DIRECTIONAL_LIGHT ? scene.lights[i].shadowData.xyz - v_modelPos : scene.lights[i].shadowData.xyz,`
`216`	`216`	`int(scene.lights[i].shadowData.w),`
`217`		`- scene.lights[i].area,`
	`217`	`+ scene.lights[i].area,`
	`218`	`+ scene.lights[i].type != DIRECTIONAL_LIGHT ? lenght(scene.lights[i].shadowData.xyz - v_modelPos) : 30.0,`
`218`	`219`	`0);`
`219`	`220`	`}`
`220`	`221`