From b43dfa260b1416da153d28bcd46a8bcbce02c18d Mon Sep 17 00:00:00 2001 From: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com> Date: Wed, 4 Jun 2025 16:22:09 +0900 Subject: fix/refactor(frontend): 画像編集機能の修正・型強化 (#16156) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * enhance: refine uploadFile * fix: missing locale * refactor: harden types * refactor: シェーダーファイルをlazy-loadingできるように * fix(frontend): omit console.log in production environment * fix: glslのバージョン表記は最初の行になければならない * fix: シェーダーの読み込みが完了してからレンダリングを行うように * fix merge failure * fix: ウォーターマークのプリセットがない場合にdividerが2重に表示される問題を修正 * fix: アップローダーダイアログの機能設定でウォーターマークが無効な場合でもデフォルトのプリセットが適用されてしまう問題を修正 * fix lint * Revert "fix: シェーダーの読み込みが完了してからレンダリングを行うように" This reverts commit e06f37a7d453ca581858252eae422d8a9e470dc3. * Revert "fix: glslのバージョン表記は最初の行になければならない" This reverts commit afcc37d886106c4acd545e4c2922e67f94e1037b. * Revert "refactor: シェーダーファイルをlazy-loadingできるように" This reverts commit a1ab2fa38c2b7485c069f9cd089bc7de59416c9d. * fix: ウォーターマークのFX定義を分ける * Update packages/frontend/src/components/MkWatermarkEditorDialog.vue * Update packages/frontend/src/components/MkWatermarkEditorDialog.vue * Update packages/frontend/src/components/MkWatermarkEditorDialog.vue --------- Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com> --- .../frontend/src/utility/image-effector/ImageEffector.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'packages/frontend/src/utility/image-effector') diff --git a/packages/frontend/src/utility/image-effector/ImageEffector.ts b/packages/frontend/src/utility/image-effector/ImageEffector.ts index fe253017e5..80e3ff65de 100644 --- a/packages/frontend/src/utility/image-effector/ImageEffector.ts +++ b/packages/frontend/src/utility/image-effector/ImageEffector.ts @@ -57,7 +57,7 @@ function getValue(params: Record>> { private gl: WebGL2RenderingContext; private canvas: HTMLCanvasElement | null = null; private renderTextureProgram: WebGLProgram; @@ -70,7 +70,7 @@ export class ImageEffector { private shaderCache: Map = new Map(); private perLayerResultTextures: Map = new Map(); private perLayerResultFrameBuffers: Map = new Map(); - private fxs: ImageEffectorFx[]; + private fxs: [...IEX]; private paramTextures: Map = new Map(); constructor(options: { @@ -78,7 +78,7 @@ export class ImageEffector { renderWidth: number; renderHeight: number; image: ImageData | ImageBitmap | HTMLImageElement | HTMLCanvasElement; - fxs: ImageEffectorFx[]; + fxs: [...IEX]; }) { this.canvas = options.canvas; this.renderWidth = options.renderWidth; @@ -230,7 +230,7 @@ export class ImageEffector { 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 { 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(layer.params, k); if (param == null) return [k, null]; @@ -329,7 +329,7 @@ export class ImageEffector { unused.delete(textureKey); if (this.paramTextures.has(textureKey)) continue; - console.log(`Baking texture of <${textureKey}>...`); + if (_DEV_) console.log(`Baking texture of <${textureKey}>...`); const texture = v.type === 'text' ? await createTextureFromText(this.gl, v.text) : v.type === 'url' ? await createTextureFromUrl(this.gl, v.url) : null; if (texture == null) continue; @@ -339,7 +339,7 @@ export class ImageEffector { } for (const k of unused) { - console.log(`Dispose unused texture <${k}>...`); + if (_DEV_) console.log(`Dispose unused texture <${k}>...`); this.gl.deleteTexture(this.paramTextures.get(k)!.texture); this.paramTextures.delete(k); } -- cgit v1.2.3-freya