From 41b02725d7d7e115ed5f5c16ba757239e7d44198 Mon Sep 17 00:00:00 2001
From: luisangelsm <luisangelsm@gmail.com>
Date: Sun, 18 Jan 2026 18:23:04 +0100
Subject: [PATCH] Use the fragment shader to calculate the shading effect for a
 more uniform shading than the one based on vertex

---
 YACReader/YACReader.pro               |   5 ++++-
 YACReaderLibrary/YACReaderLibrary.pro |   5 ++++-
 common/rhi/shaders/flow.frag          |  31 ++++++++++++++++++++------
 common/rhi/shaders/flow.frag.qsb      | Bin 1990 -> 2682 bytes
 common/rhi/shaders/flow.vert          |  25 ++++++++++-----------
 common/rhi/shaders/flow.vert.qsb      | Bin 2957 -> 2892 bytes
 common/rhi/yacreader_flow_rhi.cpp     |  24 +++++++++++---------
 7 files changed, 58 insertions(+), 32 deletions(-)

diff --git a/YACReader/YACReader.pro b/YACReader/YACReader.pro
index 940ea723..42f78184 100644
--- a/YACReader/YACReader.pro
+++ b/YACReader/YACReader.pro
@@ -157,7 +157,10 @@ SOURCES +=  ../common/comic.cpp \
             SOURCES += ../common/rhi/yacreader_flow_rhi.cpp
             SOURCES += ../common/rhi/yacreader_comic_flow_rhi.cpp \
                        ../common/rhi/yacreader_page_flow_rhi.cpp
-            RESOURCES += ../common/rhi/shaders/shaders.qrc
+                RESOURCES += ../common/rhi/shaders/shaders.qrc
+                # Make raw GLSL shader sources editable in Qt Creator
+                OTHER_FILES += ../common/rhi/shaders/flow.vert \
+                               ../common/rhi/shaders/flow.frag
         }
 }
 
diff --git a/YACReaderLibrary/YACReaderLibrary.pro b/YACReaderLibrary/YACReaderLibrary.pro
index 11952c35..1a79aadb 100644
--- a/YACReaderLibrary/YACReaderLibrary.pro
+++ b/YACReaderLibrary/YACReaderLibrary.pro
@@ -253,7 +253,10 @@ SOURCES += comic_flow.cpp \
         SOURCES += ../common/rhi/yacreader_flow_rhi.cpp
         SOURCES += ../common/rhi/yacreader_comic_flow_rhi.cpp \
              ../common/rhi/yacreader_page_flow_rhi.cpp
-        RESOURCES += ../common/rhi/shaders/shaders.qrc
+           RESOURCES += ../common/rhi/shaders/shaders.qrc
+           # Make raw GLSL shader sources editable in Qt Creator
+           OTHER_FILES += ../common/rhi/shaders/flow.vert \
+                 ../common/rhi/shaders/flow.frag
     }
 }
 
diff --git a/common/rhi/shaders/flow.frag b/common/rhi/shaders/flow.frag
index 01b474d9..5e6f6c40 100644
--- a/common/rhi/shaders/flow.frag
+++ b/common/rhi/shaders/flow.frag
@@ -2,8 +2,11 @@
 
 // Inputs from vertex shader
 layout(location = 0) in vec2 vTexCoord;
-layout(location = 1) in vec4 vColor;
-layout(location = 2) in float vIsReflection;
+layout(location = 1) in flat vec4 vInstanceShading;
+layout(location = 2) in flat float vInstanceOpacity;
+layout(location = 3) in flat float vIsReflection;
+layout(location = 4) in flat float vInstanceRotation;
+layout(location = 5) in vec2 vLocalPos;
 
 // Output
 layout(location = 0) out vec4 fragColor;
@@ -29,16 +32,30 @@ void main()
 {
     vec4 texColor = texture(coverTexture, vTexCoord);
 
-    // Apply shading: multiply texture by vColor.r to darken
-    float shadingAmount = vColor.r;
+    // Compute per-pixel shading using per-instance corner shading values
+    float leftUp = vInstanceShading.x;
+    float leftDown = vInstanceShading.y;
+    float rightUp = vInstanceShading.z;
+    float rightDown = vInstanceShading.w;
 
-    // For reflections, apply gradient fade (darker at bottom, fading to black)
+    // Use interpolated local vertex position to match original vertex-based shading.
+    // position.y in vertex ranges [-0.5..0.5], so map to [0..1] with +0.5
+    float y = clamp(vLocalPos.y + 0.5, 0.0, 1.0);
+    float x = clamp(vLocalPos.x + 0.5, 0.0, 1.0);
+    float leftShading = mix(leftDown, leftUp, y);
+    float rightShading = mix(rightDown, rightUp, y);
+    float shading = mix(leftShading, rightShading, x);
+
+    // Combine with per-instance opacity (opacity only darkens RGB, alpha preserved)
+    float shadingAmount = shading * vInstanceOpacity;
+
+    // For reflections, apply a gradient fade using reflection uniforms (darker further away)
     if (vIsReflection > 0.5) {
-        // vTexCoord.y goes from 1 (top of reflection, near cover) to 0 (bottom, far from cover)
-        // We want it brightest near the cover and fading away
+        // Legacy reflection fade: ramp from 0.0 to 0.33 using texture V coordinate
         float gradientFade = mix(0.0, 0.33, vTexCoord.y);
         shadingAmount *= gradientFade;
     }
 
+    // Final color: shaded RGB, keep source alpha
     fragColor = vec4(texColor.rgb * shadingAmount, texColor.a);
 }
diff --git a/common/rhi/shaders/flow.frag.qsb b/common/rhi/shaders/flow.frag.qsb
index f50613bb41bc80d1f8194c9a3d4b5aabc6de262b..02f9d8a6c07cb8e469453d7f1acaa3e452d97988 100644
GIT binary patch
literal 2682
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

literal 1990
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
Y<G)6M;nMZ5*Is|;56bZM2V@V*yxfxNvj6}9

diff --git a/common/rhi/shaders/flow.vert b/common/rhi/shaders/flow.vert
index 1584e783..1d9d18c4 100644
--- a/common/rhi/shaders/flow.vert
+++ b/common/rhi/shaders/flow.vert
@@ -12,11 +12,15 @@ layout(location = 5) in vec4 instanceModel_row3;
 layout(location = 6) in vec4 instanceShading1;
 layout(location = 7) in float instanceOpacity;
 layout(location = 8) in float instanceFlip;
+layout(location = 9) in float instanceRotation;
 
 // Outputs to fragment shader
 layout(location = 0) out vec2 vTexCoord;
-layout(location = 1) out vec4 vColor;
-layout(location = 2) out float vIsReflection;
+layout(location = 1) out flat vec4 vInstanceShading;
+layout(location = 2) out flat float vInstanceOpacity;
+layout(location = 3) out flat float vIsReflection;
+layout(location = 4) out flat float vInstanceRotation;
+layout(location = 5) out vec2 vLocalPos;
 
 // Uniform buffer
 layout(std140, binding = 0) uniform UniformBuffer
@@ -39,21 +43,16 @@ void main()
 
     gl_Position = viewProjectionMatrix * instanceModel * vec4(position, 1.0);
     vTexCoord = texCoord;
+    vLocalPos = position.xy;
 
     // Flip texture vertically per-instance when requested (reflection)
     if (instanceFlip != 0.0) {
-        vTexCoord.y = 1.0 - texCoord.y;
+        vTexCoord.y = 1.0 - vTexCoord.y;
     }
 
-    float leftUpShading = instanceShading1.x;
-    float leftDownShading = instanceShading1.y;
-    float rightUpShading = instanceShading1.z;
-    float rightDownShading = instanceShading1.w;
-
-    float leftShading = mix(leftDownShading, leftUpShading, (position.y + 0.5));
-    float rightShading = mix(rightDownShading, rightUpShading, (position.y + 0.5));
-    float shading = mix(leftShading, rightShading, (position.x + 0.5));
-
-    vColor = vec4(shading * instanceOpacity);
+    // Pass per-instance values to fragment shader as flat (no interpolation)
+    vInstanceShading = instanceShading1;
+    vInstanceOpacity = instanceOpacity;
     vIsReflection = instanceFlip;
+    vInstanceRotation = instanceRotation;
 }
diff --git a/common/rhi/shaders/flow.vert.qsb b/common/rhi/shaders/flow.vert.qsb
index 11aa806e4f113be0bbafe057cdb8cc98ef3127e7..7f28484f34636838964dbbaabf506fd63ddbcd87 100644
GIT binary patch
literal 2892
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

literal 2957
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%0DGii+Nv*9+Wkezj;0Af1BRM*SuQ7S6J|
zQ{_rlOWpma918K4-)i;TAm1p;>{LQ8tAJY$)mS<i&qdt^6}FSSvf5ktxir#}4T_V7
zFnKXp@DoG8ynk$X!7LhIAPkq6NCJF2E#h(l#u4*vLzikj@ETYiS*hkNQ`(&~0#O=?
zD33%`;s|*cNqy`>iW`Ddy|v}jqlhl3xZT`Rsf2@@DrU7WD>O4#moHuUuy(HN_j<KU
zoy~rLgJVsW*6-T8AD>%Vx^liK);F4*0LTU<ZP^60JRDjQ(8_RVSwO49p%nq0ONE-W
z3*ZU4tF256*qdpv@DhwLC-u%xS%9T}V6A}IRvAlRHbce&Sd}&_^|C`a<y`$xoWecR
z*-$SW)MD+;pr+a_jxpr*m-I#_%T^j<D-W?{v^yL9wh1HF$FzuwZ84tN%<Ez1`}RGp
zk&RF5|ETk6yWP$2-1@YJ^*$lvcW-`L8Qsqy!24`}T6X_4r1vT8(BFMFK*_qGe_A98
zwnL6<Zq4KG=3u52-35s&q+O<|j-^qKr3}aND93V!V`Y>hZi3C|h)Z~MJu@hX4yy!N
z2Ui~2^uhJANbul}NOy>CZs}w$jC7yD#T{;tsM=~p%7)M+ekf>=)D+@%FxFZnu(GU)
zP9}*PwE5!YL>yu5Y^(7IyK*<^cRN=2d$Q-BRI&d`cl!6oy-uUuZ@SJ~8*Wf<*Lp#-
z?XA9@i}XEjqxlB^Q&@jHm+SZV2zKflZjZ9+I-%G6(04e4+bsJ%4)?HbvxesA{$A+B
zeg2zob})BNago!W)o84&^n3Ixs_i#A#hDv7(wYqcDa9dHWfQ=%%_aBe%8EI-3`#`n
zbu#+Wm6gG(^t=_UXig=nWQUPbEG0e>c1n$u_{vCpIfk!}#8+bYxh(vkB1!ZKYjx~O
zB(ZO1V8gm7fhT9oB5{>+ccLw&zva!M5d}G#T6g2dtkdvAQtJf1%xxDT^$+`SA){Al
zhMJ!R=c~Q>_-P&8d#2oWvW-l+(}tVN!_9*})KApl@AT>|8Y1oen{O3uf~B>iu^TMo
zO<ashyp0o-_t%ytZoko;Y0_m>bDH!R-Jd3Xe&EYFu_*t(_j992@B0;<B#OVK^W_ze
z4JP|lyBCpeiH<d;JHpNG>kFN4^aJ4m#%nz5Ro>u#8&UY5m#k|)VK+J(7ykVV6%*1N
D8729a

diff --git a/common/rhi/yacreader_flow_rhi.cpp b/common/rhi/yacreader_flow_rhi.cpp
index e325f1c2..d3b7b715 100644
--- a/common/rhi/yacreader_flow_rhi.cpp
+++ b/common/rhi/yacreader_flow_rhi.cpp
@@ -194,9 +194,9 @@ void YACReaderFlow3D::initialize(QRhiCommandBuffer *cb)
 
     // Create instance buffer for per-draw instance data
     if (!scene.instanceBuffer) {
-        // Allocate buffer for per-instance data (model matrix + shading + opacity + flipFlag)
-        // mat4 (16 floats) + vec4 (4 floats) + float (1 float) + float (1 float) = 22 floats
-        scene.instanceBuffer.reset(m_rhi->newBuffer(QRhiBuffer::Dynamic, QRhiBuffer::VertexBuffer, 22 * sizeof(float)));
+        // Allocate buffer for per-instance data (model matrix + shading + opacity + flipFlag + rotation)
+        // mat4 (16 floats) + vec4 (4 floats) + float (opacity) + float (flipFlag) + float (rotation) = 23 floats
+        scene.instanceBuffer.reset(m_rhi->newBuffer(QRhiBuffer::Dynamic, QRhiBuffer::VertexBuffer, 23 * sizeof(float)));
         scene.instanceBuffer->create();
     }
 
@@ -333,7 +333,7 @@ void YACReaderFlow3D::ensurePipeline()
     QRhiVertexInputLayout inputLayout;
     inputLayout.setBindings({
             { 5 * sizeof(float) }, // Per-vertex data (position + texCoord)
-            { 22 * sizeof(float), QRhiVertexInputBinding::PerInstance } // Per-instance data
+            { 23 * sizeof(float), QRhiVertexInputBinding::PerInstance } // Per-instance data
     });
     inputLayout.setAttributes({
             // Per-vertex attributes
@@ -347,7 +347,8 @@ void YACReaderFlow3D::ensurePipeline()
             { 1, 5, QRhiVertexInputAttribute::Float4, 12 * sizeof(float) }, // row 3
             { 1, 6, QRhiVertexInputAttribute::Float4, 16 * sizeof(float) }, // shading vec4
             { 1, 7, QRhiVertexInputAttribute::Float, 20 * sizeof(float) }, // opacity
-            { 1, 8, QRhiVertexInputAttribute::Float, 21 * sizeof(float) } // flipFlag (1.0 = reflection)
+            { 1, 8, QRhiVertexInputAttribute::Float, 21 * sizeof(float) }, // flipFlag (1.0 = reflection)
+            { 1, 9, QRhiVertexInputAttribute::Float, 22 * sizeof(float) } // rotation
     });
     scene.pipeline->setVertexInputLayout(inputLayout);
 
@@ -408,7 +409,7 @@ void YACReaderFlow3D::render(QRhiCommandBuffer *cb)
         bool isReflection;
         bool isMark;
         QRhiTexture *texture;
-        float instanceData[22];
+        float instanceData[23];
         UniformData uniformData;
     };
 
@@ -482,7 +483,7 @@ void YACReaderFlow3D::render(QRhiCommandBuffer *cb)
     }
 
     // Ensure instance buffer is large enough for all draws
-    auto requiredInstanceSize = static_cast<quint32>(draws.size() * 22 * sizeof(float));
+    auto requiredInstanceSize = static_cast<quint32>(draws.size() * 23 * sizeof(float));
     if (!scene.instanceBuffer || scene.instanceBuffer->size() < requiredInstanceSize) {
         scene.instanceBuffer.reset(m_rhi->newBuffer(QRhiBuffer::Dynamic, QRhiBuffer::VertexBuffer, requiredInstanceSize));
         if (!scene.instanceBuffer->create()) {
@@ -514,8 +515,8 @@ void YACReaderFlow3D::render(QRhiCommandBuffer *cb)
 
     // Update instance buffer with all instance data
     for (int i = 0; i < draws.size(); ++i) {
-        int offset = i * 22 * sizeof(float);
-        batch->updateDynamicBuffer(scene.instanceBuffer.get(), offset, 22 * sizeof(float), draws[i].instanceData);
+        int offset = i * 23 * sizeof(float);
+        batch->updateDynamicBuffer(scene.instanceBuffer.get(), offset, 23 * sizeof(float), draws[i].instanceData);
     }
 
     // === PHASE 2: RENDER (DURING PASS) ===
@@ -601,6 +602,9 @@ void YACReaderFlow3D::prepareDrawData(const YACReader3DImageRHI &image, bool isR
         outInstanceData[i] = matData[i];
     }
 
+    // Store per-instance rotation in the instance data (new slot at index 22)
+    outInstanceData[22] = image.current.rot;
+
     // Prepare uniform data
     outUniformData.viewProjectionMatrix = viewProjectionMatrix;
     outUniformData.backgroundColor = QVector3D(backgroundColor.redF(), backgroundColor.greenF(), backgroundColor.blueF());
@@ -637,7 +641,7 @@ void YACReaderFlow3D::executeDrawWithOffset(QRhiCommandBuffer *cb, QRhiTexture *
     // Bind vertex buffers with offset into instance buffer
     const QRhiCommandBuffer::VertexInput vbufBindings[] = {
         { scene.vertexBuffer.get(), 0 },
-        { scene.instanceBuffer.get(), quint32(uniformSlot * 22 * sizeof(float)) }
+        { scene.instanceBuffer.get(), quint32(uniformSlot * 23 * sizeof(float)) }
     };
     cb->setVertexInput(0, 2, vbufBindings);