1
=== modified file 'src/Ubuntu/Components/plugin/shaders/shapeoverlay.frag'
2
--- src/Ubuntu/Components/plugin/shaders/shapeoverlay.frag	2015-07-31 10:32:16 +0000
3
+++ src/Ubuntu/Components/plugin/shaders/shapeoverlay.frag	2015-07-31 10:32:16 +0000
4
@@ -37,8 +37,9 @@
5
37
varying mediump vec2 overlayCoord;
37
varying mediump vec2 overlayCoord;
6
38
varying lowp vec4 overlayColor;
38
varying lowp vec4 overlayColor;
7
39
39
10
40
const mediump int FLAT  = 0x08;  // 1 << 3
40
const mediump int FLAT  = 0x08;        // 1 << 3
11
41
const mediump int INSET = 0x10;  // 1 << 4
41
const mediump int INSET = 0x10;        // 1 << 4
12
42
const mediump int DROP_SHADOW = 0x20;  // 1 << 5
13
42
43
14
43
void main(void)
44
void main(void)
15
44
{
45
{
16
@@ -96,6 +97,20 @@
17
96
        // Mask the current color then blend the bevel over the resulting color. We simply use
97
        // Mask the current color then blend the bevel over the resulting color. We simply use
18
97
        // additive blending since the bevel has already been masked.
98
        // additive blending since the bevel has already been masked.
19
98
        color = (color * vec4(mask[int(shapeSide)])) + vec4(bevel);
99
        color = (color * vec4(mask[int(shapeSide)])) + vec4(bevel);
20
100
21
101
    } else if (aspect == DROP_SHADOW) {
22
102
        // The vertex layout of the shape is made so that the derivative is negative from top to
23
103
        // middle and positive from middle to bottom.
24
104
        lowp int shapeSide = dfdt * dfdtFactor <= 0.0 ? 0 : 1;
25
105
        // Get the anti-aliased and resolution independent shape mask using distance fields.
26
106
        lowp float distanceMin = abs(dfdt) * -distanceAA + 0.5;
27
107
        lowp float distanceMax = abs(dfdt) * distanceAA + 0.5;
28
108
        lowp float mask = smoothstep(distanceMin, distanceMax, shapeData[shapeSide]);
29
109
        // Get the shadow color outside of the shape mask.
30
110
        lowp float shadow = (shapeData.b * -mask) + shapeData.b;  // -ab + a = a(1 - b)
31
111
        // Mask the current color then blend the shadow over the resulting color. We simply use
32
112
        // additive blending since the shadow has already been masked.
33
113
        color = (color * vec4(mask)) + vec4(0.0, 0.0, 0.0, shadow);
34
99
    }
114
    }
35
100
115
36
101
    gl_FragColor = color * opacityFactors.xxxy;
116
    gl_FragColor = color * opacityFactors.xxxy;
Reviewer	Review Type	Date Requested	Status
Tim Peeters		2015-07-31	Approve on 2015-08-04
PS Jenkins bot	continuous-integration		Approve on 2015-07-31
Review via email: mp+266531@code.launchpad.net