@react-three/fiber 10.0.0-canary.604355a → 10.0.0-canary.6d6e5ab
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 +844 -1423
- package/dist/index.d.cts +291 -811
- package/dist/index.d.mts +291 -811
- package/dist/index.d.ts +291 -811
- package/dist/index.mjs +820 -1397
- package/dist/legacy.cjs +799 -1384
- package/dist/legacy.d.cts +292 -811
- package/dist/legacy.d.mts +292 -811
- package/dist/legacy.d.ts +292 -811
- package/dist/legacy.mjs +774 -1357
- package/dist/webgpu/index.cjs +1300 -1738
- package/dist/webgpu/index.d.cts +407 -825
- package/dist/webgpu/index.d.mts +407 -825
- package/dist/webgpu/index.d.ts +407 -825
- package/dist/webgpu/index.mjs +1270 -1710
- package/package.json +4 -3
- package/readme.md +2 -3
package/dist/legacy.mjs
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import * as three from 'three';
|
|
2
|
-
import { WebGLRenderTarget, CubeReflectionMapping, EquirectangularReflectionMapping, CubeTextureLoader, Scene,
|
|
2
|
+
import { WebGLCubeRenderTarget, WebGLRenderTarget, CubeReflectionMapping, EquirectangularReflectionMapping, CubeTextureLoader, Scene, HalfFloatType, Color, Frustum, Matrix4, Group, BoxGeometry, MeshBasicNodeMaterial, Mesh, Node, NodeUpdateType, Layers, ShaderMaterial, Uniform, SRGBColorSpace, RGBAFormat, UnsignedByteType, Vector3, Vector2, TextureLoader, Texture as Texture$1, Raycaster, OrthographicCamera, PerspectiveCamera, PCFShadowMap, VSMShadowMap, BasicShadowMap, ACESFilmicToneMapping, WebGLRenderer } from 'three';
|
|
3
3
|
import { jsx, Fragment, jsxs } from 'react/jsx-runtime';
|
|
4
4
|
import * as React from 'react';
|
|
5
5
|
import React__default, { useLayoutEffect, useRef, useMemo, useEffect, useContext, useImperativeHandle, useCallback, useState } from 'react';
|
|
@@ -11,8 +11,10 @@ import { HDRLoader } from 'three/examples/jsm/loaders/HDRLoader.js';
|
|
|
11
11
|
import { EXRLoader } from 'three/examples/jsm/loaders/EXRLoader.js';
|
|
12
12
|
import { UltraHDRLoader } from 'three/examples/jsm/loaders/UltraHDRLoader.js';
|
|
13
13
|
import { GainMapLoader } from '@monogrid/gainmap-js';
|
|
14
|
-
import Tb, {
|
|
14
|
+
import Tb, { unstable_getCurrentPriorityLevel, unstable_IdlePriority, unstable_LowPriority, unstable_NormalPriority, unstable_UserBlockingPriority, unstable_ImmediatePriority, unstable_scheduleCallback } from 'scheduler';
|
|
15
15
|
import { createWithEqualityFn } from 'zustand/traditional';
|
|
16
|
+
import { getScheduler } from '@pmndrs/scheduler';
|
|
17
|
+
export { Scheduler, getScheduler } from '@pmndrs/scheduler';
|
|
16
18
|
import { suspend, preload, clear } from 'suspend-react';
|
|
17
19
|
|
|
18
20
|
function _mergeNamespaces(n, m) {
|
|
@@ -40,9 +42,12 @@ const WebGPURenderer = class WebGPURenderer2 {
|
|
|
40
42
|
}
|
|
41
43
|
};
|
|
42
44
|
const RenderTarget = null;
|
|
45
|
+
const CubeRenderTarget = null;
|
|
43
46
|
|
|
44
47
|
const THREE = /*#__PURE__*/_mergeNamespaces({
|
|
45
48
|
__proto__: null,
|
|
49
|
+
CubeRenderTarget: CubeRenderTarget,
|
|
50
|
+
CubeRenderTargetCompat: WebGLCubeRenderTarget,
|
|
46
51
|
Inspector: Inspector,
|
|
47
52
|
R3F_BUILD_LEGACY: R3F_BUILD_LEGACY,
|
|
48
53
|
R3F_BUILD_WEBGPU: R3F_BUILD_WEBGPU,
|
|
@@ -148,7 +153,7 @@ function useEnvironment({
|
|
|
148
153
|
useLoader$1.clear(loader, multiFile ? [files] : files);
|
|
149
154
|
}
|
|
150
155
|
renderer.domElement.addEventListener("webglcontextlost", clearGainmapTexture, { once: true });
|
|
151
|
-
}, [files, renderer.domElement]);
|
|
156
|
+
}, [extension, files, loader, multiFile, renderer.domElement]);
|
|
152
157
|
const loaderResult = useLoader$1(
|
|
153
158
|
loader,
|
|
154
159
|
multiFile ? [files] : files,
|
|
@@ -320,15 +325,16 @@ function EnvironmentPortal({
|
|
|
320
325
|
preset = void 0,
|
|
321
326
|
extensions
|
|
322
327
|
}) {
|
|
323
|
-
const
|
|
328
|
+
const renderer = useThree$1((state) => state.renderer);
|
|
329
|
+
const isLegacy = useThree$1((state) => state.isLegacy);
|
|
324
330
|
const defaultScene = useThree$1((state) => state.scene);
|
|
325
331
|
const camera = React.useRef(null);
|
|
326
332
|
const [virtualScene] = React.useState(() => new Scene());
|
|
327
333
|
const fbo = React.useMemo(() => {
|
|
328
|
-
const fbo2 = new WebGLCubeRenderTarget(resolution);
|
|
334
|
+
const fbo2 = isLegacy ? new WebGLCubeRenderTarget(resolution) : new CubeRenderTarget(resolution);
|
|
329
335
|
fbo2.texture.type = HalfFloatType;
|
|
330
336
|
return fbo2;
|
|
331
|
-
}, [resolution]);
|
|
337
|
+
}, [resolution, isLegacy]);
|
|
332
338
|
React.useEffect(() => {
|
|
333
339
|
return () => {
|
|
334
340
|
fbo.dispose();
|
|
@@ -336,10 +342,10 @@ function EnvironmentPortal({
|
|
|
336
342
|
}, [fbo]);
|
|
337
343
|
React.useLayoutEffect(() => {
|
|
338
344
|
if (frames === 1) {
|
|
339
|
-
const autoClear =
|
|
340
|
-
|
|
341
|
-
camera.current.update(
|
|
342
|
-
|
|
345
|
+
const autoClear = renderer.autoClear;
|
|
346
|
+
renderer.autoClear = true;
|
|
347
|
+
camera.current.update(renderer, virtualScene);
|
|
348
|
+
renderer.autoClear = autoClear;
|
|
343
349
|
}
|
|
344
350
|
return setEnvProps(background, scene, defaultScene, fbo.texture, {
|
|
345
351
|
backgroundBlurriness: blur ?? backgroundBlurriness,
|
|
@@ -348,14 +354,29 @@ function EnvironmentPortal({
|
|
|
348
354
|
environmentIntensity,
|
|
349
355
|
environmentRotation
|
|
350
356
|
});
|
|
351
|
-
}, [
|
|
357
|
+
}, [
|
|
358
|
+
children,
|
|
359
|
+
virtualScene,
|
|
360
|
+
fbo.texture,
|
|
361
|
+
scene,
|
|
362
|
+
defaultScene,
|
|
363
|
+
background,
|
|
364
|
+
frames,
|
|
365
|
+
renderer,
|
|
366
|
+
blur,
|
|
367
|
+
backgroundBlurriness,
|
|
368
|
+
backgroundIntensity,
|
|
369
|
+
backgroundRotation,
|
|
370
|
+
environmentIntensity,
|
|
371
|
+
environmentRotation
|
|
372
|
+
]);
|
|
352
373
|
let count = 1;
|
|
353
374
|
useFrame$1(() => {
|
|
354
375
|
if (frames === Infinity || count < frames) {
|
|
355
|
-
const autoClear =
|
|
356
|
-
|
|
357
|
-
camera.current.update(
|
|
358
|
-
|
|
376
|
+
const autoClear = renderer.autoClear;
|
|
377
|
+
renderer.autoClear = true;
|
|
378
|
+
camera.current.update(renderer, virtualScene);
|
|
379
|
+
renderer.autoClear = autoClear;
|
|
359
380
|
count++;
|
|
360
381
|
}
|
|
361
382
|
});
|
|
@@ -419,10 +440,9 @@ function Environment(props) {
|
|
|
419
440
|
return props.ground ? /* @__PURE__ */ jsx(EnvironmentGround, { ...props }) : props.map ? /* @__PURE__ */ jsx(EnvironmentMap, { ...props }) : props.children ? /* @__PURE__ */ jsx(EnvironmentPortal, { ...props }) : /* @__PURE__ */ jsx(EnvironmentCube, { ...props });
|
|
420
441
|
}
|
|
421
442
|
|
|
422
|
-
var __defProp
|
|
423
|
-
var __defNormalProp
|
|
424
|
-
var __publicField
|
|
425
|
-
const act = React["act"];
|
|
443
|
+
var __defProp = Object.defineProperty;
|
|
444
|
+
var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
|
|
445
|
+
var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
|
|
426
446
|
const useIsomorphicLayoutEffect = /* @__PURE__ */ (() => typeof window !== "undefined" && (window.document?.createElement || window.navigator?.product === "ReactNative"))() ? React.useLayoutEffect : React.useEffect;
|
|
427
447
|
function useMutableCallback(fn) {
|
|
428
448
|
const ref = React.useRef(fn);
|
|
@@ -453,7 +473,7 @@ const ErrorBoundary = /* @__PURE__ */ (() => {
|
|
|
453
473
|
return _a = class extends React.Component {
|
|
454
474
|
constructor() {
|
|
455
475
|
super(...arguments);
|
|
456
|
-
__publicField
|
|
476
|
+
__publicField(this, "state", { error: false });
|
|
457
477
|
}
|
|
458
478
|
componentDidCatch(err) {
|
|
459
479
|
this.props.set(err);
|
|
@@ -461,7 +481,7 @@ const ErrorBoundary = /* @__PURE__ */ (() => {
|
|
|
461
481
|
render() {
|
|
462
482
|
return this.state.error ? null : this.props.children;
|
|
463
483
|
}
|
|
464
|
-
}, __publicField
|
|
484
|
+
}, __publicField(_a, "getDerivedStateFromError", () => ({ error: true })), _a;
|
|
465
485
|
})();
|
|
466
486
|
|
|
467
487
|
const is = {
|
|
@@ -598,8 +618,7 @@ function prepare(target, root, type, props) {
|
|
|
598
618
|
object,
|
|
599
619
|
eventCount: 0,
|
|
600
620
|
handlers: {},
|
|
601
|
-
isHidden: false
|
|
602
|
-
deferredRefs: []
|
|
621
|
+
isHidden: false
|
|
603
622
|
};
|
|
604
623
|
if (object) object.__r3f = instance;
|
|
605
624
|
}
|
|
@@ -756,6 +775,17 @@ function unregisterVisibility(store, object) {
|
|
|
756
775
|
internal.visibilityRegistry.delete(object.uuid);
|
|
757
776
|
internal.occlusionCache.delete(object);
|
|
758
777
|
}
|
|
778
|
+
function updateVisibilityHandlers(store, object, handlers) {
|
|
779
|
+
const { internal } = store.getState();
|
|
780
|
+
const entry = internal.visibilityRegistry.get(object.uuid);
|
|
781
|
+
if (!entry) return false;
|
|
782
|
+
entry.handlers = handlers;
|
|
783
|
+
if ((handlers.onOccluded || handlers.onVisible) && !internal.occlusionEnabled) {
|
|
784
|
+
object.occlusionTest = true;
|
|
785
|
+
enableOcclusion(store);
|
|
786
|
+
}
|
|
787
|
+
return true;
|
|
788
|
+
}
|
|
759
789
|
function checkVisibility(state) {
|
|
760
790
|
const { internal, camera } = state;
|
|
761
791
|
const registry = internal.visibilityRegistry;
|
|
@@ -916,9 +946,9 @@ function diffProps(instance, newProps) {
|
|
|
916
946
|
const { root, key } = resolve(instance.object, prop);
|
|
917
947
|
if (root.constructor && root.constructor.length === 0) {
|
|
918
948
|
const ctor = getMemoizedPrototype(root);
|
|
919
|
-
if (!is.und(ctor)) changedProps[
|
|
949
|
+
if (!is.und(ctor)) changedProps[prop] = ctor[key];
|
|
920
950
|
} else {
|
|
921
|
-
changedProps[
|
|
951
|
+
changedProps[prop] = 0;
|
|
922
952
|
}
|
|
923
953
|
}
|
|
924
954
|
return changedProps;
|
|
@@ -943,10 +973,7 @@ function applyProps(object, props) {
|
|
|
943
973
|
continue;
|
|
944
974
|
}
|
|
945
975
|
if (value === void 0) continue;
|
|
946
|
-
if (isFromRef(value))
|
|
947
|
-
instance?.deferredRefs?.push({ prop, ref: value[FROM_REF] });
|
|
948
|
-
continue;
|
|
949
|
-
}
|
|
976
|
+
if (isFromRef(value)) continue;
|
|
950
977
|
if (isOnce(value)) {
|
|
951
978
|
if (instance?.appliedOnce?.has(prop)) continue;
|
|
952
979
|
if (instance) {
|
|
@@ -982,8 +1009,24 @@ function applyProps(object, props) {
|
|
|
982
1009
|
} else if (isVectorLike(target) && is.num(value)) {
|
|
983
1010
|
if ("setScalar" in target && typeof target.setScalar === "function") target.setScalar(value);
|
|
984
1011
|
else target.set(value);
|
|
1012
|
+
} else if (root instanceof ShaderMaterial && key === "uniforms" && is.obj(value)) {
|
|
1013
|
+
if (!is.obj(root.uniforms)) root.uniforms = {};
|
|
1014
|
+
const uniforms = root.uniforms;
|
|
1015
|
+
const nextUniforms = value;
|
|
1016
|
+
for (const name in nextUniforms) {
|
|
1017
|
+
const uniform = nextUniforms[name];
|
|
1018
|
+
const targetUniform = uniforms[name];
|
|
1019
|
+
if (targetUniform) Object.assign(targetUniform, uniform);
|
|
1020
|
+
else {
|
|
1021
|
+
const nextUniform = uniform instanceof Uniform ? uniform.clone() : new Uniform(uniform.value);
|
|
1022
|
+
uniforms[name] = nextUniform;
|
|
1023
|
+
}
|
|
1024
|
+
}
|
|
985
1025
|
} else {
|
|
986
1026
|
root[key] = value;
|
|
1027
|
+
if (key.endsWith("Node") && root.isMaterial) {
|
|
1028
|
+
root.needsUpdate = true;
|
|
1029
|
+
}
|
|
987
1030
|
if (rootState && rootState.renderer?.outputColorSpace === SRGBColorSpace && colorMaps.includes(key) && isTexture(value) && root[key]?.isTexture && // sRGB textures must be RGBA8 since r137 https://github.com/mrdoob/three.js/pull/23129
|
|
988
1031
|
root[key].format === RGBAFormat && root[key].type === UnsignedByteType) {
|
|
989
1032
|
root[key].colorSpace = rootState.textureColorSpace;
|
|
@@ -997,6 +1040,9 @@ function applyProps(object, props) {
|
|
|
997
1040
|
if (instance.eventCount && object2.raycast !== null) {
|
|
998
1041
|
rootState.internal.interaction.push(object2);
|
|
999
1042
|
}
|
|
1043
|
+
}
|
|
1044
|
+
if (instance?.parent && rootState?.internal && instance.object?.isObject3D) {
|
|
1045
|
+
const object2 = instance.object;
|
|
1000
1046
|
const root = findInitialRoot(instance);
|
|
1001
1047
|
const visibilityHandlers = {
|
|
1002
1048
|
onFramed: instance.handlers.onFramed,
|
|
@@ -1004,7 +1050,9 @@ function applyProps(object, props) {
|
|
|
1004
1050
|
onVisible: instance.handlers.onVisible
|
|
1005
1051
|
};
|
|
1006
1052
|
if (hasVisibilityHandlers(visibilityHandlers)) {
|
|
1007
|
-
|
|
1053
|
+
if (!updateVisibilityHandlers(root, object2, visibilityHandlers)) {
|
|
1054
|
+
registerVisibility(root, object2, visibilityHandlers);
|
|
1055
|
+
}
|
|
1008
1056
|
} else {
|
|
1009
1057
|
unregisterVisibility(root, object2);
|
|
1010
1058
|
}
|
|
@@ -1017,38 +1065,60 @@ function applyProps(object, props) {
|
|
|
1017
1065
|
return object;
|
|
1018
1066
|
}
|
|
1019
1067
|
|
|
1068
|
+
const DEFAULT_POINTER_ID = 0;
|
|
1069
|
+
const XR_POINTER_ID_START = 1e3;
|
|
1070
|
+
function getPointerState(internal, pointerId) {
|
|
1071
|
+
let state = internal.pointerMap.get(pointerId);
|
|
1072
|
+
if (!state) {
|
|
1073
|
+
state = {
|
|
1074
|
+
hovered: /* @__PURE__ */ new Map(),
|
|
1075
|
+
captured: /* @__PURE__ */ new Map(),
|
|
1076
|
+
initialClick: [0, 0],
|
|
1077
|
+
initialHits: []
|
|
1078
|
+
};
|
|
1079
|
+
internal.pointerMap.set(pointerId, state);
|
|
1080
|
+
}
|
|
1081
|
+
return state;
|
|
1082
|
+
}
|
|
1083
|
+
function getPointerId(event) {
|
|
1084
|
+
return "pointerId" in event ? event.pointerId : DEFAULT_POINTER_ID;
|
|
1085
|
+
}
|
|
1020
1086
|
function makeId(event) {
|
|
1021
1087
|
return (event.eventObject || event.object).uuid + "/" + event.index + event.instanceId;
|
|
1022
1088
|
}
|
|
1023
|
-
function releaseInternalPointerCapture(
|
|
1024
|
-
const
|
|
1089
|
+
function releaseInternalPointerCapture(internal, obj, pointerId) {
|
|
1090
|
+
const pointerState = internal.pointerMap.get(pointerId);
|
|
1091
|
+
if (!pointerState) return;
|
|
1092
|
+
const captureData = pointerState.captured.get(obj);
|
|
1025
1093
|
if (captureData) {
|
|
1026
|
-
|
|
1027
|
-
|
|
1028
|
-
capturedMap.delete(pointerId);
|
|
1029
|
-
captureData.target.releasePointerCapture(pointerId);
|
|
1030
|
-
}
|
|
1094
|
+
pointerState.captured.delete(obj);
|
|
1095
|
+
captureData.target.releasePointerCapture(pointerId);
|
|
1031
1096
|
}
|
|
1032
1097
|
}
|
|
1033
1098
|
function removeInteractivity(store, object) {
|
|
1034
1099
|
const { internal } = store.getState();
|
|
1035
1100
|
internal.interaction = internal.interaction.filter((o) => o !== object);
|
|
1036
|
-
|
|
1037
|
-
|
|
1038
|
-
|
|
1039
|
-
|
|
1101
|
+
for (const [pointerId, pointerState] of internal.pointerMap) {
|
|
1102
|
+
pointerState.initialHits = pointerState.initialHits.filter((o) => o !== object);
|
|
1103
|
+
pointerState.hovered.forEach((value, key) => {
|
|
1104
|
+
if (value.eventObject === object || value.object === object) {
|
|
1105
|
+
pointerState.hovered.delete(key);
|
|
1106
|
+
}
|
|
1107
|
+
});
|
|
1108
|
+
if (pointerState.captured.has(object)) {
|
|
1109
|
+
releaseInternalPointerCapture(internal, object, pointerId);
|
|
1040
1110
|
}
|
|
1041
|
-
}
|
|
1042
|
-
internal.capturedMap.forEach((captures, pointerId) => {
|
|
1043
|
-
releaseInternalPointerCapture(internal.capturedMap, object, captures, pointerId);
|
|
1044
|
-
});
|
|
1111
|
+
}
|
|
1045
1112
|
unregisterVisibility(store, object);
|
|
1046
1113
|
}
|
|
1047
1114
|
function createEvents(store) {
|
|
1048
|
-
function calculateDistance(event) {
|
|
1115
|
+
function calculateDistance(event, pointerId) {
|
|
1049
1116
|
const { internal } = store.getState();
|
|
1050
|
-
const
|
|
1051
|
-
|
|
1117
|
+
const pointerState = internal.pointerMap.get(pointerId);
|
|
1118
|
+
if (!pointerState) return 0;
|
|
1119
|
+
const [initialX, initialY] = pointerState.initialClick;
|
|
1120
|
+
const dx = event.offsetX - initialX;
|
|
1121
|
+
const dy = event.offsetY - initialY;
|
|
1052
1122
|
return Math.round(Math.sqrt(dx * dx + dy * dy));
|
|
1053
1123
|
}
|
|
1054
1124
|
function filterPointerEvents(objects) {
|
|
@@ -1084,6 +1154,15 @@ function createEvents(store) {
|
|
|
1084
1154
|
return state2.raycaster.camera ? state2.raycaster.intersectObject(obj, true) : [];
|
|
1085
1155
|
}
|
|
1086
1156
|
let hits = eventsObjects.flatMap(handleRaycast).sort((a, b) => {
|
|
1157
|
+
const aInteractivePriority = a.object.userData?.interactivePriority;
|
|
1158
|
+
const bInteractivePriority = b.object.userData?.interactivePriority;
|
|
1159
|
+
if (aInteractivePriority !== void 0 || bInteractivePriority !== void 0) {
|
|
1160
|
+
if (aInteractivePriority !== void 0 && bInteractivePriority === void 0) return -1;
|
|
1161
|
+
if (bInteractivePriority !== void 0 && aInteractivePriority === void 0) return 1;
|
|
1162
|
+
if (aInteractivePriority !== bInteractivePriority) {
|
|
1163
|
+
return (bInteractivePriority ?? 0) - (aInteractivePriority ?? 0);
|
|
1164
|
+
}
|
|
1165
|
+
}
|
|
1087
1166
|
const aState = getRootState(a.object);
|
|
1088
1167
|
const bState = getRootState(b.object);
|
|
1089
1168
|
const aPriority = aState?.events?.priority ?? 1;
|
|
@@ -1105,9 +1184,13 @@ function createEvents(store) {
|
|
|
1105
1184
|
eventObject = eventObject.parent;
|
|
1106
1185
|
}
|
|
1107
1186
|
}
|
|
1108
|
-
if ("pointerId" in event
|
|
1109
|
-
|
|
1110
|
-
|
|
1187
|
+
if ("pointerId" in event) {
|
|
1188
|
+
const pointerId = event.pointerId;
|
|
1189
|
+
const pointerState = state.internal.pointerMap.get(pointerId);
|
|
1190
|
+
if (pointerState?.captured.size) {
|
|
1191
|
+
for (const captureData of pointerState.captured.values()) {
|
|
1192
|
+
if (!duplicates.has(makeId(captureData.intersection))) intersections.push(captureData.intersection);
|
|
1193
|
+
}
|
|
1111
1194
|
}
|
|
1112
1195
|
}
|
|
1113
1196
|
return intersections;
|
|
@@ -1120,27 +1203,25 @@ function createEvents(store) {
|
|
|
1120
1203
|
if (state) {
|
|
1121
1204
|
const { raycaster, pointer, camera, internal } = state;
|
|
1122
1205
|
const unprojectedPoint = new Vector3(pointer.x, pointer.y, 0).unproject(camera);
|
|
1123
|
-
const hasPointerCapture = (id) =>
|
|
1206
|
+
const hasPointerCapture = (id) => {
|
|
1207
|
+
const pointerState = internal.pointerMap.get(id);
|
|
1208
|
+
return pointerState?.captured.has(hit.eventObject) ?? false;
|
|
1209
|
+
};
|
|
1124
1210
|
const setPointerCapture = (id) => {
|
|
1125
1211
|
const captureData = { intersection: hit, target: event.target };
|
|
1126
|
-
|
|
1127
|
-
|
|
1128
|
-
} else {
|
|
1129
|
-
internal.capturedMap.set(id, /* @__PURE__ */ new Map([[hit.eventObject, captureData]]));
|
|
1130
|
-
}
|
|
1212
|
+
const pointerState = getPointerState(internal, id);
|
|
1213
|
+
pointerState.captured.set(hit.eventObject, captureData);
|
|
1131
1214
|
event.target.setPointerCapture(id);
|
|
1132
1215
|
};
|
|
1133
1216
|
const releasePointerCapture = (id) => {
|
|
1134
|
-
|
|
1135
|
-
if (captures) {
|
|
1136
|
-
releaseInternalPointerCapture(internal.capturedMap, hit.eventObject, captures, id);
|
|
1137
|
-
}
|
|
1217
|
+
releaseInternalPointerCapture(internal, hit.eventObject, id);
|
|
1138
1218
|
};
|
|
1139
1219
|
const extractEventProps = {};
|
|
1140
1220
|
for (const prop in event) {
|
|
1141
1221
|
const property = event[prop];
|
|
1142
1222
|
if (typeof property !== "function") extractEventProps[prop] = property;
|
|
1143
1223
|
}
|
|
1224
|
+
const eventPointerId = "pointerId" in event ? event.pointerId : void 0;
|
|
1144
1225
|
const raycastEvent = {
|
|
1145
1226
|
...hit,
|
|
1146
1227
|
...extractEventProps,
|
|
@@ -1151,18 +1232,19 @@ function createEvents(store) {
|
|
|
1151
1232
|
unprojectedPoint,
|
|
1152
1233
|
ray: raycaster.ray,
|
|
1153
1234
|
camera,
|
|
1235
|
+
pointerId: eventPointerId,
|
|
1154
1236
|
// Hijack stopPropagation, which just sets a flag
|
|
1155
1237
|
stopPropagation() {
|
|
1156
|
-
const
|
|
1238
|
+
const pointerState = eventPointerId !== void 0 ? internal.pointerMap.get(eventPointerId) : void 0;
|
|
1157
1239
|
if (
|
|
1158
1240
|
// ...if this pointer hasn't been captured
|
|
1159
|
-
!
|
|
1160
|
-
|
|
1241
|
+
!pointerState?.captured.size || // ... or if the hit object is capturing the pointer
|
|
1242
|
+
pointerState.captured.has(hit.eventObject)
|
|
1161
1243
|
) {
|
|
1162
1244
|
raycastEvent.stopped = localState.stopped = true;
|
|
1163
|
-
if (
|
|
1245
|
+
if (pointerState?.hovered.size && Array.from(pointerState.hovered.values()).find((i) => i.eventObject === hit.eventObject)) {
|
|
1164
1246
|
const higher = intersections.slice(0, intersections.indexOf(hit));
|
|
1165
|
-
cancelPointer([...higher, hit]);
|
|
1247
|
+
cancelPointer([...higher, hit], eventPointerId);
|
|
1166
1248
|
}
|
|
1167
1249
|
}
|
|
1168
1250
|
},
|
|
@@ -1178,15 +1260,18 @@ function createEvents(store) {
|
|
|
1178
1260
|
}
|
|
1179
1261
|
return intersections;
|
|
1180
1262
|
}
|
|
1181
|
-
function cancelPointer(intersections) {
|
|
1263
|
+
function cancelPointer(intersections, pointerId) {
|
|
1182
1264
|
const { internal } = store.getState();
|
|
1183
|
-
|
|
1265
|
+
const pid = pointerId ?? DEFAULT_POINTER_ID;
|
|
1266
|
+
const pointerState = internal.pointerMap.get(pid);
|
|
1267
|
+
if (!pointerState) return;
|
|
1268
|
+
for (const [hoveredId, hoveredObj] of pointerState.hovered) {
|
|
1184
1269
|
if (!intersections.length || !intersections.find(
|
|
1185
1270
|
(hit) => hit.object === hoveredObj.object && hit.index === hoveredObj.index && hit.instanceId === hoveredObj.instanceId
|
|
1186
1271
|
)) {
|
|
1187
1272
|
const eventObject = hoveredObj.eventObject;
|
|
1188
1273
|
const instance = eventObject.__r3f;
|
|
1189
|
-
|
|
1274
|
+
pointerState.hovered.delete(hoveredId);
|
|
1190
1275
|
if (instance?.eventCount) {
|
|
1191
1276
|
const handlers = instance.handlers;
|
|
1192
1277
|
const data = { ...hoveredObj, intersections };
|
|
@@ -1215,41 +1300,118 @@ function createEvents(store) {
|
|
|
1215
1300
|
instance?.handlers.onDropMissed?.(event);
|
|
1216
1301
|
}
|
|
1217
1302
|
}
|
|
1303
|
+
function cleanupPointer(pointerId) {
|
|
1304
|
+
const { internal } = store.getState();
|
|
1305
|
+
const pointerState = internal.pointerMap.get(pointerId);
|
|
1306
|
+
if (pointerState) {
|
|
1307
|
+
for (const [, hoveredObj] of pointerState.hovered) {
|
|
1308
|
+
const eventObject = hoveredObj.eventObject;
|
|
1309
|
+
const instance = eventObject.__r3f;
|
|
1310
|
+
if (instance?.eventCount) {
|
|
1311
|
+
const handlers = instance.handlers;
|
|
1312
|
+
const data = { ...hoveredObj, intersections: [] };
|
|
1313
|
+
handlers.onPointerOut?.(data);
|
|
1314
|
+
handlers.onPointerLeave?.(data);
|
|
1315
|
+
}
|
|
1316
|
+
}
|
|
1317
|
+
internal.pointerMap.delete(pointerId);
|
|
1318
|
+
}
|
|
1319
|
+
internal.pointerDirty.delete(pointerId);
|
|
1320
|
+
}
|
|
1321
|
+
function processDeferredPointer(event, pointerId) {
|
|
1322
|
+
const state = store.getState();
|
|
1323
|
+
const { internal } = state;
|
|
1324
|
+
if (!state.events.enabled) return;
|
|
1325
|
+
const filter = filterPointerEvents;
|
|
1326
|
+
const hits = intersect(event, filter);
|
|
1327
|
+
cancelPointer(hits, pointerId);
|
|
1328
|
+
function onIntersect(data) {
|
|
1329
|
+
const eventObject = data.eventObject;
|
|
1330
|
+
const instance = eventObject.__r3f;
|
|
1331
|
+
if (!instance?.eventCount) return;
|
|
1332
|
+
const handlers = instance.handlers;
|
|
1333
|
+
if (handlers.onPointerOver || handlers.onPointerEnter || handlers.onPointerOut || handlers.onPointerLeave) {
|
|
1334
|
+
const id = makeId(data);
|
|
1335
|
+
const pointerState = getPointerState(internal, pointerId);
|
|
1336
|
+
const hoveredItem = pointerState.hovered.get(id);
|
|
1337
|
+
if (!hoveredItem) {
|
|
1338
|
+
pointerState.hovered.set(id, data);
|
|
1339
|
+
handlers.onPointerOver?.(data);
|
|
1340
|
+
handlers.onPointerEnter?.(data);
|
|
1341
|
+
} else if (hoveredItem.stopped) {
|
|
1342
|
+
data.stopPropagation();
|
|
1343
|
+
}
|
|
1344
|
+
}
|
|
1345
|
+
handlers.onPointerMove?.(data);
|
|
1346
|
+
}
|
|
1347
|
+
handleIntersects(hits, event, 0, onIntersect);
|
|
1348
|
+
}
|
|
1218
1349
|
function handlePointer(name) {
|
|
1219
1350
|
switch (name) {
|
|
1220
1351
|
case "onPointerLeave":
|
|
1221
|
-
case "onPointerCancel":
|
|
1222
1352
|
case "onDragLeave":
|
|
1223
1353
|
return () => cancelPointer([]);
|
|
1354
|
+
// Global cancel of these events
|
|
1355
|
+
case "onPointerCancel":
|
|
1356
|
+
return (event) => {
|
|
1357
|
+
const pointerId = getPointerId(event);
|
|
1358
|
+
cleanupPointer(pointerId);
|
|
1359
|
+
};
|
|
1224
1360
|
case "onLostPointerCapture":
|
|
1225
1361
|
return (event) => {
|
|
1226
1362
|
const { internal } = store.getState();
|
|
1227
|
-
|
|
1363
|
+
const pointerId = getPointerId(event);
|
|
1364
|
+
const pointerState = internal.pointerMap.get(pointerId);
|
|
1365
|
+
if (pointerState?.captured.size) {
|
|
1228
1366
|
requestAnimationFrame(() => {
|
|
1229
|
-
|
|
1230
|
-
|
|
1231
|
-
|
|
1367
|
+
const pointerState2 = internal.pointerMap.get(pointerId);
|
|
1368
|
+
if (pointerState2?.captured.size) {
|
|
1369
|
+
pointerState2.captured.clear();
|
|
1232
1370
|
}
|
|
1371
|
+
cancelPointer([], pointerId);
|
|
1233
1372
|
});
|
|
1234
1373
|
}
|
|
1235
1374
|
};
|
|
1236
1375
|
}
|
|
1237
1376
|
return function handleEvent(event) {
|
|
1238
1377
|
const state = store.getState();
|
|
1239
|
-
const { onPointerMissed, onDragOverMissed, onDropMissed, internal } = state;
|
|
1378
|
+
const { onPointerMissed, onDragOverMissed, onDropMissed, internal, events } = state;
|
|
1379
|
+
const pointerId = getPointerId(event);
|
|
1240
1380
|
internal.lastEvent.current = event;
|
|
1241
|
-
if (!
|
|
1381
|
+
if (!events.enabled) return;
|
|
1242
1382
|
const isPointerMove = name === "onPointerMove";
|
|
1243
1383
|
const isDragOver = name === "onDragOver";
|
|
1244
1384
|
const isDrop = name === "onDrop";
|
|
1245
1385
|
const isClickEvent = name === "onClick" || name === "onContextMenu" || name === "onDoubleClick";
|
|
1386
|
+
const isPointerDown = name === "onPointerDown";
|
|
1387
|
+
const isPointerUp = name === "onPointerUp";
|
|
1388
|
+
const isWheel = name === "onWheel";
|
|
1389
|
+
const canDeferRaycasts = events.frameTimedRaycasts && state.frameloop === "always";
|
|
1390
|
+
if (isPointerMove && canDeferRaycasts) {
|
|
1391
|
+
events.compute?.(event, state);
|
|
1392
|
+
internal.pointerDirty.set(pointerId, event);
|
|
1393
|
+
return;
|
|
1394
|
+
}
|
|
1395
|
+
if (isWheel && canDeferRaycasts && !events.alwaysFireOnScroll) {
|
|
1396
|
+
events.compute?.(event, state);
|
|
1397
|
+
internal.pointerDirty.set(pointerId, event);
|
|
1398
|
+
return;
|
|
1399
|
+
}
|
|
1400
|
+
if ((isClickEvent || isPointerDown || isPointerUp) && internal.pointerDirty.has(pointerId)) {
|
|
1401
|
+
const deferredEvent = internal.pointerDirty.get(pointerId);
|
|
1402
|
+
internal.pointerDirty.delete(pointerId);
|
|
1403
|
+
processDeferredPointer(deferredEvent, pointerId);
|
|
1404
|
+
}
|
|
1246
1405
|
const filter = isPointerMove || isDragOver || isDrop ? filterPointerEvents : void 0;
|
|
1247
1406
|
const hits = intersect(event, filter);
|
|
1248
|
-
const delta = isClickEvent ? calculateDistance(event) : 0;
|
|
1249
|
-
if (
|
|
1250
|
-
|
|
1251
|
-
|
|
1252
|
-
|
|
1407
|
+
const delta = isClickEvent ? calculateDistance(event, pointerId) : 0;
|
|
1408
|
+
if (isPointerDown) {
|
|
1409
|
+
const pointerState2 = getPointerState(internal, pointerId);
|
|
1410
|
+
pointerState2.initialClick = [event.offsetX, event.offsetY];
|
|
1411
|
+
pointerState2.initialHits = hits.map((hit) => hit.eventObject);
|
|
1412
|
+
}
|
|
1413
|
+
const pointerState = internal.pointerMap.get(pointerId);
|
|
1414
|
+
const initialHits = pointerState?.initialHits ?? [];
|
|
1253
1415
|
if (isClickEvent && !hits.length) {
|
|
1254
1416
|
if (delta <= 2) {
|
|
1255
1417
|
pointerMissed(event, internal.interaction);
|
|
@@ -1264,7 +1426,9 @@ function createEvents(store) {
|
|
|
1264
1426
|
dropMissed(event, internal.interaction);
|
|
1265
1427
|
if (onDropMissed) onDropMissed(event);
|
|
1266
1428
|
}
|
|
1267
|
-
if (isPointerMove || isDragOver)
|
|
1429
|
+
if (isPointerMove || isDragOver) {
|
|
1430
|
+
cancelPointer(hits, pointerId);
|
|
1431
|
+
}
|
|
1268
1432
|
function onIntersect(data) {
|
|
1269
1433
|
const eventObject = data.eventObject;
|
|
1270
1434
|
const instance = eventObject.__r3f;
|
|
@@ -1273,9 +1437,10 @@ function createEvents(store) {
|
|
|
1273
1437
|
if (isPointerMove) {
|
|
1274
1438
|
if (handlers.onPointerOver || handlers.onPointerEnter || handlers.onPointerOut || handlers.onPointerLeave) {
|
|
1275
1439
|
const id = makeId(data);
|
|
1276
|
-
const
|
|
1440
|
+
const pointerState2 = getPointerState(internal, pointerId);
|
|
1441
|
+
const hoveredItem = pointerState2.hovered.get(id);
|
|
1277
1442
|
if (!hoveredItem) {
|
|
1278
|
-
|
|
1443
|
+
pointerState2.hovered.set(id, data);
|
|
1279
1444
|
handlers.onPointerOver?.(data);
|
|
1280
1445
|
handlers.onPointerEnter?.(data);
|
|
1281
1446
|
} else if (hoveredItem.stopped) {
|
|
@@ -1285,9 +1450,10 @@ function createEvents(store) {
|
|
|
1285
1450
|
handlers.onPointerMove?.(data);
|
|
1286
1451
|
} else if (isDragOver) {
|
|
1287
1452
|
const id = makeId(data);
|
|
1288
|
-
const
|
|
1453
|
+
const pointerState2 = getPointerState(internal, pointerId);
|
|
1454
|
+
const hoveredItem = pointerState2.hovered.get(id);
|
|
1289
1455
|
if (!hoveredItem) {
|
|
1290
|
-
|
|
1456
|
+
pointerState2.hovered.set(id, data);
|
|
1291
1457
|
handlers.onDragOverEnter?.(data);
|
|
1292
1458
|
} else if (hoveredItem.stopped) {
|
|
1293
1459
|
data.stopPropagation();
|
|
@@ -1298,18 +1464,18 @@ function createEvents(store) {
|
|
|
1298
1464
|
} else {
|
|
1299
1465
|
const handler = handlers[name];
|
|
1300
1466
|
if (handler) {
|
|
1301
|
-
if (!isClickEvent ||
|
|
1467
|
+
if (!isClickEvent || initialHits.includes(eventObject)) {
|
|
1302
1468
|
pointerMissed(
|
|
1303
1469
|
event,
|
|
1304
|
-
internal.interaction.filter((object) => !
|
|
1470
|
+
internal.interaction.filter((object) => !initialHits.includes(object))
|
|
1305
1471
|
);
|
|
1306
1472
|
handler(data);
|
|
1307
1473
|
}
|
|
1308
1474
|
} else {
|
|
1309
|
-
if (isClickEvent &&
|
|
1475
|
+
if (isClickEvent && initialHits.includes(eventObject)) {
|
|
1310
1476
|
pointerMissed(
|
|
1311
1477
|
event,
|
|
1312
|
-
internal.interaction.filter((object) => !
|
|
1478
|
+
internal.interaction.filter((object) => !initialHits.includes(object))
|
|
1313
1479
|
);
|
|
1314
1480
|
}
|
|
1315
1481
|
}
|
|
@@ -1318,7 +1484,15 @@ function createEvents(store) {
|
|
|
1318
1484
|
handleIntersects(hits, event, delta, onIntersect);
|
|
1319
1485
|
};
|
|
1320
1486
|
}
|
|
1321
|
-
|
|
1487
|
+
function flushDeferredPointers() {
|
|
1488
|
+
const { internal, events } = store.getState();
|
|
1489
|
+
if (!events.frameTimedRaycasts) return;
|
|
1490
|
+
for (const [pointerId, event] of internal.pointerDirty) {
|
|
1491
|
+
processDeferredPointer(event, pointerId);
|
|
1492
|
+
}
|
|
1493
|
+
internal.pointerDirty.clear();
|
|
1494
|
+
}
|
|
1495
|
+
return { handlePointer, flushDeferredPointers, processDeferredPointer };
|
|
1322
1496
|
}
|
|
1323
1497
|
const DOM_EVENTS = {
|
|
1324
1498
|
onClick: ["click", false],
|
|
@@ -1337,10 +1511,15 @@ const DOM_EVENTS = {
|
|
|
1337
1511
|
onLostPointerCapture: ["lostpointercapture", true]
|
|
1338
1512
|
};
|
|
1339
1513
|
function createPointerEvents(store) {
|
|
1340
|
-
const { handlePointer } = createEvents(store);
|
|
1514
|
+
const { handlePointer, flushDeferredPointers, processDeferredPointer } = createEvents(store);
|
|
1515
|
+
let nextXRPointerId = XR_POINTER_ID_START;
|
|
1516
|
+
const xrPointers = /* @__PURE__ */ new Map();
|
|
1341
1517
|
return {
|
|
1342
1518
|
priority: 1,
|
|
1343
1519
|
enabled: true,
|
|
1520
|
+
frameTimedRaycasts: true,
|
|
1521
|
+
alwaysFireOnScroll: true,
|
|
1522
|
+
updateOnFrame: false,
|
|
1344
1523
|
compute(event, state) {
|
|
1345
1524
|
state.pointer.set(event.offsetX / state.size.width * 2 - 1, -(event.offsetY / state.size.height) * 2 + 1);
|
|
1346
1525
|
state.raycaster.setFromCamera(state.pointer, state.camera);
|
|
@@ -1350,11 +1529,33 @@ function createPointerEvents(store) {
|
|
|
1350
1529
|
(acc, key) => ({ ...acc, [key]: handlePointer(key) }),
|
|
1351
1530
|
{}
|
|
1352
1531
|
),
|
|
1353
|
-
update: () => {
|
|
1532
|
+
update: (pointerId) => {
|
|
1533
|
+
const { events, internal } = store.getState();
|
|
1534
|
+
if (!events.handlers) return;
|
|
1535
|
+
if (pointerId !== void 0) {
|
|
1536
|
+
const event = internal.pointerDirty.get(pointerId);
|
|
1537
|
+
if (event) {
|
|
1538
|
+
internal.pointerDirty.delete(pointerId);
|
|
1539
|
+
processDeferredPointer(event, pointerId);
|
|
1540
|
+
} else if (internal.lastEvent?.current) {
|
|
1541
|
+
processDeferredPointer(internal.lastEvent.current, pointerId);
|
|
1542
|
+
}
|
|
1543
|
+
} else {
|
|
1544
|
+
flushDeferredPointers();
|
|
1545
|
+
if (internal.lastEvent?.current) {
|
|
1546
|
+
events.handlers.onPointerMove(internal.lastEvent.current);
|
|
1547
|
+
}
|
|
1548
|
+
}
|
|
1549
|
+
},
|
|
1550
|
+
flush: () => {
|
|
1354
1551
|
const { events, internal } = store.getState();
|
|
1355
|
-
|
|
1552
|
+
flushDeferredPointers();
|
|
1553
|
+
if (events.updateOnFrame && internal.lastEvent?.current && events.handlers) {
|
|
1554
|
+
events.handlers.onPointerMove(internal.lastEvent.current);
|
|
1555
|
+
}
|
|
1356
1556
|
},
|
|
1357
1557
|
connect: (target) => {
|
|
1558
|
+
if (!target) return;
|
|
1358
1559
|
const { set, events } = store.getState();
|
|
1359
1560
|
events.disconnect?.();
|
|
1360
1561
|
set((state) => ({ events: { ...state.events, connected: target } }));
|
|
@@ -1378,6 +1579,33 @@ function createPointerEvents(store) {
|
|
|
1378
1579
|
}
|
|
1379
1580
|
set((state) => ({ events: { ...state.events, connected: void 0 } }));
|
|
1380
1581
|
}
|
|
1582
|
+
},
|
|
1583
|
+
// PREVIEW (A8): the XR pointer registration API may change before stable.
|
|
1584
|
+
registerPointer: (config) => {
|
|
1585
|
+
const pointerId = nextXRPointerId++;
|
|
1586
|
+
xrPointers.set(pointerId, config);
|
|
1587
|
+
const { internal } = store.getState();
|
|
1588
|
+
getPointerState(internal, pointerId);
|
|
1589
|
+
return pointerId;
|
|
1590
|
+
},
|
|
1591
|
+
unregisterPointer: (pointerId) => {
|
|
1592
|
+
xrPointers.delete(pointerId);
|
|
1593
|
+
const { internal } = store.getState();
|
|
1594
|
+
const pointerState = internal.pointerMap.get(pointerId);
|
|
1595
|
+
if (pointerState) {
|
|
1596
|
+
for (const [, hoveredObj] of pointerState.hovered) {
|
|
1597
|
+
const eventObject = hoveredObj.eventObject;
|
|
1598
|
+
const instance = eventObject.__r3f;
|
|
1599
|
+
if (instance?.eventCount) {
|
|
1600
|
+
const handlers = instance.handlers;
|
|
1601
|
+
const data = { ...hoveredObj, intersections: [] };
|
|
1602
|
+
handlers.onPointerOut?.(data);
|
|
1603
|
+
handlers.onPointerLeave?.(data);
|
|
1604
|
+
}
|
|
1605
|
+
}
|
|
1606
|
+
internal.pointerMap.delete(pointerId);
|
|
1607
|
+
}
|
|
1608
|
+
internal.pointerDirty.delete(pointerId);
|
|
1381
1609
|
}
|
|
1382
1610
|
};
|
|
1383
1611
|
}
|
|
@@ -1439,1036 +1667,11 @@ function notifyAlpha({ message, link }) {
|
|
|
1439
1667
|
}
|
|
1440
1668
|
}
|
|
1441
1669
|
|
|
1442
|
-
|
|
1443
|
-
|
|
1444
|
-
|
|
1445
|
-
const
|
|
1446
|
-
|
|
1447
|
-
constructor() {
|
|
1448
|
-
/** Ordered list of phase nodes */
|
|
1449
|
-
__publicField$1(this, "phases", []);
|
|
1450
|
-
/** Quick lookup by name */
|
|
1451
|
-
__publicField$1(this, "phaseMap", /* @__PURE__ */ new Map());
|
|
1452
|
-
/** Cached ordered names (invalidated on changes) */
|
|
1453
|
-
__publicField$1(this, "orderedNamesCache", null);
|
|
1454
|
-
this.initializeDefaultPhases();
|
|
1455
|
-
}
|
|
1456
|
-
//* Initialization --------------------------------
|
|
1457
|
-
initializeDefaultPhases() {
|
|
1458
|
-
for (const name of DEFAULT_PHASES) {
|
|
1459
|
-
const node = { name, isAutoGenerated: false };
|
|
1460
|
-
this.phases.push(node);
|
|
1461
|
-
this.phaseMap.set(name, node);
|
|
1462
|
-
}
|
|
1463
|
-
this.invalidateCache();
|
|
1464
|
-
}
|
|
1465
|
-
//* Public API --------------------------------
|
|
1466
|
-
/**
|
|
1467
|
-
* Add a named phase to the graph
|
|
1468
|
-
* @param name - Phase name (must be unique)
|
|
1469
|
-
* @param options - Position options (before or after another phase)
|
|
1470
|
-
*/
|
|
1471
|
-
addPhase(name, options = {}) {
|
|
1472
|
-
if (this.phaseMap.has(name)) {
|
|
1473
|
-
console.warn(`[useFrame] Phase "${name}" already exists`);
|
|
1474
|
-
return;
|
|
1475
|
-
}
|
|
1476
|
-
const { before, after } = options;
|
|
1477
|
-
const node = { name, isAutoGenerated: false };
|
|
1478
|
-
let insertIndex = this.phases.length;
|
|
1479
|
-
const targetIndex = this.getPhaseIndex(before ?? after);
|
|
1480
|
-
if (targetIndex !== -1) {
|
|
1481
|
-
insertIndex = before ? targetIndex : targetIndex + 1;
|
|
1482
|
-
} else {
|
|
1483
|
-
const constraintType = before ? "before" : "after";
|
|
1484
|
-
console.warn(`[useFrame] Phase "${before ?? after}" not found for '${constraintType}' constraint`);
|
|
1485
|
-
}
|
|
1486
|
-
this.phases.splice(insertIndex, 0, node);
|
|
1487
|
-
this.phaseMap.set(name, node);
|
|
1488
|
-
this.invalidateCache();
|
|
1489
|
-
}
|
|
1490
|
-
/**
|
|
1491
|
-
* Get ordered list of phase names
|
|
1492
|
-
*/
|
|
1493
|
-
getOrderedPhases() {
|
|
1494
|
-
if (this.orderedNamesCache === null) this.orderedNamesCache = this.phases.map((p) => p.name);
|
|
1495
|
-
return this.orderedNamesCache;
|
|
1496
|
-
}
|
|
1497
|
-
/**
|
|
1498
|
-
* Check if a phase exists
|
|
1499
|
-
*/
|
|
1500
|
-
hasPhase(name) {
|
|
1501
|
-
return this.phaseMap.has(name);
|
|
1502
|
-
}
|
|
1503
|
-
/**
|
|
1504
|
-
* Get the index of a phase (-1 if not found)
|
|
1505
|
-
*/
|
|
1506
|
-
getPhaseIndex(name) {
|
|
1507
|
-
if (!name) return -1;
|
|
1508
|
-
return this.phases.findIndex((p) => p.name === name);
|
|
1509
|
-
}
|
|
1510
|
-
/**
|
|
1511
|
-
* Ensure a phase exists, creating an auto-generated one if needed.
|
|
1512
|
-
* Used for resolving before/after constraints.
|
|
1513
|
-
*
|
|
1514
|
-
* @param name - The phase name to ensure exists
|
|
1515
|
-
* @returns The phase name (may be auto-generated like 'before:render')
|
|
1516
|
-
*/
|
|
1517
|
-
ensurePhase(name) {
|
|
1518
|
-
if (this.phaseMap.has(name)) return name;
|
|
1519
|
-
const node = { name, isAutoGenerated: true };
|
|
1520
|
-
this.phases.push(node);
|
|
1521
|
-
this.phaseMap.set(name, node);
|
|
1522
|
-
this.invalidateCache();
|
|
1523
|
-
return name;
|
|
1524
|
-
}
|
|
1525
|
-
/**
|
|
1526
|
-
* Resolve where a job with before/after constraints should go.
|
|
1527
|
-
* Creates auto-generated phases if needed.
|
|
1528
|
-
*
|
|
1529
|
-
* @param before - Phase(s) to run before
|
|
1530
|
-
* @param after - Phase(s) to run after
|
|
1531
|
-
* @returns The resolved phase name
|
|
1532
|
-
*/
|
|
1533
|
-
resolveConstraintPhase(before, after) {
|
|
1534
|
-
const beforeArr = before ? Array.isArray(before) ? before : [before] : [];
|
|
1535
|
-
const afterArr = after ? Array.isArray(after) ? after : [after] : [];
|
|
1536
|
-
if (beforeArr.length > 0) {
|
|
1537
|
-
return this.ensureAutoPhase(beforeArr[0], "before", 0);
|
|
1538
|
-
}
|
|
1539
|
-
if (afterArr.length > 0) {
|
|
1540
|
-
return this.ensureAutoPhase(afterArr[0], "after", 1);
|
|
1541
|
-
}
|
|
1542
|
-
return "update";
|
|
1543
|
-
}
|
|
1544
|
-
/**
|
|
1545
|
-
* Ensure an auto-generated phase exists relative to a target phase.
|
|
1546
|
-
* Creates the phase if it doesn't exist, inserting it at the correct position.
|
|
1547
|
-
*
|
|
1548
|
-
* @param target - The target phase name to position relative to
|
|
1549
|
-
* @param prefix - Prefix for auto-generated phase name ('before' or 'after')
|
|
1550
|
-
* @param offset - Insertion offset (0 for before, 1 for after)
|
|
1551
|
-
* @returns The auto-generated phase name
|
|
1552
|
-
*/
|
|
1553
|
-
ensureAutoPhase(target, prefix, offset) {
|
|
1554
|
-
const autoName = `${prefix}:${target}`;
|
|
1555
|
-
if (this.phaseMap.has(autoName)) return autoName;
|
|
1556
|
-
const node = { name: autoName, isAutoGenerated: true };
|
|
1557
|
-
const targetIndex = this.getPhaseIndex(target);
|
|
1558
|
-
if (targetIndex !== -1) this.phases.splice(targetIndex + offset, 0, node);
|
|
1559
|
-
else this.phases.push(node);
|
|
1560
|
-
this.phaseMap.set(autoName, node);
|
|
1561
|
-
this.invalidateCache();
|
|
1562
|
-
return autoName;
|
|
1563
|
-
}
|
|
1564
|
-
// Internal --------------------------------
|
|
1565
|
-
invalidateCache() {
|
|
1566
|
-
this.orderedNamesCache = null;
|
|
1567
|
-
}
|
|
1568
|
-
}
|
|
1569
|
-
|
|
1570
|
-
function rebuildSortedJobs(jobs, phaseGraph) {
|
|
1571
|
-
const orderedPhases = phaseGraph.getOrderedPhases();
|
|
1572
|
-
const buckets = /* @__PURE__ */ new Map();
|
|
1573
|
-
for (const phase of orderedPhases) {
|
|
1574
|
-
buckets.set(phase, []);
|
|
1575
|
-
}
|
|
1576
|
-
for (const job of jobs.values()) {
|
|
1577
|
-
if (!job.enabled) continue;
|
|
1578
|
-
let bucket = buckets.get(job.phase);
|
|
1579
|
-
if (!bucket) {
|
|
1580
|
-
bucket = [];
|
|
1581
|
-
buckets.set(job.phase, bucket);
|
|
1582
|
-
}
|
|
1583
|
-
bucket.push(job);
|
|
1584
|
-
}
|
|
1585
|
-
const sortedBuckets = [];
|
|
1586
|
-
for (const phase of orderedPhases) {
|
|
1587
|
-
const bucket = buckets.get(phase);
|
|
1588
|
-
if (!bucket || bucket.length === 0) continue;
|
|
1589
|
-
bucket.sort((a, b) => {
|
|
1590
|
-
if (a.priority !== b.priority) return b.priority - a.priority;
|
|
1591
|
-
return a.index - b.index;
|
|
1592
|
-
});
|
|
1593
|
-
sortedBuckets.push(hasCrossJobConstraints(bucket) ? topologicalSort(bucket) : bucket);
|
|
1594
|
-
}
|
|
1595
|
-
for (const [phase, bucket] of buckets) {
|
|
1596
|
-
if (!orderedPhases.includes(phase) && bucket.length > 0) {
|
|
1597
|
-
bucket.sort((a, b) => {
|
|
1598
|
-
if (a.priority !== b.priority) return b.priority - a.priority;
|
|
1599
|
-
return a.index - b.index;
|
|
1600
|
-
});
|
|
1601
|
-
sortedBuckets.push(bucket);
|
|
1602
|
-
}
|
|
1603
|
-
}
|
|
1604
|
-
return sortedBuckets.flat();
|
|
1605
|
-
}
|
|
1606
|
-
function hasCrossJobConstraints(bucket) {
|
|
1607
|
-
const jobIds = new Set(bucket.map((j) => j.id));
|
|
1608
|
-
for (const job of bucket) {
|
|
1609
|
-
for (const ref of job.before) {
|
|
1610
|
-
if (jobIds.has(ref)) return true;
|
|
1611
|
-
}
|
|
1612
|
-
for (const ref of job.after) {
|
|
1613
|
-
if (jobIds.has(ref)) return true;
|
|
1614
|
-
}
|
|
1615
|
-
}
|
|
1616
|
-
return false;
|
|
1617
|
-
}
|
|
1618
|
-
function topologicalSort(jobs) {
|
|
1619
|
-
const n = jobs.length;
|
|
1620
|
-
if (n <= 1) return jobs;
|
|
1621
|
-
const jobMap = /* @__PURE__ */ new Map();
|
|
1622
|
-
const inDegree = /* @__PURE__ */ new Map();
|
|
1623
|
-
const adjacency = /* @__PURE__ */ new Map();
|
|
1624
|
-
for (const job of jobs) {
|
|
1625
|
-
jobMap.set(job.id, job);
|
|
1626
|
-
inDegree.set(job.id, 0);
|
|
1627
|
-
adjacency.set(job.id, []);
|
|
1628
|
-
}
|
|
1629
|
-
for (const job of jobs) {
|
|
1630
|
-
for (const ref of job.before) {
|
|
1631
|
-
if (jobMap.has(ref)) {
|
|
1632
|
-
adjacency.get(job.id).push(ref);
|
|
1633
|
-
inDegree.set(ref, inDegree.get(ref) + 1);
|
|
1634
|
-
}
|
|
1635
|
-
}
|
|
1636
|
-
for (const ref of job.after) {
|
|
1637
|
-
if (jobMap.has(ref)) {
|
|
1638
|
-
adjacency.get(ref).push(job.id);
|
|
1639
|
-
inDegree.set(job.id, inDegree.get(job.id) + 1);
|
|
1640
|
-
}
|
|
1641
|
-
}
|
|
1642
|
-
}
|
|
1643
|
-
const queue = [];
|
|
1644
|
-
for (const job of jobs) {
|
|
1645
|
-
if (inDegree.get(job.id) === 0) {
|
|
1646
|
-
queue.push(job);
|
|
1647
|
-
}
|
|
1648
|
-
}
|
|
1649
|
-
queue.sort((a, b) => {
|
|
1650
|
-
if (a.priority !== b.priority) return b.priority - a.priority;
|
|
1651
|
-
return a.index - b.index;
|
|
1652
|
-
});
|
|
1653
|
-
const result = [];
|
|
1654
|
-
while (queue.length > 0) {
|
|
1655
|
-
const job = queue.shift();
|
|
1656
|
-
result.push(job);
|
|
1657
|
-
const neighbors = adjacency.get(job.id) || [];
|
|
1658
|
-
for (const neighborId of neighbors) {
|
|
1659
|
-
const newDegree = inDegree.get(neighborId) - 1;
|
|
1660
|
-
inDegree.set(neighborId, newDegree);
|
|
1661
|
-
if (newDegree === 0) {
|
|
1662
|
-
const neighbor = jobMap.get(neighborId);
|
|
1663
|
-
insertSorted(queue, neighbor);
|
|
1664
|
-
}
|
|
1665
|
-
}
|
|
1666
|
-
}
|
|
1667
|
-
if (result.length !== n) {
|
|
1668
|
-
console.warn("[useFrame] Circular dependency detected in job constraints");
|
|
1669
|
-
const resultIds = new Set(result.map((j) => j.id));
|
|
1670
|
-
for (const job of jobs) {
|
|
1671
|
-
if (!resultIds.has(job.id)) result.push(job);
|
|
1672
|
-
}
|
|
1673
|
-
}
|
|
1674
|
-
return result;
|
|
1675
|
-
}
|
|
1676
|
-
function insertSorted(arr, job) {
|
|
1677
|
-
let i = 0;
|
|
1678
|
-
while (i < arr.length) {
|
|
1679
|
-
const cmp = arr[i];
|
|
1680
|
-
if (job.priority > cmp.priority || job.priority === cmp.priority && job.index < cmp.index) {
|
|
1681
|
-
break;
|
|
1682
|
-
}
|
|
1683
|
-
i++;
|
|
1684
|
-
}
|
|
1685
|
-
arr.splice(i, 0, job);
|
|
1686
|
-
}
|
|
1687
|
-
|
|
1688
|
-
function shouldRun(job, now) {
|
|
1689
|
-
if (!job.enabled) return false;
|
|
1690
|
-
if (!job.fps) return true;
|
|
1691
|
-
const minInterval = 1e3 / job.fps;
|
|
1692
|
-
const lastRun = job.lastRun ?? 0;
|
|
1693
|
-
const elapsed = now - lastRun;
|
|
1694
|
-
if (elapsed < minInterval) return false;
|
|
1695
|
-
if (job.drop) {
|
|
1696
|
-
job.lastRun = now;
|
|
1697
|
-
} else {
|
|
1698
|
-
const steps = Math.floor(elapsed / minInterval);
|
|
1699
|
-
job.lastRun = lastRun + steps * minInterval;
|
|
1700
|
-
if (job.lastRun < now - minInterval) {
|
|
1701
|
-
job.lastRun = now;
|
|
1702
|
-
}
|
|
1703
|
-
}
|
|
1704
|
-
return true;
|
|
1705
|
-
}
|
|
1706
|
-
function resetJobTiming(job) {
|
|
1707
|
-
job.lastRun = void 0;
|
|
1708
|
-
}
|
|
1709
|
-
|
|
1710
|
-
var __defProp = Object.defineProperty;
|
|
1711
|
-
var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
|
|
1712
|
-
var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
|
|
1713
|
-
const hmrData = (() => {
|
|
1714
|
-
if (typeof process !== "undefined" && process.env.NODE_ENV === "test") return void 0;
|
|
1715
|
-
if (typeof import_meta_hot !== "undefined") return import_meta_hot;
|
|
1716
|
-
try {
|
|
1717
|
-
return (0, eval)("import.meta.hot");
|
|
1718
|
-
} catch {
|
|
1719
|
-
return void 0;
|
|
1720
|
-
}
|
|
1721
|
-
})();
|
|
1722
|
-
const _Scheduler = class _Scheduler {
|
|
1723
|
-
//* Constructor ================================
|
|
1724
|
-
constructor() {
|
|
1725
|
-
//* Critical State ================================
|
|
1726
|
-
__publicField(this, "roots", /* @__PURE__ */ new Map());
|
|
1727
|
-
__publicField(this, "phaseGraph");
|
|
1728
|
-
__publicField(this, "loopState", {
|
|
1729
|
-
running: false,
|
|
1730
|
-
rafHandle: null,
|
|
1731
|
-
lastTime: null,
|
|
1732
|
-
// null = uninitialized, 0+ = valid timestamp
|
|
1733
|
-
frameCount: 0,
|
|
1734
|
-
elapsedTime: 0,
|
|
1735
|
-
createdAt: performance.now()
|
|
1736
|
-
});
|
|
1737
|
-
__publicField(this, "stoppedTime", 0);
|
|
1738
|
-
//* Private State ================================
|
|
1739
|
-
__publicField(this, "nextRootIndex", 0);
|
|
1740
|
-
__publicField(this, "globalBeforeJobs", /* @__PURE__ */ new Map());
|
|
1741
|
-
__publicField(this, "globalAfterJobs", /* @__PURE__ */ new Map());
|
|
1742
|
-
__publicField(this, "nextGlobalIndex", 0);
|
|
1743
|
-
__publicField(this, "idleCallbacks", /* @__PURE__ */ new Set());
|
|
1744
|
-
__publicField(this, "nextJobIndex", 0);
|
|
1745
|
-
__publicField(this, "jobStateListeners", /* @__PURE__ */ new Map());
|
|
1746
|
-
__publicField(this, "pendingFrames", 0);
|
|
1747
|
-
__publicField(this, "_frameloop", "always");
|
|
1748
|
-
//* Independent Mode & Error Handling State ================================
|
|
1749
|
-
__publicField(this, "_independent", false);
|
|
1750
|
-
__publicField(this, "errorHandler", null);
|
|
1751
|
-
__publicField(this, "rootReadyCallbacks", /* @__PURE__ */ new Set());
|
|
1752
|
-
//* Core Loop Execution Methods ================================
|
|
1753
|
-
/**
|
|
1754
|
-
* Main RAF loop callback.
|
|
1755
|
-
* Executes frame, handles demand mode, and schedules next frame.
|
|
1756
|
-
* @param {number} timestamp - RAF timestamp in milliseconds
|
|
1757
|
-
* @returns {void}
|
|
1758
|
-
* @private
|
|
1759
|
-
*/
|
|
1760
|
-
__publicField(this, "loop", (timestamp) => {
|
|
1761
|
-
if (!this.loopState.running) return;
|
|
1762
|
-
this.executeFrame(timestamp);
|
|
1763
|
-
if (this._frameloop === "demand") {
|
|
1764
|
-
this.pendingFrames = Math.max(0, this.pendingFrames - 1);
|
|
1765
|
-
if (this.pendingFrames === 0) {
|
|
1766
|
-
this.notifyIdle(timestamp);
|
|
1767
|
-
return this.stop();
|
|
1768
|
-
}
|
|
1769
|
-
}
|
|
1770
|
-
this.loopState.rafHandle = requestAnimationFrame(this.loop);
|
|
1771
|
-
});
|
|
1772
|
-
this.phaseGraph = new PhaseGraph();
|
|
1773
|
-
}
|
|
1774
|
-
static get instance() {
|
|
1775
|
-
return globalThis[_Scheduler.INSTANCE_KEY] ?? null;
|
|
1776
|
-
}
|
|
1777
|
-
static set instance(value) {
|
|
1778
|
-
globalThis[_Scheduler.INSTANCE_KEY] = value;
|
|
1779
|
-
}
|
|
1780
|
-
/**
|
|
1781
|
-
* Get the global scheduler instance (creates if doesn't exist).
|
|
1782
|
-
* Uses HMR data to preserve instance across hot reloads.
|
|
1783
|
-
* @returns {Scheduler} The singleton scheduler instance
|
|
1784
|
-
*/
|
|
1785
|
-
static get() {
|
|
1786
|
-
if (!_Scheduler.instance && hmrData?.data?.scheduler) {
|
|
1787
|
-
_Scheduler.instance = hmrData.data.scheduler;
|
|
1788
|
-
}
|
|
1789
|
-
if (!_Scheduler.instance) {
|
|
1790
|
-
_Scheduler.instance = new _Scheduler();
|
|
1791
|
-
if (hmrData?.data) {
|
|
1792
|
-
hmrData.data.scheduler = _Scheduler.instance;
|
|
1793
|
-
}
|
|
1794
|
-
}
|
|
1795
|
-
return _Scheduler.instance;
|
|
1796
|
-
}
|
|
1797
|
-
/**
|
|
1798
|
-
* Reset the singleton instance. Stops the loop and clears all state.
|
|
1799
|
-
* Primarily used for testing to ensure clean state between tests.
|
|
1800
|
-
* @returns {void}
|
|
1801
|
-
*/
|
|
1802
|
-
static reset() {
|
|
1803
|
-
if (_Scheduler.instance) {
|
|
1804
|
-
_Scheduler.instance.stop();
|
|
1805
|
-
_Scheduler.instance = null;
|
|
1806
|
-
}
|
|
1807
|
-
if (hmrData?.data) {
|
|
1808
|
-
hmrData.data.scheduler = null;
|
|
1809
|
-
}
|
|
1810
|
-
}
|
|
1811
|
-
//* Getters & Setters ================================
|
|
1812
|
-
get phases() {
|
|
1813
|
-
return this.phaseGraph.getOrderedPhases();
|
|
1814
|
-
}
|
|
1815
|
-
get frameloop() {
|
|
1816
|
-
return this._frameloop;
|
|
1817
|
-
}
|
|
1818
|
-
set frameloop(mode) {
|
|
1819
|
-
if (this._frameloop === mode) return;
|
|
1820
|
-
const wasAlways = this._frameloop === "always";
|
|
1821
|
-
this._frameloop = mode;
|
|
1822
|
-
if (mode === "always" && !this.loopState.running && this.roots.size > 0) this.start();
|
|
1823
|
-
else if (mode !== "always" && wasAlways) this.stop();
|
|
1824
|
-
}
|
|
1825
|
-
get isRunning() {
|
|
1826
|
-
return this.loopState.running;
|
|
1827
|
-
}
|
|
1828
|
-
get isReady() {
|
|
1829
|
-
return this.roots.size > 0;
|
|
1830
|
-
}
|
|
1831
|
-
get independent() {
|
|
1832
|
-
return this._independent;
|
|
1833
|
-
}
|
|
1834
|
-
set independent(value) {
|
|
1835
|
-
this._independent = value;
|
|
1836
|
-
if (value) this.ensureDefaultRoot();
|
|
1837
|
-
}
|
|
1838
|
-
//* Root Management Methods ================================
|
|
1839
|
-
/**
|
|
1840
|
-
* Register a root (Canvas) with the scheduler.
|
|
1841
|
-
* The first root to register starts the RAF loop (if frameloop='always').
|
|
1842
|
-
* @param {string} id - Unique identifier for this root
|
|
1843
|
-
* @param {RootOptions} [options] - Optional configuration with getState and onError callbacks
|
|
1844
|
-
* @returns {() => void} Unsubscribe function to remove this root
|
|
1845
|
-
*/
|
|
1846
|
-
registerRoot(id, options = {}) {
|
|
1847
|
-
if (this.roots.has(id)) {
|
|
1848
|
-
console.warn(`[Scheduler] Root "${id}" already registered`);
|
|
1849
|
-
return () => this.unregisterRoot(id);
|
|
1850
|
-
}
|
|
1851
|
-
const entry = {
|
|
1852
|
-
id,
|
|
1853
|
-
getState: options.getState ?? (() => ({})),
|
|
1854
|
-
jobs: /* @__PURE__ */ new Map(),
|
|
1855
|
-
sortedJobs: [],
|
|
1856
|
-
needsRebuild: false
|
|
1857
|
-
};
|
|
1858
|
-
if (options.onError) {
|
|
1859
|
-
this.errorHandler = options.onError;
|
|
1860
|
-
}
|
|
1861
|
-
this.roots.set(id, entry);
|
|
1862
|
-
if (this.roots.size === 1) {
|
|
1863
|
-
this.notifyRootReady();
|
|
1864
|
-
if (this._frameloop === "always") this.start();
|
|
1865
|
-
}
|
|
1866
|
-
return () => this.unregisterRoot(id);
|
|
1867
|
-
}
|
|
1868
|
-
/**
|
|
1869
|
-
* Unregister a root from the scheduler.
|
|
1870
|
-
* Cleans up all job state listeners for this root's jobs.
|
|
1871
|
-
* The last root to unregister stops the RAF loop.
|
|
1872
|
-
* @param {string} id - The root ID to unregister
|
|
1873
|
-
* @returns {void}
|
|
1874
|
-
*/
|
|
1875
|
-
unregisterRoot(id) {
|
|
1876
|
-
const root = this.roots.get(id);
|
|
1877
|
-
if (!root) return;
|
|
1878
|
-
for (const jobId of root.jobs.keys()) {
|
|
1879
|
-
this.jobStateListeners.delete(jobId);
|
|
1880
|
-
}
|
|
1881
|
-
this.roots.delete(id);
|
|
1882
|
-
if (this.roots.size === 0) {
|
|
1883
|
-
this.stop();
|
|
1884
|
-
this.errorHandler = null;
|
|
1885
|
-
}
|
|
1886
|
-
}
|
|
1887
|
-
/**
|
|
1888
|
-
* Subscribe to be notified when a root becomes available.
|
|
1889
|
-
* Fires immediately if a root already exists.
|
|
1890
|
-
* @param {() => void} callback - Function called when first root registers
|
|
1891
|
-
* @returns {() => void} Unsubscribe function
|
|
1892
|
-
*/
|
|
1893
|
-
onRootReady(callback) {
|
|
1894
|
-
if (this.roots.size > 0) {
|
|
1895
|
-
callback();
|
|
1896
|
-
return () => {
|
|
1897
|
-
};
|
|
1898
|
-
}
|
|
1899
|
-
this.rootReadyCallbacks.add(callback);
|
|
1900
|
-
return () => this.rootReadyCallbacks.delete(callback);
|
|
1901
|
-
}
|
|
1902
|
-
/**
|
|
1903
|
-
* Notify all registered root-ready callbacks.
|
|
1904
|
-
* Called when the first root registers.
|
|
1905
|
-
* @returns {void}
|
|
1906
|
-
* @private
|
|
1907
|
-
*/
|
|
1908
|
-
notifyRootReady() {
|
|
1909
|
-
for (const cb of this.rootReadyCallbacks) {
|
|
1910
|
-
try {
|
|
1911
|
-
cb();
|
|
1912
|
-
} catch (error) {
|
|
1913
|
-
console.error("[Scheduler] Error in root-ready callback:", error);
|
|
1914
|
-
}
|
|
1915
|
-
}
|
|
1916
|
-
this.rootReadyCallbacks.clear();
|
|
1917
|
-
}
|
|
1918
|
-
/**
|
|
1919
|
-
* Ensure a default root exists for independent mode.
|
|
1920
|
-
* Creates a minimal root with no state provider.
|
|
1921
|
-
* @returns {void}
|
|
1922
|
-
* @private
|
|
1923
|
-
*/
|
|
1924
|
-
ensureDefaultRoot() {
|
|
1925
|
-
if (!this.roots.has("__default__")) {
|
|
1926
|
-
this.registerRoot("__default__");
|
|
1927
|
-
}
|
|
1928
|
-
}
|
|
1929
|
-
/**
|
|
1930
|
-
* Trigger error handling for job errors.
|
|
1931
|
-
* Uses the bound error handler if available, otherwise logs to console.
|
|
1932
|
-
* @param {Error} error - The error to handle
|
|
1933
|
-
* @returns {void}
|
|
1934
|
-
*/
|
|
1935
|
-
triggerError(error) {
|
|
1936
|
-
if (this.errorHandler) this.errorHandler(error);
|
|
1937
|
-
else console.error("[Scheduler]", error);
|
|
1938
|
-
}
|
|
1939
|
-
//* Phase Management Methods ================================
|
|
1940
|
-
/**
|
|
1941
|
-
* Add a named phase to the scheduler's execution order.
|
|
1942
|
-
* Marks all roots for rebuild to incorporate the new phase.
|
|
1943
|
-
* @param {string} name - The phase name (e.g., 'physics', 'postprocess')
|
|
1944
|
-
* @param {AddPhaseOptions} [options] - Positioning options (before/after other phases)
|
|
1945
|
-
* @returns {void}
|
|
1946
|
-
* @example
|
|
1947
|
-
* scheduler.addPhase('physics', { before: 'update' });
|
|
1948
|
-
* scheduler.addPhase('postprocess', { after: 'render' });
|
|
1949
|
-
*/
|
|
1950
|
-
addPhase(name, options) {
|
|
1951
|
-
this.phaseGraph.addPhase(name, options);
|
|
1952
|
-
for (const root of this.roots.values()) {
|
|
1953
|
-
root.needsRebuild = true;
|
|
1954
|
-
}
|
|
1955
|
-
}
|
|
1956
|
-
/**
|
|
1957
|
-
* Check if a phase exists in the scheduler.
|
|
1958
|
-
* @param {string} name - The phase name to check
|
|
1959
|
-
* @returns {boolean} True if the phase exists
|
|
1960
|
-
*/
|
|
1961
|
-
hasPhase(name) {
|
|
1962
|
-
return this.phaseGraph.hasPhase(name);
|
|
1963
|
-
}
|
|
1964
|
-
//* Global Job Registration Methods (Deprecated APIs) ================================
|
|
1965
|
-
/**
|
|
1966
|
-
* Register a global job that runs once per frame (not per-root).
|
|
1967
|
-
* Used internally by deprecated addEffect/addAfterEffect APIs.
|
|
1968
|
-
* @param {'before' | 'after'} phase - When to run: 'before' all roots or 'after' all roots
|
|
1969
|
-
* @param {string} id - Unique identifier for this global job
|
|
1970
|
-
* @param {(timestamp: number) => void} callback - Function called each frame with RAF timestamp
|
|
1971
|
-
* @returns {() => void} Unsubscribe function to remove this global job
|
|
1972
|
-
* @deprecated Use useFrame with phases instead
|
|
1973
|
-
*/
|
|
1974
|
-
registerGlobal(phase, id, callback) {
|
|
1975
|
-
const job = { id, callback };
|
|
1976
|
-
if (phase === "before") {
|
|
1977
|
-
this.globalBeforeJobs.set(id, job);
|
|
1978
|
-
} else {
|
|
1979
|
-
this.globalAfterJobs.set(id, job);
|
|
1980
|
-
}
|
|
1981
|
-
return () => {
|
|
1982
|
-
if (phase === "before") this.globalBeforeJobs.delete(id);
|
|
1983
|
-
else this.globalAfterJobs.delete(id);
|
|
1984
|
-
};
|
|
1985
|
-
}
|
|
1986
|
-
//* Idle Callback Methods (Deprecated API) ================================
|
|
1987
|
-
/**
|
|
1988
|
-
* Register an idle callback that fires when the loop stops.
|
|
1989
|
-
* Used internally by deprecated addTail API.
|
|
1990
|
-
* @param {(timestamp: number) => void} callback - Function called when loop becomes idle
|
|
1991
|
-
* @returns {() => void} Unsubscribe function to remove this idle callback
|
|
1992
|
-
* @deprecated Use demand mode with invalidate() instead
|
|
1993
|
-
*/
|
|
1994
|
-
onIdle(callback) {
|
|
1995
|
-
this.idleCallbacks.add(callback);
|
|
1996
|
-
return () => this.idleCallbacks.delete(callback);
|
|
1997
|
-
}
|
|
1998
|
-
/**
|
|
1999
|
-
* Notify all registered idle callbacks.
|
|
2000
|
-
* Called when the loop stops in demand mode.
|
|
2001
|
-
* @param {number} timestamp - The RAF timestamp when idle occurred
|
|
2002
|
-
* @returns {void}
|
|
2003
|
-
* @private
|
|
2004
|
-
*/
|
|
2005
|
-
notifyIdle(timestamp) {
|
|
2006
|
-
for (const cb of this.idleCallbacks) {
|
|
2007
|
-
try {
|
|
2008
|
-
cb(timestamp);
|
|
2009
|
-
} catch (error) {
|
|
2010
|
-
console.error("[Scheduler] Error in idle callback:", error);
|
|
2011
|
-
}
|
|
2012
|
-
}
|
|
2013
|
-
}
|
|
2014
|
-
//* Job Registration & Management Methods ================================
|
|
2015
|
-
/**
|
|
2016
|
-
* Register a job (frame callback) with a specific root.
|
|
2017
|
-
* This is the core registration method used by useFrame internally.
|
|
2018
|
-
* @param {FrameNextCallback} callback - The function to call each frame
|
|
2019
|
-
* @param {JobOptions & { rootId?: string; system?: boolean }} [options] - Job configuration
|
|
2020
|
-
* @param {string} [options.rootId] - Target root ID (defaults to first registered root)
|
|
2021
|
-
* @param {string} [options.id] - Unique job ID (auto-generated if not provided)
|
|
2022
|
-
* @param {string} [options.phase] - Execution phase (defaults to 'update')
|
|
2023
|
-
* @param {number} [options.priority] - Priority within phase (higher = earlier, default 0)
|
|
2024
|
-
* @param {number} [options.fps] - FPS throttle limit
|
|
2025
|
-
* @param {boolean} [options.drop] - Drop frames when behind (default true)
|
|
2026
|
-
* @param {boolean} [options.enabled] - Whether job is active (default true)
|
|
2027
|
-
* @param {boolean} [options.system] - Internal flag for system jobs (not user-facing)
|
|
2028
|
-
* @returns {() => void} Unsubscribe function to remove this job
|
|
2029
|
-
*/
|
|
2030
|
-
register(callback, options = {}) {
|
|
2031
|
-
const rootId = options.rootId;
|
|
2032
|
-
const root = rootId ? this.roots.get(rootId) : this.roots.values().next().value;
|
|
2033
|
-
if (!root) {
|
|
2034
|
-
console.warn("[Scheduler] No root registered. Is this inside a Canvas?");
|
|
2035
|
-
return () => {
|
|
2036
|
-
};
|
|
2037
|
-
}
|
|
2038
|
-
const id = options.id ?? this.generateJobId();
|
|
2039
|
-
let phase = options.phase ?? "update";
|
|
2040
|
-
if (!options.phase && (options.before || options.after)) {
|
|
2041
|
-
phase = this.phaseGraph.resolveConstraintPhase(options.before, options.after);
|
|
2042
|
-
}
|
|
2043
|
-
const before = this.normalizeConstraints(options.before);
|
|
2044
|
-
const after = this.normalizeConstraints(options.after);
|
|
2045
|
-
const job = {
|
|
2046
|
-
id,
|
|
2047
|
-
callback,
|
|
2048
|
-
phase,
|
|
2049
|
-
before,
|
|
2050
|
-
after,
|
|
2051
|
-
priority: options.priority ?? 0,
|
|
2052
|
-
index: this.nextJobIndex++,
|
|
2053
|
-
fps: options.fps,
|
|
2054
|
-
drop: options.drop ?? true,
|
|
2055
|
-
enabled: options.enabled ?? true,
|
|
2056
|
-
system: options.system ?? false
|
|
2057
|
-
};
|
|
2058
|
-
if (root.jobs.has(id)) {
|
|
2059
|
-
console.warn(`[useFrame] Job with id "${id}" already exists, replacing`);
|
|
2060
|
-
}
|
|
2061
|
-
root.jobs.set(id, job);
|
|
2062
|
-
root.needsRebuild = true;
|
|
2063
|
-
return () => this.unregister(id, root.id);
|
|
2064
|
-
}
|
|
2065
|
-
/**
|
|
2066
|
-
* Unregister a job by its ID.
|
|
2067
|
-
* Searches all roots if rootId is not provided.
|
|
2068
|
-
* @param {string} id - The job ID to unregister
|
|
2069
|
-
* @param {string} [rootId] - Optional root ID to search (searches all if not provided)
|
|
2070
|
-
* @returns {void}
|
|
2071
|
-
*/
|
|
2072
|
-
unregister(id, rootId) {
|
|
2073
|
-
const root = rootId ? this.roots.get(rootId) : Array.from(this.roots.values()).find((r) => r.jobs.has(id));
|
|
2074
|
-
if (root?.jobs.delete(id)) {
|
|
2075
|
-
root.needsRebuild = true;
|
|
2076
|
-
this.jobStateListeners.delete(id);
|
|
2077
|
-
}
|
|
2078
|
-
}
|
|
2079
|
-
/**
|
|
2080
|
-
* Update a job's options dynamically.
|
|
2081
|
-
* Searches all roots to find the job by ID.
|
|
2082
|
-
* Phase/constraint changes trigger a rebuild of the sorted job list.
|
|
2083
|
-
* @param {string} id - The job ID to update
|
|
2084
|
-
* @param {Partial<JobOptions>} options - The options to update
|
|
2085
|
-
* @returns {void}
|
|
2086
|
-
*/
|
|
2087
|
-
updateJob(id, options) {
|
|
2088
|
-
let job;
|
|
2089
|
-
let root;
|
|
2090
|
-
for (const r of this.roots.values()) {
|
|
2091
|
-
job = r.jobs.get(id);
|
|
2092
|
-
if (job) {
|
|
2093
|
-
root = r;
|
|
2094
|
-
break;
|
|
2095
|
-
}
|
|
2096
|
-
}
|
|
2097
|
-
if (!job || !root) return;
|
|
2098
|
-
if (options.priority !== void 0) job.priority = options.priority;
|
|
2099
|
-
if (options.fps !== void 0) job.fps = options.fps;
|
|
2100
|
-
if (options.drop !== void 0) job.drop = options.drop;
|
|
2101
|
-
if (options.enabled !== void 0) {
|
|
2102
|
-
const wasEnabled = job.enabled;
|
|
2103
|
-
job.enabled = options.enabled;
|
|
2104
|
-
if (!wasEnabled && job.enabled) resetJobTiming(job);
|
|
2105
|
-
if (wasEnabled !== job.enabled) root.needsRebuild = true;
|
|
2106
|
-
}
|
|
2107
|
-
if (options.phase !== void 0 || options.before !== void 0 || options.after !== void 0) {
|
|
2108
|
-
if (options.phase) job.phase = options.phase;
|
|
2109
|
-
if (options.before !== void 0) job.before = this.normalizeConstraints(options.before);
|
|
2110
|
-
if (options.after !== void 0) job.after = this.normalizeConstraints(options.after);
|
|
2111
|
-
root.needsRebuild = true;
|
|
2112
|
-
}
|
|
2113
|
-
}
|
|
2114
|
-
//* Job State Management Methods ================================
|
|
2115
|
-
/**
|
|
2116
|
-
* Check if a job is currently paused (disabled).
|
|
2117
|
-
* @param {string} id - The job ID to check
|
|
2118
|
-
* @returns {boolean} True if the job exists and is paused
|
|
2119
|
-
*/
|
|
2120
|
-
isJobPaused(id) {
|
|
2121
|
-
for (const root of this.roots.values()) {
|
|
2122
|
-
const job = root.jobs.get(id);
|
|
2123
|
-
if (job) return !job.enabled;
|
|
2124
|
-
}
|
|
2125
|
-
return false;
|
|
2126
|
-
}
|
|
2127
|
-
/**
|
|
2128
|
-
* Subscribe to state changes for a specific job.
|
|
2129
|
-
* Listener is called when job is paused or resumed.
|
|
2130
|
-
* @param {string} id - The job ID to subscribe to
|
|
2131
|
-
* @param {() => void} listener - Callback invoked on state changes
|
|
2132
|
-
* @returns {() => void} Unsubscribe function
|
|
2133
|
-
*/
|
|
2134
|
-
subscribeJobState(id, listener) {
|
|
2135
|
-
if (!this.jobStateListeners.has(id)) {
|
|
2136
|
-
this.jobStateListeners.set(id, /* @__PURE__ */ new Set());
|
|
2137
|
-
}
|
|
2138
|
-
this.jobStateListeners.get(id).add(listener);
|
|
2139
|
-
return () => {
|
|
2140
|
-
this.jobStateListeners.get(id)?.delete(listener);
|
|
2141
|
-
if (this.jobStateListeners.get(id)?.size === 0) {
|
|
2142
|
-
this.jobStateListeners.delete(id);
|
|
2143
|
-
}
|
|
2144
|
-
};
|
|
2145
|
-
}
|
|
2146
|
-
/**
|
|
2147
|
-
* Notify all listeners that a job's state has changed.
|
|
2148
|
-
* @param {string} id - The job ID that changed
|
|
2149
|
-
* @returns {void}
|
|
2150
|
-
* @private
|
|
2151
|
-
*/
|
|
2152
|
-
notifyJobStateChange(id) {
|
|
2153
|
-
this.jobStateListeners.get(id)?.forEach((listener) => listener());
|
|
2154
|
-
}
|
|
2155
|
-
/**
|
|
2156
|
-
* Pause a job by ID (sets enabled=false).
|
|
2157
|
-
* Notifies any subscribed state listeners.
|
|
2158
|
-
* @param {string} id - The job ID to pause
|
|
2159
|
-
* @returns {void}
|
|
2160
|
-
*/
|
|
2161
|
-
pauseJob(id) {
|
|
2162
|
-
this.updateJob(id, { enabled: false });
|
|
2163
|
-
this.notifyJobStateChange(id);
|
|
2164
|
-
}
|
|
2165
|
-
/**
|
|
2166
|
-
* Resume a paused job by ID (sets enabled=true).
|
|
2167
|
-
* Resets job timing to prevent frame accumulation.
|
|
2168
|
-
* Notifies any subscribed state listeners.
|
|
2169
|
-
* @param {string} id - The job ID to resume
|
|
2170
|
-
* @returns {void}
|
|
2171
|
-
*/
|
|
2172
|
-
resumeJob(id) {
|
|
2173
|
-
this.updateJob(id, { enabled: true });
|
|
2174
|
-
this.notifyJobStateChange(id);
|
|
2175
|
-
}
|
|
2176
|
-
//* Frame Loop Control Methods ================================
|
|
2177
|
-
/**
|
|
2178
|
-
* Start the requestAnimationFrame loop.
|
|
2179
|
-
* Resets timing state (elapsedTime, frameCount) on start.
|
|
2180
|
-
* No-op if already running.
|
|
2181
|
-
* @returns {void}
|
|
2182
|
-
*/
|
|
2183
|
-
start() {
|
|
2184
|
-
if (this.loopState.running) return;
|
|
2185
|
-
const { elapsedTime, createdAt } = this.loopState;
|
|
2186
|
-
let adjustedCreated = 0;
|
|
2187
|
-
if (this.stoppedTime > 0) {
|
|
2188
|
-
adjustedCreated = createdAt - (performance.now() - this.stoppedTime);
|
|
2189
|
-
this.stoppedTime = 0;
|
|
2190
|
-
}
|
|
2191
|
-
Object.assign(this.loopState, {
|
|
2192
|
-
running: true,
|
|
2193
|
-
elapsedTime: elapsedTime ?? 0,
|
|
2194
|
-
lastTime: performance.now(),
|
|
2195
|
-
createdAt: adjustedCreated > 0 ? adjustedCreated : performance.now(),
|
|
2196
|
-
frameCount: 0,
|
|
2197
|
-
rafHandle: requestAnimationFrame(this.loop)
|
|
2198
|
-
});
|
|
2199
|
-
}
|
|
2200
|
-
/**
|
|
2201
|
-
* Stop the requestAnimationFrame loop.
|
|
2202
|
-
* Cancels any pending RAF callback.
|
|
2203
|
-
* No-op if not running.
|
|
2204
|
-
* @returns {void}
|
|
2205
|
-
*/
|
|
2206
|
-
stop() {
|
|
2207
|
-
if (!this.loopState.running) return;
|
|
2208
|
-
this.loopState.running = false;
|
|
2209
|
-
if (this.loopState.rafHandle !== null) {
|
|
2210
|
-
cancelAnimationFrame(this.loopState.rafHandle);
|
|
2211
|
-
this.loopState.rafHandle = null;
|
|
2212
|
-
}
|
|
2213
|
-
this.stoppedTime = performance.now();
|
|
2214
|
-
}
|
|
2215
|
-
/**
|
|
2216
|
-
* Request frames to be rendered in demand mode.
|
|
2217
|
-
* Accumulates pending frames (capped at 60) and starts the loop if not running.
|
|
2218
|
-
* No-op if frameloop is not 'demand'.
|
|
2219
|
-
* @param {number} [frames=1] - Number of frames to request
|
|
2220
|
-
* @param {boolean} [stackFrames=false] - Whether to add frames to existing pending count
|
|
2221
|
-
* - `false` (default): Sets pending frames to the specified value (replaces existing count)
|
|
2222
|
-
* - `true`: Adds frames to existing pending count (useful for accumulating invalidations)
|
|
2223
|
-
* @returns {void}
|
|
2224
|
-
* @example
|
|
2225
|
-
* // Request a single frame render
|
|
2226
|
-
* scheduler.invalidate();
|
|
2227
|
-
*
|
|
2228
|
-
* @example
|
|
2229
|
-
* // Request 5 frames (e.g., for animations)
|
|
2230
|
-
* scheduler.invalidate(5);
|
|
2231
|
-
*
|
|
2232
|
-
* @example
|
|
2233
|
-
* // Set pending frames to exactly 3 (don't stack with existing)
|
|
2234
|
-
* scheduler.invalidate(3, false);
|
|
2235
|
-
*
|
|
2236
|
-
* @example
|
|
2237
|
-
* // Add 2 more frames to existing pending count
|
|
2238
|
-
* scheduler.invalidate(2, true);
|
|
2239
|
-
*/
|
|
2240
|
-
invalidate(frames = 1, stackFrames = false) {
|
|
2241
|
-
if (this._frameloop !== "demand") return;
|
|
2242
|
-
const baseFrames = stackFrames ? this.pendingFrames : 0;
|
|
2243
|
-
this.pendingFrames = Math.min(60, baseFrames + frames);
|
|
2244
|
-
if (!this.loopState.running && this.pendingFrames > 0) this.start();
|
|
2245
|
-
}
|
|
2246
|
-
/**
|
|
2247
|
-
* Reset timing state for deterministic testing.
|
|
2248
|
-
* Preserves jobs and roots but resets lastTime, frameCount, elapsedTime, etc.
|
|
2249
|
-
* @returns {void}
|
|
2250
|
-
*/
|
|
2251
|
-
resetTiming() {
|
|
2252
|
-
this.loopState.lastTime = null;
|
|
2253
|
-
this.loopState.frameCount = 0;
|
|
2254
|
-
this.loopState.elapsedTime = 0;
|
|
2255
|
-
this.loopState.createdAt = performance.now();
|
|
2256
|
-
}
|
|
2257
|
-
//* Manual Stepping Methods ================================
|
|
2258
|
-
/**
|
|
2259
|
-
* Manually execute a single frame for all roots.
|
|
2260
|
-
* Useful for frameloop='never' mode or testing scenarios.
|
|
2261
|
-
* @param {number} [timestamp] - Optional timestamp (defaults to performance.now())
|
|
2262
|
-
* @returns {void}
|
|
2263
|
-
* @example
|
|
2264
|
-
* // Manual control mode
|
|
2265
|
-
* scheduler.frameloop = 'never';
|
|
2266
|
-
* scheduler.step(); // Execute one frame
|
|
2267
|
-
*/
|
|
2268
|
-
step(timestamp) {
|
|
2269
|
-
const now = timestamp ?? performance.now();
|
|
2270
|
-
this.executeFrame(now);
|
|
2271
|
-
}
|
|
2272
|
-
/**
|
|
2273
|
-
* Manually execute a single job by its ID.
|
|
2274
|
-
* Useful for testing individual job callbacks in isolation.
|
|
2275
|
-
* @param {string} id - The job ID to step
|
|
2276
|
-
* @param {number} [timestamp] - Optional timestamp (defaults to performance.now())
|
|
2277
|
-
* @returns {void}
|
|
2278
|
-
*/
|
|
2279
|
-
stepJob(id, timestamp) {
|
|
2280
|
-
let job;
|
|
2281
|
-
let root;
|
|
2282
|
-
for (const r of this.roots.values()) {
|
|
2283
|
-
job = r.jobs.get(id);
|
|
2284
|
-
if (job) {
|
|
2285
|
-
root = r;
|
|
2286
|
-
break;
|
|
2287
|
-
}
|
|
2288
|
-
}
|
|
2289
|
-
if (!job || !root) {
|
|
2290
|
-
console.warn(`[Scheduler] Job "${id}" not found`);
|
|
2291
|
-
return;
|
|
2292
|
-
}
|
|
2293
|
-
const now = timestamp ?? performance.now();
|
|
2294
|
-
const deltaMs = this.loopState.lastTime !== null ? now - this.loopState.lastTime : 0;
|
|
2295
|
-
const delta = deltaMs / 1e3;
|
|
2296
|
-
const elapsed = now - this.loopState.createdAt;
|
|
2297
|
-
const providedState = root.getState?.() ?? {};
|
|
2298
|
-
const frameState = {
|
|
2299
|
-
...providedState,
|
|
2300
|
-
time: now,
|
|
2301
|
-
delta,
|
|
2302
|
-
elapsed,
|
|
2303
|
-
frame: this.loopState.frameCount
|
|
2304
|
-
};
|
|
2305
|
-
try {
|
|
2306
|
-
job.callback(frameState, delta);
|
|
2307
|
-
} catch (error) {
|
|
2308
|
-
console.error(`[Scheduler] Error in job "${job.id}":`, error);
|
|
2309
|
-
this.triggerError(error instanceof Error ? error : new Error(String(error)));
|
|
2310
|
-
}
|
|
2311
|
-
}
|
|
2312
|
-
/**
|
|
2313
|
-
* Execute a single frame across all roots.
|
|
2314
|
-
* Order: globalBefore → each root's jobs → globalAfter
|
|
2315
|
-
* @param {number} timestamp - RAF timestamp in milliseconds
|
|
2316
|
-
* @returns {void}
|
|
2317
|
-
* @private
|
|
2318
|
-
*/
|
|
2319
|
-
executeFrame(timestamp) {
|
|
2320
|
-
const deltaMs = this.loopState.lastTime !== null ? timestamp - this.loopState.lastTime : 0;
|
|
2321
|
-
const delta = deltaMs / 1e3;
|
|
2322
|
-
this.loopState.lastTime = timestamp;
|
|
2323
|
-
this.loopState.frameCount++;
|
|
2324
|
-
this.loopState.elapsedTime += deltaMs;
|
|
2325
|
-
this.runGlobalJobs(this.globalBeforeJobs, timestamp);
|
|
2326
|
-
for (const root of this.roots.values()) {
|
|
2327
|
-
this.tickRoot(root, timestamp, delta);
|
|
2328
|
-
}
|
|
2329
|
-
this.runGlobalJobs(this.globalAfterJobs, timestamp);
|
|
2330
|
-
}
|
|
2331
|
-
/**
|
|
2332
|
-
* Run all global jobs from a job map.
|
|
2333
|
-
* Catches and logs errors without stopping execution.
|
|
2334
|
-
* @param {Map<string, GlobalJob>} jobs - The global jobs map to execute
|
|
2335
|
-
* @param {number} timestamp - RAF timestamp in milliseconds
|
|
2336
|
-
* @returns {void}
|
|
2337
|
-
* @private
|
|
2338
|
-
*/
|
|
2339
|
-
runGlobalJobs(jobs, timestamp) {
|
|
2340
|
-
for (const job of jobs.values()) {
|
|
2341
|
-
try {
|
|
2342
|
-
job.callback(timestamp);
|
|
2343
|
-
} catch (error) {
|
|
2344
|
-
console.error(`[Scheduler] Error in global job "${job.id}":`, error);
|
|
2345
|
-
}
|
|
2346
|
-
}
|
|
2347
|
-
}
|
|
2348
|
-
/**
|
|
2349
|
-
* Execute all jobs for a single root in sorted order.
|
|
2350
|
-
* Rebuilds sorted job list if needed, then dispatches each job.
|
|
2351
|
-
* Errors are caught and propagated via triggerError.
|
|
2352
|
-
* @param {RootEntry} root - The root entry to tick
|
|
2353
|
-
* @param {number} timestamp - RAF timestamp in milliseconds
|
|
2354
|
-
* @param {number} delta - Time since last frame in seconds
|
|
2355
|
-
* @returns {void}
|
|
2356
|
-
* @private
|
|
2357
|
-
*/
|
|
2358
|
-
tickRoot(root, timestamp, delta) {
|
|
2359
|
-
if (root.needsRebuild) {
|
|
2360
|
-
root.sortedJobs = rebuildSortedJobs(root.jobs, this.phaseGraph);
|
|
2361
|
-
root.needsRebuild = false;
|
|
2362
|
-
}
|
|
2363
|
-
const providedState = root.getState?.() ?? {};
|
|
2364
|
-
const frameState = {
|
|
2365
|
-
...providedState,
|
|
2366
|
-
time: timestamp,
|
|
2367
|
-
delta,
|
|
2368
|
-
elapsed: this.loopState.elapsedTime / 1e3,
|
|
2369
|
-
// Convert ms to seconds
|
|
2370
|
-
frame: this.loopState.frameCount
|
|
2371
|
-
};
|
|
2372
|
-
for (const job of root.sortedJobs) {
|
|
2373
|
-
if (!shouldRun(job, timestamp)) continue;
|
|
2374
|
-
try {
|
|
2375
|
-
job.callback(frameState, delta);
|
|
2376
|
-
} catch (error) {
|
|
2377
|
-
console.error(`[Scheduler] Error in job "${job.id}":`, error);
|
|
2378
|
-
this.triggerError(error instanceof Error ? error : new Error(String(error)));
|
|
2379
|
-
}
|
|
2380
|
-
}
|
|
2381
|
-
}
|
|
2382
|
-
//* Debug & Inspection Methods ================================
|
|
2383
|
-
/**
|
|
2384
|
-
* Get the total number of registered jobs across all roots.
|
|
2385
|
-
* Includes both per-root jobs and global before/after jobs.
|
|
2386
|
-
* @returns {number} Total job count
|
|
2387
|
-
*/
|
|
2388
|
-
getJobCount() {
|
|
2389
|
-
let count = 0;
|
|
2390
|
-
for (const root of this.roots.values()) {
|
|
2391
|
-
count += root.jobs.size;
|
|
2392
|
-
}
|
|
2393
|
-
return count + this.globalBeforeJobs.size + this.globalAfterJobs.size;
|
|
2394
|
-
}
|
|
2395
|
-
/**
|
|
2396
|
-
* Get all registered job IDs across all roots.
|
|
2397
|
-
* Includes both per-root jobs and global before/after jobs.
|
|
2398
|
-
* @returns {string[]} Array of all job IDs
|
|
2399
|
-
*/
|
|
2400
|
-
getJobIds() {
|
|
2401
|
-
const ids = [];
|
|
2402
|
-
for (const root of this.roots.values()) {
|
|
2403
|
-
ids.push(...root.jobs.keys());
|
|
2404
|
-
}
|
|
2405
|
-
ids.push(...this.globalBeforeJobs.keys());
|
|
2406
|
-
ids.push(...this.globalAfterJobs.keys());
|
|
2407
|
-
return ids;
|
|
2408
|
-
}
|
|
2409
|
-
/**
|
|
2410
|
-
* Get the number of registered roots (Canvas instances).
|
|
2411
|
-
* @returns {number} Number of registered roots
|
|
2412
|
-
*/
|
|
2413
|
-
getRootCount() {
|
|
2414
|
-
return this.roots.size;
|
|
2415
|
-
}
|
|
2416
|
-
/**
|
|
2417
|
-
* Check if any user (non-system) jobs are registered in a specific phase.
|
|
2418
|
-
* Used by the default render job to know if a user has taken over rendering.
|
|
2419
|
-
*
|
|
2420
|
-
* @param phase The phase to check
|
|
2421
|
-
* @param rootId Optional root ID to check (checks all roots if not provided)
|
|
2422
|
-
* @returns true if any user jobs exist in the phase
|
|
2423
|
-
*/
|
|
2424
|
-
hasUserJobsInPhase(phase, rootId) {
|
|
2425
|
-
const rootsToCheck = rootId ? [this.roots.get(rootId)].filter(Boolean) : Array.from(this.roots.values());
|
|
2426
|
-
return rootsToCheck.some((root) => {
|
|
2427
|
-
if (!root) return false;
|
|
2428
|
-
for (const job of root.jobs.values()) {
|
|
2429
|
-
if (job.phase === phase && !job.system && job.enabled) return true;
|
|
2430
|
-
}
|
|
2431
|
-
return false;
|
|
2432
|
-
});
|
|
2433
|
-
}
|
|
2434
|
-
//* Utility Methods ================================
|
|
2435
|
-
/**
|
|
2436
|
-
* Generate a unique root ID for automatic root registration.
|
|
2437
|
-
* @returns {string} A unique root ID in the format 'root_N'
|
|
2438
|
-
*/
|
|
2439
|
-
generateRootId() {
|
|
2440
|
-
return `root_${this.nextRootIndex++}`;
|
|
2441
|
-
}
|
|
2442
|
-
/**
|
|
2443
|
-
* Generate a unique job ID.
|
|
2444
|
-
* @returns {string} A unique job ID in the format 'job_N'
|
|
2445
|
-
* @private
|
|
2446
|
-
*/
|
|
2447
|
-
generateJobId() {
|
|
2448
|
-
return `job_${this.nextJobIndex}`;
|
|
2449
|
-
}
|
|
2450
|
-
/**
|
|
2451
|
-
* Normalize before/after constraints to a Set.
|
|
2452
|
-
* Handles undefined, single string, or array inputs.
|
|
2453
|
-
* @param {string | string[] | undefined} value - The constraint value(s)
|
|
2454
|
-
* @returns {Set<string>} Normalized Set of constraint strings
|
|
2455
|
-
* @private
|
|
2456
|
-
*/
|
|
2457
|
-
normalizeConstraints(value) {
|
|
2458
|
-
if (!value) return /* @__PURE__ */ new Set();
|
|
2459
|
-
if (Array.isArray(value)) return new Set(value);
|
|
2460
|
-
return /* @__PURE__ */ new Set([value]);
|
|
2461
|
-
}
|
|
2462
|
-
};
|
|
2463
|
-
//* Static State & Methods (Singleton Usage) ================================
|
|
2464
|
-
//* Cross-Bundle Singleton Key ==============================
|
|
2465
|
-
// Use Symbol.for() to ensure scheduler is shared across bundle boundaries
|
|
2466
|
-
// This prevents issues when mixing imports from @react-three/fiber and @react-three/fiber/webgpu
|
|
2467
|
-
__publicField(_Scheduler, "INSTANCE_KEY", Symbol.for("@react-three/fiber.scheduler"));
|
|
2468
|
-
let Scheduler = _Scheduler;
|
|
2469
|
-
const getScheduler = () => Scheduler.get();
|
|
2470
|
-
if (hmrData) {
|
|
2471
|
-
hmrData.accept?.();
|
|
1670
|
+
const INTERNAL_LIB_MARKERS = ["zustand", "setState", "Object.assign"];
|
|
1671
|
+
function isInternalRendererAccess(stack, callerDepth = 2) {
|
|
1672
|
+
if (!stack) return false;
|
|
1673
|
+
const caller = stack.split("\n")[callerDepth] ?? "";
|
|
1674
|
+
return INTERNAL_LIB_MARKERS.some((m) => caller.includes(m));
|
|
2472
1675
|
}
|
|
2473
1676
|
|
|
2474
1677
|
const R3F_CONTEXT = Symbol.for("@react-three/fiber.context");
|
|
@@ -2508,7 +1711,14 @@ const createStore = (invalidate, advance) => {
|
|
|
2508
1711
|
frustum: new Frustum(),
|
|
2509
1712
|
autoUpdateFrustum: true,
|
|
2510
1713
|
raycaster: null,
|
|
2511
|
-
events: {
|
|
1714
|
+
events: {
|
|
1715
|
+
priority: 1,
|
|
1716
|
+
enabled: true,
|
|
1717
|
+
connected: false,
|
|
1718
|
+
frameTimedRaycasts: true,
|
|
1719
|
+
alwaysFireOnScroll: true,
|
|
1720
|
+
updateOnFrame: false
|
|
1721
|
+
},
|
|
2512
1722
|
scene: null,
|
|
2513
1723
|
rootScene: null,
|
|
2514
1724
|
xr: null,
|
|
@@ -2596,14 +1806,18 @@ const createStore = (invalidate, advance) => {
|
|
|
2596
1806
|
}),
|
|
2597
1807
|
setFrameloop: (frameloop = "always") => {
|
|
2598
1808
|
set(() => ({ frameloop }));
|
|
1809
|
+
getScheduler().frameloop = frameloop;
|
|
2599
1810
|
},
|
|
2600
1811
|
setError: (error) => set(() => ({ error })),
|
|
2601
1812
|
error: null,
|
|
2602
|
-
//* TSL State (managed via hooks: useUniforms, useNodes, useTextures,
|
|
1813
|
+
//* TSL State (managed via hooks: useUniforms, useNodes, useBuffers, useGPUStorage, useTextures, useRenderPipeline) ==============================
|
|
2603
1814
|
uniforms: {},
|
|
2604
1815
|
nodes: {},
|
|
1816
|
+
buffers: {},
|
|
1817
|
+
gpuStorage: {},
|
|
2605
1818
|
textures: /* @__PURE__ */ new Map(),
|
|
2606
|
-
|
|
1819
|
+
_textureRefs: /* @__PURE__ */ new Map(),
|
|
1820
|
+
renderPipeline: null,
|
|
2607
1821
|
passes: {},
|
|
2608
1822
|
_hmrVersion: 0,
|
|
2609
1823
|
_sizeImperative: false,
|
|
@@ -2612,12 +1826,16 @@ const createStore = (invalidate, advance) => {
|
|
|
2612
1826
|
internal: {
|
|
2613
1827
|
// Events
|
|
2614
1828
|
interaction: [],
|
|
2615
|
-
hovered: /* @__PURE__ */ new Map(),
|
|
2616
1829
|
subscribers: [],
|
|
1830
|
+
// Per-pointer state (new unified structure)
|
|
1831
|
+
pointerMap: /* @__PURE__ */ new Map(),
|
|
1832
|
+
pointerDirty: /* @__PURE__ */ new Map(),
|
|
1833
|
+
lastEvent: React.createRef(),
|
|
1834
|
+
// Deprecated but kept for backwards compatibility
|
|
1835
|
+
hovered: /* @__PURE__ */ new Map(),
|
|
2617
1836
|
initialClick: [0, 0],
|
|
2618
1837
|
initialHits: [],
|
|
2619
1838
|
capturedMap: /* @__PURE__ */ new Map(),
|
|
2620
|
-
lastEvent: React.createRef(),
|
|
2621
1839
|
// Visibility tracking (onFramed, onOccluded, onVisible)
|
|
2622
1840
|
visibilityRegistry: /* @__PURE__ */ new Map(),
|
|
2623
1841
|
// Occlusion system (WebGPU only)
|
|
@@ -2656,8 +1874,7 @@ const createStore = (invalidate, advance) => {
|
|
|
2656
1874
|
const currentState = rootStore.getState();
|
|
2657
1875
|
if (!currentState.isLegacy && currentState.internal.actualRenderer) {
|
|
2658
1876
|
const stack = new Error().stack || "";
|
|
2659
|
-
|
|
2660
|
-
if (!isInternalAccess) {
|
|
1877
|
+
if (!isInternalRendererAccess(stack)) {
|
|
2661
1878
|
const cleanedStack = stack.split("\n").slice(2).join("\n") || "Stack trace unavailable";
|
|
2662
1879
|
notifyDepreciated({
|
|
2663
1880
|
heading: "Accessing state.gl in WebGPU mode",
|
|
@@ -2705,14 +1922,16 @@ const createStore = (invalidate, advance) => {
|
|
|
2705
1922
|
oldSize = size;
|
|
2706
1923
|
oldDpr = viewport.dpr;
|
|
2707
1924
|
updateCamera(camera, size);
|
|
2708
|
-
if (canvasTarget) {
|
|
1925
|
+
if (internal.isSecondary && canvasTarget) {
|
|
2709
1926
|
if (viewport.dpr > 0) canvasTarget.setPixelRatio(viewport.dpr);
|
|
2710
|
-
|
|
2711
|
-
canvasTarget.setSize(size.width, size.height, updateStyle);
|
|
1927
|
+
canvasTarget.setSize(size.width, size.height, false);
|
|
2712
1928
|
} else {
|
|
2713
1929
|
if (viewport.dpr > 0) actualRenderer.setPixelRatio(viewport.dpr);
|
|
2714
|
-
|
|
2715
|
-
|
|
1930
|
+
actualRenderer.setSize(size.width, size.height, false);
|
|
1931
|
+
if (canvasTarget) {
|
|
1932
|
+
if (viewport.dpr > 0) canvasTarget.setPixelRatio(viewport.dpr);
|
|
1933
|
+
canvasTarget.setSize(size.width, size.height, false);
|
|
1934
|
+
}
|
|
2716
1935
|
}
|
|
2717
1936
|
}
|
|
2718
1937
|
if (camera !== oldCamera) {
|
|
@@ -2768,19 +1987,25 @@ function loadingFn(extensions, onProgress) {
|
|
|
2768
1987
|
);
|
|
2769
1988
|
};
|
|
2770
1989
|
}
|
|
2771
|
-
function useLoader(loader, input, extensions, onProgress) {
|
|
2772
|
-
const
|
|
1990
|
+
function useLoader(loader, input, extensions, onProgress, cacheKey) {
|
|
1991
|
+
const inputs = Array.isArray(input) ? input : [input];
|
|
1992
|
+
const cacheKeys = Array.isArray(cacheKey ?? input) ? cacheKey ?? input : [cacheKey ?? input];
|
|
2773
1993
|
const fn = loadingFn(extensions, onProgress);
|
|
2774
|
-
const results =
|
|
1994
|
+
const results = cacheKeys.map(
|
|
1995
|
+
(key, index) => suspend(() => fn(loader, inputs[index]), [loader, key], { equal: is.equ })
|
|
1996
|
+
);
|
|
2775
1997
|
return Array.isArray(input) ? results : results[0];
|
|
2776
1998
|
}
|
|
2777
|
-
useLoader.preload = function(loader, input, extensions, onProgress) {
|
|
2778
|
-
const
|
|
2779
|
-
|
|
1999
|
+
useLoader.preload = function(loader, input, extensions, onProgress, cacheKey) {
|
|
2000
|
+
const inputs = Array.isArray(input) ? input : [input];
|
|
2001
|
+
const cacheKeys = Array.isArray(cacheKey ?? input) ? cacheKey ?? input : [cacheKey ?? input];
|
|
2002
|
+
cacheKeys.forEach(
|
|
2003
|
+
(key, index) => preload(() => loadingFn(extensions, onProgress)(loader, inputs[index]), [loader, key])
|
|
2004
|
+
);
|
|
2780
2005
|
};
|
|
2781
|
-
useLoader.clear = function(loader, input) {
|
|
2782
|
-
const
|
|
2783
|
-
|
|
2006
|
+
useLoader.clear = function(loader, input, cacheKey) {
|
|
2007
|
+
const cacheKeys = Array.isArray(cacheKey ?? input) ? cacheKey ?? input : [cacheKey ?? input];
|
|
2008
|
+
cacheKeys.forEach((key) => clear([loader, key]));
|
|
2784
2009
|
};
|
|
2785
2010
|
useLoader.loader = getLoader;
|
|
2786
2011
|
|
|
@@ -2856,20 +2081,14 @@ function useFrame(callback, priorityOrOptions) {
|
|
|
2856
2081
|
}
|
|
2857
2082
|
};
|
|
2858
2083
|
} else {
|
|
2859
|
-
|
|
2860
|
-
|
|
2861
|
-
|
|
2862
|
-
|
|
2863
|
-
|
|
2864
|
-
|
|
2865
|
-
|
|
2866
|
-
|
|
2867
|
-
unregisterJob = registerOutside();
|
|
2868
|
-
});
|
|
2869
|
-
return () => {
|
|
2870
|
-
unsubReady();
|
|
2871
|
-
unregisterJob?.();
|
|
2872
|
-
};
|
|
2084
|
+
return scheduler.register(
|
|
2085
|
+
(state, delta) => {
|
|
2086
|
+
const frameState = state;
|
|
2087
|
+
if (!frameState.renderer) return;
|
|
2088
|
+
callbackRef.current?.(frameState, delta);
|
|
2089
|
+
},
|
|
2090
|
+
{ id, ...options }
|
|
2091
|
+
);
|
|
2873
2092
|
}
|
|
2874
2093
|
}, [store, scheduler, id, optionsKey, isLegacyPriority, isInsideCanvas]);
|
|
2875
2094
|
const isPaused = React.useSyncExternalStore(
|
|
@@ -2960,18 +2179,18 @@ function buildFromCache(input, textureCache) {
|
|
|
2960
2179
|
function useTexture(input, optionsOrOnLoad) {
|
|
2961
2180
|
const renderer = useThree((state) => state.internal.actualRenderer);
|
|
2962
2181
|
const store = useStore();
|
|
2963
|
-
const textureCache = useThree((state) => state.textures);
|
|
2964
2182
|
const options = typeof optionsOrOnLoad === "function" ? { onLoad: optionsOrOnLoad } : optionsOrOnLoad ?? {};
|
|
2965
|
-
const { onLoad, cache =
|
|
2183
|
+
const { onLoad, cache = true } = options;
|
|
2966
2184
|
const onLoadRef = useRef(onLoad);
|
|
2967
2185
|
onLoadRef.current = onLoad;
|
|
2968
2186
|
const onLoadCalledForRef = useRef(null);
|
|
2969
2187
|
const urls = useMemo(() => getUrls(input), [input]);
|
|
2970
2188
|
const cachedResult = useMemo(() => {
|
|
2971
2189
|
if (!cache) return null;
|
|
2972
|
-
|
|
2973
|
-
|
|
2974
|
-
|
|
2190
|
+
const textures = store.getState().textures;
|
|
2191
|
+
if (!allUrlsCached(urls, textures)) return null;
|
|
2192
|
+
return buildFromCache(input, textures);
|
|
2193
|
+
}, [cache, urls, input, store]);
|
|
2975
2194
|
const loadedTextures = useLoader(
|
|
2976
2195
|
TextureLoader,
|
|
2977
2196
|
IsObject(input) ? Object.values(input) : input
|
|
@@ -3015,8 +2234,6 @@ function useTexture(input, optionsOrOnLoad) {
|
|
|
3015
2234
|
}, [input, loadedTextures, cachedResult]);
|
|
3016
2235
|
useEffect(() => {
|
|
3017
2236
|
if (!cache) return;
|
|
3018
|
-
if (cachedResult) return;
|
|
3019
|
-
const set = store.setState;
|
|
3020
2237
|
const urlTextureMap = [];
|
|
3021
2238
|
if (typeof input === "string") {
|
|
3022
2239
|
urlTextureMap.push([input, mappedTextures]);
|
|
@@ -3030,18 +2247,32 @@ function useTexture(input, optionsOrOnLoad) {
|
|
|
3030
2247
|
urlTextureMap.push([url, textureRecord[key]]);
|
|
3031
2248
|
}
|
|
3032
2249
|
}
|
|
3033
|
-
|
|
3034
|
-
const
|
|
3035
|
-
let
|
|
2250
|
+
store.setState((state) => {
|
|
2251
|
+
const refs = new Map(state._textureRefs);
|
|
2252
|
+
let textures = state.textures;
|
|
2253
|
+
let added = false;
|
|
3036
2254
|
for (const [url, texture] of urlTextureMap) {
|
|
3037
|
-
if (!
|
|
3038
|
-
|
|
3039
|
-
|
|
2255
|
+
if (!textures.has(url)) {
|
|
2256
|
+
if (!added) {
|
|
2257
|
+
textures = new Map(textures);
|
|
2258
|
+
added = true;
|
|
2259
|
+
}
|
|
2260
|
+
textures.set(url, texture);
|
|
3040
2261
|
}
|
|
2262
|
+
refs.set(url, (refs.get(url) ?? 0) + 1);
|
|
3041
2263
|
}
|
|
3042
|
-
return
|
|
2264
|
+
return added ? { textures, _textureRefs: refs } : { _textureRefs: refs };
|
|
2265
|
+
});
|
|
2266
|
+
return () => store.setState((state) => {
|
|
2267
|
+
const refs = new Map(state._textureRefs);
|
|
2268
|
+
for (const [url] of urlTextureMap) {
|
|
2269
|
+
const next = (refs.get(url) ?? 0) - 1;
|
|
2270
|
+
if (next <= 0) refs.delete(url);
|
|
2271
|
+
else refs.set(url, next);
|
|
2272
|
+
}
|
|
2273
|
+
return { _textureRefs: refs };
|
|
3043
2274
|
});
|
|
3044
|
-
}, [cache, input, mappedTextures, store
|
|
2275
|
+
}, [cache, input, mappedTextures, store]);
|
|
3045
2276
|
return mappedTextures;
|
|
3046
2277
|
}
|
|
3047
2278
|
useTexture.preload = (url) => useLoader.preload(TextureLoader, url);
|
|
@@ -3057,96 +2288,63 @@ const Texture = ({
|
|
|
3057
2288
|
return /* @__PURE__ */ jsx(Fragment, { children: children?.(ret) });
|
|
3058
2289
|
};
|
|
3059
2290
|
|
|
3060
|
-
function
|
|
3061
|
-
if (entry instanceof Texture$1) return entry;
|
|
3062
|
-
if (entry && typeof entry === "object" && "value" in entry && entry.value instanceof Texture$1) {
|
|
3063
|
-
return entry.value;
|
|
3064
|
-
}
|
|
3065
|
-
return null;
|
|
3066
|
-
}
|
|
3067
|
-
function useTextures() {
|
|
2291
|
+
function useTextures(selector) {
|
|
3068
2292
|
const store = useStore();
|
|
3069
|
-
|
|
3070
|
-
const set = store.setState;
|
|
2293
|
+
const registry = useMemo(() => {
|
|
3071
2294
|
const getState = store.getState;
|
|
3072
|
-
const
|
|
3073
|
-
|
|
3074
|
-
const newMap = new Map(state.textures);
|
|
3075
|
-
newMap.set(key, value);
|
|
3076
|
-
return { textures: newMap };
|
|
3077
|
-
});
|
|
3078
|
-
};
|
|
3079
|
-
const addMultiple = (items) => {
|
|
3080
|
-
set((state) => {
|
|
3081
|
-
const newMap = new Map(state.textures);
|
|
3082
|
-
const entries = items instanceof Map ? items.entries() : Object.entries(items);
|
|
3083
|
-
for (const [key, value] of entries) {
|
|
3084
|
-
newMap.set(key, value);
|
|
3085
|
-
}
|
|
3086
|
-
return { textures: newMap };
|
|
3087
|
-
});
|
|
3088
|
-
};
|
|
3089
|
-
const remove = (key) => {
|
|
3090
|
-
set((state) => {
|
|
3091
|
-
const newMap = new Map(state.textures);
|
|
3092
|
-
newMap.delete(key);
|
|
3093
|
-
return { textures: newMap };
|
|
3094
|
-
});
|
|
3095
|
-
};
|
|
3096
|
-
const removeMultiple = (keys) => {
|
|
3097
|
-
set((state) => {
|
|
3098
|
-
const newMap = new Map(state.textures);
|
|
3099
|
-
for (const key of keys) newMap.delete(key);
|
|
3100
|
-
return { textures: newMap };
|
|
3101
|
-
});
|
|
3102
|
-
};
|
|
3103
|
-
const dispose = (key) => {
|
|
3104
|
-
const entry = getState().textures.get(key);
|
|
3105
|
-
if (entry) {
|
|
3106
|
-
const tex = getTextureValue(entry);
|
|
3107
|
-
tex?.dispose();
|
|
3108
|
-
}
|
|
3109
|
-
remove(key);
|
|
3110
|
-
};
|
|
3111
|
-
const disposeMultiple = (keys) => {
|
|
3112
|
-
const textures = getState().textures;
|
|
3113
|
-
for (const key of keys) {
|
|
3114
|
-
const entry = textures.get(key);
|
|
3115
|
-
if (entry) {
|
|
3116
|
-
const tex = getTextureValue(entry);
|
|
3117
|
-
tex?.dispose();
|
|
3118
|
-
}
|
|
3119
|
-
}
|
|
3120
|
-
removeMultiple(keys);
|
|
3121
|
-
};
|
|
3122
|
-
const disposeAll = () => {
|
|
3123
|
-
const textures = getState().textures;
|
|
3124
|
-
for (const entry of textures.values()) {
|
|
3125
|
-
const tex = getTextureValue(entry);
|
|
3126
|
-
tex?.dispose();
|
|
3127
|
-
}
|
|
3128
|
-
set({ textures: /* @__PURE__ */ new Map() });
|
|
3129
|
-
};
|
|
2295
|
+
const setState = store.setState;
|
|
2296
|
+
const getOne = (key) => getState().textures.get(key);
|
|
3130
2297
|
return {
|
|
3131
|
-
|
|
3132
|
-
get textures() {
|
|
2298
|
+
get all() {
|
|
3133
2299
|
return getState().textures;
|
|
3134
2300
|
},
|
|
3135
|
-
|
|
3136
|
-
|
|
2301
|
+
get(input) {
|
|
2302
|
+
if (typeof input === "string") return getOne(input);
|
|
2303
|
+
if (Array.isArray(input)) return input.map(getOne);
|
|
2304
|
+
const out = {};
|
|
2305
|
+
for (const name in input) out[name] = getOne(input[name]);
|
|
2306
|
+
return out;
|
|
2307
|
+
},
|
|
3137
2308
|
has: (key) => getState().textures.has(key),
|
|
3138
|
-
|
|
3139
|
-
|
|
3140
|
-
|
|
3141
|
-
|
|
3142
|
-
|
|
3143
|
-
|
|
3144
|
-
|
|
3145
|
-
|
|
3146
|
-
|
|
3147
|
-
|
|
2309
|
+
add(keyOrRecord, texture) {
|
|
2310
|
+
setState((state) => {
|
|
2311
|
+
const textures = new Map(state.textures);
|
|
2312
|
+
if (typeof keyOrRecord === "string") {
|
|
2313
|
+
textures.set(keyOrRecord, texture);
|
|
2314
|
+
} else {
|
|
2315
|
+
for (const key in keyOrRecord) textures.set(key, keyOrRecord[key]);
|
|
2316
|
+
}
|
|
2317
|
+
return { textures };
|
|
2318
|
+
});
|
|
2319
|
+
},
|
|
2320
|
+
dispose(key, options) {
|
|
2321
|
+
const state = getState();
|
|
2322
|
+
const refs = state._textureRefs.get(key) ?? 0;
|
|
2323
|
+
if (refs > 0 && !options?.force) {
|
|
2324
|
+
console.warn(
|
|
2325
|
+
`[useTextures] "${key}" still has ${refs} active reference(s); skipping dispose. Pass { force: true } to override.`
|
|
2326
|
+
);
|
|
2327
|
+
return false;
|
|
2328
|
+
}
|
|
2329
|
+
state.textures.get(key)?.dispose();
|
|
2330
|
+
setState((s) => {
|
|
2331
|
+
const textures = new Map(s.textures);
|
|
2332
|
+
textures.delete(key);
|
|
2333
|
+
const nextRefs = new Map(s._textureRefs);
|
|
2334
|
+
nextRefs.delete(key);
|
|
2335
|
+
return { textures, _textureRefs: nextRefs };
|
|
2336
|
+
});
|
|
2337
|
+
return true;
|
|
2338
|
+
},
|
|
2339
|
+
disposeAll() {
|
|
2340
|
+
for (const texture of getState().textures.values()) texture.dispose();
|
|
2341
|
+
setState({ textures: /* @__PURE__ */ new Map(), _textureRefs: /* @__PURE__ */ new Map() });
|
|
2342
|
+
}
|
|
3148
2343
|
};
|
|
3149
2344
|
}, [store]);
|
|
2345
|
+
const subscribe = selector ? () => selector(registry) : (state) => state.textures;
|
|
2346
|
+
const selected = useThree(subscribe);
|
|
2347
|
+
return selector ? selected : registry;
|
|
3150
2348
|
}
|
|
3151
2349
|
|
|
3152
2350
|
function useRenderTarget(widthOrOptions, heightOrOptions, options) {
|
|
@@ -3227,7 +2425,7 @@ function advance(timestamp) {
|
|
|
3227
2425
|
getScheduler().step(timestamp);
|
|
3228
2426
|
}
|
|
3229
2427
|
|
|
3230
|
-
const version = "10.0.0-alpha.
|
|
2428
|
+
const version = "10.0.0-alpha.3";
|
|
3231
2429
|
const packageData = {
|
|
3232
2430
|
version: version};
|
|
3233
2431
|
|
|
@@ -14483,7 +13681,7 @@ function n0() {
|
|
|
14483
13681
|
var t0 = n0();
|
|
14484
13682
|
const r0 = Xb(t0);
|
|
14485
13683
|
|
|
14486
|
-
const t = 1, o = 8, r = 32, e = 2;
|
|
13684
|
+
const t = 1, o = 8, r = 32, e = 2, i$1 = 268435456;
|
|
14487
13685
|
|
|
14488
13686
|
function createReconciler(config) {
|
|
14489
13687
|
const reconciler2 = r0(config);
|
|
@@ -14648,7 +13846,15 @@ function setFiberRef(fiber, publicInstance) {
|
|
|
14648
13846
|
}
|
|
14649
13847
|
}
|
|
14650
13848
|
const reconstructed = [];
|
|
14651
|
-
function
|
|
13849
|
+
function flushReconstructedInstances() {
|
|
13850
|
+
if (reconstructed.length === 0) return;
|
|
13851
|
+
try {
|
|
13852
|
+
swapReconstructedInstances();
|
|
13853
|
+
} finally {
|
|
13854
|
+
reconstructed.length = 0;
|
|
13855
|
+
}
|
|
13856
|
+
}
|
|
13857
|
+
function swapReconstructedInstances() {
|
|
14652
13858
|
for (const [instance] of reconstructed) {
|
|
14653
13859
|
const parent = instance.parent;
|
|
14654
13860
|
if (parent) {
|
|
@@ -14666,6 +13872,7 @@ function swapInstances() {
|
|
|
14666
13872
|
}
|
|
14667
13873
|
}
|
|
14668
13874
|
if (instance.isHidden) unhideInstance(instance);
|
|
13875
|
+
if (isObject3D(instance.object)) removeInteractivity(findInitialRoot(instance), instance.object);
|
|
14669
13876
|
if (instance.object.__r3f) delete instance.object.__r3f;
|
|
14670
13877
|
if (instance.type !== "primitive") disposeOnIdle(instance.object);
|
|
14671
13878
|
}
|
|
@@ -14678,6 +13885,8 @@ function swapInstances() {
|
|
|
14678
13885
|
instance.object.__r3f = instance;
|
|
14679
13886
|
setFiberRef(fiber, instance.object);
|
|
14680
13887
|
delete instance.appliedOnce;
|
|
13888
|
+
instance.eventCount = 0;
|
|
13889
|
+
instance.handlers = {};
|
|
14681
13890
|
applyProps(instance.object, instance.props);
|
|
14682
13891
|
if (instance.props.attach) {
|
|
14683
13892
|
attach(parent, instance);
|
|
@@ -14694,14 +13903,114 @@ function swapInstances() {
|
|
|
14694
13903
|
invalidateInstance(instance);
|
|
14695
13904
|
}
|
|
14696
13905
|
}
|
|
14697
|
-
reconstructed.length = 0;
|
|
14698
13906
|
}
|
|
14699
13907
|
const handleTextInstance = () => {
|
|
14700
13908
|
};
|
|
14701
13909
|
const NO_CONTEXT = {};
|
|
14702
13910
|
let currentUpdatePriority = NoEventPriority;
|
|
14703
|
-
|
|
14704
|
-
|
|
13911
|
+
function getEventPriority(type) {
|
|
13912
|
+
switch (type) {
|
|
13913
|
+
case "beforetoggle":
|
|
13914
|
+
case "cancel":
|
|
13915
|
+
case "click":
|
|
13916
|
+
case "close":
|
|
13917
|
+
case "contextmenu":
|
|
13918
|
+
case "copy":
|
|
13919
|
+
case "cut":
|
|
13920
|
+
case "auxclick":
|
|
13921
|
+
case "dblclick":
|
|
13922
|
+
case "dragend":
|
|
13923
|
+
case "dragstart":
|
|
13924
|
+
case "drop":
|
|
13925
|
+
case "focusin":
|
|
13926
|
+
case "focusout":
|
|
13927
|
+
case "input":
|
|
13928
|
+
case "invalid":
|
|
13929
|
+
case "keydown":
|
|
13930
|
+
case "keypress":
|
|
13931
|
+
case "keyup":
|
|
13932
|
+
case "mousedown":
|
|
13933
|
+
case "mouseup":
|
|
13934
|
+
case "paste":
|
|
13935
|
+
case "pause":
|
|
13936
|
+
case "play":
|
|
13937
|
+
case "pointercancel":
|
|
13938
|
+
case "pointerdown":
|
|
13939
|
+
case "pointerup":
|
|
13940
|
+
case "ratechange":
|
|
13941
|
+
case "reset":
|
|
13942
|
+
case "resize":
|
|
13943
|
+
case "seeked":
|
|
13944
|
+
case "submit":
|
|
13945
|
+
case "touchcancel":
|
|
13946
|
+
case "touchend":
|
|
13947
|
+
case "touchstart":
|
|
13948
|
+
case "volumechange":
|
|
13949
|
+
case "change":
|
|
13950
|
+
case "selectionchange":
|
|
13951
|
+
case "compositionstart":
|
|
13952
|
+
case "compositionend":
|
|
13953
|
+
case "compositionupdate":
|
|
13954
|
+
case "beforeinput":
|
|
13955
|
+
case "blur":
|
|
13956
|
+
case "fullscreenchange":
|
|
13957
|
+
case "focus":
|
|
13958
|
+
case "hashchange":
|
|
13959
|
+
case "popstate":
|
|
13960
|
+
case "select":
|
|
13961
|
+
case "selectstart":
|
|
13962
|
+
return e;
|
|
13963
|
+
case "drag":
|
|
13964
|
+
case "dragenter":
|
|
13965
|
+
case "dragexit":
|
|
13966
|
+
case "dragleave":
|
|
13967
|
+
case "dragover":
|
|
13968
|
+
case "mousemove":
|
|
13969
|
+
case "mouseout":
|
|
13970
|
+
case "mouseover":
|
|
13971
|
+
case "pointermove":
|
|
13972
|
+
case "pointerout":
|
|
13973
|
+
case "pointerover":
|
|
13974
|
+
case "scroll":
|
|
13975
|
+
case "touchmove":
|
|
13976
|
+
case "wheel":
|
|
13977
|
+
case "mouseenter":
|
|
13978
|
+
case "mouseleave":
|
|
13979
|
+
case "pointerenter":
|
|
13980
|
+
case "pointerleave":
|
|
13981
|
+
return o;
|
|
13982
|
+
case "message": {
|
|
13983
|
+
switch (unstable_getCurrentPriorityLevel()) {
|
|
13984
|
+
case unstable_ImmediatePriority:
|
|
13985
|
+
return e;
|
|
13986
|
+
case unstable_UserBlockingPriority:
|
|
13987
|
+
return o;
|
|
13988
|
+
case unstable_NormalPriority:
|
|
13989
|
+
case unstable_LowPriority:
|
|
13990
|
+
return r;
|
|
13991
|
+
case unstable_IdlePriority:
|
|
13992
|
+
return i$1;
|
|
13993
|
+
default:
|
|
13994
|
+
return r;
|
|
13995
|
+
}
|
|
13996
|
+
}
|
|
13997
|
+
default:
|
|
13998
|
+
return r;
|
|
13999
|
+
}
|
|
14000
|
+
}
|
|
14001
|
+
function scheduleMicrotask(callback) {
|
|
14002
|
+
if (typeof queueMicrotask === "function") {
|
|
14003
|
+
queueMicrotask(callback);
|
|
14004
|
+
} else if (typeof Promise !== "undefined") {
|
|
14005
|
+
Promise.resolve().then(callback).catch((error) => {
|
|
14006
|
+
setTimeout(() => {
|
|
14007
|
+
throw error;
|
|
14008
|
+
});
|
|
14009
|
+
});
|
|
14010
|
+
} else {
|
|
14011
|
+
setTimeout(callback);
|
|
14012
|
+
}
|
|
14013
|
+
}
|
|
14705
14014
|
const reconciler = /* @__PURE__ */ createReconciler({
|
|
14706
14015
|
isPrimaryRenderer: false,
|
|
14707
14016
|
warnsIfNotActing: false,
|
|
@@ -14740,16 +14049,15 @@ const reconciler = /* @__PURE__ */ createReconciler({
|
|
|
14740
14049
|
else if (newProps.args?.length !== oldProps.args?.length) reconstruct = true;
|
|
14741
14050
|
else if (newProps.args?.some((value, index) => value !== oldProps.args?.[index])) reconstruct = true;
|
|
14742
14051
|
if (reconstruct) {
|
|
14743
|
-
reconstructed.push([instance,
|
|
14052
|
+
reconstructed.push([instance, getInstanceProps(newProps), fiber]);
|
|
14744
14053
|
} else {
|
|
14745
14054
|
const changedProps = diffProps(instance, newProps);
|
|
14746
|
-
|
|
14747
|
-
|
|
14748
|
-
|
|
14749
|
-
|
|
14055
|
+
const attach2 = instance.props.attach;
|
|
14056
|
+
instance.props = getInstanceProps(newProps);
|
|
14057
|
+
if (attach2 !== void 0) instance.props.attach = attach2;
|
|
14058
|
+
else delete instance.props.attach;
|
|
14059
|
+
if (Object.keys(changedProps).length) applyProps(instance.object, changedProps);
|
|
14750
14060
|
}
|
|
14751
|
-
const isTailSibling = fiber.sibling === null || (fiber.flags & Update) === NoFlags;
|
|
14752
|
-
if (isTailSibling) swapInstances();
|
|
14753
14061
|
},
|
|
14754
14062
|
finalizeInitialChildren: (instance) => {
|
|
14755
14063
|
for (const prop in instance.props) {
|
|
@@ -14774,8 +14082,9 @@ const reconciler = /* @__PURE__ */ createReconciler({
|
|
|
14774
14082
|
const target = container.getState().internal.container ?? container.getState().scene;
|
|
14775
14083
|
return prepare(target, container, "", {});
|
|
14776
14084
|
},
|
|
14777
|
-
|
|
14778
|
-
|
|
14085
|
+
// Reconstructed instances are swapped once all mutations are committed,
|
|
14086
|
+
// before layout effects run so refs point to the new objects
|
|
14087
|
+
resetAfterCommit: flushReconstructedInstances,
|
|
14779
14088
|
shouldSetTextContent: () => false,
|
|
14780
14089
|
clearContainer: () => false,
|
|
14781
14090
|
hideInstance,
|
|
@@ -14783,6 +14092,9 @@ const reconciler = /* @__PURE__ */ createReconciler({
|
|
|
14783
14092
|
createTextInstance: handleTextInstance,
|
|
14784
14093
|
hideTextInstance: handleTextInstance,
|
|
14785
14094
|
unhideTextInstance: handleTextInstance,
|
|
14095
|
+
// Mirrors react-dom, which flushes discrete work in microtasks
|
|
14096
|
+
supportsMicrotasks: true,
|
|
14097
|
+
scheduleMicrotask,
|
|
14786
14098
|
scheduleTimeout: typeof setTimeout === "function" ? setTimeout : void 0,
|
|
14787
14099
|
cancelTimeout: typeof clearTimeout === "function" ? clearTimeout : void 0,
|
|
14788
14100
|
noTimeout: -1,
|
|
@@ -14823,28 +14135,9 @@ const reconciler = /* @__PURE__ */ createReconciler({
|
|
|
14823
14135
|
},
|
|
14824
14136
|
resolveUpdatePriority() {
|
|
14825
14137
|
if (currentUpdatePriority !== NoEventPriority) return currentUpdatePriority;
|
|
14826
|
-
|
|
14827
|
-
|
|
14828
|
-
|
|
14829
|
-
case "dblclick":
|
|
14830
|
-
case "dragenter":
|
|
14831
|
-
case "dragleave":
|
|
14832
|
-
case "drop":
|
|
14833
|
-
case "pointercancel":
|
|
14834
|
-
case "pointerdown":
|
|
14835
|
-
case "pointerup":
|
|
14836
|
-
return e;
|
|
14837
|
-
case "dragover":
|
|
14838
|
-
case "pointermove":
|
|
14839
|
-
case "pointerout":
|
|
14840
|
-
case "pointerover":
|
|
14841
|
-
case "pointerenter":
|
|
14842
|
-
case "pointerleave":
|
|
14843
|
-
case "wheel":
|
|
14844
|
-
return o;
|
|
14845
|
-
default:
|
|
14846
|
-
return r;
|
|
14847
|
-
}
|
|
14138
|
+
const eventType = typeof window !== "undefined" ? window.event?.type : void 0;
|
|
14139
|
+
if (eventType === void 0) return r;
|
|
14140
|
+
return getEventPriority(eventType);
|
|
14848
14141
|
},
|
|
14849
14142
|
resetFormInstance() {
|
|
14850
14143
|
},
|
|
@@ -14893,11 +14186,15 @@ const reconciler = /* @__PURE__ */ createReconciler({
|
|
|
14893
14186
|
cloneMutableTextInstance(textInstance) {
|
|
14894
14187
|
return textInstance;
|
|
14895
14188
|
},
|
|
14189
|
+
// React 19.2 added these for root-level view transitions. They only run for hosts that opt into
|
|
14190
|
+
// view transitions by returning a container from cloneRootViewTransitionContainer; R3F renders
|
|
14191
|
+
// into a WebGL/WebGPU canvas, where cloning the root has no meaning, so we never opt in and
|
|
14192
|
+
// React never calls them. They stay as no-ops rather than throws: the host config is shared by
|
|
14193
|
+
// every root, and a throw here would turn a React-internal probe into a hard crash for users.
|
|
14194
|
+
// Guarded by a test asserting a full render + unmount never reaches them.
|
|
14896
14195
|
cloneRootViewTransitionContainer(_rootContainer) {
|
|
14897
|
-
throw new Error("Not implemented.");
|
|
14898
14196
|
},
|
|
14899
14197
|
removeRootViewTransitionClone(_rootContainer, _clone) {
|
|
14900
|
-
throw new Error("Not implemented.");
|
|
14901
14198
|
},
|
|
14902
14199
|
// https://github.com/facebook/react/pull/32465
|
|
14903
14200
|
createFragmentInstance: (_fiber) => null,
|
|
@@ -14982,6 +14279,7 @@ function createRoot(canvas) {
|
|
|
14982
14279
|
const lastConfiguredProps = {};
|
|
14983
14280
|
let configured = false;
|
|
14984
14281
|
let pending = null;
|
|
14282
|
+
let rendererSetup = null;
|
|
14985
14283
|
return {
|
|
14986
14284
|
async configure(props = {}) {
|
|
14987
14285
|
let resolve;
|
|
@@ -14997,7 +14295,6 @@ function createRoot(canvas) {
|
|
|
14997
14295
|
events,
|
|
14998
14296
|
onCreated: onCreatedCallback,
|
|
14999
14297
|
shadows = false,
|
|
15000
|
-
textureColorSpace = SRGBColorSpace,
|
|
15001
14298
|
orthographic = false,
|
|
15002
14299
|
frameloop = "always",
|
|
15003
14300
|
dpr = [1, 2],
|
|
@@ -15012,7 +14309,8 @@ function createRoot(canvas) {
|
|
|
15012
14309
|
_sizeProps,
|
|
15013
14310
|
forceEven
|
|
15014
14311
|
} = props;
|
|
15015
|
-
const
|
|
14312
|
+
const textureColorSpace = is.obj(glConfig) && !is.fun(glConfig) && !isRenderer(glConfig) && glConfig.textureColorSpace || is.obj(rendererConfig) && !is.fun(rendererConfig) && !isRenderer(rendererConfig) && rendererConfig.textureColorSpace || SRGBColorSpace;
|
|
14313
|
+
let state = store.getState();
|
|
15016
14314
|
const defaultGLProps = {
|
|
15017
14315
|
canvas,
|
|
15018
14316
|
powerPreference: "high-performance",
|
|
@@ -15040,9 +14338,21 @@ function createRoot(canvas) {
|
|
|
15040
14338
|
);
|
|
15041
14339
|
}
|
|
15042
14340
|
if (!state.internal.actualRenderer) {
|
|
15043
|
-
|
|
15044
|
-
|
|
15045
|
-
|
|
14341
|
+
if (!rendererSetup) {
|
|
14342
|
+
rendererSetup = (async () => {
|
|
14343
|
+
{
|
|
14344
|
+
renderer = await resolveRenderer(glConfig, defaultGLProps, WebGLRenderer);
|
|
14345
|
+
state.internal.actualRenderer = renderer;
|
|
14346
|
+
state.set({ isLegacy: true, gl: renderer, renderer, primaryStore: store });
|
|
14347
|
+
}
|
|
14348
|
+
})().catch((err) => {
|
|
14349
|
+
rendererSetup = null;
|
|
14350
|
+
throw err;
|
|
14351
|
+
});
|
|
14352
|
+
}
|
|
14353
|
+
await rendererSetup;
|
|
14354
|
+
state = store.getState();
|
|
14355
|
+
renderer = state.internal.actualRenderer;
|
|
15046
14356
|
}
|
|
15047
14357
|
let raycaster = state.raycaster;
|
|
15048
14358
|
if (!raycaster) state.set({ raycaster: raycaster = new Raycaster() });
|
|
@@ -15135,7 +14445,7 @@ function createRoot(canvas) {
|
|
|
15135
14445
|
lastConfiguredProps.performance = performance;
|
|
15136
14446
|
}
|
|
15137
14447
|
if (!state.xr) {
|
|
15138
|
-
const handleXRFrame = (timestamp,
|
|
14448
|
+
const handleXRFrame = (timestamp, _frame) => {
|
|
15139
14449
|
const state2 = store.getState();
|
|
15140
14450
|
if (state2.frameloop === "never") return;
|
|
15141
14451
|
advance(timestamp);
|
|
@@ -15171,15 +14481,22 @@ function createRoot(canvas) {
|
|
|
15171
14481
|
const oldType = renderer.shadowMap.type;
|
|
15172
14482
|
renderer.shadowMap.enabled = !!shadows;
|
|
15173
14483
|
if (is.boo(shadows)) {
|
|
15174
|
-
renderer.shadowMap.type =
|
|
14484
|
+
renderer.shadowMap.type = PCFShadowMap;
|
|
15175
14485
|
} else if (is.str(shadows)) {
|
|
14486
|
+
if (shadows === "soft") {
|
|
14487
|
+
notifyDepreciated({
|
|
14488
|
+
heading: 'shadows="soft" is deprecated',
|
|
14489
|
+
body: "Three has depreciated soft and improved basic PCFShadows, we converted for you.",
|
|
14490
|
+
link: "https://github.com/mrdoob/three.js/wiki/Migration-Guide?utm_source=chatgpt.com#181--182"
|
|
14491
|
+
});
|
|
14492
|
+
}
|
|
15176
14493
|
const types = {
|
|
15177
14494
|
basic: BasicShadowMap,
|
|
15178
14495
|
percentage: PCFShadowMap,
|
|
15179
|
-
soft:
|
|
14496
|
+
soft: PCFShadowMap,
|
|
15180
14497
|
variance: VSMShadowMap
|
|
15181
14498
|
};
|
|
15182
|
-
renderer.shadowMap.type = types[shadows] ??
|
|
14499
|
+
renderer.shadowMap.type = types[shadows] ?? PCFShadowMap;
|
|
15183
14500
|
} else if (is.obj(shadows)) {
|
|
15184
14501
|
Object.assign(renderer.shadowMap, shadows);
|
|
15185
14502
|
}
|
|
@@ -15195,13 +14512,24 @@ function createRoot(canvas) {
|
|
|
15195
14512
|
if (state.textureColorSpace !== textureColorSpace) state.set(() => ({ textureColorSpace }));
|
|
15196
14513
|
lastConfiguredProps.textureColorSpace = textureColorSpace;
|
|
15197
14514
|
}
|
|
14515
|
+
const r3fProps = ["textureColorSpace"];
|
|
14516
|
+
const constructorOnlyProps = ["samples", "antialias", "alpha", "canvas", "powerPreference"];
|
|
14517
|
+
const nonApplyProps = [...r3fProps, ...constructorOnlyProps];
|
|
15198
14518
|
if (glConfig && !is.fun(glConfig) && !isRenderer(glConfig) && !is.equ(glConfig, renderer, shallowLoose)) {
|
|
15199
|
-
|
|
14519
|
+
const glProps = {};
|
|
14520
|
+
for (const key in glConfig) {
|
|
14521
|
+
if (!nonApplyProps.includes(key)) glProps[key] = glConfig[key];
|
|
14522
|
+
}
|
|
14523
|
+
applyProps(renderer, glProps);
|
|
15200
14524
|
}
|
|
15201
14525
|
if (rendererConfig && !is.fun(rendererConfig) && !isRenderer(rendererConfig) && state.renderer) {
|
|
15202
14526
|
const currentRenderer = state.renderer;
|
|
15203
14527
|
if (!is.equ(rendererConfig, currentRenderer, shallowLoose)) {
|
|
15204
|
-
|
|
14528
|
+
const rendererProps = {};
|
|
14529
|
+
for (const key in rendererConfig) {
|
|
14530
|
+
if (!nonApplyProps.includes(key)) rendererProps[key] = rendererConfig[key];
|
|
14531
|
+
}
|
|
14532
|
+
applyProps(currentRenderer, rendererProps);
|
|
15205
14533
|
}
|
|
15206
14534
|
}
|
|
15207
14535
|
const scheduler = getScheduler();
|
|
@@ -15227,6 +14555,18 @@ function createRoot(canvas) {
|
|
|
15227
14555
|
system: true
|
|
15228
14556
|
}
|
|
15229
14557
|
);
|
|
14558
|
+
const unregisterEventsFlush = scheduler.register(
|
|
14559
|
+
() => {
|
|
14560
|
+
const state2 = store.getState();
|
|
14561
|
+
state2.events.flush?.();
|
|
14562
|
+
},
|
|
14563
|
+
{
|
|
14564
|
+
id: `${newRootId}_events`,
|
|
14565
|
+
rootId: newRootId,
|
|
14566
|
+
phase: "input",
|
|
14567
|
+
system: true
|
|
14568
|
+
}
|
|
14569
|
+
);
|
|
15230
14570
|
const unregisterFrustum = scheduler.register(
|
|
15231
14571
|
() => {
|
|
15232
14572
|
const state2 = store.getState();
|
|
@@ -15237,7 +14577,7 @@ function createRoot(canvas) {
|
|
|
15237
14577
|
{
|
|
15238
14578
|
id: `${newRootId}_frustum`,
|
|
15239
14579
|
rootId: newRootId,
|
|
15240
|
-
|
|
14580
|
+
before: "render",
|
|
15241
14581
|
system: true
|
|
15242
14582
|
}
|
|
15243
14583
|
);
|
|
@@ -15249,7 +14589,7 @@ function createRoot(canvas) {
|
|
|
15249
14589
|
{
|
|
15250
14590
|
id: `${newRootId}_visibility`,
|
|
15251
14591
|
rootId: newRootId,
|
|
15252
|
-
|
|
14592
|
+
before: "render",
|
|
15253
14593
|
system: true,
|
|
15254
14594
|
after: `${newRootId}_frustum`
|
|
15255
14595
|
}
|
|
@@ -15261,7 +14601,7 @@ function createRoot(canvas) {
|
|
|
15261
14601
|
const userHandlesRender = scheduler.hasUserJobsInPhase("render", newRootId);
|
|
15262
14602
|
if (userHandlesRender || state2.internal.priority) return;
|
|
15263
14603
|
try {
|
|
15264
|
-
if (state2.
|
|
14604
|
+
if (state2.renderPipeline?.render) state2.renderPipeline.render();
|
|
15265
14605
|
else if (renderer2?.render) renderer2.render(state2.scene, state2.camera);
|
|
15266
14606
|
} catch (error) {
|
|
15267
14607
|
state2.setError(error instanceof Error ? error : new Error(String(error)));
|
|
@@ -15286,6 +14626,7 @@ function createRoot(canvas) {
|
|
|
15286
14626
|
unregisterRoot: () => {
|
|
15287
14627
|
unregisterRoot();
|
|
15288
14628
|
unregisterCanvasTarget();
|
|
14629
|
+
unregisterEventsFlush();
|
|
15289
14630
|
unregisterFrustum();
|
|
15290
14631
|
unregisterVisibility();
|
|
15291
14632
|
unregisterRender();
|
|
@@ -15361,7 +14702,8 @@ function unmountComponentAtNode(canvas, callback) {
|
|
|
15361
14702
|
dispose(state.scene);
|
|
15362
14703
|
_roots.delete(canvas);
|
|
15363
14704
|
if (callback) callback(canvas);
|
|
15364
|
-
} catch {
|
|
14705
|
+
} catch (error) {
|
|
14706
|
+
console.warn("[R3F] Error while unmounting root; teardown may be incomplete:", error);
|
|
15365
14707
|
}
|
|
15366
14708
|
}, 500);
|
|
15367
14709
|
}
|
|
@@ -15424,6 +14766,7 @@ function PortalInner({ state = {}, children, container }) {
|
|
|
15424
14766
|
viewport = rootState.viewport.getCurrentViewport(camera, new Vector3(), resolvedSize);
|
|
15425
14767
|
if (camera !== rootState.camera) updateCamera(camera, resolvedSize);
|
|
15426
14768
|
}
|
|
14769
|
+
const set = injectState.set;
|
|
15427
14770
|
return {
|
|
15428
14771
|
// The intersect consists of the previous root state
|
|
15429
14772
|
...rootState,
|
|
@@ -15442,7 +14785,7 @@ function PortalInner({ state = {}, children, container }) {
|
|
|
15442
14785
|
size: resolvedSize,
|
|
15443
14786
|
viewport: { ...rootState.viewport, ...viewport },
|
|
15444
14787
|
// Layers are allowed to override events
|
|
15445
|
-
setEvents: (events2) =>
|
|
14788
|
+
setEvents: (events2) => set((state2) => ({ ...state2, events: { ...state2.events, ...events2 } })),
|
|
15446
14789
|
// Container for child attachment - the portalScene (injected or container itself)
|
|
15447
14790
|
internal: { ...rootState.internal, ...injectState.internal, container: portalScene }
|
|
15448
14791
|
};
|
|
@@ -15451,9 +14794,13 @@ function PortalInner({ state = {}, children, container }) {
|
|
|
15451
14794
|
const store = createWithEqualityFn((set, get) => ({ ...rest, set, get }));
|
|
15452
14795
|
const onMutate = (prev) => store.setState((state2) => inject.current(prev, state2));
|
|
15453
14796
|
onMutate(previousRoot.getState());
|
|
15454
|
-
previousRoot.subscribe(onMutate);
|
|
15455
14797
|
return store;
|
|
15456
14798
|
}, [previousRoot, container]);
|
|
14799
|
+
useIsomorphicLayoutEffect(() => {
|
|
14800
|
+
const onMutate = (prev) => usePortalStore.setState((state2) => inject.current(prev, state2));
|
|
14801
|
+
const unsubscribe = previousRoot.subscribe(onMutate);
|
|
14802
|
+
return unsubscribe;
|
|
14803
|
+
}, [previousRoot, usePortalStore]);
|
|
15457
14804
|
return (
|
|
15458
14805
|
// @ts-ignore, reconciler types are not maintained
|
|
15459
14806
|
/* @__PURE__ */ jsx(Fragment, { children: reconciler.createPortal(
|
|
@@ -15467,6 +14814,81 @@ function flushSync(fn) {
|
|
|
15467
14814
|
return reconciler.flushSyncFromReconciler(fn);
|
|
15468
14815
|
}
|
|
15469
14816
|
|
|
14817
|
+
function parseBackground(background) {
|
|
14818
|
+
if (!background) return null;
|
|
14819
|
+
if (typeof background === "object" && !background.isColor) {
|
|
14820
|
+
const { backgroundMap, envMap, files, preset, ...rest } = background;
|
|
14821
|
+
return {
|
|
14822
|
+
...rest,
|
|
14823
|
+
preset,
|
|
14824
|
+
files: envMap || files,
|
|
14825
|
+
backgroundFiles: backgroundMap,
|
|
14826
|
+
background: true
|
|
14827
|
+
};
|
|
14828
|
+
}
|
|
14829
|
+
if (typeof background === "number") {
|
|
14830
|
+
return { color: background, background: true };
|
|
14831
|
+
}
|
|
14832
|
+
if (typeof background === "string") {
|
|
14833
|
+
if (background in presetsObj) {
|
|
14834
|
+
return { preset: background, background: true };
|
|
14835
|
+
}
|
|
14836
|
+
if (/^(https?:\/\/|\/|\.\/|\.\.\/)|\.(hdr|exr|jpg|jpeg|png|webp|gif)$/i.test(background)) {
|
|
14837
|
+
return { files: background, background: true };
|
|
14838
|
+
}
|
|
14839
|
+
return { color: background, background: true };
|
|
14840
|
+
}
|
|
14841
|
+
if (background.isColor) {
|
|
14842
|
+
return { color: background, background: true };
|
|
14843
|
+
}
|
|
14844
|
+
return null;
|
|
14845
|
+
}
|
|
14846
|
+
|
|
14847
|
+
function parseRendererConfig(rendererProp) {
|
|
14848
|
+
const isRendererConfig = typeof rendererProp === "object" && rendererProp !== null && !("render" in rendererProp) && ("primaryCanvas" in rendererProp || "scheduler" in rendererProp);
|
|
14849
|
+
if (isRendererConfig) {
|
|
14850
|
+
const { primaryCanvas: pc, scheduler: sc, ...rest } = rendererProp;
|
|
14851
|
+
return {
|
|
14852
|
+
primaryCanvas: pc,
|
|
14853
|
+
scheduler: sc,
|
|
14854
|
+
renderer: Object.keys(rest).length > 0 ? rest : rendererProp
|
|
14855
|
+
};
|
|
14856
|
+
}
|
|
14857
|
+
return { primaryCanvas: void 0, scheduler: void 0, renderer: rendererProp };
|
|
14858
|
+
}
|
|
14859
|
+
|
|
14860
|
+
const RESOURCE_KINDS = ["nodes", "uniforms", "buffers", "gpuStorage"];
|
|
14861
|
+
const registries = /* @__PURE__ */ new WeakMap();
|
|
14862
|
+
function getKindRegistry(store, kind) {
|
|
14863
|
+
let registry = registries.get(store);
|
|
14864
|
+
if (!registry) {
|
|
14865
|
+
registry = {
|
|
14866
|
+
nodes: { valid: /* @__PURE__ */ new Set(), staged: /* @__PURE__ */ new Map() },
|
|
14867
|
+
uniforms: { valid: /* @__PURE__ */ new Set(), staged: /* @__PURE__ */ new Map() },
|
|
14868
|
+
buffers: { valid: /* @__PURE__ */ new Set(), staged: /* @__PURE__ */ new Map() },
|
|
14869
|
+
gpuStorage: { valid: /* @__PURE__ */ new Set(), staged: /* @__PURE__ */ new Map() }
|
|
14870
|
+
};
|
|
14871
|
+
registries.set(store, registry);
|
|
14872
|
+
}
|
|
14873
|
+
return registry[kind];
|
|
14874
|
+
}
|
|
14875
|
+
function invalidateResource(store, kind, scopeKey) {
|
|
14876
|
+
const registry = getKindRegistry(store, kind);
|
|
14877
|
+
{
|
|
14878
|
+
registry.valid.clear();
|
|
14879
|
+
registry.staged.clear();
|
|
14880
|
+
}
|
|
14881
|
+
}
|
|
14882
|
+
function invalidateAllResources(store) {
|
|
14883
|
+
for (const kind of RESOURCE_KINDS) invalidateResource(store, kind);
|
|
14884
|
+
}
|
|
14885
|
+
|
|
14886
|
+
function clearHmrCaches(store) {
|
|
14887
|
+
const primary = store.getState().primaryStore ?? store;
|
|
14888
|
+
invalidateAllResources(primary);
|
|
14889
|
+
primary.setState((state) => ({ _hmrVersion: state._hmrVersion + 1 }));
|
|
14890
|
+
}
|
|
14891
|
+
|
|
15470
14892
|
function CanvasImpl({
|
|
15471
14893
|
ref,
|
|
15472
14894
|
children,
|
|
@@ -15487,6 +14909,8 @@ function CanvasImpl({
|
|
|
15487
14909
|
raycaster,
|
|
15488
14910
|
camera,
|
|
15489
14911
|
scene,
|
|
14912
|
+
autoUpdateFrustum,
|
|
14913
|
+
occlusion,
|
|
15490
14914
|
onPointerMissed,
|
|
15491
14915
|
onDragOverMissed,
|
|
15492
14916
|
onDropMissed,
|
|
@@ -15498,39 +14922,10 @@ function CanvasImpl({
|
|
|
15498
14922
|
forceEven,
|
|
15499
14923
|
...props
|
|
15500
14924
|
}) {
|
|
15501
|
-
const { primaryCanvas, scheduler,
|
|
15502
|
-
const renderer = Object.keys(rendererConfig).length > 0 ? rendererConfig : rendererProp;
|
|
14925
|
+
const { primaryCanvas, scheduler, renderer } = parseRendererConfig(rendererProp);
|
|
15503
14926
|
React.useMemo(() => extend(THREE), []);
|
|
15504
14927
|
const Bridge = useBridge();
|
|
15505
|
-
const backgroundProps = React.useMemo(() =>
|
|
15506
|
-
if (!background) return null;
|
|
15507
|
-
if (typeof background === "object" && !background.isColor) {
|
|
15508
|
-
const { backgroundMap, envMap, files, preset, ...rest } = background;
|
|
15509
|
-
return {
|
|
15510
|
-
...rest,
|
|
15511
|
-
preset,
|
|
15512
|
-
files: envMap || files,
|
|
15513
|
-
backgroundFiles: backgroundMap,
|
|
15514
|
-
background: true
|
|
15515
|
-
};
|
|
15516
|
-
}
|
|
15517
|
-
if (typeof background === "number") {
|
|
15518
|
-
return { color: background, background: true };
|
|
15519
|
-
}
|
|
15520
|
-
if (typeof background === "string") {
|
|
15521
|
-
if (background in presetsObj) {
|
|
15522
|
-
return { preset: background, background: true };
|
|
15523
|
-
}
|
|
15524
|
-
if (/^(https?:\/\/|\/|\.\/|\.\.\/)|\\.(hdr|exr|jpg|jpeg|png|webp|gif)$/i.test(background)) {
|
|
15525
|
-
return { files: background, background: true };
|
|
15526
|
-
}
|
|
15527
|
-
return { color: background, background: true };
|
|
15528
|
-
}
|
|
15529
|
-
if (background.isColor) {
|
|
15530
|
-
return { color: background, background: true };
|
|
15531
|
-
}
|
|
15532
|
-
return null;
|
|
15533
|
-
}, [background]);
|
|
14928
|
+
const backgroundProps = React.useMemo(() => parseBackground(background), [background]);
|
|
15534
14929
|
const hasInitialSizeRef = React.useRef(false);
|
|
15535
14930
|
const measureConfig = React.useMemo(() => {
|
|
15536
14931
|
if (!hasInitialSizeRef.current) {
|
|
@@ -15572,6 +14967,7 @@ function CanvasImpl({
|
|
|
15572
14967
|
const handleDropMissed = useMutableCallback(onDropMissed);
|
|
15573
14968
|
const [block, setBlock] = React.useState(false);
|
|
15574
14969
|
const [error, setError] = React.useState(false);
|
|
14970
|
+
const [fallbackVisible, setFallbackVisible] = React.useState(false);
|
|
15575
14971
|
if (block) throw block;
|
|
15576
14972
|
if (error) throw error;
|
|
15577
14973
|
const root = React.useRef(null);
|
|
@@ -15579,6 +14975,7 @@ function CanvasImpl({
|
|
|
15579
14975
|
const unsubscribeErrorRef = React.useRef(null);
|
|
15580
14976
|
useIsomorphicLayoutEffect(() => {
|
|
15581
14977
|
effectActiveRef.current = true;
|
|
14978
|
+
if (fallbackVisible) return;
|
|
15582
14979
|
const canvas = canvasRef.current;
|
|
15583
14980
|
if (effectiveSize.width > 0 && effectiveSize.height > 0 && canvas) {
|
|
15584
14981
|
if (!root.current) {
|
|
@@ -15599,7 +14996,7 @@ function CanvasImpl({
|
|
|
15599
14996
|
}
|
|
15600
14997
|
async function run() {
|
|
15601
14998
|
if (!effectActiveRef.current || !root.current) return;
|
|
15602
|
-
await root.current.configure({
|
|
14999
|
+
const configured = await root.current.configure({
|
|
15603
15000
|
id,
|
|
15604
15001
|
primaryCanvas,
|
|
15605
15002
|
scheduler,
|
|
@@ -15614,6 +15011,8 @@ function CanvasImpl({
|
|
|
15614
15011
|
performance,
|
|
15615
15012
|
raycaster,
|
|
15616
15013
|
camera,
|
|
15014
|
+
autoUpdateFrustum,
|
|
15015
|
+
occlusion,
|
|
15617
15016
|
size: effectiveSize,
|
|
15618
15017
|
// Store size props for reset functionality
|
|
15619
15018
|
_sizeProps: width !== void 0 || height !== void 0 ? { width, height } : null,
|
|
@@ -15638,8 +15037,20 @@ function CanvasImpl({
|
|
|
15638
15037
|
}
|
|
15639
15038
|
onCreated?.(state);
|
|
15640
15039
|
}
|
|
15641
|
-
})
|
|
15642
|
-
|
|
15040
|
+
}).then(
|
|
15041
|
+
() => true,
|
|
15042
|
+
// Renderer setup failed (e.g. no WebGL/WebGPU support). The `fallback` prop lives
|
|
15043
|
+
// inside <canvas>, which browsers don't display, so surface it as visible DOM
|
|
15044
|
+
// instead; with no fallback, rethrow to an external error boundary. (#3757)
|
|
15045
|
+
(setupError) => {
|
|
15046
|
+
if (effectActiveRef.current) {
|
|
15047
|
+
if (fallback != null) setFallbackVisible(true);
|
|
15048
|
+
else setError(setupError);
|
|
15049
|
+
}
|
|
15050
|
+
return false;
|
|
15051
|
+
}
|
|
15052
|
+
);
|
|
15053
|
+
if (!configured || !effectActiveRef.current || !root.current) return;
|
|
15643
15054
|
root.current.render(
|
|
15644
15055
|
/* @__PURE__ */ jsx(Bridge, { children: /* @__PURE__ */ jsx(ErrorBoundary, { set: setError, children: /* @__PURE__ */ jsxs(React.Suspense, { fallback: /* @__PURE__ */ jsx(Block, { set: setBlock }), children: [
|
|
15645
15056
|
backgroundProps && /* @__PURE__ */ jsx(Environment, { ...backgroundProps }),
|
|
@@ -15673,20 +15084,13 @@ function CanvasImpl({
|
|
|
15673
15084
|
const handleHMR = () => {
|
|
15674
15085
|
queueMicrotask(() => {
|
|
15675
15086
|
const rootEntry = _roots.get(canvas);
|
|
15676
|
-
if (rootEntry?.store)
|
|
15677
|
-
rootEntry.store.setState((state) => ({
|
|
15678
|
-
nodes: {},
|
|
15679
|
-
uniforms: {},
|
|
15680
|
-
_hmrVersion: state._hmrVersion + 1
|
|
15681
|
-
}));
|
|
15682
|
-
}
|
|
15087
|
+
if (rootEntry?.store) clearHmrCaches(rootEntry.store);
|
|
15683
15088
|
});
|
|
15684
15089
|
};
|
|
15685
15090
|
if (typeof import.meta !== "undefined" && import.meta.hot) {
|
|
15686
15091
|
const hot = import.meta.hot;
|
|
15687
15092
|
hot.on("vite:afterUpdate", handleHMR);
|
|
15688
|
-
return () => hot.
|
|
15689
|
-
});
|
|
15093
|
+
return () => hot.off?.("vite:afterUpdate", handleHMR);
|
|
15690
15094
|
}
|
|
15691
15095
|
if (typeof module !== "undefined" && module.hot) {
|
|
15692
15096
|
const hot = module.hot;
|
|
@@ -15709,7 +15113,20 @@ function CanvasImpl({
|
|
|
15709
15113
|
...style
|
|
15710
15114
|
},
|
|
15711
15115
|
...props,
|
|
15712
|
-
children:
|
|
15116
|
+
children: fallbackVisible ? (
|
|
15117
|
+
// Renderer setup failed: render the fallback as visible DOM. Inside <canvas> (below)
|
|
15118
|
+
// it exists in the tree but browsers never paint it, which is the whole bug (#3757).
|
|
15119
|
+
fallback
|
|
15120
|
+
) : /* @__PURE__ */ jsx("div", { ref: containerRef, className: "r3f-canvas-container", style: { width: "100%", height: "100%" }, children: /* @__PURE__ */ jsx(
|
|
15121
|
+
"canvas",
|
|
15122
|
+
{
|
|
15123
|
+
ref: canvasRef,
|
|
15124
|
+
id,
|
|
15125
|
+
className: "r3f-canvas",
|
|
15126
|
+
style: { display: "block", width: "100%", height: "100%" },
|
|
15127
|
+
children: fallback
|
|
15128
|
+
}
|
|
15129
|
+
) })
|
|
15713
15130
|
}
|
|
15714
15131
|
);
|
|
15715
15132
|
}
|
|
@@ -15719,4 +15136,4 @@ function Canvas(props) {
|
|
|
15719
15136
|
|
|
15720
15137
|
extend(THREE);
|
|
15721
15138
|
|
|
15722
|
-
export { Block, Canvas, Environment, EnvironmentCube, EnvironmentMap, EnvironmentPortal, ErrorBoundary, FROM_REF, IsObject, ONCE, Portal, R3F_BUILD_LEGACY, R3F_BUILD_WEBGPU, REACT_INTERNAL_PROPS, RESERVED_PROPS,
|
|
15139
|
+
export { Block, Canvas, Environment, EnvironmentCube, EnvironmentMap, EnvironmentPortal, ErrorBoundary, FROM_REF, IsObject, ONCE, Portal, R3F_BUILD_LEGACY, R3F_BUILD_WEBGPU, REACT_INTERNAL_PROPS, RESERVED_PROPS, Texture, _roots, addAfterEffect, addEffect, addTail, advance, applyProps, attach, buildGraph, calculateDpr, context, createEvents, createPointerEvents, createPortal, createRoot, createStore, detach, diffProps, dispose, createPointerEvents as events, extend, findInitialRoot, flushSync, fromRef, getInstanceProps, getPrimary, getPrimaryIds, getRootState, getUuidPrefix, hasConstructor, hasPrimary, invalidate, invalidateInstance, is, isColorRepresentation, isCopyable, isFromRef, isObject3D, isOnce, isOrthographicCamera, isRef, isRenderer, isTexture, isVectorLike, once, prepare, presetsObj, reconciler, registerPrimary, removeInteractivity, resolve, unmountComponentAtNode, unregisterPrimary, updateCamera, updateFrustum, useBridge, useEnvironment, useFrame, useGraph, useInstanceHandle, useIsomorphicLayoutEffect, useLoader, useMutableCallback, useRenderTarget, useStore, useTexture, useTextures, useThree, waitForPrimary };
|