@react-three/tsl 10.0.0-canary.d202062 → 10.0.0-canary.d46ab63

package/dist/index.mjs

@@ -58,6 +58,13 @@ function withStagedOverlay(store, kind, committed) {
   }
   return view;
 }
+function readWithStaged(store, kind, committed, scope, isLeaf) {
+  if (scope === void 0) return withStagedOverlay(store, kind, committed);
+  const scopeData = committed[scope];
+  const current = scopeData && typeof scopeData === "object" && !isLeaf(scopeData) ? scopeData : {};
+  const staged = scope === ROOT_SCOPE ? void 0 : peekStaged(store, kind, scope);
+  return staged ? { ...current, ...staged } : current;
+}
 function flushStagedScope(store, kind, scopeKey, isLeaf) {
   const registry = getKindRegistry(store, kind);
   const staged = registry.staged.get(scopeKey);
@@ -162,6 +169,10 @@ function extractTSLValue(value) {
   if (node.isConstNode) {
     return node.value;
   }
+  if (node.isVarNode && node.node) {
+    const inner = extractTSLValue(node.node);
+    return inner === node.node ? value : inner;
+  }
   if ("value" in node) {
     let extractedValue = node.value;
     if (typeof node.traverse === "function") {
@@ -685,8 +696,9 @@ function useUniforms(creatorOrScope, scope) {
     input: memoizedInput,
     create: () => {
       if (isReader) return {};
-      if (typeof processedInput.candidates !== "object" || processedInput.candidates === null)
+      if (typeof processedInput.candidates !== "object" || processedInput.candidates === null) {
         throw new Error("Invalid uniform input");
+      }
       return processedInput.candidates;
     },
     prepare: (name, candidate) => createUniform(name, candidate, scope),
@@ -704,13 +716,7 @@ function useUniforms(creatorOrScope, scope) {
       if (!equals) existing.value = newVal;
     }
   });
-  let uniforms = created;
-  if (memoizedInput === void 0) {
-    uniforms = storeUniforms;
-  } else if (typeof memoizedInput === "string") {
-    const scopeData = storeUniforms[memoizedInput];
-    uniforms = scopeData && !isUniformNode(scopeData) ? scopeData : {};
-  }
+  const uniforms = isReader ? readWithStaged(store, "uniforms", storeUniforms, memoizedInput, isUniformNode) : created;
   return { ...uniforms, removeUniforms, clearUniforms, rebuildUniforms };
 }
 function rebuildAllUniforms(store, scope) {
@@ -744,18 +750,20 @@ function isSameThreeType(a, b) {
 const uniformOf = uniform;
 function useUniform(name, value) {
   const store = usePrimaryStore();
+  const memoizedInput = useCompareMemoize(value === void 0 ? name : { [name]: normalizeValue(value) });
   const registered = useScopedResource({
     store,
     kind: "uniforms",
     scope: void 0,
     isLeaf: isUniformNode,
-    input: name,
+    input: memoizedInput,
     create: () => value === void 0 ? {} : { [name]: value },
     prepare: createNamedUniform,
     reconcile: (existing2) => {
-      if (value !== void 0 && !isTSLNode(value) && !isUniformNode(value)) {
-        existing2.value = typeof value === "string" ? new Color(value) : value;
-      }
+      if (value === void 0 || isUniformNode(value)) return;
+      const next = normalizeValue(value);
+      if (isTSLNode(next)) return;
+      existing2.value = next;
     }
   });
   if (registered[name]) return registered[name];
@@ -765,6 +773,9 @@ function useUniform(name, value) {
     `[useUniform] Uniform "${name}" not found. Create it first with: useUniform('${name}', initialValue)`
   );
 }
+function normalizeValue(value) {
+  return typeof value === "string" ? new Color(value) : vectorize(value);
+}
 function createNamedUniform(name, value) {
   let node;
   if (isUniformNode(value)) {
@@ -822,13 +833,7 @@ function useNodes(creatorOrScope, scope) {
       return node;
     }
   });
-  let nodes = created;
-  if (creatorOrScope === void 0) {
-    nodes = storeNodes;
-  } else if (typeof creatorOrScope === "string") {
-    const scopeData = storeNodes[creatorOrScope];
-    nodes = scopeData && !isTSLNode(scopeData) ? scopeData : {};
-  }
+  const nodes = isReader ? readWithStaged(store, "nodes", storeNodes, creatorOrScope, isTSLNode) : created;
   return { ...nodes, removeNodes, clearNodes, rebuildNodes };
 }
 function rebuildAllNodes(store, scope) {
@@ -983,13 +988,7 @@ function useBuffers(creatorOrScope, scope) {
       return buffer;
     }
   });
-  let buffers = created;
-  if (creatorOrScope === void 0) {
-    buffers = storeBuffers;
-  } else if (typeof creatorOrScope === "string") {
-    const scopeData = storeBuffers[creatorOrScope];
-    buffers = scopeData && !isBufferLike(scopeData) ? scopeData : {};
-  }
+  const buffers = isReader ? readWithStaged(store, "buffers", storeBuffers, creatorOrScope, isBufferLike) : created;
   return { ...buffers, removeBuffers, clearBuffers, rebuildBuffers, disposeBuffers };
 }
 function rebuildAllBuffers(store, scope) {
@@ -1053,13 +1052,7 @@ function useGPUStorage(creatorOrScope, scope) {
       return storage;
     }
   });
-  let gpuStorage = created;
-  if (creatorOrScope === void 0) {
-    gpuStorage = storeStorage;
-  } else if (typeof creatorOrScope === "string") {
-    const scopeData = storeStorage[creatorOrScope];
-    gpuStorage = scopeData && !isStorageLike(scopeData) ? scopeData : {};
-  }
+  const gpuStorage = isReader ? readWithStaged(store, "gpuStorage", storeStorage, creatorOrScope, isStorageLike) : created;
   return {
     ...gpuStorage,
     removeStorage,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-three/tsl",
-  "version": "10.0.0-canary.d202062",
+  "version": "10.0.0-canary.d46ab63",
   "description": "TSL resource hooks for react-three-fiber: uniforms, nodes, buffers, GPU storage and render pipelines on WebGPU",
   "keywords": [
     "react",
@@ -56,7 +56,7 @@
     "@types/three": "^0.185.0",
     "@webgpu/types": "^0.1.64",
     "three": ">=0.185.0",
-    "@react-three/fiber": "10.0.0-canary.d202062"
+    "@react-three/fiber": "10.0.0-canary.d46ab63"
   },
   "scripts": {
     "build": "unbuild",

package/readme.md

@@ -46,7 +46,7 @@ export const App = () => (
 | `useBuffers`, `useGPUStorage` | Buffers and storage textures for compute                                     |
 | `useRenderPipeline`           | Post-processing with three's `RenderPipeline` (scene pass, MRT, output node) |
 
-Resources belong to the renderer: a primary canvas, its secondary canvases (`renderer={{ primaryCanvas }}`) and every portal inside them share one set. They live on the primary canvas's `RootState` (`state.uniforms`, `state.nodes`, `state.buffers`, `state.gpuStorage`); secondaries hold the same objects and portals inherit them from their parent (a portal's scene and camera stay its own), so `state.uniforms` reads the same everywhere.
+Resources belong to the renderer: a `<Canvas primary>`, the canvases sharing its renderer (every other WebGPU canvas, or `share="id"`) and every portal inside them share one set. They live on the primary canvas's `RootState` (`state.uniforms`, `state.nodes`, `state.buffers`, `state.gpuStorage`); secondaries hold the same objects and portals inherit them from their parent (a portal's scene and camera stay its own), so `state.uniforms` reads the same everywhere.
 
 Works under any Canvas that runs the WebGPU renderer: `@react-three/fiber` with the `renderer` prop, or `@react-three/fiber/webgpu`. It reaches fiber only through the three-free `@react-three/fiber/extension` entry, so it adds no renderer and no second copy of fiber to your bundle.