From 593b19582bb6e8f413856a336b998c8a47c258cc Mon Sep 17 00:00:00 2001 From: Mariana Martinho Date: Wed, 30 Sep 2026 16:25:41 +0000 Subject: [PATCH 01/11] feat(website): Re-shoot header matches Cinematic Studio View on GitHub sits on the subtitle row on desktop and after the subtitle and credit on phones; more room between Back to apps and the title. --- .../reshoot/ReshootHeader.vue | 30 +++++++++++-------- .../reshoot/ReshootStudio.vue | 2 +- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/apps/website/src/components/workshop/cinematic-studio/reshoot/ReshootHeader.vue b/apps/website/src/components/workshop/cinematic-studio/reshoot/ReshootHeader.vue index 974af5900c2..79005f5f628 100644 --- a/apps/website/src/components/workshop/cinematic-studio/reshoot/ReshootHeader.vue +++ b/apps/website/src/components/workshop/cinematic-studio/reshoot/ReshootHeader.vue @@ -9,23 +9,27 @@ const { locale = 'en' } = defineProps<{ locale?: Locale }>() diff --git a/apps/website/src/components/workshop/cinematic-studio/reshoot/ReshootStudio.vue b/apps/website/src/components/workshop/cinematic-studio/reshoot/ReshootStudio.vue index 9b15239c08f..ef8d5027da9 100644 --- a/apps/website/src/components/workshop/cinematic-studio/reshoot/ReshootStudio.vue +++ b/apps/website/src/components/workshop/cinematic-studio/reshoot/ReshootStudio.vue @@ -65,7 +65,7 @@ const { leavingTo, leave, stay } = useCinematicLeaveGuard( class="mx-auto mb-12 flex w-full max-w-10xl flex-col gap-4 px-4 pt-6 sm:px-8 lg:mb-20 lg:px-14" data-testid="reshoot" > - +
Date: Wed, 30 Sep 2026 16:45:25 +0000 Subject: [PATCH 02/11] feat(website): Re-shoot reveals its camera controls once the depth is read - While the depth is analyzed, the aim controls keep their place hidden and a checklist says what is happening: clip loaded, analyzing depth (about 20 to 40 seconds), then aim the new camera. A failed or blocked read says why, with Try again where it helps. - The preview is labelled: Original clip or Preview of the new angle, and Nothing generated yet until a take of your own exists. Take views read New angle, Original clip and New audio; a take's Original clip is the clip it was shot from. - Hourly limits live in one place (RESHOOT_LIMITS): 3 takes and 20 depth reads per person per hour, counted in the browser so the panel says how many takes are left before any refusal. --- apps/website/e2e/workshop-apps.spec.ts | 23 +++- .../reshoot/ReshootAimPending.vue | 116 ++++++++++++++++++ .../reshoot/ReshootSide.test.ts | 45 ++++++- .../cinematic-studio/reshoot/ReshootSide.vue | 94 +++++++------- .../cinematic-studio/reshoot/ReshootStage.vue | 5 + .../reshoot/ReshootStudio.test.ts | 47 ++++++- .../reshoot/ReshootStudio.vue | 3 + .../reshoot/ReshootTakeView.vue | 2 +- .../reshoot/ReshootViewport.vue | 27 +++- apps/website/src/composables/useReshoot.ts | 49 +++++++- .../src/composables/useReshootAllowance.ts | 61 +++++++++ .../workshop/cinematic-studio/reshoot-copy.ts | 52 +++++++- .../cinematic-studio/reshoot-engine/notes.ts | 2 +- .../cinematic-studio/reshoot-limits.test.ts | 31 +++++ .../cinematic-studio/reshoot-limits.ts | 52 ++++++++ 15 files changed, 545 insertions(+), 64 deletions(-) create mode 100644 apps/website/src/components/workshop/cinematic-studio/reshoot/ReshootAimPending.vue create mode 100644 apps/website/src/composables/useReshootAllowance.ts create mode 100644 apps/website/src/lib/workshop/cinematic-studio/reshoot-limits.test.ts create mode 100644 apps/website/src/lib/workshop/cinematic-studio/reshoot-limits.ts diff --git a/apps/website/e2e/workshop-apps.spec.ts b/apps/website/e2e/workshop-apps.spec.ts index 3058e907a19..8bbbc3cb489 100644 --- a/apps/website/e2e/workshop-apps.spec.ts +++ b/apps/website/e2e/workshop-apps.spec.ts @@ -258,7 +258,19 @@ signedInTest( } ) -test('keeps the Re-shoot camera help behind info buttons', async ({ +signedInTest( + 'keeps the Re-shoot camera help behind info buttons', + async ({ page, context, modelsAccount }) => { + await openReadReshootScene(page, context, modelsAccount) + + const help = 'Distance is approximate; angles give the most control.' + await expect(page.getByText(help)).toBeHidden() + await page.getByRole('button', { name: help }).hover() + await expect(page.getByText(help).first()).toBeVisible() + } +) + +test('holds the Re-shoot camera controls until the depth is read', async ({ page, context }) => { @@ -266,10 +278,11 @@ test('keeps the Re-shoot camera help behind info buttons', async ({ await page.goto('/hub/apps/reshoot/') await page.getByText('Sci-fi pilot').first().click() - const help = 'Distance is approximate; angles give the most control.' - await expect(page.getByText(help)).toBeHidden() - await page.getByRole('button', { name: help }).hover() - await expect(page.getByText(help).first()).toBeVisible() + await expect(page.getByTestId('reshoot-depth-step')).toBeVisible() + await expect(page.getByRole('slider', { name: 'Rotation' })).toBeHidden() + await expect(page.getByTestId('reshoot-frame-label')).toHaveText( + /Original clip\s*· Nothing generated yet/ + ) }) test('shows a preview frame for every Cinematic Studio shot option', async ({ diff --git a/apps/website/src/components/workshop/cinematic-studio/reshoot/ReshootAimPending.vue b/apps/website/src/components/workshop/cinematic-studio/reshoot/ReshootAimPending.vue new file mode 100644 index 00000000000..99c7bebe9f7 --- /dev/null +++ b/apps/website/src/components/workshop/cinematic-studio/reshoot/ReshootAimPending.vue @@ -0,0 +1,116 @@ + + + diff --git a/apps/website/src/components/workshop/cinematic-studio/reshoot/ReshootSide.test.ts b/apps/website/src/components/workshop/cinematic-studio/reshoot/ReshootSide.test.ts index 98a673163ee..e008816788e 100644 --- a/apps/website/src/components/workshop/cinematic-studio/reshoot/ReshootSide.test.ts +++ b/apps/website/src/components/workshop/cinematic-studio/reshoot/ReshootSide.test.ts @@ -1,6 +1,6 @@ import { render, screen } from '@testing-library/vue' import userEvent from '@testing-library/user-event' -import { describe, expect, it } from 'vitest' +import { describe, expect, it, vi } from 'vitest' import { h, ref } from 'vue' import { @@ -103,4 +103,47 @@ describe('ReshootSide', () => { screen.getByRole('button', { name: `${rc('reshoot.aspect')}: ${chosen}` }) ).toBeInTheDocument() }) + + it.for([ + { + depth: 'failed' as const, + reason: { error: 'The deployment is not ready.' }, + title: rc('reshoot.pending.depthFailed'), + retry: true + }, + { + depth: 'none' as const, + reason: { blocked: rc('reshoot.signIn') }, + title: rc('reshoot.pending.depthWaiting'), + retry: false + } + ])( + 'says why the depth is not ready ($depth) instead of showing dead controls', + async ({ depth, reason, title, retry }) => { + const analyze = vi.fn() + render({ + setup: () => () => + h(ReshootSide, { + ...props, + ...reason, + depth, + size: RESHOOT_SIZES[0], + onAnalyze: analyze + }) + }) + const step = screen.getByTestId('reshoot-depth-step') + + expect(step).toHaveTextContent(title) + expect(step).toHaveTextContent(Object.values(reason)[0]) + expect(screen.getByTestId('reshoot-aim-controls')).toHaveAttribute( + 'inert' + ) + if (retry) { + await userEvent.click(screen.getByTestId('reshoot-analyze')) + expect(analyze).toHaveBeenCalledOnce() + } else { + expect(screen.queryByTestId('reshoot-analyze')).toBeNull() + } + } + ) }) diff --git a/apps/website/src/components/workshop/cinematic-studio/reshoot/ReshootSide.vue b/apps/website/src/components/workshop/cinematic-studio/reshoot/ReshootSide.vue index 13fc4a366ae..679fc85f60b 100644 --- a/apps/website/src/components/workshop/cinematic-studio/reshoot/ReshootSide.vue +++ b/apps/website/src/components/workshop/cinematic-studio/reshoot/ReshootSide.vue @@ -1,6 +1,8 @@ + + diff --git a/apps/website/src/components/workshop/cinematic-studio/reshoot/ReshootSide.vue b/apps/website/src/components/workshop/cinematic-studio/reshoot/ReshootSide.vue index 679fc85f60b..31b08425323 100644 --- a/apps/website/src/components/workshop/cinematic-studio/reshoot/ReshootSide.vue +++ b/apps/website/src/components/workshop/cinematic-studio/reshoot/ReshootSide.vue @@ -1,8 +1,6 @@