refactor(slideshow): extract color uniform logic into computeColor

Signed-off-by: codewithvk <vivek.javiya@collabora.com>
Change-Id: I5fe84e0fed6f8fec09901b1a7b6351c2768ed4b0

Author: codewithvk

browser/src/slideshow/LayerRenderer.ts

@@ -31,6 +31,15 @@ interface LayerRenderer {
 	getRenderContext(): RenderContext;
 }
 
+interface RenderUniforms {
+	bounds: BoundsType | null;
+	alpha: number;
+	fromFillColor: Float32Array;
+	toFillColor: Float32Array;
+	fromLineColor: Float32Array;
+	toLineColor: Float32Array;
+}
+
 class LayerRendererGl implements LayerRenderer {
 	private static readonly DefaultVertices = [-1, -1, 1, -1, -1, 1, 1, 1];
 	private static readonly DefaultFromColor = new Float32Array([0, 0, 0, 0]);
@@ -178,19 +187,9 @@ class LayerRendererGl implements LayerRenderer {
 		}
 	}
 
-	drawBitmap(
-		imageInfo: ImageInfo | ImageBitmap,
+	public static computeColor(
 		properties?: AnimatedElementRenderProperties,
-	): void {
-		if (this.disposed) {
-			console.log('LayerRenderer is disposed');
-			return;
-		}
-		if (!imageInfo) {
-			console.log('LayerRenderer.drawBitmap: no image');
-			return;
-		}
-
+	): RenderUniforms {
 		let bounds: BoundsType = null;
 		let alpha = 1.0;
 		let fromFillColor = LayerRendererGl.DefaultFromColor;
@@ -212,6 +211,37 @@ class LayerRendererGl implements LayerRenderer {
 				}
 			}
 		}
+		return {
+			bounds,
+			alpha,
+			fromFillColor,
+			toFillColor,
+			fromLineColor,
+			toLineColor,
+		};
+	}
+
+	drawBitmap(
+		imageInfo: ImageInfo | ImageBitmap,
+		properties?: AnimatedElementRenderProperties,
+	): void {
+		if (this.disposed) {
+			console.log('LayerRenderer is disposed');
+			return;
+		}
+		if (!imageInfo) {
+			console.log('LayerRenderer.drawBitmap: no image');
+			return;
+		}
+
+		const {
+			bounds,
+			alpha,
+			fromFillColor,
+			toFillColor,
+			fromLineColor,
+			toLineColor,
+		} = LayerRendererGl.computeColor(properties);
 
 		let texture: WebGLTexture;
 		let textureKey: string;

browser/src/slideshow/Transition2d.ts

@@ -183,27 +183,15 @@ class Transition2d extends TransitionBase {
 				0,
 			);
 		} else {
-			let bounds: BoundsType = null;
-			let alpha = 1.0;
-			let fromFillColor = Transition2d.DefaultFromColor;
-			let toFillColor = Transition2d.DefaultToColor;
-			let fromLineColor = Transition2d.DefaultFromColor;
-			let toLineColor = Transition2d.DefaultToColor;
-			if (properties) {
-				bounds = properties.bounds;
-				alpha = properties.alpha;
-				const colorMap = properties.colorMap;
-				if (colorMap) {
-					if (colorMap.fromFillColor && colorMap.toFillColor) {
-						fromFillColor = colorMap.fromFillColor.toFloat32Array();
-						toFillColor = colorMap.toFillColor.toFloat32Array();
-					}
-					if (colorMap.fromLineColor && colorMap.toLineColor) {
-						fromLineColor = colorMap.fromLineColor.toFloat32Array();
-						toLineColor = colorMap.toLineColor.toFloat32Array();
-					}
-				}
-			}
+			const {
+				bounds,
+				alpha,
+				fromFillColor,
+				toFillColor,
+				fromLineColor,
+				toLineColor,
+			} = LayerRendererGl.computeColor(properties);
+
 			console.debug(`Transition2d.render: alpha: ${alpha}`);
 
 			this.setPositionBuffer(bounds);