@react-three/fiber 10.0.0-canary.4f316e6 → 10.0.0-canary.4f9f64c

package/dist/legacy.mjs

@@ -11,6 +11,7 @@ export { Scheduler, getScheduler } from '@pmndrs/scheduler';
 import Tb, { unstable_getCurrentPriorityLevel, unstable_IdlePriority, unstable_LowPriority, unstable_NormalPriority, unstable_UserBlockingPriority, unstable_ImmediatePriority, unstable_scheduleCallback } from 'scheduler';
 import { GroundedSkybox } from 'three/examples/jsm/objects/GroundedSkybox.js';
 import { HDRLoader } from 'three/examples/jsm/loaders/HDRLoader.js';
+import { HDRCubeTextureLoader } from 'three/examples/jsm/loaders/HDRCubeTextureLoader.js';
 import { EXRLoader } from 'three/examples/jsm/loaders/EXRLoader.js';
 import { UltraHDRLoader } from 'three/examples/jsm/loaders/UltraHDRLoader.js';
 import { GainMapLoader } from '@monogrid/gainmap-js';
@@ -33,11 +34,11 @@ const R3F_BUILD_WEBGPU = false;
 async function loadInspector() {
   throw new Error("Inspector is not available in legacy builds. Use @react-three/fiber/webgpu instead.");
 }
-const WebGPURenderer = class WebGPURenderer2 {
+class WebGPURenderer {
   constructor() {
     throw new Error("WebGPURenderer is not available in legacy builds. Use @react-three/fiber/webgpu instead.");
   }
-};
+}
 const RenderTarget = null;
 const CubeRenderTarget = null;
 
@@ -513,8 +514,10 @@ function hasVisibilityHandlers(handlers) {
 }
 
 const FROM_REF = Symbol.for("@react-three/fiber.fromRef");
-function fromRef(ref) {
-  return { [FROM_REF]: ref };
+function fromRef(ref, transform) {
+  const marker = { [FROM_REF]: ref };
+  if (transform) marker.transform = transform;
+  return marker;
 }
 function isFromRef(value) {
   return value !== null && typeof value === "object" && FROM_REF in value;
@@ -606,12 +609,7 @@ function diffProps(instance, newProps) {
   const changedProps = {};
   for (const prop in newProps) {
     if (RESERVED_PROPS.includes(prop)) continue;
-    if (is.equ(newProps[prop], instance.props[prop])) {
-      const value = newProps[prop];
-      if (!isCopyable(value)) continue;
-      const { target } = resolve(instance.object, prop);
-      if (!isCopyable(target) || target.constructor !== value.constructor) continue;
-    }
+    if (is.equ(newProps[prop], instance.props[prop])) continue;
     changedProps[prop] = newProps[prop];
     for (const other in newProps) {
       if (other.startsWith(`${prop}-`)) changedProps[other] = newProps[other];
@@ -620,11 +618,9 @@ function diffProps(instance, newProps) {
   for (const prop in instance.props) {
     if (RESERVED_PROPS.includes(prop) || newProps.hasOwnProperty(prop)) continue;
     const { root, key } = resolve(instance.object, prop);
-    if (root.constructor && root.constructor.length === 0) {
+    if (typeof root?.constructor === "function") {
       const ctor = getMemoizedPrototype(root);
       if (!is.und(ctor)) changedProps[prop] = ctor[key];
-    } else {
-      changedProps[prop] = 0;
     }
   }
   return changedProps;
@@ -1347,12 +1343,24 @@ function useTexture(input, optionsOrOnLoad) {
     TextureLoader,
     IsObject(stableInput) ? Object.values(stableInput) : stableInput
   );
+  const mappedTextures = useMemo(() => {
+    if (cachedResult) return cachedResult;
+    if (IsObject(stableInput)) {
+      const keyed = {};
+      const textureArray = loadedTextures;
+      let i = 0;
+      for (const key in stableInput) keyed[key] = textureArray[i++];
+      return keyed;
+    } else {
+      return loadedTextures;
+    }
+  }, [stableInput, loadedTextures, cachedResult]);
   useLayoutEffect(() => {
     if (cachedResult) return;
     if (onLoadCalledForRef.current === inputKey) return;
     onLoadCalledForRef.current = inputKey;
-    onLoadRef.current?.(loadedTextures);
-  }, [cachedResult, loadedTextures, inputKey]);
+    onLoadRef.current?.(mappedTextures);
+  }, [cachedResult, mappedTextures, inputKey]);
   useEffect(() => {
     if (cachedResult) return;
     if ("initTexture" in renderer) {
@@ -1371,18 +1379,6 @@ function useTexture(input, optionsOrOnLoad) {
       });
     }
   }, [renderer, loadedTextures, cachedResult]);
-  const mappedTextures = useMemo(() => {
-    if (cachedResult) return cachedResult;
-    if (IsObject(stableInput)) {
-      const keyed = {};
-      const textureArray = loadedTextures;
-      let i = 0;
-      for (const key in stableInput) keyed[key] = textureArray[i++];
-      return keyed;
-    } else {
-      return loadedTextures;
-    }
-  }, [stableInput, loadedTextures, cachedResult]);
   useEffect(() => {
     if (!cache) return;
     const urlTextureMap = [];
@@ -1584,7 +1580,7 @@ function useEnvironment({
     texture = texture.renderTarget?.texture;
   }
   texture.mapping = isCubemap ? CubeReflectionMapping : EquirectangularReflectionMapping;
-  texture.colorSpace = colorSpace ?? (isCubemap ? "srgb" : "srgb-linear");
+  texture.colorSpace = colorSpace ?? (isCubemap && extension !== "hdr-cube" ? "srgb" : "srgb-linear");
   return texture;
 }
 const preloadDefaultOptions = {
@@ -1637,11 +1633,12 @@ function getExtension(files) {
   const isCubemap = isArray(files) && files.length === 6;
   const isGainmap = isArray(files) && files.length === 3 && files.some((file) => file.endsWith("json"));
   const firstEntry = isArray(files) ? files[0] : files;
-  const extension = isCubemap ? "cube" : isGainmap ? "webp" : firstEntry.startsWith("data:application/exr") ? "exr" : firstEntry.startsWith("data:application/hdr") ? "hdr" : firstEntry.startsWith("data:image/jpeg") ? "jpg" : firstEntry.split(".").pop()?.split("?")?.shift()?.toLowerCase();
+  const firstExtension = firstEntry.split(".").pop()?.split("?")?.shift()?.toLowerCase();
+  const extension = isCubemap ? firstExtension === "hdr" ? "hdr-cube" : "cube" : isGainmap ? "webp" : firstEntry.startsWith("data:application/exr") ? "exr" : firstEntry.startsWith("data:application/hdr") ? "hdr" : firstEntry.startsWith("data:image/jpeg") ? "jpg" : firstExtension;
   return { extension, isCubemap, isGainmap };
 }
 function getLoader(extension) {
-  const loader = extension === "cube" ? CubeTextureLoader : extension === "hdr" ? HDRLoader : extension === "exr" ? EXRLoader : extension === "jpg" || extension === "jpeg" ? UltraHDRLoader : extension === "webp" ? GainMapLoader : null;
+  const loader = extension === "cube" ? CubeTextureLoader : extension === "hdr-cube" ? HDRCubeTextureLoader : extension === "hdr" ? HDRLoader : extension === "exr" ? EXRLoader : extension === "jpg" || extension === "jpeg" ? UltraHDRLoader : extension === "webp" ? GainMapLoader : null;
   return loader;
 }
 
@@ -1704,7 +1701,7 @@ function advance(timestamp, runGlobalEffects, state) {
   else scheduler.step(timestamp);
 }
 
-const version = "10.0.0-alpha.4";
+const version = "10.0.0-alpha.5";
 const packageData = {
 	version: version};
 
@@ -13563,7 +13560,10 @@ function extend(objects) {
     catalogue[Component] = objects;
     return Component;
   } else {
-    Object.assign(catalogue, objects);
+    for (const name in objects) {
+      const object = objects[name];
+      if (isConstructor(object)) catalogue[name] = object;
+    }
   }
 }
 function validateInstance(type, props) {
@@ -13911,7 +13911,7 @@ const reconciler = /* @__PURE__ */ createReconciler({
   getRootHostContext: () => NO_CONTEXT,
   getChildHostContext: () => NO_CONTEXT,
   commitUpdate(instance, type, oldProps, newProps, fiber) {
-    validateInstance(type, newProps);
+    validateInstance(instance.type, newProps);
     let reconstruct = false;
     if (instance.type === "primitive" && oldProps.object !== newProps.object) reconstruct = true;
     else if (newProps.args?.length !== oldProps.args?.length) reconstruct = true;
@@ -13938,8 +13938,8 @@ const reconciler = /* @__PURE__ */ createReconciler({
     for (const prop in instance.props) {
       const value = instance.props[prop];
       if (isFromRef(value)) {
-        const ref = value[FROM_REF];
-        if (ref.current != null) resolved[prop] = ref.current;
+        const { [FROM_REF]: ref, transform } = value;
+        if (ref.current != null) resolved[prop] = transform ? transform(ref.current) : ref.current;
       }
     }
     if (Object.keys(resolved).length) applyProps(instance.object, resolved);
@@ -14723,16 +14723,11 @@ function setEnvProps(background, scene, defaultScene, texture, sceneProps = {})
   const oldbg = target.background;
   const oldenv = target.environment;
   const oldSceneProps = {
-    // @ts-ignore
     backgroundBlurriness: target.backgroundBlurriness,
-    // @ts-ignore
     backgroundIntensity: target.backgroundIntensity,
-    // @ts-ignore
-    backgroundRotation: target.backgroundRotation?.clone?.() ?? [0, 0, 0],
-    // @ts-ignore
+    backgroundRotation: target.backgroundRotation.clone(),
     environmentIntensity: target.environmentIntensity,
-    // @ts-ignore
-    environmentRotation: target.environmentRotation?.clone?.() ?? [0, 0, 0]
+    environmentRotation: target.environmentRotation.clone()
   };
   if (background !== "only") target.environment = texture;
   if (background) target.background = texture;

package/dist/webgpu/index.cjs

@@ -10,6 +10,7 @@ const scheduler = require('@pmndrs/scheduler');
 const Tb = require('scheduler');
 const GroundedSkybox_js = require('three/examples/jsm/objects/GroundedSkybox.js');
 const HDRLoader_js = require('three/examples/jsm/loaders/HDRLoader.js');
+const HDRCubeTextureLoader_js = require('three/examples/jsm/loaders/HDRCubeTextureLoader.js');
 const EXRLoader_js = require('three/examples/jsm/loaders/EXRLoader.js');
 const UltraHDRLoader_js = require('three/examples/jsm/loaders/UltraHDRLoader.js');
 const gainmapJs = require('@monogrid/gainmap-js');
@@ -539,8 +540,10 @@ function hasVisibilityHandlers(handlers) {
 }
 
 const FROM_REF = Symbol.for("@react-three/fiber.fromRef");
-function fromRef(ref) {
-  return { [FROM_REF]: ref };
+function fromRef(ref, transform) {
+  const marker = { [FROM_REF]: ref };
+  if (transform) marker.transform = transform;
+  return marker;
 }
 function isFromRef(value) {
   return value !== null && typeof value === "object" && FROM_REF in value;
@@ -632,12 +635,7 @@ function diffProps(instance, newProps) {
   const changedProps = {};
   for (const prop in newProps) {
     if (RESERVED_PROPS.includes(prop)) continue;
-    if (is.equ(newProps[prop], instance.props[prop])) {
-      const value = newProps[prop];
-      if (!isCopyable(value)) continue;
-      const { target } = resolve(instance.object, prop);
-      if (!isCopyable(target) || target.constructor !== value.constructor) continue;
-    }
+    if (is.equ(newProps[prop], instance.props[prop])) continue;
     changedProps[prop] = newProps[prop];
     for (const other in newProps) {
       if (other.startsWith(`${prop}-`)) changedProps[other] = newProps[other];
@@ -646,11 +644,9 @@ function diffProps(instance, newProps) {
   for (const prop in instance.props) {
     if (RESERVED_PROPS.includes(prop) || newProps.hasOwnProperty(prop)) continue;
     const { root, key } = resolve(instance.object, prop);
-    if (root.constructor && root.constructor.length === 0) {
+    if (typeof root?.constructor === "function") {
       const ctor = getMemoizedPrototype(root);
       if (!is.und(ctor)) changedProps[prop] = ctor[key];
-    } else {
-      changedProps[prop] = 0;
     }
   }
   return changedProps;
@@ -1373,12 +1369,24 @@ function useTexture(input, optionsOrOnLoad) {
     webgpu.TextureLoader,
     IsObject(stableInput) ? Object.values(stableInput) : stableInput
   );
+  const mappedTextures = React.useMemo(() => {
+    if (cachedResult) return cachedResult;
+    if (IsObject(stableInput)) {
+      const keyed = {};
+      const textureArray = loadedTextures;
+      let i = 0;
+      for (const key in stableInput) keyed[key] = textureArray[i++];
+      return keyed;
+    } else {
+      return loadedTextures;
+    }
+  }, [stableInput, loadedTextures, cachedResult]);
   React.useLayoutEffect(() => {
     if (cachedResult) return;
     if (onLoadCalledForRef.current === inputKey) return;
     onLoadCalledForRef.current = inputKey;
-    onLoadRef.current?.(loadedTextures);
-  }, [cachedResult, loadedTextures, inputKey]);
+    onLoadRef.current?.(mappedTextures);
+  }, [cachedResult, mappedTextures, inputKey]);
   React.useEffect(() => {
     if (cachedResult) return;
     if ("initTexture" in renderer) {
@@ -1397,18 +1405,6 @@ function useTexture(input, optionsOrOnLoad) {
       });
     }
   }, [renderer, loadedTextures, cachedResult]);
-  const mappedTextures = React.useMemo(() => {
-    if (cachedResult) return cachedResult;
-    if (IsObject(stableInput)) {
-      const keyed = {};
-      const textureArray = loadedTextures;
-      let i = 0;
-      for (const key in stableInput) keyed[key] = textureArray[i++];
-      return keyed;
-    } else {
-      return loadedTextures;
-    }
-  }, [stableInput, loadedTextures, cachedResult]);
   React.useEffect(() => {
     if (!cache) return;
     const urlTextureMap = [];
@@ -1610,7 +1606,7 @@ function useEnvironment({
     texture = texture.renderTarget?.texture;
   }
   texture.mapping = isCubemap ? webgpu.CubeReflectionMapping : webgpu.EquirectangularReflectionMapping;
-  texture.colorSpace = colorSpace ?? (isCubemap ? "srgb" : "srgb-linear");
+  texture.colorSpace = colorSpace ?? (isCubemap && extension !== "hdr-cube" ? "srgb" : "srgb-linear");
   return texture;
 }
 const preloadDefaultOptions = {
@@ -1663,11 +1659,12 @@ function getExtension(files) {
   const isCubemap = isArray(files) && files.length === 6;
   const isGainmap = isArray(files) && files.length === 3 && files.some((file) => file.endsWith("json"));
   const firstEntry = isArray(files) ? files[0] : files;
-  const extension = isCubemap ? "cube" : isGainmap ? "webp" : firstEntry.startsWith("data:application/exr") ? "exr" : firstEntry.startsWith("data:application/hdr") ? "hdr" : firstEntry.startsWith("data:image/jpeg") ? "jpg" : firstEntry.split(".").pop()?.split("?")?.shift()?.toLowerCase();
+  const firstExtension = firstEntry.split(".").pop()?.split("?")?.shift()?.toLowerCase();
+  const extension = isCubemap ? firstExtension === "hdr" ? "hdr-cube" : "cube" : isGainmap ? "webp" : firstEntry.startsWith("data:application/exr") ? "exr" : firstEntry.startsWith("data:application/hdr") ? "hdr" : firstEntry.startsWith("data:image/jpeg") ? "jpg" : firstExtension;
   return { extension, isCubemap, isGainmap };
 }
 function getLoader(extension) {
-  const loader = extension === "cube" ? webgpu.CubeTextureLoader : extension === "hdr" ? HDRLoader_js.HDRLoader : extension === "exr" ? EXRLoader_js.EXRLoader : extension === "jpg" || extension === "jpeg" ? UltraHDRLoader_js.UltraHDRLoader : extension === "webp" ? gainmapJs.GainMapLoader : null;
+  const loader = extension === "cube" ? webgpu.CubeTextureLoader : extension === "hdr-cube" ? HDRCubeTextureLoader_js.HDRCubeTextureLoader : extension === "hdr" ? HDRLoader_js.HDRLoader : extension === "exr" ? EXRLoader_js.EXRLoader : extension === "jpg" || extension === "jpeg" ? UltraHDRLoader_js.UltraHDRLoader : extension === "webp" ? gainmapJs.GainMapLoader : null;
   return loader;
 }
 
@@ -1730,16 +1727,16 @@ function advance(timestamp, runGlobalEffects, state) {
   else scheduler$1.step(timestamp);
 }
 
-const version = "10.0.0-alpha.4";
+const version = "10.0.0-alpha.5";
 const packageData = {
 	version: version};
 
 function Xb(Tt) {
   return Tt && Tt.__esModule && Object.prototype.hasOwnProperty.call(Tt, "default") ? Tt.default : Tt;
 }
-var Rm = { exports: {} }, Og = { exports: {} }, _b;
+var Rm = { exports: {} }, Og = { exports: {} }, _b$1;
 function Kb() {
-  return _b || (_b = 1, (function(Tt) {
+  return _b$1 || (_b$1 = 1, (function(Tt) {
     Tt.exports = function(m) {
       function Yn(t, r, a, l) {
         return new uc(t, r, a, l);
@@ -13589,7 +13586,10 @@ function extend(objects) {
     catalogue[Component] = objects;
     return Component;
   } else {
-    Object.assign(catalogue, objects);
+    for (const name in objects) {
+      const object = objects[name];
+      if (isConstructor(object)) catalogue[name] = object;
+    }
   }
 }
 function validateInstance(type, props) {
@@ -13937,7 +13937,7 @@ const reconciler = /* @__PURE__ */ createReconciler({
   getRootHostContext: () => NO_CONTEXT,
   getChildHostContext: () => NO_CONTEXT,
   commitUpdate(instance, type, oldProps, newProps, fiber) {
-    validateInstance(type, newProps);
+    validateInstance(instance.type, newProps);
     let reconstruct = false;
     if (instance.type === "primitive" && oldProps.object !== newProps.object) reconstruct = true;
     else if (newProps.args?.length !== oldProps.args?.length) reconstruct = true;
@@ -13964,8 +13964,8 @@ const reconciler = /* @__PURE__ */ createReconciler({
     for (const prop in instance.props) {
       const value = instance.props[prop];
       if (isFromRef(value)) {
-        const ref = value[FROM_REF];
-        if (ref.current != null) resolved[prop] = ref.current;
+        const { [FROM_REF]: ref, transform } = value;
+        if (ref.current != null) resolved[prop] = transform ? transform(ref.current) : ref.current;
       }
     }
     if (Object.keys(resolved).length) applyProps(instance.object, resolved);
@@ -14777,16 +14777,11 @@ function setEnvProps(background, scene, defaultScene, texture, sceneProps = {})
   const oldbg = target.background;
   const oldenv = target.environment;
   const oldSceneProps = {
-    // @ts-ignore
     backgroundBlurriness: target.backgroundBlurriness,
-    // @ts-ignore
     backgroundIntensity: target.backgroundIntensity,
-    // @ts-ignore
-    backgroundRotation: target.backgroundRotation?.clone?.() ?? [0, 0, 0],
-    // @ts-ignore
+    backgroundRotation: target.backgroundRotation.clone(),
     environmentIntensity: target.environmentIntensity,
-    // @ts-ignore
-    environmentRotation: target.environmentRotation?.clone?.() ?? [0, 0, 0]
+    environmentRotation: target.environmentRotation.clone()
   };
   if (background !== "only") target.environment = texture;
   if (background) target.background = texture;
@@ -15380,20 +15375,36 @@ function CanvasImpl({
     }
   );
 }
-function Canvas(props) {
+function Canvas$1(props) {
   return /* @__PURE__ */ jsxRuntime.jsx(itsFine.FiberProvider, { children: /* @__PURE__ */ jsxRuntime.jsx(CanvasImpl, { ...props }) });
 }
 
+const isObjectLike = (value) => value !== null && (typeof value === "object" || typeof value === "function");
+const hasValidLegacyNodeMarkers = (value) => {
+  const hasUuid = "uuid" in value;
+  const hasNodeType = "nodeType" in value;
+  const uuid = Reflect.get(value, "uuid");
+  const nodeType = Reflect.get(value, "nodeType");
+  return (hasUuid || hasNodeType) && (!hasUuid || uuid === void 0 || typeof uuid === "string") && (!hasNodeType || nodeType === void 0 || nodeType === null || typeof nodeType === "string");
+};
+const isUniformNode = (value) => isObjectLike(value) && "isUniformNode" in value && value.isUniformNode === true;
+const isTSLNode = (value) => isObjectLike(value) && (Reflect.get(value, "isNode") === true || Reflect.get(value, "shaderNode") !== void 0 && typeof Reflect.get(value, "id") === "number" || hasValidLegacyNodeMarkers(value));
+const isBufferLike = (value) => ArrayBuffer.isView(value) && !(value instanceof DataView) || isObjectLike(value) && ("isBufferAttribute" in value || "isInterleavedBufferAttribute" in value || isTSLNode(value));
+const isStorageLike = (value) => isObjectLike(value) && ("isTexture" in value || "isData3DTexture" in value || isTSLNode(value));
+
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-var _a;
+var _a, _b;
 const INTERNAL_DATA = Symbol("ScopedStore.data");
-_a = INTERNAL_DATA;
+const INTERNAL_IS_LEAF = Symbol("ScopedStore.isLeaf");
+_b = INTERNAL_DATA, _a = INTERNAL_IS_LEAF;
 const _ScopedStore = class _ScopedStore {
-  constructor(data) {
+  constructor(data, isLeaf) {
+    __publicField(this, _b);
     __publicField(this, _a);
     this[INTERNAL_DATA] = data;
+    this[INTERNAL_IS_LEAF] = isLeaf;
     return new Proxy(this, {
       get(target, prop, receiver) {
         if (typeof prop === "string") {
@@ -15427,10 +15438,10 @@ const _ScopedStore = class _ScopedStore {
    * If the key doesn't exist or isn't a scope object, returns an empty ScopedStore.
    */
   scope(key) {
-    const data = this[INTERNAL_DATA][key];
-    return new _ScopedStore(
-      data && typeof data === "object" ? data : {}
-    );
+    const value = this[INTERNAL_DATA][key];
+    const isLeaf = this[INTERNAL_IS_LEAF];
+    const scope = value && typeof value === "object" && !isLeaf(value) ? value : {};
+    return new _ScopedStore(scope, isLeaf);
   }
   /**
    * Check if a key exists in the store.
@@ -15446,8 +15457,8 @@ const _ScopedStore = class _ScopedStore {
   }
 };
 let ScopedStore = _ScopedStore;
-function createScopedStore(data) {
-  return new ScopedStore(data);
+function createScopedStore(data, isLeaf) {
+  return new ScopedStore(data, isLeaf);
 }
 function createLazyCreatorState(state, store) {
   let _uniforms = null;
@@ -15458,22 +15469,22 @@ function createLazyCreatorState(state, store) {
   return Object.create(state, {
     uniforms: {
       get() {
-        return _uniforms ?? (_uniforms = createScopedStore(view("uniforms")));
+        return _uniforms ?? (_uniforms = createScopedStore(view("uniforms"), isUniformNode));
       }
     },
     nodes: {
       get() {
-        return _nodes ?? (_nodes = createScopedStore(view("nodes")));
+        return _nodes ?? (_nodes = createScopedStore(view("nodes"), isTSLNode));
       }
     },
     buffers: {
       get() {
-        return _buffers ?? (_buffers = createScopedStore(view("buffers")));
+        return _buffers ?? (_buffers = createScopedStore(view("buffers"), isBufferLike));
       }
     },
     gpuStorage: {
       get() {
-        return _gpuStorage ?? (_gpuStorage = createScopedStore(view("gpuStorage")));
+        return _gpuStorage ?? (_gpuStorage = createScopedStore(view("gpuStorage"), isStorageLike));
       }
     }
   });
@@ -15574,7 +15585,7 @@ function vectorize(inObject) {
     return extractTSLValue(inObject);
   }
   if (obj.isVector2 || obj.isVector3 || obj.isVector4) return inObject;
-  if (obj.isMatrix3 || obj.isMatrix4) return inObject;
+  if (obj.isMatrix2 || obj.isMatrix3 || obj.isMatrix4) return inObject;
   if (obj.isColor || obj.isEuler || obj.isQuaternion || obj.isSpherical) return inObject;
   if ("r" in obj && "g" in obj && "b" in obj && typeof obj.r === "number" && typeof obj.g === "number" && typeof obj.b === "number") {
     const scale = obj.r > 1 || obj.g > 1 || obj.b > 1 ? 1 / 255 : 1;
@@ -15632,22 +15643,21 @@ function useScopedResource(options) {
   return entries;
 }
 
-const isUniformNode$1 = (value) => value !== null && typeof value === "object" && "value" in value && "uuid" in value;
 function useUniforms(creatorOrScope, scope) {
   const store = usePrimaryStore();
   const removeUniforms2 = React.useCallback(
-    (names, targetScope) => removeResourceEntries(store, "uniforms", Array.isArray(names) ? names : [names], targetScope, isUniformNode$1),
+    (names, targetScope) => removeResourceEntries(store, "uniforms", Array.isArray(names) ? names : [names], targetScope, isUniformNode),
     [store]
   );
   const clearUniforms = React.useCallback(
-    (targetScope) => clearResourceEntries(store, "uniforms", targetScope, isUniformNode$1),
+    (targetScope) => clearResourceEntries(store, "uniforms", targetScope, isUniformNode),
     [store]
   );
   const rebuildUniforms = React.useCallback(
     (targetScope) => rebuildResource(store, "uniforms", targetScope),
     [store]
   );
-  const inputForMemoization = React.useMemo(() => {
+  const processedInput = React.useMemo(() => {
     let raw = creatorOrScope;
     if (is.fun(creatorOrScope)) {
       const wrappedState = createLazyCreatorState(store.getState(), store);
@@ -15658,23 +15668,24 @@ function useUniforms(creatorOrScope, scope) {
       for (const [key, value] of Object.entries(raw)) {
         normalized[key] = vectorize(value);
       }
-      return normalized;
+      return { candidates: raw, normalized };
     }
-    return raw;
+    return { candidates: raw, normalized: raw };
   }, [creatorOrScope, store]);
-  const memoizedInput = useCompareMemoize(inputForMemoization);
+  const memoizedInput = useCompareMemoize(processedInput.normalized);
   const isReader = memoizedInput === void 0 || typeof memoizedInput === "string";
   const storeUniforms = usePrimaryThree((s) => s.uniforms);
   const created = useScopedResource({
     store,
     kind: "uniforms",
     scope: isReader ? void 0 : scope,
-    isLeaf: isUniformNode$1,
+    isLeaf: isUniformNode,
     input: memoizedInput,
     create: () => {
       if (isReader) return {};
-      if (typeof memoizedInput !== "object" || memoizedInput === null) throw new Error("Invalid uniform input");
-      return memoizedInput;
+      if (typeof processedInput.candidates !== "object" || processedInput.candidates === null)
+        throw new Error("Invalid uniform input");
+      return processedInput.candidates;
     },
     prepare: (name, candidate) => createUniform(name, candidate, scope),
     reconcile: (existing, candidate) => {
@@ -15696,7 +15707,7 @@ function useUniforms(creatorOrScope, scope) {
     uniforms = storeUniforms;
   } else if (typeof memoizedInput === "string") {
     const scopeData = storeUniforms[memoizedInput];
-    uniforms = scopeData && !isUniformNode$1(scopeData) ? scopeData : {};
+    uniforms = scopeData && !isUniformNode(scopeData) ? scopeData : {};
   }
   return { ...uniforms, removeUniforms: removeUniforms2, clearUniforms, rebuildUniforms };
 }
@@ -15711,7 +15722,7 @@ function removeUniforms(set, names, scope) {
       return { uniforms: { ...state.uniforms, [scope]: currentScope } };
     }
     const uniforms = { ...state.uniforms };
-    for (const name of names) if (isUniformNode$1(uniforms[name])) delete uniforms[name];
+    for (const name of names) if (isUniformNode(uniforms[name])) delete uniforms[name];
     return { uniforms };
   });
 }
@@ -15725,7 +15736,7 @@ function clearRootUniforms(set) {
   set((state) => {
     const uniforms = {};
     for (const [key, value] of Object.entries(state.uniforms)) {
-      if (!isUniformNode$1(value)) uniforms[key] = value;
+      if (!isUniformNode(value)) uniforms[key] = value;
     }
     return { uniforms };
   });
@@ -15761,12 +15772,10 @@ function hasEqualsMethod(value) {
 function isSameThreeType(a, b) {
   const obj_a = a;
   const obj_b = b;
-  return obj_a.isColor && obj_b.isColor || obj_a.isMatrix3 && obj_b.isMatrix3 || obj_a.isMatrix4 && obj_b.isMatrix4 || obj_a.isEuler && obj_b.isEuler || obj_a.isQuaternion && obj_b.isQuaternion;
+  return obj_a.isColor && obj_b.isColor || obj_a.isMatrix2 && obj_b.isMatrix2 || obj_a.isMatrix3 && obj_b.isMatrix3 || obj_a.isMatrix4 && obj_b.isMatrix4 || obj_a.isEuler && obj_b.isEuler || obj_a.isQuaternion && obj_b.isQuaternion;
 }
 
 const uniformOf = tsl.uniform;
-const isUniformNode = (value) => value !== null && typeof value === "object" && "value" in value && "uuid" in value;
-const isTSLNode$1 = (value) => value !== null && typeof value === "object" && "uuid" in value && "nodeType" in value;
 function useUniform(name, value) {
   const store = useStore();
   const registered = useScopedResource({
@@ -15778,7 +15787,7 @@ function useUniform(name, value) {
     create: () => value === void 0 ? {} : { [name]: value },
     prepare: createNamedUniform,
     reconcile: (existing2) => {
-      if (value !== void 0 && !isTSLNode$1(value) && !isUniformNode(value)) {
+      if (value !== void 0 && !isTSLNode(value) && !isUniformNode(value)) {
         existing2.value = typeof value === "string" ? new webgpu.Color(value) : value;
       }
     }
@@ -15794,7 +15803,7 @@ function createNamedUniform(name, value) {
   let node;
   if (isUniformNode(value)) {
     node = value;
-  } else if (isTSLNode$1(value)) {
+  } else if (isTSLNode(value)) {
     node = uniformOf(value);
   } else if (typeof value === "string") {
     node = tsl.uniform(new webgpu.Color(value));
@@ -15807,7 +15816,6 @@ function createNamedUniform(name, value) {
   return node;
 }
 
-const isTSLNode = (value) => value !== null && typeof value === "object" && ("uuid" in value || "nodeType" in value);
 function useNodes(creatorOrScope, scope) {
   const store = usePrimaryStore();
   const removeNodes2 = React.useCallback(
@@ -15834,7 +15842,8 @@ function useNodes(creatorOrScope, scope) {
       return creatorOrScope(createLazyCreatorState(store.getState(), store));
     },
     prepare: (name, node) => {
-      node.setName?.(scopedNodeName(scope, name));
+      const setName = Reflect.get(node, "setName");
+      if (typeof setName === "function") setName.call(node, scopedNodeName(scope, name));
       return node;
     }
   });
@@ -15889,13 +15898,6 @@ function useLocalNodes(creator) {
   }, [store, creator, uniforms, nodes, textures, hmrVersion]);
 }
 
-const isBufferLike = (value) => {
-  if (value === null || typeof value !== "object") return false;
-  if (ArrayBuffer.isView(value)) return true;
-  if ("isBufferAttribute" in value) return true;
-  if ("uuid" in value || "nodeType" in value) return true;
-  return false;
-};
 const disposeBuffer = (buffer) => {
   if (buffer === null || typeof buffer !== "object") return;
   if ("dispose" in buffer && typeof buffer.dispose === "function") {
@@ -15942,9 +15944,8 @@ function useBuffers(creatorOrScope, scope) {
       return creatorOrScope(createLazyCreatorState(store.getState(), store));
     },
     prepare: (name, buffer) => {
-      if ("setName" in buffer && typeof buffer.setName === "function") {
-        buffer.setName(scopedNodeName(scope, name));
-      }
+      const setName = Reflect.get(buffer, "setName");
+      if (typeof setName === "function") setName.call(buffer, scopedNodeName(scope, name));
       return buffer;
     }
   });
@@ -15961,13 +15962,6 @@ function rebuildAllBuffers(store, scope) {
   rebuildResource(store, "buffers", scope);
 }
 
-const isStorageLike = (value) => {
-  if (value === null || typeof value !== "object") return false;
-  if ("isTexture" in value) return true;
-  if ("isData3DTexture" in value) return true;
-  if ("uuid" in value || "nodeType" in value) return true;
-  return false;
-};
 const disposeStorage = (storage) => {
   if (storage === null || typeof storage !== "object") return;
   if ("dispose" in storage && typeof storage.dispose === "function") {
@@ -16015,9 +16009,8 @@ function useGPUStorage(creatorOrScope, scope) {
     },
     prepare: (name, storage) => {
       const label = scopedNodeName(scope, name);
-      if ("setName" in storage && typeof storage.setName === "function") {
-        storage.setName(label);
-      }
+      const setName = Reflect.get(storage, "setName");
+      if (typeof setName === "function") setName.call(storage, label);
       if ("name" in storage && typeof storage.name === "string") {
         storage.name = label;
       }
@@ -16159,6 +16152,7 @@ function useRenderPipeline(mainCB, setupCB) {
 extend(THREE);
 const useThree = useThree$1;
 const useFrame = useFrame$1;
+const Canvas = Canvas$1;
 
 exports.Scheduler = scheduler.Scheduler;
 exports.getScheduler = scheduler.getScheduler;