From f2b10db05532b2bb7edd0c560a51ad0e052382b8 Mon Sep 17 00:00:00 2001 From: Orangerot Date: Sun, 8 Dec 2024 04:19:51 +0100 Subject: fix: scale image to viewport to not waste computation on pixels the user can't see --- index.html | 4 ++-- main.js | 31 ++++++++++++++++++++++--------- 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/index.html b/index.html index 048f3fb..3061e68 100644 --- a/index.html +++ b/index.html @@ -95,7 +95,7 @@ + min="0" max="1" value="0" step="0.05"> @@ -155,7 +155,7 @@ + min="0" max="1" value="0" step="0.05"> diff --git a/main.js b/main.js index d5580af..2e94bfe 100644 --- a/main.js +++ b/main.js @@ -5,7 +5,7 @@ let settings = { brightness: {}, saturate: {}, contrast: {}, - blur: {prefix: 'px'} + blur: {filter: value => value * canvas.width / 100 + 'px'} }; const img = new Image(); @@ -19,14 +19,17 @@ document.addEventListener("DOMContentLoaded", function() { document.getElementById("take-picture").addEventListener("click", take_picture); document.getElementById("upload-image").addEventListener("change", upload_image) - document.getElementById("save").addEventListener("click", save_image) document.getElementById("share").addEventListener("click", share_image) + window.addEventListener("resize", () => draw(true)) + for (let setting in settings) { // make an array out of an iterable const elements = [...document.getElementsByClassName(setting)]; settings[setting].elements = elements; + // if filter is not definded, use identity function + settings[setting].filter ||= value => value; for (let element of elements) { element.addEventListener("input", settings_apply); } @@ -46,14 +49,12 @@ function upload_image() { console.log(this.files[0]); img.src = URL.createObjectURL(this.files[0]); - img.onload = function() { - canvas.width = img.naturalWidth; - canvas.height = img.naturalHeight; - ctx.drawImage(img, 0, 0, canvas.width, canvas.height); - } + img.onload = () => draw(true); } function save_image() { + draw(false); + const dataUrl = canvas.toDataURL("image/png"); // downloading only works with links but not window.open const link = document.createElement('a'); @@ -76,12 +77,24 @@ function settings_apply(event) { element.value = new_value; } + draw(true); +} + +function draw(viewport_scale) { const filter = Object.entries(settings) - .map(([setting, {elements, prefix}]) => `${setting}(${elements[0].value}${prefix || ""})`) + .map(([setting, {elements, filter}]) => `${setting}(${filter(elements[0].value)})`) .join(" ") + // set the resolution to the original and then scale down to the viewport to + // only calculate the filter on pixels the user can see. + canvas.height = img.naturalHeight; + canvas.width = img.naturalWidth; + if (viewport_scale) { + canvas.height = canvas.clientHeight; + canvas.width = canvas.clientWidth; + } ctx.filter = filter console.log(filter); - ctx.drawImage(img, 0, 0, canvas.width, canvas.height); } + -- cgit v1.2.3