@hraness/slopcamera 3.2.8 → 3.3.1

package/src/spatial-scene/identity.ts

@@ -7,6 +7,7 @@ import {
   type SpatialAnimation, type SpatialAssetManifest, type SpatialEntity,
   type SpatialOverride, type SpatialSceneV1,
 } from "./contracts.js"
+import { pbrMaterialMapAssetIds } from "./material-lighting.js"
 
 export class SpatialSceneError extends SlopcameraCodeError {
   readonly path: string
@@ -96,7 +97,21 @@ export function generatedSpatialEntityId(generatorId: string, key: string): stri
 }
 
 function normalizeEntity(entity: SpatialEntity): SpatialEntity {
-  if (entity.kind === "mesh") return { ...entity, material: { ...entity.material, color: entity.material.color.toLowerCase() } }
+  if (entity.kind === "mesh") {
+    const material = entity.material
+    if (material.kind === "pbr") {
+      const emissive = material.emissive !== undefined
+        ? { ...material.emissive, color: material.emissive.color.toLowerCase() } : undefined
+      const sheen = material.sheen !== undefined
+        ? { ...material.sheen, color: material.sheen.color.toLowerCase() } : undefined
+      return { ...entity, material: { ...material, color: material.color.toLowerCase(),
+        ...(emissive === undefined ? {} : { emissive }),
+        ...(sheen === undefined ? {} : { sheen }) } }
+    }
+    const emissive = material.kind === "standard" && material.emissive !== undefined
+      ? { ...material.emissive, color: material.emissive.color.toLowerCase() } : undefined
+    return { ...entity, material: { ...material, color: material.color.toLowerCase(), ...(emissive === undefined ? {} : { emissive }) } }
+  }
   if (entity.kind === "text" || entity.kind === "light") return { ...entity, color: entity.color.toLowerCase() }
   return entity
 }
@@ -176,7 +191,7 @@ export function parseSpatialScene(input: unknown): SpatialSceneV1 {
     cameras: sortSpatialBy(parsed.cameras, item => item.cameraId),
     assets: sortSpatialBy(parsed.assets.map(normalizeAsset).map(asset => ({ ...asset, dependencies: [...asset.dependencies].sort(compare) })), item => item.assetId),
     animations: sortSpatialBy(parsed.animations, item => item.channelId),
-    generators: sortSpatialBy(parsed.generators.map(generator => ({ ...generator, editableKeys: sortSpatialBy(generator.editableKeys.map(item => ({ ...item, properties: [...item.properties].sort(compare) })), item => item.key) })), item => item.generatorId),
+    generators: sortSpatialBy(parsed.generators.map(generator => ({ ...generator, editableKeys: sortSpatialBy(generator.editableKeys.map(item => ({ ...item, properties: [...item.properties].sort(compare) })), item => item.key), ...(generator.assets === undefined ? {} : { assets: [...generator.assets].sort(compare) }) })), item => item.generatorId),
     overrides: sortSpatialBy(parsed.overrides.map(item => item.property === "color" ? { ...item, value: item.value.toLowerCase() } : item), item => `${item.entityId}:${item.property}`),
   }
   const entities = unique(scene.entities, entity => entity.entityId, "entities")
@@ -195,6 +210,26 @@ export function parseSpatialScene(input: unknown): SpatialSceneV1 {
   }
   spatialTopologicalIds(new Map(scene.assets.map(asset => [asset.assetId, asset.dependencies])), "asset dependencies")
   spatialTopologicalIds(new Map(scene.entities.map(entity => [entity.entityId, entity.parentId === null ? [] : [entity.parentId]])), "entity hierarchy")
+  // Generator-owned assets: each declared id must exist, carry a generated or
+  // derived provenance, and belong to exactly one generator. Owned assets may
+  // be referenced only by that generator's retained entities.
+  const ownedAssets = new Map<string, string>()
+  for (const generator of scene.generators) {
+    unique(generator.assets ?? [], id => id, "generator assets")
+    for (const assetId of generator.assets ?? []) {
+      const asset = requireReference(assets, assetId, "generator asset")
+      if (asset.provenance.source !== "generated" && asset.provenance.source !== "derived") throw new SpatialSceneError("invalid-data", `Generator-owned asset ${assetId} requires generated or derived provenance.`, "generators")
+      const owner = ownedAssets.get(assetId)
+      if (owner !== undefined && owner !== generator.generatorId) throw new SpatialSceneError("invalid-data", `Asset ${assetId} is owned by more than one generator.`, "generators")
+      ownedAssets.set(assetId, generator.generatorId)
+    }
+  }
+  const checkAssetOwnership = (entity: SpatialEntity, assetId: string, path: string) => {
+    const owner = ownedAssets.get(assetId)
+    if (owner !== undefined && (entity.origin.kind !== "generated" || entity.origin.generatorId !== owner)) {
+      throw new SpatialSceneError("invalid-data", `Entity ${entity.entityId} references an asset owned by another generator.`, path)
+    }
+  }
   const generatedKeys = new Set<string>()
   for (const entity of scene.entities) {
     if (entity.placement.kind === "view") requireReference(cameras, entity.placement.cameraId, "placement")
@@ -211,10 +246,28 @@ export function parseSpatialScene(input: unknown): SpatialSceneV1 {
       if (generatedKeys.has(identity)) throw new SpatialSceneError("invalid-data", "Duplicate generator output key.", "origin")
       generatedKeys.add(identity)
     }
+    if (entity.kind === "environment" && (entity.placement.kind !== "world" || entity.parentId !== null)) {
+      throw new SpatialSceneError("invalid-data", "Environment entities must be unparented world entities.", "placement")
+    }
+    if (entity.kind === "mesh" && entity.material.kind !== "pbr" && entity.material.map !== undefined) {
+      if (entity.geometry.kind === "asset") throw new SpatialSceneError("invalid-data", "Material maps apply to authored procedural geometry only.", "entities")
+      checkAssetOwnership(entity, entity.material.map, "entity asset")
+      const mapAsset = requireReference(assets, entity.material.map, "entity asset")
+      if (mapAsset.interpretation.kind !== "image") throw new SpatialSceneError("invalid-data", `Entity ${entity.entityId} material map requires an image asset.`, "entity asset")
+    }
+    if (entity.kind === "mesh" && entity.material.kind === "pbr") {
+      if (entity.geometry.kind === "asset") throw new SpatialSceneError("invalid-data", "PBR material maps apply to authored procedural geometry only.", "entities")
+      for (const mapAssetId of pbrMaterialMapAssetIds(entity.material)) {
+        const mapAsset = requireReference(assets, mapAssetId, "entity pbr map asset")
+        if (mapAsset.interpretation.kind !== "image") throw new SpatialSceneError("invalid-data", `Entity ${entity.entityId} PBR map requires an image asset, got ${mapAsset.interpretation.kind}.`, "entity pbr map")
+      }
+    }
     const reference = entity.kind === "mesh" && entity.geometry.kind === "asset" ? { assetId: entity.geometry.assetId, kind: "gltf" }
       : entity.kind === "text" ? { assetId: entity.fontAssetId, kind: "font" }
+      : entity.kind === "environment" ? { assetId: entity.assetId, kind: "image" }
       : "assetId" in entity ? { assetId: entity.assetId, kind: entity.kind } : undefined
     if (reference) {
+      checkAssetOwnership(entity, reference.assetId, "entity asset")
       const asset = requireReference(assets, reference.assetId, "entity asset")
       if (asset.interpretation.kind !== reference.kind) throw new SpatialSceneError("invalid-data", `Entity ${entity.entityId} requires a ${reference.kind} asset.`, "entity asset")
       if (entity.kind === "video" && asset.interpretation.kind === "video" && entity.sourceOffsetUs >= asset.interpretation.durationUs) throw new SpatialSceneError("invalid-data", "Video source offset must precede its duration.", "sourceOffsetUs")

package/src/spatial-scene/index.ts

@@ -1,10 +1,46 @@
 export * from "./contracts.js"
+export * from "./asset-admission.js"
 export * from "./identity.js"
 export * from "./patch.js"
 export * from "./inspect.js"
 export * from "./evaluate.js"
+export * from "./audit.js"
+export * from "./audit-rendered.js"
+export * from "./review.js"
 export * from "./math.js"
 export * from "./time.js"
 export * from "./authoring.js"
+export * from "./probe.js"
+export * from "./build.js"
+export * from "./solve.js"
+export * from "./generate.js"
 export * from "./gltf.js"
 export * from "./camera-track.js"
+export * from "./camera-rig.js"
+export * from "./character.js"
+export * from "./material-lighting.js"
+export * from "./performance.js"
+export * from "./geometry.js"
+export * from "./geometry-native.js"
+export * from "./parametric.js"
+export * from "./design.js"
+export * from "./design-templates.js"
+export * from "./effects.js"
+export * from "./render-effects.js"
+export * from "./particle.js"
+export * from "./particle-preparation.js"
+export * from "./simulation.js"
+export * from "./motion-evidence.js"
+export * from "./direction.js"
+export * from "./direction-compile.js"
+export * from "./temporal-audit.js"
+export * from "./gallery.js"
+export * from "./recipe-pack.js"
+export * from "./simulation-bake.js"
+export * from "./behavior.js"
+export * from "./behavior-fns.js"
+export * from "./behavior-trace.js"
+export * from "./behavior-bake.js"
+export * from "./behavior-gallery.js"
+export * from "./behavior-stdlib.js"
+export * from "./behavior-audit.js"

package/src/spatial-scene/inspect.ts

@@ -2,12 +2,16 @@ import { deepFreezeJson } from "../code/json-snapshot.js"
 import type { SpatialEntity, SpatialOverride, SpatialSceneV1 } from "./contracts.js"
 import { evaluateSpatialScene } from "./evaluate.js"
 import { parseSpatialScene, spatialAssetClosureDigests, spatialPropertySupported, spatialValueSha256 } from "./identity.js"
-import { transformBounds, type Bounds, type Vec3 } from "./math.js"
+import { pbrMaterialMapAssetIds } from "./material-lighting.js"
+import { composeTransform, multiplyTransforms, transformBounds, type Bounds, type Vec3 } from "./math.js"
 
 export type SpatialInspectedBounds =
   | { readonly status: "authored-enclosure"; readonly coordinateDomain: SpatialEntity["placement"]; readonly atTimeUs: 0; readonly bounds: Bounds }
   | { readonly status: "unknown"; readonly reason: "requires-asset-decoding" | "requires-text-layout" | "no-surface" }
 
+/** Authored-edit surface beyond the override properties: patch operations own these controls. */
+export type SpatialEditableControl = SpatialOverride["property"] | "emissive" | "instances" | "castShadow" | "receiveShadow" | "spot" | "shadow"
+
 export interface SpatialSceneInspection {
   readonly sceneId: string
   readonly sceneSha256: string
@@ -19,7 +23,7 @@ export interface SpatialSceneInspection {
     readonly origin: SpatialEntity["origin"]
     readonly parentId: string | null
     readonly placement: SpatialEntity["placement"]
-    readonly editableControls: readonly SpatialOverride["property"][]
+    readonly editableControls: readonly SpatialEditableControl[]
     readonly animatedProperties: readonly string[]
     readonly assetIds: readonly string[]
     readonly bounds: SpatialInspectedBounds
@@ -53,14 +57,39 @@ export function inspectSpatialScene(input: unknown): SpatialSceneInspection {
     sceneId: scene.sceneId, sceneSha256: spatialValueSha256(scene), durationUs: scene.durationUs,
     entities: snapshot.entities.map(({ entity, worldMatrix }) => {
       const origin = entity.origin
-      const declared = origin.kind === "generated"
+      const declared: readonly SpatialEditableControl[] = origin.kind === "generated"
         ? scene.generators.find(generator => generator.generatorId === origin.generatorId)!.editableKeys.find(item => item.key === origin.key)?.properties ?? []
-        : (["color", "opacity", "transform"] as const).filter(property => spatialPropertySupported(entity, property))
+        : [
+            ...(["color", "opacity", "transform"] as const).filter(property => spatialPropertySupported(entity, property)),
+            ...(entity.kind === "mesh" ? [
+              ...((entity.material.kind === "standard" || entity.material.kind === "pbr") && spatialPropertySupported(entity, "color") ? ["emissive" as const] : []),
+              "instances" as const, "castShadow" as const, "receiveShadow" as const,
+            ] : []),
+            ...(entity.kind === "light" ? [
+              ...(entity.light === "spot" ? ["spot" as const] : []),
+              ...(entity.light !== "ambient" ? ["shadow" as const] : []),
+            ] : []),
+          ]
       const animatedProperties = scene.animations.filter(channel => channel.targetId === entity.entityId).map(channel => channel.property)
       const editableControls = declared.filter(property => !animatedProperties.some(animated => animated === property || (property === "transform" && ["position", "rotation", "scale"].includes(animated))))
       const local = localBounds(entity)
-      const bounds: SpatialInspectedBounds = "status" in local ? local : { status: "authored-enclosure", coordinateDomain: entity.placement, atTimeUs: 0, bounds: transformBounds(worldMatrix, local) }
-      const assetIds = entity.kind === "mesh" && entity.geometry.kind === "asset" ? [entity.geometry.assetId] : entity.kind === "text" ? [entity.fontAssetId] : "assetId" in entity ? [entity.assetId] : []
+      const localDomains: Bounds[] = "status" in local ? []
+        : entity.kind === "mesh" && entity.instances !== undefined
+          ? entity.instances.map(instance => transformBounds(multiplyTransforms(worldMatrix, composeTransform(instance)), local))
+          : [transformBounds(worldMatrix, local)]
+      const bounds: SpatialInspectedBounds = "status" in local ? local : {
+        status: "authored-enclosure", coordinateDomain: entity.placement, atTimeUs: 0,
+        bounds: localDomains.reduce((union, next) => ({
+          min: union.min.map((value, axis) => Math.min(value, next.min[axis]!)) as unknown as Bounds["min"],
+          max: union.max.map((value, axis) => Math.max(value, next.max[axis]!)) as unknown as Bounds["max"],
+        })),
+      }
+      const meshMapIds = entity.kind === "mesh"
+        ? entity.material.kind === "pbr" ? pbrMaterialMapAssetIds(entity.material) : entity.material.map === undefined ? [] : [entity.material.map]
+        : []
+      const assetIds = entity.kind === "mesh"
+        ? [...entity.geometry.kind === "asset" ? [entity.geometry.assetId] : [], ...meshMapIds]
+        : entity.kind === "text" ? [entity.fontAssetId] : "assetId" in entity ? [entity.assetId] : []
       return { entityId: entity.entityId, name: entity.name, kind: entity.kind, origin, parentId: entity.parentId, placement: entity.placement, editableControls, animatedProperties, assetIds, bounds }
     }),
     cameras: scene.cameras, assets: scene.assets.map(manifest => ({ assetId: manifest.assetId, manifestSha256: digests[manifest.assetId]!, manifest })), generators: scene.generators,