@react-three/fiber 10.0.0-canary.1b98c17 → 10.0.0-canary.2c50459

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/legacy.mjs CHANGED
@@ -13,6 +13,8 @@ import { UltraHDRLoader } from 'three/examples/jsm/loaders/UltraHDRLoader.js';
13
13
  import { GainMapLoader } from '@monogrid/gainmap-js';
14
14
  import Tb, { unstable_scheduleCallback, unstable_IdlePriority } from 'scheduler';
15
15
  import { createWithEqualityFn } from 'zustand/traditional';
16
+ import { getScheduler } from '@pmndrs/scheduler';
17
+ export { Scheduler, getScheduler } from '@pmndrs/scheduler';
16
18
  import { suspend, preload, clear } from 'suspend-react';
17
19
 
18
20
  function _mergeNamespaces(n, m) {
@@ -434,9 +436,9 @@ function Environment(props) {
434
436
  return props.ground ? /* @__PURE__ */ jsx(EnvironmentGround, { ...props }) : props.map ? /* @__PURE__ */ jsx(EnvironmentMap, { ...props }) : props.children ? /* @__PURE__ */ jsx(EnvironmentPortal, { ...props }) : /* @__PURE__ */ jsx(EnvironmentCube, { ...props });
435
437
  }
436
438
 
437
- var __defProp$2 = Object.defineProperty;
438
- var __defNormalProp$2 = (obj, key, value) => key in obj ? __defProp$2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
439
- var __publicField$2 = (obj, key, value) => __defNormalProp$2(obj, typeof key !== "symbol" ? key + "" : key, value);
439
+ var __defProp = Object.defineProperty;
440
+ var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
441
+ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
440
442
  const act = React["act"];
441
443
  const useIsomorphicLayoutEffect = /* @__PURE__ */ (() => typeof window !== "undefined" && (window.document?.createElement || window.navigator?.product === "ReactNative"))() ? React.useLayoutEffect : React.useEffect;
442
444
  function useMutableCallback(fn) {
@@ -468,7 +470,7 @@ const ErrorBoundary = /* @__PURE__ */ (() => {
468
470
  return _a = class extends React.Component {
469
471
  constructor() {
470
472
  super(...arguments);
471
- __publicField$2(this, "state", { error: false });
473
+ __publicField(this, "state", { error: false });
472
474
  }
473
475
  componentDidCatch(err) {
474
476
  this.props.set(err);
@@ -476,7 +478,7 @@ const ErrorBoundary = /* @__PURE__ */ (() => {
476
478
  render() {
477
479
  return this.state.error ? null : this.props.children;
478
480
  }
479
- }, __publicField$2(_a, "getDerivedStateFromError", () => ({ error: true })), _a;
481
+ }, __publicField(_a, "getDerivedStateFromError", () => ({ error: true })), _a;
480
482
  })();
481
483
 
482
484
  const is = {
@@ -1636,1038 +1638,6 @@ function notifyAlpha({ message, link }) {
1636
1638
  }
1637
1639
  }
1638
1640
 
1639
- var __defProp$1 = Object.defineProperty;
1640
- var __defNormalProp$1 = (obj, key, value) => key in obj ? __defProp$1(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
1641
- var __publicField$1 = (obj, key, value) => __defNormalProp$1(obj, typeof key !== "symbol" ? key + "" : key, value);
1642
- const DEFAULT_PHASES = ["start", "input", "physics", "update", "render", "finish"];
1643
- class PhaseGraph {
1644
- constructor() {
1645
- /** Ordered list of phase nodes */
1646
- __publicField$1(this, "phases", []);
1647
- /** Quick lookup by name */
1648
- __publicField$1(this, "phaseMap", /* @__PURE__ */ new Map());
1649
- /** Cached ordered names (invalidated on changes) */
1650
- __publicField$1(this, "orderedNamesCache", null);
1651
- this.initializeDefaultPhases();
1652
- }
1653
- //* Initialization --------------------------------
1654
- initializeDefaultPhases() {
1655
- for (const name of DEFAULT_PHASES) {
1656
- const node = { name, isAutoGenerated: false };
1657
- this.phases.push(node);
1658
- this.phaseMap.set(name, node);
1659
- }
1660
- this.invalidateCache();
1661
- }
1662
- //* Public API --------------------------------
1663
- /**
1664
- * Add a named phase to the graph
1665
- * @param name - Phase name (must be unique)
1666
- * @param options - Position options (before or after another phase)
1667
- */
1668
- addPhase(name, options = {}) {
1669
- if (this.phaseMap.has(name)) {
1670
- console.warn(`[useFrame] Phase "${name}" already exists`);
1671
- return;
1672
- }
1673
- const { before, after } = options;
1674
- const node = { name, isAutoGenerated: false };
1675
- let insertIndex = this.phases.length;
1676
- const targetIndex = this.getPhaseIndex(before ?? after);
1677
- if (targetIndex !== -1) {
1678
- insertIndex = before ? targetIndex : targetIndex + 1;
1679
- } else {
1680
- const constraintType = before ? "before" : "after";
1681
- console.warn(`[useFrame] Phase "${before ?? after}" not found for '${constraintType}' constraint`);
1682
- }
1683
- this.phases.splice(insertIndex, 0, node);
1684
- this.phaseMap.set(name, node);
1685
- this.invalidateCache();
1686
- }
1687
- /**
1688
- * Get ordered list of phase names
1689
- */
1690
- getOrderedPhases() {
1691
- if (this.orderedNamesCache === null) this.orderedNamesCache = this.phases.map((p) => p.name);
1692
- return this.orderedNamesCache;
1693
- }
1694
- /**
1695
- * Check if a phase exists
1696
- */
1697
- hasPhase(name) {
1698
- return this.phaseMap.has(name);
1699
- }
1700
- /**
1701
- * Get the index of a phase (-1 if not found)
1702
- */
1703
- getPhaseIndex(name) {
1704
- if (!name) return -1;
1705
- return this.phases.findIndex((p) => p.name === name);
1706
- }
1707
- /**
1708
- * Ensure a phase exists, creating an auto-generated one if needed.
1709
- * Used for resolving before/after constraints.
1710
- *
1711
- * @param name - The phase name to ensure exists
1712
- * @returns The phase name (may be auto-generated like 'before:render')
1713
- */
1714
- ensurePhase(name) {
1715
- if (this.phaseMap.has(name)) return name;
1716
- const node = { name, isAutoGenerated: true };
1717
- this.phases.push(node);
1718
- this.phaseMap.set(name, node);
1719
- this.invalidateCache();
1720
- return name;
1721
- }
1722
- /**
1723
- * Resolve where a job with before/after constraints should go.
1724
- * Creates auto-generated phases if needed.
1725
- *
1726
- * @param before - Phase(s) to run before
1727
- * @param after - Phase(s) to run after
1728
- * @returns The resolved phase name
1729
- */
1730
- resolveConstraintPhase(before, after) {
1731
- const beforeArr = before ? Array.isArray(before) ? before : [before] : [];
1732
- const afterArr = after ? Array.isArray(after) ? after : [after] : [];
1733
- if (beforeArr.length > 0) {
1734
- return this.ensureAutoPhase(beforeArr[0], "before", 0);
1735
- }
1736
- if (afterArr.length > 0) {
1737
- return this.ensureAutoPhase(afterArr[0], "after", 1);
1738
- }
1739
- return "update";
1740
- }
1741
- /**
1742
- * Ensure an auto-generated phase exists relative to a target phase.
1743
- * Creates the phase if it doesn't exist, inserting it at the correct position.
1744
- *
1745
- * @param target - The target phase name to position relative to
1746
- * @param prefix - Prefix for auto-generated phase name ('before' or 'after')
1747
- * @param offset - Insertion offset (0 for before, 1 for after)
1748
- * @returns The auto-generated phase name
1749
- */
1750
- ensureAutoPhase(target, prefix, offset) {
1751
- const autoName = `${prefix}:${target}`;
1752
- if (this.phaseMap.has(autoName)) return autoName;
1753
- const node = { name: autoName, isAutoGenerated: true };
1754
- const targetIndex = this.getPhaseIndex(target);
1755
- if (targetIndex !== -1) this.phases.splice(targetIndex + offset, 0, node);
1756
- else this.phases.push(node);
1757
- this.phaseMap.set(autoName, node);
1758
- this.invalidateCache();
1759
- return autoName;
1760
- }
1761
- // Internal --------------------------------
1762
- invalidateCache() {
1763
- this.orderedNamesCache = null;
1764
- }
1765
- }
1766
-
1767
- function rebuildSortedJobs(jobs, phaseGraph) {
1768
- const orderedPhases = phaseGraph.getOrderedPhases();
1769
- const buckets = /* @__PURE__ */ new Map();
1770
- for (const phase of orderedPhases) {
1771
- buckets.set(phase, []);
1772
- }
1773
- for (const job of jobs.values()) {
1774
- if (!job.enabled) continue;
1775
- let bucket = buckets.get(job.phase);
1776
- if (!bucket) {
1777
- bucket = [];
1778
- buckets.set(job.phase, bucket);
1779
- }
1780
- bucket.push(job);
1781
- }
1782
- const sortedBuckets = [];
1783
- for (const phase of orderedPhases) {
1784
- const bucket = buckets.get(phase);
1785
- if (!bucket || bucket.length === 0) continue;
1786
- bucket.sort((a, b) => {
1787
- if (a.priority !== b.priority) return b.priority - a.priority;
1788
- return a.index - b.index;
1789
- });
1790
- sortedBuckets.push(hasCrossJobConstraints(bucket) ? topologicalSort(bucket) : bucket);
1791
- }
1792
- for (const [phase, bucket] of buckets) {
1793
- if (!orderedPhases.includes(phase) && bucket.length > 0) {
1794
- bucket.sort((a, b) => {
1795
- if (a.priority !== b.priority) return b.priority - a.priority;
1796
- return a.index - b.index;
1797
- });
1798
- sortedBuckets.push(bucket);
1799
- }
1800
- }
1801
- return sortedBuckets.flat();
1802
- }
1803
- function hasCrossJobConstraints(bucket) {
1804
- const jobIds = new Set(bucket.map((j) => j.id));
1805
- for (const job of bucket) {
1806
- for (const ref of job.before) {
1807
- if (jobIds.has(ref)) return true;
1808
- }
1809
- for (const ref of job.after) {
1810
- if (jobIds.has(ref)) return true;
1811
- }
1812
- }
1813
- return false;
1814
- }
1815
- function topologicalSort(jobs) {
1816
- const n = jobs.length;
1817
- if (n <= 1) return jobs;
1818
- const jobMap = /* @__PURE__ */ new Map();
1819
- const inDegree = /* @__PURE__ */ new Map();
1820
- const adjacency = /* @__PURE__ */ new Map();
1821
- for (const job of jobs) {
1822
- jobMap.set(job.id, job);
1823
- inDegree.set(job.id, 0);
1824
- adjacency.set(job.id, []);
1825
- }
1826
- for (const job of jobs) {
1827
- for (const ref of job.before) {
1828
- if (jobMap.has(ref)) {
1829
- adjacency.get(job.id).push(ref);
1830
- inDegree.set(ref, inDegree.get(ref) + 1);
1831
- }
1832
- }
1833
- for (const ref of job.after) {
1834
- if (jobMap.has(ref)) {
1835
- adjacency.get(ref).push(job.id);
1836
- inDegree.set(job.id, inDegree.get(job.id) + 1);
1837
- }
1838
- }
1839
- }
1840
- const queue = [];
1841
- for (const job of jobs) {
1842
- if (inDegree.get(job.id) === 0) {
1843
- queue.push(job);
1844
- }
1845
- }
1846
- queue.sort((a, b) => {
1847
- if (a.priority !== b.priority) return b.priority - a.priority;
1848
- return a.index - b.index;
1849
- });
1850
- const result = [];
1851
- while (queue.length > 0) {
1852
- const job = queue.shift();
1853
- result.push(job);
1854
- const neighbors = adjacency.get(job.id) || [];
1855
- for (const neighborId of neighbors) {
1856
- const newDegree = inDegree.get(neighborId) - 1;
1857
- inDegree.set(neighborId, newDegree);
1858
- if (newDegree === 0) {
1859
- const neighbor = jobMap.get(neighborId);
1860
- insertSorted(queue, neighbor);
1861
- }
1862
- }
1863
- }
1864
- if (result.length !== n) {
1865
- console.warn("[useFrame] Circular dependency detected in job constraints");
1866
- const resultIds = new Set(result.map((j) => j.id));
1867
- for (const job of jobs) {
1868
- if (!resultIds.has(job.id)) result.push(job);
1869
- }
1870
- }
1871
- return result;
1872
- }
1873
- function insertSorted(arr, job) {
1874
- let i = 0;
1875
- while (i < arr.length) {
1876
- const cmp = arr[i];
1877
- if (job.priority > cmp.priority || job.priority === cmp.priority && job.index < cmp.index) {
1878
- break;
1879
- }
1880
- i++;
1881
- }
1882
- arr.splice(i, 0, job);
1883
- }
1884
-
1885
- function shouldRun(job, now) {
1886
- if (!job.enabled) return false;
1887
- if (!job.fps) return true;
1888
- const minInterval = 1e3 / job.fps;
1889
- const lastRun = job.lastRun ?? 0;
1890
- const elapsed = now - lastRun;
1891
- if (elapsed < minInterval - 1) return false;
1892
- if (job.drop) {
1893
- job.lastRun = now;
1894
- } else {
1895
- const steps = Math.floor(elapsed / minInterval);
1896
- job.lastRun = lastRun + steps * minInterval;
1897
- if (job.lastRun < now - minInterval) {
1898
- job.lastRun = now;
1899
- }
1900
- }
1901
- return true;
1902
- }
1903
- function resetJobTiming(job) {
1904
- job.lastRun = void 0;
1905
- }
1906
-
1907
- var __defProp = Object.defineProperty;
1908
- var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
1909
- var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
1910
- const hmrData = (() => {
1911
- if (typeof process !== "undefined" && process.env.NODE_ENV === "test") return void 0;
1912
- if (typeof import_meta_hot !== "undefined") return import_meta_hot;
1913
- try {
1914
- return (0, eval)("import.meta.hot");
1915
- } catch {
1916
- return void 0;
1917
- }
1918
- })();
1919
- const _Scheduler = class _Scheduler {
1920
- //* Constructor ================================
1921
- constructor() {
1922
- //* Critical State ================================
1923
- __publicField(this, "roots", /* @__PURE__ */ new Map());
1924
- __publicField(this, "phaseGraph");
1925
- __publicField(this, "loopState", {
1926
- running: false,
1927
- rafHandle: null,
1928
- lastTime: null,
1929
- // null = uninitialized, 0+ = valid timestamp
1930
- frameCount: 0,
1931
- elapsedTime: 0,
1932
- createdAt: performance.now()
1933
- });
1934
- __publicField(this, "stoppedTime", 0);
1935
- //* Private State ================================
1936
- __publicField(this, "nextRootIndex", 0);
1937
- __publicField(this, "globalBeforeJobs", /* @__PURE__ */ new Map());
1938
- __publicField(this, "globalAfterJobs", /* @__PURE__ */ new Map());
1939
- __publicField(this, "nextGlobalIndex", 0);
1940
- __publicField(this, "idleCallbacks", /* @__PURE__ */ new Set());
1941
- __publicField(this, "nextJobIndex", 0);
1942
- __publicField(this, "jobStateListeners", /* @__PURE__ */ new Map());
1943
- __publicField(this, "pendingFrames", 0);
1944
- __publicField(this, "_frameloop", "always");
1945
- //* Independent Mode & Error Handling State ================================
1946
- __publicField(this, "_independent", false);
1947
- __publicField(this, "errorHandler", null);
1948
- __publicField(this, "rootReadyCallbacks", /* @__PURE__ */ new Set());
1949
- //* Core Loop Execution Methods ================================
1950
- /**
1951
- * Main RAF loop callback.
1952
- * Executes frame, handles demand mode, and schedules next frame.
1953
- * @param {number} timestamp - RAF timestamp in milliseconds
1954
- * @returns {void}
1955
- * @private
1956
- */
1957
- __publicField(this, "loop", (timestamp) => {
1958
- if (!this.loopState.running) return;
1959
- this.executeFrame(timestamp);
1960
- if (this._frameloop === "demand") {
1961
- this.pendingFrames = Math.max(0, this.pendingFrames - 1);
1962
- if (this.pendingFrames === 0) {
1963
- this.notifyIdle(timestamp);
1964
- return this.stop();
1965
- }
1966
- }
1967
- this.loopState.rafHandle = requestAnimationFrame(this.loop);
1968
- });
1969
- this.phaseGraph = new PhaseGraph();
1970
- }
1971
- static get instance() {
1972
- return globalThis[_Scheduler.INSTANCE_KEY] ?? null;
1973
- }
1974
- static set instance(value) {
1975
- globalThis[_Scheduler.INSTANCE_KEY] = value;
1976
- }
1977
- /**
1978
- * Get the global scheduler instance (creates if doesn't exist).
1979
- * Uses HMR data to preserve instance across hot reloads.
1980
- * @returns {Scheduler} The singleton scheduler instance
1981
- */
1982
- static get() {
1983
- if (!_Scheduler.instance && hmrData?.data?.scheduler) {
1984
- _Scheduler.instance = hmrData.data.scheduler;
1985
- }
1986
- if (!_Scheduler.instance) {
1987
- _Scheduler.instance = new _Scheduler();
1988
- if (hmrData?.data) {
1989
- hmrData.data.scheduler = _Scheduler.instance;
1990
- }
1991
- }
1992
- return _Scheduler.instance;
1993
- }
1994
- /**
1995
- * Reset the singleton instance. Stops the loop and clears all state.
1996
- * Primarily used for testing to ensure clean state between tests.
1997
- * @returns {void}
1998
- */
1999
- static reset() {
2000
- if (_Scheduler.instance) {
2001
- _Scheduler.instance.stop();
2002
- _Scheduler.instance = null;
2003
- }
2004
- if (hmrData?.data) {
2005
- hmrData.data.scheduler = null;
2006
- }
2007
- }
2008
- //* Getters & Setters ================================
2009
- get phases() {
2010
- return this.phaseGraph.getOrderedPhases();
2011
- }
2012
- get frameloop() {
2013
- return this._frameloop;
2014
- }
2015
- set frameloop(mode) {
2016
- if (this._frameloop === mode) return;
2017
- const wasAlways = this._frameloop === "always";
2018
- this._frameloop = mode;
2019
- if (mode === "always" && !this.loopState.running && this.roots.size > 0) this.start();
2020
- else if (mode !== "always" && wasAlways) this.stop();
2021
- }
2022
- get isRunning() {
2023
- return this.loopState.running;
2024
- }
2025
- get isReady() {
2026
- return this.roots.size > 0;
2027
- }
2028
- get independent() {
2029
- return this._independent;
2030
- }
2031
- set independent(value) {
2032
- this._independent = value;
2033
- if (value) this.ensureDefaultRoot();
2034
- }
2035
- //* Root Management Methods ================================
2036
- /**
2037
- * Register a root (Canvas) with the scheduler.
2038
- * The first root to register starts the RAF loop (if frameloop='always').
2039
- * @param {string} id - Unique identifier for this root
2040
- * @param {RootOptions} [options] - Optional configuration with getState and onError callbacks
2041
- * @returns {() => void} Unsubscribe function to remove this root
2042
- */
2043
- registerRoot(id, options = {}) {
2044
- if (this.roots.has(id)) {
2045
- console.warn(`[Scheduler] Root "${id}" already registered`);
2046
- return () => this.unregisterRoot(id);
2047
- }
2048
- const entry = {
2049
- id,
2050
- getState: options.getState ?? (() => ({})),
2051
- jobs: /* @__PURE__ */ new Map(),
2052
- sortedJobs: [],
2053
- needsRebuild: false
2054
- };
2055
- if (options.onError) {
2056
- this.errorHandler = options.onError;
2057
- }
2058
- this.roots.set(id, entry);
2059
- if (this.roots.size === 1) {
2060
- this.notifyRootReady();
2061
- if (this._frameloop === "always") this.start();
2062
- }
2063
- return () => this.unregisterRoot(id);
2064
- }
2065
- /**
2066
- * Unregister a root from the scheduler.
2067
- * Cleans up all job state listeners for this root's jobs.
2068
- * The last root to unregister stops the RAF loop.
2069
- * @param {string} id - The root ID to unregister
2070
- * @returns {void}
2071
- */
2072
- unregisterRoot(id) {
2073
- const root = this.roots.get(id);
2074
- if (!root) return;
2075
- for (const jobId of root.jobs.keys()) {
2076
- this.jobStateListeners.delete(jobId);
2077
- }
2078
- this.roots.delete(id);
2079
- if (this.roots.size === 0) {
2080
- this.stop();
2081
- this.errorHandler = null;
2082
- }
2083
- }
2084
- /**
2085
- * Subscribe to be notified when a root becomes available.
2086
- * Fires immediately if a root already exists.
2087
- * @param {() => void} callback - Function called when first root registers
2088
- * @returns {() => void} Unsubscribe function
2089
- */
2090
- onRootReady(callback) {
2091
- if (this.roots.size > 0) {
2092
- callback();
2093
- return () => {
2094
- };
2095
- }
2096
- this.rootReadyCallbacks.add(callback);
2097
- return () => this.rootReadyCallbacks.delete(callback);
2098
- }
2099
- /**
2100
- * Notify all registered root-ready callbacks.
2101
- * Called when the first root registers.
2102
- * @returns {void}
2103
- * @private
2104
- */
2105
- notifyRootReady() {
2106
- for (const cb of this.rootReadyCallbacks) {
2107
- try {
2108
- cb();
2109
- } catch (error) {
2110
- console.error("[Scheduler] Error in root-ready callback:", error);
2111
- }
2112
- }
2113
- this.rootReadyCallbacks.clear();
2114
- }
2115
- /**
2116
- * Ensure a default root exists for independent mode.
2117
- * Creates a minimal root with no state provider.
2118
- * @returns {void}
2119
- * @private
2120
- */
2121
- ensureDefaultRoot() {
2122
- if (!this.roots.has("__default__")) {
2123
- this.registerRoot("__default__");
2124
- }
2125
- }
2126
- /**
2127
- * Trigger error handling for job errors.
2128
- * Uses the bound error handler if available, otherwise logs to console.
2129
- * @param {Error} error - The error to handle
2130
- * @returns {void}
2131
- */
2132
- triggerError(error) {
2133
- if (this.errorHandler) this.errorHandler(error);
2134
- else console.error("[Scheduler]", error);
2135
- }
2136
- //* Phase Management Methods ================================
2137
- /**
2138
- * Add a named phase to the scheduler's execution order.
2139
- * Marks all roots for rebuild to incorporate the new phase.
2140
- * @param {string} name - The phase name (e.g., 'physics', 'postprocess')
2141
- * @param {AddPhaseOptions} [options] - Positioning options (before/after other phases)
2142
- * @returns {void}
2143
- * @example
2144
- * scheduler.addPhase('physics', { before: 'update' });
2145
- * scheduler.addPhase('postprocess', { after: 'render' });
2146
- */
2147
- addPhase(name, options) {
2148
- this.phaseGraph.addPhase(name, options);
2149
- for (const root of this.roots.values()) {
2150
- root.needsRebuild = true;
2151
- }
2152
- }
2153
- /**
2154
- * Check if a phase exists in the scheduler.
2155
- * @param {string} name - The phase name to check
2156
- * @returns {boolean} True if the phase exists
2157
- */
2158
- hasPhase(name) {
2159
- return this.phaseGraph.hasPhase(name);
2160
- }
2161
- //* Global Job Registration Methods (Deprecated APIs) ================================
2162
- /**
2163
- * Register a global job that runs once per frame (not per-root).
2164
- * Used internally by deprecated addEffect/addAfterEffect APIs.
2165
- * @param {'before' | 'after'} phase - When to run: 'before' all roots or 'after' all roots
2166
- * @param {string} id - Unique identifier for this global job
2167
- * @param {(timestamp: number) => void} callback - Function called each frame with RAF timestamp
2168
- * @returns {() => void} Unsubscribe function to remove this global job
2169
- * @deprecated Use useFrame with phases instead
2170
- */
2171
- registerGlobal(phase, id, callback) {
2172
- const job = { id, callback };
2173
- if (phase === "before") {
2174
- this.globalBeforeJobs.set(id, job);
2175
- } else {
2176
- this.globalAfterJobs.set(id, job);
2177
- }
2178
- return () => {
2179
- if (phase === "before") this.globalBeforeJobs.delete(id);
2180
- else this.globalAfterJobs.delete(id);
2181
- };
2182
- }
2183
- //* Idle Callback Methods (Deprecated API) ================================
2184
- /**
2185
- * Register an idle callback that fires when the loop stops.
2186
- * Used internally by deprecated addTail API.
2187
- * @param {(timestamp: number) => void} callback - Function called when loop becomes idle
2188
- * @returns {() => void} Unsubscribe function to remove this idle callback
2189
- * @deprecated Use demand mode with invalidate() instead
2190
- */
2191
- onIdle(callback) {
2192
- this.idleCallbacks.add(callback);
2193
- return () => this.idleCallbacks.delete(callback);
2194
- }
2195
- /**
2196
- * Notify all registered idle callbacks.
2197
- * Called when the loop stops in demand mode.
2198
- * @param {number} timestamp - The RAF timestamp when idle occurred
2199
- * @returns {void}
2200
- * @private
2201
- */
2202
- notifyIdle(timestamp) {
2203
- for (const cb of this.idleCallbacks) {
2204
- try {
2205
- cb(timestamp);
2206
- } catch (error) {
2207
- console.error("[Scheduler] Error in idle callback:", error);
2208
- }
2209
- }
2210
- }
2211
- //* Job Registration & Management Methods ================================
2212
- /**
2213
- * Register a job (frame callback) with a specific root.
2214
- * This is the core registration method used by useFrame internally.
2215
- * @param {FrameNextCallback} callback - The function to call each frame
2216
- * @param {JobOptions & { rootId?: string; system?: boolean }} [options] - Job configuration
2217
- * @param {string} [options.rootId] - Target root ID (defaults to first registered root)
2218
- * @param {string} [options.id] - Unique job ID (auto-generated if not provided)
2219
- * @param {string} [options.phase] - Execution phase (defaults to 'update')
2220
- * @param {number} [options.priority] - Priority within phase (higher = earlier, default 0)
2221
- * @param {number} [options.fps] - FPS throttle limit
2222
- * @param {boolean} [options.drop] - Drop frames when behind (default true)
2223
- * @param {boolean} [options.enabled] - Whether job is active (default true)
2224
- * @param {boolean} [options.system] - Internal flag for system jobs (not user-facing)
2225
- * @returns {() => void} Unsubscribe function to remove this job
2226
- */
2227
- register(callback, options = {}) {
2228
- const rootId = options.rootId;
2229
- const root = rootId ? this.roots.get(rootId) : this.roots.values().next().value;
2230
- if (!root) {
2231
- console.warn("[Scheduler] No root registered. Is this inside a Canvas?");
2232
- return () => {
2233
- };
2234
- }
2235
- const id = options.id ?? this.generateJobId();
2236
- let phase = options.phase ?? "update";
2237
- if (!options.phase && (options.before || options.after)) {
2238
- phase = this.phaseGraph.resolveConstraintPhase(options.before, options.after);
2239
- }
2240
- const before = this.normalizeConstraints(options.before);
2241
- const after = this.normalizeConstraints(options.after);
2242
- const job = {
2243
- id,
2244
- callback,
2245
- phase,
2246
- before,
2247
- after,
2248
- priority: options.priority ?? 0,
2249
- index: this.nextJobIndex++,
2250
- fps: options.fps,
2251
- drop: options.drop ?? true,
2252
- enabled: options.enabled ?? true,
2253
- system: options.system ?? false
2254
- };
2255
- if (root.jobs.has(id)) {
2256
- console.warn(`[useFrame] Job with id "${id}" already exists, replacing`);
2257
- }
2258
- root.jobs.set(id, job);
2259
- root.needsRebuild = true;
2260
- return () => this.unregister(id, root.id);
2261
- }
2262
- /**
2263
- * Unregister a job by its ID.
2264
- * Searches all roots if rootId is not provided.
2265
- * @param {string} id - The job ID to unregister
2266
- * @param {string} [rootId] - Optional root ID to search (searches all if not provided)
2267
- * @returns {void}
2268
- */
2269
- unregister(id, rootId) {
2270
- const root = rootId ? this.roots.get(rootId) : Array.from(this.roots.values()).find((r) => r.jobs.has(id));
2271
- if (root?.jobs.delete(id)) {
2272
- root.needsRebuild = true;
2273
- this.jobStateListeners.delete(id);
2274
- }
2275
- }
2276
- /**
2277
- * Update a job's options dynamically.
2278
- * Searches all roots to find the job by ID.
2279
- * Phase/constraint changes trigger a rebuild of the sorted job list.
2280
- * @param {string} id - The job ID to update
2281
- * @param {Partial<JobOptions>} options - The options to update
2282
- * @returns {void}
2283
- */
2284
- updateJob(id, options) {
2285
- let job;
2286
- let root;
2287
- for (const r of this.roots.values()) {
2288
- job = r.jobs.get(id);
2289
- if (job) {
2290
- root = r;
2291
- break;
2292
- }
2293
- }
2294
- if (!job || !root) return;
2295
- if (options.priority !== void 0) job.priority = options.priority;
2296
- if (options.fps !== void 0) job.fps = options.fps;
2297
- if (options.drop !== void 0) job.drop = options.drop;
2298
- if (options.enabled !== void 0) {
2299
- const wasEnabled = job.enabled;
2300
- job.enabled = options.enabled;
2301
- if (!wasEnabled && job.enabled) resetJobTiming(job);
2302
- if (wasEnabled !== job.enabled) root.needsRebuild = true;
2303
- }
2304
- if (options.phase !== void 0 || options.before !== void 0 || options.after !== void 0) {
2305
- if (options.phase) job.phase = options.phase;
2306
- if (options.before !== void 0) job.before = this.normalizeConstraints(options.before);
2307
- if (options.after !== void 0) job.after = this.normalizeConstraints(options.after);
2308
- root.needsRebuild = true;
2309
- }
2310
- }
2311
- //* Job State Management Methods ================================
2312
- /**
2313
- * Check if a job is currently paused (disabled).
2314
- * @param {string} id - The job ID to check
2315
- * @returns {boolean} True if the job exists and is paused
2316
- */
2317
- isJobPaused(id) {
2318
- for (const root of this.roots.values()) {
2319
- const job = root.jobs.get(id);
2320
- if (job) return !job.enabled;
2321
- }
2322
- return false;
2323
- }
2324
- /**
2325
- * Subscribe to state changes for a specific job.
2326
- * Listener is called when job is paused or resumed.
2327
- * @param {string} id - The job ID to subscribe to
2328
- * @param {() => void} listener - Callback invoked on state changes
2329
- * @returns {() => void} Unsubscribe function
2330
- */
2331
- subscribeJobState(id, listener) {
2332
- if (!this.jobStateListeners.has(id)) {
2333
- this.jobStateListeners.set(id, /* @__PURE__ */ new Set());
2334
- }
2335
- this.jobStateListeners.get(id).add(listener);
2336
- return () => {
2337
- this.jobStateListeners.get(id)?.delete(listener);
2338
- if (this.jobStateListeners.get(id)?.size === 0) {
2339
- this.jobStateListeners.delete(id);
2340
- }
2341
- };
2342
- }
2343
- /**
2344
- * Notify all listeners that a job's state has changed.
2345
- * @param {string} id - The job ID that changed
2346
- * @returns {void}
2347
- * @private
2348
- */
2349
- notifyJobStateChange(id) {
2350
- this.jobStateListeners.get(id)?.forEach((listener) => listener());
2351
- }
2352
- /**
2353
- * Pause a job by ID (sets enabled=false).
2354
- * Notifies any subscribed state listeners.
2355
- * @param {string} id - The job ID to pause
2356
- * @returns {void}
2357
- */
2358
- pauseJob(id) {
2359
- this.updateJob(id, { enabled: false });
2360
- this.notifyJobStateChange(id);
2361
- }
2362
- /**
2363
- * Resume a paused job by ID (sets enabled=true).
2364
- * Resets job timing to prevent frame accumulation.
2365
- * Notifies any subscribed state listeners.
2366
- * @param {string} id - The job ID to resume
2367
- * @returns {void}
2368
- */
2369
- resumeJob(id) {
2370
- this.updateJob(id, { enabled: true });
2371
- this.notifyJobStateChange(id);
2372
- }
2373
- //* Frame Loop Control Methods ================================
2374
- /**
2375
- * Start the requestAnimationFrame loop.
2376
- * Resets timing state (elapsedTime, frameCount) on start.
2377
- * No-op if already running.
2378
- * @returns {void}
2379
- */
2380
- start() {
2381
- if (this.loopState.running) return;
2382
- const { elapsedTime, createdAt } = this.loopState;
2383
- let adjustedCreated = 0;
2384
- if (this.stoppedTime > 0) {
2385
- adjustedCreated = createdAt - (performance.now() - this.stoppedTime);
2386
- this.stoppedTime = 0;
2387
- }
2388
- Object.assign(this.loopState, {
2389
- running: true,
2390
- elapsedTime: elapsedTime ?? 0,
2391
- lastTime: performance.now(),
2392
- createdAt: adjustedCreated > 0 ? adjustedCreated : performance.now(),
2393
- frameCount: 0,
2394
- rafHandle: requestAnimationFrame(this.loop)
2395
- });
2396
- }
2397
- /**
2398
- * Stop the requestAnimationFrame loop.
2399
- * Cancels any pending RAF callback.
2400
- * No-op if not running.
2401
- * @returns {void}
2402
- */
2403
- stop() {
2404
- if (!this.loopState.running) return;
2405
- this.loopState.running = false;
2406
- if (this.loopState.rafHandle !== null) {
2407
- cancelAnimationFrame(this.loopState.rafHandle);
2408
- this.loopState.rafHandle = null;
2409
- }
2410
- this.stoppedTime = performance.now();
2411
- }
2412
- /**
2413
- * Request frames to be rendered in demand mode.
2414
- * Accumulates pending frames (capped at 60) and starts the loop if not running.
2415
- * No-op if frameloop is not 'demand'.
2416
- * @param {number} [frames=1] - Number of frames to request
2417
- * @param {boolean} [stackFrames=false] - Whether to add frames to existing pending count
2418
- * - `false` (default): Sets pending frames to the specified value (replaces existing count)
2419
- * - `true`: Adds frames to existing pending count (useful for accumulating invalidations)
2420
- * @returns {void}
2421
- * @example
2422
- * // Request a single frame render
2423
- * scheduler.invalidate();
2424
- *
2425
- * @example
2426
- * // Request 5 frames (e.g., for animations)
2427
- * scheduler.invalidate(5);
2428
- *
2429
- * @example
2430
- * // Set pending frames to exactly 3 (don't stack with existing)
2431
- * scheduler.invalidate(3, false);
2432
- *
2433
- * @example
2434
- * // Add 2 more frames to existing pending count
2435
- * scheduler.invalidate(2, true);
2436
- */
2437
- invalidate(frames = 1, stackFrames = false) {
2438
- if (this._frameloop !== "demand") return;
2439
- const baseFrames = stackFrames ? this.pendingFrames : 0;
2440
- this.pendingFrames = Math.min(60, baseFrames + frames);
2441
- if (!this.loopState.running && this.pendingFrames > 0) this.start();
2442
- }
2443
- /**
2444
- * Reset timing state for deterministic testing.
2445
- * Preserves jobs and roots but resets lastTime, frameCount, elapsedTime, etc.
2446
- * @returns {void}
2447
- */
2448
- resetTiming() {
2449
- this.loopState.lastTime = null;
2450
- this.loopState.frameCount = 0;
2451
- this.loopState.elapsedTime = 0;
2452
- this.loopState.createdAt = performance.now();
2453
- }
2454
- //* Manual Stepping Methods ================================
2455
- /**
2456
- * Manually execute a single frame for all roots.
2457
- * Useful for frameloop='never' mode or testing scenarios.
2458
- * @param {number} [timestamp] - Optional timestamp (defaults to performance.now())
2459
- * @returns {void}
2460
- * @example
2461
- * // Manual control mode
2462
- * scheduler.frameloop = 'never';
2463
- * scheduler.step(); // Execute one frame
2464
- */
2465
- step(timestamp) {
2466
- const now = timestamp ?? performance.now();
2467
- this.executeFrame(now);
2468
- }
2469
- /**
2470
- * Manually execute a single job by its ID.
2471
- * Useful for testing individual job callbacks in isolation.
2472
- * @param {string} id - The job ID to step
2473
- * @param {number} [timestamp] - Optional timestamp (defaults to performance.now())
2474
- * @returns {void}
2475
- */
2476
- stepJob(id, timestamp) {
2477
- let job;
2478
- let root;
2479
- for (const r of this.roots.values()) {
2480
- job = r.jobs.get(id);
2481
- if (job) {
2482
- root = r;
2483
- break;
2484
- }
2485
- }
2486
- if (!job || !root) {
2487
- console.warn(`[Scheduler] Job "${id}" not found`);
2488
- return;
2489
- }
2490
- const now = timestamp ?? performance.now();
2491
- const deltaMs = this.loopState.lastTime !== null ? now - this.loopState.lastTime : 0;
2492
- const delta = deltaMs / 1e3;
2493
- const elapsed = now - this.loopState.createdAt;
2494
- const providedState = root.getState?.() ?? {};
2495
- const frameState = {
2496
- ...providedState,
2497
- time: now,
2498
- delta,
2499
- elapsed,
2500
- frame: this.loopState.frameCount
2501
- };
2502
- try {
2503
- job.callback(frameState, delta);
2504
- } catch (error) {
2505
- console.error(`[Scheduler] Error in job "${job.id}":`, error);
2506
- this.triggerError(error instanceof Error ? error : new Error(String(error)));
2507
- }
2508
- }
2509
- /**
2510
- * Execute a single frame across all roots.
2511
- * Order: globalBefore → each root's jobs → globalAfter
2512
- * @param {number} timestamp - RAF timestamp in milliseconds
2513
- * @returns {void}
2514
- * @private
2515
- */
2516
- executeFrame(timestamp) {
2517
- const deltaMs = this.loopState.lastTime !== null ? timestamp - this.loopState.lastTime : 0;
2518
- const delta = deltaMs / 1e3;
2519
- this.loopState.lastTime = timestamp;
2520
- this.loopState.frameCount++;
2521
- this.loopState.elapsedTime += deltaMs;
2522
- this.runGlobalJobs(this.globalBeforeJobs, timestamp);
2523
- for (const root of this.roots.values()) {
2524
- this.tickRoot(root, timestamp, delta);
2525
- }
2526
- this.runGlobalJobs(this.globalAfterJobs, timestamp);
2527
- }
2528
- /**
2529
- * Run all global jobs from a job map.
2530
- * Catches and logs errors without stopping execution.
2531
- * @param {Map<string, GlobalJob>} jobs - The global jobs map to execute
2532
- * @param {number} timestamp - RAF timestamp in milliseconds
2533
- * @returns {void}
2534
- * @private
2535
- */
2536
- runGlobalJobs(jobs, timestamp) {
2537
- for (const job of jobs.values()) {
2538
- try {
2539
- job.callback(timestamp);
2540
- } catch (error) {
2541
- console.error(`[Scheduler] Error in global job "${job.id}":`, error);
2542
- }
2543
- }
2544
- }
2545
- /**
2546
- * Execute all jobs for a single root in sorted order.
2547
- * Rebuilds sorted job list if needed, then dispatches each job.
2548
- * Errors are caught and propagated via triggerError.
2549
- * @param {RootEntry} root - The root entry to tick
2550
- * @param {number} timestamp - RAF timestamp in milliseconds
2551
- * @param {number} delta - Time since last frame in seconds
2552
- * @returns {void}
2553
- * @private
2554
- */
2555
- tickRoot(root, timestamp, delta) {
2556
- if (root.needsRebuild) {
2557
- root.sortedJobs = rebuildSortedJobs(root.jobs, this.phaseGraph);
2558
- root.needsRebuild = false;
2559
- }
2560
- const providedState = root.getState?.() ?? {};
2561
- const frameState = {
2562
- ...providedState,
2563
- time: timestamp,
2564
- delta,
2565
- elapsed: this.loopState.elapsedTime / 1e3,
2566
- // Convert ms to seconds
2567
- frame: this.loopState.frameCount
2568
- };
2569
- for (const job of root.sortedJobs) {
2570
- if (!shouldRun(job, timestamp)) continue;
2571
- try {
2572
- job.callback(frameState, delta);
2573
- } catch (error) {
2574
- console.error(`[Scheduler] Error in job "${job.id}":`, error);
2575
- this.triggerError(error instanceof Error ? error : new Error(String(error)));
2576
- }
2577
- }
2578
- }
2579
- //* Debug & Inspection Methods ================================
2580
- /**
2581
- * Get the total number of registered jobs across all roots.
2582
- * Includes both per-root jobs and global before/after jobs.
2583
- * @returns {number} Total job count
2584
- */
2585
- getJobCount() {
2586
- let count = 0;
2587
- for (const root of this.roots.values()) {
2588
- count += root.jobs.size;
2589
- }
2590
- return count + this.globalBeforeJobs.size + this.globalAfterJobs.size;
2591
- }
2592
- /**
2593
- * Get all registered job IDs across all roots.
2594
- * Includes both per-root jobs and global before/after jobs.
2595
- * @returns {string[]} Array of all job IDs
2596
- */
2597
- getJobIds() {
2598
- const ids = [];
2599
- for (const root of this.roots.values()) {
2600
- ids.push(...root.jobs.keys());
2601
- }
2602
- ids.push(...this.globalBeforeJobs.keys());
2603
- ids.push(...this.globalAfterJobs.keys());
2604
- return ids;
2605
- }
2606
- /**
2607
- * Get the number of registered roots (Canvas instances).
2608
- * @returns {number} Number of registered roots
2609
- */
2610
- getRootCount() {
2611
- return this.roots.size;
2612
- }
2613
- /**
2614
- * Check if any user (non-system) jobs are registered in a specific phase.
2615
- * Used by the default render job to know if a user has taken over rendering.
2616
- *
2617
- * @param phase The phase to check
2618
- * @param rootId Optional root ID to check (checks all roots if not provided)
2619
- * @returns true if any user jobs exist in the phase
2620
- */
2621
- hasUserJobsInPhase(phase, rootId) {
2622
- const rootsToCheck = rootId ? [this.roots.get(rootId)].filter(Boolean) : Array.from(this.roots.values());
2623
- return rootsToCheck.some((root) => {
2624
- if (!root) return false;
2625
- for (const job of root.jobs.values()) {
2626
- if (job.phase === phase && !job.system && job.enabled) return true;
2627
- }
2628
- return false;
2629
- });
2630
- }
2631
- //* Utility Methods ================================
2632
- /**
2633
- * Generate a unique root ID for automatic root registration.
2634
- * @returns {string} A unique root ID in the format 'root_N'
2635
- */
2636
- generateRootId() {
2637
- return `root_${this.nextRootIndex++}`;
2638
- }
2639
- /**
2640
- * Generate a unique job ID.
2641
- * @returns {string} A unique job ID in the format 'job_N'
2642
- * @private
2643
- */
2644
- generateJobId() {
2645
- return `job_${this.nextJobIndex}`;
2646
- }
2647
- /**
2648
- * Normalize before/after constraints to a Set.
2649
- * Handles undefined, single string, or array inputs.
2650
- * @param {string | string[] | undefined} value - The constraint value(s)
2651
- * @returns {Set<string>} Normalized Set of constraint strings
2652
- * @private
2653
- */
2654
- normalizeConstraints(value) {
2655
- if (!value) return /* @__PURE__ */ new Set();
2656
- if (Array.isArray(value)) return new Set(value);
2657
- return /* @__PURE__ */ new Set([value]);
2658
- }
2659
- };
2660
- //* Static State & Methods (Singleton Usage) ================================
2661
- //* Cross-Bundle Singleton Key ==============================
2662
- // Use Symbol.for() to ensure scheduler is shared across bundle boundaries
2663
- // This prevents issues when mixing imports from @react-three/fiber and @react-three/fiber/webgpu
2664
- __publicField(_Scheduler, "INSTANCE_KEY", Symbol.for("@react-three/fiber.scheduler"));
2665
- let Scheduler = _Scheduler;
2666
- const getScheduler = () => Scheduler.get();
2667
- if (hmrData) {
2668
- hmrData.accept?.();
2669
- }
2670
-
2671
1641
  const R3F_CONTEXT = Symbol.for("@react-three/fiber.context");
2672
1642
  const context = globalThis[R3F_CONTEXT] ?? (globalThis[R3F_CONTEXT] = React.createContext(null));
2673
1643
  const createStore = (invalidate, advance) => {
@@ -2809,6 +1779,7 @@ const createStore = (invalidate, advance) => {
2809
1779
  buffers: {},
2810
1780
  gpuStorage: {},
2811
1781
  textures: /* @__PURE__ */ new Map(),
1782
+ _textureRefs: /* @__PURE__ */ new Map(),
2812
1783
  renderPipeline: null,
2813
1784
  passes: {},
2814
1785
  _hmrVersion: 0,
@@ -3068,20 +2039,14 @@ function useFrame(callback, priorityOrOptions) {
3068
2039
  }
3069
2040
  };
3070
2041
  } else {
3071
- const registerOutside = () => {
3072
- return scheduler.register((state, delta) => callbackRef.current?.(state, delta), { id, ...options });
3073
- };
3074
- if (scheduler.independent || scheduler.isReady) {
3075
- return registerOutside();
3076
- }
3077
- let unregisterJob = null;
3078
- const unsubReady = scheduler.onRootReady(() => {
3079
- unregisterJob = registerOutside();
3080
- });
3081
- return () => {
3082
- unsubReady();
3083
- unregisterJob?.();
3084
- };
2042
+ return scheduler.register(
2043
+ (state, delta) => {
2044
+ const frameState = state;
2045
+ if (!frameState.renderer) return;
2046
+ callbackRef.current?.(frameState, delta);
2047
+ },
2048
+ { id, ...options }
2049
+ );
3085
2050
  }
3086
2051
  }, [store, scheduler, id, optionsKey, isLegacyPriority, isInsideCanvas]);
3087
2052
  const isPaused = React.useSyncExternalStore(
@@ -3172,18 +2137,18 @@ function buildFromCache(input, textureCache) {
3172
2137
  function useTexture(input, optionsOrOnLoad) {
3173
2138
  const renderer = useThree((state) => state.internal.actualRenderer);
3174
2139
  const store = useStore();
3175
- const textureCache = useThree((state) => state.textures);
3176
2140
  const options = typeof optionsOrOnLoad === "function" ? { onLoad: optionsOrOnLoad } : optionsOrOnLoad ?? {};
3177
- const { onLoad, cache = false } = options;
2141
+ const { onLoad, cache = true } = options;
3178
2142
  const onLoadRef = useRef(onLoad);
3179
2143
  onLoadRef.current = onLoad;
3180
2144
  const onLoadCalledForRef = useRef(null);
3181
2145
  const urls = useMemo(() => getUrls(input), [input]);
3182
2146
  const cachedResult = useMemo(() => {
3183
2147
  if (!cache) return null;
3184
- if (!allUrlsCached(urls, textureCache)) return null;
3185
- return buildFromCache(input, textureCache);
3186
- }, [cache, urls, textureCache, input]);
2148
+ const textures = store.getState().textures;
2149
+ if (!allUrlsCached(urls, textures)) return null;
2150
+ return buildFromCache(input, textures);
2151
+ }, [cache, urls, input, store]);
3187
2152
  const loadedTextures = useLoader(
3188
2153
  TextureLoader,
3189
2154
  IsObject(input) ? Object.values(input) : input
@@ -3227,8 +2192,6 @@ function useTexture(input, optionsOrOnLoad) {
3227
2192
  }, [input, loadedTextures, cachedResult]);
3228
2193
  useEffect(() => {
3229
2194
  if (!cache) return;
3230
- if (cachedResult) return;
3231
- const set = store.setState;
3232
2195
  const urlTextureMap = [];
3233
2196
  if (typeof input === "string") {
3234
2197
  urlTextureMap.push([input, mappedTextures]);
@@ -3242,18 +2205,32 @@ function useTexture(input, optionsOrOnLoad) {
3242
2205
  urlTextureMap.push([url, textureRecord[key]]);
3243
2206
  }
3244
2207
  }
3245
- set((state) => {
3246
- const newMap = new Map(state.textures);
3247
- let changed = false;
2208
+ store.setState((state) => {
2209
+ const refs = new Map(state._textureRefs);
2210
+ let textures = state.textures;
2211
+ let added = false;
3248
2212
  for (const [url, texture] of urlTextureMap) {
3249
- if (!newMap.has(url)) {
3250
- newMap.set(url, texture);
3251
- changed = true;
2213
+ if (!textures.has(url)) {
2214
+ if (!added) {
2215
+ textures = new Map(textures);
2216
+ added = true;
2217
+ }
2218
+ textures.set(url, texture);
3252
2219
  }
2220
+ refs.set(url, (refs.get(url) ?? 0) + 1);
3253
2221
  }
3254
- return changed ? { textures: newMap } : state;
2222
+ return added ? { textures, _textureRefs: refs } : { _textureRefs: refs };
3255
2223
  });
3256
- }, [cache, input, mappedTextures, store, cachedResult]);
2224
+ return () => store.setState((state) => {
2225
+ const refs = new Map(state._textureRefs);
2226
+ for (const [url] of urlTextureMap) {
2227
+ const next = (refs.get(url) ?? 0) - 1;
2228
+ if (next <= 0) refs.delete(url);
2229
+ else refs.set(url, next);
2230
+ }
2231
+ return { _textureRefs: refs };
2232
+ });
2233
+ }, [cache, input, mappedTextures, store]);
3257
2234
  return mappedTextures;
3258
2235
  }
3259
2236
  useTexture.preload = (url) => useLoader.preload(TextureLoader, url);
@@ -3269,96 +2246,63 @@ const Texture = ({
3269
2246
  return /* @__PURE__ */ jsx(Fragment, { children: children?.(ret) });
3270
2247
  };
3271
2248
 
3272
- function getTextureValue(entry) {
3273
- if (entry instanceof Texture$1) return entry;
3274
- if (entry && typeof entry === "object" && "value" in entry && entry.value instanceof Texture$1) {
3275
- return entry.value;
3276
- }
3277
- return null;
3278
- }
3279
- function useTextures() {
2249
+ function useTextures(selector) {
3280
2250
  const store = useStore();
3281
- return useMemo(() => {
3282
- const set = store.setState;
2251
+ const registry = useMemo(() => {
3283
2252
  const getState = store.getState;
3284
- const add = (key, value) => {
3285
- set((state) => {
3286
- const newMap = new Map(state.textures);
3287
- newMap.set(key, value);
3288
- return { textures: newMap };
3289
- });
3290
- };
3291
- const addMultiple = (items) => {
3292
- set((state) => {
3293
- const newMap = new Map(state.textures);
3294
- const entries = items instanceof Map ? items.entries() : Object.entries(items);
3295
- for (const [key, value] of entries) {
3296
- newMap.set(key, value);
3297
- }
3298
- return { textures: newMap };
3299
- });
3300
- };
3301
- const remove = (key) => {
3302
- set((state) => {
3303
- const newMap = new Map(state.textures);
3304
- newMap.delete(key);
3305
- return { textures: newMap };
3306
- });
3307
- };
3308
- const removeMultiple = (keys) => {
3309
- set((state) => {
3310
- const newMap = new Map(state.textures);
3311
- for (const key of keys) newMap.delete(key);
3312
- return { textures: newMap };
3313
- });
3314
- };
3315
- const dispose = (key) => {
3316
- const entry = getState().textures.get(key);
3317
- if (entry) {
3318
- const tex = getTextureValue(entry);
3319
- tex?.dispose();
3320
- }
3321
- remove(key);
3322
- };
3323
- const disposeMultiple = (keys) => {
3324
- const textures = getState().textures;
3325
- for (const key of keys) {
3326
- const entry = textures.get(key);
3327
- if (entry) {
3328
- const tex = getTextureValue(entry);
3329
- tex?.dispose();
3330
- }
3331
- }
3332
- removeMultiple(keys);
3333
- };
3334
- const disposeAll = () => {
3335
- const textures = getState().textures;
3336
- for (const entry of textures.values()) {
3337
- const tex = getTextureValue(entry);
3338
- tex?.dispose();
3339
- }
3340
- set({ textures: /* @__PURE__ */ new Map() });
3341
- };
2253
+ const setState = store.setState;
2254
+ const getOne = (key) => getState().textures.get(key);
3342
2255
  return {
3343
- // Getter for the textures Map (reactive via getState)
3344
- get textures() {
2256
+ get all() {
3345
2257
  return getState().textures;
3346
2258
  },
3347
- // Read
3348
- get: (key) => getState().textures.get(key),
2259
+ get(input) {
2260
+ if (typeof input === "string") return getOne(input);
2261
+ if (Array.isArray(input)) return input.map(getOne);
2262
+ const out = {};
2263
+ for (const name in input) out[name] = getOne(input[name]);
2264
+ return out;
2265
+ },
3349
2266
  has: (key) => getState().textures.has(key),
3350
- // Write
3351
- add,
3352
- addMultiple,
3353
- // Remove (cache only)
3354
- remove,
3355
- removeMultiple,
3356
- // Dispose (GPU + cache)
3357
- dispose,
3358
- disposeMultiple,
3359
- disposeAll
2267
+ add(keyOrRecord, texture) {
2268
+ setState((state) => {
2269
+ const textures = new Map(state.textures);
2270
+ if (typeof keyOrRecord === "string") {
2271
+ textures.set(keyOrRecord, texture);
2272
+ } else {
2273
+ for (const key in keyOrRecord) textures.set(key, keyOrRecord[key]);
2274
+ }
2275
+ return { textures };
2276
+ });
2277
+ },
2278
+ dispose(key, options) {
2279
+ const state = getState();
2280
+ const refs = state._textureRefs.get(key) ?? 0;
2281
+ if (refs > 0 && !options?.force) {
2282
+ console.warn(
2283
+ `[useTextures] "${key}" still has ${refs} active reference(s); skipping dispose. Pass { force: true } to override.`
2284
+ );
2285
+ return false;
2286
+ }
2287
+ state.textures.get(key)?.dispose();
2288
+ setState((s) => {
2289
+ const textures = new Map(s.textures);
2290
+ textures.delete(key);
2291
+ const nextRefs = new Map(s._textureRefs);
2292
+ nextRefs.delete(key);
2293
+ return { textures, _textureRefs: nextRefs };
2294
+ });
2295
+ return true;
2296
+ },
2297
+ disposeAll() {
2298
+ for (const texture of getState().textures.values()) texture.dispose();
2299
+ setState({ textures: /* @__PURE__ */ new Map(), _textureRefs: /* @__PURE__ */ new Map() });
2300
+ }
3360
2301
  };
3361
2302
  }, [store]);
2303
+ const subscribe = selector ? () => selector(registry) : (state) => state.textures;
2304
+ const selected = useThree(subscribe);
2305
+ return selector ? selected : registry;
3362
2306
  }
3363
2307
 
3364
2308
  function useRenderTarget(widthOrOptions, heightOrOptions, options) {
@@ -15479,7 +14423,7 @@ function createRoot(canvas) {
15479
14423
  {
15480
14424
  id: `${newRootId}_frustum`,
15481
14425
  rootId: newRootId,
15482
- phase: "preRender",
14426
+ before: "render",
15483
14427
  system: true
15484
14428
  }
15485
14429
  );
@@ -15491,7 +14435,7 @@ function createRoot(canvas) {
15491
14435
  {
15492
14436
  id: `${newRootId}_visibility`,
15493
14437
  rootId: newRootId,
15494
- phase: "preRender",
14438
+ before: "render",
15495
14439
  system: true,
15496
14440
  after: `${newRootId}_frustum`
15497
14441
  }
@@ -15714,6 +14658,46 @@ function flushSync(fn) {
15714
14658
  return reconciler.flushSyncFromReconciler(fn);
15715
14659
  }
15716
14660
 
14661
+ function parseBackground(background) {
14662
+ if (!background) return null;
14663
+ if (typeof background === "object" && !background.isColor) {
14664
+ const { backgroundMap, envMap, files, preset, ...rest } = background;
14665
+ return {
14666
+ ...rest,
14667
+ preset,
14668
+ files: envMap || files,
14669
+ backgroundFiles: backgroundMap,
14670
+ background: true
14671
+ };
14672
+ }
14673
+ if (typeof background === "number") {
14674
+ return { color: background, background: true };
14675
+ }
14676
+ if (typeof background === "string") {
14677
+ if (background in presetsObj) {
14678
+ return { preset: background, background: true };
14679
+ }
14680
+ if (/^(https?:\/\/|\/|\.\/|\.\.\/)|\.(hdr|exr|jpg|jpeg|png|webp|gif)$/i.test(background)) {
14681
+ return { files: background, background: true };
14682
+ }
14683
+ return { color: background, background: true };
14684
+ }
14685
+ if (background.isColor) {
14686
+ return { color: background, background: true };
14687
+ }
14688
+ return null;
14689
+ }
14690
+
14691
+ function clearHmrCaches(store) {
14692
+ store.setState((state) => ({
14693
+ nodes: {},
14694
+ uniforms: {},
14695
+ buffers: {},
14696
+ gpuStorage: {},
14697
+ _hmrVersion: state._hmrVersion + 1
14698
+ }));
14699
+ }
14700
+
15717
14701
  function CanvasImpl({
15718
14702
  ref,
15719
14703
  children,
@@ -15734,6 +14718,8 @@ function CanvasImpl({
15734
14718
  raycaster,
15735
14719
  camera,
15736
14720
  scene,
14721
+ autoUpdateFrustum,
14722
+ occlusion,
15737
14723
  onPointerMissed,
15738
14724
  onDragOverMissed,
15739
14725
  onDropMissed,
@@ -15759,35 +14745,7 @@ function CanvasImpl({
15759
14745
  }
15760
14746
  React.useMemo(() => extend(THREE), []);
15761
14747
  const Bridge = useBridge();
15762
- const backgroundProps = React.useMemo(() => {
15763
- if (!background) return null;
15764
- if (typeof background === "object" && !background.isColor) {
15765
- const { backgroundMap, envMap, files, preset, ...rest } = background;
15766
- return {
15767
- ...rest,
15768
- preset,
15769
- files: envMap || files,
15770
- backgroundFiles: backgroundMap,
15771
- background: true
15772
- };
15773
- }
15774
- if (typeof background === "number") {
15775
- return { color: background, background: true };
15776
- }
15777
- if (typeof background === "string") {
15778
- if (background in presetsObj) {
15779
- return { preset: background, background: true };
15780
- }
15781
- if (/^(https?:\/\/|\/|\.\/|\.\.\/)|\\.(hdr|exr|jpg|jpeg|png|webp|gif)$/i.test(background)) {
15782
- return { files: background, background: true };
15783
- }
15784
- return { color: background, background: true };
15785
- }
15786
- if (background.isColor) {
15787
- return { color: background, background: true };
15788
- }
15789
- return null;
15790
- }, [background]);
14748
+ const backgroundProps = React.useMemo(() => parseBackground(background), [background]);
15791
14749
  const hasInitialSizeRef = React.useRef(false);
15792
14750
  const measureConfig = React.useMemo(() => {
15793
14751
  if (!hasInitialSizeRef.current) {
@@ -15871,6 +14829,8 @@ function CanvasImpl({
15871
14829
  performance,
15872
14830
  raycaster,
15873
14831
  camera,
14832
+ autoUpdateFrustum,
14833
+ occlusion,
15874
14834
  size: effectiveSize,
15875
14835
  // Store size props for reset functionality
15876
14836
  _sizeProps: width !== void 0 || height !== void 0 ? { width, height } : null,
@@ -15930,14 +14890,7 @@ function CanvasImpl({
15930
14890
  const handleHMR = () => {
15931
14891
  queueMicrotask(() => {
15932
14892
  const rootEntry = _roots.get(canvas);
15933
- if (rootEntry?.store) {
15934
- console.log("[R3F] HMR detected \u2014 rebuilding nodes/uniforms");
15935
- rootEntry.store.setState((state) => ({
15936
- nodes: {},
15937
- uniforms: {},
15938
- _hmrVersion: state._hmrVersion + 1
15939
- }));
15940
- }
14893
+ if (rootEntry?.store) clearHmrCaches(rootEntry.store);
15941
14894
  });
15942
14895
  };
15943
14896
  if (typeof import.meta !== "undefined" && import.meta.hot) {
@@ -15985,4 +14938,4 @@ function Canvas(props) {
15985
14938
 
15986
14939
  extend(THREE);
15987
14940
 
15988
- export { Block, Canvas, Environment, EnvironmentCube, EnvironmentMap, EnvironmentPortal, ErrorBoundary, FROM_REF, IsObject, ONCE, Portal, R3F_BUILD_LEGACY, R3F_BUILD_WEBGPU, REACT_INTERNAL_PROPS, RESERVED_PROPS, Scheduler, Texture, _roots, act, addAfterEffect, addEffect, addTail, advance, applyProps, attach, buildGraph, calculateDpr, context, createEvents, createPointerEvents, createPortal, createRoot, createStore, detach, diffProps, dispose, createPointerEvents as events, extend, findInitialRoot, flushSync, fromRef, getInstanceProps, getPrimary, getPrimaryIds, getRootState, getScheduler, getUuidPrefix, hasConstructor, hasPrimary, invalidate, invalidateInstance, is, isColorRepresentation, isCopyable, isFromRef, isObject3D, isOnce, isOrthographicCamera, isRef, isRenderer, isTexture, isVectorLike, once, prepare, presetsObj, reconciler, registerPrimary, removeInteractivity, resolve, unmountComponentAtNode, unregisterPrimary, updateCamera, updateFrustum, useBridge, useEnvironment, useFrame, useGraph, useInstanceHandle, useIsomorphicLayoutEffect, useLoader, useMutableCallback, useRenderTarget, useStore, useTexture, useTextures, useThree, waitForPrimary };
14941
+ export { Block, Canvas, Environment, EnvironmentCube, EnvironmentMap, EnvironmentPortal, ErrorBoundary, FROM_REF, IsObject, ONCE, Portal, R3F_BUILD_LEGACY, R3F_BUILD_WEBGPU, REACT_INTERNAL_PROPS, RESERVED_PROPS, Texture, _roots, act, addAfterEffect, addEffect, addTail, advance, applyProps, attach, buildGraph, calculateDpr, context, createEvents, createPointerEvents, createPortal, createRoot, createStore, detach, diffProps, dispose, createPointerEvents as events, extend, findInitialRoot, flushSync, fromRef, getInstanceProps, getPrimary, getPrimaryIds, getRootState, getUuidPrefix, hasConstructor, hasPrimary, invalidate, invalidateInstance, is, isColorRepresentation, isCopyable, isFromRef, isObject3D, isOnce, isOrthographicCamera, isRef, isRenderer, isTexture, isVectorLike, once, prepare, presetsObj, reconciler, registerPrimary, removeInteractivity, resolve, unmountComponentAtNode, unregisterPrimary, updateCamera, updateFrustum, useBridge, useEnvironment, useFrame, useGraph, useInstanceHandle, useIsomorphicLayoutEffect, useLoader, useMutableCallback, useRenderTarget, useStore, useTexture, useTextures, useThree, waitForPrimary };