@react-three/fiber 10.0.0-canary.b0fafc8 → 10.0.0-canary.c49d4cb
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 +692 -1383
- package/dist/index.d.cts +291 -806
- package/dist/index.d.mts +291 -806
- package/dist/index.d.ts +291 -806
- package/dist/index.mjs +667 -1357
- package/dist/legacy.cjs +647 -1344
- package/dist/legacy.d.cts +292 -806
- package/dist/legacy.d.mts +292 -806
- package/dist/legacy.d.ts +292 -806
- package/dist/legacy.mjs +621 -1317
- package/dist/webgpu/index.cjs +1101 -1409
- package/dist/webgpu/index.d.cts +393 -818
- package/dist/webgpu/index.d.mts +393 -818
- package/dist/webgpu/index.d.ts +393 -818
- package/dist/webgpu/index.mjs +1070 -1381
- 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';
|
|
@@ -13,6 +13,8 @@ import { UltraHDRLoader } from 'three/examples/jsm/loaders/UltraHDRLoader.js';
|
|
|
13
13
|
import { GainMapLoader } from '@monogrid/gainmap-js';
|
|
14
14
|
import Tb, { unstable_scheduleCallback, unstable_IdlePriority } from 'scheduler';
|
|
15
15
|
import { createWithEqualityFn } from 'zustand/traditional';
|
|
16
|
+
import { getScheduler } from '@pmndrs/scheduler';
|
|
17
|
+
export { Scheduler, getScheduler } from '@pmndrs/scheduler';
|
|
16
18
|
import { suspend, preload, clear } from 'suspend-react';
|
|
17
19
|
|
|
18
20
|
function _mergeNamespaces(n, m) {
|
|
@@ -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,9 +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
|
|
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);
|
|
425
446
|
const act = React["act"];
|
|
426
447
|
const useIsomorphicLayoutEffect = /* @__PURE__ */ (() => typeof window !== "undefined" && (window.document?.createElement || window.navigator?.product === "ReactNative"))() ? React.useLayoutEffect : React.useEffect;
|
|
427
448
|
function useMutableCallback(fn) {
|
|
@@ -453,7 +474,7 @@ const ErrorBoundary = /* @__PURE__ */ (() => {
|
|
|
453
474
|
return _a = class extends React.Component {
|
|
454
475
|
constructor() {
|
|
455
476
|
super(...arguments);
|
|
456
|
-
__publicField
|
|
477
|
+
__publicField(this, "state", { error: false });
|
|
457
478
|
}
|
|
458
479
|
componentDidCatch(err) {
|
|
459
480
|
this.props.set(err);
|
|
@@ -461,7 +482,7 @@ const ErrorBoundary = /* @__PURE__ */ (() => {
|
|
|
461
482
|
render() {
|
|
462
483
|
return this.state.error ? null : this.props.children;
|
|
463
484
|
}
|
|
464
|
-
}, __publicField
|
|
485
|
+
}, __publicField(_a, "getDerivedStateFromError", () => ({ error: true })), _a;
|
|
465
486
|
})();
|
|
466
487
|
|
|
467
488
|
const is = {
|
|
@@ -598,8 +619,7 @@ function prepare(target, root, type, props) {
|
|
|
598
619
|
object,
|
|
599
620
|
eventCount: 0,
|
|
600
621
|
handlers: {},
|
|
601
|
-
isHidden: false
|
|
602
|
-
deferredRefs: []
|
|
622
|
+
isHidden: false
|
|
603
623
|
};
|
|
604
624
|
if (object) object.__r3f = instance;
|
|
605
625
|
}
|
|
@@ -756,6 +776,17 @@ function unregisterVisibility(store, object) {
|
|
|
756
776
|
internal.visibilityRegistry.delete(object.uuid);
|
|
757
777
|
internal.occlusionCache.delete(object);
|
|
758
778
|
}
|
|
779
|
+
function updateVisibilityHandlers(store, object, handlers) {
|
|
780
|
+
const { internal } = store.getState();
|
|
781
|
+
const entry = internal.visibilityRegistry.get(object.uuid);
|
|
782
|
+
if (!entry) return false;
|
|
783
|
+
entry.handlers = handlers;
|
|
784
|
+
if ((handlers.onOccluded || handlers.onVisible) && !internal.occlusionEnabled) {
|
|
785
|
+
object.occlusionTest = true;
|
|
786
|
+
enableOcclusion(store);
|
|
787
|
+
}
|
|
788
|
+
return true;
|
|
789
|
+
}
|
|
759
790
|
function checkVisibility(state) {
|
|
760
791
|
const { internal, camera } = state;
|
|
761
792
|
const registry = internal.visibilityRegistry;
|
|
@@ -943,10 +974,7 @@ function applyProps(object, props) {
|
|
|
943
974
|
continue;
|
|
944
975
|
}
|
|
945
976
|
if (value === void 0) continue;
|
|
946
|
-
if (isFromRef(value))
|
|
947
|
-
instance?.deferredRefs?.push({ prop, ref: value[FROM_REF] });
|
|
948
|
-
continue;
|
|
949
|
-
}
|
|
977
|
+
if (isFromRef(value)) continue;
|
|
950
978
|
if (isOnce(value)) {
|
|
951
979
|
if (instance?.appliedOnce?.has(prop)) continue;
|
|
952
980
|
if (instance) {
|
|
@@ -982,8 +1010,24 @@ function applyProps(object, props) {
|
|
|
982
1010
|
} else if (isVectorLike(target) && is.num(value)) {
|
|
983
1011
|
if ("setScalar" in target && typeof target.setScalar === "function") target.setScalar(value);
|
|
984
1012
|
else target.set(value);
|
|
1013
|
+
} else if (root instanceof ShaderMaterial && key === "uniforms" && is.obj(value)) {
|
|
1014
|
+
if (!is.obj(root.uniforms)) root.uniforms = {};
|
|
1015
|
+
const uniforms = root.uniforms;
|
|
1016
|
+
const nextUniforms = value;
|
|
1017
|
+
for (const name in nextUniforms) {
|
|
1018
|
+
const uniform = nextUniforms[name];
|
|
1019
|
+
const targetUniform = uniforms[name];
|
|
1020
|
+
if (targetUniform) Object.assign(targetUniform, uniform);
|
|
1021
|
+
else {
|
|
1022
|
+
const nextUniform = uniform instanceof Uniform ? uniform.clone() : new Uniform(uniform.value);
|
|
1023
|
+
uniforms[name] = nextUniform;
|
|
1024
|
+
}
|
|
1025
|
+
}
|
|
985
1026
|
} else {
|
|
986
1027
|
root[key] = value;
|
|
1028
|
+
if (key.endsWith("Node") && root.isMaterial) {
|
|
1029
|
+
root.needsUpdate = true;
|
|
1030
|
+
}
|
|
987
1031
|
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
1032
|
root[key].format === RGBAFormat && root[key].type === UnsignedByteType) {
|
|
989
1033
|
root[key].colorSpace = rootState.textureColorSpace;
|
|
@@ -997,6 +1041,9 @@ function applyProps(object, props) {
|
|
|
997
1041
|
if (instance.eventCount && object2.raycast !== null) {
|
|
998
1042
|
rootState.internal.interaction.push(object2);
|
|
999
1043
|
}
|
|
1044
|
+
}
|
|
1045
|
+
if (instance?.parent && rootState?.internal && instance.object?.isObject3D) {
|
|
1046
|
+
const object2 = instance.object;
|
|
1000
1047
|
const root = findInitialRoot(instance);
|
|
1001
1048
|
const visibilityHandlers = {
|
|
1002
1049
|
onFramed: instance.handlers.onFramed,
|
|
@@ -1004,7 +1051,9 @@ function applyProps(object, props) {
|
|
|
1004
1051
|
onVisible: instance.handlers.onVisible
|
|
1005
1052
|
};
|
|
1006
1053
|
if (hasVisibilityHandlers(visibilityHandlers)) {
|
|
1007
|
-
|
|
1054
|
+
if (!updateVisibilityHandlers(root, object2, visibilityHandlers)) {
|
|
1055
|
+
registerVisibility(root, object2, visibilityHandlers);
|
|
1056
|
+
}
|
|
1008
1057
|
} else {
|
|
1009
1058
|
unregisterVisibility(root, object2);
|
|
1010
1059
|
}
|
|
@@ -1017,38 +1066,60 @@ function applyProps(object, props) {
|
|
|
1017
1066
|
return object;
|
|
1018
1067
|
}
|
|
1019
1068
|
|
|
1069
|
+
const DEFAULT_POINTER_ID = 0;
|
|
1070
|
+
const XR_POINTER_ID_START = 1e3;
|
|
1071
|
+
function getPointerState(internal, pointerId) {
|
|
1072
|
+
let state = internal.pointerMap.get(pointerId);
|
|
1073
|
+
if (!state) {
|
|
1074
|
+
state = {
|
|
1075
|
+
hovered: /* @__PURE__ */ new Map(),
|
|
1076
|
+
captured: /* @__PURE__ */ new Map(),
|
|
1077
|
+
initialClick: [0, 0],
|
|
1078
|
+
initialHits: []
|
|
1079
|
+
};
|
|
1080
|
+
internal.pointerMap.set(pointerId, state);
|
|
1081
|
+
}
|
|
1082
|
+
return state;
|
|
1083
|
+
}
|
|
1084
|
+
function getPointerId(event) {
|
|
1085
|
+
return "pointerId" in event ? event.pointerId : DEFAULT_POINTER_ID;
|
|
1086
|
+
}
|
|
1020
1087
|
function makeId(event) {
|
|
1021
1088
|
return (event.eventObject || event.object).uuid + "/" + event.index + event.instanceId;
|
|
1022
1089
|
}
|
|
1023
|
-
function releaseInternalPointerCapture(
|
|
1024
|
-
const
|
|
1090
|
+
function releaseInternalPointerCapture(internal, obj, pointerId) {
|
|
1091
|
+
const pointerState = internal.pointerMap.get(pointerId);
|
|
1092
|
+
if (!pointerState) return;
|
|
1093
|
+
const captureData = pointerState.captured.get(obj);
|
|
1025
1094
|
if (captureData) {
|
|
1026
|
-
|
|
1027
|
-
|
|
1028
|
-
capturedMap.delete(pointerId);
|
|
1029
|
-
captureData.target.releasePointerCapture(pointerId);
|
|
1030
|
-
}
|
|
1095
|
+
pointerState.captured.delete(obj);
|
|
1096
|
+
captureData.target.releasePointerCapture(pointerId);
|
|
1031
1097
|
}
|
|
1032
1098
|
}
|
|
1033
1099
|
function removeInteractivity(store, object) {
|
|
1034
1100
|
const { internal } = store.getState();
|
|
1035
1101
|
internal.interaction = internal.interaction.filter((o) => o !== object);
|
|
1036
|
-
|
|
1037
|
-
|
|
1038
|
-
|
|
1039
|
-
|
|
1102
|
+
for (const [pointerId, pointerState] of internal.pointerMap) {
|
|
1103
|
+
pointerState.initialHits = pointerState.initialHits.filter((o) => o !== object);
|
|
1104
|
+
pointerState.hovered.forEach((value, key) => {
|
|
1105
|
+
if (value.eventObject === object || value.object === object) {
|
|
1106
|
+
pointerState.hovered.delete(key);
|
|
1107
|
+
}
|
|
1108
|
+
});
|
|
1109
|
+
if (pointerState.captured.has(object)) {
|
|
1110
|
+
releaseInternalPointerCapture(internal, object, pointerId);
|
|
1040
1111
|
}
|
|
1041
|
-
}
|
|
1042
|
-
internal.capturedMap.forEach((captures, pointerId) => {
|
|
1043
|
-
releaseInternalPointerCapture(internal.capturedMap, object, captures, pointerId);
|
|
1044
|
-
});
|
|
1112
|
+
}
|
|
1045
1113
|
unregisterVisibility(store, object);
|
|
1046
1114
|
}
|
|
1047
1115
|
function createEvents(store) {
|
|
1048
|
-
function calculateDistance(event) {
|
|
1116
|
+
function calculateDistance(event, pointerId) {
|
|
1049
1117
|
const { internal } = store.getState();
|
|
1050
|
-
const
|
|
1051
|
-
|
|
1118
|
+
const pointerState = internal.pointerMap.get(pointerId);
|
|
1119
|
+
if (!pointerState) return 0;
|
|
1120
|
+
const [initialX, initialY] = pointerState.initialClick;
|
|
1121
|
+
const dx = event.offsetX - initialX;
|
|
1122
|
+
const dy = event.offsetY - initialY;
|
|
1052
1123
|
return Math.round(Math.sqrt(dx * dx + dy * dy));
|
|
1053
1124
|
}
|
|
1054
1125
|
function filterPointerEvents(objects) {
|
|
@@ -1084,6 +1155,15 @@ function createEvents(store) {
|
|
|
1084
1155
|
return state2.raycaster.camera ? state2.raycaster.intersectObject(obj, true) : [];
|
|
1085
1156
|
}
|
|
1086
1157
|
let hits = eventsObjects.flatMap(handleRaycast).sort((a, b) => {
|
|
1158
|
+
const aInteractivePriority = a.object.userData?.interactivePriority;
|
|
1159
|
+
const bInteractivePriority = b.object.userData?.interactivePriority;
|
|
1160
|
+
if (aInteractivePriority !== void 0 || bInteractivePriority !== void 0) {
|
|
1161
|
+
if (aInteractivePriority !== void 0 && bInteractivePriority === void 0) return -1;
|
|
1162
|
+
if (bInteractivePriority !== void 0 && aInteractivePriority === void 0) return 1;
|
|
1163
|
+
if (aInteractivePriority !== bInteractivePriority) {
|
|
1164
|
+
return (bInteractivePriority ?? 0) - (aInteractivePriority ?? 0);
|
|
1165
|
+
}
|
|
1166
|
+
}
|
|
1087
1167
|
const aState = getRootState(a.object);
|
|
1088
1168
|
const bState = getRootState(b.object);
|
|
1089
1169
|
const aPriority = aState?.events?.priority ?? 1;
|
|
@@ -1105,9 +1185,13 @@ function createEvents(store) {
|
|
|
1105
1185
|
eventObject = eventObject.parent;
|
|
1106
1186
|
}
|
|
1107
1187
|
}
|
|
1108
|
-
if ("pointerId" in event
|
|
1109
|
-
|
|
1110
|
-
|
|
1188
|
+
if ("pointerId" in event) {
|
|
1189
|
+
const pointerId = event.pointerId;
|
|
1190
|
+
const pointerState = state.internal.pointerMap.get(pointerId);
|
|
1191
|
+
if (pointerState?.captured.size) {
|
|
1192
|
+
for (const captureData of pointerState.captured.values()) {
|
|
1193
|
+
if (!duplicates.has(makeId(captureData.intersection))) intersections.push(captureData.intersection);
|
|
1194
|
+
}
|
|
1111
1195
|
}
|
|
1112
1196
|
}
|
|
1113
1197
|
return intersections;
|
|
@@ -1120,27 +1204,25 @@ function createEvents(store) {
|
|
|
1120
1204
|
if (state) {
|
|
1121
1205
|
const { raycaster, pointer, camera, internal } = state;
|
|
1122
1206
|
const unprojectedPoint = new Vector3(pointer.x, pointer.y, 0).unproject(camera);
|
|
1123
|
-
const hasPointerCapture = (id) =>
|
|
1207
|
+
const hasPointerCapture = (id) => {
|
|
1208
|
+
const pointerState = internal.pointerMap.get(id);
|
|
1209
|
+
return pointerState?.captured.has(hit.eventObject) ?? false;
|
|
1210
|
+
};
|
|
1124
1211
|
const setPointerCapture = (id) => {
|
|
1125
1212
|
const captureData = { intersection: hit, target: event.target };
|
|
1126
|
-
|
|
1127
|
-
|
|
1128
|
-
} else {
|
|
1129
|
-
internal.capturedMap.set(id, /* @__PURE__ */ new Map([[hit.eventObject, captureData]]));
|
|
1130
|
-
}
|
|
1213
|
+
const pointerState = getPointerState(internal, id);
|
|
1214
|
+
pointerState.captured.set(hit.eventObject, captureData);
|
|
1131
1215
|
event.target.setPointerCapture(id);
|
|
1132
1216
|
};
|
|
1133
1217
|
const releasePointerCapture = (id) => {
|
|
1134
|
-
|
|
1135
|
-
if (captures) {
|
|
1136
|
-
releaseInternalPointerCapture(internal.capturedMap, hit.eventObject, captures, id);
|
|
1137
|
-
}
|
|
1218
|
+
releaseInternalPointerCapture(internal, hit.eventObject, id);
|
|
1138
1219
|
};
|
|
1139
1220
|
const extractEventProps = {};
|
|
1140
1221
|
for (const prop in event) {
|
|
1141
1222
|
const property = event[prop];
|
|
1142
1223
|
if (typeof property !== "function") extractEventProps[prop] = property;
|
|
1143
1224
|
}
|
|
1225
|
+
const eventPointerId = "pointerId" in event ? event.pointerId : void 0;
|
|
1144
1226
|
const raycastEvent = {
|
|
1145
1227
|
...hit,
|
|
1146
1228
|
...extractEventProps,
|
|
@@ -1151,18 +1233,19 @@ function createEvents(store) {
|
|
|
1151
1233
|
unprojectedPoint,
|
|
1152
1234
|
ray: raycaster.ray,
|
|
1153
1235
|
camera,
|
|
1236
|
+
pointerId: eventPointerId,
|
|
1154
1237
|
// Hijack stopPropagation, which just sets a flag
|
|
1155
1238
|
stopPropagation() {
|
|
1156
|
-
const
|
|
1239
|
+
const pointerState = eventPointerId !== void 0 ? internal.pointerMap.get(eventPointerId) : void 0;
|
|
1157
1240
|
if (
|
|
1158
1241
|
// ...if this pointer hasn't been captured
|
|
1159
|
-
!
|
|
1160
|
-
|
|
1242
|
+
!pointerState?.captured.size || // ... or if the hit object is capturing the pointer
|
|
1243
|
+
pointerState.captured.has(hit.eventObject)
|
|
1161
1244
|
) {
|
|
1162
1245
|
raycastEvent.stopped = localState.stopped = true;
|
|
1163
|
-
if (
|
|
1246
|
+
if (pointerState?.hovered.size && Array.from(pointerState.hovered.values()).find((i) => i.eventObject === hit.eventObject)) {
|
|
1164
1247
|
const higher = intersections.slice(0, intersections.indexOf(hit));
|
|
1165
|
-
cancelPointer([...higher, hit]);
|
|
1248
|
+
cancelPointer([...higher, hit], eventPointerId);
|
|
1166
1249
|
}
|
|
1167
1250
|
}
|
|
1168
1251
|
},
|
|
@@ -1178,15 +1261,18 @@ function createEvents(store) {
|
|
|
1178
1261
|
}
|
|
1179
1262
|
return intersections;
|
|
1180
1263
|
}
|
|
1181
|
-
function cancelPointer(intersections) {
|
|
1264
|
+
function cancelPointer(intersections, pointerId) {
|
|
1182
1265
|
const { internal } = store.getState();
|
|
1183
|
-
|
|
1266
|
+
const pid = pointerId ?? DEFAULT_POINTER_ID;
|
|
1267
|
+
const pointerState = internal.pointerMap.get(pid);
|
|
1268
|
+
if (!pointerState) return;
|
|
1269
|
+
for (const [hoveredId, hoveredObj] of pointerState.hovered) {
|
|
1184
1270
|
if (!intersections.length || !intersections.find(
|
|
1185
1271
|
(hit) => hit.object === hoveredObj.object && hit.index === hoveredObj.index && hit.instanceId === hoveredObj.instanceId
|
|
1186
1272
|
)) {
|
|
1187
1273
|
const eventObject = hoveredObj.eventObject;
|
|
1188
1274
|
const instance = eventObject.__r3f;
|
|
1189
|
-
|
|
1275
|
+
pointerState.hovered.delete(hoveredId);
|
|
1190
1276
|
if (instance?.eventCount) {
|
|
1191
1277
|
const handlers = instance.handlers;
|
|
1192
1278
|
const data = { ...hoveredObj, intersections };
|
|
@@ -1215,41 +1301,118 @@ function createEvents(store) {
|
|
|
1215
1301
|
instance?.handlers.onDropMissed?.(event);
|
|
1216
1302
|
}
|
|
1217
1303
|
}
|
|
1304
|
+
function cleanupPointer(pointerId) {
|
|
1305
|
+
const { internal } = store.getState();
|
|
1306
|
+
const pointerState = internal.pointerMap.get(pointerId);
|
|
1307
|
+
if (pointerState) {
|
|
1308
|
+
for (const [, hoveredObj] of pointerState.hovered) {
|
|
1309
|
+
const eventObject = hoveredObj.eventObject;
|
|
1310
|
+
const instance = eventObject.__r3f;
|
|
1311
|
+
if (instance?.eventCount) {
|
|
1312
|
+
const handlers = instance.handlers;
|
|
1313
|
+
const data = { ...hoveredObj, intersections: [] };
|
|
1314
|
+
handlers.onPointerOut?.(data);
|
|
1315
|
+
handlers.onPointerLeave?.(data);
|
|
1316
|
+
}
|
|
1317
|
+
}
|
|
1318
|
+
internal.pointerMap.delete(pointerId);
|
|
1319
|
+
}
|
|
1320
|
+
internal.pointerDirty.delete(pointerId);
|
|
1321
|
+
}
|
|
1322
|
+
function processDeferredPointer(event, pointerId) {
|
|
1323
|
+
const state = store.getState();
|
|
1324
|
+
const { internal } = state;
|
|
1325
|
+
if (!state.events.enabled) return;
|
|
1326
|
+
const filter = filterPointerEvents;
|
|
1327
|
+
const hits = intersect(event, filter);
|
|
1328
|
+
cancelPointer(hits, pointerId);
|
|
1329
|
+
function onIntersect(data) {
|
|
1330
|
+
const eventObject = data.eventObject;
|
|
1331
|
+
const instance = eventObject.__r3f;
|
|
1332
|
+
if (!instance?.eventCount) return;
|
|
1333
|
+
const handlers = instance.handlers;
|
|
1334
|
+
if (handlers.onPointerOver || handlers.onPointerEnter || handlers.onPointerOut || handlers.onPointerLeave) {
|
|
1335
|
+
const id = makeId(data);
|
|
1336
|
+
const pointerState = getPointerState(internal, pointerId);
|
|
1337
|
+
const hoveredItem = pointerState.hovered.get(id);
|
|
1338
|
+
if (!hoveredItem) {
|
|
1339
|
+
pointerState.hovered.set(id, data);
|
|
1340
|
+
handlers.onPointerOver?.(data);
|
|
1341
|
+
handlers.onPointerEnter?.(data);
|
|
1342
|
+
} else if (hoveredItem.stopped) {
|
|
1343
|
+
data.stopPropagation();
|
|
1344
|
+
}
|
|
1345
|
+
}
|
|
1346
|
+
handlers.onPointerMove?.(data);
|
|
1347
|
+
}
|
|
1348
|
+
handleIntersects(hits, event, 0, onIntersect);
|
|
1349
|
+
}
|
|
1218
1350
|
function handlePointer(name) {
|
|
1219
1351
|
switch (name) {
|
|
1220
1352
|
case "onPointerLeave":
|
|
1221
|
-
case "onPointerCancel":
|
|
1222
1353
|
case "onDragLeave":
|
|
1223
1354
|
return () => cancelPointer([]);
|
|
1355
|
+
// Global cancel of these events
|
|
1356
|
+
case "onPointerCancel":
|
|
1357
|
+
return (event) => {
|
|
1358
|
+
const pointerId = getPointerId(event);
|
|
1359
|
+
cleanupPointer(pointerId);
|
|
1360
|
+
};
|
|
1224
1361
|
case "onLostPointerCapture":
|
|
1225
1362
|
return (event) => {
|
|
1226
1363
|
const { internal } = store.getState();
|
|
1227
|
-
|
|
1364
|
+
const pointerId = getPointerId(event);
|
|
1365
|
+
const pointerState = internal.pointerMap.get(pointerId);
|
|
1366
|
+
if (pointerState?.captured.size) {
|
|
1228
1367
|
requestAnimationFrame(() => {
|
|
1229
|
-
|
|
1230
|
-
|
|
1231
|
-
|
|
1368
|
+
const pointerState2 = internal.pointerMap.get(pointerId);
|
|
1369
|
+
if (pointerState2?.captured.size) {
|
|
1370
|
+
pointerState2.captured.clear();
|
|
1232
1371
|
}
|
|
1372
|
+
cancelPointer([], pointerId);
|
|
1233
1373
|
});
|
|
1234
1374
|
}
|
|
1235
1375
|
};
|
|
1236
1376
|
}
|
|
1237
1377
|
return function handleEvent(event) {
|
|
1238
1378
|
const state = store.getState();
|
|
1239
|
-
const { onPointerMissed, onDragOverMissed, onDropMissed, internal } = state;
|
|
1379
|
+
const { onPointerMissed, onDragOverMissed, onDropMissed, internal, events } = state;
|
|
1380
|
+
const pointerId = getPointerId(event);
|
|
1240
1381
|
internal.lastEvent.current = event;
|
|
1241
|
-
if (!
|
|
1382
|
+
if (!events.enabled) return;
|
|
1242
1383
|
const isPointerMove = name === "onPointerMove";
|
|
1243
1384
|
const isDragOver = name === "onDragOver";
|
|
1244
1385
|
const isDrop = name === "onDrop";
|
|
1245
1386
|
const isClickEvent = name === "onClick" || name === "onContextMenu" || name === "onDoubleClick";
|
|
1387
|
+
const isPointerDown = name === "onPointerDown";
|
|
1388
|
+
const isPointerUp = name === "onPointerUp";
|
|
1389
|
+
const isWheel = name === "onWheel";
|
|
1390
|
+
const canDeferRaycasts = events.frameTimedRaycasts && state.frameloop === "always";
|
|
1391
|
+
if (isPointerMove && canDeferRaycasts) {
|
|
1392
|
+
events.compute?.(event, state);
|
|
1393
|
+
internal.pointerDirty.set(pointerId, event);
|
|
1394
|
+
return;
|
|
1395
|
+
}
|
|
1396
|
+
if (isWheel && canDeferRaycasts && !events.alwaysFireOnScroll) {
|
|
1397
|
+
events.compute?.(event, state);
|
|
1398
|
+
internal.pointerDirty.set(pointerId, event);
|
|
1399
|
+
return;
|
|
1400
|
+
}
|
|
1401
|
+
if ((isClickEvent || isPointerDown || isPointerUp) && internal.pointerDirty.has(pointerId)) {
|
|
1402
|
+
const deferredEvent = internal.pointerDirty.get(pointerId);
|
|
1403
|
+
internal.pointerDirty.delete(pointerId);
|
|
1404
|
+
processDeferredPointer(deferredEvent, pointerId);
|
|
1405
|
+
}
|
|
1246
1406
|
const filter = isPointerMove || isDragOver || isDrop ? filterPointerEvents : void 0;
|
|
1247
1407
|
const hits = intersect(event, filter);
|
|
1248
|
-
const delta = isClickEvent ? calculateDistance(event) : 0;
|
|
1249
|
-
if (
|
|
1250
|
-
|
|
1251
|
-
|
|
1252
|
-
|
|
1408
|
+
const delta = isClickEvent ? calculateDistance(event, pointerId) : 0;
|
|
1409
|
+
if (isPointerDown) {
|
|
1410
|
+
const pointerState2 = getPointerState(internal, pointerId);
|
|
1411
|
+
pointerState2.initialClick = [event.offsetX, event.offsetY];
|
|
1412
|
+
pointerState2.initialHits = hits.map((hit) => hit.eventObject);
|
|
1413
|
+
}
|
|
1414
|
+
const pointerState = internal.pointerMap.get(pointerId);
|
|
1415
|
+
const initialHits = pointerState?.initialHits ?? [];
|
|
1253
1416
|
if (isClickEvent && !hits.length) {
|
|
1254
1417
|
if (delta <= 2) {
|
|
1255
1418
|
pointerMissed(event, internal.interaction);
|
|
@@ -1264,7 +1427,9 @@ function createEvents(store) {
|
|
|
1264
1427
|
dropMissed(event, internal.interaction);
|
|
1265
1428
|
if (onDropMissed) onDropMissed(event);
|
|
1266
1429
|
}
|
|
1267
|
-
if (isPointerMove || isDragOver)
|
|
1430
|
+
if (isPointerMove || isDragOver) {
|
|
1431
|
+
cancelPointer(hits, pointerId);
|
|
1432
|
+
}
|
|
1268
1433
|
function onIntersect(data) {
|
|
1269
1434
|
const eventObject = data.eventObject;
|
|
1270
1435
|
const instance = eventObject.__r3f;
|
|
@@ -1273,9 +1438,10 @@ function createEvents(store) {
|
|
|
1273
1438
|
if (isPointerMove) {
|
|
1274
1439
|
if (handlers.onPointerOver || handlers.onPointerEnter || handlers.onPointerOut || handlers.onPointerLeave) {
|
|
1275
1440
|
const id = makeId(data);
|
|
1276
|
-
const
|
|
1441
|
+
const pointerState2 = getPointerState(internal, pointerId);
|
|
1442
|
+
const hoveredItem = pointerState2.hovered.get(id);
|
|
1277
1443
|
if (!hoveredItem) {
|
|
1278
|
-
|
|
1444
|
+
pointerState2.hovered.set(id, data);
|
|
1279
1445
|
handlers.onPointerOver?.(data);
|
|
1280
1446
|
handlers.onPointerEnter?.(data);
|
|
1281
1447
|
} else if (hoveredItem.stopped) {
|
|
@@ -1285,9 +1451,10 @@ function createEvents(store) {
|
|
|
1285
1451
|
handlers.onPointerMove?.(data);
|
|
1286
1452
|
} else if (isDragOver) {
|
|
1287
1453
|
const id = makeId(data);
|
|
1288
|
-
const
|
|
1454
|
+
const pointerState2 = getPointerState(internal, pointerId);
|
|
1455
|
+
const hoveredItem = pointerState2.hovered.get(id);
|
|
1289
1456
|
if (!hoveredItem) {
|
|
1290
|
-
|
|
1457
|
+
pointerState2.hovered.set(id, data);
|
|
1291
1458
|
handlers.onDragOverEnter?.(data);
|
|
1292
1459
|
} else if (hoveredItem.stopped) {
|
|
1293
1460
|
data.stopPropagation();
|
|
@@ -1298,18 +1465,18 @@ function createEvents(store) {
|
|
|
1298
1465
|
} else {
|
|
1299
1466
|
const handler = handlers[name];
|
|
1300
1467
|
if (handler) {
|
|
1301
|
-
if (!isClickEvent ||
|
|
1468
|
+
if (!isClickEvent || initialHits.includes(eventObject)) {
|
|
1302
1469
|
pointerMissed(
|
|
1303
1470
|
event,
|
|
1304
|
-
internal.interaction.filter((object) => !
|
|
1471
|
+
internal.interaction.filter((object) => !initialHits.includes(object))
|
|
1305
1472
|
);
|
|
1306
1473
|
handler(data);
|
|
1307
1474
|
}
|
|
1308
1475
|
} else {
|
|
1309
|
-
if (isClickEvent &&
|
|
1476
|
+
if (isClickEvent && initialHits.includes(eventObject)) {
|
|
1310
1477
|
pointerMissed(
|
|
1311
1478
|
event,
|
|
1312
|
-
internal.interaction.filter((object) => !
|
|
1479
|
+
internal.interaction.filter((object) => !initialHits.includes(object))
|
|
1313
1480
|
);
|
|
1314
1481
|
}
|
|
1315
1482
|
}
|
|
@@ -1318,7 +1485,15 @@ function createEvents(store) {
|
|
|
1318
1485
|
handleIntersects(hits, event, delta, onIntersect);
|
|
1319
1486
|
};
|
|
1320
1487
|
}
|
|
1321
|
-
|
|
1488
|
+
function flushDeferredPointers() {
|
|
1489
|
+
const { internal, events } = store.getState();
|
|
1490
|
+
if (!events.frameTimedRaycasts) return;
|
|
1491
|
+
for (const [pointerId, event] of internal.pointerDirty) {
|
|
1492
|
+
processDeferredPointer(event, pointerId);
|
|
1493
|
+
}
|
|
1494
|
+
internal.pointerDirty.clear();
|
|
1495
|
+
}
|
|
1496
|
+
return { handlePointer, flushDeferredPointers, processDeferredPointer };
|
|
1322
1497
|
}
|
|
1323
1498
|
const DOM_EVENTS = {
|
|
1324
1499
|
onClick: ["click", false],
|
|
@@ -1337,10 +1512,15 @@ const DOM_EVENTS = {
|
|
|
1337
1512
|
onLostPointerCapture: ["lostpointercapture", true]
|
|
1338
1513
|
};
|
|
1339
1514
|
function createPointerEvents(store) {
|
|
1340
|
-
const { handlePointer } = createEvents(store);
|
|
1515
|
+
const { handlePointer, flushDeferredPointers, processDeferredPointer } = createEvents(store);
|
|
1516
|
+
let nextXRPointerId = XR_POINTER_ID_START;
|
|
1517
|
+
const xrPointers = /* @__PURE__ */ new Map();
|
|
1341
1518
|
return {
|
|
1342
1519
|
priority: 1,
|
|
1343
1520
|
enabled: true,
|
|
1521
|
+
frameTimedRaycasts: true,
|
|
1522
|
+
alwaysFireOnScroll: true,
|
|
1523
|
+
updateOnFrame: false,
|
|
1344
1524
|
compute(event, state) {
|
|
1345
1525
|
state.pointer.set(event.offsetX / state.size.width * 2 - 1, -(event.offsetY / state.size.height) * 2 + 1);
|
|
1346
1526
|
state.raycaster.setFromCamera(state.pointer, state.camera);
|
|
@@ -1350,11 +1530,33 @@ function createPointerEvents(store) {
|
|
|
1350
1530
|
(acc, key) => ({ ...acc, [key]: handlePointer(key) }),
|
|
1351
1531
|
{}
|
|
1352
1532
|
),
|
|
1353
|
-
update: () => {
|
|
1533
|
+
update: (pointerId) => {
|
|
1354
1534
|
const { events, internal } = store.getState();
|
|
1355
|
-
if (
|
|
1535
|
+
if (!events.handlers) return;
|
|
1536
|
+
if (pointerId !== void 0) {
|
|
1537
|
+
const event = internal.pointerDirty.get(pointerId);
|
|
1538
|
+
if (event) {
|
|
1539
|
+
internal.pointerDirty.delete(pointerId);
|
|
1540
|
+
processDeferredPointer(event, pointerId);
|
|
1541
|
+
} else if (internal.lastEvent?.current) {
|
|
1542
|
+
processDeferredPointer(internal.lastEvent.current, pointerId);
|
|
1543
|
+
}
|
|
1544
|
+
} else {
|
|
1545
|
+
flushDeferredPointers();
|
|
1546
|
+
if (internal.lastEvent?.current) {
|
|
1547
|
+
events.handlers.onPointerMove(internal.lastEvent.current);
|
|
1548
|
+
}
|
|
1549
|
+
}
|
|
1550
|
+
},
|
|
1551
|
+
flush: () => {
|
|
1552
|
+
const { events, internal } = store.getState();
|
|
1553
|
+
flushDeferredPointers();
|
|
1554
|
+
if (events.updateOnFrame && internal.lastEvent?.current && events.handlers) {
|
|
1555
|
+
events.handlers.onPointerMove(internal.lastEvent.current);
|
|
1556
|
+
}
|
|
1356
1557
|
},
|
|
1357
1558
|
connect: (target) => {
|
|
1559
|
+
if (!target) return;
|
|
1358
1560
|
const { set, events } = store.getState();
|
|
1359
1561
|
events.disconnect?.();
|
|
1360
1562
|
set((state) => ({ events: { ...state.events, connected: target } }));
|
|
@@ -1378,6 +1580,33 @@ function createPointerEvents(store) {
|
|
|
1378
1580
|
}
|
|
1379
1581
|
set((state) => ({ events: { ...state.events, connected: void 0 } }));
|
|
1380
1582
|
}
|
|
1583
|
+
},
|
|
1584
|
+
// PREVIEW (A8): the XR pointer registration API may change before stable.
|
|
1585
|
+
registerPointer: (config) => {
|
|
1586
|
+
const pointerId = nextXRPointerId++;
|
|
1587
|
+
xrPointers.set(pointerId, config);
|
|
1588
|
+
const { internal } = store.getState();
|
|
1589
|
+
getPointerState(internal, pointerId);
|
|
1590
|
+
return pointerId;
|
|
1591
|
+
},
|
|
1592
|
+
unregisterPointer: (pointerId) => {
|
|
1593
|
+
xrPointers.delete(pointerId);
|
|
1594
|
+
const { internal } = store.getState();
|
|
1595
|
+
const pointerState = internal.pointerMap.get(pointerId);
|
|
1596
|
+
if (pointerState) {
|
|
1597
|
+
for (const [, hoveredObj] of pointerState.hovered) {
|
|
1598
|
+
const eventObject = hoveredObj.eventObject;
|
|
1599
|
+
const instance = eventObject.__r3f;
|
|
1600
|
+
if (instance?.eventCount) {
|
|
1601
|
+
const handlers = instance.handlers;
|
|
1602
|
+
const data = { ...hoveredObj, intersections: [] };
|
|
1603
|
+
handlers.onPointerOut?.(data);
|
|
1604
|
+
handlers.onPointerLeave?.(data);
|
|
1605
|
+
}
|
|
1606
|
+
}
|
|
1607
|
+
internal.pointerMap.delete(pointerId);
|
|
1608
|
+
}
|
|
1609
|
+
internal.pointerDirty.delete(pointerId);
|
|
1381
1610
|
}
|
|
1382
1611
|
};
|
|
1383
1612
|
}
|
|
@@ -1439,1036 +1668,11 @@ function notifyAlpha({ message, link }) {
|
|
|
1439
1668
|
}
|
|
1440
1669
|
}
|
|
1441
1670
|
|
|
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?.();
|
|
1671
|
+
const INTERNAL_LIB_MARKERS = ["zustand", "setState", "Object.assign"];
|
|
1672
|
+
function isInternalRendererAccess(stack, callerDepth = 2) {
|
|
1673
|
+
if (!stack) return false;
|
|
1674
|
+
const caller = stack.split("\n")[callerDepth] ?? "";
|
|
1675
|
+
return INTERNAL_LIB_MARKERS.some((m) => caller.includes(m));
|
|
2472
1676
|
}
|
|
2473
1677
|
|
|
2474
1678
|
const R3F_CONTEXT = Symbol.for("@react-three/fiber.context");
|
|
@@ -2508,7 +1712,14 @@ const createStore = (invalidate, advance) => {
|
|
|
2508
1712
|
frustum: new Frustum(),
|
|
2509
1713
|
autoUpdateFrustum: true,
|
|
2510
1714
|
raycaster: null,
|
|
2511
|
-
events: {
|
|
1715
|
+
events: {
|
|
1716
|
+
priority: 1,
|
|
1717
|
+
enabled: true,
|
|
1718
|
+
connected: false,
|
|
1719
|
+
frameTimedRaycasts: true,
|
|
1720
|
+
alwaysFireOnScroll: true,
|
|
1721
|
+
updateOnFrame: false
|
|
1722
|
+
},
|
|
2512
1723
|
scene: null,
|
|
2513
1724
|
rootScene: null,
|
|
2514
1725
|
xr: null,
|
|
@@ -2596,14 +1807,18 @@ const createStore = (invalidate, advance) => {
|
|
|
2596
1807
|
}),
|
|
2597
1808
|
setFrameloop: (frameloop = "always") => {
|
|
2598
1809
|
set(() => ({ frameloop }));
|
|
1810
|
+
getScheduler().frameloop = frameloop;
|
|
2599
1811
|
},
|
|
2600
1812
|
setError: (error) => set(() => ({ error })),
|
|
2601
1813
|
error: null,
|
|
2602
|
-
//* TSL State (managed via hooks: useUniforms, useNodes, useTextures,
|
|
1814
|
+
//* TSL State (managed via hooks: useUniforms, useNodes, useBuffers, useGPUStorage, useTextures, useRenderPipeline) ==============================
|
|
2603
1815
|
uniforms: {},
|
|
2604
1816
|
nodes: {},
|
|
1817
|
+
buffers: {},
|
|
1818
|
+
gpuStorage: {},
|
|
2605
1819
|
textures: /* @__PURE__ */ new Map(),
|
|
2606
|
-
|
|
1820
|
+
_textureRefs: /* @__PURE__ */ new Map(),
|
|
1821
|
+
renderPipeline: null,
|
|
2607
1822
|
passes: {},
|
|
2608
1823
|
_hmrVersion: 0,
|
|
2609
1824
|
_sizeImperative: false,
|
|
@@ -2612,12 +1827,16 @@ const createStore = (invalidate, advance) => {
|
|
|
2612
1827
|
internal: {
|
|
2613
1828
|
// Events
|
|
2614
1829
|
interaction: [],
|
|
2615
|
-
hovered: /* @__PURE__ */ new Map(),
|
|
2616
1830
|
subscribers: [],
|
|
1831
|
+
// Per-pointer state (new unified structure)
|
|
1832
|
+
pointerMap: /* @__PURE__ */ new Map(),
|
|
1833
|
+
pointerDirty: /* @__PURE__ */ new Map(),
|
|
1834
|
+
lastEvent: React.createRef(),
|
|
1835
|
+
// Deprecated but kept for backwards compatibility
|
|
1836
|
+
hovered: /* @__PURE__ */ new Map(),
|
|
2617
1837
|
initialClick: [0, 0],
|
|
2618
1838
|
initialHits: [],
|
|
2619
1839
|
capturedMap: /* @__PURE__ */ new Map(),
|
|
2620
|
-
lastEvent: React.createRef(),
|
|
2621
1840
|
// Visibility tracking (onFramed, onOccluded, onVisible)
|
|
2622
1841
|
visibilityRegistry: /* @__PURE__ */ new Map(),
|
|
2623
1842
|
// Occlusion system (WebGPU only)
|
|
@@ -2656,8 +1875,7 @@ const createStore = (invalidate, advance) => {
|
|
|
2656
1875
|
const currentState = rootStore.getState();
|
|
2657
1876
|
if (!currentState.isLegacy && currentState.internal.actualRenderer) {
|
|
2658
1877
|
const stack = new Error().stack || "";
|
|
2659
|
-
|
|
2660
|
-
if (!isInternalAccess) {
|
|
1878
|
+
if (!isInternalRendererAccess(stack)) {
|
|
2661
1879
|
const cleanedStack = stack.split("\n").slice(2).join("\n") || "Stack trace unavailable";
|
|
2662
1880
|
notifyDepreciated({
|
|
2663
1881
|
heading: "Accessing state.gl in WebGPU mode",
|
|
@@ -2705,14 +1923,16 @@ const createStore = (invalidate, advance) => {
|
|
|
2705
1923
|
oldSize = size;
|
|
2706
1924
|
oldDpr = viewport.dpr;
|
|
2707
1925
|
updateCamera(camera, size);
|
|
2708
|
-
if (canvasTarget) {
|
|
1926
|
+
if (internal.isSecondary && canvasTarget) {
|
|
2709
1927
|
if (viewport.dpr > 0) canvasTarget.setPixelRatio(viewport.dpr);
|
|
2710
|
-
|
|
2711
|
-
canvasTarget.setSize(size.width, size.height, updateStyle);
|
|
1928
|
+
canvasTarget.setSize(size.width, size.height, false);
|
|
2712
1929
|
} else {
|
|
2713
1930
|
if (viewport.dpr > 0) actualRenderer.setPixelRatio(viewport.dpr);
|
|
2714
|
-
|
|
2715
|
-
|
|
1931
|
+
actualRenderer.setSize(size.width, size.height, false);
|
|
1932
|
+
if (canvasTarget) {
|
|
1933
|
+
if (viewport.dpr > 0) canvasTarget.setPixelRatio(viewport.dpr);
|
|
1934
|
+
canvasTarget.setSize(size.width, size.height, false);
|
|
1935
|
+
}
|
|
2716
1936
|
}
|
|
2717
1937
|
}
|
|
2718
1938
|
if (camera !== oldCamera) {
|
|
@@ -2768,19 +1988,25 @@ function loadingFn(extensions, onProgress) {
|
|
|
2768
1988
|
);
|
|
2769
1989
|
};
|
|
2770
1990
|
}
|
|
2771
|
-
function useLoader(loader, input, extensions, onProgress) {
|
|
2772
|
-
const
|
|
1991
|
+
function useLoader(loader, input, extensions, onProgress, cacheKey) {
|
|
1992
|
+
const inputs = Array.isArray(input) ? input : [input];
|
|
1993
|
+
const cacheKeys = Array.isArray(cacheKey ?? input) ? cacheKey ?? input : [cacheKey ?? input];
|
|
2773
1994
|
const fn = loadingFn(extensions, onProgress);
|
|
2774
|
-
const results =
|
|
1995
|
+
const results = cacheKeys.map(
|
|
1996
|
+
(key, index) => suspend(() => fn(loader, inputs[index]), [loader, key], { equal: is.equ })
|
|
1997
|
+
);
|
|
2775
1998
|
return Array.isArray(input) ? results : results[0];
|
|
2776
1999
|
}
|
|
2777
|
-
useLoader.preload = function(loader, input, extensions, onProgress) {
|
|
2778
|
-
const
|
|
2779
|
-
|
|
2000
|
+
useLoader.preload = function(loader, input, extensions, onProgress, cacheKey) {
|
|
2001
|
+
const inputs = Array.isArray(input) ? input : [input];
|
|
2002
|
+
const cacheKeys = Array.isArray(cacheKey ?? input) ? cacheKey ?? input : [cacheKey ?? input];
|
|
2003
|
+
cacheKeys.forEach(
|
|
2004
|
+
(key, index) => preload(() => loadingFn(extensions, onProgress)(loader, inputs[index]), [loader, key])
|
|
2005
|
+
);
|
|
2780
2006
|
};
|
|
2781
|
-
useLoader.clear = function(loader, input) {
|
|
2782
|
-
const
|
|
2783
|
-
|
|
2007
|
+
useLoader.clear = function(loader, input, cacheKey) {
|
|
2008
|
+
const cacheKeys = Array.isArray(cacheKey ?? input) ? cacheKey ?? input : [cacheKey ?? input];
|
|
2009
|
+
cacheKeys.forEach((key) => clear([loader, key]));
|
|
2784
2010
|
};
|
|
2785
2011
|
useLoader.loader = getLoader;
|
|
2786
2012
|
|
|
@@ -2856,20 +2082,14 @@ function useFrame(callback, priorityOrOptions) {
|
|
|
2856
2082
|
}
|
|
2857
2083
|
};
|
|
2858
2084
|
} else {
|
|
2859
|
-
|
|
2860
|
-
|
|
2861
|
-
|
|
2862
|
-
|
|
2863
|
-
|
|
2864
|
-
|
|
2865
|
-
|
|
2866
|
-
|
|
2867
|
-
unregisterJob = registerOutside();
|
|
2868
|
-
});
|
|
2869
|
-
return () => {
|
|
2870
|
-
unsubReady();
|
|
2871
|
-
unregisterJob?.();
|
|
2872
|
-
};
|
|
2085
|
+
return scheduler.register(
|
|
2086
|
+
(state, delta) => {
|
|
2087
|
+
const frameState = state;
|
|
2088
|
+
if (!frameState.renderer) return;
|
|
2089
|
+
callbackRef.current?.(frameState, delta);
|
|
2090
|
+
},
|
|
2091
|
+
{ id, ...options }
|
|
2092
|
+
);
|
|
2873
2093
|
}
|
|
2874
2094
|
}, [store, scheduler, id, optionsKey, isLegacyPriority, isInsideCanvas]);
|
|
2875
2095
|
const isPaused = React.useSyncExternalStore(
|
|
@@ -2960,18 +2180,18 @@ function buildFromCache(input, textureCache) {
|
|
|
2960
2180
|
function useTexture(input, optionsOrOnLoad) {
|
|
2961
2181
|
const renderer = useThree((state) => state.internal.actualRenderer);
|
|
2962
2182
|
const store = useStore();
|
|
2963
|
-
const textureCache = useThree((state) => state.textures);
|
|
2964
2183
|
const options = typeof optionsOrOnLoad === "function" ? { onLoad: optionsOrOnLoad } : optionsOrOnLoad ?? {};
|
|
2965
|
-
const { onLoad, cache =
|
|
2184
|
+
const { onLoad, cache = true } = options;
|
|
2966
2185
|
const onLoadRef = useRef(onLoad);
|
|
2967
2186
|
onLoadRef.current = onLoad;
|
|
2968
2187
|
const onLoadCalledForRef = useRef(null);
|
|
2969
2188
|
const urls = useMemo(() => getUrls(input), [input]);
|
|
2970
2189
|
const cachedResult = useMemo(() => {
|
|
2971
2190
|
if (!cache) return null;
|
|
2972
|
-
|
|
2973
|
-
|
|
2974
|
-
|
|
2191
|
+
const textures = store.getState().textures;
|
|
2192
|
+
if (!allUrlsCached(urls, textures)) return null;
|
|
2193
|
+
return buildFromCache(input, textures);
|
|
2194
|
+
}, [cache, urls, input, store]);
|
|
2975
2195
|
const loadedTextures = useLoader(
|
|
2976
2196
|
TextureLoader,
|
|
2977
2197
|
IsObject(input) ? Object.values(input) : input
|
|
@@ -3015,8 +2235,6 @@ function useTexture(input, optionsOrOnLoad) {
|
|
|
3015
2235
|
}, [input, loadedTextures, cachedResult]);
|
|
3016
2236
|
useEffect(() => {
|
|
3017
2237
|
if (!cache) return;
|
|
3018
|
-
if (cachedResult) return;
|
|
3019
|
-
const set = store.setState;
|
|
3020
2238
|
const urlTextureMap = [];
|
|
3021
2239
|
if (typeof input === "string") {
|
|
3022
2240
|
urlTextureMap.push([input, mappedTextures]);
|
|
@@ -3030,18 +2248,32 @@ function useTexture(input, optionsOrOnLoad) {
|
|
|
3030
2248
|
urlTextureMap.push([url, textureRecord[key]]);
|
|
3031
2249
|
}
|
|
3032
2250
|
}
|
|
3033
|
-
|
|
3034
|
-
const
|
|
3035
|
-
let
|
|
2251
|
+
store.setState((state) => {
|
|
2252
|
+
const refs = new Map(state._textureRefs);
|
|
2253
|
+
let textures = state.textures;
|
|
2254
|
+
let added = false;
|
|
3036
2255
|
for (const [url, texture] of urlTextureMap) {
|
|
3037
|
-
if (!
|
|
3038
|
-
|
|
3039
|
-
|
|
2256
|
+
if (!textures.has(url)) {
|
|
2257
|
+
if (!added) {
|
|
2258
|
+
textures = new Map(textures);
|
|
2259
|
+
added = true;
|
|
2260
|
+
}
|
|
2261
|
+
textures.set(url, texture);
|
|
3040
2262
|
}
|
|
2263
|
+
refs.set(url, (refs.get(url) ?? 0) + 1);
|
|
3041
2264
|
}
|
|
3042
|
-
return
|
|
2265
|
+
return added ? { textures, _textureRefs: refs } : { _textureRefs: refs };
|
|
2266
|
+
});
|
|
2267
|
+
return () => store.setState((state) => {
|
|
2268
|
+
const refs = new Map(state._textureRefs);
|
|
2269
|
+
for (const [url] of urlTextureMap) {
|
|
2270
|
+
const next = (refs.get(url) ?? 0) - 1;
|
|
2271
|
+
if (next <= 0) refs.delete(url);
|
|
2272
|
+
else refs.set(url, next);
|
|
2273
|
+
}
|
|
2274
|
+
return { _textureRefs: refs };
|
|
3043
2275
|
});
|
|
3044
|
-
}, [cache, input, mappedTextures, store
|
|
2276
|
+
}, [cache, input, mappedTextures, store]);
|
|
3045
2277
|
return mappedTextures;
|
|
3046
2278
|
}
|
|
3047
2279
|
useTexture.preload = (url) => useLoader.preload(TextureLoader, url);
|
|
@@ -3057,96 +2289,63 @@ const Texture = ({
|
|
|
3057
2289
|
return /* @__PURE__ */ jsx(Fragment, { children: children?.(ret) });
|
|
3058
2290
|
};
|
|
3059
2291
|
|
|
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() {
|
|
2292
|
+
function useTextures(selector) {
|
|
3068
2293
|
const store = useStore();
|
|
3069
|
-
|
|
3070
|
-
const set = store.setState;
|
|
2294
|
+
const registry = useMemo(() => {
|
|
3071
2295
|
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
|
-
};
|
|
2296
|
+
const setState = store.setState;
|
|
2297
|
+
const getOne = (key) => getState().textures.get(key);
|
|
3130
2298
|
return {
|
|
3131
|
-
|
|
3132
|
-
get textures() {
|
|
2299
|
+
get all() {
|
|
3133
2300
|
return getState().textures;
|
|
3134
2301
|
},
|
|
3135
|
-
|
|
3136
|
-
|
|
2302
|
+
get(input) {
|
|
2303
|
+
if (typeof input === "string") return getOne(input);
|
|
2304
|
+
if (Array.isArray(input)) return input.map(getOne);
|
|
2305
|
+
const out = {};
|
|
2306
|
+
for (const name in input) out[name] = getOne(input[name]);
|
|
2307
|
+
return out;
|
|
2308
|
+
},
|
|
3137
2309
|
has: (key) => getState().textures.has(key),
|
|
3138
|
-
|
|
3139
|
-
|
|
3140
|
-
|
|
3141
|
-
|
|
3142
|
-
|
|
3143
|
-
|
|
3144
|
-
|
|
3145
|
-
|
|
3146
|
-
|
|
3147
|
-
|
|
2310
|
+
add(keyOrRecord, texture) {
|
|
2311
|
+
setState((state) => {
|
|
2312
|
+
const textures = new Map(state.textures);
|
|
2313
|
+
if (typeof keyOrRecord === "string") {
|
|
2314
|
+
textures.set(keyOrRecord, texture);
|
|
2315
|
+
} else {
|
|
2316
|
+
for (const key in keyOrRecord) textures.set(key, keyOrRecord[key]);
|
|
2317
|
+
}
|
|
2318
|
+
return { textures };
|
|
2319
|
+
});
|
|
2320
|
+
},
|
|
2321
|
+
dispose(key, options) {
|
|
2322
|
+
const state = getState();
|
|
2323
|
+
const refs = state._textureRefs.get(key) ?? 0;
|
|
2324
|
+
if (refs > 0 && !options?.force) {
|
|
2325
|
+
console.warn(
|
|
2326
|
+
`[useTextures] "${key}" still has ${refs} active reference(s); skipping dispose. Pass { force: true } to override.`
|
|
2327
|
+
);
|
|
2328
|
+
return false;
|
|
2329
|
+
}
|
|
2330
|
+
state.textures.get(key)?.dispose();
|
|
2331
|
+
setState((s) => {
|
|
2332
|
+
const textures = new Map(s.textures);
|
|
2333
|
+
textures.delete(key);
|
|
2334
|
+
const nextRefs = new Map(s._textureRefs);
|
|
2335
|
+
nextRefs.delete(key);
|
|
2336
|
+
return { textures, _textureRefs: nextRefs };
|
|
2337
|
+
});
|
|
2338
|
+
return true;
|
|
2339
|
+
},
|
|
2340
|
+
disposeAll() {
|
|
2341
|
+
for (const texture of getState().textures.values()) texture.dispose();
|
|
2342
|
+
setState({ textures: /* @__PURE__ */ new Map(), _textureRefs: /* @__PURE__ */ new Map() });
|
|
2343
|
+
}
|
|
3148
2344
|
};
|
|
3149
2345
|
}, [store]);
|
|
2346
|
+
const subscribe = selector ? () => selector(registry) : (state) => state.textures;
|
|
2347
|
+
const selected = useThree(subscribe);
|
|
2348
|
+
return selector ? selected : registry;
|
|
3150
2349
|
}
|
|
3151
2350
|
|
|
3152
2351
|
function useRenderTarget(widthOrOptions, heightOrOptions, options) {
|
|
@@ -3227,7 +2426,7 @@ function advance(timestamp) {
|
|
|
3227
2426
|
getScheduler().step(timestamp);
|
|
3228
2427
|
}
|
|
3229
2428
|
|
|
3230
|
-
const version = "10.0.0-alpha.
|
|
2429
|
+
const version = "10.0.0-alpha.3";
|
|
3231
2430
|
const packageData = {
|
|
3232
2431
|
version: version};
|
|
3233
2432
|
|
|
@@ -14666,6 +13865,7 @@ function swapInstances() {
|
|
|
14666
13865
|
}
|
|
14667
13866
|
}
|
|
14668
13867
|
if (instance.isHidden) unhideInstance(instance);
|
|
13868
|
+
if (isObject3D(instance.object)) removeInteractivity(findInitialRoot(instance), instance.object);
|
|
14669
13869
|
if (instance.object.__r3f) delete instance.object.__r3f;
|
|
14670
13870
|
if (instance.type !== "primitive") disposeOnIdle(instance.object);
|
|
14671
13871
|
}
|
|
@@ -14678,6 +13878,8 @@ function swapInstances() {
|
|
|
14678
13878
|
instance.object.__r3f = instance;
|
|
14679
13879
|
setFiberRef(fiber, instance.object);
|
|
14680
13880
|
delete instance.appliedOnce;
|
|
13881
|
+
instance.eventCount = 0;
|
|
13882
|
+
instance.handlers = {};
|
|
14681
13883
|
applyProps(instance.object, instance.props);
|
|
14682
13884
|
if (instance.props.attach) {
|
|
14683
13885
|
attach(parent, instance);
|
|
@@ -14893,11 +14095,15 @@ const reconciler = /* @__PURE__ */ createReconciler({
|
|
|
14893
14095
|
cloneMutableTextInstance(textInstance) {
|
|
14894
14096
|
return textInstance;
|
|
14895
14097
|
},
|
|
14098
|
+
// React 19.2 added these for root-level view transitions. They only run for hosts that opt into
|
|
14099
|
+
// view transitions by returning a container from cloneRootViewTransitionContainer; R3F renders
|
|
14100
|
+
// into a WebGL/WebGPU canvas, where cloning the root has no meaning, so we never opt in and
|
|
14101
|
+
// React never calls them. They stay as no-ops rather than throws: the host config is shared by
|
|
14102
|
+
// every root, and a throw here would turn a React-internal probe into a hard crash for users.
|
|
14103
|
+
// Guarded by a test asserting a full render + unmount never reaches them.
|
|
14896
14104
|
cloneRootViewTransitionContainer(_rootContainer) {
|
|
14897
|
-
throw new Error("Not implemented.");
|
|
14898
14105
|
},
|
|
14899
14106
|
removeRootViewTransitionClone(_rootContainer, _clone) {
|
|
14900
|
-
throw new Error("Not implemented.");
|
|
14901
14107
|
},
|
|
14902
14108
|
// https://github.com/facebook/react/pull/32465
|
|
14903
14109
|
createFragmentInstance: (_fiber) => null,
|
|
@@ -14982,6 +14188,7 @@ function createRoot(canvas) {
|
|
|
14982
14188
|
const lastConfiguredProps = {};
|
|
14983
14189
|
let configured = false;
|
|
14984
14190
|
let pending = null;
|
|
14191
|
+
let rendererSetup = null;
|
|
14985
14192
|
return {
|
|
14986
14193
|
async configure(props = {}) {
|
|
14987
14194
|
let resolve;
|
|
@@ -14997,7 +14204,6 @@ function createRoot(canvas) {
|
|
|
14997
14204
|
events,
|
|
14998
14205
|
onCreated: onCreatedCallback,
|
|
14999
14206
|
shadows = false,
|
|
15000
|
-
textureColorSpace = SRGBColorSpace,
|
|
15001
14207
|
orthographic = false,
|
|
15002
14208
|
frameloop = "always",
|
|
15003
14209
|
dpr = [1, 2],
|
|
@@ -15012,7 +14218,8 @@ function createRoot(canvas) {
|
|
|
15012
14218
|
_sizeProps,
|
|
15013
14219
|
forceEven
|
|
15014
14220
|
} = props;
|
|
15015
|
-
const
|
|
14221
|
+
const textureColorSpace = is.obj(glConfig) && !is.fun(glConfig) && !isRenderer(glConfig) && glConfig.textureColorSpace || is.obj(rendererConfig) && !is.fun(rendererConfig) && !isRenderer(rendererConfig) && rendererConfig.textureColorSpace || SRGBColorSpace;
|
|
14222
|
+
let state = store.getState();
|
|
15016
14223
|
const defaultGLProps = {
|
|
15017
14224
|
canvas,
|
|
15018
14225
|
powerPreference: "high-performance",
|
|
@@ -15040,9 +14247,21 @@ function createRoot(canvas) {
|
|
|
15040
14247
|
);
|
|
15041
14248
|
}
|
|
15042
14249
|
if (!state.internal.actualRenderer) {
|
|
15043
|
-
|
|
15044
|
-
|
|
15045
|
-
|
|
14250
|
+
if (!rendererSetup) {
|
|
14251
|
+
rendererSetup = (async () => {
|
|
14252
|
+
{
|
|
14253
|
+
renderer = await resolveRenderer(glConfig, defaultGLProps, WebGLRenderer);
|
|
14254
|
+
state.internal.actualRenderer = renderer;
|
|
14255
|
+
state.set({ isLegacy: true, gl: renderer, renderer, primaryStore: store });
|
|
14256
|
+
}
|
|
14257
|
+
})().catch((err) => {
|
|
14258
|
+
rendererSetup = null;
|
|
14259
|
+
throw err;
|
|
14260
|
+
});
|
|
14261
|
+
}
|
|
14262
|
+
await rendererSetup;
|
|
14263
|
+
state = store.getState();
|
|
14264
|
+
renderer = state.internal.actualRenderer;
|
|
15046
14265
|
}
|
|
15047
14266
|
let raycaster = state.raycaster;
|
|
15048
14267
|
if (!raycaster) state.set({ raycaster: raycaster = new Raycaster() });
|
|
@@ -15135,7 +14354,7 @@ function createRoot(canvas) {
|
|
|
15135
14354
|
lastConfiguredProps.performance = performance;
|
|
15136
14355
|
}
|
|
15137
14356
|
if (!state.xr) {
|
|
15138
|
-
const handleXRFrame = (timestamp,
|
|
14357
|
+
const handleXRFrame = (timestamp, _frame) => {
|
|
15139
14358
|
const state2 = store.getState();
|
|
15140
14359
|
if (state2.frameloop === "never") return;
|
|
15141
14360
|
advance(timestamp);
|
|
@@ -15171,15 +14390,22 @@ function createRoot(canvas) {
|
|
|
15171
14390
|
const oldType = renderer.shadowMap.type;
|
|
15172
14391
|
renderer.shadowMap.enabled = !!shadows;
|
|
15173
14392
|
if (is.boo(shadows)) {
|
|
15174
|
-
renderer.shadowMap.type =
|
|
14393
|
+
renderer.shadowMap.type = PCFShadowMap;
|
|
15175
14394
|
} else if (is.str(shadows)) {
|
|
14395
|
+
if (shadows === "soft") {
|
|
14396
|
+
notifyDepreciated({
|
|
14397
|
+
heading: 'shadows="soft" is deprecated',
|
|
14398
|
+
body: "Three has depreciated soft and improved basic PCFShadows, we converted for you.",
|
|
14399
|
+
link: "https://github.com/mrdoob/three.js/wiki/Migration-Guide?utm_source=chatgpt.com#181--182"
|
|
14400
|
+
});
|
|
14401
|
+
}
|
|
15176
14402
|
const types = {
|
|
15177
14403
|
basic: BasicShadowMap,
|
|
15178
14404
|
percentage: PCFShadowMap,
|
|
15179
|
-
soft:
|
|
14405
|
+
soft: PCFShadowMap,
|
|
15180
14406
|
variance: VSMShadowMap
|
|
15181
14407
|
};
|
|
15182
|
-
renderer.shadowMap.type = types[shadows] ??
|
|
14408
|
+
renderer.shadowMap.type = types[shadows] ?? PCFShadowMap;
|
|
15183
14409
|
} else if (is.obj(shadows)) {
|
|
15184
14410
|
Object.assign(renderer.shadowMap, shadows);
|
|
15185
14411
|
}
|
|
@@ -15195,13 +14421,24 @@ function createRoot(canvas) {
|
|
|
15195
14421
|
if (state.textureColorSpace !== textureColorSpace) state.set(() => ({ textureColorSpace }));
|
|
15196
14422
|
lastConfiguredProps.textureColorSpace = textureColorSpace;
|
|
15197
14423
|
}
|
|
14424
|
+
const r3fProps = ["textureColorSpace"];
|
|
14425
|
+
const constructorOnlyProps = ["samples", "antialias", "alpha", "canvas", "powerPreference"];
|
|
14426
|
+
const nonApplyProps = [...r3fProps, ...constructorOnlyProps];
|
|
15198
14427
|
if (glConfig && !is.fun(glConfig) && !isRenderer(glConfig) && !is.equ(glConfig, renderer, shallowLoose)) {
|
|
15199
|
-
|
|
14428
|
+
const glProps = {};
|
|
14429
|
+
for (const key in glConfig) {
|
|
14430
|
+
if (!nonApplyProps.includes(key)) glProps[key] = glConfig[key];
|
|
14431
|
+
}
|
|
14432
|
+
applyProps(renderer, glProps);
|
|
15200
14433
|
}
|
|
15201
14434
|
if (rendererConfig && !is.fun(rendererConfig) && !isRenderer(rendererConfig) && state.renderer) {
|
|
15202
14435
|
const currentRenderer = state.renderer;
|
|
15203
14436
|
if (!is.equ(rendererConfig, currentRenderer, shallowLoose)) {
|
|
15204
|
-
|
|
14437
|
+
const rendererProps = {};
|
|
14438
|
+
for (const key in rendererConfig) {
|
|
14439
|
+
if (!nonApplyProps.includes(key)) rendererProps[key] = rendererConfig[key];
|
|
14440
|
+
}
|
|
14441
|
+
applyProps(currentRenderer, rendererProps);
|
|
15205
14442
|
}
|
|
15206
14443
|
}
|
|
15207
14444
|
const scheduler = getScheduler();
|
|
@@ -15227,6 +14464,18 @@ function createRoot(canvas) {
|
|
|
15227
14464
|
system: true
|
|
15228
14465
|
}
|
|
15229
14466
|
);
|
|
14467
|
+
const unregisterEventsFlush = scheduler.register(
|
|
14468
|
+
() => {
|
|
14469
|
+
const state2 = store.getState();
|
|
14470
|
+
state2.events.flush?.();
|
|
14471
|
+
},
|
|
14472
|
+
{
|
|
14473
|
+
id: `${newRootId}_events`,
|
|
14474
|
+
rootId: newRootId,
|
|
14475
|
+
phase: "input",
|
|
14476
|
+
system: true
|
|
14477
|
+
}
|
|
14478
|
+
);
|
|
15230
14479
|
const unregisterFrustum = scheduler.register(
|
|
15231
14480
|
() => {
|
|
15232
14481
|
const state2 = store.getState();
|
|
@@ -15237,7 +14486,7 @@ function createRoot(canvas) {
|
|
|
15237
14486
|
{
|
|
15238
14487
|
id: `${newRootId}_frustum`,
|
|
15239
14488
|
rootId: newRootId,
|
|
15240
|
-
|
|
14489
|
+
before: "render",
|
|
15241
14490
|
system: true
|
|
15242
14491
|
}
|
|
15243
14492
|
);
|
|
@@ -15249,7 +14498,7 @@ function createRoot(canvas) {
|
|
|
15249
14498
|
{
|
|
15250
14499
|
id: `${newRootId}_visibility`,
|
|
15251
14500
|
rootId: newRootId,
|
|
15252
|
-
|
|
14501
|
+
before: "render",
|
|
15253
14502
|
system: true,
|
|
15254
14503
|
after: `${newRootId}_frustum`
|
|
15255
14504
|
}
|
|
@@ -15261,7 +14510,7 @@ function createRoot(canvas) {
|
|
|
15261
14510
|
const userHandlesRender = scheduler.hasUserJobsInPhase("render", newRootId);
|
|
15262
14511
|
if (userHandlesRender || state2.internal.priority) return;
|
|
15263
14512
|
try {
|
|
15264
|
-
if (state2.
|
|
14513
|
+
if (state2.renderPipeline?.render) state2.renderPipeline.render();
|
|
15265
14514
|
else if (renderer2?.render) renderer2.render(state2.scene, state2.camera);
|
|
15266
14515
|
} catch (error) {
|
|
15267
14516
|
state2.setError(error instanceof Error ? error : new Error(String(error)));
|
|
@@ -15286,6 +14535,7 @@ function createRoot(canvas) {
|
|
|
15286
14535
|
unregisterRoot: () => {
|
|
15287
14536
|
unregisterRoot();
|
|
15288
14537
|
unregisterCanvasTarget();
|
|
14538
|
+
unregisterEventsFlush();
|
|
15289
14539
|
unregisterFrustum();
|
|
15290
14540
|
unregisterVisibility();
|
|
15291
14541
|
unregisterRender();
|
|
@@ -15361,7 +14611,8 @@ function unmountComponentAtNode(canvas, callback) {
|
|
|
15361
14611
|
dispose(state.scene);
|
|
15362
14612
|
_roots.delete(canvas);
|
|
15363
14613
|
if (callback) callback(canvas);
|
|
15364
|
-
} catch {
|
|
14614
|
+
} catch (error) {
|
|
14615
|
+
console.warn("[R3F] Error while unmounting root; teardown may be incomplete:", error);
|
|
15365
14616
|
}
|
|
15366
14617
|
}, 500);
|
|
15367
14618
|
}
|
|
@@ -15424,6 +14675,7 @@ function PortalInner({ state = {}, children, container }) {
|
|
|
15424
14675
|
viewport = rootState.viewport.getCurrentViewport(camera, new Vector3(), resolvedSize);
|
|
15425
14676
|
if (camera !== rootState.camera) updateCamera(camera, resolvedSize);
|
|
15426
14677
|
}
|
|
14678
|
+
const set = injectState.set;
|
|
15427
14679
|
return {
|
|
15428
14680
|
// The intersect consists of the previous root state
|
|
15429
14681
|
...rootState,
|
|
@@ -15442,7 +14694,7 @@ function PortalInner({ state = {}, children, container }) {
|
|
|
15442
14694
|
size: resolvedSize,
|
|
15443
14695
|
viewport: { ...rootState.viewport, ...viewport },
|
|
15444
14696
|
// Layers are allowed to override events
|
|
15445
|
-
setEvents: (events2) =>
|
|
14697
|
+
setEvents: (events2) => set((state2) => ({ ...state2, events: { ...state2.events, ...events2 } })),
|
|
15446
14698
|
// Container for child attachment - the portalScene (injected or container itself)
|
|
15447
14699
|
internal: { ...rootState.internal, ...injectState.internal, container: portalScene }
|
|
15448
14700
|
};
|
|
@@ -15451,9 +14703,13 @@ function PortalInner({ state = {}, children, container }) {
|
|
|
15451
14703
|
const store = createWithEqualityFn((set, get) => ({ ...rest, set, get }));
|
|
15452
14704
|
const onMutate = (prev) => store.setState((state2) => inject.current(prev, state2));
|
|
15453
14705
|
onMutate(previousRoot.getState());
|
|
15454
|
-
previousRoot.subscribe(onMutate);
|
|
15455
14706
|
return store;
|
|
15456
14707
|
}, [previousRoot, container]);
|
|
14708
|
+
useIsomorphicLayoutEffect(() => {
|
|
14709
|
+
const onMutate = (prev) => usePortalStore.setState((state2) => inject.current(prev, state2));
|
|
14710
|
+
const unsubscribe = previousRoot.subscribe(onMutate);
|
|
14711
|
+
return unsubscribe;
|
|
14712
|
+
}, [previousRoot, usePortalStore]);
|
|
15457
14713
|
return (
|
|
15458
14714
|
// @ts-ignore, reconciler types are not maintained
|
|
15459
14715
|
/* @__PURE__ */ jsx(Fragment, { children: reconciler.createPortal(
|
|
@@ -15467,6 +14723,59 @@ function flushSync(fn) {
|
|
|
15467
14723
|
return reconciler.flushSyncFromReconciler(fn);
|
|
15468
14724
|
}
|
|
15469
14725
|
|
|
14726
|
+
function parseBackground(background) {
|
|
14727
|
+
if (!background) return null;
|
|
14728
|
+
if (typeof background === "object" && !background.isColor) {
|
|
14729
|
+
const { backgroundMap, envMap, files, preset, ...rest } = background;
|
|
14730
|
+
return {
|
|
14731
|
+
...rest,
|
|
14732
|
+
preset,
|
|
14733
|
+
files: envMap || files,
|
|
14734
|
+
backgroundFiles: backgroundMap,
|
|
14735
|
+
background: true
|
|
14736
|
+
};
|
|
14737
|
+
}
|
|
14738
|
+
if (typeof background === "number") {
|
|
14739
|
+
return { color: background, background: true };
|
|
14740
|
+
}
|
|
14741
|
+
if (typeof background === "string") {
|
|
14742
|
+
if (background in presetsObj) {
|
|
14743
|
+
return { preset: background, background: true };
|
|
14744
|
+
}
|
|
14745
|
+
if (/^(https?:\/\/|\/|\.\/|\.\.\/)|\.(hdr|exr|jpg|jpeg|png|webp|gif)$/i.test(background)) {
|
|
14746
|
+
return { files: background, background: true };
|
|
14747
|
+
}
|
|
14748
|
+
return { color: background, background: true };
|
|
14749
|
+
}
|
|
14750
|
+
if (background.isColor) {
|
|
14751
|
+
return { color: background, background: true };
|
|
14752
|
+
}
|
|
14753
|
+
return null;
|
|
14754
|
+
}
|
|
14755
|
+
|
|
14756
|
+
function parseRendererConfig(rendererProp) {
|
|
14757
|
+
const isRendererConfig = typeof rendererProp === "object" && rendererProp !== null && !("render" in rendererProp) && ("primaryCanvas" in rendererProp || "scheduler" in rendererProp);
|
|
14758
|
+
if (isRendererConfig) {
|
|
14759
|
+
const { primaryCanvas: pc, scheduler: sc, ...rest } = rendererProp;
|
|
14760
|
+
return {
|
|
14761
|
+
primaryCanvas: pc,
|
|
14762
|
+
scheduler: sc,
|
|
14763
|
+
renderer: Object.keys(rest).length > 0 ? rest : rendererProp
|
|
14764
|
+
};
|
|
14765
|
+
}
|
|
14766
|
+
return { primaryCanvas: void 0, scheduler: void 0, renderer: rendererProp };
|
|
14767
|
+
}
|
|
14768
|
+
|
|
14769
|
+
function clearHmrCaches(store) {
|
|
14770
|
+
store.setState((state) => ({
|
|
14771
|
+
nodes: {},
|
|
14772
|
+
uniforms: {},
|
|
14773
|
+
buffers: {},
|
|
14774
|
+
gpuStorage: {},
|
|
14775
|
+
_hmrVersion: state._hmrVersion + 1
|
|
14776
|
+
}));
|
|
14777
|
+
}
|
|
14778
|
+
|
|
15470
14779
|
function CanvasImpl({
|
|
15471
14780
|
ref,
|
|
15472
14781
|
children,
|
|
@@ -15487,6 +14796,8 @@ function CanvasImpl({
|
|
|
15487
14796
|
raycaster,
|
|
15488
14797
|
camera,
|
|
15489
14798
|
scene,
|
|
14799
|
+
autoUpdateFrustum,
|
|
14800
|
+
occlusion,
|
|
15490
14801
|
onPointerMissed,
|
|
15491
14802
|
onDragOverMissed,
|
|
15492
14803
|
onDropMissed,
|
|
@@ -15498,39 +14809,10 @@ function CanvasImpl({
|
|
|
15498
14809
|
forceEven,
|
|
15499
14810
|
...props
|
|
15500
14811
|
}) {
|
|
15501
|
-
const { primaryCanvas, scheduler,
|
|
15502
|
-
const renderer = Object.keys(rendererConfig).length > 0 ? rendererConfig : rendererProp;
|
|
14812
|
+
const { primaryCanvas, scheduler, renderer } = parseRendererConfig(rendererProp);
|
|
15503
14813
|
React.useMemo(() => extend(THREE), []);
|
|
15504
14814
|
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]);
|
|
14815
|
+
const backgroundProps = React.useMemo(() => parseBackground(background), [background]);
|
|
15534
14816
|
const hasInitialSizeRef = React.useRef(false);
|
|
15535
14817
|
const measureConfig = React.useMemo(() => {
|
|
15536
14818
|
if (!hasInitialSizeRef.current) {
|
|
@@ -15572,6 +14854,7 @@ function CanvasImpl({
|
|
|
15572
14854
|
const handleDropMissed = useMutableCallback(onDropMissed);
|
|
15573
14855
|
const [block, setBlock] = React.useState(false);
|
|
15574
14856
|
const [error, setError] = React.useState(false);
|
|
14857
|
+
const [fallbackVisible, setFallbackVisible] = React.useState(false);
|
|
15575
14858
|
if (block) throw block;
|
|
15576
14859
|
if (error) throw error;
|
|
15577
14860
|
const root = React.useRef(null);
|
|
@@ -15579,6 +14862,7 @@ function CanvasImpl({
|
|
|
15579
14862
|
const unsubscribeErrorRef = React.useRef(null);
|
|
15580
14863
|
useIsomorphicLayoutEffect(() => {
|
|
15581
14864
|
effectActiveRef.current = true;
|
|
14865
|
+
if (fallbackVisible) return;
|
|
15582
14866
|
const canvas = canvasRef.current;
|
|
15583
14867
|
if (effectiveSize.width > 0 && effectiveSize.height > 0 && canvas) {
|
|
15584
14868
|
if (!root.current) {
|
|
@@ -15599,7 +14883,7 @@ function CanvasImpl({
|
|
|
15599
14883
|
}
|
|
15600
14884
|
async function run() {
|
|
15601
14885
|
if (!effectActiveRef.current || !root.current) return;
|
|
15602
|
-
await root.current.configure({
|
|
14886
|
+
const configured = await root.current.configure({
|
|
15603
14887
|
id,
|
|
15604
14888
|
primaryCanvas,
|
|
15605
14889
|
scheduler,
|
|
@@ -15614,6 +14898,8 @@ function CanvasImpl({
|
|
|
15614
14898
|
performance,
|
|
15615
14899
|
raycaster,
|
|
15616
14900
|
camera,
|
|
14901
|
+
autoUpdateFrustum,
|
|
14902
|
+
occlusion,
|
|
15617
14903
|
size: effectiveSize,
|
|
15618
14904
|
// Store size props for reset functionality
|
|
15619
14905
|
_sizeProps: width !== void 0 || height !== void 0 ? { width, height } : null,
|
|
@@ -15638,8 +14924,20 @@ function CanvasImpl({
|
|
|
15638
14924
|
}
|
|
15639
14925
|
onCreated?.(state);
|
|
15640
14926
|
}
|
|
15641
|
-
})
|
|
15642
|
-
|
|
14927
|
+
}).then(
|
|
14928
|
+
() => true,
|
|
14929
|
+
// Renderer setup failed (e.g. no WebGL/WebGPU support). The `fallback` prop lives
|
|
14930
|
+
// inside <canvas>, which browsers don't display, so surface it as visible DOM
|
|
14931
|
+
// instead; with no fallback, rethrow to an external error boundary. (#3757)
|
|
14932
|
+
(setupError) => {
|
|
14933
|
+
if (effectActiveRef.current) {
|
|
14934
|
+
if (fallback != null) setFallbackVisible(true);
|
|
14935
|
+
else setError(setupError);
|
|
14936
|
+
}
|
|
14937
|
+
return false;
|
|
14938
|
+
}
|
|
14939
|
+
);
|
|
14940
|
+
if (!configured || !effectActiveRef.current || !root.current) return;
|
|
15643
14941
|
root.current.render(
|
|
15644
14942
|
/* @__PURE__ */ jsx(Bridge, { children: /* @__PURE__ */ jsx(ErrorBoundary, { set: setError, children: /* @__PURE__ */ jsxs(React.Suspense, { fallback: /* @__PURE__ */ jsx(Block, { set: setBlock }), children: [
|
|
15645
14943
|
backgroundProps && /* @__PURE__ */ jsx(Environment, { ...backgroundProps }),
|
|
@@ -15673,20 +14971,13 @@ function CanvasImpl({
|
|
|
15673
14971
|
const handleHMR = () => {
|
|
15674
14972
|
queueMicrotask(() => {
|
|
15675
14973
|
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
|
-
}
|
|
14974
|
+
if (rootEntry?.store) clearHmrCaches(rootEntry.store);
|
|
15683
14975
|
});
|
|
15684
14976
|
};
|
|
15685
14977
|
if (typeof import.meta !== "undefined" && import.meta.hot) {
|
|
15686
14978
|
const hot = import.meta.hot;
|
|
15687
14979
|
hot.on("vite:afterUpdate", handleHMR);
|
|
15688
|
-
return () => hot.
|
|
15689
|
-
});
|
|
14980
|
+
return () => hot.off?.("vite:afterUpdate", handleHMR);
|
|
15690
14981
|
}
|
|
15691
14982
|
if (typeof module !== "undefined" && module.hot) {
|
|
15692
14983
|
const hot = module.hot;
|
|
@@ -15709,7 +15000,20 @@ function CanvasImpl({
|
|
|
15709
15000
|
...style
|
|
15710
15001
|
},
|
|
15711
15002
|
...props,
|
|
15712
|
-
children:
|
|
15003
|
+
children: fallbackVisible ? (
|
|
15004
|
+
// Renderer setup failed: render the fallback as visible DOM. Inside <canvas> (below)
|
|
15005
|
+
// it exists in the tree but browsers never paint it, which is the whole bug (#3757).
|
|
15006
|
+
fallback
|
|
15007
|
+
) : /* @__PURE__ */ jsx("div", { ref: containerRef, className: "r3f-canvas-container", style: { width: "100%", height: "100%" }, children: /* @__PURE__ */ jsx(
|
|
15008
|
+
"canvas",
|
|
15009
|
+
{
|
|
15010
|
+
ref: canvasRef,
|
|
15011
|
+
id,
|
|
15012
|
+
className: "r3f-canvas",
|
|
15013
|
+
style: { display: "block", width: "100%", height: "100%" },
|
|
15014
|
+
children: fallback
|
|
15015
|
+
}
|
|
15016
|
+
) })
|
|
15713
15017
|
}
|
|
15714
15018
|
);
|
|
15715
15019
|
}
|
|
@@ -15719,4 +15023,4 @@ function Canvas(props) {
|
|
|
15719
15023
|
|
|
15720
15024
|
extend(THREE);
|
|
15721
15025
|
|
|
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,
|
|
15026
|
+
export { Block, Canvas, Environment, EnvironmentCube, EnvironmentMap, EnvironmentPortal, ErrorBoundary, FROM_REF, IsObject, ONCE, Portal, R3F_BUILD_LEGACY, R3F_BUILD_WEBGPU, REACT_INTERNAL_PROPS, RESERVED_PROPS, Texture, _roots, act, addAfterEffect, addEffect, addTail, advance, applyProps, attach, buildGraph, calculateDpr, context, createEvents, createPointerEvents, createPortal, createRoot, createStore, detach, diffProps, dispose, createPointerEvents as events, extend, findInitialRoot, flushSync, fromRef, getInstanceProps, getPrimary, getPrimaryIds, getRootState, getUuidPrefix, hasConstructor, hasPrimary, invalidate, invalidateInstance, is, isColorRepresentation, isCopyable, isFromRef, isObject3D, isOnce, isOrthographicCamera, isRef, isRenderer, isTexture, isVectorLike, once, prepare, presetsObj, reconciler, registerPrimary, removeInteractivity, resolve, unmountComponentAtNode, unregisterPrimary, updateCamera, updateFrustum, useBridge, useEnvironment, useFrame, useGraph, useInstanceHandle, useIsomorphicLayoutEffect, useLoader, useMutableCallback, useRenderTarget, useStore, useTexture, useTextures, useThree, waitForPrimary };
|