mirror of
https://github.com/shumaiOne/shumai.git
synced 2026-11-19 14:16:29 +00:00
fix(webui): reverse 3D sprite scrubbing and remove container volumes from turntable doc
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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}
|
||||
</>
|
||||
|
||||
@@ -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(
|
||||
<SpriteScrubber
|
||||
spriteUrl="https://example.com/sprite.webp"
|
||||
thumbnailUrl="https://example.com/thumb.webp"
|
||||
videoWidth={1080}
|
||||
videoHeight={1080}
|
||||
/>,
|
||||
)
|
||||
|
||||
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(
|
||||
<SpriteScrubber
|
||||
spriteUrl="https://example.com/sprite.webp"
|
||||
thumbnailUrl="https://example.com/thumb.webp"
|
||||
videoWidth={1080}
|
||||
videoHeight={1080}
|
||||
reverse={true}
|
||||
/>,
|
||||
)
|
||||
|
||||
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(<FilePreview item={asset3D} />)
|
||||
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(<FilePreview item={assetVideo} />)
|
||||
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')
|
||||
})
|
||||
})
|
||||
@@ -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<SpriteScrubberProps> = ({
|
||||
videoWidth,
|
||||
videoHeight,
|
||||
className = '',
|
||||
reverse = false,
|
||||
}) => {
|
||||
const containerRef = useRef<HTMLDivElement>(null)
|
||||
const [containerSize, setContainerSize] = useState<Dimensions>({
|
||||
@@ -99,7 +102,8 @@ export const SpriteScrubber: React.FC<SpriteScrubberProps> = ({
|
||||
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<SpriteScrubberProps> = ({
|
||||
return (
|
||||
<div
|
||||
ref={containerRef}
|
||||
data-testid="sprite-scrubber"
|
||||
data-frame={currentFrame}
|
||||
className={`relative w-full h-full overflow-hidden cursor-crosshair group bg-black select-none ${className}`}
|
||||
onMouseEnter={handleMouseEnter}
|
||||
onMouseLeave={handleMouseLeave}
|
||||
|
||||
Reference in New Issue
Block a user