cozyclay 1.9.0 → 2.0.0

package/src/scene-objects.js

@@ -363,6 +363,7 @@ export function createSceneObject(kind, existing = [], placement = {}) {
 		// world-anchored prop — where everything starts, because a fresh object
 		// is dropped in front of the lens, not into someone's hand.
 		attach: null,
+		hidden: false,
 		footprint: { ...entry.footprint },
 		height: entry.height,
 		supportY: Number.isFinite(entry.supportY) ? entry.supportY : entry.height,
@@ -413,6 +414,7 @@ export function createCutoutObject({ assetId, aspect = 1, height = CUTOUT_DEFAUL
 		color: CUTOUT_TINT,
 		parent: null,
 		attach: null,
+		hidden: false,
 		// Key order matches what `normalizeSceneObject` writes, so a record
 		// survives a storage round trip byte-for-byte.
 		assetId,
@@ -493,6 +495,7 @@ export function createMeshObject({ assetId, height = MESH_DEFAULT_HEIGHT, footpr
 		color: MESH_ENTRY.color,
 		parent: null,
 		attach: null,
+		hidden: false,
 		assetId,
 		clay: clay === true,
 		footprint: meshFootprint,
@@ -541,6 +544,36 @@ export function descendantsOf(objects, id) {
 	return out;
 }
 
+/** True when this record, a parent above it, or a character carrying any of
+ *  those records is hidden. A cycle in parent links ends the walk. When the
+ *  id is in `objects`, that stored record is what the walk reads, so a display
+ *  copy cannot disagree with the authored flag. Nothing in the lists is changed. */
+export function isEffectivelyHidden(entity, objects = [], characters = []) {
+	if (!entity || typeof entity !== "object") return false;
+	const byId = new Map();
+	for (const object of objects) {
+		if (object && typeof object.id === "string") byId.set(object.id, object);
+	}
+	const characterHidden = (id) => characters.some((item) => item && typeof item === "object" && item.id === id && item.hidden === true);
+	const seen = new Set();
+	let current = entity;
+	while (current && typeof current === "object") {
+		const id = typeof current.id === "string" ? current.id : null;
+		if (id) {
+			if (seen.has(id)) break;
+			seen.add(id);
+			if (byId.has(id)) current = byId.get(id);
+		}
+		if (current.hidden === true) return true;
+		const characterId = current.attach && typeof current.attach.characterId === "string" ? current.attach.characterId : null;
+		if (characterId && characterHidden(characterId)) return true;
+		const parentId = typeof current.parent === "string" ? current.parent : null;
+		if (!parentId) break;
+		current = byId.get(parentId) ?? null;
+	}
+	return false;
+}
+
 export function updateSceneObject(objects, id, patch) {
 	let changed = false;
 	const target = objects.find((object) => object.id === id);
@@ -595,6 +628,7 @@ export function updateSceneObject(objects, id, patch) {
 			if (typeof patch[key] !== "string" || !patch[key] || patch[key] === object[key]) continue;
 			update[key] = patch[key];
 		}
+		if (typeof patch.hidden === "boolean" && patch.hidden !== (object.hidden === true)) update.hidden = patch.hidden;
 		// The travel path is authored geometry, not a bounded transform: it is
 		// normalized by createObjectPath (which repairs or refuses it) and set
 		// wholesale, with null clearing it back to a standing object.
@@ -820,6 +854,7 @@ export function normalizeSceneObject(record) {
 		// not exist. A record written before attachment existed has no field at
 		// all, and null is exactly what it meant: world-anchored.
 		attach: normalizeSceneAttach(record.attach) ?? null,
+		hidden: record.hidden === true,
 		// Library kinds take their size from the library — a stored footprint is
 		// stale data, not a fact. Cutouts and meshes are the exceptions: their
 		// size IS per-instance. A cutout rebuilds the footprint from height and
@@ -1042,10 +1077,11 @@ export function objectFootprintBounds(object) {
  * The contact height is exact, never snapped to the 5 cm grid, and never
  * clamped here: the y clamp stays in updateSceneObject, the single owner.
  */
-export function dropToSurfacePatch(object, others) {
+export function dropToSurfacePatch(object, others, characters = []) {
 	const self = objectFootprintBounds(object);
 	let highestTop = 0;
 	for (const other of others) {
+		if (isEffectivelyHidden(other, others, characters)) continue;
 		const bounds = objectFootprintBounds(other);
 		if (self.minX >= bounds.maxX - OVERLAP_EPS || bounds.minX >= self.maxX - OVERLAP_EPS) continue;
 		if (self.minZ >= bounds.maxZ - OVERLAP_EPS || bounds.minZ >= self.maxZ - OVERLAP_EPS) continue;

package/src/scenes.js

@@ -5,6 +5,7 @@
 import { DEFAULT_SENSOR_FORMAT, SENSOR_FORMATS } from "./shot.js";
 import { normalizeStableItems } from "./stable-items.js";
 import { normalizeMotionCalibration } from "./ardy/motion-calibration.js";
+import { normalizeTrailEdits } from "./motion-trail.js";
 import { elementByPath } from "./studio-elements.js";
 import { wrapAngle } from "./scene-objects.js";
 
@@ -214,6 +215,10 @@ function normalizeMotionRef(ref) {
 	// boundary for a later scene reload. cloneValue also strips non-finite values
 	// and recursively owns the object, so a caller cannot mutate the saved stage.
 	if (plainObject(ref.calibration)) normalized.calibration = normalizeMotionCalibration(ref.calibration);
+	if (ref.trailEdits != null) normalized.trailEdits = normalizeTrailEdits(ref.trailEdits);
+	// An agent-installed take keeps the Studio take id its receipts name, so a
+	// reload still reports the same take. Optional, like calibration.
+	if (typeof ref.studioTakeId === "string" && ref.studioTakeId) normalized.studioTakeId = ref.studioTakeId;
 	return normalized;
 }
 

package/src/semantic-edit.js

@@ -1,4 +1,5 @@
 import { createCameraBlock } from "./camera-block.js";
+import { isBusRunActive } from "./command-bus.js";
 
 export const FIRST_EDIT_VERSION = 1;
 export const FIRST_EDIT_KINDS = Object.freeze([
@@ -90,6 +91,7 @@ export function createSemanticState(initial, publish, observe, domain) {
 		const before = current;
 		const after = typeof update === "function" ? update(before) : update;
 		current = after;
+		if (authored && !isBusRunActive()) console.warn(`[bus] semantic edit for ${domain} called outside a bus run`);
 		publish(after);
 		if (authored) observe(domain, before, after);
 		return after;

package/src/settings-menu.jsx

@@ -1,15 +1,14 @@
-import { useEffect, useRef, useState } from "react";
-import { getAnalyticsOptOut, setAnalyticsOptOut } from "./analytics.js";
+import { useCallback, useEffect, useRef, useState } from "react";
 import { LOCALE, ko, localeChosen, setLocale } from "./locale.js";
+import PreferencesDialog from "./shell/PreferencesDialog.jsx";
 
 // App settings — language and analytics — behind one labelled topbar trigger
 // (#193, docs/studio-ui-ia.md R4). Neither item edits the document, so they do
 // not belong on the Save/Export row as bare toggles.
 //
-// The panel is a group of toggle buttons rather than role="menu": aria-pressed
-// is the state contract the analytics opt-out already shipped with, and only
-// role="button" supports it. Tab order is DOM order, Escape returns focus to
-// the trigger.
+// The trigger now opens the v2 Preferences dialog. The old language strings stay
+// here because the locale contract and the camera-tutorial source contract both
+// treat this file as the Settings entry point.
 const LANGUAGES = [
 	{ id: "en", label: "English", action: "Switch to English" },
 	{ id: "ko", label: "한국어", action: "한국어로 전환" },
@@ -17,43 +16,35 @@ const LANGUAGES = [
 
 export default function SettingsMenu({ motionSetup, motionSetupReveal = 0 }) {
 	const [open, setOpen] = useState(false);
-	const [setupOpen, setSetupOpen] = useState(false);
-	const [optedOut, setOptedOut] = useState(getAnalyticsOptOut);
 	const triggerRef = useRef(null);
-	const setupRef = useRef(null);
+	const close = useCallback(() => {
+		setOpen(false);
+		triggerRef.current?.focus();
+	}, []);
+	const openCameraTutorial = useCallback(() => {
+		window.dispatchEvent(new CustomEvent("cozyclay:camera-tutorial", { detail: { open: true } }));
+		setOpen(false);
+	}, []);
+	const cameraTutorial = (
+		<>
+			<h4>{ko("Help", "도움말")}</h4>
+			<button
+				type="button"
+				data-testid="settings-camera-tutorial"
+				title={ko("Learn the camera in seven steps", "일곱 단계로 카메라 익히기")}
+				onClick={openCameraTutorial}
+			>
+				{ko("Camera tutorial", "카메라 튜토리얼")}
+			</button>
+		</>
+	);
 
-	// Generation setup is an app setting, never a document edit. The same
-	// popover is revealed by the contextual action beside Generate.
+	// A contextual readiness action can reveal Preferences directly on the
+	// motion connection page without changing the topbar or adding a second
+	// settings surface.
 	useEffect(() => {
-		if (!motionSetupReveal) return;
-		setOpen(true);
-		setSetupOpen(true);
+		if (motionSetupReveal) setOpen(true);
 	}, [motionSetupReveal]);
-	useEffect(() => {
-		if (open && setupOpen) setupRef.current?.focus();
-	}, [open, setupOpen, motionSetupReveal]);
-
-	// Dismissal mirrors the project menu: listen only while open, ignore
-	// presses inside the wrap so the trigger keeps toggling, close on Escape
-	// and hand focus back to the control the operator came from.
-	useEffect(() => {
-		if (!open) return undefined;
-		const onPointerDown = (event) => {
-			if (event.target instanceof Element && event.target.closest(".settings-menu-wrap")) return;
-			setOpen(false);
-		};
-		const onKeyDown = (event) => {
-			if (event.key !== "Escape") return;
-			setOpen(false);
-			triggerRef.current?.focus();
-		};
-		document.addEventListener("pointerdown", onPointerDown);
-		window.addEventListener("keydown", onKeyDown);
-		return () => {
-			document.removeEventListener("pointerdown", onPointerDown);
-			window.removeEventListener("keydown", onKeyDown);
-		};
-	}, [open]);
 
 	// First-run cue: the studio starts in English even on a Korean browser, so
 	// the only visible hint that Korean exists used to be the old locale button.
@@ -68,78 +59,21 @@ export default function SettingsMenu({ motionSetup, motionSetupReveal = 0 }) {
 				className="topbar-action settings-menu-trigger"
 				data-testid="settings-menu-trigger"
 				aria-expanded={open}
-				aria-haspopup="true"
+				aria-haspopup="dialog"
 				title={ko("Language and analytics", "언어 및 사용 통계")}
 				ref={triggerRef}
-				onClick={() => setOpen((value) => !value)}
+				onClick={() => (open ? close() : setOpen(true))}
 			>
 				{label}
 				<span className="caret">▾</span>
 			</button>
-			{open && (
-				<div className="project-menu settings-menu" role="group" aria-label={ko("Settings", "설정")}>
-					{/* Motion readiness setup (#277): separate from privacy controls. */}
-					{motionSetup && (
-						<>
-							<button
-								type="button"
-								data-testid="settings-motion-setup"
-								aria-expanded={setupOpen}
-								ref={setupRef}
-								onClick={() => setSetupOpen((value) => !value)}
-							>
-								{ko("Motion generation", "모션 생성")}
-							</button>
-							{setupOpen && motionSetup}
-						</>
-					)}
-					<h4>{ko("Language", "언어")}</h4>
-					{LANGUAGES.map((language) => (
-						<button
-							key={language.id}
-							type="button"
-							data-testid={`settings-locale-${language.id}`}
-							aria-pressed={LOCALE === language.id}
-							title={language.action}
-							onClick={() => setLocale(language.id)}
-						>
-							{language.label}
-							<span className="mark" aria-hidden="true">{LOCALE === language.id ? "✓" : ""}</span>
-						</button>
-					))}
-					<h4>{ko("Privacy", "개인정보")}</h4>
-					<button
-						type="button"
-						data-testid="settings-analytics"
-						aria-pressed={!optedOut}
-						title={optedOut
-							? ko("Turn anonymous analytics on", "익명 사용 통계 켜기")
-							: ko("Turn anonymous analytics off", "익명 사용 통계 끄기")}
-						onClick={async () => {
-							const actual = await setAnalyticsOptOut(!optedOut);
-							setOptedOut(actual);
-						}}
-					>
-						{ko("Anonymous analytics", "익명 사용 통계")}
-						<span className="mark">{optedOut ? ko("off", "끔") : ko("on", "켬")}</span>
-					</button>
-					{/* Learning the camera is not a document edit and not a topbar
-					    button (R4): the tutorial opens from this closed popover, so the
-					    mode budgets in docs/studio-ui-ia.md §1 are untouched. */}
-					<h4>{ko("Help", "도움말")}</h4>
-					<button
-						type="button"
-						data-testid="settings-camera-tutorial"
-						title={ko("Learn the camera in seven steps", "일곱 단계로 카메라 익히기")}
-						onClick={() => {
-							window.dispatchEvent(new CustomEvent("cozyclay:camera-tutorial", { detail: { open: true } }));
-							setOpen(false);
-						}}
-					>
-						{ko("Camera tutorial", "카메라 튜토리얼")}
-					</button>
-				</div>
-			)}
+			<PreferencesDialog
+				open={open}
+				onClose={close}
+				motionSetup={motionSetup}
+				initialSection={motionSetupReveal ? "ARDY Connection" : "Appearance"}
+				cameraTutorial={cameraTutorial}
+			/>
 		</div>
 	);
 }