Added samppling strategies for raytracing shadows. Upgraded light object

Author: AEspinosaDev

examples/raytracing/application.cpp

@@ -72,6 +72,7 @@ void Application::setup() {
     light->set_area_of_effect(20.0f);
     light->set_shadow_fov(115.0f);
     light->set_shadow_type(ShadowType::RAYTRACED_SHADOW);
+    light->set_area(0.5f);
     light->add_child(lightDummy);
     light->set_name("Light");
 

include/engine/core/scene/light.h

@@ -21,6 +21,7 @@ class Light : public Object3D
   protected:
     Vec3  m_color;
     float m_intensity;
+    float m_area = 0.0; // If ZERO is treated as a VPL (Virtual Point Light)
 
     // Shadow
     struct Shadow {
@@ -35,12 +36,14 @@ class Light : public Object3D
         bool       angleDependableBias = false;
         float      kernelRadius        = 1.0;
         int        softness            = 3;
+        int        raySamples          = 4;
     };
 
     Shadow          m_shadow;
     const LightType m_lighType;
 
   public:
+
     Light(std::string name, LightType type, Vec3 color = Vec3(1.0f, 1.0f, 1.0f), float intensity = 1.0f)
         : Object3D(name, LIGHT)
         , m_color(color)
@@ -121,6 +124,12 @@ class Light : public Object3D
     virtual inline void set_shadow_softness(int k) {
         m_shadow.softness = k;
     }
+    virtual inline int get_shadow_ray_samples() const {
+        return m_shadow.raySamples;
+    }
+    virtual inline void set_shadow_ray_samples(int rays) {
+        m_shadow.raySamples = rays;
+    }
 
     virtual inline bool get_angle_dependant_bias() const {
         return m_shadow.angleDependableBias;
@@ -139,6 +148,12 @@ class Light : public Object3D
     virtual LightType get_light_type() const {
         return m_lighType;
     }
+    virtual inline float get_area() const {
+        return m_area;
+    }
+    virtual inline void set_area(float a) {
+        m_area = a;
+    }
 
     virtual Graphics::LightUniforms get_uniforms(Mat4 cameraView) const = 0;
 };
@@ -148,15 +163,13 @@ class Light : public Object3D
 class PointLight : public Light
 {
     float m_effectArea;
-    float m_decaying;
 
     static int m_instanceCount;
 
   public:
     PointLight(Vec3 color = Vec3(1.0f, 1.0f, 1.0f), float intensity = 1.0f)
         : Light("Point Light #" + std::to_string(PointLight::m_instanceCount), LightType::POINT, color, intensity)
-        , m_effectArea(12.0f)
-        , m_decaying(1.0f) {
+        , m_effectArea(12.0f) {
         PointLight::m_instanceCount++;
     }
 
@@ -167,13 +180,6 @@ class PointLight : public Light
         m_effectArea = a;
     }
 
-    inline float get_decaying() const {
-        return m_decaying;
-    }
-    inline void set_decaying(float d) {
-        m_decaying = d;
-    }
-
     virtual Graphics::LightUniforms get_uniforms(Mat4 cameraView) const;
 };
 

include/engine/core/textures/texture.h

@@ -17,15 +17,13 @@ VULKAN_ENGINE_NAMESPACE_BEGIN
 namespace Core {
 
 struct TextureSettings {
-    ColorFormatType       format{SRGBA_8};
-    TextureFilterType     filter{LINEAR};
-    TextureAdressModeType adressMode{REPEAT};
-
-    bool useMipmaps{true};
-    bool anisotropicFilter{true};
-
-    int minMipLevel{0};
-    int maxMipLevel{-1};
+    ColorFormatType       format            = SRGBA_8;
+    TextureFilterType     filter            = LINEAR;
+    TextureAdressModeType adressMode        = REPEAT;
+    bool                  useMipmaps        = true;
+    bool                  anisotropicFilter = true;
+    int                   minMipLevel       = 0;
+    int                   maxMipLevel       = -1;
 };
 
 /*

include/engine/core/textures/textureLDR.h

@@ -27,6 +27,7 @@ class TextureLDR : public ITexture
 
   public:
     static Texture *FALLBACK_TEX;
+    static Texture *BLUE_NOISE_TEXT;
 
     TextureLDR() : ITexture()
     {

include/engine/graphics/uniforms.h

@@ -26,13 +26,12 @@ struct CameraUniforms {
 };
 
 struct LightUniforms {
-    
+
     Vec4 position  = {0.0f, 0.0f, 0.0f, 0.0f}; // w for type
     Vec4 color     = {0.0f, 0.0f, 0.0f, 0.0f};
     Vec4 dataSlot1 = {0.0f, 0.0f, 0.0f, 0.0f};
     Mat4 viewProj;
     Vec4 dataSlot2 = {0.0f, 0.0f, 0.0f, 0.0f};
-   
 };
 
 struct SceneUniforms {
@@ -46,6 +45,7 @@ struct SceneUniforms {
     int           useIBL;
     float         envRotation;
     float         envColorMultiplier;
+    float           time;
 };
 
 struct ObjectUniforms {

include/engine/systems/renderers/renderer.h

@@ -20,6 +20,8 @@
 
 #include <engine/common.h>
 
+#include <engine/tools/loaders.h>
+
 #include <engine/core/materials/material.h>
 #include <engine/core/renderpasses/irradiance_compute_pass.h>
 #include <engine/core/renderpasses/panorama_conversion_pass.h>
@@ -120,9 +122,9 @@ class BaseRenderer
     Graphics::Utils::DeletionQueue m_deletionQueue;
 
     // Query
-    uint32_t m_currentFrame{0};
-    bool     m_initialized{false};
-    bool     m_updateFramebuffers{false};
+    uint32_t m_currentFrame       = 0;
+    bool     m_initialized        = false;
+    bool     m_updateFramebuffers = false;
 
 #pragma endregion
   public:

resources/shaders/forward/physically_based.glsl

@@ -76,6 +76,7 @@ void main() {
 #version 460
 #extension GL_EXT_ray_tracing : enable
 #extension GL_EXT_ray_query : enable
+
 #include camera.glsl
 #include light.glsl
 #include scene.glsl
@@ -87,7 +88,7 @@ void main() {
 #include IBL.glsl
 #include reindhart.glsl
 #include BRDFs/schlick_smith_BRDF.glsl
-#include raytraced_shadows.glsl
+#include raytracing.glsl
 
 //Input
 layout(location = 0) in vec3 v_pos;
@@ -102,11 +103,11 @@ layout(location = 6) in mat3 v_TBN;
 layout(location = 0) out vec4 outColor;
 
 
-layout(set = 0, binding = 2) uniform sampler2DArray shadowMap;
-layout(set = 0, binding = 4) uniform samplerCube irradianceMap;
-layout (set = 0,  binding = 5) uniform accelerationStructureEXT TLAS;
-
-
+//Uniforms
+layout(set = 0, binding = 2)    uniform sampler2DArray              shadowMap;
+layout(set = 0, binding = 4)    uniform samplerCube                 irradianceMap;
+layout(set = 0,  binding = 5)   uniform accelerationStructureEXT    TLAS;
+layout(set = 0,  binding = 6)   uniform sampler2D                   blueNoiseMap;
 layout(set = 1, binding = 1) uniform MaterialUniforms {
      vec3 albedo;
     float opacity;
@@ -129,8 +130,6 @@ layout(set = 1, binding = 1) uniform MaterialUniforms {
     int maskType;
     float opacityWeight;
 } material;
-
-
 layout(set = 2, binding = 0) uniform sampler2D albedoTex;
 layout(set = 2, binding = 1) uniform sampler2D normalTex;
 layout(set = 2, binding = 2) uniform sampler2D maskRoughTex;
@@ -202,7 +201,7 @@ void main() {
                 if(scene.lights[i].shadowType == 1) //VSM   
                     lighting *= computeVarianceShadow(shadowMap, scene.lights[i], i, v_modelPos);
                 if(scene.lights[i].shadowType == 2) //Raytraced  
-                    lighting *= computeRaytracedShadow(TLAS, v_modelPos, normalize(scene.lights[i].shadowData.xyz - v_modelPos), 1000);
+                    lighting *= computeRaytracedShadow(TLAS, blueNoiseMap ,v_modelPos, scene.lights[i].shadowData.xyz - v_modelPos, int(scene.lights[i].shadowData.w) , scene.lights[i].area , 0);
             }
 
         color += lighting;

resources/shaders/scripts/BRDFs/marschner_BSDF.glsl

@@ -7,7 +7,9 @@
 #define R_NORMALIZING_FACTOR    1.5
 #define TT_NORMALIZING_FACTOR   1.0
 #define TRT_NORMALIZING_FACTOR  0.01
-#define PI 3.1415926535897932384626433832795
+#ifndef PI 
+#define PI              3.1415926535897932384626433832795
+#endif
 #define ONE_OVER_PI      (1.0 / PI)
 #define ONE_OVER_PI_HALF (2.0 / PI)
 #define DEG2RAD(x) ((x) / 180.0 * PI)

resources/shaders/scripts/BRDFs/marschner_LUT_BSDF.glsl

@@ -2,7 +2,9 @@
 // LUT BASED
 /////////////////////////////////////////////
 
-#define PI 3.1415926535897932384626433832795
+#ifndef PI 
+#define PI              3.1415926535897932384626433832795
+#endif
 #define ONE_OVER_PI      (1.0 / PI)
 #define ONE_OVER_PI_HALF (2.0 / PI)
 #define DEG2RAD(x) ((x) / 180.0 * PI)

resources/shaders/scripts/BRDFs/schlick_smith_BRDF.glsl

@@ -1,5 +1,9 @@
-const float PI          = 3.14159265359;
-const float EPSILON     = 0.1;
+#ifndef PI 
+#define PI              3.1415926535897932384626433832795
+#endif
+#ifndef EPSILON 
+#define EPSILON         0.001
+#endif  
 
 struct                  SchlickSmithBRDF{
     vec3                albedo;