@react-three/fiber 10.0.0-canary.c3fa45d → 10.0.0-canary.ca63ccd
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/index.cjs +352 -1315
- package/dist/index.d.cts +151 -795
- package/dist/index.d.mts +151 -795
- package/dist/index.d.ts +151 -795
- package/dist/index.mjs +326 -1288
- package/dist/legacy.cjs +307 -1270
- package/dist/legacy.d.cts +151 -794
- package/dist/legacy.d.mts +151 -794
- package/dist/legacy.d.ts +151 -794
- package/dist/legacy.mjs +280 -1242
- package/dist/webgpu/index.cjs +395 -1339
- package/dist/webgpu/index.d.cts +168 -794
- package/dist/webgpu/index.d.mts +168 -794
- package/dist/webgpu/index.d.ts +168 -794
- package/dist/webgpu/index.mjs +368 -1311
- package/package.json +4 -3
- package/readme.md +2 -3
package/dist/index.cjs
CHANGED
|
@@ -15,6 +15,7 @@ const UltraHDRLoader_js = require('three/examples/jsm/loaders/UltraHDRLoader.js'
|
|
|
15
15
|
const gainmapJs = require('@monogrid/gainmap-js');
|
|
16
16
|
const Tb = require('scheduler');
|
|
17
17
|
const traditional = require('zustand/traditional');
|
|
18
|
+
const scheduler = require('@pmndrs/scheduler');
|
|
18
19
|
const suspendReact = require('suspend-react');
|
|
19
20
|
|
|
20
21
|
var _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;
|
|
@@ -55,10 +56,13 @@ const R3F_BUILD_WEBGPU = true;
|
|
|
55
56
|
|
|
56
57
|
const THREE = /*#__PURE__*/_mergeNamespaces({
|
|
57
58
|
__proto__: null,
|
|
59
|
+
CubeRenderTarget: webgpu.CubeRenderTarget,
|
|
60
|
+
CubeRenderTargetCompat: webgpu.CubeRenderTarget,
|
|
58
61
|
Inspector: Inspector_js.Inspector,
|
|
59
62
|
R3F_BUILD_LEGACY: R3F_BUILD_LEGACY,
|
|
60
63
|
R3F_BUILD_WEBGPU: R3F_BUILD_WEBGPU,
|
|
61
64
|
RenderTargetCompat: webgpu.RenderTarget,
|
|
65
|
+
WebGLCubeRenderTarget: three.WebGLCubeRenderTarget,
|
|
62
66
|
WebGLRenderTarget: three.WebGLRenderTarget,
|
|
63
67
|
WebGLRenderer: three.WebGLRenderer
|
|
64
68
|
}, [webgpu__namespace]);
|
|
@@ -332,15 +336,16 @@ function EnvironmentPortal({
|
|
|
332
336
|
preset = void 0,
|
|
333
337
|
extensions
|
|
334
338
|
}) {
|
|
335
|
-
const
|
|
339
|
+
const renderer = fiber.useThree((state) => state.renderer);
|
|
340
|
+
const isLegacy = fiber.useThree((state) => state.isLegacy);
|
|
336
341
|
const defaultScene = fiber.useThree((state) => state.scene);
|
|
337
342
|
const camera = React__namespace.useRef(null);
|
|
338
343
|
const [virtualScene] = React__namespace.useState(() => new webgpu.Scene());
|
|
339
344
|
const fbo = React__namespace.useMemo(() => {
|
|
340
|
-
const fbo2 = new
|
|
345
|
+
const fbo2 = isLegacy ? new three.WebGLCubeRenderTarget(resolution) : new webgpu.CubeRenderTarget(resolution);
|
|
341
346
|
fbo2.texture.type = webgpu.HalfFloatType;
|
|
342
347
|
return fbo2;
|
|
343
|
-
}, [resolution]);
|
|
348
|
+
}, [resolution, isLegacy]);
|
|
344
349
|
React__namespace.useEffect(() => {
|
|
345
350
|
return () => {
|
|
346
351
|
fbo.dispose();
|
|
@@ -348,10 +353,10 @@ function EnvironmentPortal({
|
|
|
348
353
|
}, [fbo]);
|
|
349
354
|
React__namespace.useLayoutEffect(() => {
|
|
350
355
|
if (frames === 1) {
|
|
351
|
-
const autoClear =
|
|
352
|
-
|
|
353
|
-
camera.current.update(
|
|
354
|
-
|
|
356
|
+
const autoClear = renderer.autoClear;
|
|
357
|
+
renderer.autoClear = true;
|
|
358
|
+
camera.current.update(renderer, virtualScene);
|
|
359
|
+
renderer.autoClear = autoClear;
|
|
355
360
|
}
|
|
356
361
|
return setEnvProps(background, scene, defaultScene, fbo.texture, {
|
|
357
362
|
backgroundBlurriness: blur ?? backgroundBlurriness,
|
|
@@ -368,7 +373,7 @@ function EnvironmentPortal({
|
|
|
368
373
|
defaultScene,
|
|
369
374
|
background,
|
|
370
375
|
frames,
|
|
371
|
-
|
|
376
|
+
renderer,
|
|
372
377
|
blur,
|
|
373
378
|
backgroundBlurriness,
|
|
374
379
|
backgroundIntensity,
|
|
@@ -379,10 +384,10 @@ function EnvironmentPortal({
|
|
|
379
384
|
let count = 1;
|
|
380
385
|
fiber.useFrame(() => {
|
|
381
386
|
if (frames === Infinity || count < frames) {
|
|
382
|
-
const autoClear =
|
|
383
|
-
|
|
384
|
-
camera.current.update(
|
|
385
|
-
|
|
387
|
+
const autoClear = renderer.autoClear;
|
|
388
|
+
renderer.autoClear = true;
|
|
389
|
+
camera.current.update(renderer, virtualScene);
|
|
390
|
+
renderer.autoClear = autoClear;
|
|
386
391
|
count++;
|
|
387
392
|
}
|
|
388
393
|
});
|
|
@@ -446,9 +451,9 @@ function Environment(props) {
|
|
|
446
451
|
return props.ground ? /* @__PURE__ */ jsxRuntime.jsx(EnvironmentGround, { ...props }) : props.map ? /* @__PURE__ */ jsxRuntime.jsx(EnvironmentMap, { ...props }) : props.children ? /* @__PURE__ */ jsxRuntime.jsx(EnvironmentPortal, { ...props }) : /* @__PURE__ */ jsxRuntime.jsx(EnvironmentCube, { ...props });
|
|
447
452
|
}
|
|
448
453
|
|
|
449
|
-
var __defProp
|
|
450
|
-
var __defNormalProp
|
|
451
|
-
var __publicField
|
|
454
|
+
var __defProp = Object.defineProperty;
|
|
455
|
+
var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
|
|
456
|
+
var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
|
|
452
457
|
const act = React__namespace["act"];
|
|
453
458
|
const useIsomorphicLayoutEffect = /* @__PURE__ */ (() => typeof window !== "undefined" && (window.document?.createElement || window.navigator?.product === "ReactNative"))() ? React__namespace.useLayoutEffect : React__namespace.useEffect;
|
|
454
459
|
function useMutableCallback(fn) {
|
|
@@ -480,7 +485,7 @@ const ErrorBoundary = /* @__PURE__ */ (() => {
|
|
|
480
485
|
return _a = class extends React__namespace.Component {
|
|
481
486
|
constructor() {
|
|
482
487
|
super(...arguments);
|
|
483
|
-
__publicField
|
|
488
|
+
__publicField(this, "state", { error: false });
|
|
484
489
|
}
|
|
485
490
|
componentDidCatch(err) {
|
|
486
491
|
this.props.set(err);
|
|
@@ -488,7 +493,7 @@ const ErrorBoundary = /* @__PURE__ */ (() => {
|
|
|
488
493
|
render() {
|
|
489
494
|
return this.state.error ? null : this.props.children;
|
|
490
495
|
}
|
|
491
|
-
}, __publicField
|
|
496
|
+
}, __publicField(_a, "getDerivedStateFromError", () => ({ error: true })), _a;
|
|
492
497
|
})();
|
|
493
498
|
|
|
494
499
|
const is = {
|
|
@@ -625,8 +630,7 @@ function prepare(target, root, type, props) {
|
|
|
625
630
|
object,
|
|
626
631
|
eventCount: 0,
|
|
627
632
|
handlers: {},
|
|
628
|
-
isHidden: false
|
|
629
|
-
deferredRefs: []
|
|
633
|
+
isHidden: false
|
|
630
634
|
};
|
|
631
635
|
if (object) object.__r3f = instance;
|
|
632
636
|
}
|
|
@@ -783,6 +787,17 @@ function unregisterVisibility(store, object) {
|
|
|
783
787
|
internal.visibilityRegistry.delete(object.uuid);
|
|
784
788
|
internal.occlusionCache.delete(object);
|
|
785
789
|
}
|
|
790
|
+
function updateVisibilityHandlers(store, object, handlers) {
|
|
791
|
+
const { internal } = store.getState();
|
|
792
|
+
const entry = internal.visibilityRegistry.get(object.uuid);
|
|
793
|
+
if (!entry) return false;
|
|
794
|
+
entry.handlers = handlers;
|
|
795
|
+
if ((handlers.onOccluded || handlers.onVisible) && !internal.occlusionEnabled) {
|
|
796
|
+
object.occlusionTest = true;
|
|
797
|
+
enableOcclusion(store);
|
|
798
|
+
}
|
|
799
|
+
return true;
|
|
800
|
+
}
|
|
786
801
|
function checkVisibility(state) {
|
|
787
802
|
const { internal, camera } = state;
|
|
788
803
|
const registry = internal.visibilityRegistry;
|
|
@@ -970,10 +985,7 @@ function applyProps(object, props) {
|
|
|
970
985
|
continue;
|
|
971
986
|
}
|
|
972
987
|
if (value === void 0) continue;
|
|
973
|
-
if (isFromRef(value))
|
|
974
|
-
instance?.deferredRefs?.push({ prop, ref: value[FROM_REF] });
|
|
975
|
-
continue;
|
|
976
|
-
}
|
|
988
|
+
if (isFromRef(value)) continue;
|
|
977
989
|
if (isOnce(value)) {
|
|
978
990
|
if (instance?.appliedOnce?.has(prop)) continue;
|
|
979
991
|
if (instance) {
|
|
@@ -1009,6 +1021,19 @@ function applyProps(object, props) {
|
|
|
1009
1021
|
} else if (isVectorLike(target) && is.num(value)) {
|
|
1010
1022
|
if ("setScalar" in target && typeof target.setScalar === "function") target.setScalar(value);
|
|
1011
1023
|
else target.set(value);
|
|
1024
|
+
} else if (root instanceof webgpu.ShaderMaterial && key === "uniforms" && is.obj(value)) {
|
|
1025
|
+
if (!is.obj(root.uniforms)) root.uniforms = {};
|
|
1026
|
+
const uniforms = root.uniforms;
|
|
1027
|
+
const nextUniforms = value;
|
|
1028
|
+
for (const name in nextUniforms) {
|
|
1029
|
+
const uniform = nextUniforms[name];
|
|
1030
|
+
const targetUniform = uniforms[name];
|
|
1031
|
+
if (targetUniform) Object.assign(targetUniform, uniform);
|
|
1032
|
+
else {
|
|
1033
|
+
const nextUniform = uniform instanceof webgpu.Uniform ? uniform.clone() : new webgpu.Uniform(uniform.value);
|
|
1034
|
+
uniforms[name] = nextUniform;
|
|
1035
|
+
}
|
|
1036
|
+
}
|
|
1012
1037
|
} else {
|
|
1013
1038
|
root[key] = value;
|
|
1014
1039
|
if (key.endsWith("Node") && root.isMaterial) {
|
|
@@ -1027,6 +1052,9 @@ function applyProps(object, props) {
|
|
|
1027
1052
|
if (instance.eventCount && object2.raycast !== null) {
|
|
1028
1053
|
rootState.internal.interaction.push(object2);
|
|
1029
1054
|
}
|
|
1055
|
+
}
|
|
1056
|
+
if (instance?.parent && rootState?.internal && instance.object?.isObject3D) {
|
|
1057
|
+
const object2 = instance.object;
|
|
1030
1058
|
const root = findInitialRoot(instance);
|
|
1031
1059
|
const visibilityHandlers = {
|
|
1032
1060
|
onFramed: instance.handlers.onFramed,
|
|
@@ -1034,7 +1062,9 @@ function applyProps(object, props) {
|
|
|
1034
1062
|
onVisible: instance.handlers.onVisible
|
|
1035
1063
|
};
|
|
1036
1064
|
if (hasVisibilityHandlers(visibilityHandlers)) {
|
|
1037
|
-
|
|
1065
|
+
if (!updateVisibilityHandlers(root, object2, visibilityHandlers)) {
|
|
1066
|
+
registerVisibility(root, object2, visibilityHandlers);
|
|
1067
|
+
}
|
|
1038
1068
|
} else {
|
|
1039
1069
|
unregisterVisibility(root, object2);
|
|
1040
1070
|
}
|
|
@@ -1562,6 +1592,7 @@ function createPointerEvents(store) {
|
|
|
1562
1592
|
set((state) => ({ events: { ...state.events, connected: void 0 } }));
|
|
1563
1593
|
}
|
|
1564
1594
|
},
|
|
1595
|
+
// PREVIEW (A8): the XR pointer registration API may change before stable.
|
|
1565
1596
|
registerPointer: (config) => {
|
|
1566
1597
|
const pointerId = nextXRPointerId++;
|
|
1567
1598
|
xrPointers.set(pointerId, config);
|
|
@@ -1648,1036 +1679,11 @@ function notifyAlpha({ message, link }) {
|
|
|
1648
1679
|
}
|
|
1649
1680
|
}
|
|
1650
1681
|
|
|
1651
|
-
|
|
1652
|
-
|
|
1653
|
-
|
|
1654
|
-
const
|
|
1655
|
-
|
|
1656
|
-
constructor() {
|
|
1657
|
-
/** Ordered list of phase nodes */
|
|
1658
|
-
__publicField$1(this, "phases", []);
|
|
1659
|
-
/** Quick lookup by name */
|
|
1660
|
-
__publicField$1(this, "phaseMap", /* @__PURE__ */ new Map());
|
|
1661
|
-
/** Cached ordered names (invalidated on changes) */
|
|
1662
|
-
__publicField$1(this, "orderedNamesCache", null);
|
|
1663
|
-
this.initializeDefaultPhases();
|
|
1664
|
-
}
|
|
1665
|
-
//* Initialization --------------------------------
|
|
1666
|
-
initializeDefaultPhases() {
|
|
1667
|
-
for (const name of DEFAULT_PHASES) {
|
|
1668
|
-
const node = { name, isAutoGenerated: false };
|
|
1669
|
-
this.phases.push(node);
|
|
1670
|
-
this.phaseMap.set(name, node);
|
|
1671
|
-
}
|
|
1672
|
-
this.invalidateCache();
|
|
1673
|
-
}
|
|
1674
|
-
//* Public API --------------------------------
|
|
1675
|
-
/**
|
|
1676
|
-
* Add a named phase to the graph
|
|
1677
|
-
* @param name - Phase name (must be unique)
|
|
1678
|
-
* @param options - Position options (before or after another phase)
|
|
1679
|
-
*/
|
|
1680
|
-
addPhase(name, options = {}) {
|
|
1681
|
-
if (this.phaseMap.has(name)) {
|
|
1682
|
-
console.warn(`[useFrame] Phase "${name}" already exists`);
|
|
1683
|
-
return;
|
|
1684
|
-
}
|
|
1685
|
-
const { before, after } = options;
|
|
1686
|
-
const node = { name, isAutoGenerated: false };
|
|
1687
|
-
let insertIndex = this.phases.length;
|
|
1688
|
-
const targetIndex = this.getPhaseIndex(before ?? after);
|
|
1689
|
-
if (targetIndex !== -1) {
|
|
1690
|
-
insertIndex = before ? targetIndex : targetIndex + 1;
|
|
1691
|
-
} else {
|
|
1692
|
-
const constraintType = before ? "before" : "after";
|
|
1693
|
-
console.warn(`[useFrame] Phase "${before ?? after}" not found for '${constraintType}' constraint`);
|
|
1694
|
-
}
|
|
1695
|
-
this.phases.splice(insertIndex, 0, node);
|
|
1696
|
-
this.phaseMap.set(name, node);
|
|
1697
|
-
this.invalidateCache();
|
|
1698
|
-
}
|
|
1699
|
-
/**
|
|
1700
|
-
* Get ordered list of phase names
|
|
1701
|
-
*/
|
|
1702
|
-
getOrderedPhases() {
|
|
1703
|
-
if (this.orderedNamesCache === null) this.orderedNamesCache = this.phases.map((p) => p.name);
|
|
1704
|
-
return this.orderedNamesCache;
|
|
1705
|
-
}
|
|
1706
|
-
/**
|
|
1707
|
-
* Check if a phase exists
|
|
1708
|
-
*/
|
|
1709
|
-
hasPhase(name) {
|
|
1710
|
-
return this.phaseMap.has(name);
|
|
1711
|
-
}
|
|
1712
|
-
/**
|
|
1713
|
-
* Get the index of a phase (-1 if not found)
|
|
1714
|
-
*/
|
|
1715
|
-
getPhaseIndex(name) {
|
|
1716
|
-
if (!name) return -1;
|
|
1717
|
-
return this.phases.findIndex((p) => p.name === name);
|
|
1718
|
-
}
|
|
1719
|
-
/**
|
|
1720
|
-
* Ensure a phase exists, creating an auto-generated one if needed.
|
|
1721
|
-
* Used for resolving before/after constraints.
|
|
1722
|
-
*
|
|
1723
|
-
* @param name - The phase name to ensure exists
|
|
1724
|
-
* @returns The phase name (may be auto-generated like 'before:render')
|
|
1725
|
-
*/
|
|
1726
|
-
ensurePhase(name) {
|
|
1727
|
-
if (this.phaseMap.has(name)) return name;
|
|
1728
|
-
const node = { name, isAutoGenerated: true };
|
|
1729
|
-
this.phases.push(node);
|
|
1730
|
-
this.phaseMap.set(name, node);
|
|
1731
|
-
this.invalidateCache();
|
|
1732
|
-
return name;
|
|
1733
|
-
}
|
|
1734
|
-
/**
|
|
1735
|
-
* Resolve where a job with before/after constraints should go.
|
|
1736
|
-
* Creates auto-generated phases if needed.
|
|
1737
|
-
*
|
|
1738
|
-
* @param before - Phase(s) to run before
|
|
1739
|
-
* @param after - Phase(s) to run after
|
|
1740
|
-
* @returns The resolved phase name
|
|
1741
|
-
*/
|
|
1742
|
-
resolveConstraintPhase(before, after) {
|
|
1743
|
-
const beforeArr = before ? Array.isArray(before) ? before : [before] : [];
|
|
1744
|
-
const afterArr = after ? Array.isArray(after) ? after : [after] : [];
|
|
1745
|
-
if (beforeArr.length > 0) {
|
|
1746
|
-
return this.ensureAutoPhase(beforeArr[0], "before", 0);
|
|
1747
|
-
}
|
|
1748
|
-
if (afterArr.length > 0) {
|
|
1749
|
-
return this.ensureAutoPhase(afterArr[0], "after", 1);
|
|
1750
|
-
}
|
|
1751
|
-
return "update";
|
|
1752
|
-
}
|
|
1753
|
-
/**
|
|
1754
|
-
* Ensure an auto-generated phase exists relative to a target phase.
|
|
1755
|
-
* Creates the phase if it doesn't exist, inserting it at the correct position.
|
|
1756
|
-
*
|
|
1757
|
-
* @param target - The target phase name to position relative to
|
|
1758
|
-
* @param prefix - Prefix for auto-generated phase name ('before' or 'after')
|
|
1759
|
-
* @param offset - Insertion offset (0 for before, 1 for after)
|
|
1760
|
-
* @returns The auto-generated phase name
|
|
1761
|
-
*/
|
|
1762
|
-
ensureAutoPhase(target, prefix, offset) {
|
|
1763
|
-
const autoName = `${prefix}:${target}`;
|
|
1764
|
-
if (this.phaseMap.has(autoName)) return autoName;
|
|
1765
|
-
const node = { name: autoName, isAutoGenerated: true };
|
|
1766
|
-
const targetIndex = this.getPhaseIndex(target);
|
|
1767
|
-
if (targetIndex !== -1) this.phases.splice(targetIndex + offset, 0, node);
|
|
1768
|
-
else this.phases.push(node);
|
|
1769
|
-
this.phaseMap.set(autoName, node);
|
|
1770
|
-
this.invalidateCache();
|
|
1771
|
-
return autoName;
|
|
1772
|
-
}
|
|
1773
|
-
// Internal --------------------------------
|
|
1774
|
-
invalidateCache() {
|
|
1775
|
-
this.orderedNamesCache = null;
|
|
1776
|
-
}
|
|
1777
|
-
}
|
|
1778
|
-
|
|
1779
|
-
function rebuildSortedJobs(jobs, phaseGraph) {
|
|
1780
|
-
const orderedPhases = phaseGraph.getOrderedPhases();
|
|
1781
|
-
const buckets = /* @__PURE__ */ new Map();
|
|
1782
|
-
for (const phase of orderedPhases) {
|
|
1783
|
-
buckets.set(phase, []);
|
|
1784
|
-
}
|
|
1785
|
-
for (const job of jobs.values()) {
|
|
1786
|
-
if (!job.enabled) continue;
|
|
1787
|
-
let bucket = buckets.get(job.phase);
|
|
1788
|
-
if (!bucket) {
|
|
1789
|
-
bucket = [];
|
|
1790
|
-
buckets.set(job.phase, bucket);
|
|
1791
|
-
}
|
|
1792
|
-
bucket.push(job);
|
|
1793
|
-
}
|
|
1794
|
-
const sortedBuckets = [];
|
|
1795
|
-
for (const phase of orderedPhases) {
|
|
1796
|
-
const bucket = buckets.get(phase);
|
|
1797
|
-
if (!bucket || bucket.length === 0) continue;
|
|
1798
|
-
bucket.sort((a, b) => {
|
|
1799
|
-
if (a.priority !== b.priority) return b.priority - a.priority;
|
|
1800
|
-
return a.index - b.index;
|
|
1801
|
-
});
|
|
1802
|
-
sortedBuckets.push(hasCrossJobConstraints(bucket) ? topologicalSort(bucket) : bucket);
|
|
1803
|
-
}
|
|
1804
|
-
for (const [phase, bucket] of buckets) {
|
|
1805
|
-
if (!orderedPhases.includes(phase) && bucket.length > 0) {
|
|
1806
|
-
bucket.sort((a, b) => {
|
|
1807
|
-
if (a.priority !== b.priority) return b.priority - a.priority;
|
|
1808
|
-
return a.index - b.index;
|
|
1809
|
-
});
|
|
1810
|
-
sortedBuckets.push(bucket);
|
|
1811
|
-
}
|
|
1812
|
-
}
|
|
1813
|
-
return sortedBuckets.flat();
|
|
1814
|
-
}
|
|
1815
|
-
function hasCrossJobConstraints(bucket) {
|
|
1816
|
-
const jobIds = new Set(bucket.map((j) => j.id));
|
|
1817
|
-
for (const job of bucket) {
|
|
1818
|
-
for (const ref of job.before) {
|
|
1819
|
-
if (jobIds.has(ref)) return true;
|
|
1820
|
-
}
|
|
1821
|
-
for (const ref of job.after) {
|
|
1822
|
-
if (jobIds.has(ref)) return true;
|
|
1823
|
-
}
|
|
1824
|
-
}
|
|
1825
|
-
return false;
|
|
1826
|
-
}
|
|
1827
|
-
function topologicalSort(jobs) {
|
|
1828
|
-
const n = jobs.length;
|
|
1829
|
-
if (n <= 1) return jobs;
|
|
1830
|
-
const jobMap = /* @__PURE__ */ new Map();
|
|
1831
|
-
const inDegree = /* @__PURE__ */ new Map();
|
|
1832
|
-
const adjacency = /* @__PURE__ */ new Map();
|
|
1833
|
-
for (const job of jobs) {
|
|
1834
|
-
jobMap.set(job.id, job);
|
|
1835
|
-
inDegree.set(job.id, 0);
|
|
1836
|
-
adjacency.set(job.id, []);
|
|
1837
|
-
}
|
|
1838
|
-
for (const job of jobs) {
|
|
1839
|
-
for (const ref of job.before) {
|
|
1840
|
-
if (jobMap.has(ref)) {
|
|
1841
|
-
adjacency.get(job.id).push(ref);
|
|
1842
|
-
inDegree.set(ref, inDegree.get(ref) + 1);
|
|
1843
|
-
}
|
|
1844
|
-
}
|
|
1845
|
-
for (const ref of job.after) {
|
|
1846
|
-
if (jobMap.has(ref)) {
|
|
1847
|
-
adjacency.get(ref).push(job.id);
|
|
1848
|
-
inDegree.set(job.id, inDegree.get(job.id) + 1);
|
|
1849
|
-
}
|
|
1850
|
-
}
|
|
1851
|
-
}
|
|
1852
|
-
const queue = [];
|
|
1853
|
-
for (const job of jobs) {
|
|
1854
|
-
if (inDegree.get(job.id) === 0) {
|
|
1855
|
-
queue.push(job);
|
|
1856
|
-
}
|
|
1857
|
-
}
|
|
1858
|
-
queue.sort((a, b) => {
|
|
1859
|
-
if (a.priority !== b.priority) return b.priority - a.priority;
|
|
1860
|
-
return a.index - b.index;
|
|
1861
|
-
});
|
|
1862
|
-
const result = [];
|
|
1863
|
-
while (queue.length > 0) {
|
|
1864
|
-
const job = queue.shift();
|
|
1865
|
-
result.push(job);
|
|
1866
|
-
const neighbors = adjacency.get(job.id) || [];
|
|
1867
|
-
for (const neighborId of neighbors) {
|
|
1868
|
-
const newDegree = inDegree.get(neighborId) - 1;
|
|
1869
|
-
inDegree.set(neighborId, newDegree);
|
|
1870
|
-
if (newDegree === 0) {
|
|
1871
|
-
const neighbor = jobMap.get(neighborId);
|
|
1872
|
-
insertSorted(queue, neighbor);
|
|
1873
|
-
}
|
|
1874
|
-
}
|
|
1875
|
-
}
|
|
1876
|
-
if (result.length !== n) {
|
|
1877
|
-
console.warn("[useFrame] Circular dependency detected in job constraints");
|
|
1878
|
-
const resultIds = new Set(result.map((j) => j.id));
|
|
1879
|
-
for (const job of jobs) {
|
|
1880
|
-
if (!resultIds.has(job.id)) result.push(job);
|
|
1881
|
-
}
|
|
1882
|
-
}
|
|
1883
|
-
return result;
|
|
1884
|
-
}
|
|
1885
|
-
function insertSorted(arr, job) {
|
|
1886
|
-
let i = 0;
|
|
1887
|
-
while (i < arr.length) {
|
|
1888
|
-
const cmp = arr[i];
|
|
1889
|
-
if (job.priority > cmp.priority || job.priority === cmp.priority && job.index < cmp.index) {
|
|
1890
|
-
break;
|
|
1891
|
-
}
|
|
1892
|
-
i++;
|
|
1893
|
-
}
|
|
1894
|
-
arr.splice(i, 0, job);
|
|
1895
|
-
}
|
|
1896
|
-
|
|
1897
|
-
function shouldRun(job, now) {
|
|
1898
|
-
if (!job.enabled) return false;
|
|
1899
|
-
if (!job.fps) return true;
|
|
1900
|
-
const minInterval = 1e3 / job.fps;
|
|
1901
|
-
const lastRun = job.lastRun ?? 0;
|
|
1902
|
-
const elapsed = now - lastRun;
|
|
1903
|
-
if (elapsed < minInterval - 1) return false;
|
|
1904
|
-
if (job.drop) {
|
|
1905
|
-
job.lastRun = now;
|
|
1906
|
-
} else {
|
|
1907
|
-
const steps = Math.floor(elapsed / minInterval);
|
|
1908
|
-
job.lastRun = lastRun + steps * minInterval;
|
|
1909
|
-
if (job.lastRun < now - minInterval) {
|
|
1910
|
-
job.lastRun = now;
|
|
1911
|
-
}
|
|
1912
|
-
}
|
|
1913
|
-
return true;
|
|
1914
|
-
}
|
|
1915
|
-
function resetJobTiming(job) {
|
|
1916
|
-
job.lastRun = void 0;
|
|
1917
|
-
}
|
|
1918
|
-
|
|
1919
|
-
var __defProp = Object.defineProperty;
|
|
1920
|
-
var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
|
|
1921
|
-
var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
|
|
1922
|
-
const hmrData = (() => {
|
|
1923
|
-
if (typeof process !== "undefined" && process.env.NODE_ENV === "test") return void 0;
|
|
1924
|
-
if (typeof import_meta_hot !== "undefined") return import_meta_hot;
|
|
1925
|
-
try {
|
|
1926
|
-
return (0, eval)("import.meta.hot");
|
|
1927
|
-
} catch {
|
|
1928
|
-
return void 0;
|
|
1929
|
-
}
|
|
1930
|
-
})();
|
|
1931
|
-
const _Scheduler = class _Scheduler {
|
|
1932
|
-
//* Constructor ================================
|
|
1933
|
-
constructor() {
|
|
1934
|
-
//* Critical State ================================
|
|
1935
|
-
__publicField(this, "roots", /* @__PURE__ */ new Map());
|
|
1936
|
-
__publicField(this, "phaseGraph");
|
|
1937
|
-
__publicField(this, "loopState", {
|
|
1938
|
-
running: false,
|
|
1939
|
-
rafHandle: null,
|
|
1940
|
-
lastTime: null,
|
|
1941
|
-
// null = uninitialized, 0+ = valid timestamp
|
|
1942
|
-
frameCount: 0,
|
|
1943
|
-
elapsedTime: 0,
|
|
1944
|
-
createdAt: performance.now()
|
|
1945
|
-
});
|
|
1946
|
-
__publicField(this, "stoppedTime", 0);
|
|
1947
|
-
//* Private State ================================
|
|
1948
|
-
__publicField(this, "nextRootIndex", 0);
|
|
1949
|
-
__publicField(this, "globalBeforeJobs", /* @__PURE__ */ new Map());
|
|
1950
|
-
__publicField(this, "globalAfterJobs", /* @__PURE__ */ new Map());
|
|
1951
|
-
__publicField(this, "nextGlobalIndex", 0);
|
|
1952
|
-
__publicField(this, "idleCallbacks", /* @__PURE__ */ new Set());
|
|
1953
|
-
__publicField(this, "nextJobIndex", 0);
|
|
1954
|
-
__publicField(this, "jobStateListeners", /* @__PURE__ */ new Map());
|
|
1955
|
-
__publicField(this, "pendingFrames", 0);
|
|
1956
|
-
__publicField(this, "_frameloop", "always");
|
|
1957
|
-
//* Independent Mode & Error Handling State ================================
|
|
1958
|
-
__publicField(this, "_independent", false);
|
|
1959
|
-
__publicField(this, "errorHandler", null);
|
|
1960
|
-
__publicField(this, "rootReadyCallbacks", /* @__PURE__ */ new Set());
|
|
1961
|
-
//* Core Loop Execution Methods ================================
|
|
1962
|
-
/**
|
|
1963
|
-
* Main RAF loop callback.
|
|
1964
|
-
* Executes frame, handles demand mode, and schedules next frame.
|
|
1965
|
-
* @param {number} timestamp - RAF timestamp in milliseconds
|
|
1966
|
-
* @returns {void}
|
|
1967
|
-
* @private
|
|
1968
|
-
*/
|
|
1969
|
-
__publicField(this, "loop", (timestamp) => {
|
|
1970
|
-
if (!this.loopState.running) return;
|
|
1971
|
-
this.executeFrame(timestamp);
|
|
1972
|
-
if (this._frameloop === "demand") {
|
|
1973
|
-
this.pendingFrames = Math.max(0, this.pendingFrames - 1);
|
|
1974
|
-
if (this.pendingFrames === 0) {
|
|
1975
|
-
this.notifyIdle(timestamp);
|
|
1976
|
-
return this.stop();
|
|
1977
|
-
}
|
|
1978
|
-
}
|
|
1979
|
-
this.loopState.rafHandle = requestAnimationFrame(this.loop);
|
|
1980
|
-
});
|
|
1981
|
-
this.phaseGraph = new PhaseGraph();
|
|
1982
|
-
}
|
|
1983
|
-
static get instance() {
|
|
1984
|
-
return globalThis[_Scheduler.INSTANCE_KEY] ?? null;
|
|
1985
|
-
}
|
|
1986
|
-
static set instance(value) {
|
|
1987
|
-
globalThis[_Scheduler.INSTANCE_KEY] = value;
|
|
1988
|
-
}
|
|
1989
|
-
/**
|
|
1990
|
-
* Get the global scheduler instance (creates if doesn't exist).
|
|
1991
|
-
* Uses HMR data to preserve instance across hot reloads.
|
|
1992
|
-
* @returns {Scheduler} The singleton scheduler instance
|
|
1993
|
-
*/
|
|
1994
|
-
static get() {
|
|
1995
|
-
if (!_Scheduler.instance && hmrData?.data?.scheduler) {
|
|
1996
|
-
_Scheduler.instance = hmrData.data.scheduler;
|
|
1997
|
-
}
|
|
1998
|
-
if (!_Scheduler.instance) {
|
|
1999
|
-
_Scheduler.instance = new _Scheduler();
|
|
2000
|
-
if (hmrData?.data) {
|
|
2001
|
-
hmrData.data.scheduler = _Scheduler.instance;
|
|
2002
|
-
}
|
|
2003
|
-
}
|
|
2004
|
-
return _Scheduler.instance;
|
|
2005
|
-
}
|
|
2006
|
-
/**
|
|
2007
|
-
* Reset the singleton instance. Stops the loop and clears all state.
|
|
2008
|
-
* Primarily used for testing to ensure clean state between tests.
|
|
2009
|
-
* @returns {void}
|
|
2010
|
-
*/
|
|
2011
|
-
static reset() {
|
|
2012
|
-
if (_Scheduler.instance) {
|
|
2013
|
-
_Scheduler.instance.stop();
|
|
2014
|
-
_Scheduler.instance = null;
|
|
2015
|
-
}
|
|
2016
|
-
if (hmrData?.data) {
|
|
2017
|
-
hmrData.data.scheduler = null;
|
|
2018
|
-
}
|
|
2019
|
-
}
|
|
2020
|
-
//* Getters & Setters ================================
|
|
2021
|
-
get phases() {
|
|
2022
|
-
return this.phaseGraph.getOrderedPhases();
|
|
2023
|
-
}
|
|
2024
|
-
get frameloop() {
|
|
2025
|
-
return this._frameloop;
|
|
2026
|
-
}
|
|
2027
|
-
set frameloop(mode) {
|
|
2028
|
-
if (this._frameloop === mode) return;
|
|
2029
|
-
const wasAlways = this._frameloop === "always";
|
|
2030
|
-
this._frameloop = mode;
|
|
2031
|
-
if (mode === "always" && !this.loopState.running && this.roots.size > 0) this.start();
|
|
2032
|
-
else if (mode !== "always" && wasAlways) this.stop();
|
|
2033
|
-
}
|
|
2034
|
-
get isRunning() {
|
|
2035
|
-
return this.loopState.running;
|
|
2036
|
-
}
|
|
2037
|
-
get isReady() {
|
|
2038
|
-
return this.roots.size > 0;
|
|
2039
|
-
}
|
|
2040
|
-
get independent() {
|
|
2041
|
-
return this._independent;
|
|
2042
|
-
}
|
|
2043
|
-
set independent(value) {
|
|
2044
|
-
this._independent = value;
|
|
2045
|
-
if (value) this.ensureDefaultRoot();
|
|
2046
|
-
}
|
|
2047
|
-
//* Root Management Methods ================================
|
|
2048
|
-
/**
|
|
2049
|
-
* Register a root (Canvas) with the scheduler.
|
|
2050
|
-
* The first root to register starts the RAF loop (if frameloop='always').
|
|
2051
|
-
* @param {string} id - Unique identifier for this root
|
|
2052
|
-
* @param {RootOptions} [options] - Optional configuration with getState and onError callbacks
|
|
2053
|
-
* @returns {() => void} Unsubscribe function to remove this root
|
|
2054
|
-
*/
|
|
2055
|
-
registerRoot(id, options = {}) {
|
|
2056
|
-
if (this.roots.has(id)) {
|
|
2057
|
-
console.warn(`[Scheduler] Root "${id}" already registered`);
|
|
2058
|
-
return () => this.unregisterRoot(id);
|
|
2059
|
-
}
|
|
2060
|
-
const entry = {
|
|
2061
|
-
id,
|
|
2062
|
-
getState: options.getState ?? (() => ({})),
|
|
2063
|
-
jobs: /* @__PURE__ */ new Map(),
|
|
2064
|
-
sortedJobs: [],
|
|
2065
|
-
needsRebuild: false
|
|
2066
|
-
};
|
|
2067
|
-
if (options.onError) {
|
|
2068
|
-
this.errorHandler = options.onError;
|
|
2069
|
-
}
|
|
2070
|
-
this.roots.set(id, entry);
|
|
2071
|
-
if (this.roots.size === 1) {
|
|
2072
|
-
this.notifyRootReady();
|
|
2073
|
-
if (this._frameloop === "always") this.start();
|
|
2074
|
-
}
|
|
2075
|
-
return () => this.unregisterRoot(id);
|
|
2076
|
-
}
|
|
2077
|
-
/**
|
|
2078
|
-
* Unregister a root from the scheduler.
|
|
2079
|
-
* Cleans up all job state listeners for this root's jobs.
|
|
2080
|
-
* The last root to unregister stops the RAF loop.
|
|
2081
|
-
* @param {string} id - The root ID to unregister
|
|
2082
|
-
* @returns {void}
|
|
2083
|
-
*/
|
|
2084
|
-
unregisterRoot(id) {
|
|
2085
|
-
const root = this.roots.get(id);
|
|
2086
|
-
if (!root) return;
|
|
2087
|
-
for (const jobId of root.jobs.keys()) {
|
|
2088
|
-
this.jobStateListeners.delete(jobId);
|
|
2089
|
-
}
|
|
2090
|
-
this.roots.delete(id);
|
|
2091
|
-
if (this.roots.size === 0) {
|
|
2092
|
-
this.stop();
|
|
2093
|
-
this.errorHandler = null;
|
|
2094
|
-
}
|
|
2095
|
-
}
|
|
2096
|
-
/**
|
|
2097
|
-
* Subscribe to be notified when a root becomes available.
|
|
2098
|
-
* Fires immediately if a root already exists.
|
|
2099
|
-
* @param {() => void} callback - Function called when first root registers
|
|
2100
|
-
* @returns {() => void} Unsubscribe function
|
|
2101
|
-
*/
|
|
2102
|
-
onRootReady(callback) {
|
|
2103
|
-
if (this.roots.size > 0) {
|
|
2104
|
-
callback();
|
|
2105
|
-
return () => {
|
|
2106
|
-
};
|
|
2107
|
-
}
|
|
2108
|
-
this.rootReadyCallbacks.add(callback);
|
|
2109
|
-
return () => this.rootReadyCallbacks.delete(callback);
|
|
2110
|
-
}
|
|
2111
|
-
/**
|
|
2112
|
-
* Notify all registered root-ready callbacks.
|
|
2113
|
-
* Called when the first root registers.
|
|
2114
|
-
* @returns {void}
|
|
2115
|
-
* @private
|
|
2116
|
-
*/
|
|
2117
|
-
notifyRootReady() {
|
|
2118
|
-
for (const cb of this.rootReadyCallbacks) {
|
|
2119
|
-
try {
|
|
2120
|
-
cb();
|
|
2121
|
-
} catch (error) {
|
|
2122
|
-
console.error("[Scheduler] Error in root-ready callback:", error);
|
|
2123
|
-
}
|
|
2124
|
-
}
|
|
2125
|
-
this.rootReadyCallbacks.clear();
|
|
2126
|
-
}
|
|
2127
|
-
/**
|
|
2128
|
-
* Ensure a default root exists for independent mode.
|
|
2129
|
-
* Creates a minimal root with no state provider.
|
|
2130
|
-
* @returns {void}
|
|
2131
|
-
* @private
|
|
2132
|
-
*/
|
|
2133
|
-
ensureDefaultRoot() {
|
|
2134
|
-
if (!this.roots.has("__default__")) {
|
|
2135
|
-
this.registerRoot("__default__");
|
|
2136
|
-
}
|
|
2137
|
-
}
|
|
2138
|
-
/**
|
|
2139
|
-
* Trigger error handling for job errors.
|
|
2140
|
-
* Uses the bound error handler if available, otherwise logs to console.
|
|
2141
|
-
* @param {Error} error - The error to handle
|
|
2142
|
-
* @returns {void}
|
|
2143
|
-
*/
|
|
2144
|
-
triggerError(error) {
|
|
2145
|
-
if (this.errorHandler) this.errorHandler(error);
|
|
2146
|
-
else console.error("[Scheduler]", error);
|
|
2147
|
-
}
|
|
2148
|
-
//* Phase Management Methods ================================
|
|
2149
|
-
/**
|
|
2150
|
-
* Add a named phase to the scheduler's execution order.
|
|
2151
|
-
* Marks all roots for rebuild to incorporate the new phase.
|
|
2152
|
-
* @param {string} name - The phase name (e.g., 'physics', 'postprocess')
|
|
2153
|
-
* @param {AddPhaseOptions} [options] - Positioning options (before/after other phases)
|
|
2154
|
-
* @returns {void}
|
|
2155
|
-
* @example
|
|
2156
|
-
* scheduler.addPhase('physics', { before: 'update' });
|
|
2157
|
-
* scheduler.addPhase('postprocess', { after: 'render' });
|
|
2158
|
-
*/
|
|
2159
|
-
addPhase(name, options) {
|
|
2160
|
-
this.phaseGraph.addPhase(name, options);
|
|
2161
|
-
for (const root of this.roots.values()) {
|
|
2162
|
-
root.needsRebuild = true;
|
|
2163
|
-
}
|
|
2164
|
-
}
|
|
2165
|
-
/**
|
|
2166
|
-
* Check if a phase exists in the scheduler.
|
|
2167
|
-
* @param {string} name - The phase name to check
|
|
2168
|
-
* @returns {boolean} True if the phase exists
|
|
2169
|
-
*/
|
|
2170
|
-
hasPhase(name) {
|
|
2171
|
-
return this.phaseGraph.hasPhase(name);
|
|
2172
|
-
}
|
|
2173
|
-
//* Global Job Registration Methods (Deprecated APIs) ================================
|
|
2174
|
-
/**
|
|
2175
|
-
* Register a global job that runs once per frame (not per-root).
|
|
2176
|
-
* Used internally by deprecated addEffect/addAfterEffect APIs.
|
|
2177
|
-
* @param {'before' | 'after'} phase - When to run: 'before' all roots or 'after' all roots
|
|
2178
|
-
* @param {string} id - Unique identifier for this global job
|
|
2179
|
-
* @param {(timestamp: number) => void} callback - Function called each frame with RAF timestamp
|
|
2180
|
-
* @returns {() => void} Unsubscribe function to remove this global job
|
|
2181
|
-
* @deprecated Use useFrame with phases instead
|
|
2182
|
-
*/
|
|
2183
|
-
registerGlobal(phase, id, callback) {
|
|
2184
|
-
const job = { id, callback };
|
|
2185
|
-
if (phase === "before") {
|
|
2186
|
-
this.globalBeforeJobs.set(id, job);
|
|
2187
|
-
} else {
|
|
2188
|
-
this.globalAfterJobs.set(id, job);
|
|
2189
|
-
}
|
|
2190
|
-
return () => {
|
|
2191
|
-
if (phase === "before") this.globalBeforeJobs.delete(id);
|
|
2192
|
-
else this.globalAfterJobs.delete(id);
|
|
2193
|
-
};
|
|
2194
|
-
}
|
|
2195
|
-
//* Idle Callback Methods (Deprecated API) ================================
|
|
2196
|
-
/**
|
|
2197
|
-
* Register an idle callback that fires when the loop stops.
|
|
2198
|
-
* Used internally by deprecated addTail API.
|
|
2199
|
-
* @param {(timestamp: number) => void} callback - Function called when loop becomes idle
|
|
2200
|
-
* @returns {() => void} Unsubscribe function to remove this idle callback
|
|
2201
|
-
* @deprecated Use demand mode with invalidate() instead
|
|
2202
|
-
*/
|
|
2203
|
-
onIdle(callback) {
|
|
2204
|
-
this.idleCallbacks.add(callback);
|
|
2205
|
-
return () => this.idleCallbacks.delete(callback);
|
|
2206
|
-
}
|
|
2207
|
-
/**
|
|
2208
|
-
* Notify all registered idle callbacks.
|
|
2209
|
-
* Called when the loop stops in demand mode.
|
|
2210
|
-
* @param {number} timestamp - The RAF timestamp when idle occurred
|
|
2211
|
-
* @returns {void}
|
|
2212
|
-
* @private
|
|
2213
|
-
*/
|
|
2214
|
-
notifyIdle(timestamp) {
|
|
2215
|
-
for (const cb of this.idleCallbacks) {
|
|
2216
|
-
try {
|
|
2217
|
-
cb(timestamp);
|
|
2218
|
-
} catch (error) {
|
|
2219
|
-
console.error("[Scheduler] Error in idle callback:", error);
|
|
2220
|
-
}
|
|
2221
|
-
}
|
|
2222
|
-
}
|
|
2223
|
-
//* Job Registration & Management Methods ================================
|
|
2224
|
-
/**
|
|
2225
|
-
* Register a job (frame callback) with a specific root.
|
|
2226
|
-
* This is the core registration method used by useFrame internally.
|
|
2227
|
-
* @param {FrameNextCallback} callback - The function to call each frame
|
|
2228
|
-
* @param {JobOptions & { rootId?: string; system?: boolean }} [options] - Job configuration
|
|
2229
|
-
* @param {string} [options.rootId] - Target root ID (defaults to first registered root)
|
|
2230
|
-
* @param {string} [options.id] - Unique job ID (auto-generated if not provided)
|
|
2231
|
-
* @param {string} [options.phase] - Execution phase (defaults to 'update')
|
|
2232
|
-
* @param {number} [options.priority] - Priority within phase (higher = earlier, default 0)
|
|
2233
|
-
* @param {number} [options.fps] - FPS throttle limit
|
|
2234
|
-
* @param {boolean} [options.drop] - Drop frames when behind (default true)
|
|
2235
|
-
* @param {boolean} [options.enabled] - Whether job is active (default true)
|
|
2236
|
-
* @param {boolean} [options.system] - Internal flag for system jobs (not user-facing)
|
|
2237
|
-
* @returns {() => void} Unsubscribe function to remove this job
|
|
2238
|
-
*/
|
|
2239
|
-
register(callback, options = {}) {
|
|
2240
|
-
const rootId = options.rootId;
|
|
2241
|
-
const root = rootId ? this.roots.get(rootId) : this.roots.values().next().value;
|
|
2242
|
-
if (!root) {
|
|
2243
|
-
console.warn("[Scheduler] No root registered. Is this inside a Canvas?");
|
|
2244
|
-
return () => {
|
|
2245
|
-
};
|
|
2246
|
-
}
|
|
2247
|
-
const id = options.id ?? this.generateJobId();
|
|
2248
|
-
let phase = options.phase ?? "update";
|
|
2249
|
-
if (!options.phase && (options.before || options.after)) {
|
|
2250
|
-
phase = this.phaseGraph.resolveConstraintPhase(options.before, options.after);
|
|
2251
|
-
}
|
|
2252
|
-
const before = this.normalizeConstraints(options.before);
|
|
2253
|
-
const after = this.normalizeConstraints(options.after);
|
|
2254
|
-
const job = {
|
|
2255
|
-
id,
|
|
2256
|
-
callback,
|
|
2257
|
-
phase,
|
|
2258
|
-
before,
|
|
2259
|
-
after,
|
|
2260
|
-
priority: options.priority ?? 0,
|
|
2261
|
-
index: this.nextJobIndex++,
|
|
2262
|
-
fps: options.fps,
|
|
2263
|
-
drop: options.drop ?? true,
|
|
2264
|
-
enabled: options.enabled ?? true,
|
|
2265
|
-
system: options.system ?? false
|
|
2266
|
-
};
|
|
2267
|
-
if (root.jobs.has(id)) {
|
|
2268
|
-
console.warn(`[useFrame] Job with id "${id}" already exists, replacing`);
|
|
2269
|
-
}
|
|
2270
|
-
root.jobs.set(id, job);
|
|
2271
|
-
root.needsRebuild = true;
|
|
2272
|
-
return () => this.unregister(id, root.id);
|
|
2273
|
-
}
|
|
2274
|
-
/**
|
|
2275
|
-
* Unregister a job by its ID.
|
|
2276
|
-
* Searches all roots if rootId is not provided.
|
|
2277
|
-
* @param {string} id - The job ID to unregister
|
|
2278
|
-
* @param {string} [rootId] - Optional root ID to search (searches all if not provided)
|
|
2279
|
-
* @returns {void}
|
|
2280
|
-
*/
|
|
2281
|
-
unregister(id, rootId) {
|
|
2282
|
-
const root = rootId ? this.roots.get(rootId) : Array.from(this.roots.values()).find((r) => r.jobs.has(id));
|
|
2283
|
-
if (root?.jobs.delete(id)) {
|
|
2284
|
-
root.needsRebuild = true;
|
|
2285
|
-
this.jobStateListeners.delete(id);
|
|
2286
|
-
}
|
|
2287
|
-
}
|
|
2288
|
-
/**
|
|
2289
|
-
* Update a job's options dynamically.
|
|
2290
|
-
* Searches all roots to find the job by ID.
|
|
2291
|
-
* Phase/constraint changes trigger a rebuild of the sorted job list.
|
|
2292
|
-
* @param {string} id - The job ID to update
|
|
2293
|
-
* @param {Partial<JobOptions>} options - The options to update
|
|
2294
|
-
* @returns {void}
|
|
2295
|
-
*/
|
|
2296
|
-
updateJob(id, options) {
|
|
2297
|
-
let job;
|
|
2298
|
-
let root;
|
|
2299
|
-
for (const r of this.roots.values()) {
|
|
2300
|
-
job = r.jobs.get(id);
|
|
2301
|
-
if (job) {
|
|
2302
|
-
root = r;
|
|
2303
|
-
break;
|
|
2304
|
-
}
|
|
2305
|
-
}
|
|
2306
|
-
if (!job || !root) return;
|
|
2307
|
-
if (options.priority !== void 0) job.priority = options.priority;
|
|
2308
|
-
if (options.fps !== void 0) job.fps = options.fps;
|
|
2309
|
-
if (options.drop !== void 0) job.drop = options.drop;
|
|
2310
|
-
if (options.enabled !== void 0) {
|
|
2311
|
-
const wasEnabled = job.enabled;
|
|
2312
|
-
job.enabled = options.enabled;
|
|
2313
|
-
if (!wasEnabled && job.enabled) resetJobTiming(job);
|
|
2314
|
-
if (wasEnabled !== job.enabled) root.needsRebuild = true;
|
|
2315
|
-
}
|
|
2316
|
-
if (options.phase !== void 0 || options.before !== void 0 || options.after !== void 0) {
|
|
2317
|
-
if (options.phase) job.phase = options.phase;
|
|
2318
|
-
if (options.before !== void 0) job.before = this.normalizeConstraints(options.before);
|
|
2319
|
-
if (options.after !== void 0) job.after = this.normalizeConstraints(options.after);
|
|
2320
|
-
root.needsRebuild = true;
|
|
2321
|
-
}
|
|
2322
|
-
}
|
|
2323
|
-
//* Job State Management Methods ================================
|
|
2324
|
-
/**
|
|
2325
|
-
* Check if a job is currently paused (disabled).
|
|
2326
|
-
* @param {string} id - The job ID to check
|
|
2327
|
-
* @returns {boolean} True if the job exists and is paused
|
|
2328
|
-
*/
|
|
2329
|
-
isJobPaused(id) {
|
|
2330
|
-
for (const root of this.roots.values()) {
|
|
2331
|
-
const job = root.jobs.get(id);
|
|
2332
|
-
if (job) return !job.enabled;
|
|
2333
|
-
}
|
|
2334
|
-
return false;
|
|
2335
|
-
}
|
|
2336
|
-
/**
|
|
2337
|
-
* Subscribe to state changes for a specific job.
|
|
2338
|
-
* Listener is called when job is paused or resumed.
|
|
2339
|
-
* @param {string} id - The job ID to subscribe to
|
|
2340
|
-
* @param {() => void} listener - Callback invoked on state changes
|
|
2341
|
-
* @returns {() => void} Unsubscribe function
|
|
2342
|
-
*/
|
|
2343
|
-
subscribeJobState(id, listener) {
|
|
2344
|
-
if (!this.jobStateListeners.has(id)) {
|
|
2345
|
-
this.jobStateListeners.set(id, /* @__PURE__ */ new Set());
|
|
2346
|
-
}
|
|
2347
|
-
this.jobStateListeners.get(id).add(listener);
|
|
2348
|
-
return () => {
|
|
2349
|
-
this.jobStateListeners.get(id)?.delete(listener);
|
|
2350
|
-
if (this.jobStateListeners.get(id)?.size === 0) {
|
|
2351
|
-
this.jobStateListeners.delete(id);
|
|
2352
|
-
}
|
|
2353
|
-
};
|
|
2354
|
-
}
|
|
2355
|
-
/**
|
|
2356
|
-
* Notify all listeners that a job's state has changed.
|
|
2357
|
-
* @param {string} id - The job ID that changed
|
|
2358
|
-
* @returns {void}
|
|
2359
|
-
* @private
|
|
2360
|
-
*/
|
|
2361
|
-
notifyJobStateChange(id) {
|
|
2362
|
-
this.jobStateListeners.get(id)?.forEach((listener) => listener());
|
|
2363
|
-
}
|
|
2364
|
-
/**
|
|
2365
|
-
* Pause a job by ID (sets enabled=false).
|
|
2366
|
-
* Notifies any subscribed state listeners.
|
|
2367
|
-
* @param {string} id - The job ID to pause
|
|
2368
|
-
* @returns {void}
|
|
2369
|
-
*/
|
|
2370
|
-
pauseJob(id) {
|
|
2371
|
-
this.updateJob(id, { enabled: false });
|
|
2372
|
-
this.notifyJobStateChange(id);
|
|
2373
|
-
}
|
|
2374
|
-
/**
|
|
2375
|
-
* Resume a paused job by ID (sets enabled=true).
|
|
2376
|
-
* Resets job timing to prevent frame accumulation.
|
|
2377
|
-
* Notifies any subscribed state listeners.
|
|
2378
|
-
* @param {string} id - The job ID to resume
|
|
2379
|
-
* @returns {void}
|
|
2380
|
-
*/
|
|
2381
|
-
resumeJob(id) {
|
|
2382
|
-
this.updateJob(id, { enabled: true });
|
|
2383
|
-
this.notifyJobStateChange(id);
|
|
2384
|
-
}
|
|
2385
|
-
//* Frame Loop Control Methods ================================
|
|
2386
|
-
/**
|
|
2387
|
-
* Start the requestAnimationFrame loop.
|
|
2388
|
-
* Resets timing state (elapsedTime, frameCount) on start.
|
|
2389
|
-
* No-op if already running.
|
|
2390
|
-
* @returns {void}
|
|
2391
|
-
*/
|
|
2392
|
-
start() {
|
|
2393
|
-
if (this.loopState.running) return;
|
|
2394
|
-
const { elapsedTime, createdAt } = this.loopState;
|
|
2395
|
-
let adjustedCreated = 0;
|
|
2396
|
-
if (this.stoppedTime > 0) {
|
|
2397
|
-
adjustedCreated = createdAt - (performance.now() - this.stoppedTime);
|
|
2398
|
-
this.stoppedTime = 0;
|
|
2399
|
-
}
|
|
2400
|
-
Object.assign(this.loopState, {
|
|
2401
|
-
running: true,
|
|
2402
|
-
elapsedTime: elapsedTime ?? 0,
|
|
2403
|
-
lastTime: performance.now(),
|
|
2404
|
-
createdAt: adjustedCreated > 0 ? adjustedCreated : performance.now(),
|
|
2405
|
-
frameCount: 0,
|
|
2406
|
-
rafHandle: requestAnimationFrame(this.loop)
|
|
2407
|
-
});
|
|
2408
|
-
}
|
|
2409
|
-
/**
|
|
2410
|
-
* Stop the requestAnimationFrame loop.
|
|
2411
|
-
* Cancels any pending RAF callback.
|
|
2412
|
-
* No-op if not running.
|
|
2413
|
-
* @returns {void}
|
|
2414
|
-
*/
|
|
2415
|
-
stop() {
|
|
2416
|
-
if (!this.loopState.running) return;
|
|
2417
|
-
this.loopState.running = false;
|
|
2418
|
-
if (this.loopState.rafHandle !== null) {
|
|
2419
|
-
cancelAnimationFrame(this.loopState.rafHandle);
|
|
2420
|
-
this.loopState.rafHandle = null;
|
|
2421
|
-
}
|
|
2422
|
-
this.stoppedTime = performance.now();
|
|
2423
|
-
}
|
|
2424
|
-
/**
|
|
2425
|
-
* Request frames to be rendered in demand mode.
|
|
2426
|
-
* Accumulates pending frames (capped at 60) and starts the loop if not running.
|
|
2427
|
-
* No-op if frameloop is not 'demand'.
|
|
2428
|
-
* @param {number} [frames=1] - Number of frames to request
|
|
2429
|
-
* @param {boolean} [stackFrames=false] - Whether to add frames to existing pending count
|
|
2430
|
-
* - `false` (default): Sets pending frames to the specified value (replaces existing count)
|
|
2431
|
-
* - `true`: Adds frames to existing pending count (useful for accumulating invalidations)
|
|
2432
|
-
* @returns {void}
|
|
2433
|
-
* @example
|
|
2434
|
-
* // Request a single frame render
|
|
2435
|
-
* scheduler.invalidate();
|
|
2436
|
-
*
|
|
2437
|
-
* @example
|
|
2438
|
-
* // Request 5 frames (e.g., for animations)
|
|
2439
|
-
* scheduler.invalidate(5);
|
|
2440
|
-
*
|
|
2441
|
-
* @example
|
|
2442
|
-
* // Set pending frames to exactly 3 (don't stack with existing)
|
|
2443
|
-
* scheduler.invalidate(3, false);
|
|
2444
|
-
*
|
|
2445
|
-
* @example
|
|
2446
|
-
* // Add 2 more frames to existing pending count
|
|
2447
|
-
* scheduler.invalidate(2, true);
|
|
2448
|
-
*/
|
|
2449
|
-
invalidate(frames = 1, stackFrames = false) {
|
|
2450
|
-
if (this._frameloop !== "demand") return;
|
|
2451
|
-
const baseFrames = stackFrames ? this.pendingFrames : 0;
|
|
2452
|
-
this.pendingFrames = Math.min(60, baseFrames + frames);
|
|
2453
|
-
if (!this.loopState.running && this.pendingFrames > 0) this.start();
|
|
2454
|
-
}
|
|
2455
|
-
/**
|
|
2456
|
-
* Reset timing state for deterministic testing.
|
|
2457
|
-
* Preserves jobs and roots but resets lastTime, frameCount, elapsedTime, etc.
|
|
2458
|
-
* @returns {void}
|
|
2459
|
-
*/
|
|
2460
|
-
resetTiming() {
|
|
2461
|
-
this.loopState.lastTime = null;
|
|
2462
|
-
this.loopState.frameCount = 0;
|
|
2463
|
-
this.loopState.elapsedTime = 0;
|
|
2464
|
-
this.loopState.createdAt = performance.now();
|
|
2465
|
-
}
|
|
2466
|
-
//* Manual Stepping Methods ================================
|
|
2467
|
-
/**
|
|
2468
|
-
* Manually execute a single frame for all roots.
|
|
2469
|
-
* Useful for frameloop='never' mode or testing scenarios.
|
|
2470
|
-
* @param {number} [timestamp] - Optional timestamp (defaults to performance.now())
|
|
2471
|
-
* @returns {void}
|
|
2472
|
-
* @example
|
|
2473
|
-
* // Manual control mode
|
|
2474
|
-
* scheduler.frameloop = 'never';
|
|
2475
|
-
* scheduler.step(); // Execute one frame
|
|
2476
|
-
*/
|
|
2477
|
-
step(timestamp) {
|
|
2478
|
-
const now = timestamp ?? performance.now();
|
|
2479
|
-
this.executeFrame(now);
|
|
2480
|
-
}
|
|
2481
|
-
/**
|
|
2482
|
-
* Manually execute a single job by its ID.
|
|
2483
|
-
* Useful for testing individual job callbacks in isolation.
|
|
2484
|
-
* @param {string} id - The job ID to step
|
|
2485
|
-
* @param {number} [timestamp] - Optional timestamp (defaults to performance.now())
|
|
2486
|
-
* @returns {void}
|
|
2487
|
-
*/
|
|
2488
|
-
stepJob(id, timestamp) {
|
|
2489
|
-
let job;
|
|
2490
|
-
let root;
|
|
2491
|
-
for (const r of this.roots.values()) {
|
|
2492
|
-
job = r.jobs.get(id);
|
|
2493
|
-
if (job) {
|
|
2494
|
-
root = r;
|
|
2495
|
-
break;
|
|
2496
|
-
}
|
|
2497
|
-
}
|
|
2498
|
-
if (!job || !root) {
|
|
2499
|
-
console.warn(`[Scheduler] Job "${id}" not found`);
|
|
2500
|
-
return;
|
|
2501
|
-
}
|
|
2502
|
-
const now = timestamp ?? performance.now();
|
|
2503
|
-
const deltaMs = this.loopState.lastTime !== null ? now - this.loopState.lastTime : 0;
|
|
2504
|
-
const delta = deltaMs / 1e3;
|
|
2505
|
-
const elapsed = now - this.loopState.createdAt;
|
|
2506
|
-
const providedState = root.getState?.() ?? {};
|
|
2507
|
-
const frameState = {
|
|
2508
|
-
...providedState,
|
|
2509
|
-
time: now,
|
|
2510
|
-
delta,
|
|
2511
|
-
elapsed,
|
|
2512
|
-
frame: this.loopState.frameCount
|
|
2513
|
-
};
|
|
2514
|
-
try {
|
|
2515
|
-
job.callback(frameState, delta);
|
|
2516
|
-
} catch (error) {
|
|
2517
|
-
console.error(`[Scheduler] Error in job "${job.id}":`, error);
|
|
2518
|
-
this.triggerError(error instanceof Error ? error : new Error(String(error)));
|
|
2519
|
-
}
|
|
2520
|
-
}
|
|
2521
|
-
/**
|
|
2522
|
-
* Execute a single frame across all roots.
|
|
2523
|
-
* Order: globalBefore → each root's jobs → globalAfter
|
|
2524
|
-
* @param {number} timestamp - RAF timestamp in milliseconds
|
|
2525
|
-
* @returns {void}
|
|
2526
|
-
* @private
|
|
2527
|
-
*/
|
|
2528
|
-
executeFrame(timestamp) {
|
|
2529
|
-
const deltaMs = this.loopState.lastTime !== null ? timestamp - this.loopState.lastTime : 0;
|
|
2530
|
-
const delta = deltaMs / 1e3;
|
|
2531
|
-
this.loopState.lastTime = timestamp;
|
|
2532
|
-
this.loopState.frameCount++;
|
|
2533
|
-
this.loopState.elapsedTime += deltaMs;
|
|
2534
|
-
this.runGlobalJobs(this.globalBeforeJobs, timestamp);
|
|
2535
|
-
for (const root of this.roots.values()) {
|
|
2536
|
-
this.tickRoot(root, timestamp, delta);
|
|
2537
|
-
}
|
|
2538
|
-
this.runGlobalJobs(this.globalAfterJobs, timestamp);
|
|
2539
|
-
}
|
|
2540
|
-
/**
|
|
2541
|
-
* Run all global jobs from a job map.
|
|
2542
|
-
* Catches and logs errors without stopping execution.
|
|
2543
|
-
* @param {Map<string, GlobalJob>} jobs - The global jobs map to execute
|
|
2544
|
-
* @param {number} timestamp - RAF timestamp in milliseconds
|
|
2545
|
-
* @returns {void}
|
|
2546
|
-
* @private
|
|
2547
|
-
*/
|
|
2548
|
-
runGlobalJobs(jobs, timestamp) {
|
|
2549
|
-
for (const job of jobs.values()) {
|
|
2550
|
-
try {
|
|
2551
|
-
job.callback(timestamp);
|
|
2552
|
-
} catch (error) {
|
|
2553
|
-
console.error(`[Scheduler] Error in global job "${job.id}":`, error);
|
|
2554
|
-
}
|
|
2555
|
-
}
|
|
2556
|
-
}
|
|
2557
|
-
/**
|
|
2558
|
-
* Execute all jobs for a single root in sorted order.
|
|
2559
|
-
* Rebuilds sorted job list if needed, then dispatches each job.
|
|
2560
|
-
* Errors are caught and propagated via triggerError.
|
|
2561
|
-
* @param {RootEntry} root - The root entry to tick
|
|
2562
|
-
* @param {number} timestamp - RAF timestamp in milliseconds
|
|
2563
|
-
* @param {number} delta - Time since last frame in seconds
|
|
2564
|
-
* @returns {void}
|
|
2565
|
-
* @private
|
|
2566
|
-
*/
|
|
2567
|
-
tickRoot(root, timestamp, delta) {
|
|
2568
|
-
if (root.needsRebuild) {
|
|
2569
|
-
root.sortedJobs = rebuildSortedJobs(root.jobs, this.phaseGraph);
|
|
2570
|
-
root.needsRebuild = false;
|
|
2571
|
-
}
|
|
2572
|
-
const providedState = root.getState?.() ?? {};
|
|
2573
|
-
const frameState = {
|
|
2574
|
-
...providedState,
|
|
2575
|
-
time: timestamp,
|
|
2576
|
-
delta,
|
|
2577
|
-
elapsed: this.loopState.elapsedTime / 1e3,
|
|
2578
|
-
// Convert ms to seconds
|
|
2579
|
-
frame: this.loopState.frameCount
|
|
2580
|
-
};
|
|
2581
|
-
for (const job of root.sortedJobs) {
|
|
2582
|
-
if (!shouldRun(job, timestamp)) continue;
|
|
2583
|
-
try {
|
|
2584
|
-
job.callback(frameState, delta);
|
|
2585
|
-
} catch (error) {
|
|
2586
|
-
console.error(`[Scheduler] Error in job "${job.id}":`, error);
|
|
2587
|
-
this.triggerError(error instanceof Error ? error : new Error(String(error)));
|
|
2588
|
-
}
|
|
2589
|
-
}
|
|
2590
|
-
}
|
|
2591
|
-
//* Debug & Inspection Methods ================================
|
|
2592
|
-
/**
|
|
2593
|
-
* Get the total number of registered jobs across all roots.
|
|
2594
|
-
* Includes both per-root jobs and global before/after jobs.
|
|
2595
|
-
* @returns {number} Total job count
|
|
2596
|
-
*/
|
|
2597
|
-
getJobCount() {
|
|
2598
|
-
let count = 0;
|
|
2599
|
-
for (const root of this.roots.values()) {
|
|
2600
|
-
count += root.jobs.size;
|
|
2601
|
-
}
|
|
2602
|
-
return count + this.globalBeforeJobs.size + this.globalAfterJobs.size;
|
|
2603
|
-
}
|
|
2604
|
-
/**
|
|
2605
|
-
* Get all registered job IDs across all roots.
|
|
2606
|
-
* Includes both per-root jobs and global before/after jobs.
|
|
2607
|
-
* @returns {string[]} Array of all job IDs
|
|
2608
|
-
*/
|
|
2609
|
-
getJobIds() {
|
|
2610
|
-
const ids = [];
|
|
2611
|
-
for (const root of this.roots.values()) {
|
|
2612
|
-
ids.push(...root.jobs.keys());
|
|
2613
|
-
}
|
|
2614
|
-
ids.push(...this.globalBeforeJobs.keys());
|
|
2615
|
-
ids.push(...this.globalAfterJobs.keys());
|
|
2616
|
-
return ids;
|
|
2617
|
-
}
|
|
2618
|
-
/**
|
|
2619
|
-
* Get the number of registered roots (Canvas instances).
|
|
2620
|
-
* @returns {number} Number of registered roots
|
|
2621
|
-
*/
|
|
2622
|
-
getRootCount() {
|
|
2623
|
-
return this.roots.size;
|
|
2624
|
-
}
|
|
2625
|
-
/**
|
|
2626
|
-
* Check if any user (non-system) jobs are registered in a specific phase.
|
|
2627
|
-
* Used by the default render job to know if a user has taken over rendering.
|
|
2628
|
-
*
|
|
2629
|
-
* @param phase The phase to check
|
|
2630
|
-
* @param rootId Optional root ID to check (checks all roots if not provided)
|
|
2631
|
-
* @returns true if any user jobs exist in the phase
|
|
2632
|
-
*/
|
|
2633
|
-
hasUserJobsInPhase(phase, rootId) {
|
|
2634
|
-
const rootsToCheck = rootId ? [this.roots.get(rootId)].filter(Boolean) : Array.from(this.roots.values());
|
|
2635
|
-
return rootsToCheck.some((root) => {
|
|
2636
|
-
if (!root) return false;
|
|
2637
|
-
for (const job of root.jobs.values()) {
|
|
2638
|
-
if (job.phase === phase && !job.system && job.enabled) return true;
|
|
2639
|
-
}
|
|
2640
|
-
return false;
|
|
2641
|
-
});
|
|
2642
|
-
}
|
|
2643
|
-
//* Utility Methods ================================
|
|
2644
|
-
/**
|
|
2645
|
-
* Generate a unique root ID for automatic root registration.
|
|
2646
|
-
* @returns {string} A unique root ID in the format 'root_N'
|
|
2647
|
-
*/
|
|
2648
|
-
generateRootId() {
|
|
2649
|
-
return `root_${this.nextRootIndex++}`;
|
|
2650
|
-
}
|
|
2651
|
-
/**
|
|
2652
|
-
* Generate a unique job ID.
|
|
2653
|
-
* @returns {string} A unique job ID in the format 'job_N'
|
|
2654
|
-
* @private
|
|
2655
|
-
*/
|
|
2656
|
-
generateJobId() {
|
|
2657
|
-
return `job_${this.nextJobIndex}`;
|
|
2658
|
-
}
|
|
2659
|
-
/**
|
|
2660
|
-
* Normalize before/after constraints to a Set.
|
|
2661
|
-
* Handles undefined, single string, or array inputs.
|
|
2662
|
-
* @param {string | string[] | undefined} value - The constraint value(s)
|
|
2663
|
-
* @returns {Set<string>} Normalized Set of constraint strings
|
|
2664
|
-
* @private
|
|
2665
|
-
*/
|
|
2666
|
-
normalizeConstraints(value) {
|
|
2667
|
-
if (!value) return /* @__PURE__ */ new Set();
|
|
2668
|
-
if (Array.isArray(value)) return new Set(value);
|
|
2669
|
-
return /* @__PURE__ */ new Set([value]);
|
|
2670
|
-
}
|
|
2671
|
-
};
|
|
2672
|
-
//* Static State & Methods (Singleton Usage) ================================
|
|
2673
|
-
//* Cross-Bundle Singleton Key ==============================
|
|
2674
|
-
// Use Symbol.for() to ensure scheduler is shared across bundle boundaries
|
|
2675
|
-
// This prevents issues when mixing imports from @react-three/fiber and @react-three/fiber/webgpu
|
|
2676
|
-
__publicField(_Scheduler, "INSTANCE_KEY", Symbol.for("@react-three/fiber.scheduler"));
|
|
2677
|
-
let Scheduler = _Scheduler;
|
|
2678
|
-
const getScheduler = () => Scheduler.get();
|
|
2679
|
-
if (hmrData) {
|
|
2680
|
-
hmrData.accept?.();
|
|
1682
|
+
const INTERNAL_LIB_MARKERS = ["zustand", "setState", "Object.assign"];
|
|
1683
|
+
function isInternalRendererAccess(stack, callerDepth = 2) {
|
|
1684
|
+
if (!stack) return false;
|
|
1685
|
+
const caller = stack.split("\n")[callerDepth] ?? "";
|
|
1686
|
+
return INTERNAL_LIB_MARKERS.some((m) => caller.includes(m));
|
|
2681
1687
|
}
|
|
2682
1688
|
|
|
2683
1689
|
const R3F_CONTEXT = Symbol.for("@react-three/fiber.context");
|
|
@@ -2789,7 +1795,7 @@ const createStore = (invalidate, advance) => {
|
|
|
2789
1795
|
size: newSize,
|
|
2790
1796
|
viewport: { ...s.viewport, ...getCurrentViewport(state2.camera, defaultTarget, newSize) }
|
|
2791
1797
|
}));
|
|
2792
|
-
getScheduler().invalidate();
|
|
1798
|
+
scheduler.getScheduler().invalidate();
|
|
2793
1799
|
}
|
|
2794
1800
|
}
|
|
2795
1801
|
return;
|
|
@@ -2804,7 +1810,7 @@ const createStore = (invalidate, advance) => {
|
|
|
2804
1810
|
viewport: { ...s.viewport, ...getCurrentViewport(state2.camera, defaultTarget, size) },
|
|
2805
1811
|
_sizeImperative: true
|
|
2806
1812
|
}));
|
|
2807
|
-
getScheduler().invalidate();
|
|
1813
|
+
scheduler.getScheduler().invalidate();
|
|
2808
1814
|
},
|
|
2809
1815
|
setDpr: (dpr) => set((state2) => {
|
|
2810
1816
|
const resolved = calculateDpr(dpr);
|
|
@@ -2812,6 +1818,7 @@ const createStore = (invalidate, advance) => {
|
|
|
2812
1818
|
}),
|
|
2813
1819
|
setFrameloop: (frameloop = "always") => {
|
|
2814
1820
|
set(() => ({ frameloop }));
|
|
1821
|
+
scheduler.getScheduler().frameloop = frameloop;
|
|
2815
1822
|
},
|
|
2816
1823
|
setError: (error) => set(() => ({ error })),
|
|
2817
1824
|
error: null,
|
|
@@ -2821,6 +1828,7 @@ const createStore = (invalidate, advance) => {
|
|
|
2821
1828
|
buffers: {},
|
|
2822
1829
|
gpuStorage: {},
|
|
2823
1830
|
textures: /* @__PURE__ */ new Map(),
|
|
1831
|
+
_textureRefs: /* @__PURE__ */ new Map(),
|
|
2824
1832
|
renderPipeline: null,
|
|
2825
1833
|
passes: {},
|
|
2826
1834
|
_hmrVersion: 0,
|
|
@@ -2878,8 +1886,7 @@ const createStore = (invalidate, advance) => {
|
|
|
2878
1886
|
const currentState = rootStore.getState();
|
|
2879
1887
|
if (!currentState.isLegacy && currentState.internal.actualRenderer) {
|
|
2880
1888
|
const stack = new Error().stack || "";
|
|
2881
|
-
|
|
2882
|
-
if (!isInternalAccess) {
|
|
1889
|
+
if (!isInternalRendererAccess(stack)) {
|
|
2883
1890
|
const cleanedStack = stack.split("\n").slice(2).join("\n") || "Stack trace unavailable";
|
|
2884
1891
|
notifyDepreciated({
|
|
2885
1892
|
heading: "Accessing state.gl in WebGPU mode",
|
|
@@ -2992,26 +1999,32 @@ function loadingFn(extensions, onProgress) {
|
|
|
2992
1999
|
);
|
|
2993
2000
|
};
|
|
2994
2001
|
}
|
|
2995
|
-
function useLoader(loader, input, extensions, onProgress) {
|
|
2996
|
-
const
|
|
2002
|
+
function useLoader(loader, input, extensions, onProgress, cacheKey) {
|
|
2003
|
+
const inputs = Array.isArray(input) ? input : [input];
|
|
2004
|
+
const cacheKeys = Array.isArray(cacheKey ?? input) ? cacheKey ?? input : [cacheKey ?? input];
|
|
2997
2005
|
const fn = loadingFn(extensions, onProgress);
|
|
2998
|
-
const results =
|
|
2006
|
+
const results = cacheKeys.map(
|
|
2007
|
+
(key, index) => suspendReact.suspend(() => fn(loader, inputs[index]), [loader, key], { equal: is.equ })
|
|
2008
|
+
);
|
|
2999
2009
|
return Array.isArray(input) ? results : results[0];
|
|
3000
2010
|
}
|
|
3001
|
-
useLoader.preload = function(loader, input, extensions, onProgress) {
|
|
3002
|
-
const
|
|
3003
|
-
|
|
2011
|
+
useLoader.preload = function(loader, input, extensions, onProgress, cacheKey) {
|
|
2012
|
+
const inputs = Array.isArray(input) ? input : [input];
|
|
2013
|
+
const cacheKeys = Array.isArray(cacheKey ?? input) ? cacheKey ?? input : [cacheKey ?? input];
|
|
2014
|
+
cacheKeys.forEach(
|
|
2015
|
+
(key, index) => suspendReact.preload(() => loadingFn(extensions, onProgress)(loader, inputs[index]), [loader, key])
|
|
2016
|
+
);
|
|
3004
2017
|
};
|
|
3005
|
-
useLoader.clear = function(loader, input) {
|
|
3006
|
-
const
|
|
3007
|
-
|
|
2018
|
+
useLoader.clear = function(loader, input, cacheKey) {
|
|
2019
|
+
const cacheKeys = Array.isArray(cacheKey ?? input) ? cacheKey ?? input : [cacheKey ?? input];
|
|
2020
|
+
cacheKeys.forEach((key) => suspendReact.clear([loader, key]));
|
|
3008
2021
|
};
|
|
3009
2022
|
useLoader.loader = getLoader;
|
|
3010
2023
|
|
|
3011
2024
|
function useFrame(callback, priorityOrOptions) {
|
|
3012
2025
|
const store = React__namespace.useContext(context);
|
|
3013
2026
|
const isInsideCanvas = store !== null;
|
|
3014
|
-
const scheduler = getScheduler();
|
|
2027
|
+
const scheduler$1 = scheduler.getScheduler();
|
|
3015
2028
|
const optionsKey = typeof priorityOrOptions === "number" ? `p:${priorityOrOptions}` : priorityOrOptions ? JSON.stringify({
|
|
3016
2029
|
id: priorityOrOptions.id,
|
|
3017
2030
|
phase: priorityOrOptions.phase,
|
|
@@ -3059,7 +2072,7 @@ function useFrame(callback, priorityOrOptions) {
|
|
|
3059
2072
|
};
|
|
3060
2073
|
callbackRef.current?.(mergedState, delta);
|
|
3061
2074
|
};
|
|
3062
|
-
const unregister = scheduler.register(wrappedCallback, {
|
|
2075
|
+
const unregister = scheduler$1.register(wrappedCallback, {
|
|
3063
2076
|
id,
|
|
3064
2077
|
rootId,
|
|
3065
2078
|
...options
|
|
@@ -3080,37 +2093,31 @@ function useFrame(callback, priorityOrOptions) {
|
|
|
3080
2093
|
}
|
|
3081
2094
|
};
|
|
3082
2095
|
} else {
|
|
3083
|
-
|
|
3084
|
-
|
|
3085
|
-
|
|
3086
|
-
|
|
3087
|
-
|
|
3088
|
-
|
|
3089
|
-
|
|
3090
|
-
|
|
3091
|
-
unregisterJob = registerOutside();
|
|
3092
|
-
});
|
|
3093
|
-
return () => {
|
|
3094
|
-
unsubReady();
|
|
3095
|
-
unregisterJob?.();
|
|
3096
|
-
};
|
|
2096
|
+
return scheduler$1.register(
|
|
2097
|
+
(state, delta) => {
|
|
2098
|
+
const frameState = state;
|
|
2099
|
+
if (!frameState.renderer) return;
|
|
2100
|
+
callbackRef.current?.(frameState, delta);
|
|
2101
|
+
},
|
|
2102
|
+
{ id, ...options }
|
|
2103
|
+
);
|
|
3097
2104
|
}
|
|
3098
|
-
}, [store, scheduler, id, optionsKey, isLegacyPriority, isInsideCanvas]);
|
|
2105
|
+
}, [store, scheduler$1, id, optionsKey, isLegacyPriority, isInsideCanvas]);
|
|
3099
2106
|
const isPaused = React__namespace.useSyncExternalStore(
|
|
3100
2107
|
// Subscribe function
|
|
3101
2108
|
React__namespace.useCallback(
|
|
3102
2109
|
(onStoreChange) => {
|
|
3103
|
-
return getScheduler().subscribeJobState(id, onStoreChange);
|
|
2110
|
+
return scheduler.getScheduler().subscribeJobState(id, onStoreChange);
|
|
3104
2111
|
},
|
|
3105
2112
|
[id]
|
|
3106
2113
|
),
|
|
3107
2114
|
// getSnapshot function
|
|
3108
|
-
React__namespace.useCallback(() => getScheduler().isJobPaused(id), [id]),
|
|
2115
|
+
React__namespace.useCallback(() => scheduler.getScheduler().isJobPaused(id), [id]),
|
|
3109
2116
|
// getServerSnapshot function (SSR)
|
|
3110
2117
|
React__namespace.useCallback(() => false, [])
|
|
3111
2118
|
);
|
|
3112
2119
|
const controls = React__namespace.useMemo(() => {
|
|
3113
|
-
const scheduler2 = getScheduler();
|
|
2120
|
+
const scheduler2 = scheduler.getScheduler();
|
|
3114
2121
|
return {
|
|
3115
2122
|
/** The job's unique ID */
|
|
3116
2123
|
id,
|
|
@@ -3125,7 +2132,7 @@ function useFrame(callback, priorityOrOptions) {
|
|
|
3125
2132
|
* @param timestamp Optional timestamp (defaults to performance.now())
|
|
3126
2133
|
*/
|
|
3127
2134
|
step: (timestamp) => {
|
|
3128
|
-
getScheduler().stepJob(id, timestamp);
|
|
2135
|
+
scheduler.getScheduler().stepJob(id, timestamp);
|
|
3129
2136
|
},
|
|
3130
2137
|
/**
|
|
3131
2138
|
* Manually step ALL jobs in the scheduler.
|
|
@@ -3133,20 +2140,20 @@ function useFrame(callback, priorityOrOptions) {
|
|
|
3133
2140
|
* @param timestamp Optional timestamp (defaults to performance.now())
|
|
3134
2141
|
*/
|
|
3135
2142
|
stepAll: (timestamp) => {
|
|
3136
|
-
getScheduler().step(timestamp);
|
|
2143
|
+
scheduler.getScheduler().step(timestamp);
|
|
3137
2144
|
},
|
|
3138
2145
|
/**
|
|
3139
2146
|
* Pause this job (set enabled=false).
|
|
3140
2147
|
* Job remains registered but won't run.
|
|
3141
2148
|
*/
|
|
3142
2149
|
pause: () => {
|
|
3143
|
-
getScheduler().pauseJob(id);
|
|
2150
|
+
scheduler.getScheduler().pauseJob(id);
|
|
3144
2151
|
},
|
|
3145
2152
|
/**
|
|
3146
2153
|
* Resume this job (set enabled=true).
|
|
3147
2154
|
*/
|
|
3148
2155
|
resume: () => {
|
|
3149
|
-
getScheduler().resumeJob(id);
|
|
2156
|
+
scheduler.getScheduler().resumeJob(id);
|
|
3150
2157
|
},
|
|
3151
2158
|
/**
|
|
3152
2159
|
* Reactive paused state - automatically updates when pause/resume is called.
|
|
@@ -3184,18 +2191,18 @@ function buildFromCache(input, textureCache) {
|
|
|
3184
2191
|
function useTexture(input, optionsOrOnLoad) {
|
|
3185
2192
|
const renderer = useThree((state) => state.internal.actualRenderer);
|
|
3186
2193
|
const store = useStore();
|
|
3187
|
-
const textureCache = useThree((state) => state.textures);
|
|
3188
2194
|
const options = typeof optionsOrOnLoad === "function" ? { onLoad: optionsOrOnLoad } : optionsOrOnLoad ?? {};
|
|
3189
|
-
const { onLoad, cache =
|
|
2195
|
+
const { onLoad, cache = true } = options;
|
|
3190
2196
|
const onLoadRef = React.useRef(onLoad);
|
|
3191
2197
|
onLoadRef.current = onLoad;
|
|
3192
2198
|
const onLoadCalledForRef = React.useRef(null);
|
|
3193
2199
|
const urls = React.useMemo(() => getUrls(input), [input]);
|
|
3194
2200
|
const cachedResult = React.useMemo(() => {
|
|
3195
2201
|
if (!cache) return null;
|
|
3196
|
-
|
|
3197
|
-
|
|
3198
|
-
|
|
2202
|
+
const textures = store.getState().textures;
|
|
2203
|
+
if (!allUrlsCached(urls, textures)) return null;
|
|
2204
|
+
return buildFromCache(input, textures);
|
|
2205
|
+
}, [cache, urls, input, store]);
|
|
3199
2206
|
const loadedTextures = useLoader(
|
|
3200
2207
|
webgpu.TextureLoader,
|
|
3201
2208
|
IsObject(input) ? Object.values(input) : input
|
|
@@ -3239,8 +2246,6 @@ function useTexture(input, optionsOrOnLoad) {
|
|
|
3239
2246
|
}, [input, loadedTextures, cachedResult]);
|
|
3240
2247
|
React.useEffect(() => {
|
|
3241
2248
|
if (!cache) return;
|
|
3242
|
-
if (cachedResult) return;
|
|
3243
|
-
const set = store.setState;
|
|
3244
2249
|
const urlTextureMap = [];
|
|
3245
2250
|
if (typeof input === "string") {
|
|
3246
2251
|
urlTextureMap.push([input, mappedTextures]);
|
|
@@ -3254,18 +2259,32 @@ function useTexture(input, optionsOrOnLoad) {
|
|
|
3254
2259
|
urlTextureMap.push([url, textureRecord[key]]);
|
|
3255
2260
|
}
|
|
3256
2261
|
}
|
|
3257
|
-
|
|
3258
|
-
const
|
|
3259
|
-
let
|
|
2262
|
+
store.setState((state) => {
|
|
2263
|
+
const refs = new Map(state._textureRefs);
|
|
2264
|
+
let textures = state.textures;
|
|
2265
|
+
let added = false;
|
|
3260
2266
|
for (const [url, texture] of urlTextureMap) {
|
|
3261
|
-
if (!
|
|
3262
|
-
|
|
3263
|
-
|
|
2267
|
+
if (!textures.has(url)) {
|
|
2268
|
+
if (!added) {
|
|
2269
|
+
textures = new Map(textures);
|
|
2270
|
+
added = true;
|
|
2271
|
+
}
|
|
2272
|
+
textures.set(url, texture);
|
|
3264
2273
|
}
|
|
2274
|
+
refs.set(url, (refs.get(url) ?? 0) + 1);
|
|
3265
2275
|
}
|
|
3266
|
-
return
|
|
2276
|
+
return added ? { textures, _textureRefs: refs } : { _textureRefs: refs };
|
|
3267
2277
|
});
|
|
3268
|
-
|
|
2278
|
+
return () => store.setState((state) => {
|
|
2279
|
+
const refs = new Map(state._textureRefs);
|
|
2280
|
+
for (const [url] of urlTextureMap) {
|
|
2281
|
+
const next = (refs.get(url) ?? 0) - 1;
|
|
2282
|
+
if (next <= 0) refs.delete(url);
|
|
2283
|
+
else refs.set(url, next);
|
|
2284
|
+
}
|
|
2285
|
+
return { _textureRefs: refs };
|
|
2286
|
+
});
|
|
2287
|
+
}, [cache, input, mappedTextures, store]);
|
|
3269
2288
|
return mappedTextures;
|
|
3270
2289
|
}
|
|
3271
2290
|
useTexture.preload = (url) => useLoader.preload(webgpu.TextureLoader, url);
|
|
@@ -3281,96 +2300,63 @@ const Texture = ({
|
|
|
3281
2300
|
return /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children: children?.(ret) });
|
|
3282
2301
|
};
|
|
3283
2302
|
|
|
3284
|
-
function
|
|
3285
|
-
if (entry instanceof webgpu.Texture) return entry;
|
|
3286
|
-
if (entry && typeof entry === "object" && "value" in entry && entry.value instanceof webgpu.Texture) {
|
|
3287
|
-
return entry.value;
|
|
3288
|
-
}
|
|
3289
|
-
return null;
|
|
3290
|
-
}
|
|
3291
|
-
function useTextures() {
|
|
2303
|
+
function useTextures(selector) {
|
|
3292
2304
|
const store = useStore();
|
|
3293
|
-
|
|
3294
|
-
const set = store.setState;
|
|
2305
|
+
const registry = React.useMemo(() => {
|
|
3295
2306
|
const getState = store.getState;
|
|
3296
|
-
const
|
|
3297
|
-
|
|
3298
|
-
const newMap = new Map(state.textures);
|
|
3299
|
-
newMap.set(key, value);
|
|
3300
|
-
return { textures: newMap };
|
|
3301
|
-
});
|
|
3302
|
-
};
|
|
3303
|
-
const addMultiple = (items) => {
|
|
3304
|
-
set((state) => {
|
|
3305
|
-
const newMap = new Map(state.textures);
|
|
3306
|
-
const entries = items instanceof Map ? items.entries() : Object.entries(items);
|
|
3307
|
-
for (const [key, value] of entries) {
|
|
3308
|
-
newMap.set(key, value);
|
|
3309
|
-
}
|
|
3310
|
-
return { textures: newMap };
|
|
3311
|
-
});
|
|
3312
|
-
};
|
|
3313
|
-
const remove = (key) => {
|
|
3314
|
-
set((state) => {
|
|
3315
|
-
const newMap = new Map(state.textures);
|
|
3316
|
-
newMap.delete(key);
|
|
3317
|
-
return { textures: newMap };
|
|
3318
|
-
});
|
|
3319
|
-
};
|
|
3320
|
-
const removeMultiple = (keys) => {
|
|
3321
|
-
set((state) => {
|
|
3322
|
-
const newMap = new Map(state.textures);
|
|
3323
|
-
for (const key of keys) newMap.delete(key);
|
|
3324
|
-
return { textures: newMap };
|
|
3325
|
-
});
|
|
3326
|
-
};
|
|
3327
|
-
const dispose = (key) => {
|
|
3328
|
-
const entry = getState().textures.get(key);
|
|
3329
|
-
if (entry) {
|
|
3330
|
-
const tex = getTextureValue(entry);
|
|
3331
|
-
tex?.dispose();
|
|
3332
|
-
}
|
|
3333
|
-
remove(key);
|
|
3334
|
-
};
|
|
3335
|
-
const disposeMultiple = (keys) => {
|
|
3336
|
-
const textures = getState().textures;
|
|
3337
|
-
for (const key of keys) {
|
|
3338
|
-
const entry = textures.get(key);
|
|
3339
|
-
if (entry) {
|
|
3340
|
-
const tex = getTextureValue(entry);
|
|
3341
|
-
tex?.dispose();
|
|
3342
|
-
}
|
|
3343
|
-
}
|
|
3344
|
-
removeMultiple(keys);
|
|
3345
|
-
};
|
|
3346
|
-
const disposeAll = () => {
|
|
3347
|
-
const textures = getState().textures;
|
|
3348
|
-
for (const entry of textures.values()) {
|
|
3349
|
-
const tex = getTextureValue(entry);
|
|
3350
|
-
tex?.dispose();
|
|
3351
|
-
}
|
|
3352
|
-
set({ textures: /* @__PURE__ */ new Map() });
|
|
3353
|
-
};
|
|
2307
|
+
const setState = store.setState;
|
|
2308
|
+
const getOne = (key) => getState().textures.get(key);
|
|
3354
2309
|
return {
|
|
3355
|
-
|
|
3356
|
-
get textures() {
|
|
2310
|
+
get all() {
|
|
3357
2311
|
return getState().textures;
|
|
3358
2312
|
},
|
|
3359
|
-
|
|
3360
|
-
|
|
2313
|
+
get(input) {
|
|
2314
|
+
if (typeof input === "string") return getOne(input);
|
|
2315
|
+
if (Array.isArray(input)) return input.map(getOne);
|
|
2316
|
+
const out = {};
|
|
2317
|
+
for (const name in input) out[name] = getOne(input[name]);
|
|
2318
|
+
return out;
|
|
2319
|
+
},
|
|
3361
2320
|
has: (key) => getState().textures.has(key),
|
|
3362
|
-
|
|
3363
|
-
|
|
3364
|
-
|
|
3365
|
-
|
|
3366
|
-
|
|
3367
|
-
|
|
3368
|
-
|
|
3369
|
-
|
|
3370
|
-
|
|
3371
|
-
|
|
2321
|
+
add(keyOrRecord, texture) {
|
|
2322
|
+
setState((state) => {
|
|
2323
|
+
const textures = new Map(state.textures);
|
|
2324
|
+
if (typeof keyOrRecord === "string") {
|
|
2325
|
+
textures.set(keyOrRecord, texture);
|
|
2326
|
+
} else {
|
|
2327
|
+
for (const key in keyOrRecord) textures.set(key, keyOrRecord[key]);
|
|
2328
|
+
}
|
|
2329
|
+
return { textures };
|
|
2330
|
+
});
|
|
2331
|
+
},
|
|
2332
|
+
dispose(key, options) {
|
|
2333
|
+
const state = getState();
|
|
2334
|
+
const refs = state._textureRefs.get(key) ?? 0;
|
|
2335
|
+
if (refs > 0 && !options?.force) {
|
|
2336
|
+
console.warn(
|
|
2337
|
+
`[useTextures] "${key}" still has ${refs} active reference(s); skipping dispose. Pass { force: true } to override.`
|
|
2338
|
+
);
|
|
2339
|
+
return false;
|
|
2340
|
+
}
|
|
2341
|
+
state.textures.get(key)?.dispose();
|
|
2342
|
+
setState((s) => {
|
|
2343
|
+
const textures = new Map(s.textures);
|
|
2344
|
+
textures.delete(key);
|
|
2345
|
+
const nextRefs = new Map(s._textureRefs);
|
|
2346
|
+
nextRefs.delete(key);
|
|
2347
|
+
return { textures, _textureRefs: nextRefs };
|
|
2348
|
+
});
|
|
2349
|
+
return true;
|
|
2350
|
+
},
|
|
2351
|
+
disposeAll() {
|
|
2352
|
+
for (const texture of getState().textures.values()) texture.dispose();
|
|
2353
|
+
setState({ textures: /* @__PURE__ */ new Map(), _textureRefs: /* @__PURE__ */ new Map() });
|
|
2354
|
+
}
|
|
3372
2355
|
};
|
|
3373
2356
|
}, [store]);
|
|
2357
|
+
const subscribe = selector ? () => selector(registry) : (state) => state.textures;
|
|
2358
|
+
const selected = useThree(subscribe);
|
|
2359
|
+
return selector ? selected : registry;
|
|
3374
2360
|
}
|
|
3375
2361
|
|
|
3376
2362
|
function useRenderTarget(widthOrOptions, heightOrOptions, options) {
|
|
@@ -3427,7 +2413,7 @@ function addEffect(callback) {
|
|
|
3427
2413
|
link: "https://docs.pmnd.rs/react-three-fiber/api/hooks#useframe"
|
|
3428
2414
|
});
|
|
3429
2415
|
const id = `legacy_effect_${effectId++}`;
|
|
3430
|
-
return getScheduler().registerGlobal("before", id, callback);
|
|
2416
|
+
return scheduler.getScheduler().registerGlobal("before", id, callback);
|
|
3431
2417
|
}
|
|
3432
2418
|
function addAfterEffect(callback) {
|
|
3433
2419
|
notifyDepreciated({
|
|
@@ -3436,7 +2422,7 @@ function addAfterEffect(callback) {
|
|
|
3436
2422
|
link: "https://docs.pmnd.rs/react-three-fiber/api/hooks#useframe"
|
|
3437
2423
|
});
|
|
3438
2424
|
const id = `legacy_afterEffect_${effectId++}`;
|
|
3439
|
-
return getScheduler().registerGlobal("after", id, callback);
|
|
2425
|
+
return scheduler.getScheduler().registerGlobal("after", id, callback);
|
|
3440
2426
|
}
|
|
3441
2427
|
function addTail(callback) {
|
|
3442
2428
|
notifyDepreciated({
|
|
@@ -3444,16 +2430,16 @@ function addTail(callback) {
|
|
|
3444
2430
|
body: "Use scheduler.onIdle(callback) instead.\naddTail will be removed in a future version.",
|
|
3445
2431
|
link: "https://docs.pmnd.rs/react-three-fiber/api/hooks#useframe"
|
|
3446
2432
|
});
|
|
3447
|
-
return getScheduler().onIdle(callback);
|
|
2433
|
+
return scheduler.getScheduler().onIdle(callback);
|
|
3448
2434
|
}
|
|
3449
2435
|
function invalidate(state, frames = 1, stackFrames = false) {
|
|
3450
|
-
getScheduler().invalidate(frames, stackFrames);
|
|
2436
|
+
scheduler.getScheduler().invalidate(frames, stackFrames);
|
|
3451
2437
|
}
|
|
3452
2438
|
function advance(timestamp) {
|
|
3453
|
-
getScheduler().step(timestamp);
|
|
2439
|
+
scheduler.getScheduler().step(timestamp);
|
|
3454
2440
|
}
|
|
3455
2441
|
|
|
3456
|
-
const version = "10.0.0-alpha.
|
|
2442
|
+
const version = "10.0.0-alpha.3";
|
|
3457
2443
|
const packageData = {
|
|
3458
2444
|
version: version};
|
|
3459
2445
|
|
|
@@ -14892,6 +13878,7 @@ function swapInstances() {
|
|
|
14892
13878
|
}
|
|
14893
13879
|
}
|
|
14894
13880
|
if (instance.isHidden) unhideInstance(instance);
|
|
13881
|
+
if (isObject3D(instance.object)) removeInteractivity(findInitialRoot(instance), instance.object);
|
|
14895
13882
|
if (instance.object.__r3f) delete instance.object.__r3f;
|
|
14896
13883
|
if (instance.type !== "primitive") disposeOnIdle(instance.object);
|
|
14897
13884
|
}
|
|
@@ -14904,6 +13891,8 @@ function swapInstances() {
|
|
|
14904
13891
|
instance.object.__r3f = instance;
|
|
14905
13892
|
setFiberRef(fiber, instance.object);
|
|
14906
13893
|
delete instance.appliedOnce;
|
|
13894
|
+
instance.eventCount = 0;
|
|
13895
|
+
instance.handlers = {};
|
|
14907
13896
|
applyProps(instance.object, instance.props);
|
|
14908
13897
|
if (instance.props.attach) {
|
|
14909
13898
|
attach(parent, instance);
|
|
@@ -15119,11 +14108,15 @@ const reconciler = /* @__PURE__ */ createReconciler({
|
|
|
15119
14108
|
cloneMutableTextInstance(textInstance) {
|
|
15120
14109
|
return textInstance;
|
|
15121
14110
|
},
|
|
14111
|
+
// React 19.2 added these for root-level view transitions. They only run for hosts that opt into
|
|
14112
|
+
// view transitions by returning a container from cloneRootViewTransitionContainer; R3F renders
|
|
14113
|
+
// into a WebGL/WebGPU canvas, where cloning the root has no meaning, so we never opt in and
|
|
14114
|
+
// React never calls them. They stay as no-ops rather than throws: the host config is shared by
|
|
14115
|
+
// every root, and a throw here would turn a React-internal probe into a hard crash for users.
|
|
14116
|
+
// Guarded by a test asserting a full render + unmount never reaches them.
|
|
15122
14117
|
cloneRootViewTransitionContainer(_rootContainer) {
|
|
15123
|
-
throw new Error("Not implemented.");
|
|
15124
14118
|
},
|
|
15125
14119
|
removeRootViewTransitionClone(_rootContainer, _clone) {
|
|
15126
|
-
throw new Error("Not implemented.");
|
|
15127
14120
|
},
|
|
15128
14121
|
// https://github.com/facebook/react/pull/32465
|
|
15129
14122
|
createFragmentInstance: (_fiber) => null,
|
|
@@ -15208,6 +14201,7 @@ function createRoot(canvas) {
|
|
|
15208
14201
|
const lastConfiguredProps = {};
|
|
15209
14202
|
let configured = false;
|
|
15210
14203
|
let pending = null;
|
|
14204
|
+
let rendererSetup = null;
|
|
15211
14205
|
return {
|
|
15212
14206
|
async configure(props = {}) {
|
|
15213
14207
|
let resolve;
|
|
@@ -15238,7 +14232,7 @@ function createRoot(canvas) {
|
|
|
15238
14232
|
forceEven
|
|
15239
14233
|
} = props;
|
|
15240
14234
|
const textureColorSpace = is.obj(glConfig) && !is.fun(glConfig) && !isRenderer(glConfig) && glConfig.textureColorSpace || is.obj(rendererConfig) && !is.fun(rendererConfig) && !isRenderer(rendererConfig) && rendererConfig.textureColorSpace || webgpu.SRGBColorSpace;
|
|
15241
|
-
|
|
14235
|
+
let state = store.getState();
|
|
15242
14236
|
const defaultGLProps = {
|
|
15243
14237
|
canvas,
|
|
15244
14238
|
powerPreference: "high-performance",
|
|
@@ -15266,56 +14260,68 @@ function createRoot(canvas) {
|
|
|
15266
14260
|
"The `primaryCanvas` prop for multi-canvas rendering cannot be used with WebGL. Remove the `gl` prop or use WebGPU."
|
|
15267
14261
|
);
|
|
15268
14262
|
}
|
|
15269
|
-
if (
|
|
15270
|
-
|
|
15271
|
-
|
|
15272
|
-
|
|
15273
|
-
|
|
15274
|
-
|
|
15275
|
-
|
|
15276
|
-
|
|
15277
|
-
|
|
15278
|
-
|
|
15279
|
-
|
|
15280
|
-
|
|
15281
|
-
|
|
15282
|
-
|
|
15283
|
-
|
|
15284
|
-
|
|
15285
|
-
|
|
15286
|
-
|
|
15287
|
-
|
|
15288
|
-
|
|
15289
|
-
|
|
15290
|
-
|
|
15291
|
-
|
|
15292
|
-
|
|
15293
|
-
|
|
15294
|
-
|
|
15295
|
-
|
|
15296
|
-
|
|
15297
|
-
|
|
15298
|
-
|
|
15299
|
-
|
|
15300
|
-
|
|
15301
|
-
|
|
15302
|
-
|
|
15303
|
-
|
|
15304
|
-
|
|
15305
|
-
|
|
15306
|
-
|
|
15307
|
-
|
|
15308
|
-
|
|
15309
|
-
|
|
15310
|
-
|
|
15311
|
-
|
|
15312
|
-
|
|
15313
|
-
|
|
15314
|
-
|
|
15315
|
-
|
|
14263
|
+
if (!state.internal.actualRenderer) {
|
|
14264
|
+
if (!rendererSetup) {
|
|
14265
|
+
rendererSetup = (async () => {
|
|
14266
|
+
if (wantsGL) {
|
|
14267
|
+
renderer = await resolveRenderer(glConfig, defaultGLProps, three.WebGLRenderer);
|
|
14268
|
+
state.internal.actualRenderer = renderer;
|
|
14269
|
+
state.set({ isLegacy: true, gl: renderer, renderer, primaryStore: store });
|
|
14270
|
+
} else if (!wantsGL && primaryCanvas) {
|
|
14271
|
+
const primary = await waitForPrimary(primaryCanvas);
|
|
14272
|
+
renderer = primary.renderer;
|
|
14273
|
+
state.internal.actualRenderer = renderer;
|
|
14274
|
+
const canvasTarget = new webgpu.CanvasTarget(canvas);
|
|
14275
|
+
primary.store.setState((prev) => ({
|
|
14276
|
+
internal: { ...prev.internal, isMultiCanvas: true }
|
|
14277
|
+
}));
|
|
14278
|
+
state.set((prev) => ({
|
|
14279
|
+
webGPUSupported: primary.store.getState().webGPUSupported,
|
|
14280
|
+
renderer,
|
|
14281
|
+
primaryStore: primary.store,
|
|
14282
|
+
internal: {
|
|
14283
|
+
...prev.internal,
|
|
14284
|
+
canvasTarget,
|
|
14285
|
+
isMultiCanvas: true,
|
|
14286
|
+
isSecondary: true,
|
|
14287
|
+
targetId: primaryCanvas
|
|
14288
|
+
}
|
|
14289
|
+
}));
|
|
14290
|
+
} else if (!wantsGL) {
|
|
14291
|
+
renderer = await resolveRenderer(rendererConfig, defaultGPUProps, webgpu.WebGPURenderer);
|
|
14292
|
+
if (!renderer.hasInitialized?.()) {
|
|
14293
|
+
const size2 = computeInitialSize(canvas, propsSize);
|
|
14294
|
+
if (size2.width > 0 && size2.height > 0) {
|
|
14295
|
+
const pixelRatio = calculateDpr(dpr);
|
|
14296
|
+
canvas.width = size2.width * pixelRatio;
|
|
14297
|
+
canvas.height = size2.height * pixelRatio;
|
|
14298
|
+
}
|
|
14299
|
+
await renderer.init();
|
|
14300
|
+
}
|
|
14301
|
+
const backend = renderer.backend;
|
|
14302
|
+
const isWebGPUBackend = backend && "isWebGPUBackend" in backend;
|
|
14303
|
+
state.internal.actualRenderer = renderer;
|
|
14304
|
+
state.set({ webGPUSupported: isWebGPUBackend, renderer, primaryStore: store });
|
|
14305
|
+
if (canvasId && !state.internal.isSecondary) {
|
|
14306
|
+
const canvasTarget = new webgpu.CanvasTarget(canvas);
|
|
14307
|
+
const unregisterPrimary = registerPrimary(canvasId, renderer, store);
|
|
14308
|
+
state.set((prev) => ({
|
|
14309
|
+
internal: {
|
|
14310
|
+
...prev.internal,
|
|
14311
|
+
canvasTarget,
|
|
14312
|
+
unregisterPrimary
|
|
14313
|
+
}
|
|
14314
|
+
}));
|
|
14315
|
+
}
|
|
15316
14316
|
}
|
|
15317
|
-
}))
|
|
14317
|
+
})().catch((err) => {
|
|
14318
|
+
rendererSetup = null;
|
|
14319
|
+
throw err;
|
|
14320
|
+
});
|
|
15318
14321
|
}
|
|
14322
|
+
await rendererSetup;
|
|
14323
|
+
state = store.getState();
|
|
14324
|
+
renderer = state.internal.actualRenderer;
|
|
15319
14325
|
}
|
|
15320
14326
|
let raycaster = state.raycaster;
|
|
15321
14327
|
if (!raycaster) state.set({ raycaster: raycaster = new webgpu.Raycaster() });
|
|
@@ -15495,15 +14501,15 @@ function createRoot(canvas) {
|
|
|
15495
14501
|
applyProps(currentRenderer, rendererProps);
|
|
15496
14502
|
}
|
|
15497
14503
|
}
|
|
15498
|
-
const scheduler = getScheduler();
|
|
14504
|
+
const scheduler$1 = scheduler.getScheduler();
|
|
15499
14505
|
const rootId = state.internal.rootId;
|
|
15500
14506
|
if (!rootId) {
|
|
15501
|
-
const newRootId = canvasId || scheduler.generateRootId();
|
|
15502
|
-
const unregisterRoot = scheduler.registerRoot(newRootId, {
|
|
14507
|
+
const newRootId = canvasId || scheduler$1.generateRootId();
|
|
14508
|
+
const unregisterRoot = scheduler$1.registerRoot(newRootId, {
|
|
15503
14509
|
getState: () => store.getState(),
|
|
15504
14510
|
onError: (err) => store.getState().setError(err)
|
|
15505
14511
|
});
|
|
15506
|
-
const unregisterCanvasTarget = scheduler.register(
|
|
14512
|
+
const unregisterCanvasTarget = scheduler$1.register(
|
|
15507
14513
|
() => {
|
|
15508
14514
|
const state2 = store.getState();
|
|
15509
14515
|
if (state2.internal.isMultiCanvas && state2.internal.canvasTarget) {
|
|
@@ -15518,7 +14524,7 @@ function createRoot(canvas) {
|
|
|
15518
14524
|
system: true
|
|
15519
14525
|
}
|
|
15520
14526
|
);
|
|
15521
|
-
const unregisterEventsFlush = scheduler.register(
|
|
14527
|
+
const unregisterEventsFlush = scheduler$1.register(
|
|
15522
14528
|
() => {
|
|
15523
14529
|
const state2 = store.getState();
|
|
15524
14530
|
state2.events.flush?.();
|
|
@@ -15530,7 +14536,7 @@ function createRoot(canvas) {
|
|
|
15530
14536
|
system: true
|
|
15531
14537
|
}
|
|
15532
14538
|
);
|
|
15533
|
-
const unregisterFrustum = scheduler.register(
|
|
14539
|
+
const unregisterFrustum = scheduler$1.register(
|
|
15534
14540
|
() => {
|
|
15535
14541
|
const state2 = store.getState();
|
|
15536
14542
|
if (state2.autoUpdateFrustum && state2.camera) {
|
|
@@ -15540,11 +14546,11 @@ function createRoot(canvas) {
|
|
|
15540
14546
|
{
|
|
15541
14547
|
id: `${newRootId}_frustum`,
|
|
15542
14548
|
rootId: newRootId,
|
|
15543
|
-
|
|
14549
|
+
before: "render",
|
|
15544
14550
|
system: true
|
|
15545
14551
|
}
|
|
15546
14552
|
);
|
|
15547
|
-
const unregisterVisibility = scheduler.register(
|
|
14553
|
+
const unregisterVisibility = scheduler$1.register(
|
|
15548
14554
|
() => {
|
|
15549
14555
|
const state2 = store.getState();
|
|
15550
14556
|
checkVisibility(state2);
|
|
@@ -15552,16 +14558,16 @@ function createRoot(canvas) {
|
|
|
15552
14558
|
{
|
|
15553
14559
|
id: `${newRootId}_visibility`,
|
|
15554
14560
|
rootId: newRootId,
|
|
15555
|
-
|
|
14561
|
+
before: "render",
|
|
15556
14562
|
system: true,
|
|
15557
14563
|
after: `${newRootId}_frustum`
|
|
15558
14564
|
}
|
|
15559
14565
|
);
|
|
15560
|
-
const unregisterRender = scheduler.register(
|
|
14566
|
+
const unregisterRender = scheduler$1.register(
|
|
15561
14567
|
() => {
|
|
15562
14568
|
const state2 = store.getState();
|
|
15563
14569
|
const renderer2 = state2.internal.actualRenderer;
|
|
15564
|
-
const userHandlesRender = scheduler.hasUserJobsInPhase("render", newRootId);
|
|
14570
|
+
const userHandlesRender = scheduler$1.hasUserJobsInPhase("render", newRootId);
|
|
15565
14571
|
if (userHandlesRender || state2.internal.priority) return;
|
|
15566
14572
|
try {
|
|
15567
14573
|
if (state2.renderPipeline?.render) state2.renderPipeline.render();
|
|
@@ -15594,11 +14600,11 @@ function createRoot(canvas) {
|
|
|
15594
14600
|
unregisterVisibility();
|
|
15595
14601
|
unregisterRender();
|
|
15596
14602
|
},
|
|
15597
|
-
scheduler
|
|
14603
|
+
scheduler: scheduler$1
|
|
15598
14604
|
}
|
|
15599
14605
|
}));
|
|
15600
14606
|
}
|
|
15601
|
-
scheduler.frameloop = frameloop;
|
|
14607
|
+
scheduler$1.frameloop = frameloop;
|
|
15602
14608
|
onCreated = onCreatedCallback;
|
|
15603
14609
|
configured = true;
|
|
15604
14610
|
resolve();
|
|
@@ -15665,7 +14671,8 @@ function unmountComponentAtNode(canvas, callback) {
|
|
|
15665
14671
|
dispose(state.scene);
|
|
15666
14672
|
_roots.delete(canvas);
|
|
15667
14673
|
if (callback) callback(canvas);
|
|
15668
|
-
} catch {
|
|
14674
|
+
} catch (error) {
|
|
14675
|
+
console.warn("[R3F] Error while unmounting root; teardown may be incomplete:", error);
|
|
15669
14676
|
}
|
|
15670
14677
|
}, 500);
|
|
15671
14678
|
}
|
|
@@ -15728,6 +14735,7 @@ function PortalInner({ state = {}, children, container }) {
|
|
|
15728
14735
|
viewport = rootState.viewport.getCurrentViewport(camera, new webgpu.Vector3(), resolvedSize);
|
|
15729
14736
|
if (camera !== rootState.camera) updateCamera(camera, resolvedSize);
|
|
15730
14737
|
}
|
|
14738
|
+
const set = injectState.set;
|
|
15731
14739
|
return {
|
|
15732
14740
|
// The intersect consists of the previous root state
|
|
15733
14741
|
...rootState,
|
|
@@ -15746,7 +14754,7 @@ function PortalInner({ state = {}, children, container }) {
|
|
|
15746
14754
|
size: resolvedSize,
|
|
15747
14755
|
viewport: { ...rootState.viewport, ...viewport },
|
|
15748
14756
|
// Layers are allowed to override events
|
|
15749
|
-
setEvents: (events2) =>
|
|
14757
|
+
setEvents: (events2) => set((state2) => ({ ...state2, events: { ...state2.events, ...events2 } })),
|
|
15750
14758
|
// Container for child attachment - the portalScene (injected or container itself)
|
|
15751
14759
|
internal: { ...rootState.internal, ...injectState.internal, container: portalScene }
|
|
15752
14760
|
};
|
|
@@ -15775,6 +14783,59 @@ function flushSync(fn) {
|
|
|
15775
14783
|
return reconciler.flushSyncFromReconciler(fn);
|
|
15776
14784
|
}
|
|
15777
14785
|
|
|
14786
|
+
function parseBackground(background) {
|
|
14787
|
+
if (!background) return null;
|
|
14788
|
+
if (typeof background === "object" && !background.isColor) {
|
|
14789
|
+
const { backgroundMap, envMap, files, preset, ...rest } = background;
|
|
14790
|
+
return {
|
|
14791
|
+
...rest,
|
|
14792
|
+
preset,
|
|
14793
|
+
files: envMap || files,
|
|
14794
|
+
backgroundFiles: backgroundMap,
|
|
14795
|
+
background: true
|
|
14796
|
+
};
|
|
14797
|
+
}
|
|
14798
|
+
if (typeof background === "number") {
|
|
14799
|
+
return { color: background, background: true };
|
|
14800
|
+
}
|
|
14801
|
+
if (typeof background === "string") {
|
|
14802
|
+
if (background in presetsObj) {
|
|
14803
|
+
return { preset: background, background: true };
|
|
14804
|
+
}
|
|
14805
|
+
if (/^(https?:\/\/|\/|\.\/|\.\.\/)|\.(hdr|exr|jpg|jpeg|png|webp|gif)$/i.test(background)) {
|
|
14806
|
+
return { files: background, background: true };
|
|
14807
|
+
}
|
|
14808
|
+
return { color: background, background: true };
|
|
14809
|
+
}
|
|
14810
|
+
if (background.isColor) {
|
|
14811
|
+
return { color: background, background: true };
|
|
14812
|
+
}
|
|
14813
|
+
return null;
|
|
14814
|
+
}
|
|
14815
|
+
|
|
14816
|
+
function parseRendererConfig(rendererProp) {
|
|
14817
|
+
const isRendererConfig = typeof rendererProp === "object" && rendererProp !== null && !("render" in rendererProp) && ("primaryCanvas" in rendererProp || "scheduler" in rendererProp);
|
|
14818
|
+
if (isRendererConfig) {
|
|
14819
|
+
const { primaryCanvas: pc, scheduler: sc, ...rest } = rendererProp;
|
|
14820
|
+
return {
|
|
14821
|
+
primaryCanvas: pc,
|
|
14822
|
+
scheduler: sc,
|
|
14823
|
+
renderer: Object.keys(rest).length > 0 ? rest : rendererProp
|
|
14824
|
+
};
|
|
14825
|
+
}
|
|
14826
|
+
return { primaryCanvas: void 0, scheduler: void 0, renderer: rendererProp };
|
|
14827
|
+
}
|
|
14828
|
+
|
|
14829
|
+
function clearHmrCaches(store) {
|
|
14830
|
+
store.setState((state) => ({
|
|
14831
|
+
nodes: {},
|
|
14832
|
+
uniforms: {},
|
|
14833
|
+
buffers: {},
|
|
14834
|
+
gpuStorage: {},
|
|
14835
|
+
_hmrVersion: state._hmrVersion + 1
|
|
14836
|
+
}));
|
|
14837
|
+
}
|
|
14838
|
+
|
|
15778
14839
|
function CanvasImpl({
|
|
15779
14840
|
ref,
|
|
15780
14841
|
children,
|
|
@@ -15795,6 +14856,8 @@ function CanvasImpl({
|
|
|
15795
14856
|
raycaster,
|
|
15796
14857
|
camera,
|
|
15797
14858
|
scene,
|
|
14859
|
+
autoUpdateFrustum,
|
|
14860
|
+
occlusion,
|
|
15798
14861
|
onPointerMissed,
|
|
15799
14862
|
onDragOverMissed,
|
|
15800
14863
|
onDropMissed,
|
|
@@ -15806,49 +14869,10 @@ function CanvasImpl({
|
|
|
15806
14869
|
forceEven,
|
|
15807
14870
|
...props
|
|
15808
14871
|
}) {
|
|
15809
|
-
const
|
|
15810
|
-
let primaryCanvas;
|
|
15811
|
-
let scheduler;
|
|
15812
|
-
let renderer;
|
|
15813
|
-
if (isRendererConfig) {
|
|
15814
|
-
const { primaryCanvas: pc, scheduler: sc, ...rest } = rendererProp;
|
|
15815
|
-
primaryCanvas = pc;
|
|
15816
|
-
scheduler = sc;
|
|
15817
|
-
renderer = Object.keys(rest).length > 0 ? rest : rendererProp;
|
|
15818
|
-
} else {
|
|
15819
|
-
renderer = rendererProp;
|
|
15820
|
-
}
|
|
14872
|
+
const { primaryCanvas, scheduler, renderer } = parseRendererConfig(rendererProp);
|
|
15821
14873
|
React__namespace.useMemo(() => extend(THREE), []);
|
|
15822
14874
|
const Bridge = useBridge();
|
|
15823
|
-
const backgroundProps = React__namespace.useMemo(() =>
|
|
15824
|
-
if (!background) return null;
|
|
15825
|
-
if (typeof background === "object" && !background.isColor) {
|
|
15826
|
-
const { backgroundMap, envMap, files, preset, ...rest } = background;
|
|
15827
|
-
return {
|
|
15828
|
-
...rest,
|
|
15829
|
-
preset,
|
|
15830
|
-
files: envMap || files,
|
|
15831
|
-
backgroundFiles: backgroundMap,
|
|
15832
|
-
background: true
|
|
15833
|
-
};
|
|
15834
|
-
}
|
|
15835
|
-
if (typeof background === "number") {
|
|
15836
|
-
return { color: background, background: true };
|
|
15837
|
-
}
|
|
15838
|
-
if (typeof background === "string") {
|
|
15839
|
-
if (background in presetsObj) {
|
|
15840
|
-
return { preset: background, background: true };
|
|
15841
|
-
}
|
|
15842
|
-
if (/^(https?:\/\/|\/|\.\/|\.\.\/)|\\.(hdr|exr|jpg|jpeg|png|webp|gif)$/i.test(background)) {
|
|
15843
|
-
return { files: background, background: true };
|
|
15844
|
-
}
|
|
15845
|
-
return { color: background, background: true };
|
|
15846
|
-
}
|
|
15847
|
-
if (background.isColor) {
|
|
15848
|
-
return { color: background, background: true };
|
|
15849
|
-
}
|
|
15850
|
-
return null;
|
|
15851
|
-
}, [background]);
|
|
14875
|
+
const backgroundProps = React__namespace.useMemo(() => parseBackground(background), [background]);
|
|
15852
14876
|
const hasInitialSizeRef = React__namespace.useRef(false);
|
|
15853
14877
|
const measureConfig = React__namespace.useMemo(() => {
|
|
15854
14878
|
if (!hasInitialSizeRef.current) {
|
|
@@ -15890,6 +14914,7 @@ function CanvasImpl({
|
|
|
15890
14914
|
const handleDropMissed = useMutableCallback(onDropMissed);
|
|
15891
14915
|
const [block, setBlock] = React__namespace.useState(false);
|
|
15892
14916
|
const [error, setError] = React__namespace.useState(false);
|
|
14917
|
+
const [fallbackVisible, setFallbackVisible] = React__namespace.useState(false);
|
|
15893
14918
|
if (block) throw block;
|
|
15894
14919
|
if (error) throw error;
|
|
15895
14920
|
const root = React__namespace.useRef(null);
|
|
@@ -15897,6 +14922,7 @@ function CanvasImpl({
|
|
|
15897
14922
|
const unsubscribeErrorRef = React__namespace.useRef(null);
|
|
15898
14923
|
useIsomorphicLayoutEffect(() => {
|
|
15899
14924
|
effectActiveRef.current = true;
|
|
14925
|
+
if (fallbackVisible) return;
|
|
15900
14926
|
const canvas = canvasRef.current;
|
|
15901
14927
|
if (effectiveSize.width > 0 && effectiveSize.height > 0 && canvas) {
|
|
15902
14928
|
if (!root.current) {
|
|
@@ -15917,7 +14943,7 @@ function CanvasImpl({
|
|
|
15917
14943
|
}
|
|
15918
14944
|
async function run() {
|
|
15919
14945
|
if (!effectActiveRef.current || !root.current) return;
|
|
15920
|
-
await root.current.configure({
|
|
14946
|
+
const configured = await root.current.configure({
|
|
15921
14947
|
id,
|
|
15922
14948
|
primaryCanvas,
|
|
15923
14949
|
scheduler,
|
|
@@ -15932,6 +14958,8 @@ function CanvasImpl({
|
|
|
15932
14958
|
performance,
|
|
15933
14959
|
raycaster,
|
|
15934
14960
|
camera,
|
|
14961
|
+
autoUpdateFrustum,
|
|
14962
|
+
occlusion,
|
|
15935
14963
|
size: effectiveSize,
|
|
15936
14964
|
// Store size props for reset functionality
|
|
15937
14965
|
_sizeProps: width !== void 0 || height !== void 0 ? { width, height } : null,
|
|
@@ -15956,8 +14984,20 @@ function CanvasImpl({
|
|
|
15956
14984
|
}
|
|
15957
14985
|
onCreated?.(state);
|
|
15958
14986
|
}
|
|
15959
|
-
})
|
|
15960
|
-
|
|
14987
|
+
}).then(
|
|
14988
|
+
() => true,
|
|
14989
|
+
// Renderer setup failed (e.g. no WebGL/WebGPU support). The `fallback` prop lives
|
|
14990
|
+
// inside <canvas>, which browsers don't display, so surface it as visible DOM
|
|
14991
|
+
// instead; with no fallback, rethrow to an external error boundary. (#3757)
|
|
14992
|
+
(setupError) => {
|
|
14993
|
+
if (effectActiveRef.current) {
|
|
14994
|
+
if (fallback != null) setFallbackVisible(true);
|
|
14995
|
+
else setError(setupError);
|
|
14996
|
+
}
|
|
14997
|
+
return false;
|
|
14998
|
+
}
|
|
14999
|
+
);
|
|
15000
|
+
if (!configured || !effectActiveRef.current || !root.current) return;
|
|
15961
15001
|
root.current.render(
|
|
15962
15002
|
/* @__PURE__ */ jsxRuntime.jsx(Bridge, { children: /* @__PURE__ */ jsxRuntime.jsx(ErrorBoundary, { set: setError, children: /* @__PURE__ */ jsxRuntime.jsxs(React__namespace.Suspense, { fallback: /* @__PURE__ */ jsxRuntime.jsx(Block, { set: setBlock }), children: [
|
|
15963
15003
|
backgroundProps && /* @__PURE__ */ jsxRuntime.jsx(Environment, { ...backgroundProps }),
|
|
@@ -15991,14 +15031,7 @@ function CanvasImpl({
|
|
|
15991
15031
|
const handleHMR = () => {
|
|
15992
15032
|
queueMicrotask(() => {
|
|
15993
15033
|
const rootEntry = _roots.get(canvas);
|
|
15994
|
-
if (rootEntry?.store)
|
|
15995
|
-
console.log("[R3F] HMR detected \u2014 rebuilding nodes/uniforms");
|
|
15996
|
-
rootEntry.store.setState((state) => ({
|
|
15997
|
-
nodes: {},
|
|
15998
|
-
uniforms: {},
|
|
15999
|
-
_hmrVersion: state._hmrVersion + 1
|
|
16000
|
-
}));
|
|
16001
|
-
}
|
|
15034
|
+
if (rootEntry?.store) clearHmrCaches(rootEntry.store);
|
|
16002
15035
|
});
|
|
16003
15036
|
};
|
|
16004
15037
|
if (typeof ({ url: (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index.cjs', document.baseURI).href)) }) !== "undefined" && undefined) {
|
|
@@ -16027,7 +15060,11 @@ function CanvasImpl({
|
|
|
16027
15060
|
...style
|
|
16028
15061
|
},
|
|
16029
15062
|
...props,
|
|
16030
|
-
children:
|
|
15063
|
+
children: fallbackVisible ? (
|
|
15064
|
+
// Renderer setup failed: render the fallback as visible DOM. Inside <canvas> (below)
|
|
15065
|
+
// it exists in the tree but browsers never paint it, which is the whole bug (#3757).
|
|
15066
|
+
fallback
|
|
15067
|
+
) : /* @__PURE__ */ jsxRuntime.jsx("div", { ref: containerRef, className: "r3f-canvas-container", style: { width: "100%", height: "100%" }, children: /* @__PURE__ */ jsxRuntime.jsx(
|
|
16031
15068
|
"canvas",
|
|
16032
15069
|
{
|
|
16033
15070
|
ref: canvasRef,
|
|
@@ -16046,6 +15083,8 @@ function Canvas(props) {
|
|
|
16046
15083
|
|
|
16047
15084
|
extend(THREE);
|
|
16048
15085
|
|
|
15086
|
+
exports.Scheduler = scheduler.Scheduler;
|
|
15087
|
+
exports.getScheduler = scheduler.getScheduler;
|
|
16049
15088
|
exports.Block = Block;
|
|
16050
15089
|
exports.Canvas = Canvas;
|
|
16051
15090
|
exports.Environment = Environment;
|
|
@@ -16061,7 +15100,6 @@ exports.R3F_BUILD_LEGACY = R3F_BUILD_LEGACY;
|
|
|
16061
15100
|
exports.R3F_BUILD_WEBGPU = R3F_BUILD_WEBGPU;
|
|
16062
15101
|
exports.REACT_INTERNAL_PROPS = REACT_INTERNAL_PROPS;
|
|
16063
15102
|
exports.RESERVED_PROPS = RESERVED_PROPS;
|
|
16064
|
-
exports.Scheduler = Scheduler;
|
|
16065
15103
|
exports.Texture = Texture;
|
|
16066
15104
|
exports._roots = _roots;
|
|
16067
15105
|
exports.act = act;
|
|
@@ -16091,7 +15129,6 @@ exports.getInstanceProps = getInstanceProps;
|
|
|
16091
15129
|
exports.getPrimary = getPrimary;
|
|
16092
15130
|
exports.getPrimaryIds = getPrimaryIds;
|
|
16093
15131
|
exports.getRootState = getRootState;
|
|
16094
|
-
exports.getScheduler = getScheduler;
|
|
16095
15132
|
exports.getUuidPrefix = getUuidPrefix;
|
|
16096
15133
|
exports.hasConstructor = hasConstructor;
|
|
16097
15134
|
exports.hasPrimary = hasPrimary;
|