From 01aa95aaf993ada03456d040ca534a6aa181ac95 Mon Sep 17 00:00:00 2001 From: syuilo <4439005+syuilo@users.noreply.github.com> Date: Tue, 16 Sep 2025 17:14:46 +0900 Subject: [PATCH 1/9] wip --- locales/index.d.ts | 8 ++ locales/ja-JP.yml | 2 + .../src/utility/image-effector/fxs.ts | 2 + .../utility/image-effector/fxs/fillSquare.ts | 122 ++++++++++++++++++ 4 files changed, 134 insertions(+) create mode 100644 packages/frontend/src/utility/image-effector/fxs/fillSquare.ts diff --git a/locales/index.d.ts b/locales/index.d.ts index 23f0d88a37..ee808bfa77 100644 --- a/locales/index.d.ts +++ b/locales/index.d.ts @@ -12378,6 +12378,10 @@ export interface Locale extends ILocale { * ティアリング */ "tearing": string; + /** + * 塗りつぶし(四角) + */ + "fillSquare": string; }; "_fxProps": { /** @@ -12392,6 +12396,10 @@ export interface Locale extends ILocale { * サイズ */ "size": string; + /** + * 位置 + */ + "offset": string; /** * 色 */ diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 3b8f4443b1..322ff3ab2f 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -3314,11 +3314,13 @@ _imageEffector: checker: "チェッカー" blockNoise: "ブロックノイズ" tearing: "ティアリング" + fillSquare: "塗りつぶし(四角)" _fxProps: angle: "角度" scale: "サイズ" size: "サイズ" + offset: "位置" color: "色" opacity: "不透明度" normalize: "正規化" diff --git a/packages/frontend/src/utility/image-effector/fxs.ts b/packages/frontend/src/utility/image-effector/fxs.ts index 1fa48aea15..43e10a22fc 100644 --- a/packages/frontend/src/utility/image-effector/fxs.ts +++ b/packages/frontend/src/utility/image-effector/fxs.ts @@ -18,6 +18,7 @@ import { FX_stripe } from './fxs/stripe.js'; import { FX_threshold } from './fxs/threshold.js'; import { FX_zoomLines } from './fxs/zoomLines.js'; import { FX_blockNoise } from './fxs/blockNoise.js'; +import { FX_fillSquare } from './fxs/fillSquare.js'; import type { ImageEffectorFx } from './ImageEffector.js'; export const FXS = [ @@ -36,4 +37,5 @@ export const FXS = [ FX_chromaticAberration, FX_tearing, FX_blockNoise, + FX_fillSquare, ] as const satisfies ImageEffectorFx[]; diff --git a/packages/frontend/src/utility/image-effector/fxs/fillSquare.ts b/packages/frontend/src/utility/image-effector/fxs/fillSquare.ts new file mode 100644 index 0000000000..55b53830e0 --- /dev/null +++ b/packages/frontend/src/utility/image-effector/fxs/fillSquare.ts @@ -0,0 +1,122 @@ +/* + * SPDX-FileCopyrightText: syuilo and misskey-project + * SPDX-License-Identifier: AGPL-3.0-only + */ + +import { defineImageEffectorFx } from '../ImageEffector.js'; +import { i18n } from '@/i18n.js'; + +const shader = `#version 300 es +precision mediump float; + +const float PI = 3.141592653589793; +const float TWO_PI = 6.283185307179586; +const float HALF_PI = 1.5707963267948966; + +in vec2 in_uv; +uniform sampler2D in_texture; +uniform vec2 in_resolution; +uniform vec2 u_offset; +uniform vec2 u_scale; +uniform float u_angle; +uniform vec3 u_color; +uniform float u_opacity; +out vec4 out_color; + +void main() { + vec4 in_color = texture(in_texture, in_uv); + //float x_ratio = max(in_resolution.x / in_resolution.y, 1.0); + //float y_ratio = max(in_resolution.y / in_resolution.x, 1.0); + + float angle = -(u_angle * PI); + vec2 centeredUv = in_uv - vec2(0.5, 0.5) - u_offset; + vec2 rotatedUV = vec2( + centeredUv.x * cos(angle) - centeredUv.y * sin(angle), + centeredUv.x * sin(angle) + centeredUv.y * cos(angle) + ) + u_offset; + + bool isInside = rotatedUV.x > u_offset.x - u_scale.x && rotatedUV.x < u_offset.x + u_scale.x && rotatedUV.y > u_offset.y - u_scale.y && rotatedUV.y < u_offset.y + u_scale.y; + + out_color = isInside ? vec4( + mix(in_color.r, u_color.r, u_opacity), + mix(in_color.g, u_color.g, u_opacity), + mix(in_color.b, u_color.b, u_opacity), + in_color.a + ) : in_color; +} +`; + +export const FX_fillSquare = defineImageEffectorFx({ + id: 'fillSquare', + name: i18n.ts._imageEffector._fxs.fillSquare, + shader, + uniforms: ['offset', 'scale', 'angle', 'color', 'opacity'] as const, + params: { + offsetX: { + label: i18n.ts._imageEffector._fxProps.offset + ' X', + type: 'number', + default: 0.0, + min: -1.0, + max: 1.0, + step: 0.01, + toViewValue: v => Math.round(v * 100) + '%', + }, + offsetY: { + label: i18n.ts._imageEffector._fxProps.offset + ' Y', + type: 'number', + default: 0.0, + min: -1.0, + max: 1.0, + step: 0.01, + toViewValue: v => Math.round(v * 100) + '%', + }, + scaleX: { + label: i18n.ts._imageEffector._fxProps.scale + ' X', + type: 'number', + default: 0.5, + min: 0.0, + max: 1.0, + step: 0.01, + toViewValue: v => Math.round(v * 100) + '%', + }, + scaleY: { + label: i18n.ts._imageEffector._fxProps.scale + ' Y', + type: 'number', + default: 0.5, + min: 0.0, + max: 1.0, + step: 0.01, + toViewValue: v => Math.round(v * 100) + '%', + }, + angle: { + label: i18n.ts._imageEffector._fxProps.angle, + type: 'number', + default: 0, + min: -1.0, + max: 1.0, + step: 0.01, + toViewValue: v => Math.round(v * 90) + '°', + }, + color: { + label: i18n.ts._imageEffector._fxProps.color, + type: 'color', + default: [1, 1, 1], + }, + opacity: { + label: i18n.ts._imageEffector._fxProps.opacity, + type: 'number', + default: 1.0, + min: 0.0, + max: 1.0, + step: 0.01, + toViewValue: v => Math.round(v * 100) + '%', + }, + }, + main: ({ gl, u, params }) => { + gl.uniform2f(u.offset, params.offsetX / 2, params.offsetY / 2); + gl.uniform2f(u.scale, params.scaleX / 2, params.scaleY / 2); + gl.uniform1f(u.angle, params.angle / 2); + gl.uniform3f(u.color, params.color[0], params.color[1], params.color[2]); + gl.uniform1f(u.opacity, params.opacity); + }, +}); From 54f0e7eaf783d7497ee449aa418774e11811c50b Mon Sep 17 00:00:00 2001 From: syuilo <4439005+syuilo@users.noreply.github.com> Date: Tue, 16 Sep 2025 19:15:18 +0900 Subject: [PATCH 2/9] wip --- .../src/components/MkImageEffectorDialog.vue | 70 ++++++++++++++++++- 1 file changed, 69 insertions(+), 1 deletion(-) diff --git a/packages/frontend/src/components/MkImageEffectorDialog.vue b/packages/frontend/src/components/MkImageEffectorDialog.vue index 2c6185fd33..ab4ee024d1 100644 --- a/packages/frontend/src/components/MkImageEffectorDialog.vue +++ b/packages/frontend/src/components/MkImageEffectorDialog.vue @@ -19,9 +19,12 @@ SPDX-License-Identifier: AGPL-3.0-only
- +
{{ i18n.ts.preview }}
+
+ +
@@ -212,6 +215,59 @@ watch(enabled, () => { renderer.render(); } }); + +const fillSquare = ref(false); + +function onImagePointerdown(ev: PointerEvent) { + const PADDING = 20; + + let startX = ev.offsetX; + let startY = ev.offsetY; + + const xRatio = Math.max(imageBitmap!.width / imageBitmap!.height, 1); + const yRatio = Math.max(imageBitmap!.height / imageBitmap!.width, 1); + + startX = (startX - PADDING) / ((canvasEl.value!.clientWidth / yRatio) - (PADDING * 2)); + startY = (startY - PADDING) / ((canvasEl.value!.clientHeight / xRatio) - (PADDING * 2)); + + const id = genId(); + layers.push({ + id, + fxId: 'fillSquare', + params: { + offsetX: 0, + offsetY: 0, + scaleX: 0.1, + scaleY: 0.1, + angle: 0, + opacity: 1, + color: [1, 1, 1], + }, + }); + + canvasEl.value!.onpointermove = (ev) => { + let x = ev.offsetX; + let y = ev.offsetY; + x = (x - PADDING) / ((canvasEl.value!.clientWidth / yRatio) - (PADDING * 2)); + y = (y - PADDING) / ((canvasEl.value!.clientHeight / xRatio) - (PADDING * 2)); + + const scaleX = Math.abs(x - startX); + const scaleY = Math.abs(y - startY); + x = (x + startX) / 2; + y = (y + startY) / 2; + + const layerIndex = layers.findIndex((l) => l.id === id); + const layer = layerIndex !== -1 ? layers[layerIndex] : null; + if (layer != null) { + layer.params.offsetX = (x * 2) - 1; + layer.params.offsetY = (y * 2) - 1; + layer.params.scaleX = scaleX; + layer.params.scaleY = scaleY; + layers[layerIndex] = layer; + } + }; + canvasEl.value!.setPointerCapture(ev.pointerId); +}