From 6c95d14fb3db6ebb4f11a643be13675f3b32805d Mon Sep 17 00:00:00 2001 From: yiling Date: Tue, 13 Oct 2026 16:49:42 +0800 Subject: [PATCH] fix(webui): reverse 3D sprite scrubbing and remove container volumes from turntable doc --- docs/using-shumai/3d-asset-support.mdx | 7 +- .../components/file-browser/file-preview.tsx | 1 + .../webui/components/sprite-scrubber.test.tsx | 158 ++++++++++++++++++ packages/webui/components/sprite-scrubber.tsx | 8 +- 4 files changed, 167 insertions(+), 7 deletions(-) create mode 100644 packages/webui/components/sprite-scrubber.test.tsx diff --git a/docs/using-shumai/3d-asset-support.mdx b/docs/using-shumai/3d-asset-support.mdx index f76710c9..fe2916cb 100644 --- a/docs/using-shumai/3d-asset-support.mdx +++ b/docs/using-shumai/3d-asset-support.mdx @@ -73,13 +73,12 @@ The easiest way to run `turntable-renderer` is using the prebuilt Docker image: docker run -d --rm \ --name turntable-renderer \ -p 3003:3000 \ - -v $(pwd)/data:/app/data \ -e TURNTABLE_RENDERER_API_BASIC_AUTH_USERNAME=admin \ -e TURNTABLE_RENDERER_API_BASIC_AUTH_PASSWORD=your_password \ shumaione/turntable-renderer:latest ``` -> **Note**: Host port `3003` maps to internal container port `3000`. Persistent temporary file storage is kept in `./data`. +> **Note**: Host port `3003` maps to internal container port `3000`. ### Docker Compose Setup @@ -92,8 +91,6 @@ services: restart: unless-stopped ports: - '3003:3000' - volumes: - - ./data/turntable:/app/data environment: TURNTABLE_RENDERER_API_BASIC_AUTH_USERNAME: admin TURNTABLE_RENDERER_API_BASIC_AUTH_PASSWORD: your_password @@ -123,7 +120,6 @@ docker run -d --rm \ --shm-size=1gb \ -p 3003:3000 \ --device /dev/dri \ - -v $(pwd)/data:/app/data \ -e TURNTABLE_RENDERER_API_BASIC_AUTH_USERNAME=admin \ -e TURNTABLE_RENDERER_API_BASIC_AUTH_PASSWORD=your_password \ shumaione/turntable-renderer:latest @@ -141,7 +137,6 @@ docker run -d --rm \ --runtime nvidia \ --gpus all \ --device /dev/nvidia-modeset \ - -v $(pwd)/data:/app/data \ -e TURNTABLE_RENDERER_API_BASIC_AUTH_USERNAME=admin \ -e TURNTABLE_RENDERER_API_BASIC_AUTH_PASSWORD=your_password \ shumaione/turntable-renderer:latest diff --git a/packages/webui/components/file-browser/file-preview.tsx b/packages/webui/components/file-browser/file-preview.tsx index fc4875c4..7110ef46 100644 --- a/packages/webui/components/file-browser/file-preview.tsx +++ b/packages/webui/components/file-browser/file-preview.tsx @@ -58,6 +58,7 @@ export const FilePreview = ({ item, showDuration = false }: FilePreviewProps) => thumbnailUrl={item.preview.thumbnailUrl!} videoWidth={item.preview.originalWidth!} videoHeight={item.preview.originalHeight!} + reverse={is3D} /> {overlay} diff --git a/packages/webui/components/sprite-scrubber.test.tsx b/packages/webui/components/sprite-scrubber.test.tsx new file mode 100644 index 00000000..03dbe594 --- /dev/null +++ b/packages/webui/components/sprite-scrubber.test.tsx @@ -0,0 +1,158 @@ +// @vitest-environment happy-dom +import { cleanup, fireEvent, render } from '@testing-library/react' +import React from 'react' +import { afterEach, describe, expect, it, vi } from 'vitest' +import { SpriteScrubber } from './sprite-scrubber' +import { FilePreview } from './file-browser/file-preview' + +class MockResizeObserver { + observe = vi.fn() + unobserve = vi.fn() + disconnect = vi.fn() +} +globalThis.ResizeObserver = MockResizeObserver as unknown as typeof ResizeObserver + +describe('SpriteScrubber', () => { + afterEach(() => { + cleanup() + }) + + it('scrubs forward by default when hovering from left to right', () => { + const { getByTestId } = render( + , + ) + + const scrubber = getByTestId('sprite-scrubber') + vi.spyOn(scrubber, 'getBoundingClientRect').mockReturnValue({ + left: 0, + top: 0, + width: 100, + height: 100, + right: 100, + bottom: 100, + x: 0, + y: 0, + toJSON: () => ({}), + }) + + // At x = 0 (left edge): frame 0 + fireEvent.mouseMove(scrubber, { clientX: 0 }) + expect(scrubber.getAttribute('data-frame')).toBe('0') + + // At x = 50 (middle): frame 50 + fireEvent.mouseMove(scrubber, { clientX: 50 }) + expect(scrubber.getAttribute('data-frame')).toBe('50') + + // At x = 99 (near right edge): frame 99 + fireEvent.mouseMove(scrubber, { clientX: 99 }) + expect(scrubber.getAttribute('data-frame')).toBe('99') + }) + + it('scrubs in reverse when reverse={true} (moving right decreases frame index)', () => { + const { getByTestId } = render( + , + ) + + const scrubber = getByTestId('sprite-scrubber') + vi.spyOn(scrubber, 'getBoundingClientRect').mockReturnValue({ + left: 0, + top: 0, + width: 100, + height: 100, + right: 100, + bottom: 100, + x: 0, + y: 0, + toJSON: () => ({}), + }) + + // At x = 0 (left edge): frame 99 + fireEvent.mouseMove(scrubber, { clientX: 0 }) + expect(scrubber.getAttribute('data-frame')).toBe('99') + + // At x = 25: frame 74 (rotated right / CCW) + fireEvent.mouseMove(scrubber, { clientX: 25 }) + expect(scrubber.getAttribute('data-frame')).toBe('74') + + // At x = 50: frame 49 + fireEvent.mouseMove(scrubber, { clientX: 50 }) + expect(scrubber.getAttribute('data-frame')).toBe('49') + + // At x = 99 (right edge): frame 0 + fireEvent.mouseMove(scrubber, { clientX: 99 }) + expect(scrubber.getAttribute('data-frame')).toBe('0') + }) + + it('FilePreview passes reverse={true} for 3D assets and reverse={false} for video assets', () => { + const asset3D = { + proxyType: '3d' as const, + preview: { + proxyType: '3d' as const, + spriteUrl: 'https://example.com/3d-sprite.webp', + thumbnailUrl: 'https://example.com/3d-poster.webp', + originalWidth: 1080, + originalHeight: 1080, + }, + } + + const { getByTestId, unmount } = render() + const scrubber3D = getByTestId('sprite-scrubber') + vi.spyOn(scrubber3D, 'getBoundingClientRect').mockReturnValue({ + left: 0, + top: 0, + width: 100, + height: 100, + right: 100, + bottom: 100, + x: 0, + y: 0, + toJSON: () => ({}), + }) + + // Moving right decreases frame index for 3D assets + fireEvent.mouseMove(scrubber3D, { clientX: 25 }) + expect(scrubber3D.getAttribute('data-frame')).toBe('74') + + unmount() + + const assetVideo = { + proxyType: 'video' as const, + preview: { + proxyType: 'video' as const, + spriteUrl: 'https://example.com/video-sprite.webp', + thumbnailUrl: 'https://example.com/video-poster.webp', + originalWidth: 1920, + originalHeight: 1080, + }, + } + + const { getByTestId: getVideoScrubber } = render() + const scrubberVideo = getVideoScrubber('sprite-scrubber') + vi.spyOn(scrubberVideo, 'getBoundingClientRect').mockReturnValue({ + left: 0, + top: 0, + width: 100, + height: 100, + right: 100, + bottom: 100, + x: 0, + y: 0, + toJSON: () => ({}), + }) + + // Moving right increases frame index for video assets + fireEvent.mouseMove(scrubberVideo, { clientX: 25 }) + expect(scrubberVideo.getAttribute('data-frame')).toBe('25') + }) +}) diff --git a/packages/webui/components/sprite-scrubber.tsx b/packages/webui/components/sprite-scrubber.tsx index cad0bb86..d128b10e 100644 --- a/packages/webui/components/sprite-scrubber.tsx +++ b/packages/webui/components/sprite-scrubber.tsx @@ -13,6 +13,8 @@ interface SpriteScrubberProps { frameWidth?: number /** Optional custom class name for the container */ className?: string + /** Whether to reverse scrubbing order (e.g. for 3D model rotation so moving right rotates right) */ + reverse?: boolean } interface Dimensions { @@ -30,6 +32,7 @@ export const SpriteScrubber: React.FC = ({ videoWidth, videoHeight, className = '', + reverse = false, }) => { const containerRef = useRef(null) const [containerSize, setContainerSize] = useState({ @@ -99,7 +102,8 @@ export const SpriteScrubber: React.FC = ({ setCursorX(clampedX) const percentage = clampedX / rect.width - const frameIndex = Math.min(Math.floor(percentage * TOTAL_FRAMES), TOTAL_FRAMES - 1) + const rawFrame = Math.min(Math.floor(percentage * TOTAL_FRAMES), TOTAL_FRAMES - 1) + const frameIndex = reverse ? TOTAL_FRAMES - 1 - rawFrame : rawFrame setCurrentFrame(frameIndex) } @@ -159,6 +163,8 @@ export const SpriteScrubber: React.FC = ({ return (