From 5d87c039fb6541b91a665a1c07c2cf5d427ea80b Mon Sep 17 00:00:00 2001
From: kakkokari-gtyih <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Wed, 4 Jun 2025 13:32:09 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=E3=82=A6=E3=82=A9=E3=83=BC=E3=82=BF?=
 =?UTF-8?q?=E3=83=BC=E3=83=9E=E3=83=BC=E3=82=AF=E3=81=AEFX=E5=AE=9A?=
 =?UTF-8?q?=E7=BE=A9=E3=82=92=E5=88=86=E3=81=91=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/utility/image-effector/ImageEffector.ts    |  4 ++--
 .../frontend/src/utility/image-effector/fxs.ts     |  7 -------
 packages/frontend/src/utility/watermark.ts         | 14 ++++++++++++--
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/packages/frontend/src/utility/image-effector/ImageEffector.ts b/packages/frontend/src/utility/image-effector/ImageEffector.ts
index 319dada09a..80e3ff65de 100644
--- a/packages/frontend/src/utility/image-effector/ImageEffector.ts
+++ b/packages/frontend/src/utility/image-effector/ImageEffector.ts
@@ -230,7 +230,7 @@ export class ImageEffector<IEX extends ReadonlyArray<ImageEffectorFx<any, any, a
 			gl: gl,
 			program: shaderProgram,
 			params: Object.fromEntries(
-				Object.entries(fx.params).map(([key, param]) => {
+				Object.entries(fx.params as ImageEffectorFxParamDefs).map(([key, param]) => {
 					return [key, layer.params[key] ?? param.default];
 				}),
 			),
@@ -238,7 +238,7 @@ export class ImageEffector<IEX extends ReadonlyArray<ImageEffectorFx<any, any, a
 			width: this.renderWidth,
 			height: this.renderHeight,
 			textures: Object.fromEntries(
-				Object.entries(fx.params).map(([k, v]) => {
+				Object.entries(fx.params as ImageEffectorFxParamDefs).map(([k, v]) => {
 					if (v.type !== 'texture') return [k, null];
 					const param = getValue<typeof v.type>(layer.params, k);
 					if (param == null) return [k, null];
diff --git a/packages/frontend/src/utility/image-effector/fxs.ts b/packages/frontend/src/utility/image-effector/fxs.ts
index f391314abf..5887a68c43 100644
--- a/packages/frontend/src/utility/image-effector/fxs.ts
+++ b/packages/frontend/src/utility/image-effector/fxs.ts
@@ -35,10 +35,3 @@ export const FXS = [
 	FX_polkadot,
 	FX_checker,
 ] as const satisfies ImageEffectorFx<string, any>[];
-
-export const WATERMARK_FXS = [
-	FX_watermarkPlacement,
-	FX_stripe,
-	FX_polkadot,
-	FX_checker,
-] as const satisfies ImageEffectorFx<string, any>[];
diff --git a/packages/frontend/src/utility/watermark.ts b/packages/frontend/src/utility/watermark.ts
index a70e14d95d..f0b38684f0 100644
--- a/packages/frontend/src/utility/watermark.ts
+++ b/packages/frontend/src/utility/watermark.ts
@@ -3,10 +3,20 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { WATERMARK_FXS } from './image-effector/fxs.js';
-import type { ImageEffectorLayer } from '@/utility/image-effector/ImageEffector.js';
+import { FX_watermarkPlacement } from '@/utility/image-effector/fxs/watermarkPlacement.js';
+import { FX_stripe } from '@/utility/image-effector/fxs/stripe.js';
+import { FX_polkadot } from '@/utility/image-effector/fxs/polkadot.js';
+import { FX_checker } from '@/utility/image-effector/fxs/checker.js';
+import type { ImageEffectorFx, ImageEffectorLayer } from '@/utility/image-effector/ImageEffector.js';
 import { ImageEffector } from '@/utility/image-effector/ImageEffector.js';
 
+const WATERMARK_FXS = [
+	FX_watermarkPlacement,
+	FX_stripe,
+	FX_polkadot,
+	FX_checker,
+] as const satisfies ImageEffectorFx<string, any>[];
+
 export type WatermarkPreset = {
 	id: string;
 	name: string;