Dodaios is an open-source agent OS for your desktop: it runs your coding agents, browser and apps by voice or chat, on your own machine. Formerly Personal Jarvis.
Python agent-orchestrationai-agentai-coding-assistantclaude-codecoding-agentcomputer-usedesktop-applocal-firstmcppersonal-jarvisvoice-assistantvoice-coding
feat(office): contemporary office look for the shared kit, floors and rooms
rubenluetke10-beep5d5145de704e
diff --git a/jarvis/ui/web/frontend/src/components/society/office/DeskInstances.tsx b/jarvis/ui/web/frontend/src/components/society/office/DeskInstances.tsxindex c22e57c4d0..703255dccc 100644--- a/jarvis/ui/web/frontend/src/components/society/office/DeskInstances.tsx+++ b/jarvis/ui/web/frontend/src/components/society/office/DeskInstances.tsx@@ -1,64 +1,118 @@/*** Every workstation on the floor, drawn as instanced meshes: one draw call- * per desk part instead of one per part per desk. Same parts and local- * placement as `Desk` in OfficeFurniture (the agent sits at local +z and looks- * north at its monitor); a desk facing south is rotated half a turn.+ * per desk part instead of one per part per desk. The agent sits at local +z+ * and looks north at its monitor; a desk facing south is rotated half a turn.+ *+ * The workstation is a contemporary bench desk: a light-oak top on black+ * steel T-legs, a felt privacy screen, a slim monitor on an arm, a white+ * pedestal, and an ergonomic chair with a mesh back on a five-star base. The+ * felt screen and the seat fabric take the department's zone colour through+ * per-instance colours, so a department reads as one team at a glance. A+ * coding-floor studio passes a `tone` instead, which swaps whole materials by+ * part role.*/import { useLayoutEffect, useMemo, useRef } from "react";-import { BufferGeometry, Euler, InstancedMesh, Matrix4, PlaneGeometry, Quaternion, Vector3, type Material, type MeshStandardMaterial } from "three";+import {+ BufferGeometry, Color, Euler, InstancedMesh, Matrix4, PlaneGeometry, Quaternion, Vector3, type Material, type MeshStandardMaterial,+} from "three";import { RoundedBoxGeometry } from "three-stdlib";import type { SocietyAgent } from "../data";import { GEO, MAT, screenMaterial } from "./OfficeFurniture";import type { DeskSlot } from "./officeLayout";+import { DEPARTMENT_ZONES } from "./officePalette";import type { ScreenFace } from "./screenTextures";+/** Which zone colour a tinted part takes: the felt screen's panel tone or the seat fabric. */+type Tint = "panel" | "seat";+/** Which surface of a workstation a part is; a desk tone recolours parts by role. */type PartRole = "top" | "body" | "leg" | "monitor" | "keyboard" | "chair" | "seat";/** Per-department materials for the parts that carry a room's style (the monitor and keyboard stay). */export type DeskTone = Partial<Record<Exclude<PartRole, "monitor" | "keyboard">, MeshStandardMaterial>>;-interface Part { role: PartRole; geometry: BufferGeometry; material: Material; position: [number, number, number]; scale?: [number, number, number]; cast: boolean }+interface Part {+ role: PartRole;+ geometry: BufferGeometry;+ material: Material;+ position: [number, number, number];+ scale?: [number, number, number];+ /** Turn about the part's own vertical axis (radians). */+ rotY?: number;+ tint?: Tint;+ cast: boolean;+}const CHAIR_Z = 0.62;const rounded = (w: number, h: number, d: number, r: number) => new RoundedBoxGeometry(w, h, d, 2, r);+/** Five spokes of the chair's star base, and a caster at the end of each. */+const STAR = Array.from({ length: 5 }, (_, i) => (i * 2 * Math.PI) / 5);+const PARTS: Part[] = [- { role: "top", geometry: rounded(1.5, 0.06, 0.8, 0.02), material: MAT.deskTop, position: [0, 0.74, 0], cast: true },- { role: "body", geometry: GEO.box, material: MAT.deskBody, position: [0.53, 0.36, 0], scale: [0.36, 0.7, 0.72], cast: true },- { role: "leg", geometry: GEO.box, material: MAT.deskLeg, position: [-0.7, 0.36, 0], scale: [0.05, 0.7, 0.7], cast: true },- { role: "body", geometry: GEO.box, material: MAT.deskBody, position: [0, 0.94, -0.41], scale: [1.5, 0.34, 0.03], cast: true },- { role: "monitor", geometry: GEO.box, material: MAT.monitor, position: [0, 0.87, -0.22], scale: [0.08, 0.2, 0.08], cast: true },- { role: "monitor", geometry: GEO.box, material: MAT.monitor, position: [0, 0.78, -0.22], scale: [0.24, 0.02, 0.16], cast: true },- { role: "monitor", geometry: rounded(0.72, 0.44, 0.05, 0.02), material: MAT.monitor, position: [0, 1.18, -0.24], cast: true },- { role: "keyboard", geometry: GEO.box, material: MAT.keyboard, position: [0, 0.78, 0.24], scale: [0.42, 0.02, 0.14], cast: true },- { role: "chair", geometry: GEO.cyl, material: MAT.chair, position: [0, 0.03, CHAIR_Z], scale: [0.3, 0.04, 0.3], cast: true },- { role: "chair", geometry: GEO.cyl, material: MAT.chair, position: [0, 0.25, CHAIR_Z], scale: [0.03, 0.42, 0.03], cast: false },- { role: "seat", geometry: rounded(0.5, 0.08, 0.48, 0.03), material: MAT.chairSeat, position: [0, 0.48, CHAIR_Z], cast: true },- { role: "seat", geometry: rounded(0.48, 0.5, 0.07, 0.03), material: MAT.chairSeat, position: [0, 0.78, CHAIR_Z + 0.24], cast: true },+ // Desk: top surface at 0.77 m, as before, so hands and keyboards line up with the seated pose.+ { role: "top", geometry: rounded(1.5, 0.035, 0.8, 0.015), material: MAT.deskTop, position: [0, 0.7525, 0], cast: true },+ ...[-0.64, 0.64].flatMap((x): Part[] => [+ { role: "leg", geometry: GEO.box, material: MAT.deskLeg, position: [x, 0.36, 0], scale: [0.06, 0.72, 0.05], cast: true },+ { role: "leg", geometry: GEO.box, material: MAT.deskLeg, position: [x, 0.015, 0], scale: [0.06, 0.03, 0.72], cast: false },+ { role: "leg", geometry: GEO.box, material: MAT.deskLeg, position: [x, 0.72, 0], scale: [0.05, 0.03, 0.68], cast: false },+ ]),+ { role: "leg", geometry: GEO.box, material: MAT.deskLeg, position: [0, 0.68, -0.2], scale: [1.24, 0.05, 0.04], cast: false },+ // Mobile pedestal under the desk's right side.+ { role: "body", geometry: rounded(0.4, 0.56, 0.5, 0.03), material: MAT.deskBody, position: [0.44, 0.3, -0.12], cast: true },+ // Felt privacy screen between the back-to-back pair.+ { role: "body", geometry: rounded(1.46, 0.36, 0.03, 0.012), material: MAT.tinted, position: [0, 0.95, -0.41], tint: "panel", cast: true },+ // Slim monitor on an arm clamped to the back edge.+ { role: "monitor", geometry: GEO.box, material: MAT.monitorArm, position: [0, 0.795, -0.33], scale: [0.08, 0.05, 0.06], cast: false },+ { role: "monitor", geometry: GEO.cyl, material: MAT.monitorArm, position: [0, 0.95, -0.33], scale: [0.018, 0.32, 0.018], cast: true },+ { role: "monitor", geometry: GEO.box, material: MAT.monitorArm, position: [0, 1.1, -0.28], scale: [0.04, 0.03, 0.1], cast: false },+ { role: "monitor", geometry: rounded(0.72, 0.43, 0.022, 0.012), material: MAT.monitor, position: [0, 1.18, -0.224], cast: true },+ // Keyboard, mouse and a mug.+ { role: "keyboard", geometry: GEO.box, material: MAT.keyboard, position: [0, 0.777, 0.22], scale: [0.44, 0.014, 0.13], cast: true },+ { role: "keyboard", geometry: GEO.box, material: MAT.keyboard, position: [0.33, 0.78, 0.22], scale: [0.05, 0.02, 0.08], cast: false },+ { role: "keyboard", geometry: GEO.cyl, material: MAT.mug, position: [-0.52, 0.815, 0.02], scale: [0.035, 0.09, 0.035], cast: true },+ // Chair: star base with casters, gas lift, fabric seat (seat top 0.52 m) and a mesh back.+ ...STAR.flatMap((a): Part[] => [+ { role: "chair", geometry: GEO.box, material: MAT.chair, position: [Math.sin(a) * 0.15, 0.06, CHAIR_Z + Math.cos(a) * 0.15], scale: [0.045, 0.035, 0.3], rotY: a, cast: true },+ { role: "chair", geometry: GEO.cyl, material: MAT.chair, position: [Math.sin(a) * 0.29, 0.025, CHAIR_Z + Math.cos(a) * 0.29], scale: [0.028, 0.05, 0.028], cast: false },+ ]),+ { role: "chair", geometry: GEO.cyl, material: MAT.monitorArm, position: [0, 0.27, CHAIR_Z], scale: [0.025, 0.4, 0.025], cast: false },+ { role: "seat", geometry: rounded(0.5, 0.07, 0.48, 0.03), material: MAT.tinted, position: [0, 0.485, CHAIR_Z], tint: "seat", cast: true },+ { role: "chair", geometry: GEO.box, material: MAT.chair, position: [0, 0.62, CHAIR_Z + 0.27], scale: [0.05, 0.3, 0.03], cast: false },+ { role: "chair", geometry: rounded(0.46, 0.52, 0.06, 0.03), material: MAT.chairMesh, position: [0, 0.87, CHAIR_Z + 0.25], cast: true },+ // Lumbar band in the seat fabric, so the mesh back reads as an ergonomic chair.+ { role: "seat", geometry: rounded(0.4, 0.07, 0.02, 0.01), material: MAT.tinted, position: [0, 0.74, CHAIR_Z + 0.215], tint: "seat", cast: false },];const SCREEN_GEOMETRY = new PlaneGeometry(0.66, 0.38);const SCREEN_LOCAL: [number, number, number] = [0, 1.18, -0.212];const FACES: ScreenFace[] = ["working", "idle", "waiting", "paused", "empty"];-function deskMatrix(desk: DeskSlot, local: [number, number, number], scale: [number, number, number] = [1, 1, 1]): Matrix4 {+function deskMatrix(desk: DeskSlot, local: [number, number, number], scale: [number, number, number] = [1, 1, 1], rotY = 0): Matrix4 {const turn = desk.facing === "north" ? 0 : Math.PI;const world = new Matrix4().compose(new Vector3(desk.x, 0, desk.z), new Quaternion().setFromEuler(new Euler(0, turn, 0)), new Vector3(1, 1, 1));- const part = new Matrix4().compose(new Vector3(...local), new Quaternion(), new Vector3(...scale));+ const part = new Matrix4().compose(new Vector3(...local), new Quaternion().setFromEuler(new Euler(0, rotY, 0)), new Vector3(...scale));return world.multiply(part);}-function PartInstances({ part, desks, material }: { part: Part; desks: DeskSlot[]; material: Material }) {+const zoneColours = DEPARTMENT_ZONES.map((z) => ({ panel: new Color(z.panel), seat: new Color(z.seat) }));++function PartInstances({ part, desks, zones, material, tinted }: {+ part: Part; desks: DeskSlot[]; zones: ReadonlyMap<string, number>; material: Material; tinted: boolean;+}) {const ref = useRef<InstancedMesh>(null);useLayoutEffect(() => {const mesh = ref.current;if (!mesh) return;- desks.forEach((desk, i) => mesh.setMatrixAt(i, deskMatrix(desk, part.position, part.scale)));+ desks.forEach((desk, i) => {+ mesh.setMatrixAt(i, deskMatrix(desk, part.position, part.scale, part.rotY));+ if (tinted && part.tint) mesh.setColorAt(i, zoneColours[(zones.get(desk.id) ?? 0) % zoneColours.length][part.tint]);+ });mesh.count = desks.length;mesh.instanceMatrix.needsUpdate = true;+ if (mesh.instanceColor) mesh.instanceColor.needsUpdate = true;mesh.computeBoundingSphere();- }, [desks, part]);+ }, [desks, part, zones, tinted]);return <instancedMesh ref={ref} args={[part.geometry, material, Math.max(1, desks.length)]} castShadow={part.cast} receiveShadow frustumCulled={false} />;}@@ -75,8 +129,16 @@ function ScreenInstances({ face, desks }: { face: ScreenFace; desks: DeskSlot[]return <instancedMesh key={Math.max(1, desks.length)} ref={ref} args={[SCREEN_GEOMETRY, screenMaterial(face), Math.max(1, desks.length)]} frustumCulled={false} />;}-/** All desks with the monitor face each one's agent state calls for; `tone` restyles the desk and chair. */-export function DeskInstances({ desks, agents, tone }: { desks: DeskSlot[]; agents: ReadonlyMap<string, SocietyAgent>; tone?: DeskTone }) {+const NO_ZONES: ReadonlyMap<string, number> = new Map();++/**+ * All desks with the monitor face each one's agent state calls for; `zones`+ * maps a desk id to its department's zone colour (desks without one take the+ * first), and `tone` swaps the desk and chair materials by role instead.+ */+export function DeskInstances({ desks, agents, zones = NO_ZONES, tone }: {+ desks: DeskSlot[]; agents: ReadonlyMap<string, SocietyAgent>; zones?: ReadonlyMap<string, number>; tone?: DeskTone;+}) {const byFace = useMemo(() => {const groups = new Map<ScreenFace, DeskSlot[]>(FACES.map((f) => [f, []]));for (const desk of desks) {@@ -88,8 +150,10 @@ export function DeskInstances({ desks, agents, tone }: { desks: DeskSlot[]; agenreturn (<group>{PARTS.map((part, i) => {- const material = (part.role !== "monitor" && part.role !== "keyboard" && tone?.[part.role]) || part.material;- return <PartInstances key={`${i}:${desks.length}:${material.uuid}`} part={part} desks={desks} material={material} />;+ const override = part.role !== "monitor" && part.role !== "keyboard" ? tone?.[part.role] : undefined;+ const material = override ?? part.material;+ return <PartInstances key={`${i}:${desks.length}:${material.uuid}`} part={part} desks={desks} zones={zones}+ material={material} tinted={!override} />;})}{FACES.map((face) => (byFace.get(face)!.length > 0 ? <ScreenInstances key={face} face={face} desks={byFace.get(face)!} /> : null))}</group>diff --git a/jarvis/ui/web/frontend/src/components/society/office/OfficeFurniture.tsx b/jarvis/ui/web/frontend/src/components/society/office/OfficeFurniture.tsxindex 4f49fc165c..acd3832258 100644--- a/jarvis/ui/web/frontend/src/components/society/office/OfficeFurniture.tsx+++ b/jarvis/ui/web/frontend/src/components/society/office/OfficeFurniture.tsx@@ -1,41 +1,54 @@/*** The office kit: every piece is a few rounded primitives with flat, matte- * colours — the "toy office" look needs no authored meshes or textures.+ * colours in a contemporary-workplace palette — light oak on black steel,+ * felt, ceramic planters and lots of green. It needs no authored meshes; the+ * few surface patterns (felt fluting, sign faces) are canvas textures.* Geometries and materials are module-level singletons shared by every copy.*/import { useMemo } from "react";import {- BoxGeometry, CanvasTexture, CylinderGeometry, DoubleSide, IcosahedronGeometry,- MeshStandardMaterial, SRGBColorSpace, type Texture,+ BoxGeometry, CylinderGeometry, DoubleSide, IcosahedronGeometry, MeshStandardMaterial, RepeatWrapping, type Texture,} from "three";import { RoundedBoxGeometry } from "three-stdlib";-import { OFFICE } from "./officePalette";+import { cachedCanvasTexture } from "./canvasMaterials";+import { DEPARTMENT_ZONES, OFFICE } from "./officePalette";import { screenTexture, type ScreenFace } from "./screenTextures";export const matte = (color: string, extra: Partial<ConstructorParameters<typeof MeshStandardMaterial>[0]> = {}) =>new MeshStandardMaterial({ color, roughness: 0.85, metalness: 0, ...extra });export const MAT = {- deskTop: matte(OFFICE.deskTop),+ deskTop: matte(OFFICE.deskTop, { roughness: 0.6 }),+ deskEdge: matte(OFFICE.deskEdge, { roughness: 0.6 }),deskBody: matte(OFFICE.deskBody),- deskLeg: matte(OFFICE.deskLeg),- chair: matte(OFFICE.chair),+ deskLeg: matte(OFFICE.deskLeg, { roughness: 0.45, metalness: 0.35 }),+ chair: matte(OFFICE.chair, { roughness: 0.5, metalness: 0.2 }),chairSeat: matte(OFFICE.chairSeat),- monitor: matte(OFFICE.monitor, { roughness: 0.5 }),- keyboard: matte(OFFICE.keyboard),+ chairMesh: matte(OFFICE.chairMesh, { roughness: 0.95 }),+ /** White base for parts tinted per instance (seat fabric, desk screens): the instance colour is the colour. */+ tinted: matte("#ffffff", { roughness: 0.95 }),+ monitor: matte(OFFICE.monitor, { roughness: 0.35, metalness: 0.2 }),+ monitorArm: matte(OFFICE.monitorArm, { roughness: 0.3, metalness: 0.6 }),+ keyboard: matte(OFFICE.keyboard, { roughness: 0.5 }),+ mug: matte(OFFICE.mug, { roughness: 0.35 }),+ steel: matte(OFFICE.steel, { roughness: 0.45, metalness: 0.35 }),railing: matte(OFFICE.railing, { roughness: 0.4, metalness: 0.3 }),- glass: new MeshStandardMaterial({ color: OFFICE.glass, transparent: true, opacity: 0.18, roughness: 0.1, side: DoubleSide, depthWrite: false }),+ glass: new MeshStandardMaterial({ color: OFFICE.glass, transparent: true, opacity: 0.14, roughness: 0.05, side: DoubleSide, depthWrite: false }),wall: matte(OFFICE.wallWhite),- sign: matte(OFFICE.signBoard),- wood: matte(OFFICE.wood),- woodDark: matte(OFFICE.woodDark),- couch: matte(OFFICE.couch),- cushion: matte(OFFICE.couchCushion),- pot: matte(OFFICE.plantPot),+ sign: matte(OFFICE.signBoard, { roughness: 0.6 }),+ wood: matte(OFFICE.wood, { roughness: 0.65 }),+ woodDark: matte(OFFICE.woodDark, { roughness: 0.65 }),+ couch: matte(OFFICE.couch, { roughness: 1 }),+ cushion: matte(OFFICE.couchCushion, { roughness: 1 }),+ couchAccents: OFFICE.couchAccent.map((c) => matte(c, { roughness: 1 })),+ pot: matte(OFFICE.plantPot, { roughness: 0.7 }),+ planterLight: matte(OFFICE.planterLight, { roughness: 0.7 }),+ soil: matte("#3b2f26"),leaf: matte(OFFICE.leaf, { flatShading: true }),leafDark: matte(OFFICE.leafDark, { flatShading: true }),+ leafLight: matte(OFFICE.leafLight, { flatShading: true }),trunk: matte(OFFICE.trunk),- rug: matte(OFFICE.rug),+ rug: matte(OFFICE.rug, { roughness: 1 }),books: OFFICE.book.map((c) => matte(c)),};@@ -43,7 +56,8 @@ export const GEO = {box: new BoxGeometry(1, 1, 1),cyl: new CylinderGeometry(1, 1, 1, 16),potCyl: new CylinderGeometry(1, 0.8, 1, 16),- blob: new IcosahedronGeometry(1, 0),+ // One subdivision: foliage reads as soft clusters rather than faceted low-poly rocks.+ blob: new IcosahedronGeometry(1, 1),};export function Box({ size, position, material, cast = true }: {@@ -82,153 +96,186 @@ export function screenMaterial(face: ScreenFace): MeshStandardMaterial {}/**- * One workstation in local space: the agent sits at +z and looks north (-z)- * at its monitor. The parent rotates the whole station for south-facing rows.+ * A potted plant; `size` scales the whole plant (1 ≈ 1.45 m tall): a tall+ * charcoal planter under a full, leafy crown.*/-export function Desk({ face }: { face: ScreenFace }) {- return (- <group>- {/* Top and the white pedestal/legs of a bench desk. */}- <Rounded size={[1.5, 0.06, 0.8]} radius={0.02} position={[0, 0.74, 0]} material={MAT.deskTop} />- <Box size={[0.36, 0.7, 0.72]} position={[0.53, 0.36, 0]} material={MAT.deskBody} />- <Box size={[0.05, 0.7, 0.7]} position={[-0.7, 0.36, 0]} material={MAT.deskLeg} />- {/* Privacy divider between the back-to-back pair. */}- <Box size={[1.5, 0.34, 0.03]} position={[0, 0.94, -0.41]} material={MAT.deskBody} />- {/* Monitor on its stand. */}- <Box size={[0.08, 0.2, 0.08]} position={[0, 0.87, -0.22]} material={MAT.monitor} />- <Box size={[0.24, 0.02, 0.16]} position={[0, 0.78, -0.22]} material={MAT.monitor} />- <Rounded size={[0.72, 0.44, 0.05]} radius={0.02} position={[0, 1.18, -0.24]} material={MAT.monitor} />- <mesh position={[0, 1.18, -0.212]} material={screenMaterial(face)}>- <planeGeometry args={[0.66, 0.38]} />- </mesh>- <Box size={[0.42, 0.02, 0.14]} position={[0, 0.78, 0.24]} material={MAT.keyboard} />- <Chair />- </group>- );-}--/** Office swivel chair behind the desk (local +z side). */-export function Chair() {- return (- <group position={[0, 0, 0.62]}>- <mesh geometry={GEO.cyl} material={MAT.chair} position={[0, 0.03, 0]} scale={[0.3, 0.04, 0.3]} castShadow />- <mesh geometry={GEO.cyl} material={MAT.chair} position={[0, 0.25, 0]} scale={[0.03, 0.42, 0.03]} />- <Rounded size={[0.5, 0.08, 0.48]} radius={0.03} position={[0, 0.48, 0]} material={MAT.chairSeat} />- <Rounded size={[0.48, 0.5, 0.07]} radius={0.03} position={[0, 0.78, 0.24]} material={MAT.chairSeat} />- </group>- );-}--/** A potted plant; `size` scales the whole plant (1 ≈ 1.2 m tall). */export function Plant({ position, size = 1 }: { position: [number, number, number]; size?: number }) {return (<group position={position} scale={size}>- <mesh geometry={GEO.potCyl} material={MAT.pot} position={[0, 0.22, 0]} scale={[0.26, 0.44, 0.26]} castShadow receiveShadow />- <mesh geometry={GEO.cyl} material={MAT.trunk} position={[0, 0.6, 0]} scale={[0.04, 0.5, 0.04]} castShadow />- <mesh geometry={GEO.blob} material={MAT.leaf} position={[0, 1.0, 0]} scale={[0.42, 0.36, 0.42]} castShadow />- <mesh geometry={GEO.blob} material={MAT.leafDark} position={[0.18, 0.86, 0.1]} scale={0.24} castShadow />- <mesh geometry={GEO.blob} material={MAT.leaf} position={[-0.16, 0.9, -0.12]} scale={0.22} castShadow />+ <mesh geometry={GEO.cyl} material={MAT.pot} position={[0, 0.25, 0]} scale={[0.21, 0.5, 0.21]} castShadow receiveShadow />+ <mesh geometry={GEO.cyl} material={MAT.soil} position={[0, 0.501, 0]} scale={[0.19, 0.01, 0.19]} />+ <mesh geometry={GEO.cyl} material={MAT.trunk} position={[0, 0.64, 0]} scale={[0.025, 0.3, 0.025]} castShadow />+ <mesh geometry={GEO.blob} material={MAT.leaf} position={[0, 1.0, 0]} scale={[0.33, 0.3, 0.33]} castShadow />+ <mesh geometry={GEO.blob} material={MAT.leafDark} position={[0.15, 0.86, 0.1]} scale={0.19} castShadow />+ <mesh geometry={GEO.blob} material={MAT.leafLight} position={[-0.15, 0.92, -0.08]} scale={0.19} castShadow />+ <mesh geometry={GEO.blob} material={MAT.leafDark} position={[-0.06, 0.8, 0.16]} scale={0.17} castShadow />+ <mesh geometry={GEO.blob} material={MAT.leaf} position={[0.1, 1.12, -0.14]} scale={0.18} castShadow />+ <mesh geometry={GEO.blob} material={MAT.leafLight} position={[0.04, 1.28, 0.04]} scale={[0.2, 0.15, 0.2]} castShadow />+ <mesh geometry={GEO.blob} material={MAT.leafDark} position={[-0.13, 1.16, 0.1]} scale={0.15} castShadow /></group>);}-/** A low wooden bookshelf with a few coloured books. */+/** Open shelving: black steel uprights, light-oak boards, books, a plant and a few ceramics. */export function Bookshelf({ position, rotationY = 0 }: { position: [number, number, number]; rotationY?: number }) {- const books = useMemo(() => Array.from({ length: 14 }, (_, i) => ({- x: -0.72 + (i % 7) * 0.22 + ((i * 13) % 5) * 0.01,- // Bottom-row books stay below the shelf board, whose front is flush with theirs.- y: i < 7 ? 0.4 : 0.98,- h: 0.3 + ((i * 7) % 4) * 0.04,- m: MAT.books[i % MAT.books.length],- })), []);+ const books = useMemo(() => Array.from({ length: 13 }, (_, i) => {+ const shelf = i < 6 ? 0 : i < 10 ? 1 : 2;+ const inShelf = shelf === 0 ? i : shelf === 1 ? i - 6 : i - 10;+ const start = shelf === 0 ? -0.8 : shelf === 1 ? 0.12 : -0.78;+ return {+ x: start + inShelf * 0.1,+ y: [0.05, 0.5, 0.95][shelf],+ h: 0.26 + ((i * 7) % 4) * 0.03,+ m: MAT.books[(i * 3) % MAT.books.length],+ };+ }), []);return (<group position={position} rotation={[0, rotationY, 0]}>- <Box size={[1.8, 1.4, 0.36]} position={[0, 0.7, 0]} material={MAT.woodDark} />- <Box size={[1.7, 0.03, 0.34]} position={[0, 0.72, 0.02]} material={MAT.wood} cast={false} />- {books.map((b, i) => <Box key={i} size={[0.14, b.h, 0.26]} position={[b.x, b.y + b.h / 2 - 0.12, 0.06]} material={b.m} />)}+ {[-0.88, 0, 0.88].map((x) => <Box key={x} size={[0.03, 1.4, 0.34]} position={[x, 0.7, 0]} material={MAT.steel} />)}+ {[0.035, 0.485, 0.935, 1.385].map((y) => <Box key={y} size={[1.8, 0.03, 0.34]} position={[0, y, 0]} material={MAT.wood} />)}+ {books.map((b, i) => <Box key={i} size={[0.07, b.h, 0.24]} position={[b.x, b.y + b.h / 2, 0]} material={b.m} />)}+ {/* A small planter, two ceramic vases and a trailing plant. */}+ <mesh geometry={GEO.cyl} material={MAT.planterLight} position={[0.45, 0.58, 0]} scale={[0.08, 0.14, 0.08]} castShadow />+ <mesh geometry={GEO.blob} material={MAT.leaf} position={[0.45, 0.71, 0]} scale={[0.12, 0.1, 0.12]} castShadow />+ <mesh geometry={GEO.cyl} material={MAT.planterLight} position={[-0.45, 1.05, 0]} scale={[0.06, 0.2, 0.06]} castShadow />+ <mesh geometry={GEO.cyl} material={MAT.pot} position={[-0.3, 1.02, 0.02]} scale={[0.05, 0.14, 0.05]} castShadow />+ <mesh geometry={GEO.cyl} material={MAT.pot} position={[0.55, 1.0, 0]} scale={[0.07, 0.1, 0.07]} castShadow />+ <mesh geometry={GEO.blob} material={MAT.leafDark} position={[0.55, 1.1, 0]} scale={[0.1, 0.1, 0.1]} castShadow /></group>);}-/** A two-seat lounge couch facing +z. */+/** A low modular lounge sofa facing +z: plinth on slim legs, loose cushions, two accent pillows. */export function Couch({ position, rotationY = 0 }: { position: [number, number, number]; rotationY?: number }) {return (<group position={position} rotation={[0, rotationY, 0]}>- <Rounded size={[2.2, 0.42, 0.9]} radius={0.08} position={[0, 0.25, 0]} material={MAT.couch} />- <Rounded size={[2.2, 0.55, 0.22]} radius={0.08} position={[0, 0.6, -0.36]} material={MAT.couch} />- <Rounded size={[0.2, 0.36, 0.9]} radius={0.06} position={[-1.08, 0.5, 0]} material={MAT.couch} />- <Rounded size={[0.2, 0.36, 0.9]} radius={0.06} position={[1.08, 0.5, 0]} material={MAT.couch} />- <Rounded size={[0.96, 0.12, 0.66]} radius={0.05} position={[-0.5, 0.5, 0.06]} material={MAT.cushion} />- <Rounded size={[0.96, 0.12, 0.66]} radius={0.05} position={[0.5, 0.5, 0.06]} material={MAT.cushion} />+ {[-1.05, 1.05].flatMap((x) => [-0.36, 0.36].map((z) => (+ <mesh key={`${x}:${z}`} geometry={GEO.cyl} material={MAT.steel} position={[x, 0.04, z]} scale={[0.03, 0.08, 0.03]} />+ )))}+ <Rounded size={[2.3, 0.34, 0.88]} radius={0.06} position={[0, 0.25, 0]} material={MAT.couch} />+ <Rounded size={[2.3, 0.42, 0.22]} radius={0.08} position={[0, 0.62, -0.33]} material={MAT.couch} />+ <Rounded size={[0.16, 0.3, 0.88]} radius={0.06} position={[-1.1, 0.55, 0]} material={MAT.couch} />+ <Rounded size={[0.16, 0.3, 0.88]} radius={0.06} position={[1.1, 0.55, 0]} material={MAT.couch} />+ <Rounded size={[1.0, 0.14, 0.64]} radius={0.05} position={[-0.51, 0.49, 0.08]} material={MAT.cushion} />+ <Rounded size={[1.0, 0.14, 0.64]} radius={0.05} position={[0.51, 0.49, 0.08]} material={MAT.cushion} />+ <group position={[-0.72, 0.7, -0.17]} rotation={[-0.25, 0.15, 0]}>+ <Rounded size={[0.38, 0.3, 0.1]} radius={0.04} position={[0, 0, 0]} material={MAT.couchAccents[0]} />+ </group>+ <group position={[0.74, 0.7, -0.17]} rotation={[-0.25, -0.12, 0]}>+ <Rounded size={[0.38, 0.3, 0.1]} radius={0.04} position={[0, 0, 0]} material={MAT.couchAccents[1]} />+ </group></group>);}-/** A glass railing run from (x1,z1) to (x2,z2): posts, a top rail and a pane. */+/** A frameless glass balustrade from (x1,z1) to (x2,z2): a black base shoe, the pane and a slim cap. */export function Railing({ from, to, height = 1.05 }: { from: [number, number]; to: [number, number]; height?: number }) {const [x1, z1] = from;const [x2, z2] = to;const length = Math.hypot(x2 - x1, z2 - z1);const angle = Math.atan2(z2 - z1, x2 - x1);- const posts = Math.max(2, Math.round(length / 2.4) + 1);return (<group position={[(x1 + x2) / 2, 0, (z1 + z2) / 2]} rotation={[0, -angle, 0]}>- <Box size={[length, 0.06, 0.08]} position={[0, height, 0]} material={MAT.railing} />- <Box size={[length, height - 0.1, 0.02]} position={[0, (height - 0.1) / 2 + 0.05, 0]} material={MAT.glass} cast={false} />- {Array.from({ length: posts }, (_, i) => (- <Box key={i} size={[0.06, height, 0.06]} position={[-length / 2 + (length * i) / (posts - 1), height / 2, 0]} material={MAT.railing} />- ))}+ <Box size={[length, 0.08, 0.08]} position={[0, 0.04, 0]} material={MAT.railing} />+ <Box size={[length, height - 0.1, 0.02]} position={[0, (height - 0.1) / 2 + 0.07, 0]} material={MAT.glass} cast={false} />+ <Box size={[length, 0.03, 0.05]} position={[0, height, 0]} material={MAT.railing} /></group>);}-const signTextures = new Map<string, Texture | null>();-function signTexture(label: string): Texture | null {- if (signTextures.has(label)) return signTextures.get(label) ?? null;- const canvas = typeof document !== "undefined" ? document.createElement("canvas") : null;- const ctx = canvas?.getContext("2d") ?? null;- let texture: Texture | null = null;- if (canvas && ctx) {- canvas.width = 512;- canvas.height = 96;+/** A department name plate: white type on charcoal, with a short rule in the zone's colour. */+function signTexture(label: string, accent: string): Texture | null {+ const text = label.length > 22 ? `${label.slice(0, 21)}…` : label;+ return cachedCanvasTexture(`dept-sign:${accent}:${text}`, 512, 112, (ctx, w, h) => {ctx.fillStyle = OFFICE.signBoard;- ctx.fillRect(0, 0, canvas.width, canvas.height);+ ctx.fillRect(0, 0, w, h);+ ctx.fillStyle = accent;+ ctx.fillRect(30, h - 24, 48, 6);ctx.fillStyle = OFFICE.signText;- ctx.font = "600 52px system-ui, -apple-system, 'Segoe UI', sans-serif";- ctx.textAlign = "center";+ ctx.textAlign = "left";ctx.textBaseline = "middle";- ctx.fillText(label.length > 18 ? `${label.slice(0, 17)}…` : label, canvas.width / 2, canvas.height / 2 + 2);- const made = new CanvasTexture(canvas);- made.colorSpace = SRGBColorSpace;- made.anisotropy = 4;- texture = made;+ let size = 50;+ const font = (px: number) => `600 ${px}px system-ui, -apple-system, 'Segoe UI', sans-serif`;+ ctx.font = font(size);+ while (size > 30 && ctx.measureText(text).width > w - 60) {+ size -= 2;+ ctx.font = font(size);+ }+ ctx.fillText(text, 30, h / 2 - 8);+ });+}++/** Acoustic felt with vertical fluting, drawn once per colour and repeated along the wall. */+function feltTexture(colour: string): Texture | null {+ const texture = cachedCanvasTexture(`felt:${colour}`, 64, 64, (ctx, w, h) => {+ ctx.fillStyle = colour;+ ctx.fillRect(0, 0, w, h);+ ctx.fillStyle = "rgba(0,0,0,0.16)";+ for (let x = 0; x < w; x += 16) ctx.fillRect(x, 0, 3, h);+ ctx.fillStyle = "rgba(255,255,255,0.07)";+ for (let x = 6; x < w; x += 16) ctx.fillRect(x, 0, 4, h);+ });+ if (texture) {+ texture.wrapS = texture.wrapT = RepeatWrapping;+ texture.anisotropy = 4;}- signTextures.set(label, texture);return texture;}-/** A department's back wall: white partition, dark-wood name board, slatted wood panels; `tone` repaints wall and slats. */-export function SignWall({ label, width, position, tone }: {- label: string; width: number; position: [number, number, number];+const feltMaterials = new Map<string, MeshStandardMaterial>();+function feltMaterial(colour: string, width: number): MeshStandardMaterial {+ const key = `${colour}:${width.toFixed(2)}`;+ let material = feltMaterials.get(key);+ if (!material) {+ const base = feltTexture(colour);+ let map: Texture | null = null;+ if (base) {+ map = base.clone();+ // Four flutes per texture repeat, one repeat every 20 cm.+ map.repeat.set(width / 0.2, 1);+ map.needsUpdate = true;+ }+ material = new MeshStandardMaterial({ color: map ? "#ffffff" : colour, map, roughness: 1 });+ feltMaterials.set(key, material);+ }+ return material;+}++/**+ * A department's back wall: a white partition faced with fluted acoustic felt+ * in the zone's colour, a charcoal name plate with white type, and on a wide+ * wall two slim oak ledges with small planters.+ */+export function SignWall({ label, width, position, zone = 0, tone }: {+ label: string; width: number; position: [number, number, number]; zone?: number;+ /** A coding-floor studio's own wall and panel materials, in place of the zone colours. */tone?: { wall: MeshStandardMaterial; slat: MeshStandardMaterial };}) {- const texture = signTexture(label);- const slats = Math.max(2, Math.floor(width / 0.5));+ const colours = DEPARTMENT_ZONES[zone % DEPARTMENT_ZONES.length];+ const panel = tone ? `#${tone.slat.color.getHexString()}` : colours.panel;+ const texture = signTexture(label, tone ? panel : colours.rug);+ const plateW = Math.min(2.6, width * 0.46);+ const ledgeX = width / 2 - 0.9;return (<group position={position}>- <Box size={[width, 1.9, 0.14]} position={[0, 0.95, 0]} material={tone?.wall ?? MAT.wall} />- <Box size={[width * 0.52, 0.5, 0.05]} position={[0, 1.35, 0.1]} material={MAT.sign} />+ <Box size={[width, 1.9, 0.12]} position={[0, 0.95, -0.01]} material={tone?.wall ?? MAT.wall} />+ <Box size={[width - 0.06, 1.6, 0.03]} position={[0, 0.98, 0.06]} material={feltMaterial(panel, width - 0.06)} cast={false} />+ <Box size={[plateW + 0.06, (plateW * 112) / 512 + 0.06, 0.03]} position={[0, 1.36, 0.09]} material={MAT.sign} />{texture && (- <mesh position={[0, 1.35, 0.13]}>- <planeGeometry args={[width * 0.5, (width * 0.5 * 96) / 512]} />- <meshStandardMaterial map={texture} roughness={0.8} />+ <mesh position={[0, 1.36, 0.106]}>+ <planeGeometry args={[plateW, (plateW * 112) / 512]} />+ <meshStandardMaterial map={texture} roughness={0.7} /></mesh>)}- {Array.from({ length: slats }, (_, i) => {- const x = -width / 2 + 0.25 + i * ((width - 0.5) / (slats - 1));- if (Math.abs(x) < width * 0.3) return null;- return <Box key={i} size={[0.12, 1.7, 0.05]} position={[x, 0.95, 0.1]} material={tone?.slat ?? MAT.woodDark} />;- })}+ {ledgeX > plateW / 2 + 0.55 && [-ledgeX, ledgeX].map((x) => (+ <group key={x} position={[x, 0, 0]}>+ <Box size={[0.9, 0.03, 0.12]} position={[0, 1.2, 0.13]} material={MAT.wood} />+ <mesh geometry={GEO.cyl} material={MAT.planterLight} position={[-0.2, 1.28, 0.13]} scale={[0.05, 0.13, 0.05]} castShadow />+ <mesh geometry={GEO.blob} material={MAT.leaf} position={[-0.2, 1.4, 0.13]} scale={[0.09, 0.08, 0.09]} castShadow />+ <mesh geometry={GEO.cyl} material={MAT.pot} position={[0.18, 1.26, 0.13]} scale={[0.045, 0.09, 0.045]} castShadow />+ <mesh geometry={GEO.blob} material={MAT.leafDark} position={[0.18, 1.35, 0.13]} scale={[0.07, 0.06, 0.07]} castShadow />+ </group>+ ))}</group>);}diff --git a/jarvis/ui/web/frontend/src/components/society/office/OfficeRooms.tsx b/jarvis/ui/web/frontend/src/components/society/office/OfficeRooms.tsxindex 58df99336a..5d6018fcde 100644--- a/jarvis/ui/web/frontend/src/components/society/office/OfficeRooms.tsx+++ b/jarvis/ui/web/frontend/src/components/society/office/OfficeRooms.tsx@@ -25,7 +25,7 @@ function lcg(seed: number): () => number {}/** Metres covered by one repeat of each floor pattern. */-const PATTERN_METRES: Record<RoomKind, number> = { lead: 2.6, team: 2, wardrobe: 2, reception: 2.4, break: 2, focus: 2, server: 2 };+const PATTERN_METRES: Record<RoomKind, number> = { lead: 2.6, team: 2, wardrobe: 2, reception: 3.2, break: 2.4, focus: 2, server: 2 };function drawFloor(kind: RoomKind, ctx: CanvasRenderingContext2D, w: number, h: number): void {const { base, accents } = ROOM_FLOOR_COLOURS[kind];@@ -54,7 +54,27 @@ function drawFloor(kind: RoomKind, ctx: CanvasRenderingContext2D, w: number, h:}}ctx.putImageData(image, 0, 0);- } else if (kind === "team" || kind === "break" || kind === "focus") {+ } else if (kind === "break") {+ // Light-oak planks, staggered; segments run past both edges so the tile wraps.+ for (let row = 0; row < 8; row += 1) {+ const offset = ((row % 2) * 64 + ((row * 53) % 64)) - 128;+ for (let seg = 0; seg < 4; seg += 1) {+ ctx.fillStyle = accents[(row + seg * 3) % accents.length];+ ctx.fillRect(offset + seg * 128, row * 32, 128, 32);+ ctx.fillStyle = "rgba(110,84,56,0.22)";+ ctx.fillRect(offset + seg * 128, row * 32, 1.5, 32);+ }+ ctx.fillStyle = "rgba(110,84,56,0.18)";+ ctx.fillRect(0, row * 32, w, 1.5);+ }+ } else if (kind === "wardrobe") {+ // Terrazzo: a pale ground with small stone chips in the accent tones.+ for (let i = 0; i < 900; i += 1) {+ ctx.fillStyle = accents[Math.floor(rand() * accents.length)];+ const s = 2 + rand() * 4;+ ctx.fillRect(Math.floor(rand() * w), Math.floor(rand() * h), s, s * (0.6 + rand() * 0.6));+ }+ } else if (kind === "team" || kind === "focus") {// Carpet grain: fine speckles in the accent tones, plus a faint weave.for (let i = 0; i < 2600; i += 1) {ctx.fillStyle = accents[Math.floor(rand() * accents.length)];@@ -63,8 +83,8 @@ function drawFloor(kind: RoomKind, ctx: CanvasRenderingContext2D, w: number, h:ctx.fillStyle = "rgba(0,0,0,0.035)";for (let y = 0; y < h; y += 8) ctx.fillRect(0, y, w, 1);} else {- // Tiles: wardrobe small square tiles, reception large stone slabs.- const tiles = kind === "wardrobe" || kind === "server" ? 4 : 2;+ // Tiles: the server room's raised-floor grid, reception's large pale stone slabs.+ const tiles = kind === "server" ? 4 : 2;const size = w / tiles;for (let ty = 0; ty < tiles; ty += 1) {for (let tx = 0; tx < tiles; tx += 1) {@@ -78,7 +98,7 @@ function drawFloor(kind: RoomKind, ctx: CanvasRenderingContext2D, w: number, h:}}}- ctx.fillStyle = kind === "wardrobe" ? "rgba(120,100,150,0.35)" : "rgba(140,130,115,0.45)";+ ctx.fillStyle = kind === "server" ? "rgba(110,118,130,0.45)" : "rgba(150,142,130,0.28)";for (let i = 0; i < tiles; i += 1) {ctx.fillRect(i * size, 0, 3, h);ctx.fillRect(0, i * size, w, 3);@@ -118,7 +138,7 @@ function RoomFloor({ room }: { room: Room }) {);}-/** A floor overlay per room: walnut chevron (lead), teal carpet (team), lilac tile (wardrobe), stone (reception), coral carpet (break). */+/** A floor overlay per room: walnut chevron (lead), slate felt (team), terrazzo (wardrobe), pale stone (reception), light oak (break). */export function RoomFloors({ rooms }: { rooms: Room[] }) {return <group>{rooms.map((room) => <RoomFloor key={room.id} room={room} />)}</group>;}@@ -129,27 +149,28 @@ export function RoomFloors({ rooms }: { rooms: Room[] }) {export const WALL_HEIGHT = 2.1;const BASE_HEIGHT = 0.12;-const POST_SPACING = 1.5;+const POST_SPACING = 1.8;-/** One glass wall run: white base strip, glass pane, metal posts and a top rail. */+/** One glass wall run: slim black steel base, mullions and top rail around a clear pane. */function GlassWall({ wall }: { wall: WallSegment }) {// The lead office is framed in brass on a walnut base, behind warm-tinted glass.const lead = wall.room === "lead";const frame = lead ? LEAD_MAT.brass : MAT.railing;- const base = lead ? LEAD_MAT.walnutDark : MAT.wall;+ const base = lead ? LEAD_MAT.walnutDark : MAT.railing;const glass = lead ? LEAD_MAT.wallGlass : MAT.glass;const length = Math.hypot(wall.x2 - wall.x1, wall.z2 - wall.z1);if (length < 0.05) return null;const angle = Math.atan2(wall.z2 - wall.z1, wall.x2 - wall.x1);const posts = Math.max(2, Math.ceil(length / POST_SPACING) + 1);+ const post = lead ? 0.05 : 0.035;return (<group position={[(wall.x1 + wall.x2) / 2, 0, (wall.z1 + wall.z2) / 2]} rotation={[0, -angle, 0]}>- <Box size={[length, BASE_HEIGHT, 0.1]} position={[0, BASE_HEIGHT / 2, 0]} material={base} />+ <Box size={[length, lead ? BASE_HEIGHT : 0.06, lead ? 0.1 : 0.06]} position={[0, lead ? BASE_HEIGHT / 2 : 0.03, 0]} material={base} /><Box size={[length, WALL_HEIGHT - BASE_HEIGHT - 0.04, 0.02]} position={[0, (WALL_HEIGHT + BASE_HEIGHT - 0.04) / 2, 0]}material={glass} cast={false} />- <Box size={[length, 0.05, 0.07]} position={[0, WALL_HEIGHT - 0.025, 0]} material={frame} />+ <Box size={[length, 0.04, lead ? 0.07 : 0.05]} position={[0, WALL_HEIGHT - 0.02, 0]} material={frame} />{Array.from({ length: posts }, (_, i) => (- <Box key={i} size={[0.05, WALL_HEIGHT, 0.07]} position={[-length / 2 + (length * i) / (posts - 1), WALL_HEIGHT / 2, 0]}+ <Box key={i} size={[post, WALL_HEIGHT, lead ? 0.07 : 0.05]} position={[-length / 2 + (length * i) / (posts - 1), WALL_HEIGHT / 2, 0]}material={frame} />))}</group>@@ -214,7 +235,7 @@ function signMaterial(label: string, lead = false): MeshStandardMaterial {return material;}-/** Dark-wood board with the label on both faces, centred on its local origin. */+/** Charcoal wayfinding board with the label on both faces, centred on its local origin. */function SignBoard({ label, lead = false }: { label: string; lead?: boolean }) {const material = signMaterial(label, lead);const textH = (SIGN_TEXT_W * SIGN_CANVAS.h) / SIGN_CANVAS.w;@@ -260,9 +281,9 @@ export function RoomSign({ room, label }: { room: Room; label: string }) {const cx = (west.x + east.x) / 2;return (<group position={[cx, 0, west.z]}>- <Box size={[ARCH.post, postH, ARCH.post]} position={[west.x - cx, postH / 2, 0]} material={MAT.woodDark} />- <Box size={[ARCH.post, postH, ARCH.post]} position={[east.x - cx, postH / 2, 0]} material={MAT.woodDark} />- <Box size={[east.x - west.x + ARCH.post, 0.06, ARCH.post]} position={[0, archY - SIGN_H / 2 - 0.03, 0]} material={MAT.woodDark} />+ <Box size={[ARCH.post, postH, ARCH.post]} position={[west.x - cx, postH / 2, 0]} material={MAT.railing} />+ <Box size={[ARCH.post, postH, ARCH.post]} position={[east.x - cx, postH / 2, 0]} material={MAT.railing} />+ <Box size={[east.x - west.x + ARCH.post, 0.04, ARCH.post]} position={[0, archY - SIGN_H / 2 - 0.02, 0]} material={MAT.railing} /><group position={[0, archY, 0]}><SignBoard label={label} /></group></group>);diff --git a/jarvis/ui/web/frontend/src/components/society/office/OfficeScene.tsx b/jarvis/ui/web/frontend/src/components/society/office/OfficeScene.tsxindex b61d36ab6b..0b4a1d70aa 100644--- a/jarvis/ui/web/frontend/src/components/society/office/OfficeScene.tsx+++ b/jarvis/ui/web/frontend/src/components/society/office/OfficeScene.tsx@@ -1,12 +1,12 @@/**- * The office floor: a wood-plank plate floating in a starry night, glass- * railings around it, walled rooms in the north and south, one carpeted+ * The office floor: a microcement plate floating in a starry night behind+ * frameless glass, walled rooms in the north and south, one felt-zoned* department per provider family in between — and everybody in it.*/import { useLayoutEffect, useMemo } from "react";import { Stars } from "@react-three/drei";import type { ThreeEvent } from "@react-three/fiber";-import { CanvasTexture, Color, RepeatWrapping, SRGBColorSpace, type Texture } from "three";+import { CanvasTexture, Color, RepeatWrapping, Shape, SRGBColorSpace, type Texture } from "three";import { useT } from "@/i18n";import type { SocietyAgent } from "../data";import type { ToyLook } from "./toyFigureModel";@@ -32,7 +32,7 @@ import { PlayerBubble } from "./OfficeBubbles";import { OfficeCameraRig } from "./OfficeCameraRig";import { allDesks, type Department, type OfficeLayout, type Point } from "./officeLayout";import { isWalkable, nearestWalkable, type NavGrid } from "./officeNav";-import { CODING_SCENE, DEPARTMENT_TINTS, OFFICE } from "./officePalette";+import { CODING_SCENE, DEPARTMENT_ZONES, OFFICE } from "./officePalette";import { officeSession, player as playerBody, useOfficeStore, type OfficeFloor, type Selection } from "./officeStore";import { arrivalPose } from "./officeFloors";@@ -66,48 +66,69 @@ function GigiCompanion({ grid, awake, reduced }: { grid: NavGrid; awake: booleanreturn <GigiFlyer owner={PLAYER_OWNER} mode="follow" speaking={speaking} paused={!awake} reduced={reduced} clear={clear} />;}-/** Warm planks drawn once; repeated across the floor. */-let plankTexture: Texture | null | undefined;-function planks(): Texture | null {- if (plankTexture !== undefined) return plankTexture;+/** Metres covered by one repeat of the floor texture (one poured panel). */+const FLOOR_PANEL_M = 4;++/** Microcement drawn once: soft clouds of tone and faint panel seams; repeated across the floor. */+let floorTexture: Texture | null | undefined;+function microcement(): Texture | null {+ if (floorTexture !== undefined) return floorTexture;const canvas = typeof document !== "undefined" ? document.createElement("canvas") : null;- const ctx = canvas?.getContext("2d") ?? null;- plankTexture = null;+ let ctx: CanvasRenderingContext2D | null = null;+ try {+ ctx = canvas?.getContext("2d") ?? null;+ } catch {+ // jsdom without the canvas package: no texture, the flat floor colour is the right fallback.+ ctx = null;+ }+ floorTexture = null;if (canvas && ctx) {- canvas.width = 256;- canvas.height = 256;- const tones = ["#c9a27a", "#c29a71", "#cfa983", "#bf966c"];- ctx.fillStyle = tones[0];- ctx.fillRect(0, 0, 256, 256);- for (let row = 0; row < 8; row += 1) {- // Staggered joints; segments run past both edges so the tile wraps seamlessly.- const offset = ((row % 2) * 64 + ((row * 53) % 64)) - 128;- for (let seg = 0; seg < 4; seg += 1) {- ctx.fillStyle = tones[(row + seg + 4) % tones.length];- ctx.fillRect(offset + seg * 128, row * 32, 128, 32);- ctx.fillStyle = "rgba(90,60,35,0.35)";- ctx.fillRect(offset + seg * 128, row * 32, 2, 32);+ const size = 512;+ canvas.width = size;+ canvas.height = size;+ ctx.fillStyle = OFFICE.floor;+ ctx.fillRect(0, 0, size, size);+ // Deterministic clouds, drawn at every wrapped offset so the tile repeats seamlessly.+ let seed = 0x2f6e2b1;+ const rand = () => ((seed = (seed * 1664525 + 1013904223) >>> 0) / 0x1_0000_0000);+ for (let i = 0; i < 70; i += 1) {+ const x = rand() * size, y = rand() * size, r = 30 + rand() * 90;+ const tone = OFFICE.floorCloud[i % OFFICE.floorCloud.length];+ for (const dx of [-size, 0, size]) {+ for (const dy of [-size, 0, size]) {+ const g = ctx.createRadialGradient(x + dx, y + dy, 0, x + dx, y + dy, r);+ g.addColorStop(0, `${tone}66`);+ g.addColorStop(1, `${tone}00`);+ ctx.fillStyle = g;+ ctx.fillRect(x + dx - r, y + dy - r, r * 2, r * 2);+ }}- ctx.fillStyle = "rgba(90,60,35,0.3)";- ctx.fillRect(0, row * 32, 256, 2);}+ // Fine grain, then the panel seams on two edges (they meet the next tile's).+ for (let i = 0; i < 5000; i += 1) {+ ctx.fillStyle = rand() > 0.5 ? "rgba(255,255,255,0.10)" : "rgba(90,84,76,0.07)";+ ctx.fillRect(Math.floor(rand() * size), Math.floor(rand() * size), 1, 1);+ }+ ctx.fillStyle = OFFICE.floorSeam;+ ctx.fillRect(0, 0, size, 2);+ ctx.fillRect(0, 0, 2, size);const texture = new CanvasTexture(canvas);texture.colorSpace = SRGBColorSpace;texture.wrapS = texture.wrapT = RepeatWrapping;texture.anisotropy = 8;- plankTexture = texture;+ floorTexture = texture;}- return plankTexture;+ return floorTexture;}function Slab({ layout, onFloorClick }: { layout: OfficeLayout; onFloorClick: (event: ThreeEvent<MouseEvent>) => void }) {const { minX, maxX, minZ, maxZ } = layout.bounds;const w = maxX - minX, d = maxZ - minZ, cx = (minX + maxX) / 2, cz = (minZ + maxZ) / 2;const floorMap = useMemo(() => {- const base = planks();+ const base = microcement();if (!base) return null;const map = base.clone();- map.repeat.set(w / 3, d / 3);+ map.repeat.set(w / FLOOR_PANEL_M, d / FLOOR_PANEL_M);map.needsUpdate = true;return map;}, [w, d]);@@ -119,7 +140,7 @@ function Slab({ layout, onFloorClick }: { layout: OfficeLayout; onFloorClick: (e</mesh><mesh position={[cx, 0.001, cz]} rotation={[-Math.PI / 2, 0, 0]} receiveShadow onClick={onFloorClick}><planeGeometry args={[w, d]} />- <meshStandardMaterial color={floorMap ? "#ffffff" : OFFICE.walkway} map={floorMap} roughness={0.8} />+ <meshStandardMaterial color={floorMap ? "#ffffff" : OFFICE.walkway} map={floorMap} roughness={0.55} /></mesh><Railing from={[minX + 0.2, minZ + 0.2]} to={[maxX - 0.2, minZ + 0.2]} /><Railing from={[maxX - 0.2, minZ + 0.2]} to={[maxX - 0.2, maxZ - 0.2]} />@@ -129,18 +150,41 @@ function Slab({ layout, onFloorClick }: { layout: OfficeLayout; onFloorClick: (e);}+/** A flat rounded rectangle in the XY plane, laid on the floor by its mesh's rotation. */+function roundedRect(w: number, d: number, r: number): Shape {+ const x = -w / 2, y = -d / 2;+ const shape = new Shape();+ shape.moveTo(x + r, y);+ shape.lineTo(x + w - r, y);+ shape.quadraticCurveTo(x + w, y, x + w, y + r);+ shape.lineTo(x + w, y + d - r);+ shape.quadraticCurveTo(x + w, y + d, x + w - r, y + d);+ shape.lineTo(x + r, y + d);+ shape.quadraticCurveTo(x, y + d, x, y + d - r);+ shape.lineTo(x, y + r);+ shape.quadraticCurveTo(x, y, x + r, y);+ return shape;+}++/** A department zone: a rounded felt rug with a darker border band, and its fluted back wall. */function DepartmentArea({ dept }: { dept: Department }) {const t = useT();const w = dept.maxX - dept.minX, d = dept.maxZ - dept.minZ;const cx = (dept.minX + dept.maxX) / 2, cz = (dept.minZ + dept.maxZ) / 2;- const tint = DEPARTMENT_TINTS[dept.tint % DEPARTMENT_TINTS.length];+ const zone = DEPARTMENT_ZONES[dept.tint % DEPARTMENT_ZONES.length];+ const outer = useMemo(() => roundedRect(w - 0.1, d - 0.1, 0.45), [w, d]);+ const inner = useMemo(() => roundedRect(w - 0.4, d - 0.4, 0.32), [w, d]);return (<group>- <mesh position={[cx, 0.006, cz]} rotation={[-Math.PI / 2, 0, 0]} receiveShadow>- <planeGeometry args={[w, d]} />- <meshStandardMaterial color={tint} roughness={0.95} />+ <mesh position={[cx, 0.005, cz]} rotation={[-Math.PI / 2, 0, 0]} receiveShadow>+ <shapeGeometry args={[outer, 6]} />+ <meshStandardMaterial color={zone.panel} roughness={1} />+ </mesh>+ <mesh position={[cx, 0.007, cz]} rotation={[-Math.PI / 2, 0, 0]} receiveShadow>+ <shapeGeometry args={[inner, 6]} />+ <meshStandardMaterial color={zone.rug} roughness={1} /></mesh>- <SignWall label={dept.label || t("society.office.open_space")} width={w - 0.4} position={[cx, 0, dept.minZ + 0.1]} />+ <SignWall label={dept.label || t("society.office.open_space")} width={w - 0.4} position={[cx, 0, dept.minZ + 0.1]} zone={dept.tint} /></group>);}@@ -175,6 +219,8 @@ export function OfficeScene({ floor, occupants, ready, layout, grid, walkers, agconst atLift = nearby?.kind === "checkpoint" && nearby.id === "elevator";// Lead desks carry their own size and are built as executive desks, not bench instances.const benchDesks = useMemo(() => desks.filter((d) => !d.size), [desks]);+ // Each desk takes its department's zone colour for the felt screen and the seat fabric.+ const zones = useMemo(() => new Map(layout.departments.flatMap((dept) => dept.desks.map((desk) => [desk.id, dept.tint] as const))), [layout]);const leadRoom = layout.rooms.find((r) => r.kind === "lead");const dogBed = layout.furniture.find((f) => f.kind === "dogBed");const coding = floor === "coding";@@ -197,9 +243,9 @@ export function OfficeScene({ floor, occupants, ready, layout, grid, walkers, ag<primitive attach="background" object={background} /><fog attach="fog" args={[space, span * 2.2, span * 4.5]} /><Stars radius={span * 3} depth={span} count={2500} factor={4} saturation={0} fade speed={reduced ? 0 : 0.3} />- <hemisphereLight args={coding ? [CODING_SCENE.sky, CODING_SCENE.ground, 0.95] : ["#dfe9ff", "#6b5a48", 0.9]} />+ <hemisphereLight args={coding ? [CODING_SCENE.sky, CODING_SCENE.ground, 0.95] : ["#eef2ff", "#8a8279", 0.95]} /><ambientLight intensity={0.25} />- <directionalLight position={[maxX + 10, 26, maxZ + 6]} intensity={1.6} castShadow+ <directionalLight position={[maxX + 10, 26, maxZ + 6]} intensity={1.55} color="#fff7ec" castShadowshadow-mapSize={[2048, 2048]} shadow-bias={-0.0004} shadow-normalBias={0.03}shadow-camera-left={-span * 0.7} shadow-camera-right={span * 0.7}shadow-camera-top={span * 0.7} shadow-camera-bottom={-span * 0.7} shadow-camera-far={120} />@@ -211,7 +257,7 @@ export function OfficeScene({ floor, occupants, ready, layout, grid, walkers, ag? layout.departments.map((dept) => <CodingStudio key={dept.id} dept={dept} agents={agents} />): <>{layout.departments.map((dept) => <DepartmentArea key={dept.id} dept={dept} />)}- <DeskInstances desks={benchDesks} agents={agents} />+ <DeskInstances desks={benchDesks} agents={agents} zones={zones} /></>}<ExecutiveDesks desks={desks} agents={agents} onOpenScreen={onOpenScreen} />{leadRoom && <LeadOfficeLight room={leadRoom} />}diff --git a/jarvis/ui/web/frontend/src/components/society/office/officePalette.ts b/jarvis/ui/web/frontend/src/components/society/office/officePalette.tsindex 527c8bf120..d98daf750c 100644--- a/jarvis/ui/web/frontend/src/components/society/office/officePalette.ts+++ b/jarvis/ui/web/frontend/src/components/society/office/officePalette.ts@@ -1,43 +1,71 @@/**- * The office's own colours ("cosy toy office", docs/agent-society/office-map.md §2).+ * The office's own colours: a contemporary workplace (docs/agent-society/office-map.md §2)+ * — light microcement floor, light-oak tops on black steel, graphite screens,+ * felt zone rugs, charcoal wayfinding with white type and lots of green.* Like the earlier worlds, nothing inside the canvas reads a theme token: the* scene is a lit diorama that looks the same in light and dark mode.*/export const OFFICE = {- space: "#0b1024",- slab: "#3a3f4b",- slabEdge: "#2b2f38",- wood: "#b98a5e",- woodDark: "#8a6240",- walkway: "#c9a27a",- deskTop: "#e8d3b0",- deskBody: "#f2f0ec",- deskLeg: "#d9d6cf",- chair: "#2c2f36",- chairSeat: "#3b3f48",- monitor: "#23262d",- keyboard: "#3a3d44",- railing: "#b7bcc4",- glass: "#bfe3ff",- wallWhite: "#f1efe9",- signBoard: "#3d2c22",- signText: "#fff7ec",- couch: "#2f3542",- couchCushion: "#3d4556",- plantPot: "#f4f1ea",- leaf: "#5fa35a",- leafDark: "#3f7f45",- trunk: "#6b4a2e",- book: ["#c8553d", "#f2a541", "#4f7cac", "#5e9c76", "#8d6cab"],- rug: "#d8c8ae",+ space: "#0d1320",+ slab: "#2a2e35",+ slabEdge: "#1c2027",+ /** Microcement floor: base plus the soft cloud tones and panel seams drawn over it. */+ floor: "#dcd8d1",+ floorCloud: ["#d4d0c8", "#e2ded8", "#d8d4cd", "#e6e3dd"],+ floorSeam: "rgba(120,114,104,0.22)",+ wood: "#d8bc94",+ woodDark: "#a88460",+ walkway: "#dcd8d1",+ deskTop: "#dcc39d",+ deskEdge: "#c9ab81",+ deskBody: "#f3f2ef",+ deskLeg: "#1f2226",+ steel: "#1f2226",+ chair: "#1d2025",+ chairSeat: "#3a3f47",+ chairMesh: "#40454e",+ monitor: "#16181c",+ monitorArm: "#b8bdc5",+ keyboard: "#e4e5e8",+ mug: "#f7f5f1",+ railing: "#23262b",+ glass: "#d6ecff",+ wallWhite: "#f6f5f2",+ signBoard: "#23262c",+ signText: "#ffffff",+ couch: "#bdb6aa",+ couchCushion: "#d8d1c4",+ couchAccent: ["#7f9a86", "#c98f6f", "#7c8fa8"],+ plantPot: "#34373d",+ planterLight: "#ebe6de",+ leaf: "#4f8f52",+ leafDark: "#2f6b3f",+ leafLight: "#77ad64",+ trunk: "#6b5440",+ book: ["#c8553d", "#e9b44c", "#4f7cac", "#5e9c76", "#8d6cab", "#e7e2d8"],+ rug: "#cfc7ba",ringWorking: "#4ade80",ringIdle: "#e8ecf2",ringWaiting: "#fbbf24",ringPaused: "#94a3b8",} as const;-/** Carpet tints per department — soft, desaturated, readable next to wood. */-export const DEPARTMENT_TINTS = ["#9aa6b8", "#a9b59a", "#b8a39a", "#a39ab8", "#9ab5b1", "#b8b19a"] as const;+/**+ * Department zones: a felt rug, the matching acoustic wall panel and the seat+ * fabric of every chair in it — muted, contemporary tones that read on the+ * light floor without shouting.+ */+export const DEPARTMENT_ZONES = [+ { rug: "#bccab6", panel: "#8aa391", seat: "#6f8b77" },+ { rug: "#b9c6d4", panel: "#7b91ab", seat: "#5f7894" },+ { rug: "#ddd1bb", panel: "#bfa07a", seat: "#a8845a" },+ { rug: "#e2cbc0", panel: "#c48e7a", seat: "#b0705b" },+ { rug: "#c6c1d5", panel: "#918aad", seat: "#766e96" },+ { rug: "#b8d0c9", panel: "#6f9f94", seat: "#528579" },+] as const;++/** Rug tints per department (kept for callers that only need the floor colour). */+export const DEPARTMENT_TINTS = DEPARTMENT_ZONES.map((z) => z.rug);/*** The coding floor's own look, so the two floors never read as copies: a@@ -61,7 +89,7 @@ export interface StudioStyle {carpet: string;weave: string;border: string;- /** The department's back wall and its slats. */+ /** The department's back wall and its acoustic felt panel. */wall: string;slat: string;/** Desk top, cabinet, leg, chair base and seat. */@@ -72,20 +100,25 @@ export interface StudioStyle {seat: string;}-/** One studio per workspace department, cycled; every one differs in pattern, colours and furniture. */+/**+ * One studio per workspace department, cycled; every one differs in pattern+ * and colours. The patterns are woven tone-on-tone and the furniture stays in+ * the office's contemporary kit (oak or walnut tops, black or white steel,+ * graphite chairs), so a studio reads as a team's corner, not a theme park.+ */export const CODING_STUDIOS: readonly StudioStyle[] = [- { pattern: "grid", carpet: "#3b4a6b", weave: "#4d5e82", border: "#5eead4", wall: "#2f3b57", slat: "#5eead4",- deskTop: "#6b4a33", deskBody: "#23262d", deskLeg: "#3a3d44", chair: "#23262d", seat: "#3aa99a" },- { pattern: "stripes", carpet: "#a7b98f", weave: "#95a87e", border: "#e8d9a8", wall: "#e9efe0", slat: "#7c9a5e",- deskTop: "#e6d2ad", deskBody: "#fbfaf6", deskLeg: "#c9c4b8", chair: "#4b5a3a", seat: "#7c9a5e" },- { pattern: "checker", carpet: "#d99a7b", weave: "#c9876a", border: "#f3e3cf", wall: "#f5e6d8", slat: "#b5654a",- deskTop: "#f0e2cb", deskBody: "#fdf8f0", deskLeg: "#d8cbb8", chair: "#6b3a2a", seat: "#c46a4c" },- { pattern: "dots", carpet: "#b9aed6", weave: "#d6cdee", border: "#7d6bb0", wall: "#ece6f7", slat: "#8b79c0",- deskTop: "#fbfbfb", deskBody: "#d9d7e2", deskLeg: "#a9a6b8", chair: "#3a3350", seat: "#7a4f8f" },- { pattern: "diagonal", carpet: "#7fb9b8", weave: "#6aa6a5", border: "#1f5f6b", wall: "#dcefee", slat: "#2e7c85",- deskTop: "#d9b98f", deskBody: "#e7eeee", deskLeg: "#9fb3b5", chair: "#1f3b4d", seat: "#2d5f86" },- { pattern: "zigzag", carpet: "#e2c070", weave: "#d0aa55", border: "#3a3024", wall: "#fbf1d6", slat: "#b8862e",- deskTop: "#5b3a25", deskBody: "#2c2a28", deskLeg: "#46423d", chair: "#2c2a28", seat: "#e0a93a" },+ { pattern: "grid", carpet: "#39424f", weave: "#424c5a", border: "#5eead4", wall: "#2c333d", slat: "#3d4a58",+ deskTop: "#c9ab81", deskBody: "#2b2f36", deskLeg: "#1f2226", chair: "#1d2025", seat: "#3aa99a" },+ { pattern: "stripes", carpet: "#b7c4ae", weave: "#aebba5", border: "#8aa391", wall: "#eef1ea", slat: "#8aa391",+ deskTop: "#dcc39d", deskBody: "#f3f2ef", deskLeg: "#1f2226", chair: "#1d2025", seat: "#6f8b77" },+ { pattern: "checker", carpet: "#e0c7bb", weave: "#dac0b3", border: "#c48e7a", wall: "#f6efe9", slat: "#c48e7a",+ deskTop: "#f2f0ec", deskBody: "#f3f2ef", deskLeg: "#1f2226", chair: "#1d2025", seat: "#b0705b" },+ { pattern: "dots", carpet: "#c9c3d9", weave: "#bfb9cf", border: "#918aad", wall: "#f1eff6", slat: "#918aad",+ deskTop: "#dcc39d", deskBody: "#e9e7ef", deskLeg: "#e9e7ef", chair: "#2b2f36", seat: "#766e96" },+ { pattern: "diagonal", carpet: "#bccadb", weave: "#b3c1d1", border: "#7b91ab", wall: "#eef2f6", slat: "#7b91ab",+ deskTop: "#c9ab81", deskBody: "#f3f2ef", deskLeg: "#1f2226", chair: "#1d2025", seat: "#5f7894" },+ { pattern: "zigzag", carpet: "#d9ccb3", weave: "#d1c3a9", border: "#bfa07a", wall: "#f5efe3", slat: "#bfa07a",+ deskTop: "#8a6446", deskBody: "#2b2f36", deskLeg: "#1f2226", chair: "#1d2025", seat: "#c79a3a" },];/** Colours of the room props (lobby, team room, wardrobe, break room). */@@ -121,13 +154,14 @@ export const PROP_COLOURS = {/** Floor overlays per room kind: base colour plus the pattern's accent tones. */export const ROOM_FLOOR_COLOURS = {lead: { base: "#6a432a", accents: ["#74492d", "#5e3a24", "#6c4429", "#7d5133", "#553420"] },- team: { base: "#7fb3ad", accents: ["#8bbdb7", "#74a7a1", "#86b8b2"] },- wardrobe: { base: "#ddd3ea", accents: ["#cfc3e0", "#e6ddf1"] },- reception: { base: "#e7e2d9", accents: ["#ece8e0", "#e0dacf", "#e9e4dc"] },- break: { base: "#d98b6e", accents: ["#e0967a", "#d08065", "#dc9074"] },- // Coding floor: a calm sage carpet in the focus zone, cool raised-floor tiles in the server room.- focus: { base: "#9fb08c", accents: ["#a9ba96", "#94a582", "#a3b491"] },- server: { base: "#b9c0cb", accents: ["#c3cad4", "#aeb5c0"] },+ // Contemporary rooms: slate felt (team), light terrazzo (wardrobe), large pale stone (reception),+ // light-oak planks (break room); on the coding floor a soft sage felt and a raised-floor grid.+ team: { base: "#b4bec6", accents: ["#aab4bd", "#bcc6cd", "#b0bac2"] },+ wardrobe: { base: "#ece8e2", accents: ["#c9c2b8", "#9aa4ad", "#d9b8aa", "#aebcaa"] },+ reception: { base: "#e9e6e1", accents: ["#ece9e4", "#e5e2dc", "#efece8"] },+ break: { base: "#d9c09b", accents: ["#dcc39f", "#d2b791", "#e0c8a6", "#cfb48c"] },+ focus: { base: "#b3c0ab", accents: ["#aebba6", "#b9c6b1", "#b0bda8"] },+ server: { base: "#c3c8cf", accents: ["#c9ced4", "#bcc2c9"] },} as const;/** Checkpoint gold: floor ring, hexagon token and the label badge. */