1.0.1: target size for GIF / APNG / APNG preview
Frame-based exports (GIF, APNG, APNG-preview) accept an optional target output size. ExportDialog exposes it as a single width input above the three image-export rows; height is derived live from the scene's aspect ratio so the user can't squash the output. The preview HTML mirrors the target dims so a downsized export previews at its real pixel size. renderFrames takes targetWidth / targetHeight, sizes its canvas accordingly and scales the ctx once; drawSceneFrame's own save/restore preserves the transform across frames, including the top-level-mask offscreen compositing path. Target width on dialog open is inherited from the current scene.canvas — watched via modelValue so resizing the stage and reopening the dialog picks up the new size (instead of the stale value from whenever ExportDialog first instantiated). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
1 parent
c2b81b0fb4
commit
cd9cf91ef0
7 files changed
+374
-26
No files matched your search
+1
-1
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "ruwio",
|
||||
"private": true,
|
||||
"version": "1.0.0",
|
||||
"version": "1.0.1",
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"dev": "vite",
|
||||
|
||||
+169
-17
@@ -1,5 +1,5 @@
|
||||
<script setup lang="ts">
|
||||
import { computed, ref } from 'vue'
|
||||
import { computed, ref, watch } from 'vue'
|
||||
import {
|
||||
PhCode,
|
||||
PhDownloadSimple,
|
||||
@@ -19,7 +19,7 @@ import type { ButtonAsset, Layer } from '@/types/scene'
|
||||
import { Modal } from '@/components/ui'
|
||||
import { t } from '@/i18n'
|
||||
|
||||
defineProps<{ modelValue: boolean }>()
|
||||
const props = defineProps<{ modelValue: boolean }>()
|
||||
const emit = defineEmits<{ 'update:modelValue': [value: boolean] }>()
|
||||
|
||||
const store = useSceneStore()
|
||||
@@ -40,6 +40,52 @@ const videoSupported = pickMimeType() !== null
|
||||
// explicitly asks for it. Applies to every format below.
|
||||
const skipHidden = ref(false)
|
||||
|
||||
// Target output size for frame-based formats (GIF, APNG, APNG
|
||||
// preview). The user enters a width; the height is derived from the
|
||||
// scene's aspect ratio so the export never squashes the content.
|
||||
const targetWidth = ref(Math.max(1, Math.round(store.scene.canvas.width)))
|
||||
|
||||
const targetHeight = computed(() => {
|
||||
const sw = store.scene.canvas.width
|
||||
const sh = store.scene.canvas.height
|
||||
if (sw <= 0 || sh <= 0) return targetWidth.value
|
||||
return Math.max(1, Math.round((targetWidth.value * sh) / sw))
|
||||
})
|
||||
|
||||
const targetSizeChanged = computed(
|
||||
() =>
|
||||
targetWidth.value !== Math.round(store.scene.canvas.width) ||
|
||||
targetHeight.value !== Math.round(store.scene.canvas.height),
|
||||
)
|
||||
|
||||
function resetTargetSize() {
|
||||
targetWidth.value = Math.max(1, Math.round(store.scene.canvas.width))
|
||||
}
|
||||
|
||||
// Every time the dialog re-opens, inherit the CURRENT document
|
||||
// canvas size. Without this, a user who resized the stage after
|
||||
// first opening the dialog would keep seeing the stale value from
|
||||
// whenever ExportDialog originally instantiated.
|
||||
watch(
|
||||
() => props.modelValue,
|
||||
(open) => {
|
||||
if (open) resetTargetSize()
|
||||
},
|
||||
)
|
||||
|
||||
/** Shared render options for GIF / APNG / APNG-preview. Only sends
|
||||
* target dimensions when they actually differ from the scene's own
|
||||
* size so a same-size export keeps the old no-scaling code path. */
|
||||
function frameExportOpts(controller: AbortController, onProg: (p: number) => void) {
|
||||
const base = { signal: controller.signal, onProgress: onProg }
|
||||
if (!targetSizeChanged.value) return base
|
||||
return {
|
||||
...base,
|
||||
targetWidth: targetWidth.value,
|
||||
targetHeight: targetHeight.value,
|
||||
}
|
||||
}
|
||||
|
||||
const hasHiddenLayers = computed(() => {
|
||||
if (store.scene.layers.some((l) => l.editorHidden)) return true
|
||||
if (store.scene.clipTracks?.some((t) => t.editorHidden)) return true
|
||||
@@ -174,12 +220,12 @@ async function exportGif() {
|
||||
}
|
||||
store.pause()
|
||||
try {
|
||||
await downloadSceneAsGif(activeSceneClone(), {
|
||||
signal: controller.signal,
|
||||
onProgress: (p) => {
|
||||
await downloadSceneAsGif(
|
||||
activeSceneClone(),
|
||||
frameExportOpts(controller, (p) => {
|
||||
if (progress.value) progress.value.progress = p
|
||||
},
|
||||
})
|
||||
}),
|
||||
)
|
||||
progress.value = null
|
||||
emit('update:modelValue', false)
|
||||
} catch (err) {
|
||||
@@ -202,12 +248,12 @@ async function exportApng() {
|
||||
}
|
||||
store.pause()
|
||||
try {
|
||||
await downloadSceneAsApng(activeSceneClone(), {
|
||||
signal: controller.signal,
|
||||
onProgress: (p) => {
|
||||
await downloadSceneAsApng(
|
||||
activeSceneClone(),
|
||||
frameExportOpts(controller, (p) => {
|
||||
if (progress.value) progress.value.progress = p
|
||||
},
|
||||
})
|
||||
}),
|
||||
)
|
||||
progress.value = null
|
||||
emit('update:modelValue', false)
|
||||
} catch (err) {
|
||||
@@ -230,12 +276,12 @@ async function exportApngPreview() {
|
||||
}
|
||||
store.pause()
|
||||
try {
|
||||
await downloadSceneAsApngPreview(activeSceneClone(), {
|
||||
signal: controller.signal,
|
||||
onProgress: (p) => {
|
||||
await downloadSceneAsApngPreview(
|
||||
activeSceneClone(),
|
||||
frameExportOpts(controller, (p) => {
|
||||
if (progress.value) progress.value.progress = p
|
||||
},
|
||||
})
|
||||
}),
|
||||
)
|
||||
progress.value = null
|
||||
emit('update:modelValue', false)
|
||||
} catch (err) {
|
||||
@@ -379,6 +425,33 @@ function onUpdate(v: boolean) {
|
||||
<PhDownloadSimple :size="14" class="opt-arrow" />
|
||||
</button>
|
||||
|
||||
<div class="target-size">
|
||||
<div class="target-size-label">{{ t('export.targetSize') }}</div>
|
||||
<label class="target-size-input">
|
||||
<span class="target-size-tag">W</span>
|
||||
<input
|
||||
type="number"
|
||||
min="1"
|
||||
step="1"
|
||||
:value="targetWidth"
|
||||
@input="targetWidth = Math.max(1, Math.round(Number(($event.target as HTMLInputElement).value) || 1))"
|
||||
/>
|
||||
</label>
|
||||
<span class="target-size-times">×</span>
|
||||
<div class="target-size-derived">
|
||||
{{ targetHeight }}
|
||||
<span class="target-size-tag">H</span>
|
||||
</div>
|
||||
<button
|
||||
v-if="targetSizeChanged"
|
||||
class="target-size-reset"
|
||||
v-tooltip="t('export.targetSizeReset')"
|
||||
@click="resetTargetSize"
|
||||
>
|
||||
{{ t('export.targetSizeResetLabel') }}
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<button class="opt" @click="exportGif">
|
||||
<div class="opt-icon"><PhGif :size="20" /></div>
|
||||
<div class="opt-text">
|
||||
@@ -531,6 +604,85 @@ function onUpdate(v: boolean) {
|
||||
transform: translateX(14px);
|
||||
}
|
||||
|
||||
.target-size {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
padding: 10px 12px;
|
||||
background: var(--panel-alt);
|
||||
border: 1px solid var(--border);
|
||||
border-radius: var(--radius);
|
||||
color: var(--text);
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
.target-size-label {
|
||||
flex-shrink: 0;
|
||||
font-weight: 500;
|
||||
color: var(--text-dim);
|
||||
}
|
||||
|
||||
.target-size-input,
|
||||
.target-size-derived {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 4px;
|
||||
padding: 4px 6px;
|
||||
background: var(--panel);
|
||||
border: 1px solid var(--border);
|
||||
border-radius: var(--radius-sm);
|
||||
min-width: 82px;
|
||||
}
|
||||
|
||||
.target-size-input input {
|
||||
background: transparent;
|
||||
border: 0;
|
||||
color: var(--text);
|
||||
font: inherit;
|
||||
font-variant-numeric: tabular-nums;
|
||||
width: 56px;
|
||||
text-align: right;
|
||||
padding: 0;
|
||||
outline: none;
|
||||
}
|
||||
|
||||
.target-size-input input:focus {
|
||||
outline: none;
|
||||
}
|
||||
|
||||
.target-size-tag {
|
||||
font-size: 10px;
|
||||
color: var(--text-dim);
|
||||
text-transform: uppercase;
|
||||
letter-spacing: 0.03em;
|
||||
}
|
||||
|
||||
.target-size-times {
|
||||
color: var(--text-dim);
|
||||
}
|
||||
|
||||
.target-size-derived {
|
||||
color: var(--text-dim);
|
||||
font-variant-numeric: tabular-nums;
|
||||
justify-content: flex-end;
|
||||
}
|
||||
|
||||
.target-size-reset {
|
||||
margin-left: auto;
|
||||
padding: 4px 8px;
|
||||
background: var(--panel);
|
||||
border: 1px solid var(--border);
|
||||
color: var(--text-dim);
|
||||
font-size: 11px;
|
||||
border-radius: var(--radius-sm);
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.target-size-reset:hover {
|
||||
border-color: var(--border-strong);
|
||||
color: var(--text);
|
||||
}
|
||||
|
||||
.opt {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
||||
@@ -1309,6 +1309,100 @@ export function registerAllTests(): void {
|
||||
})
|
||||
})
|
||||
|
||||
suite('export — target size scaling', () => {
|
||||
// The GIF/APNG/APNG-preview pipeline scales to a caller-specified
|
||||
// canvas size while preserving the scene's composition. The
|
||||
// ExportDialog UI derives height from width so aspect stays
|
||||
// locked; this suite verifies the underlying renderer honours
|
||||
// targetWidth/Height directly.
|
||||
|
||||
test('renderFrames scales the canvas to targetWidth/targetHeight', async () => {
|
||||
const { renderFrames } = await import('@/lib/frameExport')
|
||||
const s = makeFreshStore()
|
||||
s.setDuration(0.25)
|
||||
s.project.fps = 4
|
||||
s.scene.canvas.width = 20
|
||||
s.scene.canvas.height = 10
|
||||
let lastWidth = 0
|
||||
let lastHeight = 0
|
||||
await renderFrames(
|
||||
s.scene,
|
||||
({ width, height }) => {
|
||||
lastWidth = width
|
||||
lastHeight = height
|
||||
},
|
||||
{ targetWidth: 200, targetHeight: 100 },
|
||||
)
|
||||
expect(lastWidth).toBe(200)
|
||||
expect(lastHeight).toBe(100)
|
||||
})
|
||||
|
||||
test('renderFrames at target size draws content scaled into the new pixel grid', async () => {
|
||||
// A full-canvas coloured rect should cover the entire target
|
||||
// canvas when we 4x the output. Picks a centre pixel to verify
|
||||
// the fill colour came through (and isn't cleared or clipped).
|
||||
const { renderFrames } = await import('@/lib/frameExport')
|
||||
const s = makeFreshStore()
|
||||
s.setDuration(0.25)
|
||||
s.project.fps = 4
|
||||
s.scene.canvas.width = 10
|
||||
s.scene.canvas.height = 10
|
||||
s.scene.canvas.background = 'transparent'
|
||||
const a = s.addAsset({ kind: 'rect', name: 'R', width: 10, height: 10, fill: '#ff0000' })
|
||||
const l = s.addLayer(a.id)!
|
||||
s.upsertKeyframe(l.id, 0, { x: 5, y: 5 })
|
||||
let px: Uint8ClampedArray | null = null
|
||||
await renderFrames(
|
||||
s.scene,
|
||||
({ ctx, width, height }) => {
|
||||
px = ctx.getImageData(Math.floor(width / 2), Math.floor(height / 2), 1, 1).data
|
||||
void width
|
||||
void height
|
||||
},
|
||||
{ targetWidth: 40, targetHeight: 40 },
|
||||
)
|
||||
expect(px).toBeTruthy()
|
||||
expect(px![0]).toBeGreaterThan(200) // red
|
||||
expect(px![3]).toBeGreaterThan(200) // alpha
|
||||
})
|
||||
|
||||
test('renderSceneToApng honours targetWidth + targetHeight', async () => {
|
||||
const s = makeFreshStore()
|
||||
s.setDuration(0.25)
|
||||
s.project.fps = 4
|
||||
s.scene.canvas.width = 20
|
||||
s.scene.canvas.height = 10
|
||||
const blob = await renderSceneToApng(s.scene, {
|
||||
targetWidth: 80,
|
||||
targetHeight: 40,
|
||||
})
|
||||
expect(blob.type).toBe('image/png')
|
||||
// Decode the PNG header's IHDR to verify the encoded dimensions
|
||||
// match the target — the Uint8 offset layout is fixed per PNG
|
||||
// spec (magic[8] + length[4] + type[4] + width[4]).
|
||||
const bytes = new Uint8Array(await blob.arrayBuffer())
|
||||
const dv = new DataView(bytes.buffer)
|
||||
expect(dv.getUint32(16)).toBe(80)
|
||||
expect(dv.getUint32(20)).toBe(40)
|
||||
})
|
||||
|
||||
test('APNG preview page reflects targetWidth/Height, not the scene canvas', async () => {
|
||||
// downloadSceneAsApngPreview builds HTML + kicks off a download;
|
||||
// for the test we just reach into the underlying pipeline by
|
||||
// rendering the APNG separately and feeding the same (target)
|
||||
// dimensions to generateApngPreviewHtml. This guards against
|
||||
// anyone wiring the previewer to the scene's size directly
|
||||
// while ignoring the user's target override.
|
||||
const html = generateApngPreviewHtml(
|
||||
'data:image/png;base64,AAAA',
|
||||
640,
|
||||
360,
|
||||
)
|
||||
expect(html).toContain('width: 640px')
|
||||
expect(html).toContain('height: 360px')
|
||||
})
|
||||
})
|
||||
|
||||
suite('ui — ExportDialog', () => {
|
||||
// ExportDialog teleports through Modal so query through document
|
||||
// rather than the handle's host root. Each test snapshots the
|
||||
@@ -1346,6 +1440,86 @@ export function registerAllTests(): void {
|
||||
handle.unmount()
|
||||
})
|
||||
|
||||
test('target-size input defaults to the scene canvas and derives height from width', async () => {
|
||||
const s = makeFreshStore()
|
||||
s.scene.canvas.width = 1920
|
||||
s.scene.canvas.height = 1080
|
||||
const baseline = snapshotDialogs()
|
||||
const handle = mountComponent(ExportDialog, { modelValue: true })
|
||||
try {
|
||||
await nextTick()
|
||||
const dialog = dialogsAddedSince(baseline)[0]
|
||||
const input = dialog.querySelector(
|
||||
'.target-size input[type="number"]',
|
||||
) as HTMLInputElement
|
||||
expect(input).toBeTruthy()
|
||||
expect(Number(input.value)).toBe(1920)
|
||||
const derived = dialog.querySelector('.target-size-derived') as HTMLElement
|
||||
expect(derived.textContent).toContain('1080')
|
||||
// Change width to half — derived height must follow aspect
|
||||
// ratio (1080 * 960 / 1920 = 540).
|
||||
input.value = '960'
|
||||
input.dispatchEvent(new Event('input', { bubbles: true }))
|
||||
await nextTick()
|
||||
expect(derived.textContent).toContain('540')
|
||||
} finally {
|
||||
handle.unmount()
|
||||
}
|
||||
})
|
||||
|
||||
test('re-opening the dialog re-inherits the current document canvas size', async () => {
|
||||
// Regression: the target-width ref was only initialised at
|
||||
// setup() and never refreshed when the user resized the stage
|
||||
// before reopening. Watching modelValue resets it on each open
|
||||
// so the dialog always starts from the current document dims.
|
||||
const s = makeFreshStore()
|
||||
s.scene.canvas.width = 800
|
||||
s.scene.canvas.height = 600
|
||||
const baseline = snapshotDialogs()
|
||||
// Wrapper owns the `open` ref so we can flip it without
|
||||
// remounting — that exercises the watch(modelValue) rather
|
||||
// than a fresh setup().
|
||||
const open = ref(false)
|
||||
const Wrapper = defineComponent({
|
||||
render() {
|
||||
return h(ExportDialog, {
|
||||
modelValue: open.value,
|
||||
'onUpdate:modelValue': (v: boolean) => { open.value = v },
|
||||
})
|
||||
},
|
||||
})
|
||||
const handle = mountComponent(Wrapper, {})
|
||||
try {
|
||||
open.value = true
|
||||
await nextTick()
|
||||
let dialog = dialogsAddedSince(baseline)[0]
|
||||
let input = dialog.querySelector(
|
||||
'.target-size input[type="number"]',
|
||||
) as HTMLInputElement
|
||||
expect(Number(input.value)).toBe(800)
|
||||
// User types something custom, then closes the dialog.
|
||||
input.value = '400'
|
||||
input.dispatchEvent(new Event('input', { bubbles: true }))
|
||||
await nextTick()
|
||||
open.value = false
|
||||
await nextTick()
|
||||
// Canvas grew in the meantime.
|
||||
s.scene.canvas.width = 1600
|
||||
s.scene.canvas.height = 1200
|
||||
open.value = true
|
||||
await nextTick()
|
||||
dialog = dialogsAddedSince(baseline)[0]
|
||||
input = dialog.querySelector(
|
||||
'.target-size input[type="number"]',
|
||||
) as HTMLInputElement
|
||||
// Must have picked up the new canvas dims, not the custom
|
||||
// 400 the user entered last time.
|
||||
expect(Number(input.value)).toBe(1600)
|
||||
} finally {
|
||||
handle.unmount()
|
||||
}
|
||||
})
|
||||
|
||||
test('clicking APNG preview transitions the dialog to the progress view', async () => {
|
||||
// Tiny scene so the async render stays short. We assert the
|
||||
// synchronous state transition right after the click — the
|
||||
|
||||
@@ -451,6 +451,9 @@ export const en = {
|
||||
skipHidden: 'Skip hidden tracks',
|
||||
skipHiddenDesc: 'Drop layers toggled off in the editor from every format below.',
|
||||
skipHiddenNone: 'No editor-hidden tracks in the scene.',
|
||||
targetSize: 'Target size',
|
||||
targetSizeReset: 'Reset to scene canvas size',
|
||||
targetSizeResetLabel: 'Reset',
|
||||
},
|
||||
|
||||
tests: {
|
||||
|
||||
@@ -221,11 +221,11 @@ export async function downloadSceneAsApngPreview(
|
||||
): Promise<void> {
|
||||
const blob = await renderSceneToApng(scene, opts)
|
||||
const dataUrl = await blobToDataUrl(blob)
|
||||
const html = generateApngPreviewHtml(
|
||||
dataUrl,
|
||||
scene.canvas.width,
|
||||
scene.canvas.height,
|
||||
)
|
||||
// Preview HTML must mirror the encoded APNG's dimensions —
|
||||
// falling back to the scene canvas when the user didn't override.
|
||||
const previewWidth = Math.max(1, Math.round(opts.targetWidth ?? scene.canvas.width))
|
||||
const previewHeight = Math.max(1, Math.round(opts.targetHeight ?? scene.canvas.height))
|
||||
const html = generateApngPreviewHtml(dataUrl, previewWidth, previewHeight)
|
||||
const htmlBlob = new Blob([html], { type: 'text/html' })
|
||||
const url = URL.createObjectURL(htmlBlob)
|
||||
const a = document.createElement('a')
|
||||
|
||||
+21
-2
@@ -27,6 +27,16 @@ export interface FrameExportOptions {
|
||||
/** 0..1, fraction of frames completed. Fired after each frame. */
|
||||
onProgress?: (progress: number) => void
|
||||
signal?: AbortSignal
|
||||
/** Output canvas width in pixels. Defaults to the scene canvas
|
||||
* width. Combined with `targetHeight` to override the rendered
|
||||
* resolution (e.g. export a 1920×1080 scene as a 640×360 GIF).
|
||||
* The caller is responsible for keeping the aspect ratio — the
|
||||
* ExportDialog UI derives the second dimension so users can't
|
||||
* accidentally squash the output. */
|
||||
targetWidth?: number
|
||||
/** Output canvas height in pixels. Defaults to the scene canvas
|
||||
* height. */
|
||||
targetHeight?: number
|
||||
}
|
||||
|
||||
export interface FrameRenderContext {
|
||||
@@ -57,13 +67,22 @@ export async function renderFrames(
|
||||
onFrame: (ctx: FrameRenderContext) => void | Promise<void>,
|
||||
opts: FrameExportOptions = {},
|
||||
): Promise<void> {
|
||||
const width = scene.canvas.width
|
||||
const height = scene.canvas.height
|
||||
const srcWidth = scene.canvas.width
|
||||
const srcHeight = scene.canvas.height
|
||||
const width = Math.max(1, Math.round(opts.targetWidth ?? srcWidth))
|
||||
const height = Math.max(1, Math.round(opts.targetHeight ?? srcHeight))
|
||||
const canvas = document.createElement('canvas')
|
||||
canvas.width = width
|
||||
canvas.height = height
|
||||
const ctx = canvas.getContext('2d')
|
||||
if (!ctx) throw new Error('2D context unavailable')
|
||||
// Scale scene coords into target pixels. drawSceneFrame runs its
|
||||
// own save/restore so the transform survives across frames, and
|
||||
// any internal `setTransform(1,0,0,1,0,0)` (top-level mask
|
||||
// compositing) is sandwiched inside its own save/restore too.
|
||||
const scaleX = width / srcWidth
|
||||
const scaleY = height / srcHeight
|
||||
if (scaleX !== 1 || scaleY !== 1) ctx.scale(scaleX, scaleY)
|
||||
|
||||
const images = await loadSceneImages(scene)
|
||||
const { start: rangeIn, end: rangeOut } = playbackRange(scene)
|
||||
|
||||
+1
-1
@@ -1,2 +1,2 @@
|
||||
export const APP_VERSION = '1.0.0'
|
||||
export const APP_VERSION = '1.0.1'
|
||||
export const APP_NAME = 'RUWIO'
|
||||
Reference in new issue
Block a user