summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaviya Vivekkumar Dineshbhai <vivek.javiya@collabora.com>2024-07-05 20:05:19 +0530
committerSzymon Kłos <eszkadev@gmail.com>2024-07-05 18:07:13 +0200
commit9622d7d60b9a24dc0442eddef2cb00899670af93 (patch)
tree6620186f7d560d9aac709d2dfad457f1ed4ab6fe
parenttransition: Add Checkers transition (diff)
downloadonline-9622d7d60b9a24dc0442eddef2cb00899670af93.tar.gz
online-9622d7d60b9a24dc0442eddef2cb00899670af93.zip
transition: Add Plus transition
Signed-off-by: Javiya Vivekkumar Dineshbhai <vivek.javiya@collabora.com> Change-Id: I3c3d6b68a4487d2f7b7d5f7c767802e8ed94e792
-rw-r--r--browser/Makefile.am2
-rw-r--r--browser/src/slideshow/PerformTransition.ts8
-rw-r--r--browser/src/slideshow/transition/PlusTransition.ts73
3 files changed, 83 insertions, 0 deletions
diff --git a/browser/Makefile.am b/browser/Makefile.am
index 80ca287042..c5d9b22cf5 100644
--- a/browser/Makefile.am
+++ b/browser/Makefile.am
@@ -414,6 +414,7 @@ COOL_JS_LST =\
src/slideshow/Transition2d.ts \
src/slideshow/PerformTransition.ts \
src/slideshow/transition/FadeTransition.ts \
+ src/slideshow/transition/PlusTransition.ts \
src/slideshow/transition/CheckersTransition.ts \
src/slideshow/transition/BarsTransition.ts \
src/slideshow/transition/WheelTransition.ts \
@@ -855,6 +856,7 @@ pot:
src/slideshow/Transition2d.ts \
src/slideshow/PerformTransition.ts \
src/slideshow/transition/FadeTransition.ts \
+ src/slideshow/transition/PlusTransition.ts \
src/slideshow/transition/CheckersTransition.ts \
src/slideshow/transition/BarsTransition.ts \
src/slideshow/transition/WheelTransition.ts \
diff --git a/browser/src/slideshow/PerformTransition.ts b/browser/src/slideshow/PerformTransition.ts
index c855e4003c..560b748db9 100644
--- a/browser/src/slideshow/PerformTransition.ts
+++ b/browser/src/slideshow/PerformTransition.ts
@@ -64,6 +64,14 @@ SlideShow.PerformTransition = function (
).start(1);
break;
+ case 'PLUS':
+ new PlusTransition(
+ canvas,
+ image1,
+ image2,
+ ).start();
+ break;
+
default:
console.error('Unknown transition type');
break;
diff --git a/browser/src/slideshow/transition/PlusTransition.ts b/browser/src/slideshow/transition/PlusTransition.ts
new file mode 100644
index 0000000000..2f87d8fa30
--- /dev/null
+++ b/browser/src/slideshow/transition/PlusTransition.ts
@@ -0,0 +1,73 @@
+/*
+ * Copyright the Collabora Online contributors.
+ *
+ * SPDX-License-Identifier: MPL-2.0
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+declare var SlideShow: any;
+
+class PlusTransition extends SlideShow.Transition2d {
+ constructor(
+ canvas: HTMLCanvasElement,
+ image1: HTMLImageElement,
+ image2: HTMLImageElement,
+ ) {
+ super(canvas, image1, image2);
+ this.prepareTransition();
+ this.animationTime = 1500;
+ }
+
+
+ public start(): void {
+ this.startTransition();
+ }
+
+ public getVertexShader(): string {
+ return `#version 300 es
+ in vec4 a_position;
+ in vec2 a_texCoord;
+ out vec2 v_texCoord;
+
+ void main() {
+ gl_Position = a_position;
+ v_texCoord = a_texCoord;
+ }
+ `;
+ }
+
+ public getFragmentShader(): string {
+ return `#version 300 es
+ precision mediump float;
+
+ uniform sampler2D leavingSlideTexture;
+ uniform sampler2D enteringSlideTexture;
+ uniform float time;
+
+ in vec2 v_texCoord;
+ out vec4 outColor;
+
+ void main() {
+ vec2 uv = v_texCoord;
+ float progress = time;
+
+ vec2 center = vec2(0.5, 0.5);
+
+ vec2 dist = abs(uv - center);
+
+ float size = (1.0 - progress) * 2.0;
+
+ float mask = step(dist.x, size / 5.0) + step(dist.y, size / 5.0);
+
+ mask = min(mask, 1.0);
+
+ vec4 color1 = texture(leavingSlideTexture, uv);
+ vec4 color2 = texture(enteringSlideTexture, uv);
+
+ outColor = mix(color2, color1, mask);
+ }`;
+ }
+}