summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaviya Vivekkumar Dineshbhai <vivek.javiya@collabora.com>2024-07-05 20:12:24 +0530
committerSzymon Kłos <eszkadev@gmail.com>2024-07-05 18:07:13 +0200
commit2c5e0d660af37d8613156c35162cafaf69db7a8e (patch)
treefad56bd8126e2e743a6e8431c1b16ff3fa3bfc35
parenttransition: Add Plus transition (diff)
downloadonline-2c5e0d660af37d8613156c35162cafaf69db7a8e.tar.gz
online-2c5e0d660af37d8613156c35162cafaf69db7a8e.zip
transition: Add Circle transition
Signed-off-by: Javiya Vivekkumar Dineshbhai <vivek.javiya@collabora.com> Change-Id: Ib63ba32be40248d4f97ce8f3a601ddeebac0c5ee
-rw-r--r--browser/Makefile.am2
-rw-r--r--browser/src/slideshow/PerformTransition.ts9
-rw-r--r--browser/src/slideshow/transition/CircleTransition.ts74
3 files changed, 84 insertions, 1 deletions
diff --git a/browser/Makefile.am b/browser/Makefile.am
index c5d9b22cf5..cb89c7ada4 100644
--- a/browser/Makefile.am
+++ b/browser/Makefile.am
@@ -415,6 +415,7 @@ COOL_JS_LST =\
src/slideshow/PerformTransition.ts \
src/slideshow/transition/FadeTransition.ts \
src/slideshow/transition/PlusTransition.ts \
+ src/slideshow/transition/CircleTransition.ts\
src/slideshow/transition/CheckersTransition.ts \
src/slideshow/transition/BarsTransition.ts \
src/slideshow/transition/WheelTransition.ts \
@@ -857,6 +858,7 @@ pot:
src/slideshow/PerformTransition.ts \
src/slideshow/transition/FadeTransition.ts \
src/slideshow/transition/PlusTransition.ts \
+ src/slideshow/transition/CircleTransition.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 560b748db9..eabfee3fcc 100644
--- a/browser/src/slideshow/PerformTransition.ts
+++ b/browser/src/slideshow/PerformTransition.ts
@@ -71,7 +71,14 @@ SlideShow.PerformTransition = function (
image2,
).start();
break;
-
+
+ case 'CIRCLE':
+ new CircleTransition(
+ canvas,
+ image1,
+ image2,
+ ).start();
+ break;
default:
console.error('Unknown transition type');
break;
diff --git a/browser/src/slideshow/transition/CircleTransition.ts b/browser/src/slideshow/transition/CircleTransition.ts
new file mode 100644
index 0000000000..24adbbab64
--- /dev/null
+++ b/browser/src/slideshow/transition/CircleTransition.ts
@@ -0,0 +1,74 @@
+/*
+ * 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 CircleTransition extends SlideShow.Transition2d {
+ constructor(
+ canvas: HTMLCanvasElement,
+ image1: HTMLImageElement,
+ image2: HTMLImageElement,
+ ) {
+ super(canvas, image1, image2);
+ this.prepareTransition();
+ this.animationTime = 3000;
+ }
+
+
+ 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);
+
+ float dist = distance(uv, center);
+
+ float size = progress * 1.5;
+
+ float mask = step(dist, size);
+
+ mask = min(mask, 1.0);
+
+ vec4 color1 = texture(leavingSlideTexture, uv);
+ vec4 color2 = texture(enteringSlideTexture, uv);
+
+ outColor = mix(color1, color2, mask);
+ }
+ `;
+ }
+}