diff options
| author | Emmanuel Gil Peyrot <emmanuel.peyrot@collabora.com> | 2016-01-13 23:18:32 +0000 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2016-01-21 08:33:13 +0000 |
| commit | 76f7533d1bfd49179774a4a0948061b2b2c7939e (patch) | |
| tree | cc4806c9feb527b2b6cdf5430609bee35c560e20 /slideshow/opengl/glitterVertexShader.glsl | |
| parent | 3763ab42fa88d9f2a2248eba1854f3d97fcfbde8 (diff) | |
slideshow: Tweak a few constants to make Glitter and Honeycomb look nicer
Change-Id: I5dd15f3d483caaedbf58a7ad12bf24798694524f
(cherry picked from commit 0fe5a3069b83d6a5e83c6c4df5d874c8802b7f52)
Reviewed-on: https://gerrit.libreoffice.org/21644
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'slideshow/opengl/glitterVertexShader.glsl')
| -rw-r--r-- | slideshow/opengl/glitterVertexShader.glsl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/slideshow/opengl/glitterVertexShader.glsl b/slideshow/opengl/glitterVertexShader.glsl index 3704efdab90e..00ae568ac672 100644 --- a/slideshow/opengl/glitterVertexShader.glsl +++ b/slideshow/opengl/glitterVertexShader.glsl @@ -111,9 +111,9 @@ void main( void ) // Scale the transition time to minimize the time a tile will stay black. float transitionTime = clamp((time - startTime) / (endTime - startTime), 0.0, 1.0); if (transitionTime < 0.5) - transitionTime = transitionTime * 0.3 / 0.5; + transitionTime = transitionTime / 2.0; else - transitionTime = (transitionTime * 0.3 / 0.5) + 0.4; + transitionTime = (transitionTime / 2.0) + 0.5; angle = transitionTime * M_PI * 2.0; mat4 modelViewMatrix = u_modelViewMatrix * u_operationsTransformMatrix * u_sceneTransformMatrix * u_primitiveTransformMatrix; |