Fixes an error where Light->Copy was deferring to point light instead of virtual light. This would cause weird and hard to track down errors once the engine made a copy of a VPL and then tried casting the copy to a VPL.

Author: KTStephano

Examples/ExampleEnv02/Sponza.cpp

@@ -310,7 +310,7 @@ class Sponza : public stratus::Application {
                                 mover->light->setIntensity(worldLight->getIntensity() * 10);
                                 const auto worldLightColor = glm::vec3(1.0f, 0.0f, 0.0f);
                                 mover->light->setColor(worldLightColor.r, worldLightColor.g, worldLightColor.b);
-                                ((stratus::VirtualPointLight *)mover->light.get())->SetNumShadowSamples(27);
+                                ((stratus::VirtualPointLight *)mover->light.get())->SetNumShadowSamples(9);
                                 mover->position = camera->getPosition();
                                 mover->addToScene();
                                 lightMovers.push_back(std::move(mover));
@@ -323,6 +323,7 @@ class Sponza : public stratus::Application {
                                 mover->light->setIntensity(worldLight->getIntensity() * 10);
                                 const auto worldLightColor = glm::vec3(0.0f, 1.0f, 0.0f);
                                 mover->light->setColor(worldLightColor.r, worldLightColor.g, worldLightColor.b);
+                                ((stratus::VirtualPointLight *)mover->light.get())->SetNumShadowSamples(9);
                                 mover->position = camera->getPosition();
                                 mover->addToScene();
                                 lightMovers.push_back(std::move(mover));
@@ -335,6 +336,7 @@ class Sponza : public stratus::Application {
                                 mover->light->setIntensity(worldLight->getIntensity() * 10);
                                 const auto worldLightColor = glm::vec3(0.0f, 0.0f, 1.0f);
                                 mover->light->setColor(worldLightColor.r, worldLightColor.g, worldLightColor.b);
+                                ((stratus::VirtualPointLight *)mover->light.get())->SetNumShadowSamples(9);
                                 mover->position = camera->getPosition();
                                 mover->addToScene();
                                 lightMovers.push_back(std::move(mover));

Source/StratusLight.h

@@ -106,12 +106,13 @@ namespace stratus {
         // as a way of simulating bounce lighting
         bool _virtualLight = false;
 
+        Light(const bool virtualLight)
+            : _virtualLight(virtualLight) {}
+
     public:
         glm::vec3 position = glm::vec3(0.0f);
-
-        Light(const bool virtualLight = false)
-            : _virtualLight(virtualLight) {}
 
+        Light() : Light(false) {}
         virtual ~Light() = default;
 
         /**
@@ -264,6 +265,12 @@ namespace stratus {
         void SetNumShadowSamples(uint32_t samples) { _numShadowSamples = samples; }
         uint32_t GetNumShadowSamples() const { return _numShadowSamples; }
 
+        // This MUST be done or else the engine makes copies and it will defer
+        // to PointLight instead of this and then cause horrible strange errors
+        LightPtr Copy() const override {
+            return LightPtr(new VirtualPointLight(*this));
+        }
+
     private:
         uint32_t _numShadowSamples = 3;
     };

resources/shaders/pbr_vpl_gi.fs

@@ -94,16 +94,15 @@ vec3 performLightingCalculations(vec3 screenColor, vec2 pixelCoords, vec2 texCoo
     for (int baseLightIndex = 0 ; baseLightIndex < numActiveVPLs; baseLightIndex += 1) {
         // Calculate true light index via lookup into active light table
         int lightIndex = activeLightIndicesPerTile[baseTileIndex + baseLightIndex];
+        if (lightIndex > MAX_TOTAL_VPLS_PER_FRAME) continue;
+
         vec3 lightPosition = lightPositions[lightIndex].xyz;
         float distance = length(lightPosition - fragPos);
         vec3 lightColor = lightColors[lightIndex].xyz;
         if (distance > lightRadii[lightIndex]) continue;
         if (length(vplColor) > (length(infiniteLightColor) * 0.25)) break;
 
-        int numSamples = 3;//int(lightNumSamples[lightIndex]);
-        // This solves an error where sometimes numShadowSamples seems to be uninitialized to some huge
-        // value - must fix
-        //if (numSamples > 64) continue;
+        int numSamples = int(lightNumSamples[lightIndex]);
         float shadowFactor = 0.0;
         if (length(lightPosition - viewPosition) < 135) {
             shadowFactor = calculateShadowValue(shadowCubeMaps[lightIndex], lightFarPlanes[lightIndex], fragPos, lightPosition, dot(lightPosition - fragPos, normal), numSamples);