summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaviya Vivekkumar Dineshbhai <vivek.javiya@collabora.com>2024-07-05 20:18:45 +0530
committerSzymon Kłos <eszkadev@gmail.com>2024-07-05 18:07:13 +0200
commit7d66a62b6974a6808a348f7a064d44a0850fc053 (patch)
tree75f0d7b4ab232f292d841ac8bdf87b1bb7facc4a
parenttransition: Add Circle transition (diff)
downloadonline-7d66a62b6974a6808a348f7a064d44a0850fc053.tar.gz
online-7d66a62b6974a6808a348f7a064d44a0850fc053.zip
transition: Add Diamond transition
Signed-off-by: Javiya Vivekkumar Dineshbhai <vivek.javiya@collabora.com> Change-Id: I719ce3fe4c1615e88df680a2d7abedb039e13312
-rw-r--r--browser/Makefile.am2
-rw-r--r--browser/src/slideshow/PerformTransition.ts8
-rw-r--r--browser/src/slideshow/transition/DiamondTransition.ts74
3 files changed, 84 insertions, 0 deletions
diff --git a/browser/Makefile.am b/browser/Makefile.am
index cb89c7ada4..93651364da 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/DiamondTransition.ts\
src/slideshow/transition/CheckersTransition.ts \
src/slideshow/transition/BarsTransition.ts \
src/slideshow/transition/WheelTransition.ts \
@@ -859,6 +860,7 @@ pot:
src/slideshow/transition/FadeTransition.ts \
src/slideshow/transition/PlusTransition.ts \
src/slideshow/transition/CircleTransition.ts\
+ src/slideshow/transition/DiamondTransition.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 eabfee3fcc..2d31085038 100644
--- a/browser/src/slideshow/PerformTransition.ts
+++ b/browser/src/slideshow/PerformTransition.ts
@@ -79,6 +79,14 @@ SlideShow.PerformTransition = function (
image2,
).start();
break;
+
+ case 'DIAMOND':
+ new DiamondTransition(
+ canvas,
+ image1,
+ image2,
+ ).start();
+ break;
default:
console.error('Unknown transition type');
break;
diff --git a/browser/src/slideshow/transition/DiamondTransition.ts b/browser/src/slideshow/transition/DiamondTransition.ts
new file mode 100644
index 0000000000..b3687f2964
--- /dev/null
+++ b/browser/src/slideshow/transition/DiamondTransition.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 DiamondTransition extends SlideShow.Transition2d {
+ constructor(
+ canvas: HTMLCanvasElement,
+ image1: HTMLImageElement,
+ image2: HTMLImageElement,
+ ) {
+ super(canvas, image1, image2);
+ this.prepareTransition();
+ this.animationTime = 2000;
+ }
+
+
+ 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 = progress * 1.5;
+
+ float mask = step(dist.x + dist.y, size);
+
+ mask = min(mask, 1.0);
+
+ vec4 color1 = texture(leavingSlideTexture, uv);
+ vec4 color2 = texture(enteringSlideTexture, uv);
+
+ outColor = mix(color1, color2, mask);
+ }
+`;
+ }
+}