@react-three/fiber 10.0.0-canary.d6fdf72 → 10.0.0-canary.e881a4a
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 +297 -1218
- package/dist/index.d.cts +71 -742
- package/dist/index.d.mts +71 -742
- package/dist/index.d.ts +71 -742
- package/dist/index.mjs +271 -1191
- package/dist/legacy.cjs +252 -1173
- package/dist/legacy.d.cts +71 -741
- package/dist/legacy.d.mts +71 -741
- package/dist/legacy.d.ts +71 -741
- package/dist/legacy.mjs +225 -1145
- package/dist/webgpu/index.cjs +818 -1962
- package/dist/webgpu/index.d.cts +104 -745
- package/dist/webgpu/index.d.mts +104 -745
- package/dist/webgpu/index.d.ts +104 -745
- package/dist/webgpu/index.mjs +793 -1936
- 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,
|
|
@@ -2879,8 +1886,7 @@ const createStore = (invalidate, advance) => {
|
|
|
2879
1886
|
const currentState = rootStore.getState();
|
|
2880
1887
|
if (!currentState.isLegacy && currentState.internal.actualRenderer) {
|
|
2881
1888
|
const stack = new Error().stack || "";
|
|
2882
|
-
|
|
2883
|
-
if (!isInternalAccess) {
|
|
1889
|
+
if (!isInternalRendererAccess(stack)) {
|
|
2884
1890
|
const cleanedStack = stack.split("\n").slice(2).join("\n") || "Stack trace unavailable";
|
|
2885
1891
|
notifyDepreciated({
|
|
2886
1892
|
heading: "Accessing state.gl in WebGPU mode",
|
|
@@ -2993,26 +1999,32 @@ function loadingFn(extensions, onProgress) {
|
|
|
2993
1999
|
);
|
|
2994
2000
|
};
|
|
2995
2001
|
}
|
|
2996
|
-
function useLoader(loader, input, extensions, onProgress) {
|
|
2997
|
-
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];
|
|
2998
2005
|
const fn = loadingFn(extensions, onProgress);
|
|
2999
|
-
const results =
|
|
2006
|
+
const results = cacheKeys.map(
|
|
2007
|
+
(key, index) => suspendReact.suspend(() => fn(loader, inputs[index]), [loader, key], { equal: is.equ })
|
|
2008
|
+
);
|
|
3000
2009
|
return Array.isArray(input) ? results : results[0];
|
|
3001
2010
|
}
|
|
3002
|
-
useLoader.preload = function(loader, input, extensions, onProgress) {
|
|
3003
|
-
const
|
|
3004
|
-
|
|
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
|
+
);
|
|
3005
2017
|
};
|
|
3006
|
-
useLoader.clear = function(loader, input) {
|
|
3007
|
-
const
|
|
3008
|
-
|
|
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]));
|
|
3009
2021
|
};
|
|
3010
2022
|
useLoader.loader = getLoader;
|
|
3011
2023
|
|
|
3012
2024
|
function useFrame(callback, priorityOrOptions) {
|
|
3013
2025
|
const store = React__namespace.useContext(context);
|
|
3014
2026
|
const isInsideCanvas = store !== null;
|
|
3015
|
-
const scheduler = getScheduler();
|
|
2027
|
+
const scheduler$1 = scheduler.getScheduler();
|
|
3016
2028
|
const optionsKey = typeof priorityOrOptions === "number" ? `p:${priorityOrOptions}` : priorityOrOptions ? JSON.stringify({
|
|
3017
2029
|
id: priorityOrOptions.id,
|
|
3018
2030
|
phase: priorityOrOptions.phase,
|
|
@@ -3060,7 +2072,7 @@ function useFrame(callback, priorityOrOptions) {
|
|
|
3060
2072
|
};
|
|
3061
2073
|
callbackRef.current?.(mergedState, delta);
|
|
3062
2074
|
};
|
|
3063
|
-
const unregister = scheduler.register(wrappedCallback, {
|
|
2075
|
+
const unregister = scheduler$1.register(wrappedCallback, {
|
|
3064
2076
|
id,
|
|
3065
2077
|
rootId,
|
|
3066
2078
|
...options
|
|
@@ -3081,37 +2093,31 @@ function useFrame(callback, priorityOrOptions) {
|
|
|
3081
2093
|
}
|
|
3082
2094
|
};
|
|
3083
2095
|
} else {
|
|
3084
|
-
|
|
3085
|
-
|
|
3086
|
-
|
|
3087
|
-
|
|
3088
|
-
|
|
3089
|
-
|
|
3090
|
-
|
|
3091
|
-
|
|
3092
|
-
unregisterJob = registerOutside();
|
|
3093
|
-
});
|
|
3094
|
-
return () => {
|
|
3095
|
-
unsubReady();
|
|
3096
|
-
unregisterJob?.();
|
|
3097
|
-
};
|
|
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
|
+
);
|
|
3098
2104
|
}
|
|
3099
|
-
}, [store, scheduler, id, optionsKey, isLegacyPriority, isInsideCanvas]);
|
|
2105
|
+
}, [store, scheduler$1, id, optionsKey, isLegacyPriority, isInsideCanvas]);
|
|
3100
2106
|
const isPaused = React__namespace.useSyncExternalStore(
|
|
3101
2107
|
// Subscribe function
|
|
3102
2108
|
React__namespace.useCallback(
|
|
3103
2109
|
(onStoreChange) => {
|
|
3104
|
-
return getScheduler().subscribeJobState(id, onStoreChange);
|
|
2110
|
+
return scheduler.getScheduler().subscribeJobState(id, onStoreChange);
|
|
3105
2111
|
},
|
|
3106
2112
|
[id]
|
|
3107
2113
|
),
|
|
3108
2114
|
// getSnapshot function
|
|
3109
|
-
React__namespace.useCallback(() => getScheduler().isJobPaused(id), [id]),
|
|
2115
|
+
React__namespace.useCallback(() => scheduler.getScheduler().isJobPaused(id), [id]),
|
|
3110
2116
|
// getServerSnapshot function (SSR)
|
|
3111
2117
|
React__namespace.useCallback(() => false, [])
|
|
3112
2118
|
);
|
|
3113
2119
|
const controls = React__namespace.useMemo(() => {
|
|
3114
|
-
const scheduler2 = getScheduler();
|
|
2120
|
+
const scheduler2 = scheduler.getScheduler();
|
|
3115
2121
|
return {
|
|
3116
2122
|
/** The job's unique ID */
|
|
3117
2123
|
id,
|
|
@@ -3126,7 +2132,7 @@ function useFrame(callback, priorityOrOptions) {
|
|
|
3126
2132
|
* @param timestamp Optional timestamp (defaults to performance.now())
|
|
3127
2133
|
*/
|
|
3128
2134
|
step: (timestamp) => {
|
|
3129
|
-
getScheduler().stepJob(id, timestamp);
|
|
2135
|
+
scheduler.getScheduler().stepJob(id, timestamp);
|
|
3130
2136
|
},
|
|
3131
2137
|
/**
|
|
3132
2138
|
* Manually step ALL jobs in the scheduler.
|
|
@@ -3134,20 +2140,20 @@ function useFrame(callback, priorityOrOptions) {
|
|
|
3134
2140
|
* @param timestamp Optional timestamp (defaults to performance.now())
|
|
3135
2141
|
*/
|
|
3136
2142
|
stepAll: (timestamp) => {
|
|
3137
|
-
getScheduler().step(timestamp);
|
|
2143
|
+
scheduler.getScheduler().step(timestamp);
|
|
3138
2144
|
},
|
|
3139
2145
|
/**
|
|
3140
2146
|
* Pause this job (set enabled=false).
|
|
3141
2147
|
* Job remains registered but won't run.
|
|
3142
2148
|
*/
|
|
3143
2149
|
pause: () => {
|
|
3144
|
-
getScheduler().pauseJob(id);
|
|
2150
|
+
scheduler.getScheduler().pauseJob(id);
|
|
3145
2151
|
},
|
|
3146
2152
|
/**
|
|
3147
2153
|
* Resume this job (set enabled=true).
|
|
3148
2154
|
*/
|
|
3149
2155
|
resume: () => {
|
|
3150
|
-
getScheduler().resumeJob(id);
|
|
2156
|
+
scheduler.getScheduler().resumeJob(id);
|
|
3151
2157
|
},
|
|
3152
2158
|
/**
|
|
3153
2159
|
* Reactive paused state - automatically updates when pause/resume is called.
|
|
@@ -3407,7 +2413,7 @@ function addEffect(callback) {
|
|
|
3407
2413
|
link: "https://docs.pmnd.rs/react-three-fiber/api/hooks#useframe"
|
|
3408
2414
|
});
|
|
3409
2415
|
const id = `legacy_effect_${effectId++}`;
|
|
3410
|
-
return getScheduler().registerGlobal("before", id, callback);
|
|
2416
|
+
return scheduler.getScheduler().registerGlobal("before", id, callback);
|
|
3411
2417
|
}
|
|
3412
2418
|
function addAfterEffect(callback) {
|
|
3413
2419
|
notifyDepreciated({
|
|
@@ -3416,7 +2422,7 @@ function addAfterEffect(callback) {
|
|
|
3416
2422
|
link: "https://docs.pmnd.rs/react-three-fiber/api/hooks#useframe"
|
|
3417
2423
|
});
|
|
3418
2424
|
const id = `legacy_afterEffect_${effectId++}`;
|
|
3419
|
-
return getScheduler().registerGlobal("after", id, callback);
|
|
2425
|
+
return scheduler.getScheduler().registerGlobal("after", id, callback);
|
|
3420
2426
|
}
|
|
3421
2427
|
function addTail(callback) {
|
|
3422
2428
|
notifyDepreciated({
|
|
@@ -3424,16 +2430,16 @@ function addTail(callback) {
|
|
|
3424
2430
|
body: "Use scheduler.onIdle(callback) instead.\naddTail will be removed in a future version.",
|
|
3425
2431
|
link: "https://docs.pmnd.rs/react-three-fiber/api/hooks#useframe"
|
|
3426
2432
|
});
|
|
3427
|
-
return getScheduler().onIdle(callback);
|
|
2433
|
+
return scheduler.getScheduler().onIdle(callback);
|
|
3428
2434
|
}
|
|
3429
2435
|
function invalidate(state, frames = 1, stackFrames = false) {
|
|
3430
|
-
getScheduler().invalidate(frames, stackFrames);
|
|
2436
|
+
scheduler.getScheduler().invalidate(frames, stackFrames);
|
|
3431
2437
|
}
|
|
3432
2438
|
function advance(timestamp) {
|
|
3433
|
-
getScheduler().step(timestamp);
|
|
2439
|
+
scheduler.getScheduler().step(timestamp);
|
|
3434
2440
|
}
|
|
3435
2441
|
|
|
3436
|
-
const version = "10.0.0-alpha.
|
|
2442
|
+
const version = "10.0.0-alpha.3";
|
|
3437
2443
|
const packageData = {
|
|
3438
2444
|
version: version};
|
|
3439
2445
|
|
|
@@ -14872,6 +13878,7 @@ function swapInstances() {
|
|
|
14872
13878
|
}
|
|
14873
13879
|
}
|
|
14874
13880
|
if (instance.isHidden) unhideInstance(instance);
|
|
13881
|
+
if (isObject3D(instance.object)) removeInteractivity(findInitialRoot(instance), instance.object);
|
|
14875
13882
|
if (instance.object.__r3f) delete instance.object.__r3f;
|
|
14876
13883
|
if (instance.type !== "primitive") disposeOnIdle(instance.object);
|
|
14877
13884
|
}
|
|
@@ -14884,6 +13891,8 @@ function swapInstances() {
|
|
|
14884
13891
|
instance.object.__r3f = instance;
|
|
14885
13892
|
setFiberRef(fiber, instance.object);
|
|
14886
13893
|
delete instance.appliedOnce;
|
|
13894
|
+
instance.eventCount = 0;
|
|
13895
|
+
instance.handlers = {};
|
|
14887
13896
|
applyProps(instance.object, instance.props);
|
|
14888
13897
|
if (instance.props.attach) {
|
|
14889
13898
|
attach(parent, instance);
|
|
@@ -15099,11 +14108,15 @@ const reconciler = /* @__PURE__ */ createReconciler({
|
|
|
15099
14108
|
cloneMutableTextInstance(textInstance) {
|
|
15100
14109
|
return textInstance;
|
|
15101
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.
|
|
15102
14117
|
cloneRootViewTransitionContainer(_rootContainer) {
|
|
15103
|
-
throw new Error("Not implemented.");
|
|
15104
14118
|
},
|
|
15105
14119
|
removeRootViewTransitionClone(_rootContainer, _clone) {
|
|
15106
|
-
throw new Error("Not implemented.");
|
|
15107
14120
|
},
|
|
15108
14121
|
// https://github.com/facebook/react/pull/32465
|
|
15109
14122
|
createFragmentInstance: (_fiber) => null,
|
|
@@ -15188,6 +14201,7 @@ function createRoot(canvas) {
|
|
|
15188
14201
|
const lastConfiguredProps = {};
|
|
15189
14202
|
let configured = false;
|
|
15190
14203
|
let pending = null;
|
|
14204
|
+
let rendererSetup = null;
|
|
15191
14205
|
return {
|
|
15192
14206
|
async configure(props = {}) {
|
|
15193
14207
|
let resolve;
|
|
@@ -15218,7 +14232,7 @@ function createRoot(canvas) {
|
|
|
15218
14232
|
forceEven
|
|
15219
14233
|
} = props;
|
|
15220
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;
|
|
15221
|
-
|
|
14235
|
+
let state = store.getState();
|
|
15222
14236
|
const defaultGLProps = {
|
|
15223
14237
|
canvas,
|
|
15224
14238
|
powerPreference: "high-performance",
|
|
@@ -15246,56 +14260,68 @@ function createRoot(canvas) {
|
|
|
15246
14260
|
"The `primaryCanvas` prop for multi-canvas rendering cannot be used with WebGL. Remove the `gl` prop or use WebGPU."
|
|
15247
14261
|
);
|
|
15248
14262
|
}
|
|
15249
|
-
if (
|
|
15250
|
-
|
|
15251
|
-
|
|
15252
|
-
|
|
15253
|
-
|
|
15254
|
-
|
|
15255
|
-
|
|
15256
|
-
|
|
15257
|
-
|
|
15258
|
-
|
|
15259
|
-
|
|
15260
|
-
|
|
15261
|
-
|
|
15262
|
-
|
|
15263
|
-
|
|
15264
|
-
|
|
15265
|
-
|
|
15266
|
-
|
|
15267
|
-
|
|
15268
|
-
|
|
15269
|
-
|
|
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
|
-
|
|
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
|
+
}
|
|
15296
14316
|
}
|
|
15297
|
-
}))
|
|
14317
|
+
})().catch((err) => {
|
|
14318
|
+
rendererSetup = null;
|
|
14319
|
+
throw err;
|
|
14320
|
+
});
|
|
15298
14321
|
}
|
|
14322
|
+
await rendererSetup;
|
|
14323
|
+
state = store.getState();
|
|
14324
|
+
renderer = state.internal.actualRenderer;
|
|
15299
14325
|
}
|
|
15300
14326
|
let raycaster = state.raycaster;
|
|
15301
14327
|
if (!raycaster) state.set({ raycaster: raycaster = new webgpu.Raycaster() });
|
|
@@ -15475,15 +14501,15 @@ function createRoot(canvas) {
|
|
|
15475
14501
|
applyProps(currentRenderer, rendererProps);
|
|
15476
14502
|
}
|
|
15477
14503
|
}
|
|
15478
|
-
const scheduler = getScheduler();
|
|
14504
|
+
const scheduler$1 = scheduler.getScheduler();
|
|
15479
14505
|
const rootId = state.internal.rootId;
|
|
15480
14506
|
if (!rootId) {
|
|
15481
|
-
const newRootId = canvasId || scheduler.generateRootId();
|
|
15482
|
-
const unregisterRoot = scheduler.registerRoot(newRootId, {
|
|
14507
|
+
const newRootId = canvasId || scheduler$1.generateRootId();
|
|
14508
|
+
const unregisterRoot = scheduler$1.registerRoot(newRootId, {
|
|
15483
14509
|
getState: () => store.getState(),
|
|
15484
14510
|
onError: (err) => store.getState().setError(err)
|
|
15485
14511
|
});
|
|
15486
|
-
const unregisterCanvasTarget = scheduler.register(
|
|
14512
|
+
const unregisterCanvasTarget = scheduler$1.register(
|
|
15487
14513
|
() => {
|
|
15488
14514
|
const state2 = store.getState();
|
|
15489
14515
|
if (state2.internal.isMultiCanvas && state2.internal.canvasTarget) {
|
|
@@ -15498,7 +14524,7 @@ function createRoot(canvas) {
|
|
|
15498
14524
|
system: true
|
|
15499
14525
|
}
|
|
15500
14526
|
);
|
|
15501
|
-
const unregisterEventsFlush = scheduler.register(
|
|
14527
|
+
const unregisterEventsFlush = scheduler$1.register(
|
|
15502
14528
|
() => {
|
|
15503
14529
|
const state2 = store.getState();
|
|
15504
14530
|
state2.events.flush?.();
|
|
@@ -15510,7 +14536,7 @@ function createRoot(canvas) {
|
|
|
15510
14536
|
system: true
|
|
15511
14537
|
}
|
|
15512
14538
|
);
|
|
15513
|
-
const unregisterFrustum = scheduler.register(
|
|
14539
|
+
const unregisterFrustum = scheduler$1.register(
|
|
15514
14540
|
() => {
|
|
15515
14541
|
const state2 = store.getState();
|
|
15516
14542
|
if (state2.autoUpdateFrustum && state2.camera) {
|
|
@@ -15520,11 +14546,11 @@ function createRoot(canvas) {
|
|
|
15520
14546
|
{
|
|
15521
14547
|
id: `${newRootId}_frustum`,
|
|
15522
14548
|
rootId: newRootId,
|
|
15523
|
-
|
|
14549
|
+
before: "render",
|
|
15524
14550
|
system: true
|
|
15525
14551
|
}
|
|
15526
14552
|
);
|
|
15527
|
-
const unregisterVisibility = scheduler.register(
|
|
14553
|
+
const unregisterVisibility = scheduler$1.register(
|
|
15528
14554
|
() => {
|
|
15529
14555
|
const state2 = store.getState();
|
|
15530
14556
|
checkVisibility(state2);
|
|
@@ -15532,16 +14558,16 @@ function createRoot(canvas) {
|
|
|
15532
14558
|
{
|
|
15533
14559
|
id: `${newRootId}_visibility`,
|
|
15534
14560
|
rootId: newRootId,
|
|
15535
|
-
|
|
14561
|
+
before: "render",
|
|
15536
14562
|
system: true,
|
|
15537
14563
|
after: `${newRootId}_frustum`
|
|
15538
14564
|
}
|
|
15539
14565
|
);
|
|
15540
|
-
const unregisterRender = scheduler.register(
|
|
14566
|
+
const unregisterRender = scheduler$1.register(
|
|
15541
14567
|
() => {
|
|
15542
14568
|
const state2 = store.getState();
|
|
15543
14569
|
const renderer2 = state2.internal.actualRenderer;
|
|
15544
|
-
const userHandlesRender = scheduler.hasUserJobsInPhase("render", newRootId);
|
|
14570
|
+
const userHandlesRender = scheduler$1.hasUserJobsInPhase("render", newRootId);
|
|
15545
14571
|
if (userHandlesRender || state2.internal.priority) return;
|
|
15546
14572
|
try {
|
|
15547
14573
|
if (state2.renderPipeline?.render) state2.renderPipeline.render();
|
|
@@ -15574,11 +14600,11 @@ function createRoot(canvas) {
|
|
|
15574
14600
|
unregisterVisibility();
|
|
15575
14601
|
unregisterRender();
|
|
15576
14602
|
},
|
|
15577
|
-
scheduler
|
|
14603
|
+
scheduler: scheduler$1
|
|
15578
14604
|
}
|
|
15579
14605
|
}));
|
|
15580
14606
|
}
|
|
15581
|
-
scheduler.frameloop = frameloop;
|
|
14607
|
+
scheduler$1.frameloop = frameloop;
|
|
15582
14608
|
onCreated = onCreatedCallback;
|
|
15583
14609
|
configured = true;
|
|
15584
14610
|
resolve();
|
|
@@ -15645,7 +14671,8 @@ function unmountComponentAtNode(canvas, callback) {
|
|
|
15645
14671
|
dispose(state.scene);
|
|
15646
14672
|
_roots.delete(canvas);
|
|
15647
14673
|
if (callback) callback(canvas);
|
|
15648
|
-
} catch {
|
|
14674
|
+
} catch (error) {
|
|
14675
|
+
console.warn("[R3F] Error while unmounting root; teardown may be incomplete:", error);
|
|
15649
14676
|
}
|
|
15650
14677
|
}, 500);
|
|
15651
14678
|
}
|
|
@@ -15708,6 +14735,7 @@ function PortalInner({ state = {}, children, container }) {
|
|
|
15708
14735
|
viewport = rootState.viewport.getCurrentViewport(camera, new webgpu.Vector3(), resolvedSize);
|
|
15709
14736
|
if (camera !== rootState.camera) updateCamera(camera, resolvedSize);
|
|
15710
14737
|
}
|
|
14738
|
+
const set = injectState.set;
|
|
15711
14739
|
return {
|
|
15712
14740
|
// The intersect consists of the previous root state
|
|
15713
14741
|
...rootState,
|
|
@@ -15726,7 +14754,7 @@ function PortalInner({ state = {}, children, container }) {
|
|
|
15726
14754
|
size: resolvedSize,
|
|
15727
14755
|
viewport: { ...rootState.viewport, ...viewport },
|
|
15728
14756
|
// Layers are allowed to override events
|
|
15729
|
-
setEvents: (events2) =>
|
|
14757
|
+
setEvents: (events2) => set((state2) => ({ ...state2, events: { ...state2.events, ...events2 } })),
|
|
15730
14758
|
// Container for child attachment - the portalScene (injected or container itself)
|
|
15731
14759
|
internal: { ...rootState.internal, ...injectState.internal, container: portalScene }
|
|
15732
14760
|
};
|
|
@@ -15755,6 +14783,81 @@ function flushSync(fn) {
|
|
|
15755
14783
|
return reconciler.flushSyncFromReconciler(fn);
|
|
15756
14784
|
}
|
|
15757
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
|
+
const RESOURCE_KINDS = ["nodes", "uniforms", "buffers", "gpuStorage"];
|
|
14830
|
+
const registries = /* @__PURE__ */ new WeakMap();
|
|
14831
|
+
function getKindRegistry(store, kind) {
|
|
14832
|
+
let registry = registries.get(store);
|
|
14833
|
+
if (!registry) {
|
|
14834
|
+
registry = {
|
|
14835
|
+
nodes: { valid: /* @__PURE__ */ new Set(), staged: /* @__PURE__ */ new Map() },
|
|
14836
|
+
uniforms: { valid: /* @__PURE__ */ new Set(), staged: /* @__PURE__ */ new Map() },
|
|
14837
|
+
buffers: { valid: /* @__PURE__ */ new Set(), staged: /* @__PURE__ */ new Map() },
|
|
14838
|
+
gpuStorage: { valid: /* @__PURE__ */ new Set(), staged: /* @__PURE__ */ new Map() }
|
|
14839
|
+
};
|
|
14840
|
+
registries.set(store, registry);
|
|
14841
|
+
}
|
|
14842
|
+
return registry[kind];
|
|
14843
|
+
}
|
|
14844
|
+
function invalidateResource(store, kind, scopeKey) {
|
|
14845
|
+
const registry = getKindRegistry(store, kind);
|
|
14846
|
+
{
|
|
14847
|
+
registry.valid.clear();
|
|
14848
|
+
registry.staged.clear();
|
|
14849
|
+
}
|
|
14850
|
+
}
|
|
14851
|
+
function invalidateAllResources(store) {
|
|
14852
|
+
for (const kind of RESOURCE_KINDS) invalidateResource(store, kind);
|
|
14853
|
+
}
|
|
14854
|
+
|
|
14855
|
+
function clearHmrCaches(store) {
|
|
14856
|
+
const primary = store.getState().primaryStore ?? store;
|
|
14857
|
+
invalidateAllResources(primary);
|
|
14858
|
+
primary.setState((state) => ({ _hmrVersion: state._hmrVersion + 1 }));
|
|
14859
|
+
}
|
|
14860
|
+
|
|
15758
14861
|
function CanvasImpl({
|
|
15759
14862
|
ref,
|
|
15760
14863
|
children,
|
|
@@ -15775,6 +14878,8 @@ function CanvasImpl({
|
|
|
15775
14878
|
raycaster,
|
|
15776
14879
|
camera,
|
|
15777
14880
|
scene,
|
|
14881
|
+
autoUpdateFrustum,
|
|
14882
|
+
occlusion,
|
|
15778
14883
|
onPointerMissed,
|
|
15779
14884
|
onDragOverMissed,
|
|
15780
14885
|
onDropMissed,
|
|
@@ -15786,49 +14891,10 @@ function CanvasImpl({
|
|
|
15786
14891
|
forceEven,
|
|
15787
14892
|
...props
|
|
15788
14893
|
}) {
|
|
15789
|
-
const
|
|
15790
|
-
let primaryCanvas;
|
|
15791
|
-
let scheduler;
|
|
15792
|
-
let renderer;
|
|
15793
|
-
if (isRendererConfig) {
|
|
15794
|
-
const { primaryCanvas: pc, scheduler: sc, ...rest } = rendererProp;
|
|
15795
|
-
primaryCanvas = pc;
|
|
15796
|
-
scheduler = sc;
|
|
15797
|
-
renderer = Object.keys(rest).length > 0 ? rest : rendererProp;
|
|
15798
|
-
} else {
|
|
15799
|
-
renderer = rendererProp;
|
|
15800
|
-
}
|
|
14894
|
+
const { primaryCanvas, scheduler, renderer } = parseRendererConfig(rendererProp);
|
|
15801
14895
|
React__namespace.useMemo(() => extend(THREE), []);
|
|
15802
14896
|
const Bridge = useBridge();
|
|
15803
|
-
const backgroundProps = React__namespace.useMemo(() =>
|
|
15804
|
-
if (!background) return null;
|
|
15805
|
-
if (typeof background === "object" && !background.isColor) {
|
|
15806
|
-
const { backgroundMap, envMap, files, preset, ...rest } = background;
|
|
15807
|
-
return {
|
|
15808
|
-
...rest,
|
|
15809
|
-
preset,
|
|
15810
|
-
files: envMap || files,
|
|
15811
|
-
backgroundFiles: backgroundMap,
|
|
15812
|
-
background: true
|
|
15813
|
-
};
|
|
15814
|
-
}
|
|
15815
|
-
if (typeof background === "number") {
|
|
15816
|
-
return { color: background, background: true };
|
|
15817
|
-
}
|
|
15818
|
-
if (typeof background === "string") {
|
|
15819
|
-
if (background in presetsObj) {
|
|
15820
|
-
return { preset: background, background: true };
|
|
15821
|
-
}
|
|
15822
|
-
if (/^(https?:\/\/|\/|\.\/|\.\.\/)|\\.(hdr|exr|jpg|jpeg|png|webp|gif)$/i.test(background)) {
|
|
15823
|
-
return { files: background, background: true };
|
|
15824
|
-
}
|
|
15825
|
-
return { color: background, background: true };
|
|
15826
|
-
}
|
|
15827
|
-
if (background.isColor) {
|
|
15828
|
-
return { color: background, background: true };
|
|
15829
|
-
}
|
|
15830
|
-
return null;
|
|
15831
|
-
}, [background]);
|
|
14897
|
+
const backgroundProps = React__namespace.useMemo(() => parseBackground(background), [background]);
|
|
15832
14898
|
const hasInitialSizeRef = React__namespace.useRef(false);
|
|
15833
14899
|
const measureConfig = React__namespace.useMemo(() => {
|
|
15834
14900
|
if (!hasInitialSizeRef.current) {
|
|
@@ -15870,6 +14936,7 @@ function CanvasImpl({
|
|
|
15870
14936
|
const handleDropMissed = useMutableCallback(onDropMissed);
|
|
15871
14937
|
const [block, setBlock] = React__namespace.useState(false);
|
|
15872
14938
|
const [error, setError] = React__namespace.useState(false);
|
|
14939
|
+
const [fallbackVisible, setFallbackVisible] = React__namespace.useState(false);
|
|
15873
14940
|
if (block) throw block;
|
|
15874
14941
|
if (error) throw error;
|
|
15875
14942
|
const root = React__namespace.useRef(null);
|
|
@@ -15877,6 +14944,7 @@ function CanvasImpl({
|
|
|
15877
14944
|
const unsubscribeErrorRef = React__namespace.useRef(null);
|
|
15878
14945
|
useIsomorphicLayoutEffect(() => {
|
|
15879
14946
|
effectActiveRef.current = true;
|
|
14947
|
+
if (fallbackVisible) return;
|
|
15880
14948
|
const canvas = canvasRef.current;
|
|
15881
14949
|
if (effectiveSize.width > 0 && effectiveSize.height > 0 && canvas) {
|
|
15882
14950
|
if (!root.current) {
|
|
@@ -15897,7 +14965,7 @@ function CanvasImpl({
|
|
|
15897
14965
|
}
|
|
15898
14966
|
async function run() {
|
|
15899
14967
|
if (!effectActiveRef.current || !root.current) return;
|
|
15900
|
-
await root.current.configure({
|
|
14968
|
+
const configured = await root.current.configure({
|
|
15901
14969
|
id,
|
|
15902
14970
|
primaryCanvas,
|
|
15903
14971
|
scheduler,
|
|
@@ -15912,6 +14980,8 @@ function CanvasImpl({
|
|
|
15912
14980
|
performance,
|
|
15913
14981
|
raycaster,
|
|
15914
14982
|
camera,
|
|
14983
|
+
autoUpdateFrustum,
|
|
14984
|
+
occlusion,
|
|
15915
14985
|
size: effectiveSize,
|
|
15916
14986
|
// Store size props for reset functionality
|
|
15917
14987
|
_sizeProps: width !== void 0 || height !== void 0 ? { width, height } : null,
|
|
@@ -15936,8 +15006,20 @@ function CanvasImpl({
|
|
|
15936
15006
|
}
|
|
15937
15007
|
onCreated?.(state);
|
|
15938
15008
|
}
|
|
15939
|
-
})
|
|
15940
|
-
|
|
15009
|
+
}).then(
|
|
15010
|
+
() => true,
|
|
15011
|
+
// Renderer setup failed (e.g. no WebGL/WebGPU support). The `fallback` prop lives
|
|
15012
|
+
// inside <canvas>, which browsers don't display, so surface it as visible DOM
|
|
15013
|
+
// instead; with no fallback, rethrow to an external error boundary. (#3757)
|
|
15014
|
+
(setupError) => {
|
|
15015
|
+
if (effectActiveRef.current) {
|
|
15016
|
+
if (fallback != null) setFallbackVisible(true);
|
|
15017
|
+
else setError(setupError);
|
|
15018
|
+
}
|
|
15019
|
+
return false;
|
|
15020
|
+
}
|
|
15021
|
+
);
|
|
15022
|
+
if (!configured || !effectActiveRef.current || !root.current) return;
|
|
15941
15023
|
root.current.render(
|
|
15942
15024
|
/* @__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: [
|
|
15943
15025
|
backgroundProps && /* @__PURE__ */ jsxRuntime.jsx(Environment, { ...backgroundProps }),
|
|
@@ -15971,14 +15053,7 @@ function CanvasImpl({
|
|
|
15971
15053
|
const handleHMR = () => {
|
|
15972
15054
|
queueMicrotask(() => {
|
|
15973
15055
|
const rootEntry = _roots.get(canvas);
|
|
15974
|
-
if (rootEntry?.store)
|
|
15975
|
-
console.log("[R3F] HMR detected \u2014 rebuilding nodes/uniforms");
|
|
15976
|
-
rootEntry.store.setState((state) => ({
|
|
15977
|
-
nodes: {},
|
|
15978
|
-
uniforms: {},
|
|
15979
|
-
_hmrVersion: state._hmrVersion + 1
|
|
15980
|
-
}));
|
|
15981
|
-
}
|
|
15056
|
+
if (rootEntry?.store) clearHmrCaches(rootEntry.store);
|
|
15982
15057
|
});
|
|
15983
15058
|
};
|
|
15984
15059
|
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) {
|
|
@@ -16007,7 +15082,11 @@ function CanvasImpl({
|
|
|
16007
15082
|
...style
|
|
16008
15083
|
},
|
|
16009
15084
|
...props,
|
|
16010
|
-
children:
|
|
15085
|
+
children: fallbackVisible ? (
|
|
15086
|
+
// Renderer setup failed: render the fallback as visible DOM. Inside <canvas> (below)
|
|
15087
|
+
// it exists in the tree but browsers never paint it, which is the whole bug (#3757).
|
|
15088
|
+
fallback
|
|
15089
|
+
) : /* @__PURE__ */ jsxRuntime.jsx("div", { ref: containerRef, className: "r3f-canvas-container", style: { width: "100%", height: "100%" }, children: /* @__PURE__ */ jsxRuntime.jsx(
|
|
16011
15090
|
"canvas",
|
|
16012
15091
|
{
|
|
16013
15092
|
ref: canvasRef,
|
|
@@ -16026,6 +15105,8 @@ function Canvas(props) {
|
|
|
16026
15105
|
|
|
16027
15106
|
extend(THREE);
|
|
16028
15107
|
|
|
15108
|
+
exports.Scheduler = scheduler.Scheduler;
|
|
15109
|
+
exports.getScheduler = scheduler.getScheduler;
|
|
16029
15110
|
exports.Block = Block;
|
|
16030
15111
|
exports.Canvas = Canvas;
|
|
16031
15112
|
exports.Environment = Environment;
|
|
@@ -16041,7 +15122,6 @@ exports.R3F_BUILD_LEGACY = R3F_BUILD_LEGACY;
|
|
|
16041
15122
|
exports.R3F_BUILD_WEBGPU = R3F_BUILD_WEBGPU;
|
|
16042
15123
|
exports.REACT_INTERNAL_PROPS = REACT_INTERNAL_PROPS;
|
|
16043
15124
|
exports.RESERVED_PROPS = RESERVED_PROPS;
|
|
16044
|
-
exports.Scheduler = Scheduler;
|
|
16045
15125
|
exports.Texture = Texture;
|
|
16046
15126
|
exports._roots = _roots;
|
|
16047
15127
|
exports.act = act;
|
|
@@ -16071,7 +15151,6 @@ exports.getInstanceProps = getInstanceProps;
|
|
|
16071
15151
|
exports.getPrimary = getPrimary;
|
|
16072
15152
|
exports.getPrimaryIds = getPrimaryIds;
|
|
16073
15153
|
exports.getRootState = getRootState;
|
|
16074
|
-
exports.getScheduler = getScheduler;
|
|
16075
15154
|
exports.getUuidPrefix = getUuidPrefix;
|
|
16076
15155
|
exports.hasConstructor = hasConstructor;
|
|
16077
15156
|
exports.hasPrimary = hasPrimary;
|