@flighthq/render 0.3.0-next.1714.3bd86f1 → 0.3.0-next.1729.f927a3b

package/dist/renderColorScaleBias.d.ts

@@ -1,3 +1,3 @@
 import type { RenderProxy, RenderState } from '@flighthq/types/contract';
-export declare function updateRenderProxyColorScaleBias(state: RenderState, data: RenderProxy, _parentData?: RenderProxy): void;
+export declare function updateRenderProxyColorScaleBias(state: RenderState, data: RenderProxy, parentData?: RenderProxy): void;
 //# sourceMappingURL=renderColorScaleBias.d.ts.map

package/dist/renderColorScaleBias.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"renderColorScaleBias.d.ts","sourceRoot":"","sources":["../src/renderColorScaleBias.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAA4C,WAAW,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAcnH,wBAAgB,+BAA+B,CAC7C,KAAK,EAAE,WAAW,EAClB,IAAI,EAAE,WAAW,EACjB,WAAW,CAAC,EAAE,WAAW,GACxB,IAAI,CAON"}
+{"version":3,"file":"renderColorScaleBias.d.ts","sourceRoot":"","sources":["../src/renderColorScaleBias.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAKV,WAAW,EACX,WAAW,EACZ,MAAM,0BAA0B,CAAC;AAelC,wBAAgB,+BAA+B,CAAC,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,WAAW,EAAE,UAAU,CAAC,EAAE,WAAW,GAAG,IAAI,CA2BrH"}

package/dist/renderColorScaleBias.js

@@ -1,21 +1,99 @@
+import { multiplyColorMatrix } from '@flighthq/adjustments/contract';
+import { concatColorScaleBias, createColorScaleBias } from '@flighthq/materials/contract';
 import { getNodeRuntime } from '@flighthq/node/contract';
 import { getRenderStateRuntime } from './renderState';
 // Hands the node's resolved color adjustment to the render node. A node's color-adjustment stack
 // (NodeRuntime.colorAdjustments) is fused once into the affine `resolvedColorScaleBias` cache by the
-// set-accessors on change — never per frame — so this hot-path visitor is a single field read, identical
-// in cost to reading the old `.colorScaleBias`. Non-inheriting: a node uses its own resolved value (or
-// none → null). The value is the Adjustment-tier fold input; it is not a material and does not key the
-// batch.
+// set-accessors on change — never per frame. The render walk then applies the local value first and its
+// parent's inherited value second, matching the appearance and alpha axes: a transform on a container
+// must reach every renderer-bearing descendant. Null and single-adjustment paths remain reference-only;
+// only a node with both local and inherited adjustments performs composition. The result is the
+// Adjustment-tier fold input; it is not a material and does not key the batch.
 //
 // Matrix-tier channel mixing travels through `resolvedColorMatrix`. A non-matrix operation that cannot
 // be represented by either path leaves `colorAdjustmentsUnsupported` set, invoking the shakeable guard
 // so unsupported adjustment data is reported rather than silently discarded.
-export function updateRenderProxyColorScaleBias(state, data, _parentData) {
+export function updateRenderProxyColorScaleBias(state, data, parentData) {
     const runtime = getNodeRuntime(data.source);
-    data.colorScaleBias = runtime.resolvedColorScaleBias ?? null;
-    data.colorMatrix = runtime.resolvedColorMatrix ?? null;
+    const localColorScaleBias = runtime.resolvedColorScaleBias ?? null;
+    const localColorMatrix = runtime.resolvedColorMatrix ?? null;
+    const parentColorScaleBias = parentData?.colorScaleBias ?? null;
+    const parentColorMatrix = parentData?.colorMatrix ?? null;
+    if (localColorMatrix !== null || parentColorMatrix !== null) {
+        data.colorMatrix = resolveInheritedColorMatrix(data.colorMatrix, parentColorMatrix, parentColorScaleBias, localColorMatrix, localColorScaleBias);
+        data.colorScaleBias = null;
+    }
+    else {
+        data.colorMatrix = null;
+        data.colorScaleBias = resolveInheritedColorScaleBias(data.colorScaleBias, parentColorScaleBias, localColorScaleBias);
+    }
     if (runtime.colorAdjustmentsUnsupported) {
         getRenderStateRuntime(state).colorAdjustmentUnsupportedGuard?.(state, data.source);
     }
 }
+function resolveInheritedColorScaleBias(previous, parent, local) {
+    if (parent === null)
+        return local;
+    if (local === null)
+        return parent;
+    const out = previous !== parent && previous !== local && previous !== null && inheritedColorScaleBiases.has(previous)
+        ? previous
+        : createInheritedColorScaleBias();
+    // SWF and scene-graph semantics apply the local adjustment first, then the parent's adjustment.
+    concatColorScaleBias(out, parent, local);
+    return out;
+}
+function resolveInheritedColorMatrix(previous, parentMatrix, parentColorScaleBias, localMatrix, localColorScaleBias) {
+    if (parentMatrix === null && parentColorScaleBias === null)
+        return localMatrix;
+    if (localMatrix === null && localColorScaleBias === null)
+        return parentMatrix;
+    const parent = parentMatrix ?? writeColorScaleBiasMatrix(parentColorMatrixScratch, parentColorScaleBias);
+    const local = localMatrix ?? writeColorScaleBiasMatrix(localColorMatrixScratch, localColorScaleBias);
+    const out = previous !== parentMatrix &&
+        previous !== localMatrix &&
+        previous !== null &&
+        previous !== undefined &&
+        inheritedColorMatrices.has(previous)
+        ? previous
+        : createInheritedColorMatrix();
+    return multiplyColorMatrix(parent, local, out);
+}
+function writeColorScaleBiasMatrix(out, value) {
+    out[0] = value.redScale;
+    out[1] = 0;
+    out[2] = 0;
+    out[3] = 0;
+    out[4] = value.redBias;
+    out[5] = 0;
+    out[6] = value.greenScale;
+    out[7] = 0;
+    out[8] = 0;
+    out[9] = value.greenBias;
+    out[10] = 0;
+    out[11] = 0;
+    out[12] = value.blueScale;
+    out[13] = 0;
+    out[14] = value.blueBias;
+    out[15] = 0;
+    out[16] = 0;
+    out[17] = 0;
+    out[18] = value.alphaScale;
+    out[19] = value.alphaBias;
+    return out;
+}
+function createInheritedColorScaleBias() {
+    const value = createColorScaleBias();
+    inheritedColorScaleBiases.add(value);
+    return value;
+}
+function createInheritedColorMatrix() {
+    const value = new Array(20);
+    inheritedColorMatrices.add(value);
+    return value;
+}
+const inheritedColorScaleBiases = new WeakSet();
+const inheritedColorMatrices = new WeakSet();
+const parentColorMatrixScratch = new Array(20);
+const localColorMatrixScratch = new Array(20);
 //# sourceMappingURL=renderColorScaleBias.js.map

package/dist/renderColorScaleBias.js.map

@@ -1 +1 @@
-{"version":3,"file":"renderColorScaleBias.js","sourceRoot":"","sources":["../src/renderColorScaleBias.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAGzD,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAEtD,iGAAiG;AACjG,qGAAqG;AACrG,yGAAyG;AACzG,uGAAuG;AACvG,uGAAuG;AACvG,SAAS;AACT,EAAE;AACF,uGAAuG;AACvG,uGAAuG;AACvG,6EAA6E;AAC7E,MAAM,UAAU,+BAA+B,CAC7C,KAAkB,EAClB,IAAiB,EACjB,WAAyB;IAEzB,MAAM,OAAO,GAAG,cAAc,CAAC,IAAI,CAAC,MAAc,CAA8C,CAAC;IACjG,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC,sBAAsB,IAAI,IAAI,CAAC;IAC7D,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,mBAAmB,IAAI,IAAI,CAAC;IACvD,IAAI,OAAO,CAAC,2BAA2B,EAAE,CAAC;QACxC,qBAAqB,CAAC,KAAK,CAAC,CAAC,+BAA+B,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC,MAAoB,CAAC,CAAC;IACnG,CAAC;AACH,CAAC"}
+{"version":3,"file":"renderColorScaleBias.js","sourceRoot":"","sources":["../src/renderColorScaleBias.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flighthq/render",
-  "version": "0.3.0-next.1714.3bd86f1",
+  "version": "0.3.0-next.1729.f927a3b",
   "repository": {
     "type": "git",
     "url": "https://github.com/flighthq/flight.git",
@@ -36,18 +36,18 @@
     "clean:dist": "tsx ../../scripts/clean-package-dist.ts"
   },
   "dependencies": {
-    "@flighthq/color": "0.3.0-next.1714.3bd86f1",
-    "@flighthq/entity": "0.3.0-next.1714.3bd86f1",
-    "@flighthq/geometry": "0.3.0-next.1714.3bd86f1",
-    "@flighthq/log": "0.3.0-next.1714.3bd86f1",
-    "@flighthq/materials": "0.3.0-next.1714.3bd86f1",
-    "@flighthq/mesh": "0.3.0-next.1714.3bd86f1",
-    "@flighthq/node": "0.3.0-next.1714.3bd86f1",
-    "@flighthq/signals": "0.3.0-next.1714.3bd86f1",
-    "@flighthq/types": "0.3.0-next.1714.3bd86f1"
+    "@flighthq/adjustments": "0.3.0-next.1729.f927a3b",
+    "@flighthq/color": "0.3.0-next.1729.f927a3b",
+    "@flighthq/entity": "0.3.0-next.1729.f927a3b",
+    "@flighthq/geometry": "0.3.0-next.1729.f927a3b",
+    "@flighthq/log": "0.3.0-next.1729.f927a3b",
+    "@flighthq/materials": "0.3.0-next.1729.f927a3b",
+    "@flighthq/mesh": "0.3.0-next.1729.f927a3b",
+    "@flighthq/node": "0.3.0-next.1729.f927a3b",
+    "@flighthq/signals": "0.3.0-next.1729.f927a3b",
+    "@flighthq/types": "0.3.0-next.1729.f927a3b"
   },
   "devDependencies": {
-    "@flighthq/adjustments": "*",
     "@flighthq/camera": "*",
     "@flighthq/scene2d": "*",
     "@flighthq/lighting": "*",

package/src/renderColorScaleBias.test.ts

@@ -1,10 +1,15 @@
-import { createColorMatrixAdjustment, createTintAdjustment } from '@flighthq/adjustments/contract';
-import { setNodeColorAdjustments } from '@flighthq/node/contract';
+import {
+  applyColorMatrixToColor,
+  createColorMatrixAdjustment,
+  createColorScaleBiasAdjustment,
+  createTintAdjustment,
+} from '@flighthq/adjustments/contract';
+import { addNodeChild, setNodeColorAdjustments } from '@flighthq/node/contract';
 import { createDisplayObject, getNode2DRuntime } from '@flighthq/scene2d/contract';
 import type { Renderable } from '@flighthq/types/contract';
 
 import { updateRenderProxyColorScaleBias } from './renderColorScaleBias';
-import { createRenderProxy } from './renderProxy';
+import { createRenderProxy, getRenderProxy2D, prepareScene2DRender } from './renderProxy';
 import { createRenderState } from './renderState';
 
 describe('updateRenderProxyColorScaleBias', () => {
@@ -27,6 +32,7 @@ describe('updateRenderProxyColorScaleBias', () => {
     const data = createRenderProxy(state, node as unknown as Renderable);
     updateRenderProxyColorScaleBias(state, data);
     expect(data.colorMatrix).toEqual(matrix);
+    expect(data.colorScaleBias).toBeNull();
   });
 
   it('resolves to null when the node carries no adjustments', () => {
@@ -35,6 +41,151 @@ describe('updateRenderProxyColorScaleBias', () => {
     const data = createRenderProxy(state, node as unknown as Renderable);
     updateRenderProxyColorScaleBias(state, data);
     expect(data.colorScaleBias).toBeNull();
+    expect(data.colorMatrix).toBeNull();
+  });
+
+  it('inherits a parent adjustment when the renderer-bearing child has none of its own', () => {
+    const state = createRenderState();
+    const parent = createDisplayObject();
+    const child = createDisplayObject();
+    setNodeColorAdjustments(parent, [createTintAdjustment(0x80ff33ff)]);
+    const parentData = createRenderProxy(state, parent as unknown as Renderable);
+    const childData = createRenderProxy(state, child as unknown as Renderable);
+    updateRenderProxyColorScaleBias(state, parentData);
+    updateRenderProxyColorScaleBias(state, childData, parentData);
+    expect(childData.colorScaleBias).toBe(parentData.colorScaleBias);
+  });
+
+  it('carries a container adjustment to its child through the real render walk', () => {
+    const state = createRenderState();
+    const parent = createDisplayObject();
+    const child = createDisplayObject();
+    addNodeChild(parent, child);
+    setNodeColorAdjustments(parent, [createTintAdjustment(0x80ff33ff)]);
+    prepareScene2DRender(state, parent);
+    expect(getRenderProxy2D(state, child)?.colorScaleBias).toBe(getRenderProxy2D(state, parent)?.colorScaleBias);
+  });
+
+  it('refreshes inherited adjustments through descendants when an ancestor changes', () => {
+    const state = createRenderState();
+    const root = createDisplayObject();
+    const parent = createDisplayObject();
+    const child = createDisplayObject();
+    addNodeChild(root, parent);
+    addNodeChild(parent, child);
+    setNodeColorAdjustments(root, [createTintAdjustment(0x80ffffff)]);
+    setNodeColorAdjustments(parent, [createTintAdjustment(0xff8033ff)]);
+
+    prepareScene2DRender(state, root);
+    const first = getRenderProxy2D(state, child)?.colorScaleBias;
+    expect(first?.redScale).toBeCloseTo(0.5 * 1);
+    expect(first?.greenScale).toBeCloseTo(1 * 0.5);
+
+    setNodeColorAdjustments(root, [createTintAdjustment(0x40ffffff)]);
+    prepareScene2DRender(state, root);
+    const second = getRenderProxy2D(state, child)?.colorScaleBias;
+    expect(second?.redScale).toBeCloseTo(0.25 * 1);
+    expect(second?.greenScale).toBeCloseTo(1 * 0.5);
+
+    setNodeColorAdjustments(parent, null);
+    prepareScene2DRender(state, root);
+    expect(getRenderProxy2D(state, child)?.colorScaleBias).toBe(getRenderProxy2D(state, root)?.colorScaleBias);
+  });
+
+  it('concatenates a parent affine adjustment after the child adjustment', () => {
+    const state = createRenderState();
+    const parent = createDisplayObject();
+    const child = createDisplayObject();
+    setNodeColorAdjustments(parent, [
+      createColorScaleBiasAdjustment({
+        redScale: 0.5,
+        redBias: 0.1,
+        greenScale: 1,
+        greenBias: 0,
+        blueScale: 1,
+        blueBias: 0,
+        alphaScale: 1,
+        alphaBias: 0,
+      }),
+    ]);
+    setNodeColorAdjustments(child, [
+      createColorScaleBiasAdjustment({
+        redScale: 0.25,
+        redBias: 0.2,
+        greenScale: 1,
+        greenBias: 0,
+        blueScale: 1,
+        blueBias: 0,
+        alphaScale: 1,
+        alphaBias: 0,
+      }),
+    ]);
+    const parentData = createRenderProxy(state, parent as unknown as Renderable);
+    const childData = createRenderProxy(state, child as unknown as Renderable);
+    updateRenderProxyColorScaleBias(state, parentData);
+    updateRenderProxyColorScaleBias(state, childData, parentData);
+    expect(childData.colorScaleBias?.redScale).toBeCloseTo(0.125);
+    expect(childData.colorScaleBias?.redBias).toBeCloseTo(0.2);
+  });
+
+  it('promotes a parent affine and child matrix to one parent-after-child matrix', () => {
+    const state = createRenderState();
+    const parent = createDisplayObject();
+    const child = createDisplayObject();
+    const parentAdjustment = createColorScaleBiasAdjustment({
+      redScale: 0.5,
+      redBias: 0.1,
+      greenScale: 1,
+      greenBias: 0,
+      blueScale: 1,
+      blueBias: 0,
+      alphaScale: 1,
+      alphaBias: 0,
+    });
+    const childMatrix = [0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0];
+    setNodeColorAdjustments(parent, [parentAdjustment]);
+    setNodeColorAdjustments(child, [createColorMatrixAdjustment(childMatrix)]);
+    const parentData = createRenderProxy(state, parent as unknown as Renderable);
+    const childData = createRenderProxy(state, child as unknown as Renderable);
+    updateRenderProxyColorScaleBias(state, parentData);
+    updateRenderProxyColorScaleBias(state, childData, parentData);
+    const source = 0x204060ff;
+    const expected = applyColorMatrixToColor(
+      parentAdjustment.colorMatrix,
+      applyColorMatrixToColor(childMatrix, source),
+    );
+    expect(applyColorMatrixToColor(childData.colorMatrix!, source)).toBe(expected);
+    expect(childData.colorScaleBias).toBeNull();
+  });
+
+  it('promotes a parent matrix and child affine to one parent-after-child matrix', () => {
+    const state = createRenderState();
+    const parent = createDisplayObject();
+    const child = createDisplayObject();
+    const parentMatrix = [1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0];
+    const childAdjustment = createColorScaleBiasAdjustment({
+      redScale: 0.5,
+      redBias: 0.1,
+      greenScale: 1,
+      greenBias: 0,
+      blueScale: 1,
+      blueBias: 0,
+      alphaScale: 1,
+      alphaBias: 0,
+    });
+    setNodeColorAdjustments(parent, [createColorMatrixAdjustment(parentMatrix)]);
+    setNodeColorAdjustments(child, [childAdjustment]);
+    const parentData = createRenderProxy(state, parent as unknown as Renderable);
+    const childData = createRenderProxy(state, child as unknown as Renderable);
+    updateRenderProxyColorScaleBias(state, parentData);
+    updateRenderProxyColorScaleBias(state, childData, parentData);
+    const source = 0x204060ff;
+    const expected = applyColorMatrixToColor(
+      parentMatrix,
+      applyColorMatrixToColor(childAdjustment.colorMatrix, source),
+    );
+    expect(applyColorMatrixToColor(childData.colorMatrix!, source)).toBe(expected);
+    expect(childData.colorScaleBias).toBeNull();
   });
 
   it('reads the cache the accessor fused once (the walk never re-fuses)', () => {