From fa2b60c06d0e0c957ba8e2403fd24e1cdad537df Mon Sep 17 00:00:00 2001 From: syuilo <4439005+syuilo@users.noreply.github.com> Date: Fri, 31 Oct 2025 09:20:13 +0900 Subject: [PATCH] wip --- locales/index.d.ts | 8 ++++++-- packages/frontend/src/composables/use-uploader.ts | 10 +++++----- packages/frontend/src/pages/settings/drive.vue | 2 +- .../frontend/src/utility/image-effector/fxs/frame.ts | 2 +- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/locales/index.d.ts b/locales/index.d.ts index a4e9bf41e8..9e2ca030b0 100644 --- a/locales/index.d.ts +++ b/locales/index.d.ts @@ -5605,13 +5605,17 @@ export interface Locale extends ILocale { * 技術的なお問い合わせの際に、以下の情報を併記すると問題の解決に役立つことがあります。 */ "deviceInfoDescription": string; + /** + * フレーム + */ + "frame": string; "_imageFrameEditor": { /** - * ラベルの編集 + * フレームの編集 */ "title": string; /** - * フレームの幅 + * フチの幅 */ "borderThickness": string; /** diff --git a/packages/frontend/src/composables/use-uploader.ts b/packages/frontend/src/composables/use-uploader.ts index 8e7a8f7ad9..1b14c8cc82 100644 --- a/packages/frontend/src/composables/use-uploader.ts +++ b/packages/frontend/src/composables/use-uploader.ts @@ -575,21 +575,21 @@ export function useUploader(options: { const exif = await ExifReader.load(await item.file.arrayBuffer()); - const labelRenderer = new ImageFrameRenderer({ + const frameRenderer = new ImageFrameRenderer({ canvas: canvas, image: await window.createImageBitmap(preprocessedFile), exif, }); - //await labelRenderer.update({ + //await frameRenderer.update({ // title: `${meta_model} + ${meta_lensModel}`, // text: `${date} ${meta_mm}mm f/${meta_f} ${meta_s}s ISO${meta_iso}`, //}); - await labelRenderer.updateAndRender({ + await frameRenderer.updateAndRender({ title: 'aaaaaaaaaaaaa', text: 'bbbbbbbbbbbbbbbbbbbb', }); - labelRenderer.render(); + frameRenderer.render(); preprocessedFile = await new Promise((resolve) => { canvas.toBlob((blob) => { @@ -597,7 +597,7 @@ export function useUploader(options: { throw new Error('Failed to convert canvas to blob'); } resolve(blob); - labelRenderer.destroy(); + frameRenderer.destroy(); }, 'image/png'); }); diff --git a/packages/frontend/src/pages/settings/drive.vue b/packages/frontend/src/pages/settings/drive.vue index 9609c86555..8cbad614da 100644 --- a/packages/frontend/src/pages/settings/drive.vue +++ b/packages/frontend/src/pages/settings/drive.vue @@ -346,7 +346,7 @@ async function addImageFramePreset() { const { dispose } = await os.popupAsyncWithDialog(import('@/components/MkImageFrameEditorDialog.vue').then(x => x.default), { }, { ok: (preset: any) => { - //prefer.commit('imageLabelPresets', [...prefer.s.imageLabelPresets, preset]); + //prefer.commit('imageFramePresets', [...prefer.s.imageFramePresets, preset]); }, closed: () => dispose(), }); diff --git a/packages/frontend/src/utility/image-effector/fxs/frame.ts b/packages/frontend/src/utility/image-effector/fxs/frame.ts index c3f50693de..79b7b66b07 100644 --- a/packages/frontend/src/utility/image-effector/fxs/frame.ts +++ b/packages/frontend/src/utility/image-effector/fxs/frame.ts @@ -4,7 +4,7 @@ */ import { defineImageEffectorFx } from '../ImageEffector.js'; -import shader from './label.glsl'; +import shader from './frame.glsl'; export const FX_frame = defineImageEffectorFx({ id: 'frame',