@aura3d/rendering 1.4.4 → 1.5.0

package/dist/LightCollector.d.ts

@@ -1,12 +1,16 @@
 import { Light, Scene } from "@aura3d/scene";
-export type CollectedLightKind = "directional" | "point" | "spot";
+export type CollectedLightKind = "directional" | "point" | "spot" | "rect-area";
 export interface CollectedLight {
     readonly kind: CollectedLightKind;
     readonly color: readonly [number, number, number];
     readonly intensity: number;
     readonly position: readonly [number, number, number];
     readonly direction: readonly [number, number, number];
+    readonly right?: readonly [number, number, number];
+    readonly up?: readonly [number, number, number];
     readonly range: number;
+    readonly width?: number;
+    readonly height?: number;
     readonly spotAngle: number;
     readonly penumbra: number;
     readonly castsShadow: boolean;

package/dist/LightCollector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LightCollector.d.ts","sourceRoot":"","sources":["../../../../packages/rendering/src/LightCollector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,KAAK,EAAc,KAAK,EAAa,MAAM,eAAe,CAAC;AAEtF,MAAM,MAAM,kBAAkB,GAAG,aAAa,GAAG,OAAO,GAAG,MAAM,CAAC;AAElE,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,IAAI,EAAE,kBAAkB,CAAC;IAClC,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAClD,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,QAAQ,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IACrD,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IACtD,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC;IAC9B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAC;CACxB;AAED,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,eAAe,CAAC,EAAE,OAAO,CAAC;CACpC;AAED,qBAAa,cAAc;IACzB,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,GAAE,qBAA0B,GAAG,SAAS,cAAc,EAAE;CActF"}
+{"version":3,"file":"LightCollector.d.ts","sourceRoot":"","sources":["../../../../packages/rendering/src/LightCollector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,KAAK,EAA6B,KAAK,EAAa,MAAM,eAAe,CAAC;AAErG,MAAM,MAAM,kBAAkB,GAAG,aAAa,GAAG,OAAO,GAAG,MAAM,GAAG,WAAW,CAAC;AAEhF,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,IAAI,EAAE,kBAAkB,CAAC;IAClC,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAClD,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,QAAQ,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IACrD,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IACtD,QAAQ,CAAC,KAAK,CAAC,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IACnD,QAAQ,CAAC,EAAE,CAAC,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAChD,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC;IAC9B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAC;CACxB;AAED,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,eAAe,CAAC,EAAE,OAAO,CAAC;CACpC;AAED,qBAAa,cAAc;IACzB,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,GAAE,qBAA0B,GAAG,SAAS,cAAc,EAAE;CActF"}

package/dist/LightCollector.js

@@ -1,4 +1,4 @@
-import { DirectionalLight, Light, PointLight, Scene, SpotLight } from "@aura3d/scene";
+import { DirectionalLight, Light, PointLight, RectAreaLight, Scene, SpotLight } from "@aura3d/scene";
 export class LightCollector {
     collect(scene, options = {}) {
         const maxLights = options.maxLights ?? Number.POSITIVE_INFINITY;
@@ -21,7 +21,11 @@ function collectLight(light) {
     const direction = light instanceof DirectionalLight
         ? vectorToTuple(light.getDirection())
         : normalize([-matrix[8], -matrix[9], -matrix[10]]);
-    const range = light instanceof PointLight || light instanceof SpotLight ? light.range : 0;
+    const right = normalize([matrix[0], matrix[1], matrix[2]]);
+    const up = normalize([matrix[4], matrix[5], matrix[6]]);
+    const range = light instanceof PointLight || light instanceof SpotLight || light instanceof RectAreaLight ? light.range : 0;
+    const width = light instanceof RectAreaLight ? light.width : 0;
+    const height = light instanceof RectAreaLight ? light.height : 0;
     const spotAngle = light instanceof SpotLight ? light.angle : 0;
     const penumbra = light instanceof SpotLight ? light.penumbra : 0;
     return {
@@ -30,7 +34,11 @@ function collectLight(light) {
         intensity: light.intensity,
         position,
         direction,
+        right,
+        up,
         range,
+        width,
+        height,
         spotAngle,
         penumbra,
         castsShadow: light.castsShadow,
@@ -51,6 +59,11 @@ function matrixElements(value) {
 }
 function normalize(value) {
     const length = Math.hypot(value[0], value[1], value[2]);
-    return length === 0 ? [0, 0, -1] : [value[0] / length, value[1] / length, value[2] / length];
+    return length === 0
+        ? [0, 0, -1]
+        : [canonicalZero(value[0] / length), canonicalZero(value[1] / length), canonicalZero(value[2] / length)];
+}
+function canonicalZero(value) {
+    return value === 0 ? 0 : value;
 }
 //# sourceMappingURL=LightCollector.js.map

package/dist/LightCollector.js.map

@@ -1 +1 @@
-{"version":3,"file":"LightCollector.js","sourceRoot":"","sources":["../../../../packages/rendering/src/LightCollector.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"LightCollector.js","sourceRoot":"","sources":["../../../../packages/rendering/src/LightCollector.ts"],"names":[],"mappings":"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"}

package/dist/LightUniforms.d.ts

@@ -1,13 +1,38 @@
 import { type CollectedLight } from "./LightCollector";
 import { UniformLayout } from "./UniformLayout";
 export declare const MAX_DIRECT_LIGHTS = 16;
+export type DirectLightSelectionStrategy = "intensity-times-relative-luminance";
+export type DirectLightSelectionOrder = "input" | "contribution-descending";
+export interface DirectLightSelectionEntry {
+    readonly sourceId: string;
+    readonly sourceName: string;
+    readonly kind: CollectedLight["kind"];
+    readonly contribution: number;
+}
+export interface DirectLightSelectionDiagnostics {
+    readonly source: "LightUniforms.pack";
+    readonly strategy: DirectLightSelectionStrategy;
+    readonly order: DirectLightSelectionOrder;
+    readonly requestedMaxLights: number;
+    readonly maxLights: number;
+    readonly capacityClamped: boolean;
+    readonly requestedCount: number;
+    readonly selectedCount: number;
+    readonly droppedCount: number;
+    readonly degraded: boolean;
+    readonly selected: readonly DirectLightSelectionEntry[];
+    readonly dropped: readonly DirectLightSelectionEntry[];
+    readonly message: string;
+}
 export interface PackedLightUniforms {
     readonly lightCount: number;
     readonly data: Float32Array;
     readonly layout: UniformLayout;
+    readonly diagnostics: DirectLightSelectionDiagnostics;
 }
 export declare class LightUniforms {
-    static readonly floatsPerLight = 16;
+    static readonly floatsPerLight = 24;
+    static readonly vec4sPerLight: number;
     static readonly layout: UniformLayout;
     static pack(lights: readonly CollectedLight[], maxLights?: number): PackedLightUniforms;
 }

package/dist/LightUniforms.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LightUniforms.d.ts","sourceRoot":"","sources":["../../../../packages/rendering/src/LightUniforms.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,eAAO,MAAM,iBAAiB,KAAK,CAAC;AAEpC,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAC;IAC5B,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC;CAChC;AAED,qBAAa,aAAa;IACxB,MAAM,CAAC,QAAQ,CAAC,cAAc,MAAM;IAEpC,MAAM,CAAC,QAAQ,CAAC,MAAM,gBAGnB;IAEH,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,cAAc,EAAE,EAAE,SAAS,SAAoB,GAAG,mBAAmB;CAgBnG"}
+{"version":3,"file":"LightUniforms.d.ts","sourceRoot":"","sources":["../../../../packages/rendering/src/LightUniforms.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,eAAO,MAAM,iBAAiB,KAAK,CAAC;AAEpC,MAAM,MAAM,4BAA4B,GAAG,oCAAoC,CAAC;AAChF,MAAM,MAAM,yBAAyB,GAAG,OAAO,GAAG,yBAAyB,CAAC;AAE5E,MAAM,WAAW,yBAAyB;IACxC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC,MAAM,CAAC,CAAC;IACtC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;CAC/B;AAED,MAAM,WAAW,+BAA+B;IAC9C,QAAQ,CAAC,MAAM,EAAE,oBAAoB,CAAC;IACtC,QAAQ,CAAC,QAAQ,EAAE,4BAA4B,CAAC;IAChD,QAAQ,CAAC,KAAK,EAAE,yBAAyB,CAAC;IAC1C,QAAQ,CAAC,kBAAkB,EAAE,MAAM,CAAC;IACpC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,eAAe,EAAE,OAAO,CAAC;IAClC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,QAAQ,EAAE,SAAS,yBAAyB,EAAE,CAAC;IACxD,QAAQ,CAAC,OAAO,EAAE,SAAS,yBAAyB,EAAE,CAAC;IACvD,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAC;IAC5B,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC;IAC/B,QAAQ,CAAC,WAAW,EAAE,+BAA+B,CAAC;CACvD;AAED,qBAAa,aAAa;IACxB,MAAM,CAAC,QAAQ,CAAC,cAAc,MAAM;IACpC,MAAM,CAAC,QAAQ,CAAC,aAAa,SAAoC;IAEjE,MAAM,CAAC,QAAQ,CAAC,MAAM,gBAGnB;IAEH,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,cAAc,EAAE,EAAE,SAAS,SAAoB,GAAG,mBAAmB;CAiEnG"}

package/dist/LightUniforms.js

@@ -2,28 +2,158 @@ import {} from "./LightCollector.js";
 import { UniformLayout } from "./UniformLayout.js";
 export const MAX_DIRECT_LIGHTS = 16;
 export class LightUniforms {
-    static floatsPerLight = 16;
+    static floatsPerLight = 24;
+    static vec4sPerLight = LightUniforms.floatsPerLight / 4;
     static layout = new UniformLayout([
         { name: "u_lightCount", type: "float" },
-        { name: "u_lightData", type: "vec4", arrayLength: MAX_DIRECT_LIGHTS * 4 }
+        { name: "u_lightData", type: "vec4", arrayLength: MAX_DIRECT_LIGHTS * LightUniforms.vec4sPerLight }
     ]);
     static pack(lights, maxLights = MAX_DIRECT_LIGHTS) {
-        if (!Number.isInteger(maxLights) || maxLights <= 0 || maxLights > MAX_DIRECT_LIGHTS) {
-            throw new RangeError(`maxLights must be an integer in [1, ${MAX_DIRECT_LIGHTS}]`);
+        if (!Number.isInteger(maxLights) || maxLights <= 0) {
+            throw new RangeError("maxLights must be a positive integer");
         }
-        const selected = lights.slice(0, maxLights);
+        const effectiveMaxLights = Math.min(maxLights, MAX_DIRECT_LIGHTS);
+        const evaluated = evaluateLights(lights);
+        const order = lights.length > effectiveMaxLights
+            ? "contribution-descending"
+            : "input";
+        const ordered = order === "contribution-descending"
+            ? rankLightsByContribution(evaluated)
+            : evaluated;
+        const selected = ordered.slice(0, effectiveMaxLights);
+        const dropped = ordered.slice(effectiveMaxLights);
         const data = new Float32Array(MAX_DIRECT_LIGHTS * LightUniforms.floatsPerLight);
-        selected.forEach((light, index) => {
+        selected.forEach(({ light }, index) => {
             const offset = index * LightUniforms.floatsPerLight;
             const forwardShadowSupported = light.castsShadow;
             data.set([light.color[0], light.color[1], light.color[2], light.intensity], offset);
             data.set([light.position[0], light.position[1], light.position[2], light.range], offset + 4);
             data.set([light.direction[0], light.direction[1], light.direction[2], kindToFloat(light.kind)], offset + 8);
-            data.set([light.spotAngle, light.penumbra, forwardShadowSupported ? 1 : 0, light.layerMask], offset + 12);
+            data.set([
+                light.kind === "rect-area" ? light.width ?? 1 : light.spotAngle,
+                light.kind === "rect-area" ? light.height ?? 1 : light.penumbra,
+                forwardShadowSupported && light.kind !== "rect-area" ? 1 : 0,
+                light.layerMask
+            ], offset + 12);
+            data.set([...(light.right ?? [1, 0, 0]), 0], offset + 16);
+            data.set([...(light.up ?? [0, 1, 0]), 0], offset + 20);
         });
-        return { lightCount: selected.length, data, layout: LightUniforms.layout };
+        const selectedEntries = selected.map(selectionEntry);
+        const droppedEntries = dropped.map(selectionEntry);
+        const droppedCount = droppedEntries.length;
+        const degraded = droppedCount > 0;
+        const capacityClamped = maxLights > effectiveMaxLights;
+        const selectedNames = selectedEntries.map((entry) => entry.sourceName).join(", ");
+        const capacityMessage = capacityClamped
+            ? ` Requested capacity ${maxLights} was clamped to the interim limit ${effectiveMaxLights}.`
+            : "";
+        const message = (degraded
+            ? `Direct-light limit applied: selected ${selectedEntries.length} of ${lights.length} by ${DIRECT_LIGHT_SELECTION_STRATEGY}, dropped ${droppedCount}. Selected: ${selectedNames}.`
+            : `Direct-light selection kept all ${selectedEntries.length} requested lights in input order; dropped 0. Contribution scores use ${DIRECT_LIGHT_SELECTION_STRATEGY}. Selected: ${selectedNames || "none"}.`) + capacityMessage;
+        return {
+            lightCount: selected.length,
+            data,
+            layout: LightUniforms.layout,
+            diagnostics: {
+                source: "LightUniforms.pack",
+                strategy: DIRECT_LIGHT_SELECTION_STRATEGY,
+                order,
+                requestedMaxLights: maxLights,
+                maxLights: effectiveMaxLights,
+                capacityClamped,
+                requestedCount: lights.length,
+                selectedCount: selectedEntries.length,
+                droppedCount,
+                degraded,
+                selected: selectedEntries,
+                dropped: droppedEntries,
+                message
+            }
+        };
     }
 }
+const DIRECT_LIGHT_SELECTION_STRATEGY = "intensity-times-relative-luminance";
+const RELATIVE_LUMINANCE_RED = 0.2126;
+const RELATIVE_LUMINANCE_GREEN = 0.7152;
+const RELATIVE_LUMINANCE_BLUE = 0.0722;
+function evaluateLights(lights) {
+    return lights
+        .map((light, inputIndex) => ({
+        light,
+        inputIndex,
+        sourceId: lightSourceId(light),
+        sourceName: lightSourceName(light),
+        stableKey: stableLightKey(light),
+        contribution: estimateLightContribution(light)
+    }));
+}
+function rankLightsByContribution(lights) {
+    return [...lights].sort((left, right) => {
+        const contributionOrder = right.contribution - left.contribution;
+        if (contributionOrder !== 0)
+            return contributionOrder;
+        const sourceNameOrder = compareText(left.sourceName, right.sourceName);
+        if (sourceNameOrder !== 0)
+            return sourceNameOrder;
+        const sourceIdOrder = compareText(left.sourceId, right.sourceId);
+        if (sourceIdOrder !== 0)
+            return sourceIdOrder;
+        const stableKeyOrder = compareText(left.stableKey, right.stableKey);
+        if (stableKeyOrder !== 0)
+            return stableKeyOrder;
+        return left.inputIndex - right.inputIndex;
+    });
+}
+// Packing has no receiver, camera, or scene-bounds context, so emitted linear-RGB
+// luminance is the strongest deterministic contribution estimate available here.
+// Per-fragment range, cone, and distance attenuation remains shader-owned.
+function estimateLightContribution(light) {
+    const luminance = (finiteNonNegative(light.color[0]) * RELATIVE_LUMINANCE_RED
+        + finiteNonNegative(light.color[1]) * RELATIVE_LUMINANCE_GREEN
+        + finiteNonNegative(light.color[2]) * RELATIVE_LUMINANCE_BLUE);
+    const contribution = finiteNonNegative(light.intensity) * luminance;
+    return Number.isFinite(contribution) ? contribution : Number.MAX_VALUE;
+}
+function selectionEntry(light) {
+    return {
+        sourceId: light.sourceId,
+        sourceName: light.sourceName,
+        kind: light.light.kind,
+        contribution: light.contribution
+    };
+}
+function lightSourceId(light) {
+    const id = light.source.id.trim();
+    return id || `anonymous-${light.kind}`;
+}
+function lightSourceName(light) {
+    const name = light.source.name.trim();
+    return name || lightSourceId(light);
+}
+function stableLightKey(light) {
+    return [
+        light.kind,
+        light.color,
+        light.intensity,
+        light.position,
+        light.direction,
+        light.right,
+        light.up,
+        light.range,
+        light.width,
+        light.height,
+        light.spotAngle,
+        light.penumbra,
+        light.castsShadow ? 1 : 0,
+        light.layerMask
+    ].join("|");
+}
+function finiteNonNegative(value) {
+    return Number.isFinite(value) ? Math.max(0, value) : 0;
+}
+function compareText(left, right) {
+    return left < right ? -1 : left > right ? 1 : 0;
+}
 function kindToFloat(kind) {
     switch (kind) {
         case "directional":
@@ -32,6 +162,8 @@ function kindToFloat(kind) {
             return 1;
         case "spot":
             return 2;
+        case "rect-area":
+            return 3;
     }
 }
 //# sourceMappingURL=LightUniforms.js.map

package/dist/LightUniforms.js.map

@@ -1 +1 @@
-{"version":3,"file":"LightUniforms.js","sourceRoot":"","sources":["../../../../packages/rendering/src/LightUniforms.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,MAAM,CAAC,MAAM,iBAAiB,GAAG,EAAE,CAAC;AAQpC,MAAM,OAAO,aAAa;IACxB,MAAM,CAAU,cAAc,GAAG,EAAE,CAAC;IAEpC,MAAM,CAAU,MAAM,GAAG,IAAI,aAAa,CAAC;QACzC,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,OAAO,EAAE;QACvC,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,iBAAiB,GAAG,CAAC,EAAE;KAC1E,CAAC,CAAC;IAEH,MAAM,CAAC,IAAI,CAAC,MAAiC,EAAE,SAAS,GAAG,iBAAiB;QAC1E,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,SAAS,IAAI,CAAC,IAAI,SAAS,GAAG,iBAAiB,EAAE,CAAC;YACpF,MAAM,IAAI,UAAU,CAAC,uCAAuC,iBAAiB,GAAG,CAAC,CAAC;QACpF,CAAC;QACD,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;QAC5C,MAAM,IAAI,GAAG,IAAI,YAAY,CAAC,iBAAiB,GAAG,aAAa,CAAC,cAAc,CAAC,CAAC;QAChF,QAAQ,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;YAChC,MAAM,MAAM,GAAG,KAAK,GAAG,aAAa,CAAC,cAAc,CAAC;YACpD,MAAM,sBAAsB,GAAG,KAAK,CAAC,WAAW,CAAC;YACjD,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,CAAC;YACpF,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,CAAC;YAC7F,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,CAAC;YAC5G,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,QAAQ,EAAE,sBAAsB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,EAAE,CAAC,CAAC;QAC5G,CAAC,CAAC,CAAC;QACH,OAAO,EAAE,UAAU,EAAE,QAAQ,CAAC,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,aAAa,CAAC,MAAM,EAAE,CAAC;IAC7E,CAAC;;AAGH,SAAS,WAAW,CAAC,IAA4B;IAC/C,QAAQ,IAAI,EAAE,CAAC;QACb,KAAK,aAAa;YAChB,OAAO,CAAC,CAAC;QACX,KAAK,OAAO;YACV,OAAO,CAAC,CAAC;QACX,KAAK,MAAM;YACT,OAAO,CAAC,CAAC;IACb,CAAC;AACH,CAAC"}
+{"version":3,"file":"LightUniforms.js","sourceRoot":"","sources":["../../../../packages/rendering/src/LightUniforms.ts"],"names":[],"mappings":"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"}

package/dist/LightingRig.d.ts

@@ -12,6 +12,8 @@ export interface LightingRigLightDescriptor {
     readonly range: number;
     readonly spotAngle: number;
     readonly penumbra: number;
+    readonly width: number;
+    readonly height: number;
     readonly castsShadow: boolean;
     readonly claimBoundary: string;
 }
@@ -47,7 +49,82 @@ export interface LightingRigOptions {
     readonly intensityScale?: number;
     readonly shadows?: boolean;
     readonly includeUnsupportedDiagnostics?: boolean;
+    /**
+     * Scale light *placements* to the rendered subject, keeping the rig's geometry across asset swaps.
+     *
+     * ## Why this exists
+     *
+     * Preset positions are authored for a subject about 1 unit tall. Every showcase route therefore ignored
+     * them and hand-authored its own coordinates: Turbo as `SCENE_SIZE` multiples, Blockfall and Aura Clash as
+     * bare numbers. The *structure* those routes built was identical -- ambient, key, opposing rims -- and only
+     * the coordinates differed, because each route re-derived where a rim belongs for its own subject size.
+     *
+     * That is the same defect class as the framing constants: a coordinate correct for one subject reads as a
+     * design decision, survives an asset swap, and is then silently wrong. Turbo's `CAR_SCENE_HEIGHT` and its
+     * hand-tuned chase height both outlived their assets exactly this way.
+     *
+     * Supplying `subject` multiplies each preset position by `subjectHeight` (and lateral placement by the
+     * subject's widest horizontal extent, since a rim must reach the silhouette edge to do anything), then
+     * lifts the rig onto `floorY`. Intensities are untouched: a rig that dimmed with subject size would make
+     * large subjects dark for no photographic reason.
+     */
+    readonly subject?: LightingRigSubject;
+}
+/** Rendered subject measurements a rig scales its placements to. */
+export interface LightingRigSubject {
+    /** Rendered subject height in world units. Pair with `resolveSubjectRenderedSize` so it is derived. */
+    readonly height: number;
+    /** Widest horizontal extent, used for lateral rim placement. Defaults to `height`. */
+    readonly width?: number;
+    /** World Y of the surface the subject stands on. Defaults to 0. */
+    readonly floorY?: number;
 }
 export declare function createLightingRig(options?: LightingRigOptions): LightingRig;
+/** Placement for a rim light that follows a moving subject. */
+export interface SubjectRimPlacement {
+    /** World position for the rim light. */
+    readonly position: readonly [number, number, number];
+    /** Point-light range, sized so falloff keeps the rim on the subject rather than the backdrop. */
+    readonly range: number;
+}
+export interface SubjectRimPlacementOptions {
+    /** Subject's current world position (its ground contact point). */
+    readonly subjectPosition: readonly [number, number, number];
+    /** Rendered subject height in world units. Everything below is a fraction of it. */
+    readonly subjectHeight: number;
+    /** Which side of the subject the rim sits on. */
+    readonly side: "left" | "right";
+    /**
+     * Depth offset behind the subject, as a fraction of subject height.
+     *
+     * Negative values sit behind a subject viewed down -z, which is what makes the light graze the silhouette
+     * edge instead of front-lighting the body.
+     */
+    readonly depthFraction?: number | undefined;
+    /** Height above the subject's contact point, as a fraction of subject height. */
+    readonly heightFraction?: number | undefined;
+    /** Lateral offset, as a fraction of subject height. */
+    readonly lateralFraction?: number | undefined;
+    /** Range as a fraction of subject height. */
+    readonly rangeFraction?: number | undefined;
+}
+/**
+ * Place a rim light relative to a moving subject.
+ *
+ * ## Why this is reusable rather than route-local
+ *
+ * Aura Clash computes per-fighter rim placement inline as
+ * `(fighter.x ± 0.34, fighter.y + 1.22, -0.72)` with `range = 1.5`. Against its 1.829-unit fighter rig those
+ * are 0.186x, 0.667x, -0.394x and 0.820x of subject height respectively — clean photographic ratios written as
+ * absolute literals. Any fighter rig of a different height silently breaks them: the rim drifts off the
+ * silhouette and stops separating the subject from the backdrop, which is the one thing a rim exists to do.
+ *
+ * That is the same defect class as the framing constants removed earlier in this work: a coordinate correct
+ * for one asset reads as a design decision, survives a swap, and is then wrong. Expressing the ratios keeps
+ * the intent ("upper-torso height, slightly outboard, behind the subject") and lets the numbers follow the rig.
+ *
+ * The defaults are Aura Clash's measured values, so adopting this helper is a no-op for its current rig.
+ */
+export declare function resolveSubjectRimPlacement(options: SubjectRimPlacementOptions): SubjectRimPlacement;
 export declare function listLightingRigPresets(): readonly LightingRigPreset[];
 //# sourceMappingURL=LightingRig.d.ts.map

package/dist/LightingRig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LightingRig.d.ts","sourceRoot":"","sources":["../../../../packages/rendering/src/LightingRig.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"LightingRig.d.ts","sourceRoot":"","sources":["../../../../packages/rendering/src/LightingRig.ts"],"names":[],"mappings":"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"}