feat: Stage 2C CAD assembly cleanup, full-height canvas, physics parity

Remove default Measurement overlay and procedural motor duplicate; force
opaque CAD materials; modular extension pitch from CAD; shared runtime/
headless physics config hash; layout e2e and Stage 2C artifacts.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
Даня Архипов
2026-07-30 12:35:50 +00:00
parent 0a1be376eb
commit 68327635ce
50 changed files with 3051 additions and 100 deletions

View File

@@ -35,7 +35,16 @@ function materialFor(slot: string): THREE.MeshStandardMaterial {
'dark-mechanical': { color: '#3a4148', metalness: 0.6, roughness: 0.5 },
'safety-yellow': { color: '#f5b301', metalness: 0.2, roughness: 0.55 },
};
MATERIALS[slot] = new THREE.MeshStandardMaterial(defs[slot] ?? defs['painted-metal']);
const def = defs[slot] ?? defs['painted-metal'];
// Stage 2C §9.1 — opaque machine metals: no accidental alpha / DoubleSide bleed.
MATERIALS[slot] = new THREE.MeshStandardMaterial({
...def,
transparent: false,
opacity: 1,
depthWrite: true,
depthTest: true,
side: THREE.FrontSide,
});
}
return MATERIALS[slot];
}
@@ -102,6 +111,11 @@ export function ConveyorCadModel({
mesh.material = materialFor(slotFor(name));
mesh.castShadow = shadows;
mesh.receiveShadow = shadows;
// Force opaque even if a future GLB embeds transparent materials.
const mat = mesh.material as THREE.MeshStandardMaterial;
mat.transparent = false;
mat.opacity = 1;
mat.depthWrite = true;
if (name.startsWith('stop-gate/') || name.startsWith('rollers/Ролик') || name.startsWith('rollers/Вал')) {
toPivot.push(mesh);
}

View File

@@ -42,14 +42,9 @@ import {
BELT_TOP_Y,
BELT_THICKNESS_M,
CONVEYOR_WIDTH_M,
ROLLER_RADIUS_M,
ROLLER_SPACING_M,
FRAME_HEIGHT_M,
SIDE_GUARD_HEIGHT_M,
LEG_WIDTH_M,
MOTOR_WIDTH_M,
MOTOR_HEIGHT_M,
MOTOR_DEPTH_M,
DRIVE_ROLLER_RADIUS_M,
ZONES,
CAMERA_RIG,
@@ -61,6 +56,11 @@ import {
CAGE_FLOOR_Y,
CONVEYOR_SPEED_MPS,
} from '../../domain/physicalLayout';
import {
CAD_ROLLER_PITCH_M,
CAD_ROLLER_RADIUS_M,
CAD_SUPPORT_SPACING_M,
} from '../../domain/cadAssemblyParams';
import { CHUTE_PITCH, CHUTE_LENGTH, CHUTE_MID_Y, CHUTE_MID_Z, CHUTE_X, CHUTE_HALF_W } from '../../domain/physicsWorldLayout';
import PerfCollector from './PerfCollector';
import PerfOverlay from './PerfOverlay';
@@ -133,8 +133,8 @@ function getItemMaterial(itemId: string) {
// Physical layout constants
const BELT_Y = BELT_TOP_Y; // 0.7m - top of belt where items ride
const BELT_UNDERSIDE_Y = BELT_TOP_Y - BELT_THICKNESS_M; // 0.685m
const ROLLER_Y = BELT_UNDERSIDE_Y - ROLLER_RADIUS_M; // ~0.645m - roller center
const FRAME_TOP_Y = ROLLER_Y - ROLLER_RADIUS_M - 0.02; // Top of frame structure
const ROLLER_Y = BELT_UNDERSIDE_Y - CAD_ROLLER_RADIUS_M;
const FRAME_TOP_Y = ROLLER_Y - CAD_ROLLER_RADIUS_M - 0.02;
const CONVEYOR_START_X = -4.2;
const CONVEYOR_END_X = B_RECEIVER.transferEndX + 0.15; // main belt ends at short B spur tip
/** Max items rendered simultaneously (perf cap). */
@@ -267,12 +267,19 @@ function MotionTrail({
);
}
/** Static roller cylinder — no per-frame rotation (belt stripes show movement). */
/** Static roller — CAD pitch/radius for modular extensions (no non-uniform scale of CAD module). */
function StaticRoller({ position }: { position: [number, number, number] }) {
return (
<mesh position={position} rotation={[0, 0, Math.PI / 2]}>
<cylinderGeometry args={[ROLLER_RADIUS_M, ROLLER_RADIUS_M, CONVEYOR_WIDTH_M - 0.02, 8]} />
<meshStandardMaterial color={COLORS.rollers} metalness={0.4} roughness={0.5} />
<cylinderGeometry args={[CAD_ROLLER_RADIUS_M, CAD_ROLLER_RADIUS_M, CONVEYOR_WIDTH_M - 0.02, 16]} />
<meshStandardMaterial
color={COLORS.rollers}
metalness={0.85}
roughness={0.32}
transparent={false}
opacity={1}
depthWrite
/>
</mesh>
);
}
@@ -302,56 +309,7 @@ function BeltStripe({ baseOffset, elapsedMs }: { baseOffset: number; elapsedMs:
);
}
/** Stepper motor drive unit with pulse indicator */
function StepperMotor({ position, pulseActive }: { position: [number, number, number]; pulseActive: boolean }) {
const pulseRef = useRef<Mesh>(null);
const rotationRef = useRef(0);
useFrame((_, delta) => {
if (pulseRef.current && pulseActive) {
rotationRef.current += delta * 8;
pulseRef.current.rotation.z = rotationRef.current;
}
});
return (
<group position={position}>
{/* Motor body */}
<mesh position={[0, 0, CONVEYOR_WIDTH_M / 2 + MOTOR_DEPTH_M / 2 + 0.02]}>
<boxGeometry args={[MOTOR_WIDTH_M, MOTOR_HEIGHT_M, MOTOR_DEPTH_M]} />
<meshStandardMaterial color="#475569" metalness={0.6} roughness={0.3} />
</mesh>
{/* Motor shaft - rotates when active */}
<mesh
ref={pulseRef}
position={[0, 0, CONVEYOR_WIDTH_M / 2 + 0.01]}
rotation={[Math.PI / 2, 0, 0]}
>
<cylinderGeometry args={[0.015, 0.015, 0.03, 8]} />
<meshStandardMaterial color="#94a3b8" metalness={0.7} roughness={0.2} />
</mesh>
{/* Drive pulley */}
<mesh position={[0, 0, CONVEYOR_WIDTH_M / 2 - 0.02]} rotation={[Math.PI / 2, 0, 0]}>
<cylinderGeometry args={[0.035, 0.035, 0.025, 12]} />
<meshStandardMaterial color="#64748b" metalness={0.5} roughness={0.4} />
</mesh>
{/* Belt to drive roller */}
<mesh position={[0, DRIVE_ROLLER_RADIUS_M / 2, CONVEYOR_WIDTH_M / 2 - 0.02]}>
<boxGeometry args={[0.01, DRIVE_ROLLER_RADIUS_M + 0.02, 0.015]} />
<meshStandardMaterial color="#1e293b" />
</mesh>
{/* Pulse indicator LED */}
<mesh position={[0, MOTOR_HEIGHT_M / 2 - 0.01, CONVEYOR_WIDTH_M / 2 + MOTOR_DEPTH_M + 0.025]}>
<sphereGeometry args={[0.008, 8, 8]} />
<meshStandardMaterial
color={pulseActive ? '#22d3ee' : '#475569'}
emissive={pulseActive ? '#22d3ee' : '#000'}
emissiveIntensity={pulseActive ? 0.8 : 0}
/>
</mesh>
</group>
);
}
/** StepperMotor removed in Stage 2C — CAD motor-and-drive/NEMA17 is the sole drive unit. */
/** Laser beam from rangefinder to item — static opacity, no useFrame. */
function LaserBeam({ active, itemY }: { active: boolean; itemY: number }) {
@@ -467,26 +425,27 @@ function SupportLeg({ x }: { x: number }) {
* Belt top surface at 0.7m (BELT_TOP_Y)
*/
/**
* Belt extension segment (SPEC_DERIVED) — entry/exit sections flanking the
* CAD conveyor module. Same 500 mm width / 700 mm belt top as the real unit.
* Belt extension segment (SPEC_DERIVED modular) — entry/exit flanking the CAD
* module. Uses CAD roller pitch (500 mm) and radius (25 mm); never scales the GLB.
*/
function BeltSection({ startX, endX, simplified, shadows }: { startX: number; endX: number; simplified: boolean; shadows: boolean }) {
const spacing = simplified ? ROLLER_SPACING_M * 2 : ROLLER_SPACING_M;
const spacing = simplified ? CAD_ROLLER_PITCH_M * 2 : CAD_ROLLER_PITCH_M;
const length = endX - startX;
const centerX = (startX + endX) / 2;
const rollerCount = Math.max(1, Math.floor(length / spacing));
const rollerY = BELT_Y - BELT_THICKNESS_M - CAD_ROLLER_RADIUS_M - 0.01;
const rollerPositions = useMemo(() => {
const positions: [number, number, number][] = [];
for (let i = 0; i < rollerCount; i++) {
positions.push([startX + spacing / 2 + i * spacing, ROLLER_Y, 0]);
positions.push([startX + spacing / 2 + i * spacing, rollerY, 0]);
}
return positions;
}, [rollerCount, spacing, startX]);
}, [rollerCount, spacing, startX, rollerY]);
const legPositions = useMemo(() => {
const positions: number[] = [];
for (let x = startX + 0.5; x < endX - 0.3; x += 2.0) {
for (let x = startX + 0.5; x < endX - 0.3; x += CAD_SUPPORT_SPACING_M) {
positions.push(x);
}
return positions;
@@ -496,23 +455,23 @@ function BeltSection({ startX, endX, simplified, shadows }: { startX: number; en
<group>
<mesh position={[centerX, BELT_Y - BELT_THICKNESS_M / 2, 0]} receiveShadow={shadows}>
<boxGeometry args={[length, BELT_THICKNESS_M, CONVEYOR_WIDTH_M]} />
<meshStandardMaterial color={COLORS.belt} roughness={0.85} metalness={0.05} />
<meshStandardMaterial color={COLORS.belt} roughness={0.85} metalness={0.05} transparent={false} opacity={1} depthWrite />
</mesh>
<mesh position={[centerX, BELT_Y + SIDE_GUARD_HEIGHT_M / 2, CONVEYOR_WIDTH_M / 2 + 0.02]}>
<boxGeometry args={[length, SIDE_GUARD_HEIGHT_M, 0.025]} />
<meshStandardMaterial color={COLORS.sideGuards} metalness={0.4} roughness={0.5} />
<meshStandardMaterial color={COLORS.sideGuards} metalness={0.55} roughness={0.45} transparent={false} opacity={1} depthWrite />
</mesh>
<mesh position={[centerX, BELT_Y + SIDE_GUARD_HEIGHT_M / 2, -CONVEYOR_WIDTH_M / 2 - 0.02]}>
<boxGeometry args={[length, SIDE_GUARD_HEIGHT_M, 0.025]} />
<meshStandardMaterial color={COLORS.sideGuards} metalness={0.4} roughness={0.5} />
<meshStandardMaterial color={COLORS.sideGuards} metalness={0.55} roughness={0.45} transparent={false} opacity={1} depthWrite />
</mesh>
<mesh position={[centerX, FRAME_TOP_Y + 0.025, CONVEYOR_WIDTH_M / 2 + 0.01]} castShadow={shadows}>
<boxGeometry args={[length, 0.05, 0.04]} />
<meshStandardMaterial color={COLORS.conveyorFrame} metalness={0.5} roughness={0.4} />
<meshStandardMaterial color={COLORS.conveyorFrame} metalness={0.55} roughness={0.4} transparent={false} opacity={1} depthWrite />
</mesh>
<mesh position={[centerX, FRAME_TOP_Y + 0.025, -CONVEYOR_WIDTH_M / 2 - 0.01]} castShadow={shadows}>
<boxGeometry args={[length, 0.05, 0.04]} />
<meshStandardMaterial color={COLORS.conveyorFrame} metalness={0.5} roughness={0.4} />
<meshStandardMaterial color={COLORS.conveyorFrame} metalness={0.55} roughness={0.4} transparent={false} opacity={1} depthWrite />
</mesh>
{rollerPositions.map((pos, i) => (
<StaticRoller key={i} position={pos} />
@@ -525,17 +484,16 @@ function BeltSection({ startX, endX, simplified, shadows }: { startX: number; en
}
/**
* Conveyor: CAD module (REAL_CAD) + entry/exit belt extensions (SPEC_DERIVED).
* Gate/roller/belt motion is driven by the domain visual-state adapter.
* SorterCadAssembly (inline): sole conveyor geometry source —
* REAL_CAD module + modular SPEC_DERIVED entry/exit at CAD pitch.
* No procedural motor (CAD NEMA17 only).
*/
function ConveyorBelt({ pulseActive, elapsedMs, simplified, shadows = false, gateOpen = false, beltVelocityMps = 0, rollerOmega = 0 }: { pulseActive: boolean; elapsedMs: number; simplified: boolean; shadows?: boolean; gateOpen?: boolean; beltVelocityMps?: number; rollerOmega?: number }) {
function ConveyorBelt({ pulseActive: _pulseActive, elapsedMs, simplified, shadows = false, gateOpen = false, beltVelocityMps = 0, rollerOmega = 0 }: { pulseActive: boolean; elapsedMs: number; simplified: boolean; shadows?: boolean; gateOpen?: boolean; beltVelocityMps?: number; rollerOmega?: number }) {
const stripeOffsets = simplified ? [-2, 0, 2] : [-3, -1, 0.5, 2];
const [cadStart, cadEnd] = CONVEYOR_CAD_SPAN_X;
return (
<group>
{/* CAD-derived conveyor module (real machine: frame, belt, rollers,
drive, metering gates, servo diverters, camera arch) */}
<group name="SorterCadAssembly" userData={{ role: 'single-cad-conveyor' }}>
<Suspense fallback={null}>
<ConveyorCadModel
gateOpen={gateOpen}
@@ -545,39 +503,30 @@ function ConveyorBelt({ pulseActive, elapsedMs, simplified, shadows = false, gat
/>
</Suspense>
{/* Entry extension: zone A feed into the CAD module */}
<BeltSection startX={CONVEYOR_START_X} endX={cadStart} simplified={simplified} shadows={shadows} />
{/* Exit extension: CAD module discharge to the B spur */}
<BeltSection startX={cadEnd} endX={CONVEYOR_END_X} simplified={simplified} shadows={shadows} />
{/* Belt stripes — deterministic movement synced to item (offset = time * 1 m/s) */}
{stripeOffsets.map((offset, i) => (
<BeltStripe key={i} baseOffset={offset} elapsedMs={elapsedMs} />
))}
{/* Drive roller at end (larger) */}
<mesh position={[CONVEYOR_END_X - 0.1, ROLLER_Y, 0]} rotation={[0, 0, Math.PI / 2]}>
<mesh position={[CONVEYOR_END_X - 0.1, BELT_Y - BELT_THICKNESS_M - CAD_ROLLER_RADIUS_M - 0.01, 0]} rotation={[0, 0, Math.PI / 2]}>
<cylinderGeometry args={[DRIVE_ROLLER_RADIUS_M, DRIVE_ROLLER_RADIUS_M, CONVEYOR_WIDTH_M - 0.02, 16]} />
<meshStandardMaterial color="#64748b" metalness={0.5} roughness={0.4} />
<meshStandardMaterial color="#64748b" metalness={0.5} roughness={0.4} transparent={false} opacity={1} depthWrite />
</mesh>
{/* Tension roller at start (larger) */}
<mesh position={[CONVEYOR_START_X + 0.1, ROLLER_Y, 0]} rotation={[0, 0, Math.PI / 2]}>
<mesh position={[CONVEYOR_START_X + 0.1, BELT_Y - BELT_THICKNESS_M - CAD_ROLLER_RADIUS_M - 0.01, 0]} rotation={[0, 0, Math.PI / 2]}>
<cylinderGeometry args={[DRIVE_ROLLER_RADIUS_M * 0.9, DRIVE_ROLLER_RADIUS_M * 0.9, CONVEYOR_WIDTH_M - 0.02, 16]} />
<meshStandardMaterial color="#64748b" metalness={0.5} roughness={0.4} />
<meshStandardMaterial color="#64748b" metalness={0.5} roughness={0.4} transparent={false} opacity={1} depthWrite />
</mesh>
{/* Stepper motor at drive end */}
<StepperMotor position={[CONVEYOR_END_X - 0.1, ROLLER_Y, 0]} pulseActive={pulseActive} />
{/* End caps / guards */}
<mesh position={[CONVEYOR_START_X, BELT_Y - 0.05, 0]}>
<boxGeometry args={[0.05, 0.12, CONVEYOR_WIDTH_M + 0.1]} />
<meshStandardMaterial color={COLORS.conveyorFrame} />
<meshStandardMaterial color={COLORS.conveyorFrame} transparent={false} opacity={1} depthWrite />
</mesh>
<mesh position={[CONVEYOR_END_X, BELT_Y - 0.05, 0]}>
<boxGeometry args={[0.05, 0.12, CONVEYOR_WIDTH_M + 0.1]} />
<meshStandardMaterial color={COLORS.conveyorFrame} />
<meshStandardMaterial color={COLORS.conveyorFrame} transparent={false} opacity={1} depthWrite />
</mesh>
</group>
);

View File

@@ -17,8 +17,9 @@ import { useRef, type ReactNode } from 'react';
import { useFrame } from '@react-three/fiber';
import { Physics, RigidBody, CuboidCollider, useRapier } from '@react-three/rapier';
import { getStaticColliders } from '../../domain/physicsWorldLayout';
import { PHYSICS_TIMESTEP_SEC } from '../../domain/physicsTimestep';
export const PHYSICS_DT = 1 / 60;
export const PHYSICS_DT = PHYSICS_TIMESTEP_SEC;
const MAX_SUBSTEPS = 4;
/**

View File

@@ -0,0 +1,45 @@
/**
* Stage 2C — modular CAD conveyor assembly parameters.
*
* Derived from 3d_models/conveer.FCStd (manifest Body and Link bbox mm) and
* OZON Track 3 layout (500 mm belt / 700 mm height). Extensions flanking the
* ~2.01 m CAD module use the same pitch/width/height — never non-uniform scale.
*/
/** Author CAD module length after bake+placement (m). */
export const CAD_MODULE_LENGTH_M = 2.01;
/** CAD roller assembly pitch along the line (profiles / Link005 spacing ~500 mm). */
export const CAD_ROLLER_PITCH_M = 0.5;
/** CAD roller outer radius — Body002 roller diameter 50 mm. */
export const CAD_ROLLER_RADIUS_M = 0.025;
/** Spec / CAD belt width. */
export const CAD_CONVEYOR_WIDTH_M = 0.5;
/** Belt top height from floor. */
export const CAD_BELT_HEIGHT_M = 0.7;
/** Support leg spacing along extensions. */
export const CAD_SUPPORT_SPACING_M = 2.0;
/** Full domain line length (entry A to B spur tip), meters. */
export const CAD_TOTAL_LINE_LENGTH_M = 8.5;
export const CAD_ASSEMBLY_PARAMS = {
segmentLength: CAD_MODULE_LENGTH_M,
rollerPitch: CAD_ROLLER_PITCH_M,
rollerRadius: CAD_ROLLER_RADIUS_M,
conveyorWidth: CAD_CONVEYOR_WIDTH_M,
beltHeight: CAD_BELT_HEIGHT_M,
supportSpacing: CAD_SUPPORT_SPACING_M,
totalLineLength: CAD_TOTAL_LINE_LENGTH_M,
} as const;
/** Structured correction transforms (bake is authoritative; JSX must not invent offsets). */
export const CAD_TRANSFORM_MANIFEST = {
bakeFormula: '(x,y,z)_mm_Zup -> (-x, z, y+250)/1000 Y-up meters',
worldPlacement: [-2.02, 0.594, 0] as [number, number, number],
moduleSpanX: [-2.086, -0.076] as [number, number],
motorNode: 'motor-and-drive/NEMA17',
motorWorldAabbApprox: {
min: [-2.062, 0.564, 0.212],
max: [-2.02, 0.606, 0.284],
note: 'On frame at belt height — not under floor. Detached motor was procedural StepperMotor.',
},
} as const;

View File

@@ -0,0 +1,89 @@
/**
* Stage 2C §11.1 — machine-readable runtime ↔ headless physics config hash.
* Both paths must consume the same static colliders, pusher geometry, dt, gravity.
* Hash is pure-JS (no Node crypto) so the module stays isomorphic.
*/
import { getStaticColliders } from './physicsWorldLayout';
import { PUSHER } from './pusherMotion';
import { PHYSICS_TIMESTEP_SEC, PHYSICS_GRAVITY } from './physicsTimestep';
export { PHYSICS_TIMESTEP_SEC, PHYSICS_GRAVITY } from './physicsTimestep';
export interface PhysicsConfigSnapshot {
timestep: number;
gravity: [number, number, number];
pusherHalfExtents: [number, number, number];
pusherCenterY: number;
pusherEngage: { x: number; z: number };
staticColliderCount: number;
staticColliderIds: string[];
staticColliderFingerprint: string;
}
function fingerprintColliders(): string {
const defs = getStaticColliders();
return defs
.map((d) =>
[
d.id,
d.halfExtents.map((n) => n.toFixed(5)).join(','),
d.position.map((n) => n.toFixed(5)).join(','),
d.rotation.map((n) => n.toFixed(5)).join(','),
d.friction.toFixed(4),
].join('|'),
)
.join(';');
}
/** FNV-1a 64-bit (as hex) — deterministic, isomorphic. */
function fnv1aHex(input: string): string {
let h = 0xcbf29ce484222325n;
const prime = 0x100000001b3n;
for (let i = 0; i < input.length; i++) {
h ^= BigInt(input.charCodeAt(i));
h = (h * prime) & 0xffffffffffffffffn;
}
return h.toString(16).padStart(16, '0');
}
export function buildPhysicsConfigSnapshot(timestep: number): PhysicsConfigSnapshot {
const defs = getStaticColliders();
return {
timestep,
gravity: PHYSICS_GRAVITY,
pusherHalfExtents: [...PUSHER.halfExtents] as [number, number, number],
pusherCenterY: PUSHER.centerY,
pusherEngage: { x: PUSHER.engageX, z: PUSHER.engageZ },
staticColliderCount: defs.length,
staticColliderIds: defs.map((d) => d.id),
staticColliderFingerprint: fingerprintColliders(),
};
}
export function hashPhysicsConfig(snapshot: PhysicsConfigSnapshot): string {
return fnv1aHex(JSON.stringify(snapshot));
}
export function getRuntimePhysicsConfigHash(): string {
return hashPhysicsConfig(buildPhysicsConfigSnapshot(PHYSICS_TIMESTEP_SEC));
}
export function getHeadlessPhysicsConfigHash(headlessTimestep = PHYSICS_TIMESTEP_SEC): string {
return hashPhysicsConfig(buildPhysicsConfigSnapshot(headlessTimestep));
}
export function assertRuntimeHeadlessParity(headlessTimestep = PHYSICS_TIMESTEP_SEC): {
runtime: string;
headless: string;
equal: boolean;
timestepEqual: boolean;
} {
const runtime = getRuntimePhysicsConfigHash();
const headless = getHeadlessPhysicsConfigHash(headlessTimestep);
return {
runtime,
headless,
equal: runtime === headless,
timestepEqual: headlessTimestep === PHYSICS_TIMESTEP_SEC,
};
}

View File

@@ -21,8 +21,9 @@ import { getPusherState, PUSHER } from './pusherMotion';
import { receiverContains, type ReceiverZone } from './receiverVolumes';
import { resolveItem } from '../data/resolveItem';
import { BELT_TOP_Y } from './physicalLayout';
import { PHYSICS_TIMESTEP_SEC } from './physicsTimestep';
export const SIM_DT = 1 / 60;
export const SIM_DT = PHYSICS_TIMESTEP_SEC;
export const SIM_SETTLE_SECONDS = 6.0;
let rapierReady = false;

View File

@@ -0,0 +1,3 @@
/** Shared fixed physics timestep — runtime Rapier and headless must match. */
export const PHYSICS_TIMESTEP_SEC = 1 / 60;
export const PHYSICS_GRAVITY: [number, number, number] = [0, -9.81, 0];

View File

@@ -0,0 +1,52 @@
/**
* Stage 2C — unit tests for CAD assembly params + runtime/headless physics hash.
*/
import { describe, expect, it } from 'vitest';
import {
CAD_ASSEMBLY_PARAMS,
CAD_TRANSFORM_MANIFEST,
CAD_ROLLER_PITCH_M,
CAD_CONVEYOR_WIDTH_M,
CAD_BELT_HEIGHT_M,
} from './cadAssemblyParams';
import {
assertRuntimeHeadlessParity,
PHYSICS_TIMESTEP_SEC,
buildPhysicsConfigSnapshot,
} from './physicsConfigHash';
import { SIM_DT } from './physicsDropSim';
describe('Stage 2C CAD assembly params', () => {
it('preserves official belt width and height', () => {
expect(CAD_CONVEYOR_WIDTH_M).toBe(0.5);
expect(CAD_BELT_HEIGHT_M).toBe(0.7);
expect(CAD_ASSEMBLY_PARAMS.rollerPitch).toBe(CAD_ROLLER_PITCH_M);
});
it('documents motor on-frame AABB (not under floor)', () => {
const aabb = CAD_TRANSFORM_MANIFEST.motorWorldAabbApprox;
expect(aabb.min[1]).toBeGreaterThan(0.4);
expect(aabb.max[1]).toBeLessThan(0.8);
});
});
describe('Stage 2C runtime/headless physics parity', () => {
it('headless SIM_DT matches canonical timestep', () => {
expect(SIM_DT).toBe(PHYSICS_TIMESTEP_SEC);
});
it('hashes match for runtime and headless snapshots', () => {
const parity = assertRuntimeHeadlessParity(SIM_DT);
expect(parity.timestepEqual).toBe(true);
expect(parity.equal).toBe(true);
expect(parity.runtime).toBe(parity.headless);
expect(parity.runtime).toMatch(/^[a-f0-9]{16}$/);
});
it('snapshot includes static colliders and pusher geometry', () => {
const snap = buildPhysicsConfigSnapshot(PHYSICS_TIMESTEP_SEC);
expect(snap.staticColliderCount).toBeGreaterThan(5);
expect(snap.pusherHalfExtents[0]).toBe(0.5);
expect(snap.gravity).toEqual([0, -9.81, 0]);
});
});

View File

@@ -241,7 +241,16 @@ export default function MainPage({
const caseProgress = getCaseProgress(playback);
const measurementData = useMemo(() => getMeasurementData(playback), [playback]);
// Stage 2C §6: large white MEASUREMENT panel is debug-only.
// Default / — never mount. ?debug=1 — compact. ?debug=1&measurement=full — full panel.
const measurementMode = useMemo(() => {
if (typeof window === 'undefined') return 'off' as const;
const params = new URLSearchParams(window.location.search);
if (params.get('debug') !== '1') return 'off' as const;
return params.get('measurement') === 'full' ? 'full' as const : 'compact' as const;
}, []);
const showMeasurement =
measurementMode !== 'off' &&
!presentationMode &&
shouldShowMeasurement(playback.currentPhase) &&
(isRunning || isPaused) &&
@@ -306,9 +315,29 @@ export default function MainPage({
)}
</div>
{width >= 768 && (
{width >= 768 && measurementMode === 'full' && (
<CVInspectionOverlay data={measurementData} visible={showMeasurement} />
)}
{width >= 768 && measurementMode === 'compact' && showMeasurement && (
<div className="cv-overlay cv-overlay-compact" data-testid="measurement-compact">
<div className="cv-header">
<span className="cv-title">MEAS</span>
<span className="cv-status active">{Math.round((measurementData.confidence ?? 0) * 100)}%</span>
</div>
<div className="cv-body">
<div className="cv-row cv-compact">
<span className="cv-label">L×W×H</span>
<span className="cv-value cv-mono">
{measurementData.measuredLengthMm}×{measurementData.measuredWidthMm}×{measurementData.measuredHeightMm}
</span>
</div>
<div className="cv-row cv-compact">
<span className="cv-label">K</span>
<span className="cv-value cv-mono">{measurementData.roundnessK.toFixed(2)}</span>
</div>
</div>
</div>
)}
{!presentationMode && (!stage0.enabled || stage0.hud) && (
<div className="main-hud" data-testid="demo-hud">

View File

@@ -2046,9 +2046,12 @@ button:disabled {
.main-page {
position: relative;
width: 100vw;
height: 100vh;
height: 100dvh;
height: 100vh; /* fallback */
min-height: 100dvh;
overflow: hidden;
background: var(--bg);
padding-bottom: env(safe-area-inset-bottom, 0);
}
.main-demo-viewport {
@@ -2057,11 +2060,26 @@ button:disabled {
z-index: 1;
}
.main-demo-viewport .digital-twin-wrap {
/* Stage 2C §7 — canvas-holder must fill viewport; % height of auto parent was collapsing Canvas. */
.main-demo-viewport .canvas-holder {
position: absolute;
inset: 0;
width: 100%;
height: 100%;
min-height: 100%;
}
.main-demo-viewport .digital-twin-wrap {
position: absolute;
inset: 0;
height: 100%;
width: 100%;
}
.main-demo-viewport .digital-twin-canvas {
position: absolute;
inset: 0;
width: 100% !important;
height: 100% !important;
min-height: 100% !important;
border: none;
@@ -2544,7 +2562,7 @@ button:disabled {
left: 16px;
z-index: 15;
width: 220px;
max-height: calc(100vh - 220px);
max-height: calc(100dvh - 220px);
overflow-y: auto;
border: 1px solid rgba(37, 99, 235, 0.2);
border-radius: 10px;
@@ -2553,6 +2571,16 @@ button:disabled {
box-shadow: 0 2px 16px rgba(37, 99, 235, 0.12);
font-family: 'SF Mono', 'Monaco', 'Consolas', monospace;
font-size: 10px;
pointer-events: auto;
}
.cv-overlay-compact {
width: 160px;
top: 88px;
left: auto;
right: 16px;
max-height: 120px;
pointer-events: none;
}
.cv-header {