diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-05-21 13:50:19 +0300 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-05-22 06:40:33 +0300 |
| commit | 2fa772a324612d30d2374510e5acd424f5a76e52 (patch) | |
| tree | 248f758a23d6d3789bdd75c2e383b9f2c65466bb /src/datavis3d/engine/shaders | |
| parent | 172dee54625d75007502b29314d872451a9053b0 (diff) | |
Transparent background texture support + selection color improvement
Transparency is now supported in background textures.
Q3DMaps: Selection supports now 16777215 objects (yes, one less than 16M).
Change-Id: Ie6b7819a19b94bbc1b903a80587f4d919aca9aaf
Change-Id: Ie6b7819a19b94bbc1b903a80587f4d919aca9aaf
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/datavis3d/engine/shaders')
| -rw-r--r-- | src/datavis3d/engine/shaders/fragmentShadow | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/datavis3d/engine/shaders/fragmentShadow b/src/datavis3d/engine/shaders/fragmentShadow index 5f3ee665..919cedee 100644 --- a/src/datavis3d/engine/shaders/fragmentShadow +++ b/src/datavis3d/engine/shaders/fragmentShadow @@ -78,5 +78,5 @@ void main() { visibility * (materialAmbientColor + materialDiffuseColor * lightStrength * cosTheta + materialSpecularColor * lightStrength * pow(cosAlpha, 10)); - gl_FragColor.a = 1.0; + gl_FragColor.a = texture2D(textureSampler, UV).a; } |