diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-06-25 07:23:35 +0300 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-06-25 08:36:38 +0300 |
| commit | d2082af08756eb3cf971b75b654db1f199e043fa (patch) | |
| tree | 90f929cba915f9481f4002cdda41c5730be45857 /src/datavis3d/engine/shaders | |
| parent | 54e0f001e9d6348231964d7d72899eb8e9e0fb87 (diff) | |
Selection fix
Now works for Qt Quick 2 as well. It seems alpha channel gets messed up if
it's not forced to 1.0.
Change-Id: Ia0b5474ac774f9cb0f5412a7b0e7b19a2064d624
Change-Id: Ia0b5474ac774f9cb0f5412a7b0e7b19a2064d624
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/datavis3d/engine/shaders')
| -rw-r--r-- | src/datavis3d/engine/shaders/colorOnY_ES2.frag | 1 | ||||
| -rw-r--r-- | src/datavis3d/engine/shaders/selection.frag | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/datavis3d/engine/shaders/colorOnY_ES2.frag b/src/datavis3d/engine/shaders/colorOnY_ES2.frag index dd7c0cf3..68c8ac39 100644 --- a/src/datavis3d/engine/shaders/colorOnY_ES2.frag +++ b/src/datavis3d/engine/shaders/colorOnY_ES2.frag @@ -31,5 +31,6 @@ void main() { materialAmbientColor + materialDiffuseColor * lightStrength * (cosTheta * cosTheta) / (distance * distance) + materialSpecularColor * lightStrength * (cosAlpha * cosAlpha * cosAlpha * cosAlpha * cosAlpha) / (distance * distance); + gl_FragColor.a = 1.0; } diff --git a/src/datavis3d/engine/shaders/selection.frag b/src/datavis3d/engine/shaders/selection.frag index 1658b316..099c87a1 100644 --- a/src/datavis3d/engine/shaders/selection.frag +++ b/src/datavis3d/engine/shaders/selection.frag @@ -2,5 +2,6 @@ uniform highp vec3 color_mdl; void main() { gl_FragColor.rgb = color_mdl; + gl_FragColor.a = 1.0; } |