[Libreoffice-commits] core.git: slideshow/opengl
Tor Lillqvist
tml at collabora.com
Mon Oct 26 11:05:08 UTC 2015
slideshow/opengl/dissolveFragmentShader.glsl | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
New commits:
commit 8c84777c46bf0863b2fc01a547de8ba87805f5c8
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Oct 26 12:52:22 2015 +0200
Actually, the permTexture is 256*256 pixels
Change-Id: Ia32c98d8162f31a8ee0b0d0c1301ca204c9c3c87
diff --git a/slideshow/opengl/dissolveFragmentShader.glsl b/slideshow/opengl/dissolveFragmentShader.glsl
index adc4e16..c6e80e2 100644
--- a/slideshow/opengl/dissolveFragmentShader.glsl
+++ b/slideshow/opengl/dissolveFragmentShader.glsl
@@ -38,9 +38,7 @@ float snoise(vec2 P) {
}
void main() {
- // No idea why the multiplication by 10 (and not 16, which would seem more logical to me, as
- // the permTexture is 16*16 pixels in size).
- float sn = snoise(10.0*v_texturePosition);
+ float sn = snoise(256*v_texturePosition);
if( sn < time)
gl_FragColor = texture2D(enteringSlideTexture, v_texturePosition);
else
More information about the Libreoffice-commits
mailing list