Restore point light functionnality, in addition to tube light.

Author: Adnn

src/apps/ch10_area_lights/ch10_area_lights/Scene.cpp

@@ -225,7 +225,7 @@ void Scene::render(math::Size<2, int> aRenderResolution)
         entity.mLocalToWorld =
             math::trans3d::scaleUniform(pointLight.mRadius.mMin)
             * math::trans3d::translate(pointLight.mPosition.as<math::Vec>());
-        entity.mColorFactor = pointLight.mColors.mDiffuseColor;
+        entity.mColorFactor = pointLight.mColors.mSpecularColor;
 
         // Populate the line segments representing the tube lights
         if (pointLightIdx % 2 == 1)
@@ -234,6 +234,7 @@ void Scene::render(math::Size<2, int> aRenderResolution)
                 renderer::LineSegment_glsl{
                     .mPointA = mLights.mPointLights[pointLightIdx - 1].mPosition,
                     .mPointB = mLights.mPointLights[pointLightIdx].mPosition,
+                    .mColor = mLights.mPointLights[pointLightIdx - 1].mColors.mSpecularColor,
                     .mWidth = 2 * mLights.mPointLights[pointLightIdx - 1].mRadius.mMin,
                 });
         }
@@ -285,6 +286,7 @@ void Scene::render(math::Size<2, int> aRenderResolution)
     // TODO: should be done only once for each pair of VAO-program
     validateVertexAttributes(mSurfaceProgram);
     glUseProgram(mSurfaceProgram);
+    graphics::setUniform(mSurfaceProgram, "u_TubeCount", mFrameControl.mTubeCount);
 
     glDrawElementsInstancedBaseInstance(
         GL_PATCHES,
@@ -320,7 +322,7 @@ void Scene::render(math::Size<2, int> aRenderResolution)
         }
         glBindVertexArray(mLineDrawer.mVao);
         glUseProgram(mLineDrawer.mProgram);
-        glDrawArrays(GL_TRIANGLES, 0, mLineDrawer.mVerticesCount);
+        glDrawArraysInstanced(GL_TRIANGLES, 0, mLineDrawer.mVerticesCount, mFrameControl.mTubeCount);
         glEnable(GL_CULL_FACE);
     }
 }
@@ -351,6 +353,10 @@ void Scene::presentUi(bool * aOpen)
 
     ImGui::Checkbox("Show Punctual Lights", &mFrameControl.mShowPunctualLights);
 
+    ImGui::InputScalar("Tube count", ImGuiDataType_U32, &mFrameControl.mTubeCount);
+    mFrameControl.mTubeCount = std::min(mFrameControl.mTubeCount, mLights.mPointCount / 2);
+
+
     DearImguiWitness witness;
 
     ImGui::Spacing();

src/apps/ch10_area_lights/ch10_area_lights/Scene.h

@@ -101,6 +101,7 @@ struct Scene
 
         decltype(gPolygonModes)::const_iterator mPolygonMode = gPolygonModes.begin() + 2;
         bool mShowPunctualLights = true;
+        unsigned int mTubeCount = 1;
     };
 
     Scene(graphics::AppInterface & aAppInterface, const imguiui::ImguiUi & aImgui);

src/apps/ch10_area_lights/ch10_area_lights/resources/shaders/ch10_area_lights_Pbr.frag

@@ -14,6 +14,8 @@ in vec3 ex_Position_view;
 
 out vec4 out_Color;
 
+uniform uint u_TubeCount;
+
 
 LightContributions applyLight_pbr(vec3 aView, vec3 aDiffuseLightDir, vec3 aSpecularLightDir, vec3 aShadingNormal,
                                   PbrParameters aParams, LightColors aColors)
@@ -149,35 +151,38 @@ void main(void)
     }
 
 
-    //// Point lights
-    //for(uint pointIdx = 0; pointIdx != ub_PointCount.x; ++pointIdx)
-    //{
-    //    PointLight point = ub_PointLights[pointIdx];
+    // The u_TubeCount first pairs of point lights are representing tube lights
+    uint firstPoint = min(2 * u_TubeCount, ub_PointCount);
+
+    // Point lights
+    for(uint pointIdx = firstPoint; pointIdx != ub_PointCount; ++pointIdx)
+    {
+        PointLight point = ub_PointLights[pointIdx];
 
-    //    // see rtr 4th p110 (5.10)
-    //    vec3 lightRay_view = point.position.xyz - ex_Position_view;
-    //    float radius = length(lightRay_view);
-    //    vec3 lightDir_view = lightRay_view / radius;
+        // see rtr 4th p110 (5.10)
+        vec3 lightRay_view = point.position.xyz - ex_Position_view;
+        float radius = length(lightRay_view);
+        vec3 lightDir_view = lightRay_view / radius;
 
-    //    vec3 specularLightDir_view = normalize(
-    //        representativePoint_sphere(ex_Position_view,
-    //                                   point.position.xyz,
-    //                                   reflect(-viewDir_view, shadingNormal_view),
-    //                                   point.radius.x));
+        vec3 specularLightDir_view = normalize(
+            representativePoint_sphere(ex_Position_view,
+                                       point.position.xyz,
+                                       reflect(-viewDir_view, shadingNormal_view),
+                                       point.radius.x));
 
-    //    LightContributions lighting = 
-    //        applyLight_pbr(
-    //            viewDir_view, lightDir_view, specularLightDir_view, shadingNormal_view,
-    //            pbrParameters, point.colors);
+        LightContributions lighting = 
+            applyLight_pbr(
+                viewDir_view, lightDir_view, specularLightDir_view, shadingNormal_view,
+                pbrParameters, point.colors);
 
-    //    float falloff = attenuatePoint(point, radius);
-    //    diffuseAccum  += lighting.diffuse  * falloff;
-    //    specularAccum += lighting.specular * falloff;
-    //}
+        float falloff = attenuatePoint(point, radius);
+        diffuseAccum  += lighting.diffuse  * falloff;
+        specularAccum += lighting.specular * falloff;
+    }
 
 
     // Tube lights
-    for(uint pointIdx = 0; pointIdx != ub_PointCount; pointIdx += 2)
+    for(uint pointIdx = 0; (pointIdx + 1) < firstPoint; pointIdx += 2)
     {
         PointLight p0 = ub_PointLights[pointIdx];
         PointLight p1 = ub_PointLights[pointIdx+1];

src/libs/engine/engine/Lights.h

@@ -71,8 +71,8 @@ struct Radius
     // * r_0 (the distance at which the intensities are given)
     // * r_min (the distance below which light will not gain intensities anymore)
     // max is used as r_max, i.e. where both light intensity & derivative should reach zero.
-    GLfloat mMin = 0.f;
-    GLfloat mMax = 0.f;
+    GLfloat mMin = 0.25f;
+    GLfloat mMax = 10.f;
     // Until the maybe_uninitialized warning works better we need
     // mMin and mMax to have default values or gcc will shout on
     // us

src/libs/engine/engine/Lines.h

@@ -1,6 +1,7 @@
 #pragma once
 
 
+#include <math/Color.h>
 #include <math/Vector.h>
 
 #include <renderer/GL_Loader.h>
@@ -15,6 +16,7 @@ struct LineSegment_glsl
 {
     alignas(4 * sizeof(GLfloat)) math::Position<3, GLfloat> mPointA;
     alignas(4 * sizeof(GLfloat)) math::Position<3, GLfloat> mPointB;
+    alignas(4 * sizeof(GLfloat)) math::hdr::Rgba_f mColor = math::hdr::gWhite<GLfloat>;
     alignas(4 * sizeof(GLfloat)) GLfloat mWidth;
 };
 

src/libs/engine/engine/resources/shaders/Line.vert

@@ -1,6 +1,7 @@
 #version 460
 
 
+#include "LineBlock.glsl"
 #include "ViewProjectionBlock.glsl"
 
 
@@ -9,21 +10,6 @@ out vec4 ex_Color;
 
 uniform ivec2 u_FramebufferSize;
 
-struct LineSegment
-{
-    // We never use vec3 in buffer-backed interface blocks due to alignment complications
-    // We could use the last float for a per-point width
-    vec4 pointA;
-    vec4 pointB;
-    float width;
-};
-
-
-layout(std140, binding = 8) readonly buffer LinesSsbo
-{
-    LineSegment ub_Segments[];
-};
-
 const vec2 pos_data[4] = vec2[] (
     vec2( 1.0, -0.5),
     vec2( 1.0,  0.5),

src/libs/engine/engine/resources/shaders/LineBlock.glsl

@@ -0,0 +1,15 @@
+struct LineSegment
+{
+    // We never use vec3 in buffer-backed interface blocks due to alignment complications
+    // We could use the last float for a per-point width
+    vec4 pointA;
+    vec4 pointB;
+    vec4 color;
+    float width;
+};
+
+
+layout(std140, binding = 8) readonly buffer LinesSsbo
+{
+    LineSegment ub_Segments[];
+};

src/libs/engine/engine/resources/shaders/LineRound.vert

@@ -2,6 +2,7 @@
 
 
 #include "Constants.glsl"
+#include "LineBlock.glsl"
 #include "ViewProjectionBlock.glsl"
 
 
@@ -11,29 +12,12 @@ out vec4 ex_Color;
 
 uniform ivec2 u_FramebufferSize;
 
-struct LineSegment
-{
-    // We never use vec3 in buffer-backed interface blocks due to alignment complications
-    // We could use the last float for a per-point width
-    vec4 pointA;
-    vec4 pointB;
-    float width;
-};
-
-
-layout(std140, binding = 8) readonly buffer LinesSsbo
-{
-    LineSegment ub_Segments[];
-};
-
-
 // Note: the idea to use a special pattern of positions to draw the line and the round endpoints
 // was inspired by: https://wwwtyro.net/2019/11/18/instanced-lines.html
 void main() 
 {
-    ex_Color = vec4(1);
-
     LineSegment segment = ub_Segments[gl_InstanceID];
+    ex_Color = segment.color;
     float width = segment.width;
     vec3 point = v_Position;