@rig-c/review 2.3.0 → 2.3.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/package.json +1 -1
- package/web/main.ts +1 -1
- package/web/rig-viewport-provider.ts +29 -5
package/package.json
CHANGED
package/web/main.ts
CHANGED
|
@@ -1127,7 +1127,7 @@ async function playPreview():Promise<void> {
|
|
|
1127
1127
|
}
|
|
1128
1128
|
function localDraft():boolean{return !!comments?.draft()||dirty||!!input('feedback-summary').value.trim()||!!input('feedback-start').value.trim()||!!input('feedback-end').value.trim()||!!select('feedback-category').value||!!input('feedback-target-name').value.trim()&&input('feedback-target-name').value!==data.manifest.id;}
|
|
1129
1129
|
function controlState():ControlInspection {
|
|
1130
|
-
const box=assets?.stage??player?.bounds(),center=box?{x:box.x+box.width/2,y:box.y+box.height/2}:null;
|
|
1130
|
+
const box=assets?.stage??player?.bounds(),center=viewport.paneFrame('rig')?.center??(box?{x:box.x+box.width/2,y:box.y+box.height/2}:null);
|
|
1131
1131
|
return {part:parts?.value()??null,partGeneration:parts?.observation()?.generation??null,view:numericView(),theme:appearance?.get()??'system',layout:'auto',effectiveLayout:el('stage-layout').dataset.orientation==='vertical'?'column':'row',cameras:{rig:{zoom:player?viewport.state.zoom:1,pan:{x:center&&viewport.state.cameraCenter?(center.x-viewport.state.cameraCenter.x)*viewport.state.rigScale:0,y:center&&viewport.state.cameraCenter?(viewport.state.cameraCenter.y-center.y)*viewport.state.rigScale:0}},reference:{zoom:referenceSize?viewport.state.referenceZoom:1,pan:{x:referenceSize&&viewport.state.referenceCenter?(referenceSize.width/2-viewport.state.referenceCenter.x)*viewport.state.referenceScale:0,y:referenceSize&&viewport.state.referenceCenter?(referenceSize.height/2-viewport.state.referenceCenter.y)*viewport.state.referenceScale:0}}},animation:animation||null,time,playing,loop:canRepeatIdle()?'idle':'off',layers:{images:!!player&&layers.images,meshes:!!player&&layers.mesh,bones:!!player&&layers.bones},ready:!!data,seeking:seekingControl||!!video?.seeking||!!persistence?.restoring(),dirty:localDraft(),busy:saving||stripBusy||!!persistence?.restoring(),feedbackEligible:!persistence?.restoring(),comparison:controlComparison(layoutEligibility()),capabilities:{camera:!!player,referenceCamera:!!referenceSize,animation:!!player,time:duration>0,playback:duration>0,layers:{images:!!player,meshes:!!player,bones:!!player}}};
|
|
1132
1132
|
}
|
|
1133
1133
|
async function applyControl(command:ControlCommand,signal:AbortSignal):Promise<void> {
|
|
@@ -1,16 +1,40 @@
|
|
|
1
1
|
/** Existing compiled rig/reference rendering for the shared inspection viewport. */
|
|
2
|
-
import type {ModelAssets,RigPlayer,PoseBounds} from '@rig-c/play';
|
|
2
|
+
import type {ModelAssets,RigPlayer,PoseBounds,PosedFrame} from '@rig-c/play';
|
|
3
3
|
import type {ViewportProvider,ViewportState,ViewportController} from './viewport-controller.ts';
|
|
4
4
|
import {dragImpulse} from '../src/environment.ts';
|
|
5
5
|
import {CLICK_SLOP_PX} from './stage-pick.ts';
|
|
6
6
|
export interface RigViewportHost {
|
|
7
7
|
el:ViewportProvider['el'];player:()=>RigPlayer|null;assets:()=>ModelAssets|null;
|
|
8
8
|
referenceSize:()=>{width:number;height:number}|null;view:()=>string;referenceGeneration:()=>number;
|
|
9
|
-
parts:()=>{value:()=>unknown;bounds:()=>PoseBounds|null}|null;
|
|
9
|
+
parts:()=>{value:()=>unknown;bounds:()=>PoseBounds|null;frame?:(side:'single')=>PosedFrame|undefined}|null;
|
|
10
10
|
text:(id:string,value:string)=>void;message:ViewportProvider['message'];redrawOverlay:(fresh:boolean)=>void;
|
|
11
11
|
}
|
|
12
12
|
export function createRigViewportProvider(host:RigViewportHost,state:ViewportState):ViewportProvider {
|
|
13
13
|
const {el,text,message,redrawOverlay}=host;const input=(id:string)=>el<HTMLInputElement>(id),button=(id:string)=>el<HTMLButtonElement>(id);
|
|
14
|
+
const framingBoxes=new WeakMap<RigPlayer,{assets:ModelAssets|null;box:PoseBounds}>();
|
|
15
|
+
function positiveBounds(box:PoseBounds|null|undefined):box is PoseBounds {
|
|
16
|
+
return !!box&&box.width>0&&box.height>0&&[box.x,box.y,box.width,box.height,box.x+box.width,box.y+box.height].every(Number.isFinite);
|
|
17
|
+
}
|
|
18
|
+
function rigFramingBox():PoseBounds|null {
|
|
19
|
+
const player=host.player(),assets=host.assets();if(!player)return null;
|
|
20
|
+
const declared=assets?.stage;
|
|
21
|
+
// A model without a positive declared stage keeps its existing live pose/filter basis.
|
|
22
|
+
if(!positiveBounds(declared))return player.bounds();
|
|
23
|
+
const cached=framingBoxes.get(player);if(cached&&cached.assets===assets)return cached.box;
|
|
24
|
+
const stage={...declared},frame=host.parts()?.frame?.('single');
|
|
25
|
+
// present() records a successful draw. A prepared pose or later player slot filter
|
|
26
|
+
// must not become the whole-rig framing basis merely because bounds() is positive.
|
|
27
|
+
if(!frame||frame.generation===undefined||frame.generation!==player.generation||player.slots!==null)return stage;
|
|
28
|
+
const drawn=player.bounds();
|
|
29
|
+
if(!positiveBounds(drawn))return stage;
|
|
30
|
+
const x=Math.min(stage.x,drawn.x),y=Math.min(stage.y,drawn.y);
|
|
31
|
+
const box={x,y,width:Math.max(stage.x+stage.width,drawn.x+drawn.width)-x,
|
|
32
|
+
height:Math.max(stage.y+stage.height,drawn.y+drawn.height)-y};
|
|
33
|
+
if(!positiveBounds(box))return null;
|
|
34
|
+
// bounds() follows the live pose/filter. Keep one framing basis per loaded player/assets,
|
|
35
|
+
// including when a semantic publication is temporarily replaced and then restored.
|
|
36
|
+
framingBoxes.set(player,{assets,box});return box;
|
|
37
|
+
}
|
|
14
38
|
function referenceFit(controller:ViewportController): void {
|
|
15
39
|
const referenceSize=host.referenceSize();const {paneFrame}=controller;
|
|
16
40
|
if (!referenceSize || !paneFrame('reference')) return;
|
|
@@ -26,7 +50,7 @@ function render(controller:ViewportController): void {
|
|
|
26
50
|
const player=host.player(),assets=host.assets();const {paneFrame,renderNumericView,renderCameraControls}=controller;
|
|
27
51
|
referenceFit(controller);renderNumericView();renderCameraControls();
|
|
28
52
|
if (!player || !assets) return;
|
|
29
|
-
const box
|
|
53
|
+
const box=rigFramingBox();if(!box||box.width<=0||box.height<=0)return;
|
|
30
54
|
const viewport = el('rig-viewport');if(!paneFrame('rig'))return;
|
|
31
55
|
const scale = state.rigScale = Math.max(.001,Math.min((viewport.clientWidth - 28) / box.width, (viewport.clientHeight - 58) / box.height) * state.zoom);
|
|
32
56
|
const center = state.cameraCenter ?? { x: box.x + box.width / 2, y: box.y + box.height / 2 };state.displayedCenter={...center};
|
|
@@ -36,8 +60,8 @@ function render(controller:ViewportController): void {
|
|
|
36
60
|
|
|
37
61
|
function renderControls(controller:ViewportController):void {const {availableCamera,paneCamera}=controller;input('camera-sync').checked=state.cameraSync;const target=availableCamera();text('zoom-value',`${Math.round((target?paneCamera(target).zoom:1)*100)}% · ${target==='reference'?'Reference':'Rig'}`);button('fit').textContent=state.cameraSync?'Fit views':'Fit active';text('coordinates',state.cameraSync?'Cameras synchronized · drag to pan · scroll to zoom':'Independent cameras · drag to pan · scroll to zoom');}
|
|
38
62
|
return {el,message,render,renderControls,
|
|
39
|
-
geometry:target=>{const
|
|
40
|
-
layoutKey:()=>{const
|
|
63
|
+
geometry:target=>{const referenceSize=host.referenceSize();const box=target==='rig'?rigFramingBox():referenceSize?{x:0,y:0,...referenceSize}:null;if(!box)return null;return {space:target==='rig'?'world':'image',box,marginX:target==='rig'?28:24,marginY:target==='rig'?58:56};},
|
|
64
|
+
layoutKey:()=>{const player=host.player(),referenceSize=host.referenceSize(),view=host.view(),referenceGeneration=host.referenceGeneration();const boxKey=rigFramingBox();return ['rig','reference'].map(target=>{const v=el(target+'-viewport');return `${v.clientWidth}:${v.clientHeight}`;}).join('|')+view+referenceGeneration+!!player+JSON.stringify(referenceSize)+JSON.stringify(boxKey);},
|
|
41
65
|
selection:target=>{const parts=host.parts(),part=parts?.value();return {selected:!!part,bounds:target==='rig'&&part?parts?.bounds()??null:null};}
|
|
42
66
|
};
|
|
43
67
|
}
|