rig-review 3.7.0 → 4.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/docs/DESIGN.md +145 -74
- package/docs/PANELS.md +20 -12
- package/docs/PARTS_VIEW.md +133 -76
- package/docs/REVIEW_PACKAGE.md +445 -99
- package/docs/STABILITY.md +132 -198
- package/docs/WORKFLOWS.md +41 -120
- package/package.json +4 -3
- package/skills/rig-review/SKILL.md +41 -27
- package/src/build.ts +10 -2
- package/src/cli.ts +17 -16
- package/src/comment-crops.ts +6 -1
- package/src/compare-html.ts +22 -24
- package/src/compare-server.ts +1 -1
- package/src/compare-session.ts +41 -3
- package/src/correction-handoff.ts +27 -4
- package/src/create-pin-gate.ts +3 -0
- package/src/direction-inspection.ts +6 -2
- package/src/feedback-export.ts +68 -1
- package/src/front.ts +5 -200
- package/src/handoff.ts +1 -1
- package/src/interview-routes.ts +1 -1
- package/src/interview-scene.ts +3 -3
- package/src/job-act.ts +77 -73
- package/src/job-api.ts +326 -13
- package/src/job-checkpoint-evidence.ts +113 -0
- package/src/job-cli.ts +27 -14
- package/src/job-contract.ts +284 -62
- package/src/job-front.ts +157 -58
- package/src/job-host.ts +23 -4
- package/src/job-session.ts +109 -24
- package/src/job-source.ts +209 -57
- package/src/job-store.ts +80 -6
- package/src/job-worker.ts +1 -47
- package/src/joined-project.ts +61 -4
- package/src/manifest.ts +32 -4
- package/src/open-workspace.ts +12 -12
- package/src/open.ts +19 -12
- package/src/parts-comment-crops.ts +126 -31
- package/src/parts-comment.ts +351 -28
- package/src/parts-server.ts +19 -7
- package/src/parts-view.ts +588 -109
- package/src/scene-inspection.ts +50 -0
- package/src/server.ts +31 -22
- package/src/session.ts +58 -0
- package/src/stage-comment.ts +48 -1
- package/src/stage-parts.ts +23 -11
- package/web/animation-inspection.ts +1 -1
- package/web/bones-panel.ts +1 -3
- package/web/catalog-en.ts +175 -39
- package/web/catalog-ko.ts +175 -39
- package/web/cloth-panel.ts +1 -2
- package/web/compare.css +3 -13
- package/web/compare.html +3 -3
- package/web/compare.ts +69 -64
- package/web/cuts-panel.ts +1 -3
- package/web/density-strip-panel.ts +1 -2
- package/web/direction-panel.ts +22 -6
- package/web/i18n.ts +13 -1
- package/web/idle-panel.ts +1 -2
- package/web/index.html +1 -5
- package/web/inspection-persistence.ts +2 -1
- package/web/inspector-blocks.ts +149 -40
- package/web/instance-access.ts +24 -5
- package/web/interview-panel.ts +224 -175
- package/web/job-rig-capture.ts +164 -21
- package/web/job-rig-screen.ts +337 -0
- package/web/job-session.ts +611 -1437
- package/web/main.ts +614 -151
- package/web/mesh-panel.ts +1 -2
- package/web/owner-workspace.ts +88 -109
- package/web/part-selection.ts +47 -6
- package/web/part-thumbnails.ts +20 -6
- package/web/parts-render.ts +26 -19
- package/web/parts-viewport-provider.ts +181 -7
- package/web/physics-panel.ts +1 -2
- package/web/readings-panel.ts +1 -2
- package/web/requirements-panel.ts +1 -3
- package/web/retained-frame-stage.ts +105 -0
- package/web/retarget-panel.ts +2 -3
- package/web/rig-fields-panel.ts +1 -2
- package/web/rig-host.ts +64 -0
- package/web/rig-viewport-provider.ts +65 -16
- package/web/scene-plates.ts +57 -4
- package/web/stage-comments.ts +103 -46
- package/web/styles.css +117 -63
- package/web/view-controls.ts +201 -12
- package/web/viewport-capture.ts +12 -2
- package/web/viewport-controller.ts +107 -27
- package/web/viewport-pair.ts +2 -1
- package/web/workspace-preferences.ts +5 -4
- package/web/workspace-ui.ts +151 -19
- package/src/front-worker.ts +0 -2
- package/src/interview-server.ts +0 -54
- package/src/job-hub.ts +0 -304
- package/src/job-image-set.ts +0 -50
- package/web/interview.css +0 -28
- package/web/interview.html +0 -17
- package/web/interview.ts +0 -40
- package/web/job-hub.css +0 -14
- package/web/job-hub.html +0 -5
- package/web/job-hub.ts +0 -179
- package/web/owner-workspace.css +0 -14
- package/web/owner-workspace.html +0 -5
- package/web/parts-flags.ts +0 -48
- package/web/parts.css +0 -104
- package/web/parts.html +0 -49
- package/web/parts.ts +0 -604
- package/web/stage-nav.ts +0 -136
package/web/compare.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import {sharedViewToolsMarkup,sharedCommentMarkup,legacyCompareLayerControlsMarkup,legacyCompareHeaderContent} from '../src/compare-html.ts';
|
|
2
2
|
import {bindWorkspaceVisibility} from './workspace-visibility.ts';
|
|
3
3
|
import {requireFeedbackFrames} from '../src/stage-comment.ts';
|
|
4
4
|
import {bindStageComments,type CommentPose} from './stage-comments.ts';
|
|
@@ -6,7 +6,9 @@ import {sharedTurnDials,type TurnDial} from '../src/turn-pad.ts';
|
|
|
6
6
|
import {bindTurnPad,type TurnPad} from './turn-pad.ts';
|
|
7
7
|
import {PartExplorer,loadPartModel} from './part-selection.ts';
|
|
8
8
|
import {PartThumbnails,pageRegionTable} from './part-thumbnails.ts';
|
|
9
|
-
import {
|
|
9
|
+
import {cameraSignature,type PaneCamera} from './camera-view.ts';
|
|
10
|
+
import {createViewportController,createViewportState} from './viewport-controller.ts';
|
|
11
|
+
import {createRigViewportProvider} from './rig-viewport-provider.ts';
|
|
10
12
|
import { CanvasRenderer, loadModel, RigPlayer, type ModelAssets, type PoseBounds } from '@rig-c/play';
|
|
11
13
|
import type { CompareResponse, CompareSide } from '../src/compare.ts';
|
|
12
14
|
import type { CompareFeedback, CompareSession } from '../src/compare-session.ts';
|
|
@@ -15,22 +17,40 @@ import { commonDomain, drawSynchronizedPair, compareSeekStep, feedbackTrace, ins
|
|
|
15
17
|
import { feedbackLastFrame, feedbackTargetNames, validateFeedbackSelection } from '../src/feedback-validation.ts';
|
|
16
18
|
import type { StripInterval, StripRequest } from '../src/strip.ts';
|
|
17
19
|
|
|
18
|
-
import {
|
|
20
|
+
import {createViewControls,panelMake,actionButton,bindAppearance,bindInspectorTabs,syncStageLayout,idleAvailable} from './view-controls.ts';
|
|
19
21
|
import {CLICK_SLOP_PX} from './stage-pick.ts';
|
|
20
22
|
import {dragImpulse} from '../src/environment.ts';
|
|
21
23
|
import {RigOverlays} from './rig-overlays.ts';
|
|
22
|
-
import {bindWorkspaceUI,type WorkspaceUI} from './workspace-ui.ts';
|
|
24
|
+
import {mountWorkspaceShell,bindWorkspaceUI,type WorkspaceUI} from './workspace-ui.ts';
|
|
23
25
|
import {connectControl} from './control.ts';
|
|
24
26
|
import {connectLiveWindow} from './live-connection.ts';
|
|
25
27
|
import {pageInstanceAccess,readOnlyReason} from './instance-access.ts';
|
|
26
28
|
import {controlComparison,type ControlCommand,type ControlInspection,type ControlView} from '../src/control.ts';
|
|
27
29
|
import {pairEligibility,type InputState,type PairDomain} from '../src/comparison-eligibility.ts';
|
|
28
|
-
import {parseBookmark,connectInspectionPersistence,serializableView,
|
|
30
|
+
import {parseBookmark,connectInspectionPersistence,serializableView,restoredZoom,restoreTransaction,captureInputs,restoreInputs,type InspectionBookmark,type InspectionBinding,type PersistenceConnection} from './inspection-persistence.ts';
|
|
29
31
|
import {RendererBadge} from './renderer-status.ts';
|
|
30
32
|
import {ComparePresentation,type PresentationState} from '../src/compare-presentation.ts';
|
|
31
33
|
import {nextReferenceInterval,ReferenceSelectionUnavailable,inspectionReferenceFrame,lastSupportedReferenceFrame,producerFrameAssociations,referenceFrameAtTime,referenceSeekPosition,type ReferenceFrameIndex,type VideoInfo,type VideoFrame} from '../src/reference-frames.ts';
|
|
32
34
|
import {mountComparePickedTools,type ComparePickedTools} from './compare-picked-tools.ts';
|
|
33
35
|
import {appliedCheckRefusal} from '../src/applied-context.ts';
|
|
36
|
+
/** Compose trusted content through the existing C1/C5b owners before domain lookups. */
|
|
37
|
+
function mountComparisonChrome(){
|
|
38
|
+
const domain={} as Record<keyof typeof legacyCompareHeaderContent,HTMLElement>;
|
|
39
|
+
for(const key of ['modeSwitch','buildPicker','actions'] as const){
|
|
40
|
+
const template=panelMake('template');template.innerHTML=legacyCompareHeaderContent[key];
|
|
41
|
+
domain[key]=template.content.firstElementChild as HTMLElement;
|
|
42
|
+
}
|
|
43
|
+
const shell=mountWorkspaceShell({compatibility:'legacyCompareStep3',compare:domain});
|
|
44
|
+
document.querySelector('[data-workspace-header]')!.replaceWith(shell.header);
|
|
45
|
+
for(const [seam,markup] of [['comment',sharedCommentMarkup],['view-tools',sharedViewToolsMarkup],['layers',legacyCompareLayerControlsMarkup]] as const){
|
|
46
|
+
const template=panelMake('template');template.innerHTML=markup;
|
|
47
|
+
document.querySelector(`[data-workspace-${seam}]`)!.replaceWith(template.content);
|
|
48
|
+
}
|
|
49
|
+
const controls=createViewControls({layout:'legacyCompareStep3'});
|
|
50
|
+
document.querySelector('[data-workspace-camera]')!.replaceWith(controls.zoomGroup!);
|
|
51
|
+
return shell;
|
|
52
|
+
}
|
|
53
|
+
const shell=mountComparisonChrome();
|
|
34
54
|
type Side = 'a' | 'b';
|
|
35
55
|
const el = <T extends HTMLElement = HTMLElement>(id: string): T => {
|
|
36
56
|
const node = document.getElementById(id); if (!node) throw new Error(`Missing compare UI element: ${id}`); return node as T;
|
|
@@ -48,11 +68,11 @@ let seekAbort: AbortController | null = null, videoCallback: number | null = nul
|
|
|
48
68
|
let latestSeek = 0;
|
|
49
69
|
type CameraTarget=Side|'reference';
|
|
50
70
|
const cameras:Record<CameraTarget,PaneCamera>={a:{zoom:1,center:null},b:{zoom:1,center:null},reference:{zoom:1,center:null}};
|
|
51
|
-
const cameraFrames:Partial<Record<CameraTarget,CameraFrame>>={};
|
|
52
71
|
const rigScales:Record<Side,number>={a:1,b:1};
|
|
53
72
|
let cameraSync=true,activeCamera:CameraTarget='a',cameraRestoring=false,cameraLayout='';
|
|
54
73
|
let idleHeld=true,loopRestarting=false,suspendedPreview=false;
|
|
55
74
|
let appearance:ReturnType<typeof bindAppearance>|null=null,controlDispose:(()=>void)|null=null,workspace:WorkspaceUI|null=null;
|
|
75
|
+
let inspectorTabs:ReturnType<typeof bindInspectorTabs>|null=null;
|
|
56
76
|
const viewDisposers:(()=>void)[]=[];
|
|
57
77
|
let parts:PartExplorer|null=null,turnPad:TurnPad|null=null;
|
|
58
78
|
const thumbnails:Partial<Record<Side,PartThumbnails>>={};
|
|
@@ -77,6 +97,8 @@ let endStopReason:string|null=null;
|
|
|
77
97
|
// Actual load outcomes per input; the shared domain exists only after all three loaded.
|
|
78
98
|
let pairInputs:{a:InputState;b:InputState;reference:InputState;domain:PairDomain}={a:{state:'pending'},b:{state:'pending'},reference:{state:'pending'},domain:null};
|
|
79
99
|
const traceRows: CompareTrace[] = [];
|
|
100
|
+
const viewport=createCompareViewport();
|
|
101
|
+
const {paneFrame,renderCameraControls,setCameraSync,cameraAction,updateCamera,fitSelection:fitSelected}=viewport;
|
|
80
102
|
|
|
81
103
|
function message(value: string, error = false): void { text('message', value); el('message').classList.toggle('error', error); }
|
|
82
104
|
function savedState(): void { text('save-state', dirty ? 'Unsubmitted changes' : session.updatedAt ? 'Submitted' : 'Not submitted'); el('save-state').classList.toggle('dirty', dirty); button('submit').disabled = saving || draftConflict || !!readOnly || session.feedbackWarnings.length > 0; button('submit').title = readOnly ? readOnly : session.feedbackWarnings.length ? 'Delete feedback with validation warnings, then add it again with a valid target.' : ''; }
|
|
@@ -233,15 +255,7 @@ async function seekTo(target: number,producer:{side:Side;frame:number;time:numbe
|
|
|
233
255
|
}
|
|
234
256
|
|
|
235
257
|
function unionBounds(a: PoseBounds, b: PoseBounds): PoseBounds { const x = Math.min(a.x, b.x), y = Math.min(a.y, b.y); return { x, y, width: Math.max(a.x + a.width, b.x + b.width) - x, height: Math.max(a.y + a.height, b.y + b.height) - y }; }
|
|
236
|
-
function fit(): void {
|
|
237
|
-
const layout=['a','b','reference'].map(target=>{const v=el(target+'-viewport');return `${v.clientWidth}:${v.clientHeight}`;}).join('|')+!!players.a+!!players.b+video.videoWidth+':'+video.videoHeight;
|
|
238
|
-
if(cameraSync&&!cameraRestoring&&layout!==cameraLayout)alignCameras();cameraLayout=layout;
|
|
239
|
-
for(const side of ['a','b'] as const){
|
|
240
|
-
const frame=paneFrame(side);if(!frame)continue;const camera=cameras[side],center=camera.center??frame.center,scale=rigScales[side]=frame.baseScale*camera.zoom;
|
|
241
|
-
const viewport=el(side+'-viewport'),root=el(side+'-root');root.style.left=`${viewport.clientWidth/2-center.x*scale}px`;root.style.top=`${viewport.clientHeight/2+center.y*scale}px`;root.style.transform=`scale(${scale})`;players[side]?.renderer.syncPixelRatio();
|
|
242
|
-
}
|
|
243
|
-
redrawOverlays(false);referenceFit();renderCameraControls();renderNumericView();
|
|
244
|
-
}
|
|
258
|
+
function fit(): void {viewport.fitCamera();}
|
|
245
259
|
|
|
246
260
|
function configureTurnPad():void {
|
|
247
261
|
const a=data.a.feedbackCatalog.turnDials??[],b=data.b.feedbackCatalog.turnDials??[],dials=sharedTurnDials(a,b);
|
|
@@ -331,7 +345,7 @@ function renderFeedback(): void {
|
|
|
331
345
|
row.append(title, summary);
|
|
332
346
|
for (const warning of session.feedbackWarnings.filter(value => value.id === feedback.id)) { const note = document.createElement('p'); note.className = 'hint'; note.textContent = `Validation warning · ${warning.error}`; row.append(note); }
|
|
333
347
|
const details = document.createElement('details'), heading = document.createElement('summary'), source = document.createElement('pre'); heading.textContent = 'Saved feedback and inspection context'; source.className = 'feedback-json'; source.textContent = JSON.stringify(feedback, null, 2); details.append(heading, source);
|
|
334
|
-
const remove =
|
|
348
|
+
const remove = actionButton('Delete', () => { session.feedback = session.feedback.filter(value => value.id !== feedback.id); session.feedbackWarnings = session.feedbackWarnings.filter(warning => warning.id !== feedback.id); renderFeedback(); markDirty(); });
|
|
335
349
|
row.append(details);if((feedback.context as any)?.comment?.schema!=='rig-review-comment/1'||!submittedBaseline?.feedback.some(f=>f.id===feedback.id))row.append(remove); list.append(row);
|
|
336
350
|
}
|
|
337
351
|
savedState();
|
|
@@ -396,12 +410,7 @@ function bind(): void {
|
|
|
396
410
|
button('seek').onclick = () => { const value = input('time-input').value.trim(); if (!value) { message('Enter a time in seconds.', true); return; } void seekTo(Number(value)); };
|
|
397
411
|
video.addEventListener('ended', () => { stopAtSupportedEnd(); });
|
|
398
412
|
input('reference-audio').onchange = () => { video.muted = !input('reference-audio').checked; };
|
|
399
|
-
|
|
400
|
-
input('camera-sync').onchange=()=>cameraAction(()=>setCameraSync(input('camera-sync').checked));
|
|
401
|
-
for(const target of ['a','b','reference'] as const){
|
|
402
|
-
el(target+'-viewport').addEventListener('wheel',event=>{event.preventDefault();const rect=el(target+'-viewport').getBoundingClientRect();cameraAction(()=>zoomCamera(event.deltaY<0?1.1:1/1.1,target,{x:event.clientX-rect.left,y:event.clientY-rect.top}));},{passive:false});
|
|
403
|
-
for(const event of ['pointerdown','focusin'] as const)el(target+'-viewport').addEventListener(event,()=>activateCamera(target));
|
|
404
|
-
}
|
|
413
|
+
viewDisposers.push(viewport.bindControls());
|
|
405
414
|
select('status').onchange = () => { session.status = select('status').value as CompareSession['status']; markDirty(); };
|
|
406
415
|
select('side').onchange = () => { renderFeedbackSelection(); select('category').value = ''; input('summary').value = ''; }; select('target-kind').onchange = renderFeedbackSelection;
|
|
407
416
|
button('add-feedback').onclick = () => {
|
|
@@ -421,26 +430,24 @@ function bind(): void {
|
|
|
421
430
|
button('export-json').onclick = () => { download(`${session.id}-feedback.json`, JSON.stringify({ ...session, schema: 'rig-review-compare-feedback/1', issues: session.feedback.map(issue) }, null, 2) + '\n', 'application/json'); };
|
|
422
431
|
button('export-markdown').onclick = () => { download(`${session.id}-issues.md`, [`# ${md(data.title)}`, '', 'Ordered A/B and reference provenance:', ...JSON.stringify(session.binding, null, 2).split('\n').map(line => ' ' + line), '', 'Validation warnings:', ...JSON.stringify(session.feedbackWarnings, null, 2).split('\n').map(line => ' ' + line), '', ...session.feedback.flatMap(feedback => { const entry = issue(feedback); return [`## ${md(entry.title)}`, '', entry.body, '', '---', '']; })].join('\n'), 'text/markdown'); };
|
|
423
432
|
// Saved browser defaults seed a new inspection; explicit links and source drafts restore over them.
|
|
424
|
-
workspace=bindWorkspaceUI({changed:fit,defaultTheme:theme=>appearance?.set(theme)});
|
|
433
|
+
workspace=bindWorkspaceUI({changed:fit,defaultTheme:theme=>appearance?.set(theme),language:shell.language!});
|
|
425
434
|
cameraSync=workspace.defaults().defaultCameraSync;input('camera-sync').checked=cameraSync;input('idle-repeat').checked=workspace.defaults().defaultIdleRepeat;
|
|
426
435
|
appearance=bindAppearance(select('appearance'),workspace.defaults().theme);
|
|
427
436
|
for(const side of ['a','b'] as const)overlays[side]=new RigOverlays({canvas:el<HTMLCanvasElement>(side+'-overlay'),rigRoot:el(side+'-root')});
|
|
428
437
|
// #331: a plain drag on either rig pans and carries both rigs, each by its own root scale, so A and B take the same
|
|
429
438
|
// stimulus; the reference pane only pans, as the Family viewer's does.
|
|
430
439
|
const carryBoth={threshold:CLICK_SLOP_PX,move:(dx:number,dy:number)=>{for(const side of ['a','b'] as const){const impulse=dragImpulse(dx,dy,rigScales[side]);if(impulse)players[side]?.moved(impulse);}}};
|
|
431
|
-
|
|
432
|
-
viewDisposers.push(bindStageLayout(el('stage-layout'),fit));
|
|
440
|
+
viewDisposers.push(viewport.bindNavigation(target=>target==='reference'?undefined:carryBoth,()=>!comments?.active()));
|
|
433
441
|
for(const [id,key] of [['layer-images','images'],['layer-mesh','mesh'],['layer-bones','bones']] as const)input(id).onchange=()=>{layers[key]=input(id).checked;redrawOverlays(false);};
|
|
434
442
|
input('idle-repeat').onchange=()=>{renderIdle();if(canRepeatIdle())void playComparison().catch(error=>message(describe(error),true));};
|
|
435
443
|
el('inspector-feedback').addEventListener('focusin',()=>{idleHeld=true;const current=lastPresented?.time;stop();if(current!==undefined&&!seeking)void seekTo(current);});
|
|
436
444
|
bindInspector();
|
|
437
445
|
const transportBlock=document.querySelector<HTMLElement>('#animate-blocks [data-block-target="motion-tools"]');if(transportBlock)transportBlock.dataset.blockIncludes=[transportBlock.dataset.blockIncludes,'compare-transport-context'].filter(Boolean).join(' ');
|
|
438
446
|
pickedTools=mountComparePickedTools({data:()=>data,readOnly:()=>readOnly,players,assets,rigScales,layers,parts:()=>parts,time:()=>trace?.reference??presentation.snapshot().lastDrawn?.reference??0,duration:()=>domain?.end??0,playing:()=>!video.paused,pause:()=>{idleHeld=true;stop();},seekTo:seconds=>seekTo(seconds),api,route:access.route,swapSideRig,redrawOverlays,fit,syncLayout:()=>{renderPairLayout();const mode=pickedTools?.mode()??'compare',picked=pickedTools?.pickedSide()??'a';if(mode!=='compare'&&activeCamera!=='reference'&&activeCamera!==picked)activeCamera=picked;fit();},saveDraft:()=>{persistence?.save();},message,download,turnAdjustFor:side=>turnAdjusts[side]??null,syncFeedbackSide:side=>{if(select('side').value!==side&&!input('summary').value.trim()){select('side').value=side;renderFeedbackSelection();}}});
|
|
439
|
-
viewDisposers.push(bindStageNav({model:true,side:()=>pickedTools?.pickedSide()??'a',setup:()=>pickedTools?.setMode('setup')}));
|
|
440
447
|
document.addEventListener('visibilitychange',()=>{if(document.hidden){suspendedPreview=!video.paused;stop();}else if(suspendedPreview&&!idleHeld){suspendedPreview=false;void playComparison().catch(error=>message(describe(error),true));}});
|
|
441
448
|
const observer = new ResizeObserver(fit); observer.observe(el('a-viewport')); observer.observe(el('b-viewport'));observer.observe(el('reference-viewport'));
|
|
442
449
|
window.addEventListener('beforeunload', event => { if (dirty) { event.preventDefault(); event.returnValue = ''; } });
|
|
443
|
-
window.addEventListener('pagehide', () => { pickedTools?.dispose();comments?.dispose();persistence?.dispose();turnPad?.dispose();workspace?.dispose();disposed = true; seekAbort?.abort();controlDispose?.();appearance?.dispose();viewDisposers.forEach(dispose=>dispose());for(const overlay of Object.values(overlays))overlay.dispose();stop(); if (videoCallback !== null) video.cancelVideoFrameCallback(videoCallback); if (fallbackCallback !== null) cancelAnimationFrame(fallbackCallback); for (const side of ['a', 'b'] as const) { thumbnails[side]?.dispose(); players[side]?.dispose(); assets[side]?.dispose(); } observer.disconnect(); });
|
|
450
|
+
window.addEventListener('pagehide', () => { shell.dispose();pickedTools?.dispose();comments?.dispose();persistence?.dispose();turnPad?.dispose();inspectorTabs?.dispose();workspace?.dispose();disposed = true; seekAbort?.abort();controlDispose?.();appearance?.dispose();viewDisposers.forEach(dispose=>dispose());for(const overlay of Object.values(overlays))overlay.dispose();stop(); if (videoCallback !== null) video.cancelVideoFrameCallback(videoCallback); if (fallbackCallback !== null) cancelAnimationFrame(fallbackCallback); for (const side of ['a', 'b'] as const) { thumbnails[side]?.dispose(); players[side]?.dispose(); assets[side]?.dispose(); } observer.disconnect(); });
|
|
444
451
|
}
|
|
445
452
|
|
|
446
453
|
async function start(): Promise<void> {
|
|
@@ -451,7 +458,7 @@ async function start(): Promise<void> {
|
|
|
451
458
|
readOnly = readOnlyReason(access, writes.capabilityRequired); if (readOnly) message(readOnly, true); controlServed = writes.control !== false;
|
|
452
459
|
submittedBaseline=structuredClone(session);
|
|
453
460
|
if (data.id !== session.id || data.sourceHash !== session.sourceHash || JSON.stringify(data.binding) !== JSON.stringify(session.binding)) throw new Error('Comparison and submission session refer to different source identities. Reopen the review.');
|
|
454
|
-
text('title', data.title); text('animation', `${data.animation} · A/B order and reference video hash are fixed`); document.title = data.title + ' · rig review compare'; select('status').value = session.status; provenance(); bind(); parts=new PartExplorer(el('parts-explorer'),el('selected-part'),previous=>{redrawOverlays(true);const part=parts?.value();pickedTools?.onPartSelected(part?.side==='b'?'b':part?.side==='a'?'a':null,part?.slot??null);if(part&&!pickedTools?.isSwitchingSide()){activeCamera=part.side==='b'?'b':'a';workspace?.revealInspector();if(document.querySelector<HTMLElement>('[data-inspector][aria-selected="true"]')?.dataset.inspector!=='playback')document.querySelector<HTMLButtonElement>('[data-inspector=rig]')?.click();renderCameraControls();}if(!cameraRestoring&&!pickedTools?.isSwitchingSide()&&(previous?.side!==part?.side||previous?.slot!==part?.slot))cameraAction(()=>
|
|
461
|
+
text('title', data.title); text('animation', `${data.animation} · A/B order and reference video hash are fixed`); document.title = data.title + ' · rig review compare'; select('status').value = session.status; provenance(); bind(); parts=new PartExplorer(el('parts-explorer'),el('selected-part'),previous=>{redrawOverlays(true);const part=parts?.value();pickedTools?.onPartSelected(part?.side==='b'?'b':part?.side==='a'?'a':null,part?.slot??null);if(part&&!pickedTools?.isSwitchingSide()){activeCamera=part.side==='b'?'b':'a';workspace?.revealInspector();if(document.querySelector<HTMLElement>('[data-inspector][aria-selected="true"]')?.dataset.inspector!=='playback')document.querySelector<HTMLButtonElement>('[data-inspector=rig]')?.click();renderCameraControls();}if(!cameraRestoring&&!pickedTools?.isSwitchingSide()&&(previous?.side!==part?.side||previous?.slot!==part?.slot))cameraAction(()=>fitSelected());persistence?.save();},part=>{select('side').value=part.side;select('target-kind').value='slot';renderFeedbackSelection();input('target-name').value=part.slot;document.querySelector<HTMLButtonElement>('[data-inspector=feedback]')?.click();}); updateStripControls(); stripStatus('Choose the entered start–end frames or all feedback ranges to download. Unsubmitted feedback is included; exporting does not submit the review.'); renderFeedbackSelection(); renderFeedback(); savedState();
|
|
455
462
|
renderPairLayout();
|
|
456
463
|
const settled = await Promise.allSettled([loadReference(), loadSide('a', data.a), loadSide('b', data.b)]);
|
|
457
464
|
const outcome = (value: PromiseSettledResult<number>): InputState => value.status === 'fulfilled' ? { state: 'loaded' } : { state: 'failed', reason: describe(value.reason) };
|
|
@@ -462,11 +469,39 @@ async function start(): Promise<void> {
|
|
|
462
469
|
void loadFrameIndex();
|
|
463
470
|
input('scrub').max = String(domain.end); input('time-input').max = String(domain.end); text('domain', `Shared range 0–${domain.end} s · Neither side is independently clamped or looped`); ready = true;
|
|
464
471
|
input('scrub').disabled = false; input('time-input').disabled = false; button('seek').disabled = false; button('play').disabled = domain.end === 0;
|
|
465
|
-
await seekTo(0);configureTurnPad();workspace?.refresh();activeCamera='a';if(cameraSync)
|
|
472
|
+
await seekTo(0);configureTurnPad();workspace?.refresh();activeCamera='a';if(cameraSync)setCameraSync(true);fit();for(const id of ['layer-images','layer-mesh','layer-bones'])input(id).disabled=false;renderIdle();const restored=await setupPersistence();setupComments();await pickedTools?.loadInitialSideStatuses();if(!restored&&canRepeatIdle())void playComparison().catch(error=>message(describe(error),true));
|
|
466
473
|
if(!readOnly&&controlServed)controlDispose=connectControl({sourceHash:data.sourceHash,mode:'compare',route:access.route,headers:()=>access.headers(),observe:controlState,apply:applyControl,onStatus:value=>text('control-state',value)});
|
|
467
474
|
bindWorkspaceVisibility({key:access.key,sourceHash:data.sourceHash,pause:()=>{idleHeld=true;stop();}});
|
|
468
475
|
} catch (error) { failPair(error); for (const side of ['a', 'b'] as const) if (!players[side]) text(`${side}-empty`, `${side.toUpperCase()} Could not open comparison rig.`); text('reference-empty', 'Check the reference video and comparison inputs.'); }
|
|
469
476
|
}
|
|
477
|
+
/** Configure the shared camera and compiled renderer without changing the legacy compare layout. */
|
|
478
|
+
function createCompareViewport(){
|
|
479
|
+
const state=createViewportState();state.cameras=cameras;
|
|
480
|
+
Object.defineProperties(state,{
|
|
481
|
+
cameraSync:{get:()=>cameraSync,set:(value:boolean)=>{cameraSync=value;}},
|
|
482
|
+
activeCamera:{get:()=>activeCamera,set:(value:CameraTarget)=>{activeCamera=value;}},
|
|
483
|
+
cameraRestoring:{get:()=>cameraRestoring,set:(value:boolean)=>{cameraRestoring=value;}},
|
|
484
|
+
cameraLayout:{get:()=>cameraLayout,set:(value:string)=>{cameraLayout=value;}}
|
|
485
|
+
});
|
|
486
|
+
const provider=createRigViewportProvider({el,player:()=>null,assets:()=>null,
|
|
487
|
+
panes:(['a','b'] as const).map(target=>({target,viewport:el(target+'-viewport'),pane:el(target+'-pane'),
|
|
488
|
+
root:el(target+'-root'),fallback:target==='a'?'b' as const:'a' as const,box:sharedBox,
|
|
489
|
+
player:()=>players[target]??null,scale:(value:number)=>{rigScales[target]=value;}})),
|
|
490
|
+
rigMargins:{x:22,y:38},referenceTransform:{content:video,mode:'relative'},pinch:false,dimensionVisibility:true,
|
|
491
|
+
referenceSize:()=>video.videoWidth>0&&video.videoHeight>0?{width:video.videoWidth,height:video.videoHeight}:null,
|
|
492
|
+
view:()=>'',referenceGeneration:()=>0,parts:()=>null,text,message,redrawOverlay:redrawOverlays,
|
|
493
|
+
layoutKey:()=>['a','b','reference'].map(target=>{const v=el(target+'-viewport');return `${v.clientWidth}:${v.clientHeight}`;}).join('|')+!!players.a+!!players.b+video.videoWidth+':'+video.videoHeight,
|
|
494
|
+
selection:target=>{const selected=parts?.value()?.side===target;return {selected,bounds:selected?parts?.bounds()??null:null};},
|
|
495
|
+
fitMessage:selected=>{
|
|
496
|
+
const tools=typeof pickedTools!=='undefined'?pickedTools:null,mode=tools?.mode()??'compare',picked=tools?.pickedSide()??'a';
|
|
497
|
+
const suffix=mode==='compare'?'':` on Build ${picked.toUpperCase()} (${data[picked].manifest.title})`;
|
|
498
|
+
return selected?`Selected slot fitted${suffix}.`:`View fitted${suffix}.`;
|
|
499
|
+
},
|
|
500
|
+
cameraControls:{zoomId:'zoom-label',targetLabel:target=>target==='reference'?'Reference':target?.toUpperCase()??'A',
|
|
501
|
+
fitLabel:sync=>sync?'Fit synchronized views':'Fit active view',coordinatesId:null}
|
|
502
|
+
},state);
|
|
503
|
+
return createViewportController(provider,state);
|
|
504
|
+
}
|
|
470
505
|
function sharedBox():PoseBounds|null {const a=assets.a?.stage??players.a?.bounds(),b=assets.b?.stage??players.b?.bounds();return a&&b?unionBounds(a,b):a??b??null;}
|
|
471
506
|
/** The pair is offered only when both sides and the shared video actually loaded; a failed side leaves the survivor as a single pane, named. */
|
|
472
507
|
function renderPairLayout():PairEligibilityState {
|
|
@@ -487,40 +522,13 @@ function showSurvivors():void {
|
|
|
487
522
|
message(`Comparison unavailable · ${state.reasons.compare??''}${state.effective&&state.effective!=='compare'?` · showing ${state.effective==='reference'?'the reference':state.effective.toUpperCase()} alone`:''}`,true);
|
|
488
523
|
if(!readOnly&&controlServed)controlDispose=connectControl({sourceHash:data.sourceHash,mode:'compare',route:access.route,headers:()=>access.headers(),observe:controlState,apply:applyControl,onStatus:value=>text('control-state',value)});
|
|
489
524
|
}
|
|
490
|
-
function paneFrame(target:CameraTarget,hidden=false):CameraFrame|null {
|
|
491
|
-
const viewport=el(target+'-viewport');let width=viewport.clientWidth,height=viewport.clientHeight;
|
|
492
|
-
if(width<=0||height<=0){if(!hidden)return null;if(cameraFrames[target])return cameraFrames[target]!;if(target==='a'||target==='b'){const other=el((target==='a'?'b':'a')+'-viewport');width=other.clientWidth;height=other.clientHeight;}if(width<=0||height<=0)return null;}
|
|
493
|
-
const box=target==='reference'?video.videoWidth>0&&video.videoHeight>0?{x:0,y:0,width:video.videoWidth,height:video.videoHeight}:null:players[target]?sharedBox():null;
|
|
494
|
-
if(!box)return null;const frame=cameraFrame(target==='reference'?'image':'world',box,width,height,target==='reference'?0:22,target==='reference'?0:38);if(frame)cameraFrames[target]=frame;return frame;
|
|
495
|
-
}
|
|
496
|
-
function availableCamera():CameraTarget|null {return paneFrame(activeCamera)?activeCamera:paneFrame('a')?'a':paneFrame('b')?'b':paneFrame('reference')?'reference':null;}
|
|
497
|
-
function activateCamera(target:CameraTarget):void {if(paneFrame(target)){activeCamera=target;renderCameraControls();}}
|
|
498
|
-
function alignCameras():void {
|
|
499
|
-
const target=availableCamera();if(!target)return;const source=paneFrame(target)!;assertCameraView(cameras[target],source);const signature=cameraSignature(cameras[target],source);
|
|
500
|
-
const updates:Partial<Record<CameraTarget,PaneCamera>>={};
|
|
501
|
-
for(const other of ['a','b','reference'] as const){if(other===target)continue;const frame=paneFrame(other);if(frame)updates[other]=cameraFromSignature(signature,frame);}
|
|
502
|
-
Object.assign(cameras,updates);activeCamera=target;
|
|
503
|
-
}
|
|
504
|
-
function renderCameraControls():void {input('camera-sync').checked=cameraSync;const target=availableCamera();text('zoom-label',`${Math.round((target?cameras[target].zoom:1)*100)}% · ${target==='reference'?'Reference':target?.toUpperCase()??'A'}`);button('fit').textContent=cameraSync?'Fit synchronized views':'Fit active view';}
|
|
505
|
-
function setCameraSync(value:boolean):void {if(value)alignCameras();cameraSync=value;fit();}
|
|
506
|
-
function cameraAction(action:()=>void):void {try{action();}catch(error){renderCameraControls();message(describe(error),true);}}
|
|
507
|
-
function updateCamera(target:CameraTarget,value:CameraSignature,rigGroup=false):void {
|
|
508
|
-
const frame=paneFrame(target);if(!frame)return;
|
|
509
|
-
const updates:Partial<Record<CameraTarget,PaneCamera>>={[target]:cameraFromSignature(value,frame)};
|
|
510
|
-
for(const other of ['a','b','reference'] as const){if(other===target||!cameraSync&&!(rigGroup&&other!=='reference'))continue;const next=paneFrame(other);if(next)updates[other]=cameraFromSignature(value,next);}
|
|
511
|
-
Object.assign(cameras,updates);activeCamera=target;fit();
|
|
512
|
-
}
|
|
513
|
-
function zoomCamera(factor:number,target=availableCamera(),point?:CameraPoint|null):void {if(!target)return;const frame=paneFrame(target);if(frame)updateCamera(target,zoomSignature(cameraSignature(cameras[target],frame),factor,frame,point));}
|
|
514
|
-
function panCamera(target:CameraTarget,dx:number,dy:number):void {const frame=paneFrame(target);if(frame)updateCamera(target,dragSignature(cameraSignature(cameras[target],frame),frame,dx,dy));}
|
|
515
|
-
function fitActiveCamera(target=availableCamera()):void {if(!target)return;const tools=typeof pickedTools!=='undefined'?pickedTools:null,mode=tools?.mode()??'compare',picked=tools?.pickedSide()??'a',suffix=mode==='compare'?'':` on Build ${picked.toUpperCase()} (${data[picked].manifest.title})`;const part=parts?.value();if(part?.side===target){const box=parts?.bounds(),frame=paneFrame(target);if(!box||!frame){message('PART_FIT_UNAVAILABLE: selected slot has no positive drawn bounds.',true);return;}updateCamera(target,boundsFitSignature(box,frame,22,38));message(`Selected slot fitted${suffix}.`);}else{if(!paneFrame(target))return;updateCamera(target,{zoom:1,pan:{x:0,y:0}});message(`View fitted${suffix}.`);}}
|
|
516
|
-
function referenceFit():void {const frame=paneFrame('reference');if(!frame)return;const signature=cameraSignature(cameras.reference,frame);video.style.transform=`translate(${signature.pan.x*frame.width}px,${signature.pan.y*frame.height}px) scale(${signature.zoom})`;}
|
|
517
525
|
function redrawOverlays(fresh:boolean):void {
|
|
518
526
|
const warnings:string[]=[];let needsCapture=false;
|
|
519
527
|
for(const side of ['a','b'] as const){const overlay=overlays[side],player=players[side];if(!overlay||!player)continue;const root=el(`${side}-root`),project=(x:number,y:number)=>({x:parseFloat(root.style.left||'0')+x*rigScales[side],y:parseFloat(root.style.top||'0')-y*rigScales[side]}),extra=pickedTools?pickedTools.overlayInputFor(side):{regions:[],circles:[],markers:[],meshEdit:null,weights:null,anchors:null};const snapshot=fresh?overlay.refresh({player,frame:parts?.frame(side),selectedSlot:parts?.value()?.side===side?parts.value()!.slot:null,bones:(data[side].feedbackCatalog.bones??[]).map(name=>({name})),project,settings:layers,...extra}):overlay.redraw({project,settings:layers,...extra});pickedTools?.recordOverlaySnapshot(side,snapshot);warnings.push(...snapshot.warnings);needsCapture ||= snapshot.needsCapture;}
|
|
520
528
|
text('layer-state',warnings.join(' · ')||'Actual last-drawn mesh edges / bone points');
|
|
521
529
|
if(!fresh&&needsCapture&&trace&&!seeking&&!video.seeking&&players.a&&players.b){try{drawSynchronizedPair(inspectionPlayer('a'),inspectionPlayer('b'));redrawOverlays(true);for(const side of ['a','b'] as const)text(`${side}-renderer`,rendererBadges[side].observe('drawn',players[side]!.renderer).label);}catch(error){failPair(error);}}
|
|
522
530
|
}
|
|
523
|
-
function bindInspector():void {bindInspectorTabs(()=>{pickedTools?.onInspectorTabChanged();workspace?.afterTab();if(document.querySelector('[data-inspector="feedback"][aria-selected="true"]')){idleHeld=true;const current=lastPresented?.time;stop();if(current!==undefined&&!seeking)void seekTo(current);}fit();},()=>workspace?.beforeTab());}
|
|
531
|
+
function bindInspector():void {inspectorTabs?.dispose();inspectorTabs=bindInspectorTabs(()=>{pickedTools?.onInspectorTabChanged();workspace?.afterTab();if(document.querySelector('[data-inspector="feedback"][aria-selected="true"]')){idleHeld=true;const current=lastPresented?.time;stop();if(current!==undefined&&!seeking)void seekTo(current);}fit();},()=>workspace?.beforeTab());}
|
|
524
532
|
|
|
525
533
|
function canRepeatIdle():boolean{return data?.animation==='idle'&&idleAvailable(assets.a?.animations.map(a=>a.name)??[],data.animation)&&idleAvailable(assets.b?.animations.map(a=>a.name)??[],data.animation)&&input('idle-repeat').checked&&!!domain&&domain.end>0;}
|
|
526
534
|
function renderIdle():void {text('idle-state',canRepeatIdle()?'Actual idle · repeat enabled':'Bound non-idle inspection · no automatic playback');}
|
|
@@ -558,16 +566,13 @@ async function applyControl(command:ControlCommand,signal:AbortSignal):Promise<v
|
|
|
558
566
|
if(command.type==='camera'||command.type==='fit'){
|
|
559
567
|
const target=command.target==='rig'?'a':command.target,frame=paneFrame(target);if(!frame)throw new Error('CONTROL_CAMERA_UNAVAILABLE');
|
|
560
568
|
const value=command.type==='fit'?{zoom:1,pan:{x:0,y:0}}:{zoom:command.zoom,pan:{x:command.pan.x/frame.width,y:command.pan.y/frame.height}};
|
|
561
|
-
updateCamera(target,value,command.target==='rig');return;
|
|
569
|
+
updateCamera(target,value,command.target==='rig'?['a','b']:undefined);return;
|
|
562
570
|
}
|
|
563
571
|
if(command.type==='playback'){if(command.value==='play')await playComparison(signal);else{idleHeld=true;const current=lastPresented?.time;stop();if(current!==undefined){await seekTo(current);if(!trace)throw new Error('CONTROL_REFERENCE_UNAVAILABLE');}}return;}
|
|
564
572
|
if(command.type==='time'){if(!domain)throw new Error('CONTROL_TIME_UNAVAILABLE');requireCommonTime(command.seconds,domain);await seekTo(command.seconds);if(signal.aborted||!trace)throw new Error('CONTROL_REFERENCE_UNAVAILABLE');}
|
|
565
573
|
}
|
|
566
|
-
function numericView():ControlView {
|
|
567
|
-
|
|
568
|
-
return {schema:'rig-review-view/1',cameraSync,activeCamera,cameras:{rig:null,a:numeric('a'),b:numeric('b'),reference:numeric('reference')}};
|
|
569
|
-
}
|
|
570
|
-
function renderNumericView():void {const node=document.getElementById('view-coordinates');if(node)node.textContent=JSON.stringify(numericView(),null,2);}
|
|
574
|
+
function numericView():ControlView {return viewport.numericView();}
|
|
575
|
+
function renderNumericView():void {viewport.renderNumericView();}
|
|
571
576
|
function inspectionBinding():InspectionBinding{return {mode:'compare',sourceHash:data.sourceHash,rigs:[data.a.reviewedSource.rig?.sha256??null,data.b.reviewedSource.rig?.sha256??null]};}
|
|
572
577
|
function inspectionBookmark():InspectionBookmark {return {schema:'rig-review-inspection/1',binding:inspectionBinding(),animation:data.animation,time:trace?.reference??presentation.snapshot().lastDrawn?.reference??null,theme:appearance?.get()??'system',layers:{images:layers.images,meshes:layers.mesh,bones:layers.bones},view:numericView(),selection:{...(turnPad?{turn:turnPad.snapshot()}:{}),part:parts?.value()??null,reference:data.reference.sha256,inspector:document.querySelector<HTMLElement>('[data-inspector][aria-selected=true]')?.dataset.inspector??'view',mode:pickedTools?.mode()??'compare',side:pickedTools?.pickedSide()??'a'}};}
|
|
573
578
|
async function restoreInspection(bookmark:InspectionBookmark,signal:AbortSignal):Promise<void> {
|
|
@@ -588,7 +593,7 @@ async function applyInspection(bookmark:InspectionBookmark,signal:AbortSignal):P
|
|
|
588
593
|
parts?.select(bookmark.selection.part??null);
|
|
589
594
|
idleHeld=true;stop();if(bookmark.time!==null){await seekTo(bookmark.time);if(signal.aborted||!trace)throw new Error('Saved reference inspection could not settle');}
|
|
590
595
|
appearance?.set(bookmark.theme);Object.assign(layers,{images:bookmark.layers.images,mesh:bookmark.layers.meshes,bones:bookmark.layers.bones});input('layer-images').checked=layers.images;input('layer-mesh').checked=layers.mesh;input('layer-bones').checked=layers.bones;
|
|
591
|
-
if(bookmark.selection.inspector){workspace?.beforeTab();
|
|
596
|
+
if(bookmark.selection.inspector){workspace?.beforeTab();inspectorTabs?.restore(bookmark.selection.inspector);workspace?.afterTab();}
|
|
592
597
|
if(typeof pickedTools!=='undefined'&&pickedTools){if(bookmark.selection.side==='a'||bookmark.selection.side==='b')pickedTools.setPickedSide(bookmark.selection.side);const nextMode=bookmark.selection.mode??(bookmark.selection.inspector==='rig'?'setup':bookmark.selection.inspector==='playback'?'animate':'compare');pickedTools.setMode(nextMode,{fromTab:true});}
|
|
593
598
|
syncStageLayout(el('stage-layout'));fit();
|
|
594
599
|
for(const target of ['a','b','reference'] as const){const camera=bookmark.view.cameras[target],frame=paneFrame(target,true);if(camera&&frame)cameras[target]={zoom:restoredZoom(camera,frame.baseScale,frame.width,frame.height),center:{...camera.center}};}
|
package/web/cuts-panel.ts
CHANGED
|
@@ -19,7 +19,7 @@ import {
|
|
|
19
19
|
} from '../src/cut-edits.ts';
|
|
20
20
|
import {canvasToCrop} from './chest-editor.ts';
|
|
21
21
|
import type {OverlayMarker,OverlayPoint,OverlayProject,OverlayRegion} from './rig-overlays.ts';
|
|
22
|
-
import {textEntryFocused} from './view-controls.ts';
|
|
22
|
+
import {panelNode as node,panelMake as make,textEntryFocused} from './view-controls.ts';
|
|
23
23
|
import type {PatchJobView,RebuildRefusal} from './rebuild-client.ts';
|
|
24
24
|
|
|
25
25
|
export interface CutsPanelDeps {
|
|
@@ -50,8 +50,6 @@ export interface CutsPanel {
|
|
|
50
50
|
status(text:string,error:boolean):void;busy(value:boolean):void;
|
|
51
51
|
restore():void;clear():void;sync():void;dispose():void;
|
|
52
52
|
}
|
|
53
|
-
const node=<T extends HTMLElement>(id:string)=>{const found=document.getElementById(id);if(!found)throw new Error(`Missing UI element: ${id}`);return found as T;};
|
|
54
|
-
const make=<K extends keyof HTMLElementTagNameMap>(tag:K,props:Record<string,unknown>={},...children:(Node|string)[]):HTMLElementTagNameMap[K]=>{const item=document.createElement(tag);Object.assign(item,props);item.append(...children);return item;};
|
|
55
53
|
const fmt=(p:readonly number[])=>`[${p.join(', ')}]`;
|
|
56
54
|
/** The handle under the pointer (canvas px), within 9 px; the nearest wins. */
|
|
57
55
|
export function hitHandle(points:readonly {id:string;at:OverlayPoint}[],p:OverlayPoint):string|null {
|
|
@@ -6,6 +6,7 @@
|
|
|
6
6
|
* verbatim). The two labels name rows; the table has no Apply. Load puts a built row on the stage as pending (the
|
|
7
7
|
* Mesh panel's Apply then applies it, reusing its build); Refine between builds the next strip inside two rows.
|
|
8
8
|
*/
|
|
9
|
+
import {panelNode as node,panelMake as make} from './view-controls.ts';
|
|
9
10
|
import {barText,densityField,densityPath,refineValues,stripValues,type DensityField,type StripRow} from '../src/density-strip.ts';
|
|
10
11
|
import {entryValue,type MeshEntry} from '../src/mesh-entry.ts';
|
|
11
12
|
|
|
@@ -26,8 +27,6 @@ export interface DensityStripPanel {
|
|
|
26
27
|
show(view:DensityStripViewLike|null,pending:number|null,busy:boolean):void;
|
|
27
28
|
status(text:string,error:boolean):void;
|
|
28
29
|
}
|
|
29
|
-
const node=<T extends HTMLElement>(id:string)=>{const found=document.getElementById(id);if(!found)throw new Error(`Missing UI element: ${id}`);return found as T;};
|
|
30
|
-
const make=<K extends keyof HTMLElementTagNameMap>(tag:K,props:Record<string,unknown>={},...children:(Node|string)[]):HTMLElementTagNameMap[K]=>{const item=document.createElement(tag);Object.assign(item,props);item.append(...children);return item;};
|
|
31
30
|
const fieldLabel=(f:DensityField)=>f==='grid'?'grid':'contour.spacing';
|
|
32
31
|
|
|
33
32
|
export function bindDensityStrip(host:DensityStripHost):DensityStripPanel {
|
package/web/direction-panel.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type {SceneInspection} from '../src/scene-inspection.ts';
|
|
1
2
|
import type { DirectionInspection } from '../src/direction-inspection.ts';
|
|
2
3
|
import type { TurnDial } from '../src/turn-pad.ts';
|
|
3
4
|
import { onLanguageChange, t } from './i18n.ts';
|
|
@@ -11,6 +12,7 @@ export interface DirectionView {
|
|
|
11
12
|
sets: readonly string[];
|
|
12
13
|
activeSet?: string;
|
|
13
14
|
authored?: DirectionInspection;
|
|
15
|
+
scene?: SceneInspection;
|
|
14
16
|
}
|
|
15
17
|
|
|
16
18
|
export function directionRows(view: DirectionView): { key: string; values?: string[] }[] {
|
|
@@ -29,16 +31,30 @@ export function directionRows(view: DirectionView): { key: string; values?: stri
|
|
|
29
31
|
: { key: 'direction.authoredUnavailable' },
|
|
30
32
|
...(joined ? [{ key: 'direction.joined', values: [String(joined.postVersion), joined.projectModel.path,
|
|
31
33
|
joined.packageRoot, joined.projectHash, joined.packageSourceHash] }] : []),
|
|
32
|
-
{ key: 'direction.runtimeCameraUnavailable' },
|
|
34
|
+
...(model?.inspected&&view.scene?[{key:'direction.planes',values:[t(view.scene.plates.length===2?'direction.threePlanes':'direction.twoPlanes')]}]:[{ key: 'direction.runtimeCameraUnavailable' }]),
|
|
33
35
|
{ key: 'direction.cameraApplyUnavailable' },
|
|
34
36
|
];
|
|
35
37
|
}
|
|
36
38
|
|
|
39
|
+
/** Summarize only authored fields bound to the model currently on stage. */
|
|
40
|
+
export function directionSummary(view: DirectionView, language?: 'en' | 'ko'): string {
|
|
41
|
+
const authored = view.model?.inspected ? view.authored : undefined;
|
|
42
|
+
if (!authored) return t('direction.title', undefined, language);
|
|
43
|
+
const first = authored.camera.keys[0]!.box;
|
|
44
|
+
const fixed = authored.camera.keys.every(({ box }) =>
|
|
45
|
+
box.x === first.x && box.y === first.y && box.width === first.width && box.height === first.height);
|
|
46
|
+
const post=authored.joined?.postVersion??authored.postVersion;
|
|
47
|
+
const version = post ? ` v${post}` : '';
|
|
48
|
+
return t('direction.summary', [version, String(authored.take.duration),
|
|
49
|
+
t(authored.take.loop ? 'direction.loop' : 'direction.once', undefined, language),
|
|
50
|
+
t(fixed ? 'direction.fixedCamera' : 'direction.movingCamera', undefined, language)], language);
|
|
51
|
+
}
|
|
52
|
+
|
|
37
53
|
/** The adjacent viewport, reference picker and Turn Pad keep their normal input and rendering paths. */
|
|
38
54
|
export function bindDirectionPanel(before: HTMLElement, read: () => DirectionView, set: (name: string) => void) {
|
|
39
55
|
const host = document.createElement('details');
|
|
40
56
|
host.id = 'direction-panel';
|
|
41
|
-
host.open =
|
|
57
|
+
host.open = false;
|
|
42
58
|
host.hidden = true;
|
|
43
59
|
const title = document.createElement('summary');
|
|
44
60
|
const body = document.createElement('div');
|
|
@@ -57,8 +73,8 @@ export function bindDirectionPanel(before: HTMLElement, read: () => DirectionVie
|
|
|
57
73
|
function refresh() {
|
|
58
74
|
if (host.hidden) return;
|
|
59
75
|
const view = read();
|
|
60
|
-
title.textContent =
|
|
61
|
-
const rows = directionRows(view).map(({ key, values }) => {
|
|
76
|
+
title.textContent = directionSummary(view);
|
|
77
|
+
const rows = [...directionRows(view),...(!view.scene&&view.authored?[{key:view.authored.scene?'direction.noScene':'direction.legacyTake'}]:[])].map(({ key, values }) => {
|
|
62
78
|
const row = document.createElement('li');
|
|
63
79
|
row.textContent = t(key, values);
|
|
64
80
|
return row;
|
|
@@ -84,8 +100,8 @@ export function bindDirectionPanel(before: HTMLElement, read: () => DirectionVie
|
|
|
84
100
|
if (view.model?.inspected && view.authored) {
|
|
85
101
|
const { camera, timing, take } = view.authored;
|
|
86
102
|
summary.textContent = t('direction.keys');
|
|
87
|
-
keys.textContent =
|
|
88
|
-
details.hidden =
|
|
103
|
+
keys.textContent = directionSummary(view);
|
|
104
|
+
details.hidden = true;
|
|
89
105
|
} else {
|
|
90
106
|
details.hidden = true;
|
|
91
107
|
keys.textContent = '';
|
package/web/i18n.ts
CHANGED
|
@@ -180,6 +180,14 @@ function ensureMaps(): { enToKo: Map<string, string>; koToEn: Map<string, string
|
|
|
180
180
|
koToEnMap.set(ko, en);
|
|
181
181
|
}
|
|
182
182
|
}
|
|
183
|
+
// Semantic keys have display values too; already rendered refusals must round-trip without expanding the key again.
|
|
184
|
+
for (const [key, english] of Object.entries(enCatalog)) {
|
|
185
|
+
if (english === key) continue;
|
|
186
|
+
const korean = koCatalog[key];
|
|
187
|
+
if (korean === undefined) continue;
|
|
188
|
+
enToKoMap.set(english, korean);
|
|
189
|
+
koToEnMap.set(korean, english);
|
|
190
|
+
}
|
|
183
191
|
for (const [en, ko] of Object.entries(koCatalog)) {
|
|
184
192
|
if (en.startsWith(' · ') && ko.startsWith(' · ')) {
|
|
185
193
|
const enSub = en.slice(3);
|
|
@@ -413,6 +421,7 @@ function shouldTranslateCapturedArg(arg: string, lang: ResolvedLanguage): boolea
|
|
|
413
421
|
function translateCore(text: string, lang: ResolvedLanguage, depth: number): string {
|
|
414
422
|
if (!text || depth > 4) return text;
|
|
415
423
|
if (lang === 'ko') {
|
|
424
|
+
if (getKoToEnMap().has(text)) return text;
|
|
416
425
|
const exact = getEnToKoMap().get(text);
|
|
417
426
|
if (exact !== undefined) return exact;
|
|
418
427
|
} else {
|
|
@@ -573,6 +582,7 @@ const CONTEXT_LOWER_KEYS = new Set([
|
|
|
573
582
|
function isExemptElement(el: Element | null): boolean {
|
|
574
583
|
let cur: Element | null = el;
|
|
575
584
|
while (cur) {
|
|
585
|
+
if (cur.getAttribute?.('translate') === 'no') return true;
|
|
576
586
|
const id = cur.id;
|
|
577
587
|
if (
|
|
578
588
|
id === 'target-names' ||
|
|
@@ -593,7 +603,9 @@ function isExemptElement(el: Element | null): boolean {
|
|
|
593
603
|
cls.includes('animation-lane-label') ||
|
|
594
604
|
cls.includes('animation-tree-bone-name') ||
|
|
595
605
|
cls.includes('stage-comment-pin') ||
|
|
596
|
-
cls.includes('stage-hover-label')
|
|
606
|
+
cls.includes('stage-hover-label') ||
|
|
607
|
+
// The interview modal localizes its own chrome and never rewrites agent-authored prompts or options (#708).
|
|
608
|
+
cls.includes('interview-modal')
|
|
597
609
|
) {
|
|
598
610
|
return true;
|
|
599
611
|
}
|
package/web/idle-panel.ts
CHANGED
|
@@ -7,6 +7,7 @@
|
|
|
7
7
|
* "preview — Apply decides"; it is cleared on Apply and Reset and is never recorded: the source draft keeps only the
|
|
8
8
|
* pending ops (`#idle-pending`) and the panel's own inputs carry no ids.
|
|
9
9
|
*/
|
|
10
|
+
import {panelNode as node,panelMake as make} from './view-controls.ts';
|
|
10
11
|
import {AMP_RANGE,addTrack,entryChanged,idleDraftState,idleDraftText,idleOps,initialState,isChain,orderedEntries,periodFits,periodOffers,precheck,previewPlan,removeTrack,setBlink,stateFromOps,setField,setLinkAmp,SINGLE_PROPS,type BlinkField,type ChainField,type IdleKeying,type IdleSource,type IdleState,type IdleStatus,type PreviewPlan,type SingleField} from '../src/idle-tracks.ts';
|
|
11
12
|
import {scrubBox} from './scrub-box.ts';
|
|
12
13
|
import type {PatchOp} from '../src/config-patch.ts';
|
|
@@ -51,8 +52,6 @@ export interface IdlePanel {
|
|
|
51
52
|
dispose():void;
|
|
52
53
|
}
|
|
53
54
|
|
|
54
|
-
const node=<T extends HTMLElement>(id:string)=>{const found=document.getElementById(id);if(!found)throw new Error(`Missing UI element: ${id}`);return found as T;};
|
|
55
|
-
const make=<K extends keyof HTMLElementTagNameMap>(tag:K,props:Record<string,unknown>={},...children:(Node|string)[]):HTMLElementTagNameMap[K]=>{const item=document.createElement(tag);Object.assign(item,props);item.append(...children);return item;};
|
|
56
55
|
const shown=(value:number|undefined)=>value===undefined?'—':String(Number(value.toPrecision(6)));
|
|
57
56
|
export const PREVIEW_LABEL='preview — Apply decides';
|
|
58
57
|
/** Degrees of amplitude per pane pixel dragged on a chain handle. */
|