summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaviya Vivekkumar Dineshbhai <vivek.javiya@collabora.com>2024-07-05 20:26:23 +0530
committerSzymon Kłos <eszkadev@gmail.com>2024-07-05 18:07:13 +0200
commit109278d9d7b0d92bfccf4070357520a76ee50793 (patch)
treeebd1d8a18c4479018c86c0c27a49f19f88c42139
parenttransition: Add Diamond transition (diff)
downloadonline-109278d9d7b0d92bfccf4070357520a76ee50793.tar.gz
online-109278d9d7b0d92bfccf4070357520a76ee50793.zip
transition: Add Oval transition
Signed-off-by: Javiya Vivekkumar Dineshbhai <vivek.javiya@collabora.com> Change-Id: I4256fdf96383bf1ee9f7efb2fbc423d929fa8ea3
-rw-r--r--browser/Makefile.am2
-rw-r--r--browser/src/slideshow/PerformTransition.ts8
-rw-r--r--browser/src/slideshow/transition/OvalTransition.ts88
3 files changed, 98 insertions, 0 deletions
diff --git a/browser/Makefile.am b/browser/Makefile.am
index 93651364da..de829bc4a0 100644
--- a/browser/Makefile.am
+++ b/browser/Makefile.am
@@ -416,6 +416,7 @@ COOL_JS_LST =\
src/slideshow/transition/FadeTransition.ts \
src/slideshow/transition/PlusTransition.ts \
src/slideshow/transition/CircleTransition.ts\
+ src/slideshow/transition/OvalTransition.ts\
src/slideshow/transition/DiamondTransition.ts\
src/slideshow/transition/CheckersTransition.ts \
src/slideshow/transition/BarsTransition.ts \
@@ -860,6 +861,7 @@ pot:
src/slideshow/transition/FadeTransition.ts \
src/slideshow/transition/PlusTransition.ts \
src/slideshow/transition/CircleTransition.ts\
+ src/slideshow/transition/OvalTransition.ts\
src/slideshow/transition/DiamondTransition.ts\
src/slideshow/transition/CheckersTransition.ts \
src/slideshow/transition/BarsTransition.ts \
diff --git a/browser/src/slideshow/PerformTransition.ts b/browser/src/slideshow/PerformTransition.ts
index 2d31085038..1c1252af4a 100644
--- a/browser/src/slideshow/PerformTransition.ts
+++ b/browser/src/slideshow/PerformTransition.ts
@@ -87,6 +87,14 @@ SlideShow.PerformTransition = function (
image2,
).start();
break;
+
+ case 'OVAL':
+ new OvalTransition(
+ canvas,
+ image1,
+ image2,
+ ).start(1);
+ break;
default:
console.error('Unknown transition type');
break;
diff --git a/browser/src/slideshow/transition/OvalTransition.ts b/browser/src/slideshow/transition/OvalTransition.ts
new file mode 100644
index 0000000000..f1646fd6c3
--- /dev/null
+++ b/browser/src/slideshow/transition/OvalTransition.ts
@@ -0,0 +1,88 @@
+/*
+ * 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/.
+ */
+
+class OvalTransition extends Transition2d {
+ private direction: number = 0;
+ constructor(
+ canvas: HTMLCanvasElement,
+ image1: HTMLImageElement,
+ image2: HTMLImageElement,
+ ) {
+ super(canvas, image1, image2);
+ this.prepareTransition();
+ this.animationTime = 2000;
+ }
+
+ public renderUniformValue(): void {
+ this.gl.uniform1i(
+ this.gl.getUniformLocation(this.program, 'direction'),
+ this.direction,
+ );
+ }
+
+ public start(direction: number): void {
+ this.direction = direction;
+ 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;
+ uniform int direction;
+
+
+ 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);
+
+ if (direction == 1) {
+ dist.x *= 2.0;
+ } else {
+ dist.y *= 2.0;
+ }
+
+ float size = progress * 1.2;
+
+ float mask = step(length(dist), size);
+
+ mask = min(mask, 1.0);
+
+ vec4 color1 = texture(leavingSlideTexture, uv);
+ vec4 color2 = texture(enteringSlideTexture, uv);
+
+ outColor = mix(color1, color2, mask);
+ }
+ `;
+ }
+}