rig-review 3.7.0 → 4.0.1
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 +3 -3
- package/docs/DESIGN.md +145 -74
- package/docs/PANELS.md +20 -12
- package/docs/PARTS_VIEW.md +133 -76
- package/docs/REVIEW_PACKAGE.md +446 -100
- 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 +192 -61
- package/src/job-host.ts +23 -4
- package/src/job-session.ts +109 -24
- package/src/job-source.ts +227 -58
- 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 +344 -0
- package/web/job-session.ts +611 -1443
- 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/view-controls.ts
CHANGED
|
@@ -1,5 +1,29 @@
|
|
|
1
1
|
/** Local inspection controls; these never write source or review state. */
|
|
2
|
+
export const panelNode=<T extends HTMLElement>(id:string)=>{const found=document.getElementById(id);if(!found)throw new Error(`Missing UI element: ${id}`);return found as T;};
|
|
3
|
+
export const panelMake=<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;};
|
|
4
|
+
export const actionButton=(
|
|
5
|
+
label:string,
|
|
6
|
+
click:((e?:MouseEvent)=>void)|null,
|
|
7
|
+
disabled?:boolean,
|
|
8
|
+
)=>panelMake('button',{
|
|
9
|
+
type:'button',
|
|
10
|
+
textContent:label,
|
|
11
|
+
...(disabled===undefined?{}:{disabled}),
|
|
12
|
+
onclick:click,
|
|
13
|
+
});
|
|
14
|
+
export const labelledControl=(
|
|
15
|
+
label:Node|string,
|
|
16
|
+
control:HTMLElement,
|
|
17
|
+
controlFirst=false,
|
|
18
|
+
):HTMLLabelElement=>panelMake(
|
|
19
|
+
'label',
|
|
20
|
+
{},
|
|
21
|
+
...(controlFirst?[control,label]:[label,control]),
|
|
22
|
+
);
|
|
2
23
|
export type ThemePreference = 'system' | 'dark' | 'light';
|
|
24
|
+
import {t,setSourceText} from './i18n.ts';
|
|
25
|
+
import type {PairLayout} from '../src/comparison-eligibility.ts';
|
|
26
|
+
|
|
3
27
|
export interface ViewPoint { x:number; y:number }
|
|
4
28
|
export function stageOrientation(width:number,height:number):'horizontal'|'vertical' {return width>=height?'horizontal':'vertical';}
|
|
5
29
|
export function panCenter(center:ViewPoint,dx:number,dy:number,scale:number,space:'world'|'image'):ViewPoint {
|
|
@@ -12,6 +36,14 @@ export function initialIdleAnimation(names:readonly string[],fallback:string|nul
|
|
|
12
36
|
export function automaticIdlePreview(names:readonly string[],selected:string,checkpoint:{animation?:string;time?:number;axis?:unknown}|undefined,explicitCheckpoint:boolean):boolean {
|
|
13
37
|
return idleAvailable(names,selected)&&!explicitCheckpoint&&(!checkpoint||(checkpoint.animation==='idle'&&(checkpoint.time??0)===0&&!checkpoint.axis));
|
|
14
38
|
}
|
|
39
|
+
/** Whether opening the page may start the idle preview. A restored inspection keeps its paused frame in the
|
|
40
|
+
* standalone review; a job rig subject (#709) keeps idle looping, because the restored frame there is only the
|
|
41
|
+
* previous visit's view, not a frame the reviewer chose for this decision. */
|
|
42
|
+
export function idlePreviewOnOpen(restored:boolean,hosted:boolean):boolean {return hosted||!restored;}
|
|
43
|
+
/** Whether a restored inspection keeps its saved camera. The standalone review restores it always; a job rig subject
|
|
44
|
+
* (#709) opens at Fit, because the saved camera belongs to the previous visit's window size. A view link followed after
|
|
45
|
+
* opening still restores its camera in both. */
|
|
46
|
+
export function bookmarkCameraKept(opening:boolean,hosted:boolean):boolean {return !(opening&&hosted);}
|
|
15
47
|
export function themePreference(value:unknown):ThemePreference {return value==='dark'||value==='light'?value:'system';}
|
|
16
48
|
|
|
17
49
|
/** The inspection appearance is transient; workspace Settings owns the saved browser default. */
|
|
@@ -34,6 +66,18 @@ export const layerShortcuts=Object.freeze([
|
|
|
34
66
|
Object.freeze({key:'m',id:'layer-mesh',label:'Mesh edges'}),
|
|
35
67
|
Object.freeze({key:'b',id:'layer-bones',label:'Bone points'}),
|
|
36
68
|
] as const);
|
|
69
|
+
import {rigLayerControlsMarkup} from '../src/compare-html.ts';
|
|
70
|
+
/** Mount the canonical rig layer markup; job hosts retain their translation and state binding. */
|
|
71
|
+
export function createRigLayerControls(options:{jobText?:boolean;translate?:(key:string)=>string}={}):HTMLFieldSetElement {
|
|
72
|
+
const host=document.createElement('div');host.innerHTML=rigLayerControlsMarkup;
|
|
73
|
+
const fieldset=host.querySelector<HTMLFieldSetElement>('#layer-controls')!;
|
|
74
|
+
for(const element of fieldset.querySelectorAll<HTMLElement>('legend,span')){
|
|
75
|
+
const key=element.textContent??'';
|
|
76
|
+
if(options.jobText)element.dataset.jobText=key;
|
|
77
|
+
if(options.translate)element.textContent=options.translate(key);
|
|
78
|
+
}
|
|
79
|
+
return fieldset;
|
|
80
|
+
}
|
|
37
81
|
const nonTextInputs=new Set(['checkbox','radio','button','submit','reset','range','color','file','image']);
|
|
38
82
|
/** A focused text field, textarea, select or contenteditable keeps its keys. */
|
|
39
83
|
export function textEntryFocused(target:unknown):boolean {
|
|
@@ -60,6 +104,95 @@ export function describeLayerToggles(root:{getElementById(id:string):unknown},re
|
|
|
60
104
|
}
|
|
61
105
|
}
|
|
62
106
|
|
|
107
|
+
/** Finite composition: target rig; compare/Parts/job compatibility expires at steps 3/2/5. */
|
|
108
|
+
export interface ViewSwitchMode {
|
|
109
|
+
id:string;labelKey:string;pressed:boolean;hidden?:boolean;
|
|
110
|
+
/** Localized explanation shown on the disabled choice. */
|
|
111
|
+
disabledReason?:string;
|
|
112
|
+
}
|
|
113
|
+
export interface ViewSwitchGroup {modes:readonly ViewSwitchMode[];hidden?:boolean}
|
|
114
|
+
export interface ViewSwitchConfig {
|
|
115
|
+
groups:readonly ViewSwitchGroup[];
|
|
116
|
+
currentMode:string;
|
|
117
|
+
onChange?:(id:string)=>void;
|
|
118
|
+
}
|
|
119
|
+
/** One group from layout eligibility: the effective mode is pressed and named (else the requested one); each refused mode carries its existing reason. */
|
|
120
|
+
export function eligibilityViewSwitch<L extends string>(state:{requested:L;effective:L|null;reasons:Partial<Record<L,string>>},modes:readonly (readonly [L,string])[],onChange?:(id:L)=>void):ViewSwitchConfig {
|
|
121
|
+
return {currentMode:state.effective??state.requested,...onChange?{onChange:onChange as (id:string)=>void}:{},groups:[{modes:modes.map(([id,labelKey])=>{
|
|
122
|
+
const reason=state.reasons[id];
|
|
123
|
+
return {id,labelKey,pressed:id===state.effective,...reason===undefined?{}:{disabledReason:reason}};
|
|
124
|
+
})}]};
|
|
125
|
+
}
|
|
126
|
+
/** Compare's View switch: Side by side · Reference · A · B, labelled with existing catalog keys. */
|
|
127
|
+
export const compareViewModes:readonly (readonly [PairLayout,string])[]=Object.freeze([['compare','Side by side'],['reference','Reference'],['a','Build A'],['b','Build B']]);
|
|
128
|
+
/** The existing rig menu's single definition; layout ids and visible labels remain unchanged. */
|
|
129
|
+
export function inspectionViewSwitch(onChange?:((id:string)=>void),partsSetup=false):ViewSwitchConfig {
|
|
130
|
+
return {currentMode:'compare',onChange,groups:[{modes:[
|
|
131
|
+
{id:'compare',labelKey:'Side by side',pressed:true},
|
|
132
|
+
{id:'reference',labelKey:'Reference',pressed:false},
|
|
133
|
+
{id:'rig',labelKey:'Rig',pressed:false},
|
|
134
|
+
...(partsSetup?[{id:'difference',labelKey:'Difference',pressed:false}]:[]),
|
|
135
|
+
]}]};
|
|
136
|
+
}
|
|
137
|
+
export type ViewControlsOptions = {layout:'rigStep1';viewSwitch:ViewSwitchConfig} | {
|
|
138
|
+
layout:'legacyCompareStep3';
|
|
139
|
+
};
|
|
140
|
+
/** One creation site for each common control; hosts retain adjacent tools and camera/event binding. */
|
|
141
|
+
export function createViewControls(options:ViewControlsOptions) {
|
|
142
|
+
const rig=options.layout==='rigStep1',compare=options.layout==='legacyCompareStep3';
|
|
143
|
+
const zoomIn=actionButton(compare?'+':t(rig?'Zoom in':'job.zoomIn'),null);zoomIn.id='zoom-in';
|
|
144
|
+
const zoomOut=actionButton(compare?'−':t(rig?'Zoom out':'job.zoomOut'),null);zoomOut.id='zoom-out';
|
|
145
|
+
const fit=actionButton(t(compare?'Fit synchronized views':'Fit'),null);fit.id='fit';
|
|
146
|
+
const value=panelMake(rig||compare?'output':'span',{id:compare?'zoom-label':'zoom-value',textContent:rig||compare?'100%':''});
|
|
147
|
+
const sync=panelMake('input',{id:'camera-sync',type:'checkbox'});
|
|
148
|
+
const syncLabel=labelledControl(t('Sync cameras'),sync,true);
|
|
149
|
+
if(rig||compare){sync.checked=true;syncLabel.className='camera-sync';zoomIn.setAttribute('aria-label',t(compare?'Zoom active view in':'Zoom in'));zoomOut.setAttribute('aria-label',t(compare?'Zoom active view out':'Zoom out'));}
|
|
150
|
+
if(compare)for(const button of [zoomIn,zoomOut,fit])button.removeAttribute('type');
|
|
151
|
+
const zoomButtons=[zoomIn,zoomOut,fit];
|
|
152
|
+
const zoomGroup=rig||compare?panelMake('div',{className:rig?'zoom-controls':'row'}):null;
|
|
153
|
+
const nativeOne=rig?actionButton('1:1',null):null;
|
|
154
|
+
if(nativeOne)nativeOne.id='native-one';
|
|
155
|
+
let viewSwitch:HTMLDetailsElement|null=null,viewLabel:HTMLSpanElement|null=null;
|
|
156
|
+
const modes=new Map<string,{mode:ViewSwitchMode;button:HTMLButtonElement;group:readonly ViewSwitchMode[]}>();
|
|
157
|
+
/** A null effective mode clears pressed states but may still name the requested mode. */
|
|
158
|
+
const setMode=(id:string|null,summaryId:string|null=id)=>{
|
|
159
|
+
const selected=id===null?undefined:modes.get(id),summary=summaryId===null?undefined:modes.get(summaryId);
|
|
160
|
+
if(id!==null&&!selected)return;
|
|
161
|
+
for(const item of modes.values())if(id===null||item.group===selected?.group)item.button.setAttribute('aria-pressed',String(item===selected));
|
|
162
|
+
if(viewLabel&&summary)setSourceText(viewLabel,t(summary.mode.labelKey));
|
|
163
|
+
};
|
|
164
|
+
const setDisabled=(id:string,reason:string|null)=>{
|
|
165
|
+
const item=modes.get(id);if(!item)return;
|
|
166
|
+
item.button.disabled=!!reason;item.button.title=reason??'';
|
|
167
|
+
if(reason)item.button.setAttribute('aria-description',reason);else item.button.removeAttribute('aria-description');
|
|
168
|
+
};
|
|
169
|
+
if(rig){
|
|
170
|
+
const config=options.viewSwitch;
|
|
171
|
+
viewSwitch=panelMake('details',{id:'view-menu',className:'view-menu'});
|
|
172
|
+
const groups=config.groups.filter(group=>!group.hidden).map(group=>group.modes.filter(mode=>!mode.hidden)).filter(modes=>modes.length);
|
|
173
|
+
const current=groups.flat().find(mode=>mode.id===config.currentMode);
|
|
174
|
+
const label=viewLabel=panelMake('span',{id:'view-menu-label',textContent:current?t(current.labelKey):''});
|
|
175
|
+
const summary=panelMake('summary',{},t('View switch')+' ',label);summary.setAttribute('aria-label',t('View layout'));
|
|
176
|
+
const list=panelMake('div',{className:'view-menu-list'});list.setAttribute('role','group');list.setAttribute('aria-label',t('View'));
|
|
177
|
+
for(const [index,group] of groups.entries()){
|
|
178
|
+
if(index)list.append(panelMake('hr',{role:'separator'}));
|
|
179
|
+
for(const mode of group){
|
|
180
|
+
const button=actionButton(t(mode.labelKey),()=>{
|
|
181
|
+
if(button.disabled)return;
|
|
182
|
+
setMode(mode.id);viewSwitch!.open=false;config.onChange?.(mode.id);
|
|
183
|
+
});
|
|
184
|
+
button.dataset.view=mode.id;button.setAttribute('aria-pressed',String(mode.pressed));
|
|
185
|
+
modes.set(mode.id,{mode,button,group});
|
|
186
|
+
if(mode.disabledReason)setDisabled(mode.id,mode.disabledReason);
|
|
187
|
+
list.append(button);
|
|
188
|
+
}
|
|
189
|
+
}
|
|
190
|
+
viewSwitch.append(summary,list);
|
|
191
|
+
zoomGroup!.append(zoomIn,zoomOut,fit,nativeOne!,viewSwitch,value);
|
|
192
|
+
}else if(compare)zoomGroup!.append(syncLabel,zoomOut,value,zoomIn,fit);
|
|
193
|
+
return {zoomButtons,zoomGroup,syncLabel,value,nativeOne,viewSwitch,viewModeIds:[...modes.keys()],setMode,setDisabled};
|
|
194
|
+
}
|
|
195
|
+
|
|
63
196
|
// Nested or separately disposed pan binders must not restore another binder's override.
|
|
64
197
|
const panVideoOverrides=new WeakMap<HTMLVideoElement,{owners:number;value:string;priority:string}>();
|
|
65
198
|
/**
|
|
@@ -107,16 +240,72 @@ export function bindPan(viewport:HTMLElement,move:(dx:number,dy:number)=>void,en
|
|
|
107
240
|
return ()=>{blur();window.removeEventListener('blur',blur);document.removeEventListener('keydown',keyDown,true);window.removeEventListener('keyup',keyUp,true);viewport.removeEventListener('pointerdown',start);viewport.removeEventListener('pointermove',drag);viewport.removeEventListener('pointerup',end);viewport.removeEventListener('pointercancel',end);viewport.removeEventListener('lostpointercapture',end);viewport.removeEventListener('dragstart',native);};
|
|
108
241
|
}
|
|
109
242
|
|
|
110
|
-
/**
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
243
|
+
/** A discovered row; the block adapter supplies nodes, never another activation implementation. */
|
|
244
|
+
export interface InspectorTabItem {
|
|
245
|
+
id:string;button:HTMLButtonElement;panels:HTMLElement[];attribute:'aria-selected'|'aria-pressed';included?:HTMLElement[];
|
|
246
|
+
}
|
|
247
|
+
export interface InspectorTabRow {
|
|
248
|
+
tabs:InspectorTabItem[];panels:HTMLElement[];modes?:{button:HTMLButtonElement;id:string}[];
|
|
249
|
+
/** Inner rows delegate bubbling events and keep per-block offsets; outer selectors retain onclick timing. */
|
|
250
|
+
root?:HTMLElement;scrollRoot?:HTMLElement;initialize?:boolean;
|
|
251
|
+
/** Explicit activation reveals an existing host panel, including an already-selected tab; restore never calls it. */
|
|
252
|
+
reveal?:(id:string)=>void;
|
|
253
|
+
}
|
|
254
|
+
export interface InspectorTabs {select(id:string):void;restore(id:string):void;state():string|undefined;dispose():void}
|
|
255
|
+
/** beforeChange runs while the old panel is visible; changed runs after the new one is shown.
|
|
256
|
+
* Omitted row discovers the existing outer selectors. Restore changes selection without user hooks or scrolling. */
|
|
257
|
+
export function bindInspectorTabs(changed:()=>void,beforeChange:()=>void=()=>{},row?:InspectorTabRow):InspectorTabs {
|
|
258
|
+
const scoped=!!row;
|
|
259
|
+
if(!row){
|
|
260
|
+
const buttons=[...document.querySelectorAll<HTMLButtonElement>('[data-inspector]')],panels=[...document.querySelectorAll<HTMLElement>('[data-inspector-panel]')];
|
|
261
|
+
row={tabs:buttons.map(button=>({id:button.dataset.inspector!,button,panels:panels.filter(panel=>panel.dataset.inspectorPanel===button.dataset.inspector),attribute:button.dataset.mode!==undefined?'aria-pressed':'aria-selected'})),panels,
|
|
262
|
+
modes:[...document.querySelectorAll<HTMLButtonElement>('[data-mode]')].filter(button=>!buttons.includes(button)).map(button=>({button,id:button.dataset.mode!}))};
|
|
263
|
+
}
|
|
264
|
+
const {tabs,panels,modes=[],root,scrollRoot}=row,disposers:(()=>void)[]=[],scrolls=new Map<string,number>();
|
|
265
|
+
let active=tabs.find(tab=>tab.button.getAttribute?.(tab.attribute)==='true'),disposed=false;
|
|
266
|
+
const reflect=()=>{const selected=tabs.find(tab=>tab.button.getAttribute?.(tab.attribute)==='true')?.id;for(const mode of modes)mode.button.setAttribute('aria-pressed',String(mode.id===selected));};
|
|
267
|
+
const render=(target:InspectorTabItem)=>{
|
|
268
|
+
for(const tab of tabs){
|
|
269
|
+
const on=tab===target,value=String(on);
|
|
270
|
+
if(!scoped||tab.button.getAttribute(tab.attribute)!==value)tab.button.setAttribute(tab.attribute,value);
|
|
271
|
+
if(tab.attribute==='aria-selected'&&(!scoped||tab.button.tabIndex!==(on?0:-1)))tab.button.tabIndex=on?0:-1;
|
|
272
|
+
if(scoped)for(const panel of tab.panels)if(panel.hidden===on)panel.hidden=!on;
|
|
273
|
+
for(const node of tab.included??[])if(node.hasAttribute('data-block-hidden')===on)node.toggleAttribute('data-block-hidden',!on);
|
|
274
|
+
}
|
|
275
|
+
if(!scoped)for(const panel of panels)panel.hidden=!target.panels.includes(panel);
|
|
276
|
+
reflect();
|
|
277
|
+
};
|
|
278
|
+
const activate=(id:string,user:boolean)=>{
|
|
279
|
+
if(disposed)return;const target=tabs.find(tab=>tab.id===id);if(!target)return;
|
|
280
|
+
if(scoped&&active===target){if(user)row.reveal?.(id);return;}
|
|
281
|
+
const previous=active;
|
|
282
|
+
if(user){beforeChange();if(scrollRoot&&previous)scrolls.set(previous.id,scrollRoot.scrollTop);}
|
|
283
|
+
render(target);
|
|
284
|
+
if(user&&scrollRoot&&previous){const next=scrolls.get(id)??0;if(scrollRoot.scrollTop!==next)scrollRoot.scrollTop=next;}
|
|
285
|
+
active=target;
|
|
286
|
+
// Inner restoration has always notified draft persistence, but never swaps scroll offsets.
|
|
287
|
+
if(user||scoped&&previous)changed();
|
|
288
|
+
if(user)row.reveal?.(id);
|
|
289
|
+
};
|
|
290
|
+
const key=(tab:InspectorTabItem,event:KeyboardEvent)=>{
|
|
291
|
+
if(tab.attribute==='aria-pressed')return;const index=tabs.indexOf(tab);
|
|
292
|
+
const next=event.key==='ArrowRight'?(index+1)%tabs.length:event.key==='ArrowLeft'?(index+tabs.length-1)%tabs.length:event.key==='Home'?0:event.key==='End'?tabs.length-1:null;
|
|
293
|
+
if(next===null)return;event.preventDefault();const target=tabs[next];if(target){if(row.reveal)target.button.focus();activate(target.id,true);if(!row.reveal)target.button.focus();}
|
|
294
|
+
};
|
|
295
|
+
if(root){
|
|
296
|
+
const tabOf=(event:Event)=>{const button=(event.target as Element|null)?.closest?.('button[data-block-target]');return tabs.find(tab=>tab.button===button);};
|
|
297
|
+
const click=(event:Event)=>{const tab=tabOf(event);if(tab)activate(tab.id,true);};
|
|
298
|
+
const keydown=(event:KeyboardEvent)=>{const tab=tabOf(event);if(tab)key(tab,event);};
|
|
299
|
+
root.addEventListener('click',click);root.addEventListener('keydown',keydown);
|
|
300
|
+
disposers.push(()=>{root.removeEventListener('click',click);root.removeEventListener('keydown',keydown);});
|
|
301
|
+
}else{
|
|
302
|
+
for(const tab of tabs){
|
|
303
|
+
const click=()=>activate(tab.id,true),keydown=(event:KeyboardEvent)=>key(tab,event);
|
|
304
|
+
tab.button.onclick=click;if(tab.attribute==='aria-selected')tab.button.onkeydown=keydown;
|
|
305
|
+
disposers.push(()=>{if(tab.button.onclick===click)tab.button.onclick=null;if(tab.button.onkeydown===keydown)tab.button.onkeydown=null;});
|
|
306
|
+
}
|
|
307
|
+
}
|
|
308
|
+
for(const mode of modes){const click=()=>activate(mode.id,true);mode.button.onclick=click;disposers.push(()=>{if(mode.button.onclick===click)mode.button.onclick=null;});}
|
|
309
|
+
if(row.initialize){active??=tabs[0];if(active)render(active);}else reflect();
|
|
310
|
+
return {select:id=>activate(id,true),restore:id=>activate(id,false),state:()=>active?.id,dispose(){disposed=true;for(const dispose of disposers)dispose();scrolls.clear();}};
|
|
122
311
|
}
|
package/web/viewport-capture.ts
CHANGED
|
@@ -120,6 +120,17 @@ function displayedRig(ctx:CanvasRenderingContext2D,capture:ViewportCapture,frame
|
|
|
120
120
|
ctx.restore();
|
|
121
121
|
}return true;
|
|
122
122
|
}
|
|
123
|
+
/** Shared off-screen rendering for inspection crops and fixed job evidence. */
|
|
124
|
+
export function paintPosedViewport(ctx:CanvasRenderingContext2D,posed:PosedFrame,assets:ModelAssets,
|
|
125
|
+
camera:ControlNumericCamera,backend:CanvasBackend):void {
|
|
126
|
+
if(backend==='canvas2d'&&posed.order.some(row=>row.tint.slice(0,3).some(c=>c!==1)||row.dark?.some(c=>c!==0)))throw new Error('COMMENT_CAPTURE_UNAVAILABLE: Canvas2D cannot reproduce active RGB/dark tint');
|
|
127
|
+
const root=document.createElement('div'),renderer=new CanvasRenderer(root,assets.pageImages);
|
|
128
|
+
try {
|
|
129
|
+
renderer.backend=backend;renderer.viewport={...camera.visible};
|
|
130
|
+
renderer.pixelRatio=camera.viewport.width/camera.visible.width;
|
|
131
|
+
renderer.render(posed);ctx.drawImage(renderer.canvas,0,0,camera.viewport.width,camera.viewport.height);
|
|
132
|
+
}finally{renderer.dispose();}
|
|
133
|
+
}
|
|
123
134
|
export function paintInspectionViewport(ctx:CanvasRenderingContext2D,area:MarkRegion,capture:ViewportCapture,pose:{camera:ControlNumericCamera;posed?:PosedFrame;assets?:ModelAssets;media?:HTMLVideoElement|HTMLImageElement}):void {
|
|
124
135
|
if(capture.nearest)ctx.imageSmoothingEnabled=false;
|
|
125
136
|
const overlays=capture.includeOverlays===false?[]:[...capture.pane.querySelectorAll<HTMLCanvasElement>('canvas')].filter(node=>!capture.root?.contains(node)&&node!==capture.canvas).map(node=>displayedPixels(node,capture.pane)).filter((v):v is PixelLayer=>v!==null);
|
|
@@ -127,8 +138,7 @@ export function paintInspectionViewport(ctx:CanvasRenderingContext2D,area:MarkRe
|
|
|
127
138
|
if(capture.canvas){if(capture.strictActualPixels&&getComputedStyle(capture.canvas).filter!=='none')throw new Error('JOB_STILL_CAPTURE_FAILED');const pixels=displayedPixels(capture.canvas,capture.pane,!capture.root?.contains(capture.canvas));if(pixels){ctx.save();ctx.globalAlpha=pixels.opacity;ctx.drawImage(pixels.image,pixels.rect.x,pixels.rect.y,pixels.rect.width,pixels.rect.height);ctx.restore();return;}}
|
|
128
139
|
if(pose.posed&&pose.assets){if(displayedRig(ctx,capture,pose.posed,pose.camera))return;
|
|
129
140
|
if(capture.strictActualPixels)throw new Error('JOB_STILL_CAPTURE_FAILED');
|
|
130
|
-
|
|
131
|
-
const root=document.createElement('div'),renderer=new CanvasRenderer(root,pose.assets.pageImages);try{renderer.backend=capture.backend;renderer.viewport={...pose.camera.visible};renderer.pixelRatio=pose.camera.viewport.width/pose.camera.visible.width;renderer.render(pose.posed);ctx.drawImage(renderer.canvas,0,0,pose.camera.viewport.width,pose.camera.viewport.height);}finally{renderer.dispose();}
|
|
141
|
+
paintPosedViewport(ctx,pose.posed,pose.assets,pose.camera,capture.backend);
|
|
132
142
|
}else if(capture.strictActualPixels){throw new Error('JOB_STILL_CAPTURE_FAILED');
|
|
133
143
|
}else if(pose.media){const media=pose.media,style=getComputedStyle(media),a=media.getBoundingClientRect(),b=capture.pane.getBoundingClientRect();if(!transparent(style.backgroundColor)){ctx.fillStyle=style.backgroundColor;ctx.fillRect(a.left-b.left-capture.pane.clientLeft,a.top-b.top-capture.pane.clientTop,a.width,a.height);}const w=media instanceof HTMLVideoElement?media.videoWidth:media.naturalWidth,h=media instanceof HTMLVideoElement?media.videoHeight:media.naturalHeight,first=projectMark({x:0,y:0},pose.camera),last=projectMark({x:w,y:h},pose.camera);ctx.drawImage(media,first.x,first.y,last.x-first.x,last.y-first.y);
|
|
134
144
|
}else throw new Error('COMMENT_CROP_UNAVAILABLE: this viewport has no rendered pixels');
|
|
@@ -1,12 +1,14 @@
|
|
|
1
1
|
/** The existing single inspection camera controller, detached from its model provider. */
|
|
2
|
-
import {cameraFrame,cameraSignature,cameraFromSignature,assertCameraView,boundsFitSignature,dragSignature,zoomSignature,type CameraFrame,type CameraPoint,type CameraSignature} from './camera-view.ts';
|
|
2
|
+
import {cameraFrame,cameraSignature,cameraFromSignature,assertCameraView,boundsFitSignature,dragSignature,zoomSignature,type CameraFrame,type CameraPoint,type CameraSignature,type PaneCamera} from './camera-view.ts';
|
|
3
3
|
import {bindPan,bindStageLayout,type PanCarry,type ViewPoint} from './view-controls.ts';
|
|
4
4
|
import {numericCamera} from './inspection-persistence.ts';
|
|
5
5
|
import type {ControlView} from '../src/control.ts';
|
|
6
|
-
export type CameraTarget='rig'|'reference';
|
|
6
|
+
export type CameraTarget='rig'|'reference'|'a'|'b';
|
|
7
7
|
export interface ViewportState {
|
|
8
8
|
cameraSync:boolean;activeCamera:CameraTarget;cameraRestoring:boolean;cameraLayout:string;
|
|
9
9
|
cameraFrames:Partial<Record<CameraTarget,CameraFrame>>;
|
|
10
|
+
/** Optional named cameras; the canonical pair retains its existing state fields. */
|
|
11
|
+
cameras?:Partial<Record<CameraTarget,PaneCamera>>;
|
|
10
12
|
zoom:number;cameraCenter:ViewPoint|null;referenceCenter:ViewPoint|null;
|
|
11
13
|
rigScale:number;referenceScale:number;referenceZoom:number;displayedCenter:ViewPoint|null;
|
|
12
14
|
}
|
|
@@ -14,8 +16,16 @@ export function createViewportState():ViewportState {return {cameraSync:true,act
|
|
|
14
16
|
export interface ViewportGeometry {space:'world'|'image';box:{x:number;y:number;width:number;height:number};marginX:number;marginY:number}
|
|
15
17
|
export interface ViewportProvider {
|
|
16
18
|
/** Real mounted panes; the canonical rig host uses the default pair. */
|
|
17
|
-
panes?:{target:CameraTarget;viewport:HTMLElement;pane:HTMLElement}[];
|
|
19
|
+
panes?:{target:CameraTarget;viewport:HTMLElement;pane:HTMLElement;fallback?:CameraTarget}[];
|
|
20
|
+
/** Legacy layouts determine visibility by measured dimensions, including cached replay. */
|
|
21
|
+
dimensionVisibility?:boolean;
|
|
22
|
+
fitMargins?:{x:number;y:number};
|
|
23
|
+
fitMessage?:(selected:boolean)=>string;
|
|
24
|
+
/** False retains hosts whose navigation never supplied a two-touch gesture. */
|
|
25
|
+
pinch?:boolean;
|
|
18
26
|
nativeScale?:boolean;
|
|
27
|
+
/** Provider frames share actual image/world coordinates, rather than relative frame signatures. */
|
|
28
|
+
absoluteSync?:boolean;
|
|
19
29
|
el:<T extends HTMLElement=HTMLElement>(id:string)=>T;
|
|
20
30
|
geometry:(target:CameraTarget)=>ViewportGeometry|null;
|
|
21
31
|
layoutKey:()=>string;
|
|
@@ -25,69 +35,139 @@ export interface ViewportProvider {
|
|
|
25
35
|
message:(value:string,error?:boolean)=>void;
|
|
26
36
|
}
|
|
27
37
|
export interface ViewportController {
|
|
28
|
-
|
|
38
|
+
/** Center the target at one CSS px per current pane coordinate unit, or throw before any camera changes.
|
|
39
|
+
* Relative providers retain the target's signature; absolute providers retain its physical centre and scale. */
|
|
40
|
+
unitScaleCamera:(target?:CameraTarget|null)=>void;
|
|
41
|
+
/** Owe the view a Fit: it lands once the active pane has a measured size, and a later layout size fits it again
|
|
42
|
+
* until any camera is written (a person's pan, zoom or Fit, a restore). */
|
|
43
|
+
requestFit:()=>void;
|
|
44
|
+
/** Drop an owed or held Fit, for a caller that sets the camera itself (a restored bookmark). */
|
|
45
|
+
cancelFit:()=>void;
|
|
46
|
+
state:ViewportState;paneFrame:(target:CameraTarget,hidden?:boolean)=>CameraFrame|null;paneCamera:(target:CameraTarget)=>PaneCamera;writeCamera:(target:CameraTarget,value:PaneCamera)=>void;activateCamera:(target:CameraTarget)=>void;availableCamera:()=>CameraTarget|null;alignCameras:()=>void;renderCameraControls:()=>void;setCameraSync:(value:boolean)=>void;cameraAction:(action:()=>void)=>void;updateCamera:(target:CameraTarget,value:CameraSignature,group?:readonly CameraTarget[])=>void;zoomCamera:(factor:number,target?:CameraTarget|null,point?:CameraPoint|null)=>void;panCamera:(target:CameraTarget,dx:number,dy:number)=>void;fitActiveCamera:(target?:CameraTarget|null)=>void;fitSelection:(target?:CameraTarget|null)=>void;zoomViewport:(target:CameraTarget,deltaY:number,point?:CameraPoint|null)=>void;fitCamera:()=>void;numericView:()=>ControlView;renderNumericView:()=>void;bindControls:(onUnitScale?:(target:CameraTarget)=>void)=>()=>void;bindNavigation:(carryRig?:PanCarry|((target:CameraTarget)=>PanCarry|undefined),enabled?:()=>boolean)=>()=>void;observeResize:()=>ResizeObserver;
|
|
29
47
|
}
|
|
30
48
|
|
|
31
49
|
export function createViewportController(provider:ViewportProvider,state=createViewportState()):ViewportController {
|
|
32
|
-
const {el,message}=provider;const panes=()
|
|
33
|
-
const range=(frame:CameraFrame)=>provider.nativeScale?{min:Math.min(frame.fitScale??1,1),max:16}:{min:.25,max:8};const from=(value:CameraSignature,frame:CameraFrame)=>{const limits=range(frame);if(provider.nativeScale&&(!Number.isFinite(value.zoom)||value.zoom<limits.min||value.zoom>limits.max))throw new Error('PARTS_CAMERA_RANGE: native zoom outside supported range');return cameraFromSignature(value,frame,limits);};const input=(id:string)=>el<HTMLInputElement>(id),button=(id:string)=>el<HTMLButtonElement>(id);
|
|
50
|
+
const {el,message}=provider;const panes=():NonNullable<ViewportProvider['panes']>=>provider.panes??(['rig','reference'] as const).map(target=>({target,viewport:el(target+'-viewport'),pane:el(target+'-pane')}));const targets=()=>panes().map(p=>p.target);const paneNodes=(target:CameraTarget)=>panes().find(p=>p.target===target);
|
|
51
|
+
const range=(frame:CameraFrame)=>provider.nativeScale?{min:Math.min(frame.fitScale??1,1,...(provider.absoluteSync&&state.cameraSync?targets().flatMap(target=>{const peer=paneFrame(target);return peer?[peer.fitScale??1]:[];}):[])),max:16}:{min:.25,max:8};const from=(value:CameraSignature,frame:CameraFrame)=>{const limits=range(frame);if(provider.nativeScale&&(!Number.isFinite(value.zoom)||value.zoom<limits.min||value.zoom>limits.max))throw new Error('PARTS_CAMERA_RANGE: native zoom outside supported range');return cameraFromSignature(value,frame,limits);};const input=(id:string)=>el<HTMLInputElement>(id),button=(id:string)=>el<HTMLButtonElement>(id);
|
|
34
52
|
function paneFrame(target:CameraTarget,hidden=false):CameraFrame|null {
|
|
35
|
-
const
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
53
|
+
const nodes=paneNodes(target);if(!nodes)return null;
|
|
54
|
+
const {viewport,pane,fallback}=nodes;
|
|
55
|
+
let width=viewport.clientWidth,height=viewport.clientHeight;
|
|
56
|
+
if(provider.dimensionVisibility&&(width<=0||height<=0)){
|
|
57
|
+
if(!hidden)return null;if(state.cameraFrames[target])return state.cameraFrames[target]!;
|
|
58
|
+
const sibling=fallback&&paneNodes(fallback);if(sibling){width=sibling.viewport.clientWidth;height=sibling.viewport.clientHeight;}
|
|
59
|
+
if(width<=0||height<=0)return null;
|
|
60
|
+
}
|
|
61
|
+
const geometry=provider.geometry(target);
|
|
62
|
+
if(!geometry){if(!provider.dimensionVisibility)delete state.cameraFrames[target];return null;}
|
|
63
|
+
if(!provider.dimensionVisibility&&(pane.hidden||width<=0||height<=0))return hidden?state.cameraFrames[target]??null:null;
|
|
64
|
+
const frame=cameraFrame(geometry.space,geometry.box,width,height,geometry.marginX,geometry.marginY);
|
|
39
65
|
if(frame&&provider.nativeScale){frame.fitScale=frame.baseScale;frame.baseScale=1;}
|
|
40
66
|
if(frame)state.cameraFrames[target]=frame;return frame;
|
|
41
67
|
}
|
|
42
|
-
function paneCamera(target:CameraTarget){return target==='rig'?{zoom:state.zoom,center:state.cameraCenter}:{zoom:state.referenceZoom,center:state.referenceCenter};}
|
|
43
|
-
|
|
68
|
+
function paneCamera(target:CameraTarget){return state.cameras?.[target]??(target==='rig'?{zoom:state.zoom,center:state.cameraCenter}:{zoom:state.referenceZoom,center:state.referenceCenter});}
|
|
69
|
+
// Fit owed until a pane is measured (`owed`), then held (`held`) and repeated on a new layout until another camera write.
|
|
70
|
+
let fitOwed=false,fitHeld=false,fitting=false;
|
|
71
|
+
/** True once the Fit landed. Relative providers fit each pane's own frame; absolute providers fit the shared region
|
|
72
|
+
* at one admissible scale. A refused Fit stays owed and never throws. */
|
|
73
|
+
function settleFit():boolean {
|
|
74
|
+
if(fitting||state.cameraRestoring||(!fitOwed&&!fitHeld))return false;
|
|
75
|
+
const target=availableCamera();if(!target||!paneFrame(target))return false;
|
|
76
|
+
const updates:Partial<Record<CameraTarget,ReturnType<typeof cameraFromSignature>>>={};
|
|
77
|
+
const sharedFit=provider.absoluteSync&&state.cameraSync?Math.min(16,...targets().flatMap(other=>{const frame=paneFrame(other);return frame?[frame.fitScale??1]:[];})):null;
|
|
78
|
+
try{for(const other of targets()){const frame=paneFrame(other);if(frame)updates[other]=from({zoom:sharedFit??(provider.nativeScale?Math.min(frame.fitScale??1,16):1),pan:{x:0,y:0}},frame);}}catch{return false;}
|
|
79
|
+
fitting=true;
|
|
80
|
+
try{for(const other of targets()){const update=updates[other];if(update)writeCamera(other,update);}state.activeCamera=target;fitOwed=false;fitHeld=true;fitCamera();renderCameraControls();return true;}
|
|
81
|
+
finally{fitting=false;}
|
|
82
|
+
}
|
|
83
|
+
function requestFit():void {fitOwed=true;fitHeld=false;void settleFit();}
|
|
84
|
+
function cancelFit():void {fitOwed=false;fitHeld=false;}
|
|
85
|
+
function writeCamera(target:CameraTarget,value:ReturnType<typeof cameraFromSignature>):void {if(!fitting)cancelFit();if(provider.nativeScale){const frame=paneFrame(target);if(frame){const limits=range(frame);if(!Number.isFinite(value.zoom)||value.zoom<limits.min||value.zoom>limits.max)throw new Error('PARTS_CAMERA_RANGE: native zoom outside supported range');assertCameraView(value,frame,limits);}}if(state.cameras){state.cameras[target]=value;}else if(target==='rig'){state.zoom=value.zoom;state.cameraCenter=value.center;}else{state.referenceZoom=value.zoom;state.referenceCenter=value.center;}}
|
|
44
86
|
function activateCamera(target:CameraTarget):void {if(paneFrame(target)){state.activeCamera=target;renderCameraControls();}}
|
|
45
|
-
function availableCamera():CameraTarget|null {return paneFrame(state.activeCamera)?state.activeCamera:
|
|
87
|
+
function availableCamera():CameraTarget|null {return paneFrame(state.activeCamera)?state.activeCamera:targets().find(target=>paneFrame(target))??null;}
|
|
46
88
|
function alignCameras():void {
|
|
47
89
|
const target=availableCamera();if(!target)return;
|
|
90
|
+
// Aligning peers to the active camera keeps an owed or held Fit: only the peers move, to the active pane's signature.
|
|
91
|
+
const wasFitting=fitting;fitting=true;try{alignPeers(target);}finally{fitting=wasFitting;}
|
|
92
|
+
}
|
|
93
|
+
function alignPeers(target:CameraTarget):void {
|
|
48
94
|
const frame=paneFrame(target)!;assertCameraView(paneCamera(target),frame,range(frame));const signature=cameraSignature(paneCamera(target),frame);
|
|
49
95
|
const updates:Partial<Record<CameraTarget,ReturnType<typeof cameraFromSignature>>>={};
|
|
50
|
-
for(const other of targets()){if(other===target)continue;const next=paneFrame(other);if(next)
|
|
96
|
+
for(const other of targets()){if(other===target)continue;const next=paneFrame(other);if(next){const update=provider.absoluteSync?{zoom:paneCamera(target).zoom,center:{...(paneCamera(target).center??frame.center)}}:from(signature,next);assertCameraView(update,next,range(next));updates[other]=update;}}
|
|
51
97
|
for(const other of targets()){const update=updates[other];if(update)writeCamera(other,update);}state.activeCamera=target;
|
|
52
98
|
}
|
|
53
99
|
function renderCameraControls():void {provider.renderControls(api);}
|
|
54
|
-
function setCameraSync(value:boolean):void {if(value)alignCameras();state.cameraSync=value;fitCamera();renderCameraControls();}
|
|
100
|
+
function setCameraSync(value:boolean):void {if(value&&provider.absoluteSync){state.cameraSync=true;requestFit();}else{if(value)alignCameras();state.cameraSync=value;}fitCamera();renderCameraControls();}
|
|
55
101
|
function cameraAction(action:()=>void):void {try{action();}catch(error){renderCameraControls();message(error instanceof Error?error.message:String(error),true);}}
|
|
56
|
-
function updateCamera(target:CameraTarget,value:CameraSignature):void {
|
|
102
|
+
function updateCamera(target:CameraTarget,value:CameraSignature,group:readonly CameraTarget[]=[]):void {
|
|
57
103
|
const frame=paneFrame(target);if(!frame)return;
|
|
58
104
|
const updates:Partial<Record<CameraTarget,ReturnType<typeof cameraFromSignature>>>={[target]:from(value,frame)};
|
|
59
|
-
|
|
105
|
+
for(const other of targets()){if(other===target||!state.cameraSync&&!group.includes(other))continue;const next=paneFrame(other);if(next){const update=provider.absoluteSync?{zoom:updates[target]!.zoom,center:{...updates[target]!.center!}}:from(value,next);assertCameraView(update,next,range(next));updates[other]=update;}}
|
|
60
106
|
for(const other of targets()){const update=updates[other];if(update)writeCamera(other,update);}state.activeCamera=target;
|
|
61
107
|
fitCamera();renderCameraControls();
|
|
62
108
|
}
|
|
63
109
|
function zoomCamera(factor:number,target=availableCamera(),point?:CameraPoint|null):void {if(!target)return;const frame=paneFrame(target);if(frame)updateCamera(target,zoomSignature(cameraSignature(paneCamera(target),frame),factor,frame,point,provider.nativeScale?range(frame):undefined));}
|
|
110
|
+
function unitScaleCamera(target=availableCamera()):void {
|
|
111
|
+
if(!target)throw new Error('CONTROL_CAMERA_UNAVAILABLE');
|
|
112
|
+
// Never use the cached frame of a hidden or zero-sized pane for this action.
|
|
113
|
+
const frame=paneFrame(target);
|
|
114
|
+
if(!frame)throw new Error('CONTROL_CAMERA_UNAVAILABLE');
|
|
115
|
+
const zoom=1/frame.baseScale;
|
|
116
|
+
// Validate the exact reciprocal, without wheel zoom's clamping. updateCamera
|
|
117
|
+
// prepares every synchronized candidate before assigning any live camera.
|
|
118
|
+
assertCameraView({zoom,center:frame.center},frame,range(frame));
|
|
119
|
+
updateCamera(target,{zoom,pan:{x:0,y:0}});
|
|
120
|
+
}
|
|
64
121
|
function panCamera(target:CameraTarget,dx:number,dy:number):void {const frame=paneFrame(target);if(frame)updateCamera(target,dragSignature(cameraSignature(paneCamera(target),frame),frame,dx,dy));}
|
|
65
|
-
function fitActiveCamera(target=availableCamera()):void {if(!target)return;if(provider.nativeScale){const frame=paneFrame(target);if(frame)
|
|
122
|
+
function fitActiveCamera(target=availableCamera()):void {if(!target)return;if(provider.nativeScale){const frame=paneFrame(target);if(frame){const peers=state.cameraSync?targets().flatMap(other=>{const peer=paneFrame(other);return peer?[peer]:[];}):[frame];const fit=provider.absoluteSync&&state.cameraSync?Math.min(...peers.map(peer=>peer.fitScale??1)):frame.fitScale??1;const minimum=Math.max(...peers.map(peer=>range(peer).min));updateCamera(target,{zoom:Math.min(16,Math.max(fit,minimum)),pan:{x:0,y:0}});}return;}const part=provider.selection(target);if(target!=='reference'&&part.selected){const box=part.bounds,frame=paneFrame(target);if(!box||!frame){message('PART_FIT_UNAVAILABLE: selected slot has no positive drawn bounds.',true);return;}const margin=provider.fitMargins??{x:28,y:58};updateCamera(target,boundsFitSignature(box,frame,margin.x,margin.y));message(provider.fitMessage?.(true)??'Selected slot fitted.');}else{if(!paneFrame(target))return;updateCamera(target,{zoom:1,pan:{x:0,y:0}});message(provider.fitMessage?.(false)??'View fitted.');}}
|
|
66
123
|
function zoomViewport(target:CameraTarget,deltaY:number,point?:CameraPoint|null):void {zoomCamera(deltaY<0?1.1:1/1.1,target,point);}
|
|
67
124
|
|
|
68
125
|
|
|
69
126
|
function fitCamera():void {
|
|
70
|
-
const layout=provider.layoutKey();
|
|
71
|
-
|
|
127
|
+
const layout=provider.layoutKey(),relaid=layout!==state.cameraLayout;
|
|
128
|
+
// An owed or held Fit settles first: it fits every pane to its own frame, so there is nothing left to align.
|
|
129
|
+
if(!fitting&&(fitOwed||fitHeld&&relaid)){state.cameraLayout=layout;if(settleFit())return;}
|
|
130
|
+
if(provider.nativeScale&&state.cameraSync&&!state.cameraRestoring&&!fitting&&relaid){
|
|
131
|
+
const visible=targets().flatMap(target=>{const frame=paneFrame(target);return frame?[{target,frame}]:[];});
|
|
132
|
+
const minimum=Math.max(...visible.map(({frame})=>range(frame).min)),maximum=Math.min(...visible.map(({frame})=>range(frame).max));
|
|
133
|
+
for(const {target}of visible){
|
|
134
|
+
const camera=paneCamera(target),zoom=Math.max(minimum,Math.min(maximum,camera.zoom));
|
|
135
|
+
if(zoom!==camera.zoom)writeCamera(target,{zoom,center:camera.center});
|
|
136
|
+
}
|
|
137
|
+
}
|
|
138
|
+
if(state.cameraSync&&!state.cameraRestoring&&!fitting&&relaid)alignCameras();state.cameraLayout=layout;
|
|
72
139
|
provider.render(api);
|
|
73
140
|
}
|
|
74
141
|
function numericView():ControlView {
|
|
142
|
+
// ResizeObserver delivery can follow a pointer event. Keep native-image evidence
|
|
143
|
+
// on the same freshly rendered layout before exporting its camera coordinates.
|
|
144
|
+
if(provider.nativeScale&&provider.layoutKey()!==state.cameraLayout)fitCamera();
|
|
75
145
|
const numeric=(target:CameraTarget)=>{const frame=paneFrame(target,true);if(!frame)return null;const camera=paneCamera(target);if(provider.nativeScale){const center=camera.center??frame.center;return {space:frame.space,center,zoom:camera.zoom,viewport:{width:frame.width,height:frame.height},visible:{x:center.x-frame.width/camera.zoom/2,y:center.y-frame.height/camera.zoom/2,width:frame.width/camera.zoom,height:frame.height/camera.zoom}};}return numericCamera(frame.space,camera.center??frame.center,camera.zoom,frame.baseScale*camera.zoom,frame.width,frame.height);};
|
|
76
|
-
|
|
146
|
+
const cameras:ControlView['cameras']={rig:null,a:null,b:null,reference:null};for(const target of targets())cameras[target]=numeric(target);
|
|
147
|
+
return {schema:'rig-review-view/1',cameraSync:state.cameraSync,activeCamera:state.activeCamera,cameras};
|
|
77
148
|
}
|
|
78
149
|
function renderNumericView():void {const node=document.getElementById('view-coordinates');if(node)node.textContent=JSON.stringify(numericView(),null,2);}
|
|
79
150
|
|
|
80
|
-
function bindControls():void {
|
|
151
|
+
function bindControls(onUnitScale?:(target:CameraTarget)=>void):()=>void {
|
|
81
152
|
button('zoom-in').onclick=()=>cameraAction(()=>zoomCamera(1.25));button('zoom-out').onclick=()=>cameraAction(()=>zoomCamera(1/1.25));button('fit').onclick=()=>cameraAction(()=>fitActiveCamera());
|
|
153
|
+
let nativeOne:HTMLButtonElement|null=null;
|
|
154
|
+
try{nativeOne=button('native-one')??null;}catch{/* Compare and older hosts have no native-scale control. */}
|
|
155
|
+
if(nativeOne)nativeOne.onclick=()=>cameraAction(()=>{const target=availableCamera();unitScaleCamera(target);if(target)onUnitScale?.(target);});
|
|
82
156
|
input('camera-sync').onchange=()=>cameraAction(()=>setCameraSync(input('camera-sync').checked));
|
|
83
|
-
|
|
84
|
-
for(const {target,viewport}of panes())
|
|
157
|
+
const disposers:(()=>void)[]=[];
|
|
158
|
+
for(const {target,viewport}of panes()){
|
|
159
|
+
const activate=()=>activateCamera(target);
|
|
160
|
+
const wheel=(event:WheelEvent)=>{event.preventDefault();const rect=viewport.getBoundingClientRect();cameraAction(()=>zoomViewport(target,event.deltaY,{x:event.clientX-rect.left,y:event.clientY-rect.top}));};
|
|
161
|
+
for(const event of ['pointerdown','focusin'] as const){viewport.addEventListener(event,activate);disposers.push(()=>viewport.removeEventListener(event,activate));}
|
|
162
|
+
viewport.addEventListener('wheel',wheel,{passive:false});disposers.push(()=>viewport.removeEventListener('wheel',wheel));
|
|
163
|
+
}
|
|
164
|
+
return ()=>{for(const dispose of disposers)dispose();if(nativeOne)nativeOne.onclick=null;for(const id of ['zoom-in','zoom-out','fit'])button(id).onclick=null;input('camera-sync').onchange=null;};
|
|
85
165
|
}
|
|
86
|
-
function bindNavigation(carryRig?:PanCarry,enabled:()=>boolean=()=>true):()=>void {
|
|
166
|
+
function bindNavigation(carryRig?:PanCarry|((target:CameraTarget)=>PanCarry|undefined),enabled:()=>boolean=()=>true):()=>void {
|
|
87
167
|
const disposers:(()=>void)[]=[];disposers.push(bindStageLayout(el('stage-layout'),fitCamera));
|
|
88
|
-
for(const target
|
|
168
|
+
for(const {target,viewport}of panes())disposers.push(bindPan(viewport,(dx,dy)=>cameraAction(()=>panCamera(target,dx,dy)),enabled,typeof carryRig==='function'?carryRig(target):target==='rig'?carryRig:undefined,provider.pinch===false?undefined:(factor,at,delta)=>cameraAction(()=>{zoomCamera(factor,target,at);panCamera(target,delta.x,delta.y);})));
|
|
89
169
|
return ()=>disposers.forEach(dispose=>dispose());
|
|
90
170
|
}
|
|
91
171
|
function observeResize():ResizeObserver {const resize=new ResizeObserver(fitCamera);for(const {viewport}of panes())resize.observe(viewport);return resize;}
|
|
92
|
-
const api={state,paneFrame,paneCamera,writeCamera,activateCamera,availableCamera,alignCameras,renderCameraControls,setCameraSync,cameraAction,updateCamera,zoomCamera,panCamera,fitActiveCamera,zoomViewport,fitCamera,numericView,renderNumericView,bindControls,bindNavigation,observeResize};return api;
|
|
172
|
+
const api={state,requestFit,cancelFit,paneFrame,paneCamera,writeCamera,activateCamera,availableCamera,alignCameras,renderCameraControls,setCameraSync,cameraAction,updateCamera,zoomCamera,unitScaleCamera,panCamera,fitActiveCamera,fitSelection:fitActiveCamera,zoomViewport,fitCamera,numericView,renderNumericView,bindControls,bindNavigation,observeResize};return api;
|
|
93
173
|
}
|
package/web/viewport-pair.ts
CHANGED
|
@@ -2,4 +2,5 @@
|
|
|
2
2
|
export const viewportPairMarkup="<section id=\"reference-pane\" class=\"stage-pane\" aria-label=\"Reference\"><span id=\"reference-label\" class=\"pane-label\">Reference</span><div id=\"reference-viewport\" class=\"viewport\"><div id=\"reference-content\" class=\"reference-content\"></div><div id=\"reference-empty\" class=\"empty\">No reference supplied.</div></div></section><section id=\"rig-pane\" class=\"stage-pane\" aria-label=\"Rig\"><span id=\"rig-label\" class=\"pane-label\">Generated rig · read only</span><div id=\"rig-viewport\" class=\"viewport\"><div id=\"rig-root\"></div><canvas id=\"rig-overlay\" class=\"rig-overlay\" aria-label=\"Actual rig mesh and bone overlay\"></canvas><div id=\"idle-handles\" class=\"idle-handles\" hidden aria-label=\"Chain amplitude handles\"></div><div id=\"rig-fields-stage\" class=\"rig-fields-stage\" hidden aria-label=\"Rig field handles\"></div><div id=\"rig-empty\" class=\"empty\">No compiled model supplied.</div></div></section>";
|
|
3
3
|
export const viewportPairPlaceholder="<!-- shared:viewport-pair -->";
|
|
4
4
|
export function expandViewportPair(html:string):string {return html.replace(viewportPairPlaceholder,viewportPairMarkup);}
|
|
5
|
-
|
|
5
|
+
/** A caller-owned caption occupies the C5 line immediately below the main view. */
|
|
6
|
+
export function mountViewportPair(host:HTMLElement,options:{footer?:HTMLElement}={}):void {host.innerHTML=viewportPairMarkup;if(options.footer)host.after(options.footer);}
|
|
@@ -7,9 +7,10 @@ export type WorkspaceLanguage='system'|'en'|'ko';
|
|
|
7
7
|
* `rightWidth` is the parts explorer's width wherever the page shows it (the single review page shows
|
|
8
8
|
* it on the left); `leftWidth` is the compare page's sources column. */
|
|
9
9
|
export interface WorkspacePanels {leftWidth:number;rightWidth:number;inspectorHeight:number}
|
|
10
|
-
export const panelBounds=Object.freeze({leftWidth:Object.freeze({min:120,max:720}),rightWidth:Object.freeze({min:180,max:900}),inspectorHeight:Object.freeze({min:
|
|
11
|
-
export const defaultWorkspacePanels:Readonly<WorkspacePanels>=Object.freeze({leftWidth:170,rightWidth:260,inspectorHeight:
|
|
12
|
-
|
|
10
|
+
export const panelBounds=Object.freeze({leftWidth:Object.freeze({min:120,max:720}),rightWidth:Object.freeze({min:180,max:900}),inspectorHeight:Object.freeze({min:120,max:900})});
|
|
11
|
+
export const defaultWorkspacePanels:Readonly<WorkspacePanels>=Object.freeze({leftWidth:170,rightWidth:260,inspectorHeight:262});
|
|
12
|
+
/** Earlier defaults (280, then 350, then 120 and 240 on the #709 branch): an unstamped stored value equal to one loads as today's default. */
|
|
13
|
+
const legacyDefaultInspectorHeights:ReadonlySet<number>=new Set([280,350,120,240]);
|
|
13
14
|
type Flag='defaultCameraSync'|'defaultIdleRepeat'|'settingsCollapsed';
|
|
14
15
|
type Field='theme'|'language'|Flag|keyof WorkspacePanels;
|
|
15
16
|
const fields:readonly Field[]=['theme','language','defaultCameraSync','defaultIdleRepeat','settingsCollapsed','leftWidth','rightWidth','inspectorHeight'];
|
|
@@ -39,7 +40,7 @@ export function parseWorkspacePreferences(value:unknown):WorkspacePreferences {
|
|
|
39
40
|
const o=object(value,'preferences');closed(o,['schema','revision','theme','language','defaultCameraSync','defaultIdleRepeat','settingsCollapsed','panels','stamps'],'preferences');if(o.schema!==workspacePreferenceKey)throw new Error('PREFERENCES_VERSION: unsupported schema');
|
|
40
41
|
const result=defaultWorkspacePreferences();result.theme=theme(o.theme);if('language'in o)result.language=language(o.language);result.defaultCameraSync=boolean(o.defaultCameraSync,'defaultCameraSync');result.defaultIdleRepeat=boolean(o.defaultIdleRepeat,'defaultIdleRepeat');if('settingsCollapsed'in o)result.settingsCollapsed=boolean(o.settingsCollapsed,'settingsCollapsed');result.panels=parseWorkspacePanels(o.panels);
|
|
41
42
|
const stamps=object(o.stamps,'stamps');closed(stamps,fields,'stamps');
|
|
42
|
-
for(const field of fields){const stamp=stamps[field]===undefined&&addedFields.has(field)?{revision:0,writer:''}:object(stamps[field],`stamps.${field}`);closed(stamp,['revision','writer'],`stamps.${field}`);if(typeof stamp.revision!=='number'||!Number.isSafeInteger(stamp.revision)||stamp.revision<0||typeof stamp.writer!=='string'||!(/^[A-Za-z0-9_-]{1,80}$/.test(stamp.writer)||stamp.revision===0&&stamp.writer===''))throw new Error(`PREFERENCES_STAMP: invalid ${field} revision/writer`);if(field==='inspectorHeight'&&stamp.revision===0&&stamp.writer===''&&result.panels.inspectorHeight
|
|
43
|
+
for(const field of fields){const stamp=stamps[field]===undefined&&addedFields.has(field)?{revision:0,writer:''}:object(stamps[field],`stamps.${field}`);closed(stamp,['revision','writer'],`stamps.${field}`);if(typeof stamp.revision!=='number'||!Number.isSafeInteger(stamp.revision)||stamp.revision<0||typeof stamp.writer!=='string'||!(/^[A-Za-z0-9_-]{1,80}$/.test(stamp.writer)||stamp.revision===0&&stamp.writer===''))throw new Error(`PREFERENCES_STAMP: invalid ${field} revision/writer`);if(field==='inspectorHeight'&&stamp.revision===0&&stamp.writer===''&&legacyDefaultInspectorHeights.has(result.panels.inspectorHeight))result.panels.inspectorHeight=defaultWorkspacePanels.inspectorHeight;if(stamp.revision===0&&(stamp.writer!==''||leaf(result,field)!==leaf(defaultWorkspacePreferences(),field)))throw new Error(`PREFERENCES_STAMP: unstamped ${field} differs from defaults`);result.stamps[field]={revision:stamp.revision,writer:stamp.writer};}
|
|
43
44
|
const revision=Math.max(...fields.map(field=>result.stamps[field].revision));if(o.revision!==revision)throw new Error('PREFERENCES_REVISION: record revision must equal maximum field revision');result.revision=revision;return result;
|
|
44
45
|
}
|
|
45
46
|
function parseText(raw:string):WorkspacePreferences {if(raw.length>8192)throw new Error('PREFERENCES_SIZE: record exceeds 8192 characters');return parseWorkspacePreferences(JSON.parse(raw));}
|