From 79f9108f344172c2d21491a0f52b8269ec8b8df8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Ml=C3=A1dek?= Date: Sat, 11 Sep 2021 23:51:22 +0200 Subject: [PATCH] autoformat --- src/collages.ts | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/collages.ts b/src/collages.ts index 3f7cae7..95d6650 100644 --- a/src/collages.ts +++ b/src/collages.ts @@ -11,14 +11,14 @@ export const collageModeType = [ export type CollageModeType = typeof collageModeType[number]; function cleanDraw(ctx: CanvasRenderingContext2D, image: ImageBitmap, - x: number, y: number, w: number, h: number) { + x: number, y: number, w: number, h: number) { const scaleRatio = Math.max(w / image.width, h / image.height); ctx.drawImage( - image, - image.width / 2 - w / scaleRatio / 2, image.height / 2 - h / scaleRatio / 2, - w / scaleRatio, h / scaleRatio, - x - w / 2, y - h / 2, - w, h + image, + image.width / 2 - w / scaleRatio / 2, image.height / 2 - h / scaleRatio / 2, + w / scaleRatio, h / scaleRatio, + x - w / 2, y - h / 2, + w, h ); } @@ -78,13 +78,13 @@ const modes: { [key in CollageModeType]: CollageMode } = { place: (ctx, images, segments) => { const shuffledImages = shuffle(images); shuffle(segments.map((segment, idx) => [segment, idx] as [Segment, number])) - .forEach(([segment, idx]) => { - const image = shuffledImages[idx]; - const scaleRatio = Math.max(segment.w / image.width, segment.h / image.height); - ctx.drawImage(image, - segment.x - (image.width * scaleRatio / 2), segment.y - (image.height * scaleRatio / 2), - image.width * scaleRatio, image.height * scaleRatio); - }); + .forEach(([segment, idx]) => { + const image = shuffledImages[idx]; + const scaleRatio = Math.max(segment.w / image.width, segment.h / image.height); + ctx.drawImage(image, + segment.x - (image.width * scaleRatio / 2), segment.y - (image.height * scaleRatio / 2), + image.width * scaleRatio, image.height * scaleRatio); + }); }, }, "row": { @@ -112,8 +112,8 @@ const modes: { [key in CollageModeType]: CollageMode } = { const segmentSize = [ctx.canvas.width / numImages, ctx.canvas.height]; return range(numImages).map((idx) => { const irregularWidth = images ? - segmentSize[0] + Math.random() * ((segmentSize[1] / images[idx].height * images[idx].width) - segmentSize[0]) : - segmentSize[0] + Math.random() * segmentSize[0] * .5; + segmentSize[0] + Math.random() * ((segmentSize[1] / images[idx].height * images[idx].width) - segmentSize[0]) : + segmentSize[0] + Math.random() * segmentSize[0] * .5; return { x: idx * segmentSize[0] + segmentSize[0] / 2, y: segmentSize[1] / 2, @@ -149,8 +149,8 @@ const modes: { [key in CollageModeType]: CollageMode } = { const segmentSize = [ctx.canvas.width, ctx.canvas.height / numImages]; return range(numImages).map((idx) => { const irregularHeight = images ? - segmentSize[1] + Math.random() * ((segmentSize[0] / images[idx].width * images[idx].height) - segmentSize[1]) : - segmentSize[1] + Math.random() * segmentSize[1] * .5; + segmentSize[1] + Math.random() * ((segmentSize[0] / images[idx].width * images[idx].height) - segmentSize[1]) : + segmentSize[1] + Math.random() * segmentSize[1] * .5; return { x: segmentSize[0] / 2, y: idx * segmentSize[1] + segmentSize[1] / 2,