From 7ca5d4dc6b2570324901903f73d34fc79d652158 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Fri, 31 Dec 2010 12:32:43 +0100 Subject: [PATCH] Fade in/out cube caps during start/stop animation. --- effects/cube/cube.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/effects/cube/cube.cpp b/effects/cube/cube.cpp index 943a766143..ea9dff36db 100644 --- a/effects/cube/cube.cpp +++ b/effects/cube/cube.cpp @@ -900,7 +900,13 @@ void CubeEffect::paintCap(bool frontFirst, float zOffset) if (ShaderManager::instance()->isValid() && m_capShader->isValid()) { capShader = true; ShaderManager::instance()->pushShader(m_capShader); - m_capShader->setUniform("u_opacity", cubeOpacity); + float opacity = cubeOpacity; + if (start) { + opacity *= timeLine.value(); + } else if (stop) { + opacity *= (1.0 - timeLine.value()); + } + m_capShader->setUniform("u_opacity", opacity); m_capShader->setUniform("u_mirror", 1); if (reflectionPainting) { m_capShader->setUniform("screenTransformation", m_reflectionMatrix*m_rotationMatrix);