rig-review 2.9.0 → 2.11.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/docs/REVIEW_PACKAGE.md +194 -3
- package/package.json +1 -1
- package/src/job-api.ts +23 -9
- package/src/job-checkpoint-evidence.ts +113 -0
- package/src/job-contract.ts +97 -1
- package/src/job-front.ts +28 -7
- package/src/job-host.ts +2 -0
- package/src/job-session.ts +37 -5
- package/src/job-source.ts +136 -14
- package/web/catalog-en.ts +27 -0
- package/web/catalog-ko.ts +27 -0
- package/web/job-session.ts +410 -66
- package/web/parts.ts +6 -1
- package/web/stage-comments.ts +3 -3
- package/web/styles.css +35 -3
package/web/job-session.ts
CHANGED
|
@@ -5,6 +5,8 @@ import type {
|
|
|
5
5
|
DisplayPublicationV3,
|
|
6
6
|
EventV3,
|
|
7
7
|
JobDisplayReceipt,
|
|
8
|
+
JobCheckpointEvidence,
|
|
9
|
+
JobCheckpointTable,
|
|
8
10
|
JobInterviewDiagnostics,
|
|
9
11
|
JobResult,
|
|
10
12
|
JobUISubmission,
|
|
@@ -21,11 +23,13 @@ import type {
|
|
|
21
23
|
import {enCatalog} from './catalog-en.ts';
|
|
22
24
|
import {koCatalog} from './catalog-ko.ts';
|
|
23
25
|
import {t} from './i18n.ts';
|
|
26
|
+
import {JOB_PLAN_TEXT_FIELDS, parseJobPlanTextProjection, type JobPlanTextProjection} from '../src/job-contract.ts';
|
|
24
27
|
import {JOB_HUB_READY, jobHubMessageMatches, type JobHubBinding} from './job-hub.ts';
|
|
25
28
|
import {recordJobRigDraw, freezeJobRigCapture, copyJobRigViewport, createJobRigSubmission, jobRigPixelPlacement,
|
|
26
29
|
type JobRigDraw, type JobRigDrawState} from './job-rig-capture.ts';
|
|
27
30
|
import {advancePlayback} from './playback-clock.ts';
|
|
28
31
|
import {presentJobRigViewport, type JobRigPresentation} from './viewport-capture.ts';
|
|
32
|
+
import {SENTINELS} from './parts-render.ts';
|
|
29
33
|
import {CanvasRenderer} from '@rig-c/play';
|
|
30
34
|
import {JOB_PANEL_COMPOSITION_SCHEMA, JOB_PARTS_VERDICT_ACT_SCHEMA, parsePanelComposition} from '../src/job-contract.ts';
|
|
31
35
|
import type {PartsSource, PartsHost} from './parts.ts';
|
|
@@ -129,6 +133,23 @@ export function prepareJobForms<Form>(
|
|
|
129
133
|
return prepared;
|
|
130
134
|
}
|
|
131
135
|
|
|
136
|
+
/** Association checks for normal daemon-authoritative plan text metadata. */
|
|
137
|
+
export function jobPlanTextForSource(value: unknown, source: SourceV3): JobPlanTextProjection | undefined {
|
|
138
|
+
if (value === undefined) return undefined;
|
|
139
|
+
const projection = parseJobPlanTextProjection(value);
|
|
140
|
+
const mismatch = () => {throw new Error('PLAN_TEXT_SOURCE_MISMATCH');};
|
|
141
|
+
if (!source.plan) return mismatch();
|
|
142
|
+
if (projection.record && (projection.record.sha256 !== source.projectHash ||
|
|
143
|
+
isRecordSource(source) && (source.record.path !== projection.record.path ||
|
|
144
|
+
source.record.sha256 !== projection.record.sha256 ||
|
|
145
|
+
!source.files.some(file => file.path === projection.record!.path && file.sha256 === projection.record!.sha256))))
|
|
146
|
+
return mismatch();
|
|
147
|
+
if (projection.status === 'projected' && (projection.steps.length !== source.plan.steps.length ||
|
|
148
|
+
projection.steps.some((row, index) => row.id !== source.plan!.steps[index]?.id || row.hash !== source.plan!.steps[index]?.hash)))
|
|
149
|
+
return mismatch();
|
|
150
|
+
return projection;
|
|
151
|
+
}
|
|
152
|
+
|
|
132
153
|
/** C2 publishes the plan mapping in the ask. Legacy checkpoint metadata is optional guidance. */
|
|
133
154
|
export function jobCheckpointContext(
|
|
134
155
|
ask: PendingAskV3,
|
|
@@ -610,7 +631,13 @@ import type { Checkpoint, ReviewManifest, ReviewedSource } from '../src/manifest
|
|
|
610
631
|
import type { DirectionInspection } from '../src/direction-inspection.ts';
|
|
611
632
|
import type { FeedbackCatalog } from '../src/feedback-validation.ts';
|
|
612
633
|
import type { InterviewQuestion } from '../src/interview-project.ts';
|
|
634
|
+
type JobCheckpointEvidenceMetadata = Omit<JobCheckpointEvidence, 'tiles' | 'table'> & {
|
|
635
|
+
tiles: readonly (JobCheckpointEvidence['tiles'][number] & {url: string})[];
|
|
636
|
+
table: JobCheckpointEvidence['table'] & JobCheckpointTable & {url: string};
|
|
637
|
+
};
|
|
613
638
|
export interface JobInspectionMetadata {
|
|
639
|
+
checkpointEvidence?: readonly JobCheckpointEvidenceMetadata[];
|
|
640
|
+
planText?: JobPlanTextProjection;
|
|
614
641
|
manifest: ReviewManifest;
|
|
615
642
|
recordSource?: undefined;
|
|
616
643
|
sourceHash: string;
|
|
@@ -630,9 +657,11 @@ export interface JobInspectionMetadata {
|
|
|
630
657
|
preRig?: boolean;
|
|
631
658
|
playback: boolean;
|
|
632
659
|
};
|
|
633
|
-
feedbackCatalog: Pick<FeedbackCatalog, 'slots'
|
|
660
|
+
feedbackCatalog: Pick<FeedbackCatalog, 'slots'> & Partial<Pick<FeedbackCatalog, 'bones'>>;
|
|
634
661
|
}
|
|
635
662
|
export interface JobRecordInspectionMetadata {
|
|
663
|
+
checkpointEvidence?: readonly JobCheckpointEvidenceMetadata[];
|
|
664
|
+
planText?: JobPlanTextProjection;
|
|
636
665
|
manifest?: undefined;
|
|
637
666
|
recordSource: RecordSource;
|
|
638
667
|
sourceHash: string;
|
|
@@ -647,7 +676,7 @@ export interface JobRecordInspectionMetadata {
|
|
|
647
676
|
preRig?: boolean;
|
|
648
677
|
playback: boolean;
|
|
649
678
|
};
|
|
650
|
-
feedbackCatalog: Pick<FeedbackCatalog, 'slots'
|
|
679
|
+
feedbackCatalog: Pick<FeedbackCatalog, 'slots'> & Partial<Pick<FeedbackCatalog, 'bones'>>;
|
|
651
680
|
}
|
|
652
681
|
export type JobInspectionMetadataV3 = JobInspectionMetadata | JobRecordInspectionMetadata;
|
|
653
682
|
type JobInterview = {
|
|
@@ -756,6 +785,11 @@ export interface JobPreparedInspection {
|
|
|
756
785
|
partPages?: Map<number, HTMLImageElement>;
|
|
757
786
|
interviewImages: Map<string, HTMLImageElement>;
|
|
758
787
|
imageSetImages?: readonly HTMLImageElement[];
|
|
788
|
+
checkpointEvidence?: readonly {
|
|
789
|
+
packet: JobCheckpointEvidence;
|
|
790
|
+
table: JobCheckpointTable;
|
|
791
|
+
images: readonly HTMLImageElement[];
|
|
792
|
+
}[];
|
|
759
793
|
references: JobReferenceView[];
|
|
760
794
|
assets: ModelAssets | null;
|
|
761
795
|
player: RigPlayer | null;
|
|
@@ -845,6 +879,7 @@ export async function prepareJobInspection(display: DisplayPublicationV3, signal
|
|
|
845
879
|
}
|
|
846
880
|
const objectUrls: string[] = [];
|
|
847
881
|
const media: HTMLVideoElement[] = [];
|
|
882
|
+
if (metadata.planText !== undefined) metadata.planText = jobPlanTextForSource(metadata.planText, publishedSource);
|
|
848
883
|
const rigRoot = document.createElement('div');
|
|
849
884
|
rigRoot.id = 'rig-root';
|
|
850
885
|
let assets: ModelAssets | null = null;
|
|
@@ -873,22 +908,40 @@ export async function prepareJobInspection(display: DisplayPublicationV3, signal
|
|
|
873
908
|
for (const url of objectUrls)
|
|
874
909
|
URL.revokeObjectURL(url);
|
|
875
910
|
};
|
|
876
|
-
async function visualBytes(url: string, hash?: string
|
|
877
|
-
|
|
911
|
+
async function visualBytes(url: string, hash?: string, maximum = 128 * 1024 * 1024,
|
|
912
|
+
hashRefusal = 'JOB_SOURCE_MISMATCH') {
|
|
913
|
+
const bytes = await jobBytes(url, signal, maximum);
|
|
878
914
|
if (hash && await jobDigest(bytes) !== hash)
|
|
879
|
-
throw new Error(
|
|
915
|
+
throw new Error(hashRefusal);
|
|
916
|
+
if (disposed || signal.aborted) throw new Error('JOB_PRELOAD_CANCELLED');
|
|
880
917
|
return bytes;
|
|
881
918
|
}
|
|
882
|
-
async function image(url: string, hash?: string): Promise<HTMLImageElement> {
|
|
883
|
-
const bytes = await visualBytes(url, hash
|
|
919
|
+
async function image(url: string, hash?: string, evidence = false): Promise<HTMLImageElement> {
|
|
920
|
+
const bytes = await visualBytes(url, hash, evidence ? 8 * 1024 * 1024 : undefined,
|
|
921
|
+
evidence ? 'CHECKPOINT_EVIDENCE_HASH_MISMATCH' : undefined);
|
|
922
|
+
if (disposed || signal.aborted) throw new Error('JOB_PRELOAD_CANCELLED');
|
|
884
923
|
const blob = URL.createObjectURL(new Blob([bytes.slice().buffer]));
|
|
885
924
|
objectUrls.push(blob);
|
|
886
925
|
const image = new Image();
|
|
887
926
|
image.src = blob;
|
|
888
|
-
|
|
889
|
-
|
|
890
|
-
|
|
891
|
-
|
|
927
|
+
let cancel: () => void = () => {};
|
|
928
|
+
const cancelled = new Promise<never>((_resolve, reject) => {
|
|
929
|
+
cancel = () => reject(new Error('JOB_PRELOAD_CANCELLED'));
|
|
930
|
+
signal.addEventListener('abort', cancel, {once: true});
|
|
931
|
+
if (signal.aborted) cancel();
|
|
932
|
+
});
|
|
933
|
+
try {
|
|
934
|
+
await Promise.race([image.decode().catch(error => {
|
|
935
|
+
if (evidence) throw new Error('CHECKPOINT_EVIDENCE_PNG_INVALID');
|
|
936
|
+
throw error;
|
|
937
|
+
}), cancelled]);
|
|
938
|
+
if (disposed || signal.aborted) throw new Error('JOB_PRELOAD_CANCELLED');
|
|
939
|
+
if (!image.naturalWidth || !image.naturalHeight)
|
|
940
|
+
throw new Error(evidence ? 'CHECKPOINT_EVIDENCE_PNG_INVALID' : 'JOB_VISUAL_UNAVAILABLE');
|
|
941
|
+
return image;
|
|
942
|
+
} finally {
|
|
943
|
+
signal.removeEventListener('abort', cancel);
|
|
944
|
+
}
|
|
892
945
|
}
|
|
893
946
|
try {
|
|
894
947
|
const interview = metadata.capabilities.interview ? await jobJson<JobInterview>(routes.api('interview'), signal) : null;
|
|
@@ -906,6 +959,48 @@ export async function prepareJobInspection(display: DisplayPublicationV3, signal
|
|
|
906
959
|
const preload: Promise<void>[] = [];
|
|
907
960
|
const imageSetImages: HTMLImageElement[] = [];
|
|
908
961
|
const source = display.publication.source;
|
|
962
|
+
const checkpointEvidence: NonNullable<JobPreparedInspection['checkpointEvidence']>[number][] = [];
|
|
963
|
+
if (Object.hasOwn(metadata, 'checkpointEvidence') !== Object.hasOwn(source, 'checkpointEvidence') ||
|
|
964
|
+
source.checkpointEvidence !== undefined && (!Array.isArray(metadata.checkpointEvidence) ||
|
|
965
|
+
metadata.checkpointEvidence.length !== source.checkpointEvidence.length)) {
|
|
966
|
+
throw new Error('CHECKPOINT_EVIDENCE_INVALID');
|
|
967
|
+
}
|
|
968
|
+
for (const [index, packet] of (source.checkpointEvidence ?? []).entries()) {
|
|
969
|
+
const projection = metadata.checkpointEvidence?.[index];
|
|
970
|
+
const tableUrl = `/api/checkpoint-evidence/${packet.checkpointId}/table`;
|
|
971
|
+
if (!projection?.table || !source.plan?.steps.some(step => step.id === packet.planStepId) ||
|
|
972
|
+
source.subject === 'plan' && !source.subjects.some(subject => subject.kind === 'checkpoint' &&
|
|
973
|
+
subject.checkpointId === packet.checkpointId && packet.planStepId === packet.checkpointId) ||
|
|
974
|
+
sourceSnapshot(projection) !== sourceSnapshot({...packet,
|
|
975
|
+
tiles: packet.tiles.map((tile, tileIndex) => ({...tile,
|
|
976
|
+
url: `/api/checkpoint-evidence/${packet.checkpointId}/tiles/${tileIndex}`})),
|
|
977
|
+
table: {...packet.table, url: tableUrl, schema: projection.table.schema,
|
|
978
|
+
columns: projection.table.columns, rows: projection.table.rows}})) {
|
|
979
|
+
throw new Error('CHECKPOINT_EVIDENCE_INVALID');
|
|
980
|
+
}
|
|
981
|
+
}
|
|
982
|
+
for (const [index, packet] of (source.checkpointEvidence ?? []).entries()) {
|
|
983
|
+
preload.push((async () => {
|
|
984
|
+
const bytes = await visualBytes(routes.api(`checkpoint-evidence/${packet.checkpointId}/table`),
|
|
985
|
+
packet.table.sha256, 256 * 1024, 'CHECKPOINT_EVIDENCE_HASH_MISMATCH');
|
|
986
|
+
let table: JobCheckpointTable;
|
|
987
|
+
try {
|
|
988
|
+
table = JSON.parse(new TextDecoder('utf-8', {fatal: true}).decode(bytes));
|
|
989
|
+
const projection = metadata.checkpointEvidence![index]!.table;
|
|
990
|
+
if (sourceSnapshot(table) !== sourceSnapshot({schema: projection.schema,
|
|
991
|
+
columns: projection.columns, rows: projection.rows})) throw new Error();
|
|
992
|
+
} catch {
|
|
993
|
+
throw new Error('CHECKPOINT_EVIDENCE_TABLE_INVALID');
|
|
994
|
+
}
|
|
995
|
+
const images = await Promise.all(packet.tiles.map(async (tile, tileIndex) => {
|
|
996
|
+
const element = await image(routes.api(`checkpoint-evidence/${packet.checkpointId}/tiles/${tileIndex}`),
|
|
997
|
+
tile.sha256, true);
|
|
998
|
+
element.alt = tile.label;
|
|
999
|
+
return element;
|
|
1000
|
+
}));
|
|
1001
|
+
checkpointEvidence[index] = {packet, table, images};
|
|
1002
|
+
})());
|
|
1003
|
+
}
|
|
909
1004
|
if (source.subject === 'image-set') {
|
|
910
1005
|
if (metadata.sourceHash !== source.sourceHash || metadata.manifest?.model)
|
|
911
1006
|
throw new Error('JOB_DISPLAY_MISMATCH');
|
|
@@ -1075,7 +1170,7 @@ export async function prepareJobInspection(display: DisplayPublicationV3, signal
|
|
|
1075
1170
|
};
|
|
1076
1171
|
resetToSetup();
|
|
1077
1172
|
}
|
|
1078
|
-
if (!isRecordSource(source) && !player && !references.length && !partImages.size && !imageSetImages.length)
|
|
1173
|
+
if (!isRecordSource(source) && !player && !references.length && !partImages.size && !imageSetImages.length && !checkpointEvidence.length)
|
|
1079
1174
|
throw new Error('JOB_VISUAL_UNAVAILABLE');
|
|
1080
1175
|
if (signal.aborted)
|
|
1081
1176
|
throw new Error('JOB_PRELOAD_CANCELLED');
|
|
@@ -1083,7 +1178,7 @@ export async function prepareJobInspection(display: DisplayPublicationV3, signal
|
|
|
1083
1178
|
const order = [metadata.sourcePainting?.id, ...(metadata.manifest?.references.map(reference => reference.id) ?? [])];
|
|
1084
1179
|
references.sort((a, b) => order.indexOf(a.id) - order.indexOf(b.id));
|
|
1085
1180
|
return {
|
|
1086
|
-
display, metadata, interview, parts, partImages, partPages, interviewImages, imageSetImages, references, assets, rigRoot,
|
|
1181
|
+
display, metadata, interview, parts, partImages, partPages, interviewImages, imageSetImages, checkpointEvidence, references, assets, rigRoot,
|
|
1087
1182
|
get rigPresentation() { return rigPresentation; },
|
|
1088
1183
|
set rigPresentation(value) {
|
|
1089
1184
|
clearRigPresentation();
|
|
@@ -1102,9 +1197,9 @@ export async function prepareJobInspection(display: DisplayPublicationV3, signal
|
|
|
1102
1197
|
}
|
|
1103
1198
|
/** Browser mount is explicit so importing transaction helpers never starts an app. */
|
|
1104
1199
|
export async function mountJobSession(host: HTMLElement): Promise<() => void> {
|
|
1105
|
-
const [{ createViewportController, createViewportState }, { createRigViewportProvider }, { mountViewportPair }, i18n] = await Promise.all([
|
|
1200
|
+
const [{ createViewportController, createViewportState }, { createRigViewportProvider }, { mountViewportPair }, { RigOverlays }, { bindLayerShortcuts, describeLayerToggles, layerShortcuts }, i18n] = await Promise.all([
|
|
1106
1201
|
import('./viewport-controller.ts'), import('./rig-viewport-provider.ts'),
|
|
1107
|
-
import('./viewport-pair.ts'), import('./i18n.ts'),
|
|
1202
|
+
import('./viewport-pair.ts'), import('./rig-overlays.ts'), import('./view-controls.ts'), import('./i18n.ts'),
|
|
1108
1203
|
]);
|
|
1109
1204
|
let storage: Storage | null = null;
|
|
1110
1205
|
try {
|
|
@@ -1304,6 +1399,9 @@ export async function mountJobSession(host: HTMLElement): Promise<() => void> {
|
|
|
1304
1399
|
}>();
|
|
1305
1400
|
const forms = new Map<string, JobForm>();
|
|
1306
1401
|
const drawn = new WeakMap<JobPreparedInspection, JobRigDraw>();
|
|
1402
|
+
const overlays = new WeakMap<JobPreparedInspection, InstanceType<typeof RigOverlays>>();
|
|
1403
|
+
const layers = { images: true, mesh: false, bones: false, meshOpacity: 0.65 };
|
|
1404
|
+
let stageBackground = '';
|
|
1307
1405
|
let drawGeneration = 0;
|
|
1308
1406
|
const viewportState = createViewportState();
|
|
1309
1407
|
if (restoredCamera) {
|
|
@@ -1368,11 +1466,27 @@ export async function mountJobSession(host: HTMLElement): Promise<() => void> {
|
|
|
1368
1466
|
const reference = () => current?.references.find(item => item.id === selectedReference) ?? null;
|
|
1369
1467
|
const setText = (id: string, value: string) => { const element = workspace.querySelector('#' + id); if (element)
|
|
1370
1468
|
element.textContent = i18n.tr(value); };
|
|
1469
|
+
function redrawOverlay(fresh: boolean): void {
|
|
1470
|
+
const owner = current, overlay = owner ? overlays.get(owner) : undefined;
|
|
1471
|
+
if (!owner || !overlay) return;
|
|
1472
|
+
const root = owner.rigRoot, scale = viewportState.rigScale;
|
|
1473
|
+
const left = parseFloat(root.style.left) || 0, top = parseFloat(root.style.top) || 0;
|
|
1474
|
+
const project = (x: number, y: number) => ({ x: left + x * scale, y: top - y * scale });
|
|
1475
|
+
const bones = (owner.metadata.feedbackCatalog.bones ?? []).map(name => ({ name }));
|
|
1476
|
+
const frame = owner.inspection?.frame('single');
|
|
1477
|
+
const selectedSlot = selectedPart || null;
|
|
1478
|
+
const snap = fresh
|
|
1479
|
+
? overlay.refresh({ player: owner.player, bones, frame, selectedSlot, project, settings: layers })
|
|
1480
|
+
: overlay.redraw({ project, settings: layers });
|
|
1481
|
+
if (!fresh && snap.needsCapture && owner.player) {
|
|
1482
|
+
overlay.refresh({ player: owner.player, bones, frame, selectedSlot, project, settings: layers });
|
|
1483
|
+
}
|
|
1484
|
+
}
|
|
1371
1485
|
const provider = createRigViewportProvider({
|
|
1372
1486
|
el, player: () => current?.player ?? null, assets: () => current?.assets ?? null,
|
|
1373
1487
|
referenceSize: () => reference(), view: () => 'compare', referenceGeneration: () => current?.display.publication.generation ?? 0,
|
|
1374
1488
|
parts: () => current?.inspection ?? null, text: setText,
|
|
1375
|
-
message: value => { notice.textContent = jobWindowRefusal(value); }, redrawOverlay:
|
|
1489
|
+
message: value => { notice.textContent = jobWindowRefusal(value); }, redrawOverlay: fresh => redrawOverlay(fresh),
|
|
1376
1490
|
}, viewportState);
|
|
1377
1491
|
const canonicalControls = provider.renderControls;
|
|
1378
1492
|
provider.renderControls = controller => {
|
|
@@ -1421,13 +1535,26 @@ export async function mountJobSession(host: HTMLElement): Promise<() => void> {
|
|
|
1421
1535
|
pixels?.width, pixels?.height, canvas?.width, canvas?.height, canvas?.getAttribute('style'),
|
|
1422
1536
|
]),
|
|
1423
1537
|
defaultCamera: plain && camera.zoom === 1 && camera.center.x === frame.center.x && camera.center.y === frame.center.y,
|
|
1424
|
-
wholeRig: !selectedPart && !owner.inspection?.value() && player.slots === null
|
|
1538
|
+
wholeRig: !selectedPart && !owner.inspection?.value() && player.slots === null &&
|
|
1539
|
+
layers.images && !layers.mesh && !layers.bones && !stageBackground,
|
|
1425
1540
|
playing};
|
|
1426
1541
|
}
|
|
1427
1542
|
function rememberDraw(): void {
|
|
1428
1543
|
const owner = current;
|
|
1429
1544
|
if (!owner) return;
|
|
1430
1545
|
try {
|
|
1546
|
+
const pane = el('rig-viewport');
|
|
1547
|
+
const bg = SENTINELS[stageBackground] ?? '';
|
|
1548
|
+
pane.style.backgroundColor = bg;
|
|
1549
|
+
pane.style.backgroundImage = bg ? 'none' : '';
|
|
1550
|
+
if (!layers.images || layers.mesh || layers.bones || bg) {
|
|
1551
|
+
drawn.delete(owner);
|
|
1552
|
+
owner.rigPresentation = undefined;
|
|
1553
|
+
delete pane.dataset.jobRigCanonical;
|
|
1554
|
+
owner.rigRoot.style.visibility = layers.images ? 'visible' : 'hidden';
|
|
1555
|
+
return;
|
|
1556
|
+
}
|
|
1557
|
+
owner.rigRoot.style.visibility = '';
|
|
1431
1558
|
const player = owner.player;
|
|
1432
1559
|
const posed = owner.inspection?.frame('single');
|
|
1433
1560
|
const camera = viewport.numericView().cameras.rig;
|
|
@@ -1435,7 +1562,6 @@ export async function mountJobSession(host: HTMLElement): Promise<() => void> {
|
|
|
1435
1562
|
throw new Error('JOB_STILL_CAPTURE_FAILED');
|
|
1436
1563
|
}
|
|
1437
1564
|
const renderer = player.renderer;
|
|
1438
|
-
const pane = el('rig-viewport');
|
|
1439
1565
|
const presentation = presentJobRigViewport({pane, root: owner.rigRoot, images: true,
|
|
1440
1566
|
canvas: renderer instanceof CanvasRenderer ? renderer.canvas : undefined,
|
|
1441
1567
|
backend: renderer instanceof CanvasRenderer ? renderer.backendActive : renderer.meshBackendActive},
|
|
@@ -1454,6 +1580,7 @@ export async function mountJobSession(host: HTMLElement): Promise<() => void> {
|
|
|
1454
1580
|
owner.rigPresentation = undefined;
|
|
1455
1581
|
owner.player?.draw();
|
|
1456
1582
|
owner.inspection?.present('single');
|
|
1583
|
+
if (owner === current) redrawOverlay(true);
|
|
1457
1584
|
}
|
|
1458
1585
|
function syncTransportControls(): void {
|
|
1459
1586
|
const playBtn = workspace.querySelector<HTMLButtonElement>('#job-play');
|
|
@@ -1635,6 +1762,96 @@ export async function mountJobSession(host: HTMLElement): Promise<() => void> {
|
|
|
1635
1762
|
parent.append(inputLabel(key, input));
|
|
1636
1763
|
return input;
|
|
1637
1764
|
}
|
|
1765
|
+
function imageGallery(images: readonly {name: string; sha256: string; element?: HTMLImageElement;
|
|
1766
|
+
role?: string; duplicate?: boolean}[]): HTMLElement {
|
|
1767
|
+
const gallery = node('section');
|
|
1768
|
+
gallery.style.display = 'grid';
|
|
1769
|
+
gallery.style.gridAutoFlow = 'column';
|
|
1770
|
+
gallery.style.gridAutoColumns = 'minmax(180px, 1fr)';
|
|
1771
|
+
gallery.style.gap = '16px';
|
|
1772
|
+
gallery.style.overflow = 'auto';
|
|
1773
|
+
gallery.style.minHeight = '0';
|
|
1774
|
+
gallery.style.flex = '1';
|
|
1775
|
+
for (const image of images) {
|
|
1776
|
+
const element = image.element;
|
|
1777
|
+
if (!element) throw new Error('JOB_VISUAL_UNAVAILABLE');
|
|
1778
|
+
const figure = node('figure');
|
|
1779
|
+
figure.style.margin = '0';
|
|
1780
|
+
figure.style.minWidth = '0';
|
|
1781
|
+
figure.dataset.imageName = image.name;
|
|
1782
|
+
const name = node('h3');
|
|
1783
|
+
name.textContent = image.name;
|
|
1784
|
+
name.style.overflowWrap = 'anywhere';
|
|
1785
|
+
const role = image.role ? node('p', 'job.imageRole.' + image.role) : node('p');
|
|
1786
|
+
const hash = node('code');
|
|
1787
|
+
hash.className = 'job-source';
|
|
1788
|
+
hash.style.display = 'block';
|
|
1789
|
+
hash.style.overflowWrap = 'anywhere';
|
|
1790
|
+
hash.textContent = image.sha256;
|
|
1791
|
+
element.style.width = '100%';
|
|
1792
|
+
element.style.height = 'auto';
|
|
1793
|
+
element.style.maxHeight = '70vh';
|
|
1794
|
+
element.style.objectFit = 'contain';
|
|
1795
|
+
figure.append(name, role, element, hash);
|
|
1796
|
+
if (image.duplicate)
|
|
1797
|
+
figure.append(node('p', 'job.identicalImages'));
|
|
1798
|
+
gallery.append(figure);
|
|
1799
|
+
}
|
|
1800
|
+
return gallery;
|
|
1801
|
+
}
|
|
1802
|
+
function planTextList(plan: NonNullable<SourceV3['plan']>, projection: JobPlanTextProjection | undefined,
|
|
1803
|
+
selectedId?: string): HTMLElement {
|
|
1804
|
+
const section = node('section');
|
|
1805
|
+
section.className = 'job-plan-text';
|
|
1806
|
+
if (!projection || projection.status === 'unavailable') {
|
|
1807
|
+
section.append(node('p', 'job.plan.noText'));
|
|
1808
|
+
if (projection) section.append(node('p', projection.reason));
|
|
1809
|
+
}
|
|
1810
|
+
const list = node('ol');
|
|
1811
|
+
list.className = 'job-plan-steps';
|
|
1812
|
+
for (const step of plan.steps) {
|
|
1813
|
+
if (selectedId !== undefined && step.id !== selectedId) continue;
|
|
1814
|
+
const item = node('li');
|
|
1815
|
+
item.dataset.jobPlanStep = step.id;
|
|
1816
|
+
const details = node('details');
|
|
1817
|
+
details.open = true;
|
|
1818
|
+
const title = node('summary');
|
|
1819
|
+
title.textContent = step.id;
|
|
1820
|
+
const hash = node('code');
|
|
1821
|
+
hash.className = 'job-source';
|
|
1822
|
+
hash.textContent = step.hash;
|
|
1823
|
+
details.append(title, hash);
|
|
1824
|
+
const row = projection?.status === 'projected' ? projection.steps.find(row => row.id === step.id && row.hash === step.hash) : undefined;
|
|
1825
|
+
if (row) {
|
|
1826
|
+
const fields = node('dl');
|
|
1827
|
+
for (const field of JOB_PLAN_TEXT_FIELDS) {
|
|
1828
|
+
const term = node('dt', 'job.plan.' + field);
|
|
1829
|
+
const value = node('dd');
|
|
1830
|
+
value.dataset.jobPlanField = field;
|
|
1831
|
+
const issue = row.issues.find(issue => issue.field === field);
|
|
1832
|
+
if (issue) value.append(node('span', 'job.plan.field.' + issue.reason));
|
|
1833
|
+
else if (field === 'rests_on') {
|
|
1834
|
+
const rests = node('ul');
|
|
1835
|
+
for (const text of row.rests_on!) {const rest = node('li'); rest.textContent = text; rests.append(rest);}
|
|
1836
|
+
value.append(rests);
|
|
1837
|
+
} else value.textContent = row[field]!;
|
|
1838
|
+
fields.append(term, value);
|
|
1839
|
+
}
|
|
1840
|
+
details.append(fields);
|
|
1841
|
+
}
|
|
1842
|
+
item.append(details); list.append(item);
|
|
1843
|
+
}
|
|
1844
|
+
list.addEventListener('keydown', event => {
|
|
1845
|
+
const key = event as KeyboardEvent;
|
|
1846
|
+
if (!['ArrowUp', 'ArrowDown'].includes(key.key) || !(key.target instanceof HTMLElement) || key.target.tagName !== 'SUMMARY') return;
|
|
1847
|
+
const summaries = [...list.querySelectorAll<HTMLElement>('summary')];
|
|
1848
|
+
const index = summaries.indexOf(key.target);
|
|
1849
|
+
const next = summaries[index + (key.key === 'ArrowDown' ? 1 : -1)];
|
|
1850
|
+
if (next) {key.preventDefault(); next.focus();}
|
|
1851
|
+
});
|
|
1852
|
+
section.append(list);
|
|
1853
|
+
return section;
|
|
1854
|
+
}
|
|
1638
1855
|
function formFor(ask: PendingAskV3, prepared: JobPreparedInspection): JobForm {
|
|
1639
1856
|
if (ask.publicationId !== prepared.display.publication.publicationId)
|
|
1640
1857
|
throw new Error('JOB_DISPLAY_MISMATCH');
|
|
@@ -1729,14 +1946,62 @@ export async function mountJobSession(host: HTMLElement): Promise<() => void> {
|
|
|
1729
1946
|
fields.prepend(heading);
|
|
1730
1947
|
const guidance = node('p');
|
|
1731
1948
|
guidance.textContent = checkpoint.note;
|
|
1732
|
-
|
|
1733
|
-
|
|
1734
|
-
|
|
1735
|
-
|
|
1949
|
+
fields.append(guidance, planTextList(ask.source.plan!, prepared.metadata.planText, checkpoint.step.id));
|
|
1950
|
+
const evidence = prepared.checkpointEvidence?.find(item => item.packet.checkpointId === subject.checkpointId);
|
|
1951
|
+
const declared = ask.source.checkpointEvidence?.find(item => item.checkpointId === subject.checkpointId);
|
|
1952
|
+
if (Boolean(declared) !== Boolean(evidence) || evidence &&
|
|
1953
|
+
(JSON.stringify(evidence.packet) !== JSON.stringify(declared) || evidence.packet.planStepId !== checkpoint.step.id)) {
|
|
1954
|
+
throw new Error('CHECKPOINT_EVIDENCE_INVALID');
|
|
1955
|
+
}
|
|
1956
|
+
if (evidence) {
|
|
1957
|
+
const section = node('section');
|
|
1958
|
+
section.dataset.jobCheckpointEvidence = subject.checkpointId;
|
|
1959
|
+
section.append(node('h4', 'job.checkpointEvidence'));
|
|
1960
|
+
section.append(imageGallery(evidence.packet.tiles.map((tile, index) => ({name: tile.label,
|
|
1961
|
+
sha256: tile.sha256, element: evidence.images[index]?.cloneNode(true) as HTMLImageElement}))));
|
|
1962
|
+
const tableHost = node('div');
|
|
1963
|
+
tableHost.style.overflow = 'auto';
|
|
1964
|
+
tableHost.style.maxHeight = '50dvh';
|
|
1965
|
+
const table = node('table');
|
|
1966
|
+
table.dataset.jobCheckpointTable = '';
|
|
1967
|
+
const caption = node('caption', 'job.checkpointTable');
|
|
1968
|
+
if (evidence.packet.table.label !== undefined) {
|
|
1969
|
+
delete caption.dataset.jobText;
|
|
1970
|
+
caption.textContent = evidence.packet.table.label;
|
|
1971
|
+
}
|
|
1972
|
+
const head = node('thead');
|
|
1973
|
+
const columns = node('tr');
|
|
1974
|
+
for (const column of evidence.table.columns) {
|
|
1975
|
+
const cell = node('th');
|
|
1976
|
+
cell.scope = 'col';
|
|
1977
|
+
cell.textContent = column;
|
|
1978
|
+
columns.append(cell);
|
|
1979
|
+
}
|
|
1980
|
+
head.append(columns);
|
|
1981
|
+
const body = node('tbody');
|
|
1982
|
+
for (const row of evidence.table.rows) {
|
|
1983
|
+
const cells = node('tr');
|
|
1984
|
+
for (const value of row) {
|
|
1985
|
+
const cell = node('td');
|
|
1986
|
+
cell.textContent = String(value);
|
|
1987
|
+
cells.append(cell);
|
|
1988
|
+
}
|
|
1989
|
+
body.append(cells);
|
|
1990
|
+
}
|
|
1991
|
+
table.append(caption, head, body);
|
|
1992
|
+
tableHost.append(table);
|
|
1993
|
+
const routes = node('pre');
|
|
1994
|
+
routes.textContent = evidence.packet.routesText;
|
|
1995
|
+
const recommendation = node('pre');
|
|
1996
|
+
recommendation.textContent = evidence.packet.recommendationText;
|
|
1997
|
+
section.append(tableHost, node('h4', 'job.checkpointRoutes'), routes,
|
|
1998
|
+
node('h4', 'job.checkpointRecommendation'), recommendation);
|
|
1999
|
+
fields.append(section, node('p', 'job.checkpointRouteMapping'));
|
|
2000
|
+
}
|
|
1736
2001
|
const outcome = selectValues(['', 'pass', 'fail'], ['Pending', 'Pass', 'job.fail']);
|
|
1737
2002
|
outcome.required = true;
|
|
1738
2003
|
outcome.name = 'outcome';
|
|
1739
|
-
fields.append(outcome);
|
|
2004
|
+
fields.append(outcome, note.parentElement!);
|
|
1740
2005
|
read = () => ({ checkpointId: subject.checkpointId, outcome: outcome.value as 'pass' | 'fail', words: note.value });
|
|
1741
2006
|
submitKey = 'job.saveCheckpoint';
|
|
1742
2007
|
}
|
|
@@ -1779,6 +2044,7 @@ export async function mountJobSession(host: HTMLElement): Promise<() => void> {
|
|
|
1779
2044
|
const stage = node('p');
|
|
1780
2045
|
stage.textContent = subject.stage;
|
|
1781
2046
|
fields.append(stage);
|
|
2047
|
+
if (ask.source.plan) fields.append(planTextList(ask.source.plan, prepared.metadata.planText), note.parentElement!);
|
|
1782
2048
|
read = () => ({ stage: subject.stage, decision: 'approved', words: note.value });
|
|
1783
2049
|
submitKey = 'job.signoff';
|
|
1784
2050
|
}
|
|
@@ -1935,6 +2201,41 @@ export async function mountJobSession(host: HTMLElement): Promise<() => void> {
|
|
|
1935
2201
|
}
|
|
1936
2202
|
}
|
|
1937
2203
|
}
|
|
2204
|
+
const hasCheckpointAsk = Boolean(current.player) && state.pending.some(
|
|
2205
|
+
ask => ask.publicationId === current!.display.publication.publicationId &&
|
|
2206
|
+
ask.status === 'pending' && ask.subject.kind === 'checkpoint',
|
|
2207
|
+
);
|
|
2208
|
+
const layerSet = workspace.querySelector<HTMLElement>('#layer-controls');
|
|
2209
|
+
const bgField = workspace.querySelector<HTMLElement>('#job-background-field');
|
|
2210
|
+
const bgSelect = workspace.querySelector<HTMLSelectElement>('#job-background');
|
|
2211
|
+
const hadNonDefaultView = !layers.images || layers.mesh || layers.bones || Boolean(stageBackground);
|
|
2212
|
+
if (!hasCheckpointAsk && hadNonDefaultView) {
|
|
2213
|
+
layers.images = true;
|
|
2214
|
+
layers.mesh = false;
|
|
2215
|
+
layers.bones = false;
|
|
2216
|
+
stageBackground = '';
|
|
2217
|
+
}
|
|
2218
|
+
if (layerSet) {
|
|
2219
|
+
layerSet.hidden = !hasCheckpointAsk;
|
|
2220
|
+
for (const [id, key] of [['layer-images', 'images'], ['layer-mesh', 'mesh'], ['layer-bones', 'bones']] as const) {
|
|
2221
|
+
const box = layerSet.querySelector<HTMLInputElement>('#' + id);
|
|
2222
|
+
if (box) {
|
|
2223
|
+
box.disabled = !hasCheckpointAsk;
|
|
2224
|
+
box.checked = layers[key];
|
|
2225
|
+
}
|
|
2226
|
+
}
|
|
2227
|
+
describeLayerToggles({ getElementById: id => layerSet.querySelector('#' + id) }, t('No rig supplied'));
|
|
2228
|
+
for (const label of layerSet.querySelectorAll<HTMLElement>('.layer-toggle')) label.title = i18n.tr(label.title);
|
|
2229
|
+
}
|
|
2230
|
+
if (bgField && bgSelect) {
|
|
2231
|
+
bgField.hidden = !hasCheckpointAsk;
|
|
2232
|
+
bgSelect.disabled = !hasCheckpointAsk;
|
|
2233
|
+
bgSelect.value = stageBackground;
|
|
2234
|
+
}
|
|
2235
|
+
if (!hasCheckpointAsk && hadNonDefaultView) {
|
|
2236
|
+
redrawOverlay(true);
|
|
2237
|
+
rememberDraw();
|
|
2238
|
+
}
|
|
1938
2239
|
}
|
|
1939
2240
|
async function mountJobParts(prepared: JobPreparedInspection, signal: AbortSignal): Promise<void> {
|
|
1940
2241
|
const panel = partsPanels.get(prepared)!;
|
|
@@ -2152,6 +2453,55 @@ export async function mountJobSession(host: HTMLElement): Promise<() => void> {
|
|
|
2152
2453
|
stage.className = 'job-stage';
|
|
2153
2454
|
const controls = node('div');
|
|
2154
2455
|
controls.className = 'viewbar';
|
|
2456
|
+
const layerSet = node('fieldset');
|
|
2457
|
+
layerSet.id = 'layer-controls';
|
|
2458
|
+
layerSet.className = 'layer-toggles';
|
|
2459
|
+
layerSet.hidden = true;
|
|
2460
|
+
const legend = node('legend', 'Rig layers');
|
|
2461
|
+
legend.className = 'sr-only';
|
|
2462
|
+
layerSet.append(legend);
|
|
2463
|
+
for (const item of layerShortcuts) {
|
|
2464
|
+
const label = node('label');
|
|
2465
|
+
label.className = 'layer-toggle';
|
|
2466
|
+
const box = node('input');
|
|
2467
|
+
box.id = item.id;
|
|
2468
|
+
box.type = 'checkbox';
|
|
2469
|
+
box.setAttribute('aria-keyshortcuts', item.key.toUpperCase());
|
|
2470
|
+
const keyName = item.id === 'layer-images' ? 'images' : item.id === 'layer-mesh' ? 'mesh' : 'bones';
|
|
2471
|
+
box.checked = layers[keyName];
|
|
2472
|
+
box.disabled = true;
|
|
2473
|
+
box.onchange = () => {
|
|
2474
|
+
layers[keyName] = box.checked;
|
|
2475
|
+
if (current === prepared) {
|
|
2476
|
+
redrawOverlay(true);
|
|
2477
|
+
rememberDraw();
|
|
2478
|
+
}
|
|
2479
|
+
};
|
|
2480
|
+
const kbd = node('kbd');
|
|
2481
|
+
kbd.setAttribute('aria-hidden', 'true');
|
|
2482
|
+
kbd.textContent = item.key.toUpperCase();
|
|
2483
|
+
label.append(box, node('span', item.label), kbd);
|
|
2484
|
+
layerSet.append(label);
|
|
2485
|
+
}
|
|
2486
|
+
describeLayerToggles({ getElementById: id => layerSet.querySelector('#' + id) }, t('No rig supplied'));
|
|
2487
|
+
for (const label of layerSet.querySelectorAll<HTMLElement>('.layer-toggle')) label.title = i18n.tr(label.title);
|
|
2488
|
+
const sentinelKeys = Object.keys(SENTINELS);
|
|
2489
|
+
const bgSelect = selectValues(['', ...sentinelKeys], ['Rig', ...sentinelKeys.map(k => k[0]!.toUpperCase() + k.slice(1))]);
|
|
2490
|
+
bgSelect.id = 'job-background';
|
|
2491
|
+
bgSelect.value = stageBackground;
|
|
2492
|
+
bgSelect.disabled = true;
|
|
2493
|
+
bgSelect.onchange = () => {
|
|
2494
|
+
stageBackground = Object.hasOwn(SENTINELS, bgSelect.value) ? bgSelect.value : '';
|
|
2495
|
+
bgSelect.value = stageBackground;
|
|
2496
|
+
if (current === prepared) {
|
|
2497
|
+
redrawOverlay(false);
|
|
2498
|
+
rememberDraw();
|
|
2499
|
+
}
|
|
2500
|
+
};
|
|
2501
|
+
const bgField = inputLabel('Background', bgSelect);
|
|
2502
|
+
bgField.id = 'job-background-field';
|
|
2503
|
+
bgField.hidden = true;
|
|
2504
|
+
controls.append(layerSet, bgField);
|
|
2155
2505
|
for (const [id, key] of [['zoom-in', 'job.zoomIn'], ['zoom-out', 'job.zoomOut'], ['fit', 'Fit']]) {
|
|
2156
2506
|
const button = node('button', key);
|
|
2157
2507
|
button.id = id!;
|
|
@@ -2168,7 +2518,7 @@ export async function mountJobSession(host: HTMLElement): Promise<() => void> {
|
|
|
2168
2518
|
const pair = node('div');
|
|
2169
2519
|
pair.id = 'stage-layout';
|
|
2170
2520
|
mountViewportPair(pair);
|
|
2171
|
-
for (const id of ['
|
|
2521
|
+
for (const id of ['idle-handles', 'rig-fields-stage'])
|
|
2172
2522
|
pair.querySelector('#' + id)?.remove();
|
|
2173
2523
|
for (const [id, key] of [['reference-label', 'Reference'], ['rig-label', 'Generated rig · read only'],
|
|
2174
2524
|
['reference-empty', 'No reference supplied.'], ['rig-empty', 'No compiled model supplied.']]) {
|
|
@@ -2180,7 +2530,20 @@ export async function mountJobSession(host: HTMLElement): Promise<() => void> {
|
|
|
2180
2530
|
}
|
|
2181
2531
|
pair.querySelector('#reference-pane')?.setAttribute('aria-label', t('Reference'));
|
|
2182
2532
|
pair.querySelector('#rig-pane')?.setAttribute('aria-label', t('Rig'));
|
|
2533
|
+
const rigViewport = pair.querySelector<HTMLElement>('#rig-viewport');
|
|
2534
|
+
if (rigViewport) {
|
|
2535
|
+
rigViewport.setAttribute('tabindex', '-1');
|
|
2536
|
+
rigViewport.addEventListener('pointerdown', () => rigViewport.focus?.());
|
|
2537
|
+
}
|
|
2183
2538
|
pair.querySelector('#rig-root')!.replaceWith(prepared.rigRoot);
|
|
2539
|
+
const overlayCanvas = pair.querySelector<HTMLCanvasElement>('#rig-overlay');
|
|
2540
|
+
if (overlayCanvas) {
|
|
2541
|
+
overlayCanvas.setAttribute('aria-label', t('Actual rig mesh and bone overlay'));
|
|
2542
|
+
const instance = new RigOverlays({ canvas: overlayCanvas, rigRoot: prepared.rigRoot });
|
|
2543
|
+
overlays.set(prepared, instance);
|
|
2544
|
+
const prevDispose = prepared.dispose;
|
|
2545
|
+
prepared.dispose = () => { try { instance.dispose(); } finally { prevDispose(); } };
|
|
2546
|
+
}
|
|
2184
2547
|
const transport = node('div');
|
|
2185
2548
|
transport.className = 'job-transport';
|
|
2186
2549
|
const clips = node('select');
|
|
@@ -2304,40 +2667,10 @@ export async function mountJobSession(host: HTMLElement): Promise<() => void> {
|
|
|
2304
2667
|
const digestValue = node('code');
|
|
2305
2668
|
digestValue.textContent = source.imageSetDigest;
|
|
2306
2669
|
digest.append(digestLabel, document.createTextNode(' '), digestValue);
|
|
2307
|
-
const gallery =
|
|
2670
|
+
const gallery = imageGallery(source.imageSet.images.map((image, index) => ({...image,
|
|
2671
|
+
element: prepared.imageSetImages?.[index],
|
|
2672
|
+
duplicate: source.duplicateHashes.some(group => group.names.includes(image.name))})));
|
|
2308
2673
|
gallery.dataset.jobImageSet = '';
|
|
2309
|
-
gallery.style.display = 'grid';
|
|
2310
|
-
gallery.style.gridAutoFlow = 'column';
|
|
2311
|
-
gallery.style.gridAutoColumns = 'minmax(180px, 1fr)';
|
|
2312
|
-
gallery.style.gap = '16px';
|
|
2313
|
-
gallery.style.overflow = 'auto';
|
|
2314
|
-
gallery.style.minHeight = '0';
|
|
2315
|
-
gallery.style.flex = '1';
|
|
2316
|
-
for (const [index, image] of source.imageSet.images.entries()) {
|
|
2317
|
-
const element = prepared.imageSetImages?.[index];
|
|
2318
|
-
if (!element) throw new Error('JOB_VISUAL_UNAVAILABLE');
|
|
2319
|
-
const figure = node('figure');
|
|
2320
|
-
figure.style.margin = '0';
|
|
2321
|
-
figure.style.minWidth = '0';
|
|
2322
|
-
figure.dataset.imageName = image.name;
|
|
2323
|
-
const name = node('h3');
|
|
2324
|
-
name.textContent = image.name;
|
|
2325
|
-
name.style.overflowWrap = 'anywhere';
|
|
2326
|
-
const role = node('p', 'job.imageRole.' + image.role);
|
|
2327
|
-
const hash = node('code');
|
|
2328
|
-
hash.className = 'job-source';
|
|
2329
|
-
hash.style.display = 'block';
|
|
2330
|
-
hash.style.overflowWrap = 'anywhere';
|
|
2331
|
-
hash.textContent = image.sha256;
|
|
2332
|
-
element.style.width = '100%';
|
|
2333
|
-
element.style.height = 'auto';
|
|
2334
|
-
element.style.maxHeight = '70vh';
|
|
2335
|
-
element.style.objectFit = 'contain';
|
|
2336
|
-
figure.append(name, role, element, hash);
|
|
2337
|
-
if (source.duplicateHashes.some(group => group.names.includes(image.name)))
|
|
2338
|
-
figure.append(node('p', 'job.identicalImages'));
|
|
2339
|
-
gallery.append(figure);
|
|
2340
|
-
}
|
|
2341
2674
|
stage.prepend(heading, digest, gallery);
|
|
2342
2675
|
controls.hidden = pair.hidden = transport.hidden = true;
|
|
2343
2676
|
controls.style.display = pair.style.display = transport.style.display = 'none';
|
|
@@ -2359,14 +2692,8 @@ export async function mountJobSession(host: HTMLElement): Promise<() => void> {
|
|
|
2359
2692
|
summary.append(optionLine);
|
|
2360
2693
|
}
|
|
2361
2694
|
else {
|
|
2362
|
-
|
|
2363
|
-
|
|
2364
|
-
for (const step of source.plan.steps) {
|
|
2365
|
-
const item = node('li');
|
|
2366
|
-
item.textContent = step.id + ' · ' + step.hash;
|
|
2367
|
-
list.append(item);
|
|
2368
|
-
}
|
|
2369
|
-
summary.append(list);
|
|
2695
|
+
root.dataset.jobPlanWorkspace = '';
|
|
2696
|
+
summary.append(identity, binding, planTextList(source.plan, prepared.metadata.planText));
|
|
2370
2697
|
}
|
|
2371
2698
|
stage.prepend(summary);
|
|
2372
2699
|
controls.hidden = pair.hidden = transport.hidden = true;
|
|
@@ -2431,6 +2758,7 @@ export async function mountJobSession(host: HTMLElement): Promise<() => void> {
|
|
|
2431
2758
|
drawn.delete(current);
|
|
2432
2759
|
current.rigPresentation = undefined;
|
|
2433
2760
|
current.inspection.select(selectedPart ? { side: 'single', slot: selectedPart, mode: partMode } : null);
|
|
2761
|
+
redrawOverlay(true);
|
|
2434
2762
|
rememberDraw();
|
|
2435
2763
|
setText('job-part-observation', selectedPart ? JSON.stringify(current.inspection.observation(), null, 2) : '');
|
|
2436
2764
|
viewport.renderCameraControls();
|
|
@@ -2542,6 +2870,7 @@ export async function mountJobSession(host: HTMLElement): Promise<() => void> {
|
|
|
2542
2870
|
const previousForms = new Map(forms);
|
|
2543
2871
|
const restoringCamera = Boolean(previous || restoredCamera);
|
|
2544
2872
|
const navigation = { animation, time, loop, selectedPart, partMode, selectedReference, panel,
|
|
2873
|
+
layers: { images: layers.images, mesh: layers.mesh, bones: layers.bones }, stageBackground,
|
|
2545
2874
|
partIdentity: previous ? (previous.inspection?.value() ?? null) : restoredPartIdentity,
|
|
2546
2875
|
camera: structuredClone(viewportState) };
|
|
2547
2876
|
compatibilityNotice = Boolean(!previous &&
|
|
@@ -2573,6 +2902,8 @@ export async function mountJobSession(host: HTMLElement): Promise<() => void> {
|
|
|
2573
2902
|
partMode = navigation.partMode;
|
|
2574
2903
|
selectedReference = navigation.selectedReference;
|
|
2575
2904
|
panel = navigation.panel;
|
|
2905
|
+
Object.assign(layers, navigation.layers);
|
|
2906
|
+
stageBackground = navigation.stageBackground;
|
|
2576
2907
|
forms.clear();
|
|
2577
2908
|
for (const [id, item] of previousForms)
|
|
2578
2909
|
forms.set(id, item);
|
|
@@ -2604,6 +2935,13 @@ export async function mountJobSession(host: HTMLElement): Promise<() => void> {
|
|
|
2604
2935
|
el<HTMLSelectElement>('job-reference').value = selectedReference;
|
|
2605
2936
|
el<HTMLSelectElement>('job-animation').value = animation;
|
|
2606
2937
|
el<HTMLInputElement>('job-loop').checked = loop;
|
|
2938
|
+
layers.images = true;
|
|
2939
|
+
layers.mesh = false;
|
|
2940
|
+
layers.bones = false;
|
|
2941
|
+
stageBackground = '';
|
|
2942
|
+
for (const [id, key] of [['layer-images', 'images'], ['layer-mesh', 'mesh'], ['layer-bones', 'bones']] as const) {
|
|
2943
|
+
el<HTMLInputElement>(id).checked = layers[key];
|
|
2944
|
+
}
|
|
2607
2945
|
el('rig-empty').hidden = !!prepared.player;
|
|
2608
2946
|
Object.assign(viewportState, navigation.camera, { cameraRestoring: restoringCamera });
|
|
2609
2947
|
showReference();
|
|
@@ -2724,12 +3062,17 @@ export async function mountJobSession(host: HTMLElement): Promise<() => void> {
|
|
|
2724
3062
|
if (state.receipt && !state.preparing) events?.displayed();
|
|
2725
3063
|
},
|
|
2726
3064
|
} });
|
|
3065
|
+
const unbindLayerShortcuts = bindLayerShortcuts(document);
|
|
2727
3066
|
const localize = i18n.onLanguageChange(() => {
|
|
2728
3067
|
for (const element of host.querySelectorAll<HTMLElement>('[data-job-text]'))
|
|
2729
3068
|
element.textContent = t(element.dataset.jobText!);
|
|
2730
3069
|
languages.setAttribute('aria-label', t('interview.language'));
|
|
2731
|
-
if (current && !partsPanels.has(current))
|
|
3070
|
+
if (current && !partsPanels.has(current)) {
|
|
3071
|
+
workspace.querySelector('#rig-overlay')?.setAttribute('aria-label', t('Actual rig mesh and bone overlay'));
|
|
3072
|
+
describeLayerToggles({ getElementById: id => workspace.querySelector('#' + id) }, t('No rig supplied'));
|
|
3073
|
+
for (const label of workspace.querySelectorAll<HTMLElement>('.layer-toggle')) label.title = i18n.tr(label.title);
|
|
2732
3074
|
viewport.renderCameraControls();
|
|
3075
|
+
}
|
|
2733
3076
|
window.refresh();
|
|
2734
3077
|
});
|
|
2735
3078
|
const hubVisibility = (event: MessageEvent) => {
|
|
@@ -2774,6 +3117,7 @@ export async function mountJobSession(host: HTMLElement): Promise<() => void> {
|
|
|
2774
3117
|
abort.abort();
|
|
2775
3118
|
window.stop();
|
|
2776
3119
|
localize();
|
|
3120
|
+
unbindLayerShortcuts();
|
|
2777
3121
|
unbindNavigation?.();
|
|
2778
3122
|
resize?.disconnect();
|
|
2779
3123
|
current?.dispose();
|