@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/webgpu/index.mjs
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import * as webgpu from 'three/webgpu';
|
|
2
|
-
import { RenderTarget, CubeReflectionMapping, EquirectangularReflectionMapping, CubeTextureLoader, Scene,
|
|
2
|
+
import { CubeRenderTarget, RenderTarget, 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, CanvasTarget, Raycaster, OrthographicCamera, PerspectiveCamera, PCFShadowMap, VSMShadowMap, BasicShadowMap, ACESFilmicToneMapping, WebGPURenderer, Vector4, RenderPipeline } from 'three/webgpu';
|
|
3
3
|
import { Inspector } from 'three/addons/inspector/Inspector.js';
|
|
4
4
|
import { jsx, Fragment, jsxs } from 'react/jsx-runtime';
|
|
5
5
|
import * as React from 'react';
|
|
@@ -14,6 +14,8 @@ import { UltraHDRLoader } from 'three/examples/jsm/loaders/UltraHDRLoader.js';
|
|
|
14
14
|
import { GainMapLoader } from '@monogrid/gainmap-js';
|
|
15
15
|
import Tb, { unstable_scheduleCallback, unstable_IdlePriority } from 'scheduler';
|
|
16
16
|
import { createWithEqualityFn } from 'zustand/traditional';
|
|
17
|
+
import { getScheduler } from '@pmndrs/scheduler';
|
|
18
|
+
export { Scheduler, getScheduler } from '@pmndrs/scheduler';
|
|
17
19
|
import { suspend, preload, clear } from 'suspend-react';
|
|
18
20
|
import { dequal } from 'dequal/lite';
|
|
19
21
|
import 'zustand/shallow';
|
|
@@ -41,13 +43,16 @@ const WebGLRenderer = class WebGLRenderer2 {
|
|
|
41
43
|
}
|
|
42
44
|
};
|
|
43
45
|
const WebGLRenderTarget = null;
|
|
46
|
+
const WebGLCubeRenderTarget = null;
|
|
44
47
|
|
|
45
48
|
const THREE = /*#__PURE__*/_mergeNamespaces({
|
|
46
49
|
__proto__: null,
|
|
50
|
+
CubeRenderTargetCompat: CubeRenderTarget,
|
|
47
51
|
Inspector: Inspector,
|
|
48
52
|
R3F_BUILD_LEGACY: R3F_BUILD_LEGACY,
|
|
49
53
|
R3F_BUILD_WEBGPU: R3F_BUILD_WEBGPU,
|
|
50
54
|
RenderTargetCompat: RenderTarget,
|
|
55
|
+
WebGLCubeRenderTarget: WebGLCubeRenderTarget,
|
|
51
56
|
WebGLRenderTarget: WebGLRenderTarget,
|
|
52
57
|
WebGLRenderer: WebGLRenderer
|
|
53
58
|
}, [webgpu]);
|
|
@@ -149,7 +154,7 @@ function useEnvironment({
|
|
|
149
154
|
useLoader$1.clear(loader, multiFile ? [files] : files);
|
|
150
155
|
}
|
|
151
156
|
renderer.domElement.addEventListener("webglcontextlost", clearGainmapTexture, { once: true });
|
|
152
|
-
}, [files, renderer.domElement]);
|
|
157
|
+
}, [extension, files, loader, multiFile, renderer.domElement]);
|
|
153
158
|
const loaderResult = useLoader$1(
|
|
154
159
|
loader,
|
|
155
160
|
multiFile ? [files] : files,
|
|
@@ -321,15 +326,16 @@ function EnvironmentPortal({
|
|
|
321
326
|
preset = void 0,
|
|
322
327
|
extensions
|
|
323
328
|
}) {
|
|
324
|
-
const
|
|
329
|
+
const renderer = useThree$1((state) => state.renderer);
|
|
330
|
+
const isLegacy = useThree$1((state) => state.isLegacy);
|
|
325
331
|
const defaultScene = useThree$1((state) => state.scene);
|
|
326
332
|
const camera = React.useRef(null);
|
|
327
333
|
const [virtualScene] = React.useState(() => new Scene());
|
|
328
334
|
const fbo = React.useMemo(() => {
|
|
329
|
-
const fbo2 = new WebGLCubeRenderTarget(resolution);
|
|
335
|
+
const fbo2 = isLegacy ? new WebGLCubeRenderTarget(resolution) : new CubeRenderTarget(resolution);
|
|
330
336
|
fbo2.texture.type = HalfFloatType;
|
|
331
337
|
return fbo2;
|
|
332
|
-
}, [resolution]);
|
|
338
|
+
}, [resolution, isLegacy]);
|
|
333
339
|
React.useEffect(() => {
|
|
334
340
|
return () => {
|
|
335
341
|
fbo.dispose();
|
|
@@ -337,10 +343,10 @@ function EnvironmentPortal({
|
|
|
337
343
|
}, [fbo]);
|
|
338
344
|
React.useLayoutEffect(() => {
|
|
339
345
|
if (frames === 1) {
|
|
340
|
-
const autoClear =
|
|
341
|
-
|
|
342
|
-
camera.current.update(
|
|
343
|
-
|
|
346
|
+
const autoClear = renderer.autoClear;
|
|
347
|
+
renderer.autoClear = true;
|
|
348
|
+
camera.current.update(renderer, virtualScene);
|
|
349
|
+
renderer.autoClear = autoClear;
|
|
344
350
|
}
|
|
345
351
|
return setEnvProps(background, scene, defaultScene, fbo.texture, {
|
|
346
352
|
backgroundBlurriness: blur ?? backgroundBlurriness,
|
|
@@ -349,14 +355,29 @@ function EnvironmentPortal({
|
|
|
349
355
|
environmentIntensity,
|
|
350
356
|
environmentRotation
|
|
351
357
|
});
|
|
352
|
-
}, [
|
|
358
|
+
}, [
|
|
359
|
+
children,
|
|
360
|
+
virtualScene,
|
|
361
|
+
fbo.texture,
|
|
362
|
+
scene,
|
|
363
|
+
defaultScene,
|
|
364
|
+
background,
|
|
365
|
+
frames,
|
|
366
|
+
renderer,
|
|
367
|
+
blur,
|
|
368
|
+
backgroundBlurriness,
|
|
369
|
+
backgroundIntensity,
|
|
370
|
+
backgroundRotation,
|
|
371
|
+
environmentIntensity,
|
|
372
|
+
environmentRotation
|
|
373
|
+
]);
|
|
353
374
|
let count = 1;
|
|
354
375
|
useFrame$1(() => {
|
|
355
376
|
if (frames === Infinity || count < frames) {
|
|
356
|
-
const autoClear =
|
|
357
|
-
|
|
358
|
-
camera.current.update(
|
|
359
|
-
|
|
377
|
+
const autoClear = renderer.autoClear;
|
|
378
|
+
renderer.autoClear = true;
|
|
379
|
+
camera.current.update(renderer, virtualScene);
|
|
380
|
+
renderer.autoClear = autoClear;
|
|
360
381
|
count++;
|
|
361
382
|
}
|
|
362
383
|
});
|
|
@@ -420,9 +441,9 @@ function Environment(props) {
|
|
|
420
441
|
return props.ground ? /* @__PURE__ */ jsx(EnvironmentGround, { ...props }) : props.map ? /* @__PURE__ */ jsx(EnvironmentMap, { ...props }) : props.children ? /* @__PURE__ */ jsx(EnvironmentPortal, { ...props }) : /* @__PURE__ */ jsx(EnvironmentCube, { ...props });
|
|
421
442
|
}
|
|
422
443
|
|
|
423
|
-
var __defProp$
|
|
424
|
-
var __defNormalProp$
|
|
425
|
-
var __publicField$
|
|
444
|
+
var __defProp$1 = Object.defineProperty;
|
|
445
|
+
var __defNormalProp$1 = (obj, key, value) => key in obj ? __defProp$1(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
|
|
446
|
+
var __publicField$1 = (obj, key, value) => __defNormalProp$1(obj, typeof key !== "symbol" ? key + "" : key, value);
|
|
426
447
|
const act = React["act"];
|
|
427
448
|
const useIsomorphicLayoutEffect = /* @__PURE__ */ (() => typeof window !== "undefined" && (window.document?.createElement || window.navigator?.product === "ReactNative"))() ? React.useLayoutEffect : React.useEffect;
|
|
428
449
|
function useMutableCallback(fn) {
|
|
@@ -454,7 +475,7 @@ const ErrorBoundary = /* @__PURE__ */ (() => {
|
|
|
454
475
|
return _a = class extends React.Component {
|
|
455
476
|
constructor() {
|
|
456
477
|
super(...arguments);
|
|
457
|
-
__publicField$
|
|
478
|
+
__publicField$1(this, "state", { error: false });
|
|
458
479
|
}
|
|
459
480
|
componentDidCatch(err) {
|
|
460
481
|
this.props.set(err);
|
|
@@ -462,7 +483,7 @@ const ErrorBoundary = /* @__PURE__ */ (() => {
|
|
|
462
483
|
render() {
|
|
463
484
|
return this.state.error ? null : this.props.children;
|
|
464
485
|
}
|
|
465
|
-
}, __publicField$
|
|
486
|
+
}, __publicField$1(_a, "getDerivedStateFromError", () => ({ error: true })), _a;
|
|
466
487
|
})();
|
|
467
488
|
|
|
468
489
|
const is = {
|
|
@@ -599,8 +620,7 @@ function prepare(target, root, type, props) {
|
|
|
599
620
|
object,
|
|
600
621
|
eventCount: 0,
|
|
601
622
|
handlers: {},
|
|
602
|
-
isHidden: false
|
|
603
|
-
deferredRefs: []
|
|
623
|
+
isHidden: false
|
|
604
624
|
};
|
|
605
625
|
if (object) object.__r3f = instance;
|
|
606
626
|
}
|
|
@@ -757,6 +777,17 @@ function unregisterVisibility(store, object) {
|
|
|
757
777
|
internal.visibilityRegistry.delete(object.uuid);
|
|
758
778
|
internal.occlusionCache.delete(object);
|
|
759
779
|
}
|
|
780
|
+
function updateVisibilityHandlers(store, object, handlers) {
|
|
781
|
+
const { internal } = store.getState();
|
|
782
|
+
const entry = internal.visibilityRegistry.get(object.uuid);
|
|
783
|
+
if (!entry) return false;
|
|
784
|
+
entry.handlers = handlers;
|
|
785
|
+
if ((handlers.onOccluded || handlers.onVisible) && !internal.occlusionEnabled) {
|
|
786
|
+
object.occlusionTest = true;
|
|
787
|
+
enableOcclusion(store);
|
|
788
|
+
}
|
|
789
|
+
return true;
|
|
790
|
+
}
|
|
760
791
|
function checkVisibility(state) {
|
|
761
792
|
const { internal, camera } = state;
|
|
762
793
|
const registry = internal.visibilityRegistry;
|
|
@@ -944,10 +975,7 @@ function applyProps(object, props) {
|
|
|
944
975
|
continue;
|
|
945
976
|
}
|
|
946
977
|
if (value === void 0) continue;
|
|
947
|
-
if (isFromRef(value))
|
|
948
|
-
instance?.deferredRefs?.push({ prop, ref: value[FROM_REF] });
|
|
949
|
-
continue;
|
|
950
|
-
}
|
|
978
|
+
if (isFromRef(value)) continue;
|
|
951
979
|
if (isOnce(value)) {
|
|
952
980
|
if (instance?.appliedOnce?.has(prop)) continue;
|
|
953
981
|
if (instance) {
|
|
@@ -983,8 +1011,24 @@ function applyProps(object, props) {
|
|
|
983
1011
|
} else if (isVectorLike(target) && is.num(value)) {
|
|
984
1012
|
if ("setScalar" in target && typeof target.setScalar === "function") target.setScalar(value);
|
|
985
1013
|
else target.set(value);
|
|
1014
|
+
} else if (root instanceof ShaderMaterial && key === "uniforms" && is.obj(value)) {
|
|
1015
|
+
if (!is.obj(root.uniforms)) root.uniforms = {};
|
|
1016
|
+
const uniforms = root.uniforms;
|
|
1017
|
+
const nextUniforms = value;
|
|
1018
|
+
for (const name in nextUniforms) {
|
|
1019
|
+
const uniform = nextUniforms[name];
|
|
1020
|
+
const targetUniform = uniforms[name];
|
|
1021
|
+
if (targetUniform) Object.assign(targetUniform, uniform);
|
|
1022
|
+
else {
|
|
1023
|
+
const nextUniform = uniform instanceof Uniform ? uniform.clone() : new Uniform(uniform.value);
|
|
1024
|
+
uniforms[name] = nextUniform;
|
|
1025
|
+
}
|
|
1026
|
+
}
|
|
986
1027
|
} else {
|
|
987
1028
|
root[key] = value;
|
|
1029
|
+
if (key.endsWith("Node") && root.isMaterial) {
|
|
1030
|
+
root.needsUpdate = true;
|
|
1031
|
+
}
|
|
988
1032
|
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
|
|
989
1033
|
root[key].format === RGBAFormat && root[key].type === UnsignedByteType) {
|
|
990
1034
|
root[key].colorSpace = rootState.textureColorSpace;
|
|
@@ -998,6 +1042,9 @@ function applyProps(object, props) {
|
|
|
998
1042
|
if (instance.eventCount && object2.raycast !== null) {
|
|
999
1043
|
rootState.internal.interaction.push(object2);
|
|
1000
1044
|
}
|
|
1045
|
+
}
|
|
1046
|
+
if (instance?.parent && rootState?.internal && instance.object?.isObject3D) {
|
|
1047
|
+
const object2 = instance.object;
|
|
1001
1048
|
const root = findInitialRoot(instance);
|
|
1002
1049
|
const visibilityHandlers = {
|
|
1003
1050
|
onFramed: instance.handlers.onFramed,
|
|
@@ -1005,7 +1052,9 @@ function applyProps(object, props) {
|
|
|
1005
1052
|
onVisible: instance.handlers.onVisible
|
|
1006
1053
|
};
|
|
1007
1054
|
if (hasVisibilityHandlers(visibilityHandlers)) {
|
|
1008
|
-
|
|
1055
|
+
if (!updateVisibilityHandlers(root, object2, visibilityHandlers)) {
|
|
1056
|
+
registerVisibility(root, object2, visibilityHandlers);
|
|
1057
|
+
}
|
|
1009
1058
|
} else {
|
|
1010
1059
|
unregisterVisibility(root, object2);
|
|
1011
1060
|
}
|
|
@@ -1018,38 +1067,60 @@ function applyProps(object, props) {
|
|
|
1018
1067
|
return object;
|
|
1019
1068
|
}
|
|
1020
1069
|
|
|
1070
|
+
const DEFAULT_POINTER_ID = 0;
|
|
1071
|
+
const XR_POINTER_ID_START = 1e3;
|
|
1072
|
+
function getPointerState(internal, pointerId) {
|
|
1073
|
+
let state = internal.pointerMap.get(pointerId);
|
|
1074
|
+
if (!state) {
|
|
1075
|
+
state = {
|
|
1076
|
+
hovered: /* @__PURE__ */ new Map(),
|
|
1077
|
+
captured: /* @__PURE__ */ new Map(),
|
|
1078
|
+
initialClick: [0, 0],
|
|
1079
|
+
initialHits: []
|
|
1080
|
+
};
|
|
1081
|
+
internal.pointerMap.set(pointerId, state);
|
|
1082
|
+
}
|
|
1083
|
+
return state;
|
|
1084
|
+
}
|
|
1085
|
+
function getPointerId(event) {
|
|
1086
|
+
return "pointerId" in event ? event.pointerId : DEFAULT_POINTER_ID;
|
|
1087
|
+
}
|
|
1021
1088
|
function makeId(event) {
|
|
1022
1089
|
return (event.eventObject || event.object).uuid + "/" + event.index + event.instanceId;
|
|
1023
1090
|
}
|
|
1024
|
-
function releaseInternalPointerCapture(
|
|
1025
|
-
const
|
|
1091
|
+
function releaseInternalPointerCapture(internal, obj, pointerId) {
|
|
1092
|
+
const pointerState = internal.pointerMap.get(pointerId);
|
|
1093
|
+
if (!pointerState) return;
|
|
1094
|
+
const captureData = pointerState.captured.get(obj);
|
|
1026
1095
|
if (captureData) {
|
|
1027
|
-
|
|
1028
|
-
|
|
1029
|
-
capturedMap.delete(pointerId);
|
|
1030
|
-
captureData.target.releasePointerCapture(pointerId);
|
|
1031
|
-
}
|
|
1096
|
+
pointerState.captured.delete(obj);
|
|
1097
|
+
captureData.target.releasePointerCapture(pointerId);
|
|
1032
1098
|
}
|
|
1033
1099
|
}
|
|
1034
1100
|
function removeInteractivity(store, object) {
|
|
1035
1101
|
const { internal } = store.getState();
|
|
1036
1102
|
internal.interaction = internal.interaction.filter((o) => o !== object);
|
|
1037
|
-
|
|
1038
|
-
|
|
1039
|
-
|
|
1040
|
-
|
|
1103
|
+
for (const [pointerId, pointerState] of internal.pointerMap) {
|
|
1104
|
+
pointerState.initialHits = pointerState.initialHits.filter((o) => o !== object);
|
|
1105
|
+
pointerState.hovered.forEach((value, key) => {
|
|
1106
|
+
if (value.eventObject === object || value.object === object) {
|
|
1107
|
+
pointerState.hovered.delete(key);
|
|
1108
|
+
}
|
|
1109
|
+
});
|
|
1110
|
+
if (pointerState.captured.has(object)) {
|
|
1111
|
+
releaseInternalPointerCapture(internal, object, pointerId);
|
|
1041
1112
|
}
|
|
1042
|
-
}
|
|
1043
|
-
internal.capturedMap.forEach((captures, pointerId) => {
|
|
1044
|
-
releaseInternalPointerCapture(internal.capturedMap, object, captures, pointerId);
|
|
1045
|
-
});
|
|
1113
|
+
}
|
|
1046
1114
|
unregisterVisibility(store, object);
|
|
1047
1115
|
}
|
|
1048
1116
|
function createEvents(store) {
|
|
1049
|
-
function calculateDistance(event) {
|
|
1117
|
+
function calculateDistance(event, pointerId) {
|
|
1050
1118
|
const { internal } = store.getState();
|
|
1051
|
-
const
|
|
1052
|
-
|
|
1119
|
+
const pointerState = internal.pointerMap.get(pointerId);
|
|
1120
|
+
if (!pointerState) return 0;
|
|
1121
|
+
const [initialX, initialY] = pointerState.initialClick;
|
|
1122
|
+
const dx = event.offsetX - initialX;
|
|
1123
|
+
const dy = event.offsetY - initialY;
|
|
1053
1124
|
return Math.round(Math.sqrt(dx * dx + dy * dy));
|
|
1054
1125
|
}
|
|
1055
1126
|
function filterPointerEvents(objects) {
|
|
@@ -1085,6 +1156,15 @@ function createEvents(store) {
|
|
|
1085
1156
|
return state2.raycaster.camera ? state2.raycaster.intersectObject(obj, true) : [];
|
|
1086
1157
|
}
|
|
1087
1158
|
let hits = eventsObjects.flatMap(handleRaycast).sort((a, b) => {
|
|
1159
|
+
const aInteractivePriority = a.object.userData?.interactivePriority;
|
|
1160
|
+
const bInteractivePriority = b.object.userData?.interactivePriority;
|
|
1161
|
+
if (aInteractivePriority !== void 0 || bInteractivePriority !== void 0) {
|
|
1162
|
+
if (aInteractivePriority !== void 0 && bInteractivePriority === void 0) return -1;
|
|
1163
|
+
if (bInteractivePriority !== void 0 && aInteractivePriority === void 0) return 1;
|
|
1164
|
+
if (aInteractivePriority !== bInteractivePriority) {
|
|
1165
|
+
return (bInteractivePriority ?? 0) - (aInteractivePriority ?? 0);
|
|
1166
|
+
}
|
|
1167
|
+
}
|
|
1088
1168
|
const aState = getRootState(a.object);
|
|
1089
1169
|
const bState = getRootState(b.object);
|
|
1090
1170
|
const aPriority = aState?.events?.priority ?? 1;
|
|
@@ -1106,9 +1186,13 @@ function createEvents(store) {
|
|
|
1106
1186
|
eventObject = eventObject.parent;
|
|
1107
1187
|
}
|
|
1108
1188
|
}
|
|
1109
|
-
if ("pointerId" in event
|
|
1110
|
-
|
|
1111
|
-
|
|
1189
|
+
if ("pointerId" in event) {
|
|
1190
|
+
const pointerId = event.pointerId;
|
|
1191
|
+
const pointerState = state.internal.pointerMap.get(pointerId);
|
|
1192
|
+
if (pointerState?.captured.size) {
|
|
1193
|
+
for (const captureData of pointerState.captured.values()) {
|
|
1194
|
+
if (!duplicates.has(makeId(captureData.intersection))) intersections.push(captureData.intersection);
|
|
1195
|
+
}
|
|
1112
1196
|
}
|
|
1113
1197
|
}
|
|
1114
1198
|
return intersections;
|
|
@@ -1121,27 +1205,25 @@ function createEvents(store) {
|
|
|
1121
1205
|
if (state) {
|
|
1122
1206
|
const { raycaster, pointer, camera, internal } = state;
|
|
1123
1207
|
const unprojectedPoint = new Vector3(pointer.x, pointer.y, 0).unproject(camera);
|
|
1124
|
-
const hasPointerCapture = (id) =>
|
|
1208
|
+
const hasPointerCapture = (id) => {
|
|
1209
|
+
const pointerState = internal.pointerMap.get(id);
|
|
1210
|
+
return pointerState?.captured.has(hit.eventObject) ?? false;
|
|
1211
|
+
};
|
|
1125
1212
|
const setPointerCapture = (id) => {
|
|
1126
1213
|
const captureData = { intersection: hit, target: event.target };
|
|
1127
|
-
|
|
1128
|
-
|
|
1129
|
-
} else {
|
|
1130
|
-
internal.capturedMap.set(id, /* @__PURE__ */ new Map([[hit.eventObject, captureData]]));
|
|
1131
|
-
}
|
|
1214
|
+
const pointerState = getPointerState(internal, id);
|
|
1215
|
+
pointerState.captured.set(hit.eventObject, captureData);
|
|
1132
1216
|
event.target.setPointerCapture(id);
|
|
1133
1217
|
};
|
|
1134
1218
|
const releasePointerCapture = (id) => {
|
|
1135
|
-
|
|
1136
|
-
if (captures) {
|
|
1137
|
-
releaseInternalPointerCapture(internal.capturedMap, hit.eventObject, captures, id);
|
|
1138
|
-
}
|
|
1219
|
+
releaseInternalPointerCapture(internal, hit.eventObject, id);
|
|
1139
1220
|
};
|
|
1140
1221
|
const extractEventProps = {};
|
|
1141
1222
|
for (const prop in event) {
|
|
1142
1223
|
const property = event[prop];
|
|
1143
1224
|
if (typeof property !== "function") extractEventProps[prop] = property;
|
|
1144
1225
|
}
|
|
1226
|
+
const eventPointerId = "pointerId" in event ? event.pointerId : void 0;
|
|
1145
1227
|
const raycastEvent = {
|
|
1146
1228
|
...hit,
|
|
1147
1229
|
...extractEventProps,
|
|
@@ -1152,18 +1234,19 @@ function createEvents(store) {
|
|
|
1152
1234
|
unprojectedPoint,
|
|
1153
1235
|
ray: raycaster.ray,
|
|
1154
1236
|
camera,
|
|
1237
|
+
pointerId: eventPointerId,
|
|
1155
1238
|
// Hijack stopPropagation, which just sets a flag
|
|
1156
1239
|
stopPropagation() {
|
|
1157
|
-
const
|
|
1240
|
+
const pointerState = eventPointerId !== void 0 ? internal.pointerMap.get(eventPointerId) : void 0;
|
|
1158
1241
|
if (
|
|
1159
1242
|
// ...if this pointer hasn't been captured
|
|
1160
|
-
!
|
|
1161
|
-
|
|
1243
|
+
!pointerState?.captured.size || // ... or if the hit object is capturing the pointer
|
|
1244
|
+
pointerState.captured.has(hit.eventObject)
|
|
1162
1245
|
) {
|
|
1163
1246
|
raycastEvent.stopped = localState.stopped = true;
|
|
1164
|
-
if (
|
|
1247
|
+
if (pointerState?.hovered.size && Array.from(pointerState.hovered.values()).find((i) => i.eventObject === hit.eventObject)) {
|
|
1165
1248
|
const higher = intersections.slice(0, intersections.indexOf(hit));
|
|
1166
|
-
cancelPointer([...higher, hit]);
|
|
1249
|
+
cancelPointer([...higher, hit], eventPointerId);
|
|
1167
1250
|
}
|
|
1168
1251
|
}
|
|
1169
1252
|
},
|
|
@@ -1179,15 +1262,18 @@ function createEvents(store) {
|
|
|
1179
1262
|
}
|
|
1180
1263
|
return intersections;
|
|
1181
1264
|
}
|
|
1182
|
-
function cancelPointer(intersections) {
|
|
1265
|
+
function cancelPointer(intersections, pointerId) {
|
|
1183
1266
|
const { internal } = store.getState();
|
|
1184
|
-
|
|
1267
|
+
const pid = pointerId ?? DEFAULT_POINTER_ID;
|
|
1268
|
+
const pointerState = internal.pointerMap.get(pid);
|
|
1269
|
+
if (!pointerState) return;
|
|
1270
|
+
for (const [hoveredId, hoveredObj] of pointerState.hovered) {
|
|
1185
1271
|
if (!intersections.length || !intersections.find(
|
|
1186
1272
|
(hit) => hit.object === hoveredObj.object && hit.index === hoveredObj.index && hit.instanceId === hoveredObj.instanceId
|
|
1187
1273
|
)) {
|
|
1188
1274
|
const eventObject = hoveredObj.eventObject;
|
|
1189
1275
|
const instance = eventObject.__r3f;
|
|
1190
|
-
|
|
1276
|
+
pointerState.hovered.delete(hoveredId);
|
|
1191
1277
|
if (instance?.eventCount) {
|
|
1192
1278
|
const handlers = instance.handlers;
|
|
1193
1279
|
const data = { ...hoveredObj, intersections };
|
|
@@ -1216,41 +1302,118 @@ function createEvents(store) {
|
|
|
1216
1302
|
instance?.handlers.onDropMissed?.(event);
|
|
1217
1303
|
}
|
|
1218
1304
|
}
|
|
1305
|
+
function cleanupPointer(pointerId) {
|
|
1306
|
+
const { internal } = store.getState();
|
|
1307
|
+
const pointerState = internal.pointerMap.get(pointerId);
|
|
1308
|
+
if (pointerState) {
|
|
1309
|
+
for (const [, hoveredObj] of pointerState.hovered) {
|
|
1310
|
+
const eventObject = hoveredObj.eventObject;
|
|
1311
|
+
const instance = eventObject.__r3f;
|
|
1312
|
+
if (instance?.eventCount) {
|
|
1313
|
+
const handlers = instance.handlers;
|
|
1314
|
+
const data = { ...hoveredObj, intersections: [] };
|
|
1315
|
+
handlers.onPointerOut?.(data);
|
|
1316
|
+
handlers.onPointerLeave?.(data);
|
|
1317
|
+
}
|
|
1318
|
+
}
|
|
1319
|
+
internal.pointerMap.delete(pointerId);
|
|
1320
|
+
}
|
|
1321
|
+
internal.pointerDirty.delete(pointerId);
|
|
1322
|
+
}
|
|
1323
|
+
function processDeferredPointer(event, pointerId) {
|
|
1324
|
+
const state = store.getState();
|
|
1325
|
+
const { internal } = state;
|
|
1326
|
+
if (!state.events.enabled) return;
|
|
1327
|
+
const filter = filterPointerEvents;
|
|
1328
|
+
const hits = intersect(event, filter);
|
|
1329
|
+
cancelPointer(hits, pointerId);
|
|
1330
|
+
function onIntersect(data) {
|
|
1331
|
+
const eventObject = data.eventObject;
|
|
1332
|
+
const instance = eventObject.__r3f;
|
|
1333
|
+
if (!instance?.eventCount) return;
|
|
1334
|
+
const handlers = instance.handlers;
|
|
1335
|
+
if (handlers.onPointerOver || handlers.onPointerEnter || handlers.onPointerOut || handlers.onPointerLeave) {
|
|
1336
|
+
const id = makeId(data);
|
|
1337
|
+
const pointerState = getPointerState(internal, pointerId);
|
|
1338
|
+
const hoveredItem = pointerState.hovered.get(id);
|
|
1339
|
+
if (!hoveredItem) {
|
|
1340
|
+
pointerState.hovered.set(id, data);
|
|
1341
|
+
handlers.onPointerOver?.(data);
|
|
1342
|
+
handlers.onPointerEnter?.(data);
|
|
1343
|
+
} else if (hoveredItem.stopped) {
|
|
1344
|
+
data.stopPropagation();
|
|
1345
|
+
}
|
|
1346
|
+
}
|
|
1347
|
+
handlers.onPointerMove?.(data);
|
|
1348
|
+
}
|
|
1349
|
+
handleIntersects(hits, event, 0, onIntersect);
|
|
1350
|
+
}
|
|
1219
1351
|
function handlePointer(name) {
|
|
1220
1352
|
switch (name) {
|
|
1221
1353
|
case "onPointerLeave":
|
|
1222
|
-
case "onPointerCancel":
|
|
1223
1354
|
case "onDragLeave":
|
|
1224
1355
|
return () => cancelPointer([]);
|
|
1356
|
+
// Global cancel of these events
|
|
1357
|
+
case "onPointerCancel":
|
|
1358
|
+
return (event) => {
|
|
1359
|
+
const pointerId = getPointerId(event);
|
|
1360
|
+
cleanupPointer(pointerId);
|
|
1361
|
+
};
|
|
1225
1362
|
case "onLostPointerCapture":
|
|
1226
1363
|
return (event) => {
|
|
1227
1364
|
const { internal } = store.getState();
|
|
1228
|
-
|
|
1365
|
+
const pointerId = getPointerId(event);
|
|
1366
|
+
const pointerState = internal.pointerMap.get(pointerId);
|
|
1367
|
+
if (pointerState?.captured.size) {
|
|
1229
1368
|
requestAnimationFrame(() => {
|
|
1230
|
-
|
|
1231
|
-
|
|
1232
|
-
|
|
1369
|
+
const pointerState2 = internal.pointerMap.get(pointerId);
|
|
1370
|
+
if (pointerState2?.captured.size) {
|
|
1371
|
+
pointerState2.captured.clear();
|
|
1233
1372
|
}
|
|
1373
|
+
cancelPointer([], pointerId);
|
|
1234
1374
|
});
|
|
1235
1375
|
}
|
|
1236
1376
|
};
|
|
1237
1377
|
}
|
|
1238
1378
|
return function handleEvent(event) {
|
|
1239
1379
|
const state = store.getState();
|
|
1240
|
-
const { onPointerMissed, onDragOverMissed, onDropMissed, internal } = state;
|
|
1380
|
+
const { onPointerMissed, onDragOverMissed, onDropMissed, internal, events } = state;
|
|
1381
|
+
const pointerId = getPointerId(event);
|
|
1241
1382
|
internal.lastEvent.current = event;
|
|
1242
|
-
if (!
|
|
1383
|
+
if (!events.enabled) return;
|
|
1243
1384
|
const isPointerMove = name === "onPointerMove";
|
|
1244
1385
|
const isDragOver = name === "onDragOver";
|
|
1245
1386
|
const isDrop = name === "onDrop";
|
|
1246
1387
|
const isClickEvent = name === "onClick" || name === "onContextMenu" || name === "onDoubleClick";
|
|
1388
|
+
const isPointerDown = name === "onPointerDown";
|
|
1389
|
+
const isPointerUp = name === "onPointerUp";
|
|
1390
|
+
const isWheel = name === "onWheel";
|
|
1391
|
+
const canDeferRaycasts = events.frameTimedRaycasts && state.frameloop === "always";
|
|
1392
|
+
if (isPointerMove && canDeferRaycasts) {
|
|
1393
|
+
events.compute?.(event, state);
|
|
1394
|
+
internal.pointerDirty.set(pointerId, event);
|
|
1395
|
+
return;
|
|
1396
|
+
}
|
|
1397
|
+
if (isWheel && canDeferRaycasts && !events.alwaysFireOnScroll) {
|
|
1398
|
+
events.compute?.(event, state);
|
|
1399
|
+
internal.pointerDirty.set(pointerId, event);
|
|
1400
|
+
return;
|
|
1401
|
+
}
|
|
1402
|
+
if ((isClickEvent || isPointerDown || isPointerUp) && internal.pointerDirty.has(pointerId)) {
|
|
1403
|
+
const deferredEvent = internal.pointerDirty.get(pointerId);
|
|
1404
|
+
internal.pointerDirty.delete(pointerId);
|
|
1405
|
+
processDeferredPointer(deferredEvent, pointerId);
|
|
1406
|
+
}
|
|
1247
1407
|
const filter = isPointerMove || isDragOver || isDrop ? filterPointerEvents : void 0;
|
|
1248
1408
|
const hits = intersect(event, filter);
|
|
1249
|
-
const delta = isClickEvent ? calculateDistance(event) : 0;
|
|
1250
|
-
if (
|
|
1251
|
-
|
|
1252
|
-
|
|
1253
|
-
|
|
1409
|
+
const delta = isClickEvent ? calculateDistance(event, pointerId) : 0;
|
|
1410
|
+
if (isPointerDown) {
|
|
1411
|
+
const pointerState2 = getPointerState(internal, pointerId);
|
|
1412
|
+
pointerState2.initialClick = [event.offsetX, event.offsetY];
|
|
1413
|
+
pointerState2.initialHits = hits.map((hit) => hit.eventObject);
|
|
1414
|
+
}
|
|
1415
|
+
const pointerState = internal.pointerMap.get(pointerId);
|
|
1416
|
+
const initialHits = pointerState?.initialHits ?? [];
|
|
1254
1417
|
if (isClickEvent && !hits.length) {
|
|
1255
1418
|
if (delta <= 2) {
|
|
1256
1419
|
pointerMissed(event, internal.interaction);
|
|
@@ -1265,7 +1428,9 @@ function createEvents(store) {
|
|
|
1265
1428
|
dropMissed(event, internal.interaction);
|
|
1266
1429
|
if (onDropMissed) onDropMissed(event);
|
|
1267
1430
|
}
|
|
1268
|
-
if (isPointerMove || isDragOver)
|
|
1431
|
+
if (isPointerMove || isDragOver) {
|
|
1432
|
+
cancelPointer(hits, pointerId);
|
|
1433
|
+
}
|
|
1269
1434
|
function onIntersect(data) {
|
|
1270
1435
|
const eventObject = data.eventObject;
|
|
1271
1436
|
const instance = eventObject.__r3f;
|
|
@@ -1274,9 +1439,10 @@ function createEvents(store) {
|
|
|
1274
1439
|
if (isPointerMove) {
|
|
1275
1440
|
if (handlers.onPointerOver || handlers.onPointerEnter || handlers.onPointerOut || handlers.onPointerLeave) {
|
|
1276
1441
|
const id = makeId(data);
|
|
1277
|
-
const
|
|
1442
|
+
const pointerState2 = getPointerState(internal, pointerId);
|
|
1443
|
+
const hoveredItem = pointerState2.hovered.get(id);
|
|
1278
1444
|
if (!hoveredItem) {
|
|
1279
|
-
|
|
1445
|
+
pointerState2.hovered.set(id, data);
|
|
1280
1446
|
handlers.onPointerOver?.(data);
|
|
1281
1447
|
handlers.onPointerEnter?.(data);
|
|
1282
1448
|
} else if (hoveredItem.stopped) {
|
|
@@ -1286,9 +1452,10 @@ function createEvents(store) {
|
|
|
1286
1452
|
handlers.onPointerMove?.(data);
|
|
1287
1453
|
} else if (isDragOver) {
|
|
1288
1454
|
const id = makeId(data);
|
|
1289
|
-
const
|
|
1455
|
+
const pointerState2 = getPointerState(internal, pointerId);
|
|
1456
|
+
const hoveredItem = pointerState2.hovered.get(id);
|
|
1290
1457
|
if (!hoveredItem) {
|
|
1291
|
-
|
|
1458
|
+
pointerState2.hovered.set(id, data);
|
|
1292
1459
|
handlers.onDragOverEnter?.(data);
|
|
1293
1460
|
} else if (hoveredItem.stopped) {
|
|
1294
1461
|
data.stopPropagation();
|
|
@@ -1299,18 +1466,18 @@ function createEvents(store) {
|
|
|
1299
1466
|
} else {
|
|
1300
1467
|
const handler = handlers[name];
|
|
1301
1468
|
if (handler) {
|
|
1302
|
-
if (!isClickEvent ||
|
|
1469
|
+
if (!isClickEvent || initialHits.includes(eventObject)) {
|
|
1303
1470
|
pointerMissed(
|
|
1304
1471
|
event,
|
|
1305
|
-
internal.interaction.filter((object) => !
|
|
1472
|
+
internal.interaction.filter((object) => !initialHits.includes(object))
|
|
1306
1473
|
);
|
|
1307
1474
|
handler(data);
|
|
1308
1475
|
}
|
|
1309
1476
|
} else {
|
|
1310
|
-
if (isClickEvent &&
|
|
1477
|
+
if (isClickEvent && initialHits.includes(eventObject)) {
|
|
1311
1478
|
pointerMissed(
|
|
1312
1479
|
event,
|
|
1313
|
-
internal.interaction.filter((object) => !
|
|
1480
|
+
internal.interaction.filter((object) => !initialHits.includes(object))
|
|
1314
1481
|
);
|
|
1315
1482
|
}
|
|
1316
1483
|
}
|
|
@@ -1319,7 +1486,15 @@ function createEvents(store) {
|
|
|
1319
1486
|
handleIntersects(hits, event, delta, onIntersect);
|
|
1320
1487
|
};
|
|
1321
1488
|
}
|
|
1322
|
-
|
|
1489
|
+
function flushDeferredPointers() {
|
|
1490
|
+
const { internal, events } = store.getState();
|
|
1491
|
+
if (!events.frameTimedRaycasts) return;
|
|
1492
|
+
for (const [pointerId, event] of internal.pointerDirty) {
|
|
1493
|
+
processDeferredPointer(event, pointerId);
|
|
1494
|
+
}
|
|
1495
|
+
internal.pointerDirty.clear();
|
|
1496
|
+
}
|
|
1497
|
+
return { handlePointer, flushDeferredPointers, processDeferredPointer };
|
|
1323
1498
|
}
|
|
1324
1499
|
const DOM_EVENTS = {
|
|
1325
1500
|
onClick: ["click", false],
|
|
@@ -1338,10 +1513,15 @@ const DOM_EVENTS = {
|
|
|
1338
1513
|
onLostPointerCapture: ["lostpointercapture", true]
|
|
1339
1514
|
};
|
|
1340
1515
|
function createPointerEvents(store) {
|
|
1341
|
-
const { handlePointer } = createEvents(store);
|
|
1516
|
+
const { handlePointer, flushDeferredPointers, processDeferredPointer } = createEvents(store);
|
|
1517
|
+
let nextXRPointerId = XR_POINTER_ID_START;
|
|
1518
|
+
const xrPointers = /* @__PURE__ */ new Map();
|
|
1342
1519
|
return {
|
|
1343
1520
|
priority: 1,
|
|
1344
1521
|
enabled: true,
|
|
1522
|
+
frameTimedRaycasts: true,
|
|
1523
|
+
alwaysFireOnScroll: true,
|
|
1524
|
+
updateOnFrame: false,
|
|
1345
1525
|
compute(event, state) {
|
|
1346
1526
|
state.pointer.set(event.offsetX / state.size.width * 2 - 1, -(event.offsetY / state.size.height) * 2 + 1);
|
|
1347
1527
|
state.raycaster.setFromCamera(state.pointer, state.camera);
|
|
@@ -1351,11 +1531,33 @@ function createPointerEvents(store) {
|
|
|
1351
1531
|
(acc, key) => ({ ...acc, [key]: handlePointer(key) }),
|
|
1352
1532
|
{}
|
|
1353
1533
|
),
|
|
1354
|
-
update: () => {
|
|
1534
|
+
update: (pointerId) => {
|
|
1355
1535
|
const { events, internal } = store.getState();
|
|
1356
|
-
if (
|
|
1536
|
+
if (!events.handlers) return;
|
|
1537
|
+
if (pointerId !== void 0) {
|
|
1538
|
+
const event = internal.pointerDirty.get(pointerId);
|
|
1539
|
+
if (event) {
|
|
1540
|
+
internal.pointerDirty.delete(pointerId);
|
|
1541
|
+
processDeferredPointer(event, pointerId);
|
|
1542
|
+
} else if (internal.lastEvent?.current) {
|
|
1543
|
+
processDeferredPointer(internal.lastEvent.current, pointerId);
|
|
1544
|
+
}
|
|
1545
|
+
} else {
|
|
1546
|
+
flushDeferredPointers();
|
|
1547
|
+
if (internal.lastEvent?.current) {
|
|
1548
|
+
events.handlers.onPointerMove(internal.lastEvent.current);
|
|
1549
|
+
}
|
|
1550
|
+
}
|
|
1551
|
+
},
|
|
1552
|
+
flush: () => {
|
|
1553
|
+
const { events, internal } = store.getState();
|
|
1554
|
+
flushDeferredPointers();
|
|
1555
|
+
if (events.updateOnFrame && internal.lastEvent?.current && events.handlers) {
|
|
1556
|
+
events.handlers.onPointerMove(internal.lastEvent.current);
|
|
1557
|
+
}
|
|
1357
1558
|
},
|
|
1358
1559
|
connect: (target) => {
|
|
1560
|
+
if (!target) return;
|
|
1359
1561
|
const { set, events } = store.getState();
|
|
1360
1562
|
events.disconnect?.();
|
|
1361
1563
|
set((state) => ({ events: { ...state.events, connected: target } }));
|
|
@@ -1379,6 +1581,33 @@ function createPointerEvents(store) {
|
|
|
1379
1581
|
}
|
|
1380
1582
|
set((state) => ({ events: { ...state.events, connected: void 0 } }));
|
|
1381
1583
|
}
|
|
1584
|
+
},
|
|
1585
|
+
// PREVIEW (A8): the XR pointer registration API may change before stable.
|
|
1586
|
+
registerPointer: (config) => {
|
|
1587
|
+
const pointerId = nextXRPointerId++;
|
|
1588
|
+
xrPointers.set(pointerId, config);
|
|
1589
|
+
const { internal } = store.getState();
|
|
1590
|
+
getPointerState(internal, pointerId);
|
|
1591
|
+
return pointerId;
|
|
1592
|
+
},
|
|
1593
|
+
unregisterPointer: (pointerId) => {
|
|
1594
|
+
xrPointers.delete(pointerId);
|
|
1595
|
+
const { internal } = store.getState();
|
|
1596
|
+
const pointerState = internal.pointerMap.get(pointerId);
|
|
1597
|
+
if (pointerState) {
|
|
1598
|
+
for (const [, hoveredObj] of pointerState.hovered) {
|
|
1599
|
+
const eventObject = hoveredObj.eventObject;
|
|
1600
|
+
const instance = eventObject.__r3f;
|
|
1601
|
+
if (instance?.eventCount) {
|
|
1602
|
+
const handlers = instance.handlers;
|
|
1603
|
+
const data = { ...hoveredObj, intersections: [] };
|
|
1604
|
+
handlers.onPointerOut?.(data);
|
|
1605
|
+
handlers.onPointerLeave?.(data);
|
|
1606
|
+
}
|
|
1607
|
+
}
|
|
1608
|
+
internal.pointerMap.delete(pointerId);
|
|
1609
|
+
}
|
|
1610
|
+
internal.pointerDirty.delete(pointerId);
|
|
1382
1611
|
}
|
|
1383
1612
|
};
|
|
1384
1613
|
}
|
|
@@ -1440,1036 +1669,11 @@ function notifyAlpha({ message, link }) {
|
|
|
1440
1669
|
}
|
|
1441
1670
|
}
|
|
1442
1671
|
|
|
1443
|
-
|
|
1444
|
-
|
|
1445
|
-
|
|
1446
|
-
const
|
|
1447
|
-
|
|
1448
|
-
constructor() {
|
|
1449
|
-
/** Ordered list of phase nodes */
|
|
1450
|
-
__publicField$2(this, "phases", []);
|
|
1451
|
-
/** Quick lookup by name */
|
|
1452
|
-
__publicField$2(this, "phaseMap", /* @__PURE__ */ new Map());
|
|
1453
|
-
/** Cached ordered names (invalidated on changes) */
|
|
1454
|
-
__publicField$2(this, "orderedNamesCache", null);
|
|
1455
|
-
this.initializeDefaultPhases();
|
|
1456
|
-
}
|
|
1457
|
-
//* Initialization --------------------------------
|
|
1458
|
-
initializeDefaultPhases() {
|
|
1459
|
-
for (const name of DEFAULT_PHASES) {
|
|
1460
|
-
const node = { name, isAutoGenerated: false };
|
|
1461
|
-
this.phases.push(node);
|
|
1462
|
-
this.phaseMap.set(name, node);
|
|
1463
|
-
}
|
|
1464
|
-
this.invalidateCache();
|
|
1465
|
-
}
|
|
1466
|
-
//* Public API --------------------------------
|
|
1467
|
-
/**
|
|
1468
|
-
* Add a named phase to the graph
|
|
1469
|
-
* @param name - Phase name (must be unique)
|
|
1470
|
-
* @param options - Position options (before or after another phase)
|
|
1471
|
-
*/
|
|
1472
|
-
addPhase(name, options = {}) {
|
|
1473
|
-
if (this.phaseMap.has(name)) {
|
|
1474
|
-
console.warn(`[useFrame] Phase "${name}" already exists`);
|
|
1475
|
-
return;
|
|
1476
|
-
}
|
|
1477
|
-
const { before, after } = options;
|
|
1478
|
-
const node = { name, isAutoGenerated: false };
|
|
1479
|
-
let insertIndex = this.phases.length;
|
|
1480
|
-
const targetIndex = this.getPhaseIndex(before ?? after);
|
|
1481
|
-
if (targetIndex !== -1) {
|
|
1482
|
-
insertIndex = before ? targetIndex : targetIndex + 1;
|
|
1483
|
-
} else {
|
|
1484
|
-
const constraintType = before ? "before" : "after";
|
|
1485
|
-
console.warn(`[useFrame] Phase "${before ?? after}" not found for '${constraintType}' constraint`);
|
|
1486
|
-
}
|
|
1487
|
-
this.phases.splice(insertIndex, 0, node);
|
|
1488
|
-
this.phaseMap.set(name, node);
|
|
1489
|
-
this.invalidateCache();
|
|
1490
|
-
}
|
|
1491
|
-
/**
|
|
1492
|
-
* Get ordered list of phase names
|
|
1493
|
-
*/
|
|
1494
|
-
getOrderedPhases() {
|
|
1495
|
-
if (this.orderedNamesCache === null) this.orderedNamesCache = this.phases.map((p) => p.name);
|
|
1496
|
-
return this.orderedNamesCache;
|
|
1497
|
-
}
|
|
1498
|
-
/**
|
|
1499
|
-
* Check if a phase exists
|
|
1500
|
-
*/
|
|
1501
|
-
hasPhase(name) {
|
|
1502
|
-
return this.phaseMap.has(name);
|
|
1503
|
-
}
|
|
1504
|
-
/**
|
|
1505
|
-
* Get the index of a phase (-1 if not found)
|
|
1506
|
-
*/
|
|
1507
|
-
getPhaseIndex(name) {
|
|
1508
|
-
if (!name) return -1;
|
|
1509
|
-
return this.phases.findIndex((p) => p.name === name);
|
|
1510
|
-
}
|
|
1511
|
-
/**
|
|
1512
|
-
* Ensure a phase exists, creating an auto-generated one if needed.
|
|
1513
|
-
* Used for resolving before/after constraints.
|
|
1514
|
-
*
|
|
1515
|
-
* @param name - The phase name to ensure exists
|
|
1516
|
-
* @returns The phase name (may be auto-generated like 'before:render')
|
|
1517
|
-
*/
|
|
1518
|
-
ensurePhase(name) {
|
|
1519
|
-
if (this.phaseMap.has(name)) return name;
|
|
1520
|
-
const node = { name, isAutoGenerated: true };
|
|
1521
|
-
this.phases.push(node);
|
|
1522
|
-
this.phaseMap.set(name, node);
|
|
1523
|
-
this.invalidateCache();
|
|
1524
|
-
return name;
|
|
1525
|
-
}
|
|
1526
|
-
/**
|
|
1527
|
-
* Resolve where a job with before/after constraints should go.
|
|
1528
|
-
* Creates auto-generated phases if needed.
|
|
1529
|
-
*
|
|
1530
|
-
* @param before - Phase(s) to run before
|
|
1531
|
-
* @param after - Phase(s) to run after
|
|
1532
|
-
* @returns The resolved phase name
|
|
1533
|
-
*/
|
|
1534
|
-
resolveConstraintPhase(before, after) {
|
|
1535
|
-
const beforeArr = before ? Array.isArray(before) ? before : [before] : [];
|
|
1536
|
-
const afterArr = after ? Array.isArray(after) ? after : [after] : [];
|
|
1537
|
-
if (beforeArr.length > 0) {
|
|
1538
|
-
return this.ensureAutoPhase(beforeArr[0], "before", 0);
|
|
1539
|
-
}
|
|
1540
|
-
if (afterArr.length > 0) {
|
|
1541
|
-
return this.ensureAutoPhase(afterArr[0], "after", 1);
|
|
1542
|
-
}
|
|
1543
|
-
return "update";
|
|
1544
|
-
}
|
|
1545
|
-
/**
|
|
1546
|
-
* Ensure an auto-generated phase exists relative to a target phase.
|
|
1547
|
-
* Creates the phase if it doesn't exist, inserting it at the correct position.
|
|
1548
|
-
*
|
|
1549
|
-
* @param target - The target phase name to position relative to
|
|
1550
|
-
* @param prefix - Prefix for auto-generated phase name ('before' or 'after')
|
|
1551
|
-
* @param offset - Insertion offset (0 for before, 1 for after)
|
|
1552
|
-
* @returns The auto-generated phase name
|
|
1553
|
-
*/
|
|
1554
|
-
ensureAutoPhase(target, prefix, offset) {
|
|
1555
|
-
const autoName = `${prefix}:${target}`;
|
|
1556
|
-
if (this.phaseMap.has(autoName)) return autoName;
|
|
1557
|
-
const node = { name: autoName, isAutoGenerated: true };
|
|
1558
|
-
const targetIndex = this.getPhaseIndex(target);
|
|
1559
|
-
if (targetIndex !== -1) this.phases.splice(targetIndex + offset, 0, node);
|
|
1560
|
-
else this.phases.push(node);
|
|
1561
|
-
this.phaseMap.set(autoName, node);
|
|
1562
|
-
this.invalidateCache();
|
|
1563
|
-
return autoName;
|
|
1564
|
-
}
|
|
1565
|
-
// Internal --------------------------------
|
|
1566
|
-
invalidateCache() {
|
|
1567
|
-
this.orderedNamesCache = null;
|
|
1568
|
-
}
|
|
1569
|
-
}
|
|
1570
|
-
|
|
1571
|
-
function rebuildSortedJobs(jobs, phaseGraph) {
|
|
1572
|
-
const orderedPhases = phaseGraph.getOrderedPhases();
|
|
1573
|
-
const buckets = /* @__PURE__ */ new Map();
|
|
1574
|
-
for (const phase of orderedPhases) {
|
|
1575
|
-
buckets.set(phase, []);
|
|
1576
|
-
}
|
|
1577
|
-
for (const job of jobs.values()) {
|
|
1578
|
-
if (!job.enabled) continue;
|
|
1579
|
-
let bucket = buckets.get(job.phase);
|
|
1580
|
-
if (!bucket) {
|
|
1581
|
-
bucket = [];
|
|
1582
|
-
buckets.set(job.phase, bucket);
|
|
1583
|
-
}
|
|
1584
|
-
bucket.push(job);
|
|
1585
|
-
}
|
|
1586
|
-
const sortedBuckets = [];
|
|
1587
|
-
for (const phase of orderedPhases) {
|
|
1588
|
-
const bucket = buckets.get(phase);
|
|
1589
|
-
if (!bucket || bucket.length === 0) continue;
|
|
1590
|
-
bucket.sort((a, b) => {
|
|
1591
|
-
if (a.priority !== b.priority) return b.priority - a.priority;
|
|
1592
|
-
return a.index - b.index;
|
|
1593
|
-
});
|
|
1594
|
-
sortedBuckets.push(hasCrossJobConstraints(bucket) ? topologicalSort(bucket) : bucket);
|
|
1595
|
-
}
|
|
1596
|
-
for (const [phase, bucket] of buckets) {
|
|
1597
|
-
if (!orderedPhases.includes(phase) && bucket.length > 0) {
|
|
1598
|
-
bucket.sort((a, b) => {
|
|
1599
|
-
if (a.priority !== b.priority) return b.priority - a.priority;
|
|
1600
|
-
return a.index - b.index;
|
|
1601
|
-
});
|
|
1602
|
-
sortedBuckets.push(bucket);
|
|
1603
|
-
}
|
|
1604
|
-
}
|
|
1605
|
-
return sortedBuckets.flat();
|
|
1606
|
-
}
|
|
1607
|
-
function hasCrossJobConstraints(bucket) {
|
|
1608
|
-
const jobIds = new Set(bucket.map((j) => j.id));
|
|
1609
|
-
for (const job of bucket) {
|
|
1610
|
-
for (const ref of job.before) {
|
|
1611
|
-
if (jobIds.has(ref)) return true;
|
|
1612
|
-
}
|
|
1613
|
-
for (const ref of job.after) {
|
|
1614
|
-
if (jobIds.has(ref)) return true;
|
|
1615
|
-
}
|
|
1616
|
-
}
|
|
1617
|
-
return false;
|
|
1618
|
-
}
|
|
1619
|
-
function topologicalSort(jobs) {
|
|
1620
|
-
const n = jobs.length;
|
|
1621
|
-
if (n <= 1) return jobs;
|
|
1622
|
-
const jobMap = /* @__PURE__ */ new Map();
|
|
1623
|
-
const inDegree = /* @__PURE__ */ new Map();
|
|
1624
|
-
const adjacency = /* @__PURE__ */ new Map();
|
|
1625
|
-
for (const job of jobs) {
|
|
1626
|
-
jobMap.set(job.id, job);
|
|
1627
|
-
inDegree.set(job.id, 0);
|
|
1628
|
-
adjacency.set(job.id, []);
|
|
1629
|
-
}
|
|
1630
|
-
for (const job of jobs) {
|
|
1631
|
-
for (const ref of job.before) {
|
|
1632
|
-
if (jobMap.has(ref)) {
|
|
1633
|
-
adjacency.get(job.id).push(ref);
|
|
1634
|
-
inDegree.set(ref, inDegree.get(ref) + 1);
|
|
1635
|
-
}
|
|
1636
|
-
}
|
|
1637
|
-
for (const ref of job.after) {
|
|
1638
|
-
if (jobMap.has(ref)) {
|
|
1639
|
-
adjacency.get(ref).push(job.id);
|
|
1640
|
-
inDegree.set(job.id, inDegree.get(job.id) + 1);
|
|
1641
|
-
}
|
|
1642
|
-
}
|
|
1643
|
-
}
|
|
1644
|
-
const queue = [];
|
|
1645
|
-
for (const job of jobs) {
|
|
1646
|
-
if (inDegree.get(job.id) === 0) {
|
|
1647
|
-
queue.push(job);
|
|
1648
|
-
}
|
|
1649
|
-
}
|
|
1650
|
-
queue.sort((a, b) => {
|
|
1651
|
-
if (a.priority !== b.priority) return b.priority - a.priority;
|
|
1652
|
-
return a.index - b.index;
|
|
1653
|
-
});
|
|
1654
|
-
const result = [];
|
|
1655
|
-
while (queue.length > 0) {
|
|
1656
|
-
const job = queue.shift();
|
|
1657
|
-
result.push(job);
|
|
1658
|
-
const neighbors = adjacency.get(job.id) || [];
|
|
1659
|
-
for (const neighborId of neighbors) {
|
|
1660
|
-
const newDegree = inDegree.get(neighborId) - 1;
|
|
1661
|
-
inDegree.set(neighborId, newDegree);
|
|
1662
|
-
if (newDegree === 0) {
|
|
1663
|
-
const neighbor = jobMap.get(neighborId);
|
|
1664
|
-
insertSorted(queue, neighbor);
|
|
1665
|
-
}
|
|
1666
|
-
}
|
|
1667
|
-
}
|
|
1668
|
-
if (result.length !== n) {
|
|
1669
|
-
console.warn("[useFrame] Circular dependency detected in job constraints");
|
|
1670
|
-
const resultIds = new Set(result.map((j) => j.id));
|
|
1671
|
-
for (const job of jobs) {
|
|
1672
|
-
if (!resultIds.has(job.id)) result.push(job);
|
|
1673
|
-
}
|
|
1674
|
-
}
|
|
1675
|
-
return result;
|
|
1676
|
-
}
|
|
1677
|
-
function insertSorted(arr, job) {
|
|
1678
|
-
let i = 0;
|
|
1679
|
-
while (i < arr.length) {
|
|
1680
|
-
const cmp = arr[i];
|
|
1681
|
-
if (job.priority > cmp.priority || job.priority === cmp.priority && job.index < cmp.index) {
|
|
1682
|
-
break;
|
|
1683
|
-
}
|
|
1684
|
-
i++;
|
|
1685
|
-
}
|
|
1686
|
-
arr.splice(i, 0, job);
|
|
1687
|
-
}
|
|
1688
|
-
|
|
1689
|
-
function shouldRun(job, now) {
|
|
1690
|
-
if (!job.enabled) return false;
|
|
1691
|
-
if (!job.fps) return true;
|
|
1692
|
-
const minInterval = 1e3 / job.fps;
|
|
1693
|
-
const lastRun = job.lastRun ?? 0;
|
|
1694
|
-
const elapsed = now - lastRun;
|
|
1695
|
-
if (elapsed < minInterval) return false;
|
|
1696
|
-
if (job.drop) {
|
|
1697
|
-
job.lastRun = now;
|
|
1698
|
-
} else {
|
|
1699
|
-
const steps = Math.floor(elapsed / minInterval);
|
|
1700
|
-
job.lastRun = lastRun + steps * minInterval;
|
|
1701
|
-
if (job.lastRun < now - minInterval) {
|
|
1702
|
-
job.lastRun = now;
|
|
1703
|
-
}
|
|
1704
|
-
}
|
|
1705
|
-
return true;
|
|
1706
|
-
}
|
|
1707
|
-
function resetJobTiming(job) {
|
|
1708
|
-
job.lastRun = void 0;
|
|
1709
|
-
}
|
|
1710
|
-
|
|
1711
|
-
var __defProp$1 = Object.defineProperty;
|
|
1712
|
-
var __defNormalProp$1 = (obj, key, value) => key in obj ? __defProp$1(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
|
|
1713
|
-
var __publicField$1 = (obj, key, value) => __defNormalProp$1(obj, typeof key !== "symbol" ? key + "" : key, value);
|
|
1714
|
-
const hmrData = (() => {
|
|
1715
|
-
if (typeof process !== "undefined" && process.env.NODE_ENV === "test") return void 0;
|
|
1716
|
-
if (typeof import_meta_hot !== "undefined") return import_meta_hot;
|
|
1717
|
-
try {
|
|
1718
|
-
return (0, eval)("import.meta.hot");
|
|
1719
|
-
} catch {
|
|
1720
|
-
return void 0;
|
|
1721
|
-
}
|
|
1722
|
-
})();
|
|
1723
|
-
const _Scheduler = class _Scheduler {
|
|
1724
|
-
//* Constructor ================================
|
|
1725
|
-
constructor() {
|
|
1726
|
-
//* Critical State ================================
|
|
1727
|
-
__publicField$1(this, "roots", /* @__PURE__ */ new Map());
|
|
1728
|
-
__publicField$1(this, "phaseGraph");
|
|
1729
|
-
__publicField$1(this, "loopState", {
|
|
1730
|
-
running: false,
|
|
1731
|
-
rafHandle: null,
|
|
1732
|
-
lastTime: null,
|
|
1733
|
-
// null = uninitialized, 0+ = valid timestamp
|
|
1734
|
-
frameCount: 0,
|
|
1735
|
-
elapsedTime: 0,
|
|
1736
|
-
createdAt: performance.now()
|
|
1737
|
-
});
|
|
1738
|
-
__publicField$1(this, "stoppedTime", 0);
|
|
1739
|
-
//* Private State ================================
|
|
1740
|
-
__publicField$1(this, "nextRootIndex", 0);
|
|
1741
|
-
__publicField$1(this, "globalBeforeJobs", /* @__PURE__ */ new Map());
|
|
1742
|
-
__publicField$1(this, "globalAfterJobs", /* @__PURE__ */ new Map());
|
|
1743
|
-
__publicField$1(this, "nextGlobalIndex", 0);
|
|
1744
|
-
__publicField$1(this, "idleCallbacks", /* @__PURE__ */ new Set());
|
|
1745
|
-
__publicField$1(this, "nextJobIndex", 0);
|
|
1746
|
-
__publicField$1(this, "jobStateListeners", /* @__PURE__ */ new Map());
|
|
1747
|
-
__publicField$1(this, "pendingFrames", 0);
|
|
1748
|
-
__publicField$1(this, "_frameloop", "always");
|
|
1749
|
-
//* Independent Mode & Error Handling State ================================
|
|
1750
|
-
__publicField$1(this, "_independent", false);
|
|
1751
|
-
__publicField$1(this, "errorHandler", null);
|
|
1752
|
-
__publicField$1(this, "rootReadyCallbacks", /* @__PURE__ */ new Set());
|
|
1753
|
-
//* Core Loop Execution Methods ================================
|
|
1754
|
-
/**
|
|
1755
|
-
* Main RAF loop callback.
|
|
1756
|
-
* Executes frame, handles demand mode, and schedules next frame.
|
|
1757
|
-
* @param {number} timestamp - RAF timestamp in milliseconds
|
|
1758
|
-
* @returns {void}
|
|
1759
|
-
* @private
|
|
1760
|
-
*/
|
|
1761
|
-
__publicField$1(this, "loop", (timestamp) => {
|
|
1762
|
-
if (!this.loopState.running) return;
|
|
1763
|
-
this.executeFrame(timestamp);
|
|
1764
|
-
if (this._frameloop === "demand") {
|
|
1765
|
-
this.pendingFrames = Math.max(0, this.pendingFrames - 1);
|
|
1766
|
-
if (this.pendingFrames === 0) {
|
|
1767
|
-
this.notifyIdle(timestamp);
|
|
1768
|
-
return this.stop();
|
|
1769
|
-
}
|
|
1770
|
-
}
|
|
1771
|
-
this.loopState.rafHandle = requestAnimationFrame(this.loop);
|
|
1772
|
-
});
|
|
1773
|
-
this.phaseGraph = new PhaseGraph();
|
|
1774
|
-
}
|
|
1775
|
-
static get instance() {
|
|
1776
|
-
return globalThis[_Scheduler.INSTANCE_KEY] ?? null;
|
|
1777
|
-
}
|
|
1778
|
-
static set instance(value) {
|
|
1779
|
-
globalThis[_Scheduler.INSTANCE_KEY] = value;
|
|
1780
|
-
}
|
|
1781
|
-
/**
|
|
1782
|
-
* Get the global scheduler instance (creates if doesn't exist).
|
|
1783
|
-
* Uses HMR data to preserve instance across hot reloads.
|
|
1784
|
-
* @returns {Scheduler} The singleton scheduler instance
|
|
1785
|
-
*/
|
|
1786
|
-
static get() {
|
|
1787
|
-
if (!_Scheduler.instance && hmrData?.data?.scheduler) {
|
|
1788
|
-
_Scheduler.instance = hmrData.data.scheduler;
|
|
1789
|
-
}
|
|
1790
|
-
if (!_Scheduler.instance) {
|
|
1791
|
-
_Scheduler.instance = new _Scheduler();
|
|
1792
|
-
if (hmrData?.data) {
|
|
1793
|
-
hmrData.data.scheduler = _Scheduler.instance;
|
|
1794
|
-
}
|
|
1795
|
-
}
|
|
1796
|
-
return _Scheduler.instance;
|
|
1797
|
-
}
|
|
1798
|
-
/**
|
|
1799
|
-
* Reset the singleton instance. Stops the loop and clears all state.
|
|
1800
|
-
* Primarily used for testing to ensure clean state between tests.
|
|
1801
|
-
* @returns {void}
|
|
1802
|
-
*/
|
|
1803
|
-
static reset() {
|
|
1804
|
-
if (_Scheduler.instance) {
|
|
1805
|
-
_Scheduler.instance.stop();
|
|
1806
|
-
_Scheduler.instance = null;
|
|
1807
|
-
}
|
|
1808
|
-
if (hmrData?.data) {
|
|
1809
|
-
hmrData.data.scheduler = null;
|
|
1810
|
-
}
|
|
1811
|
-
}
|
|
1812
|
-
//* Getters & Setters ================================
|
|
1813
|
-
get phases() {
|
|
1814
|
-
return this.phaseGraph.getOrderedPhases();
|
|
1815
|
-
}
|
|
1816
|
-
get frameloop() {
|
|
1817
|
-
return this._frameloop;
|
|
1818
|
-
}
|
|
1819
|
-
set frameloop(mode) {
|
|
1820
|
-
if (this._frameloop === mode) return;
|
|
1821
|
-
const wasAlways = this._frameloop === "always";
|
|
1822
|
-
this._frameloop = mode;
|
|
1823
|
-
if (mode === "always" && !this.loopState.running && this.roots.size > 0) this.start();
|
|
1824
|
-
else if (mode !== "always" && wasAlways) this.stop();
|
|
1825
|
-
}
|
|
1826
|
-
get isRunning() {
|
|
1827
|
-
return this.loopState.running;
|
|
1828
|
-
}
|
|
1829
|
-
get isReady() {
|
|
1830
|
-
return this.roots.size > 0;
|
|
1831
|
-
}
|
|
1832
|
-
get independent() {
|
|
1833
|
-
return this._independent;
|
|
1834
|
-
}
|
|
1835
|
-
set independent(value) {
|
|
1836
|
-
this._independent = value;
|
|
1837
|
-
if (value) this.ensureDefaultRoot();
|
|
1838
|
-
}
|
|
1839
|
-
//* Root Management Methods ================================
|
|
1840
|
-
/**
|
|
1841
|
-
* Register a root (Canvas) with the scheduler.
|
|
1842
|
-
* The first root to register starts the RAF loop (if frameloop='always').
|
|
1843
|
-
* @param {string} id - Unique identifier for this root
|
|
1844
|
-
* @param {RootOptions} [options] - Optional configuration with getState and onError callbacks
|
|
1845
|
-
* @returns {() => void} Unsubscribe function to remove this root
|
|
1846
|
-
*/
|
|
1847
|
-
registerRoot(id, options = {}) {
|
|
1848
|
-
if (this.roots.has(id)) {
|
|
1849
|
-
console.warn(`[Scheduler] Root "${id}" already registered`);
|
|
1850
|
-
return () => this.unregisterRoot(id);
|
|
1851
|
-
}
|
|
1852
|
-
const entry = {
|
|
1853
|
-
id,
|
|
1854
|
-
getState: options.getState ?? (() => ({})),
|
|
1855
|
-
jobs: /* @__PURE__ */ new Map(),
|
|
1856
|
-
sortedJobs: [],
|
|
1857
|
-
needsRebuild: false
|
|
1858
|
-
};
|
|
1859
|
-
if (options.onError) {
|
|
1860
|
-
this.errorHandler = options.onError;
|
|
1861
|
-
}
|
|
1862
|
-
this.roots.set(id, entry);
|
|
1863
|
-
if (this.roots.size === 1) {
|
|
1864
|
-
this.notifyRootReady();
|
|
1865
|
-
if (this._frameloop === "always") this.start();
|
|
1866
|
-
}
|
|
1867
|
-
return () => this.unregisterRoot(id);
|
|
1868
|
-
}
|
|
1869
|
-
/**
|
|
1870
|
-
* Unregister a root from the scheduler.
|
|
1871
|
-
* Cleans up all job state listeners for this root's jobs.
|
|
1872
|
-
* The last root to unregister stops the RAF loop.
|
|
1873
|
-
* @param {string} id - The root ID to unregister
|
|
1874
|
-
* @returns {void}
|
|
1875
|
-
*/
|
|
1876
|
-
unregisterRoot(id) {
|
|
1877
|
-
const root = this.roots.get(id);
|
|
1878
|
-
if (!root) return;
|
|
1879
|
-
for (const jobId of root.jobs.keys()) {
|
|
1880
|
-
this.jobStateListeners.delete(jobId);
|
|
1881
|
-
}
|
|
1882
|
-
this.roots.delete(id);
|
|
1883
|
-
if (this.roots.size === 0) {
|
|
1884
|
-
this.stop();
|
|
1885
|
-
this.errorHandler = null;
|
|
1886
|
-
}
|
|
1887
|
-
}
|
|
1888
|
-
/**
|
|
1889
|
-
* Subscribe to be notified when a root becomes available.
|
|
1890
|
-
* Fires immediately if a root already exists.
|
|
1891
|
-
* @param {() => void} callback - Function called when first root registers
|
|
1892
|
-
* @returns {() => void} Unsubscribe function
|
|
1893
|
-
*/
|
|
1894
|
-
onRootReady(callback) {
|
|
1895
|
-
if (this.roots.size > 0) {
|
|
1896
|
-
callback();
|
|
1897
|
-
return () => {
|
|
1898
|
-
};
|
|
1899
|
-
}
|
|
1900
|
-
this.rootReadyCallbacks.add(callback);
|
|
1901
|
-
return () => this.rootReadyCallbacks.delete(callback);
|
|
1902
|
-
}
|
|
1903
|
-
/**
|
|
1904
|
-
* Notify all registered root-ready callbacks.
|
|
1905
|
-
* Called when the first root registers.
|
|
1906
|
-
* @returns {void}
|
|
1907
|
-
* @private
|
|
1908
|
-
*/
|
|
1909
|
-
notifyRootReady() {
|
|
1910
|
-
for (const cb of this.rootReadyCallbacks) {
|
|
1911
|
-
try {
|
|
1912
|
-
cb();
|
|
1913
|
-
} catch (error) {
|
|
1914
|
-
console.error("[Scheduler] Error in root-ready callback:", error);
|
|
1915
|
-
}
|
|
1916
|
-
}
|
|
1917
|
-
this.rootReadyCallbacks.clear();
|
|
1918
|
-
}
|
|
1919
|
-
/**
|
|
1920
|
-
* Ensure a default root exists for independent mode.
|
|
1921
|
-
* Creates a minimal root with no state provider.
|
|
1922
|
-
* @returns {void}
|
|
1923
|
-
* @private
|
|
1924
|
-
*/
|
|
1925
|
-
ensureDefaultRoot() {
|
|
1926
|
-
if (!this.roots.has("__default__")) {
|
|
1927
|
-
this.registerRoot("__default__");
|
|
1928
|
-
}
|
|
1929
|
-
}
|
|
1930
|
-
/**
|
|
1931
|
-
* Trigger error handling for job errors.
|
|
1932
|
-
* Uses the bound error handler if available, otherwise logs to console.
|
|
1933
|
-
* @param {Error} error - The error to handle
|
|
1934
|
-
* @returns {void}
|
|
1935
|
-
*/
|
|
1936
|
-
triggerError(error) {
|
|
1937
|
-
if (this.errorHandler) this.errorHandler(error);
|
|
1938
|
-
else console.error("[Scheduler]", error);
|
|
1939
|
-
}
|
|
1940
|
-
//* Phase Management Methods ================================
|
|
1941
|
-
/**
|
|
1942
|
-
* Add a named phase to the scheduler's execution order.
|
|
1943
|
-
* Marks all roots for rebuild to incorporate the new phase.
|
|
1944
|
-
* @param {string} name - The phase name (e.g., 'physics', 'postprocess')
|
|
1945
|
-
* @param {AddPhaseOptions} [options] - Positioning options (before/after other phases)
|
|
1946
|
-
* @returns {void}
|
|
1947
|
-
* @example
|
|
1948
|
-
* scheduler.addPhase('physics', { before: 'update' });
|
|
1949
|
-
* scheduler.addPhase('postprocess', { after: 'render' });
|
|
1950
|
-
*/
|
|
1951
|
-
addPhase(name, options) {
|
|
1952
|
-
this.phaseGraph.addPhase(name, options);
|
|
1953
|
-
for (const root of this.roots.values()) {
|
|
1954
|
-
root.needsRebuild = true;
|
|
1955
|
-
}
|
|
1956
|
-
}
|
|
1957
|
-
/**
|
|
1958
|
-
* Check if a phase exists in the scheduler.
|
|
1959
|
-
* @param {string} name - The phase name to check
|
|
1960
|
-
* @returns {boolean} True if the phase exists
|
|
1961
|
-
*/
|
|
1962
|
-
hasPhase(name) {
|
|
1963
|
-
return this.phaseGraph.hasPhase(name);
|
|
1964
|
-
}
|
|
1965
|
-
//* Global Job Registration Methods (Deprecated APIs) ================================
|
|
1966
|
-
/**
|
|
1967
|
-
* Register a global job that runs once per frame (not per-root).
|
|
1968
|
-
* Used internally by deprecated addEffect/addAfterEffect APIs.
|
|
1969
|
-
* @param {'before' | 'after'} phase - When to run: 'before' all roots or 'after' all roots
|
|
1970
|
-
* @param {string} id - Unique identifier for this global job
|
|
1971
|
-
* @param {(timestamp: number) => void} callback - Function called each frame with RAF timestamp
|
|
1972
|
-
* @returns {() => void} Unsubscribe function to remove this global job
|
|
1973
|
-
* @deprecated Use useFrame with phases instead
|
|
1974
|
-
*/
|
|
1975
|
-
registerGlobal(phase, id, callback) {
|
|
1976
|
-
const job = { id, callback };
|
|
1977
|
-
if (phase === "before") {
|
|
1978
|
-
this.globalBeforeJobs.set(id, job);
|
|
1979
|
-
} else {
|
|
1980
|
-
this.globalAfterJobs.set(id, job);
|
|
1981
|
-
}
|
|
1982
|
-
return () => {
|
|
1983
|
-
if (phase === "before") this.globalBeforeJobs.delete(id);
|
|
1984
|
-
else this.globalAfterJobs.delete(id);
|
|
1985
|
-
};
|
|
1986
|
-
}
|
|
1987
|
-
//* Idle Callback Methods (Deprecated API) ================================
|
|
1988
|
-
/**
|
|
1989
|
-
* Register an idle callback that fires when the loop stops.
|
|
1990
|
-
* Used internally by deprecated addTail API.
|
|
1991
|
-
* @param {(timestamp: number) => void} callback - Function called when loop becomes idle
|
|
1992
|
-
* @returns {() => void} Unsubscribe function to remove this idle callback
|
|
1993
|
-
* @deprecated Use demand mode with invalidate() instead
|
|
1994
|
-
*/
|
|
1995
|
-
onIdle(callback) {
|
|
1996
|
-
this.idleCallbacks.add(callback);
|
|
1997
|
-
return () => this.idleCallbacks.delete(callback);
|
|
1998
|
-
}
|
|
1999
|
-
/**
|
|
2000
|
-
* Notify all registered idle callbacks.
|
|
2001
|
-
* Called when the loop stops in demand mode.
|
|
2002
|
-
* @param {number} timestamp - The RAF timestamp when idle occurred
|
|
2003
|
-
* @returns {void}
|
|
2004
|
-
* @private
|
|
2005
|
-
*/
|
|
2006
|
-
notifyIdle(timestamp) {
|
|
2007
|
-
for (const cb of this.idleCallbacks) {
|
|
2008
|
-
try {
|
|
2009
|
-
cb(timestamp);
|
|
2010
|
-
} catch (error) {
|
|
2011
|
-
console.error("[Scheduler] Error in idle callback:", error);
|
|
2012
|
-
}
|
|
2013
|
-
}
|
|
2014
|
-
}
|
|
2015
|
-
//* Job Registration & Management Methods ================================
|
|
2016
|
-
/**
|
|
2017
|
-
* Register a job (frame callback) with a specific root.
|
|
2018
|
-
* This is the core registration method used by useFrame internally.
|
|
2019
|
-
* @param {FrameNextCallback} callback - The function to call each frame
|
|
2020
|
-
* @param {JobOptions & { rootId?: string; system?: boolean }} [options] - Job configuration
|
|
2021
|
-
* @param {string} [options.rootId] - Target root ID (defaults to first registered root)
|
|
2022
|
-
* @param {string} [options.id] - Unique job ID (auto-generated if not provided)
|
|
2023
|
-
* @param {string} [options.phase] - Execution phase (defaults to 'update')
|
|
2024
|
-
* @param {number} [options.priority] - Priority within phase (higher = earlier, default 0)
|
|
2025
|
-
* @param {number} [options.fps] - FPS throttle limit
|
|
2026
|
-
* @param {boolean} [options.drop] - Drop frames when behind (default true)
|
|
2027
|
-
* @param {boolean} [options.enabled] - Whether job is active (default true)
|
|
2028
|
-
* @param {boolean} [options.system] - Internal flag for system jobs (not user-facing)
|
|
2029
|
-
* @returns {() => void} Unsubscribe function to remove this job
|
|
2030
|
-
*/
|
|
2031
|
-
register(callback, options = {}) {
|
|
2032
|
-
const rootId = options.rootId;
|
|
2033
|
-
const root = rootId ? this.roots.get(rootId) : this.roots.values().next().value;
|
|
2034
|
-
if (!root) {
|
|
2035
|
-
console.warn("[Scheduler] No root registered. Is this inside a Canvas?");
|
|
2036
|
-
return () => {
|
|
2037
|
-
};
|
|
2038
|
-
}
|
|
2039
|
-
const id = options.id ?? this.generateJobId();
|
|
2040
|
-
let phase = options.phase ?? "update";
|
|
2041
|
-
if (!options.phase && (options.before || options.after)) {
|
|
2042
|
-
phase = this.phaseGraph.resolveConstraintPhase(options.before, options.after);
|
|
2043
|
-
}
|
|
2044
|
-
const before = this.normalizeConstraints(options.before);
|
|
2045
|
-
const after = this.normalizeConstraints(options.after);
|
|
2046
|
-
const job = {
|
|
2047
|
-
id,
|
|
2048
|
-
callback,
|
|
2049
|
-
phase,
|
|
2050
|
-
before,
|
|
2051
|
-
after,
|
|
2052
|
-
priority: options.priority ?? 0,
|
|
2053
|
-
index: this.nextJobIndex++,
|
|
2054
|
-
fps: options.fps,
|
|
2055
|
-
drop: options.drop ?? true,
|
|
2056
|
-
enabled: options.enabled ?? true,
|
|
2057
|
-
system: options.system ?? false
|
|
2058
|
-
};
|
|
2059
|
-
if (root.jobs.has(id)) {
|
|
2060
|
-
console.warn(`[useFrame] Job with id "${id}" already exists, replacing`);
|
|
2061
|
-
}
|
|
2062
|
-
root.jobs.set(id, job);
|
|
2063
|
-
root.needsRebuild = true;
|
|
2064
|
-
return () => this.unregister(id, root.id);
|
|
2065
|
-
}
|
|
2066
|
-
/**
|
|
2067
|
-
* Unregister a job by its ID.
|
|
2068
|
-
* Searches all roots if rootId is not provided.
|
|
2069
|
-
* @param {string} id - The job ID to unregister
|
|
2070
|
-
* @param {string} [rootId] - Optional root ID to search (searches all if not provided)
|
|
2071
|
-
* @returns {void}
|
|
2072
|
-
*/
|
|
2073
|
-
unregister(id, rootId) {
|
|
2074
|
-
const root = rootId ? this.roots.get(rootId) : Array.from(this.roots.values()).find((r) => r.jobs.has(id));
|
|
2075
|
-
if (root?.jobs.delete(id)) {
|
|
2076
|
-
root.needsRebuild = true;
|
|
2077
|
-
this.jobStateListeners.delete(id);
|
|
2078
|
-
}
|
|
2079
|
-
}
|
|
2080
|
-
/**
|
|
2081
|
-
* Update a job's options dynamically.
|
|
2082
|
-
* Searches all roots to find the job by ID.
|
|
2083
|
-
* Phase/constraint changes trigger a rebuild of the sorted job list.
|
|
2084
|
-
* @param {string} id - The job ID to update
|
|
2085
|
-
* @param {Partial<JobOptions>} options - The options to update
|
|
2086
|
-
* @returns {void}
|
|
2087
|
-
*/
|
|
2088
|
-
updateJob(id, options) {
|
|
2089
|
-
let job;
|
|
2090
|
-
let root;
|
|
2091
|
-
for (const r of this.roots.values()) {
|
|
2092
|
-
job = r.jobs.get(id);
|
|
2093
|
-
if (job) {
|
|
2094
|
-
root = r;
|
|
2095
|
-
break;
|
|
2096
|
-
}
|
|
2097
|
-
}
|
|
2098
|
-
if (!job || !root) return;
|
|
2099
|
-
if (options.priority !== void 0) job.priority = options.priority;
|
|
2100
|
-
if (options.fps !== void 0) job.fps = options.fps;
|
|
2101
|
-
if (options.drop !== void 0) job.drop = options.drop;
|
|
2102
|
-
if (options.enabled !== void 0) {
|
|
2103
|
-
const wasEnabled = job.enabled;
|
|
2104
|
-
job.enabled = options.enabled;
|
|
2105
|
-
if (!wasEnabled && job.enabled) resetJobTiming(job);
|
|
2106
|
-
if (wasEnabled !== job.enabled) root.needsRebuild = true;
|
|
2107
|
-
}
|
|
2108
|
-
if (options.phase !== void 0 || options.before !== void 0 || options.after !== void 0) {
|
|
2109
|
-
if (options.phase) job.phase = options.phase;
|
|
2110
|
-
if (options.before !== void 0) job.before = this.normalizeConstraints(options.before);
|
|
2111
|
-
if (options.after !== void 0) job.after = this.normalizeConstraints(options.after);
|
|
2112
|
-
root.needsRebuild = true;
|
|
2113
|
-
}
|
|
2114
|
-
}
|
|
2115
|
-
//* Job State Management Methods ================================
|
|
2116
|
-
/**
|
|
2117
|
-
* Check if a job is currently paused (disabled).
|
|
2118
|
-
* @param {string} id - The job ID to check
|
|
2119
|
-
* @returns {boolean} True if the job exists and is paused
|
|
2120
|
-
*/
|
|
2121
|
-
isJobPaused(id) {
|
|
2122
|
-
for (const root of this.roots.values()) {
|
|
2123
|
-
const job = root.jobs.get(id);
|
|
2124
|
-
if (job) return !job.enabled;
|
|
2125
|
-
}
|
|
2126
|
-
return false;
|
|
2127
|
-
}
|
|
2128
|
-
/**
|
|
2129
|
-
* Subscribe to state changes for a specific job.
|
|
2130
|
-
* Listener is called when job is paused or resumed.
|
|
2131
|
-
* @param {string} id - The job ID to subscribe to
|
|
2132
|
-
* @param {() => void} listener - Callback invoked on state changes
|
|
2133
|
-
* @returns {() => void} Unsubscribe function
|
|
2134
|
-
*/
|
|
2135
|
-
subscribeJobState(id, listener) {
|
|
2136
|
-
if (!this.jobStateListeners.has(id)) {
|
|
2137
|
-
this.jobStateListeners.set(id, /* @__PURE__ */ new Set());
|
|
2138
|
-
}
|
|
2139
|
-
this.jobStateListeners.get(id).add(listener);
|
|
2140
|
-
return () => {
|
|
2141
|
-
this.jobStateListeners.get(id)?.delete(listener);
|
|
2142
|
-
if (this.jobStateListeners.get(id)?.size === 0) {
|
|
2143
|
-
this.jobStateListeners.delete(id);
|
|
2144
|
-
}
|
|
2145
|
-
};
|
|
2146
|
-
}
|
|
2147
|
-
/**
|
|
2148
|
-
* Notify all listeners that a job's state has changed.
|
|
2149
|
-
* @param {string} id - The job ID that changed
|
|
2150
|
-
* @returns {void}
|
|
2151
|
-
* @private
|
|
2152
|
-
*/
|
|
2153
|
-
notifyJobStateChange(id) {
|
|
2154
|
-
this.jobStateListeners.get(id)?.forEach((listener) => listener());
|
|
2155
|
-
}
|
|
2156
|
-
/**
|
|
2157
|
-
* Pause a job by ID (sets enabled=false).
|
|
2158
|
-
* Notifies any subscribed state listeners.
|
|
2159
|
-
* @param {string} id - The job ID to pause
|
|
2160
|
-
* @returns {void}
|
|
2161
|
-
*/
|
|
2162
|
-
pauseJob(id) {
|
|
2163
|
-
this.updateJob(id, { enabled: false });
|
|
2164
|
-
this.notifyJobStateChange(id);
|
|
2165
|
-
}
|
|
2166
|
-
/**
|
|
2167
|
-
* Resume a paused job by ID (sets enabled=true).
|
|
2168
|
-
* Resets job timing to prevent frame accumulation.
|
|
2169
|
-
* Notifies any subscribed state listeners.
|
|
2170
|
-
* @param {string} id - The job ID to resume
|
|
2171
|
-
* @returns {void}
|
|
2172
|
-
*/
|
|
2173
|
-
resumeJob(id) {
|
|
2174
|
-
this.updateJob(id, { enabled: true });
|
|
2175
|
-
this.notifyJobStateChange(id);
|
|
2176
|
-
}
|
|
2177
|
-
//* Frame Loop Control Methods ================================
|
|
2178
|
-
/**
|
|
2179
|
-
* Start the requestAnimationFrame loop.
|
|
2180
|
-
* Resets timing state (elapsedTime, frameCount) on start.
|
|
2181
|
-
* No-op if already running.
|
|
2182
|
-
* @returns {void}
|
|
2183
|
-
*/
|
|
2184
|
-
start() {
|
|
2185
|
-
if (this.loopState.running) return;
|
|
2186
|
-
const { elapsedTime, createdAt } = this.loopState;
|
|
2187
|
-
let adjustedCreated = 0;
|
|
2188
|
-
if (this.stoppedTime > 0) {
|
|
2189
|
-
adjustedCreated = createdAt - (performance.now() - this.stoppedTime);
|
|
2190
|
-
this.stoppedTime = 0;
|
|
2191
|
-
}
|
|
2192
|
-
Object.assign(this.loopState, {
|
|
2193
|
-
running: true,
|
|
2194
|
-
elapsedTime: elapsedTime ?? 0,
|
|
2195
|
-
lastTime: performance.now(),
|
|
2196
|
-
createdAt: adjustedCreated > 0 ? adjustedCreated : performance.now(),
|
|
2197
|
-
frameCount: 0,
|
|
2198
|
-
rafHandle: requestAnimationFrame(this.loop)
|
|
2199
|
-
});
|
|
2200
|
-
}
|
|
2201
|
-
/**
|
|
2202
|
-
* Stop the requestAnimationFrame loop.
|
|
2203
|
-
* Cancels any pending RAF callback.
|
|
2204
|
-
* No-op if not running.
|
|
2205
|
-
* @returns {void}
|
|
2206
|
-
*/
|
|
2207
|
-
stop() {
|
|
2208
|
-
if (!this.loopState.running) return;
|
|
2209
|
-
this.loopState.running = false;
|
|
2210
|
-
if (this.loopState.rafHandle !== null) {
|
|
2211
|
-
cancelAnimationFrame(this.loopState.rafHandle);
|
|
2212
|
-
this.loopState.rafHandle = null;
|
|
2213
|
-
}
|
|
2214
|
-
this.stoppedTime = performance.now();
|
|
2215
|
-
}
|
|
2216
|
-
/**
|
|
2217
|
-
* Request frames to be rendered in demand mode.
|
|
2218
|
-
* Accumulates pending frames (capped at 60) and starts the loop if not running.
|
|
2219
|
-
* No-op if frameloop is not 'demand'.
|
|
2220
|
-
* @param {number} [frames=1] - Number of frames to request
|
|
2221
|
-
* @param {boolean} [stackFrames=false] - Whether to add frames to existing pending count
|
|
2222
|
-
* - `false` (default): Sets pending frames to the specified value (replaces existing count)
|
|
2223
|
-
* - `true`: Adds frames to existing pending count (useful for accumulating invalidations)
|
|
2224
|
-
* @returns {void}
|
|
2225
|
-
* @example
|
|
2226
|
-
* // Request a single frame render
|
|
2227
|
-
* scheduler.invalidate();
|
|
2228
|
-
*
|
|
2229
|
-
* @example
|
|
2230
|
-
* // Request 5 frames (e.g., for animations)
|
|
2231
|
-
* scheduler.invalidate(5);
|
|
2232
|
-
*
|
|
2233
|
-
* @example
|
|
2234
|
-
* // Set pending frames to exactly 3 (don't stack with existing)
|
|
2235
|
-
* scheduler.invalidate(3, false);
|
|
2236
|
-
*
|
|
2237
|
-
* @example
|
|
2238
|
-
* // Add 2 more frames to existing pending count
|
|
2239
|
-
* scheduler.invalidate(2, true);
|
|
2240
|
-
*/
|
|
2241
|
-
invalidate(frames = 1, stackFrames = false) {
|
|
2242
|
-
if (this._frameloop !== "demand") return;
|
|
2243
|
-
const baseFrames = stackFrames ? this.pendingFrames : 0;
|
|
2244
|
-
this.pendingFrames = Math.min(60, baseFrames + frames);
|
|
2245
|
-
if (!this.loopState.running && this.pendingFrames > 0) this.start();
|
|
2246
|
-
}
|
|
2247
|
-
/**
|
|
2248
|
-
* Reset timing state for deterministic testing.
|
|
2249
|
-
* Preserves jobs and roots but resets lastTime, frameCount, elapsedTime, etc.
|
|
2250
|
-
* @returns {void}
|
|
2251
|
-
*/
|
|
2252
|
-
resetTiming() {
|
|
2253
|
-
this.loopState.lastTime = null;
|
|
2254
|
-
this.loopState.frameCount = 0;
|
|
2255
|
-
this.loopState.elapsedTime = 0;
|
|
2256
|
-
this.loopState.createdAt = performance.now();
|
|
2257
|
-
}
|
|
2258
|
-
//* Manual Stepping Methods ================================
|
|
2259
|
-
/**
|
|
2260
|
-
* Manually execute a single frame for all roots.
|
|
2261
|
-
* Useful for frameloop='never' mode or testing scenarios.
|
|
2262
|
-
* @param {number} [timestamp] - Optional timestamp (defaults to performance.now())
|
|
2263
|
-
* @returns {void}
|
|
2264
|
-
* @example
|
|
2265
|
-
* // Manual control mode
|
|
2266
|
-
* scheduler.frameloop = 'never';
|
|
2267
|
-
* scheduler.step(); // Execute one frame
|
|
2268
|
-
*/
|
|
2269
|
-
step(timestamp) {
|
|
2270
|
-
const now = timestamp ?? performance.now();
|
|
2271
|
-
this.executeFrame(now);
|
|
2272
|
-
}
|
|
2273
|
-
/**
|
|
2274
|
-
* Manually execute a single job by its ID.
|
|
2275
|
-
* Useful for testing individual job callbacks in isolation.
|
|
2276
|
-
* @param {string} id - The job ID to step
|
|
2277
|
-
* @param {number} [timestamp] - Optional timestamp (defaults to performance.now())
|
|
2278
|
-
* @returns {void}
|
|
2279
|
-
*/
|
|
2280
|
-
stepJob(id, timestamp) {
|
|
2281
|
-
let job;
|
|
2282
|
-
let root;
|
|
2283
|
-
for (const r of this.roots.values()) {
|
|
2284
|
-
job = r.jobs.get(id);
|
|
2285
|
-
if (job) {
|
|
2286
|
-
root = r;
|
|
2287
|
-
break;
|
|
2288
|
-
}
|
|
2289
|
-
}
|
|
2290
|
-
if (!job || !root) {
|
|
2291
|
-
console.warn(`[Scheduler] Job "${id}" not found`);
|
|
2292
|
-
return;
|
|
2293
|
-
}
|
|
2294
|
-
const now = timestamp ?? performance.now();
|
|
2295
|
-
const deltaMs = this.loopState.lastTime !== null ? now - this.loopState.lastTime : 0;
|
|
2296
|
-
const delta = deltaMs / 1e3;
|
|
2297
|
-
const elapsed = now - this.loopState.createdAt;
|
|
2298
|
-
const providedState = root.getState?.() ?? {};
|
|
2299
|
-
const frameState = {
|
|
2300
|
-
...providedState,
|
|
2301
|
-
time: now,
|
|
2302
|
-
delta,
|
|
2303
|
-
elapsed,
|
|
2304
|
-
frame: this.loopState.frameCount
|
|
2305
|
-
};
|
|
2306
|
-
try {
|
|
2307
|
-
job.callback(frameState, delta);
|
|
2308
|
-
} catch (error) {
|
|
2309
|
-
console.error(`[Scheduler] Error in job "${job.id}":`, error);
|
|
2310
|
-
this.triggerError(error instanceof Error ? error : new Error(String(error)));
|
|
2311
|
-
}
|
|
2312
|
-
}
|
|
2313
|
-
/**
|
|
2314
|
-
* Execute a single frame across all roots.
|
|
2315
|
-
* Order: globalBefore → each root's jobs → globalAfter
|
|
2316
|
-
* @param {number} timestamp - RAF timestamp in milliseconds
|
|
2317
|
-
* @returns {void}
|
|
2318
|
-
* @private
|
|
2319
|
-
*/
|
|
2320
|
-
executeFrame(timestamp) {
|
|
2321
|
-
const deltaMs = this.loopState.lastTime !== null ? timestamp - this.loopState.lastTime : 0;
|
|
2322
|
-
const delta = deltaMs / 1e3;
|
|
2323
|
-
this.loopState.lastTime = timestamp;
|
|
2324
|
-
this.loopState.frameCount++;
|
|
2325
|
-
this.loopState.elapsedTime += deltaMs;
|
|
2326
|
-
this.runGlobalJobs(this.globalBeforeJobs, timestamp);
|
|
2327
|
-
for (const root of this.roots.values()) {
|
|
2328
|
-
this.tickRoot(root, timestamp, delta);
|
|
2329
|
-
}
|
|
2330
|
-
this.runGlobalJobs(this.globalAfterJobs, timestamp);
|
|
2331
|
-
}
|
|
2332
|
-
/**
|
|
2333
|
-
* Run all global jobs from a job map.
|
|
2334
|
-
* Catches and logs errors without stopping execution.
|
|
2335
|
-
* @param {Map<string, GlobalJob>} jobs - The global jobs map to execute
|
|
2336
|
-
* @param {number} timestamp - RAF timestamp in milliseconds
|
|
2337
|
-
* @returns {void}
|
|
2338
|
-
* @private
|
|
2339
|
-
*/
|
|
2340
|
-
runGlobalJobs(jobs, timestamp) {
|
|
2341
|
-
for (const job of jobs.values()) {
|
|
2342
|
-
try {
|
|
2343
|
-
job.callback(timestamp);
|
|
2344
|
-
} catch (error) {
|
|
2345
|
-
console.error(`[Scheduler] Error in global job "${job.id}":`, error);
|
|
2346
|
-
}
|
|
2347
|
-
}
|
|
2348
|
-
}
|
|
2349
|
-
/**
|
|
2350
|
-
* Execute all jobs for a single root in sorted order.
|
|
2351
|
-
* Rebuilds sorted job list if needed, then dispatches each job.
|
|
2352
|
-
* Errors are caught and propagated via triggerError.
|
|
2353
|
-
* @param {RootEntry} root - The root entry to tick
|
|
2354
|
-
* @param {number} timestamp - RAF timestamp in milliseconds
|
|
2355
|
-
* @param {number} delta - Time since last frame in seconds
|
|
2356
|
-
* @returns {void}
|
|
2357
|
-
* @private
|
|
2358
|
-
*/
|
|
2359
|
-
tickRoot(root, timestamp, delta) {
|
|
2360
|
-
if (root.needsRebuild) {
|
|
2361
|
-
root.sortedJobs = rebuildSortedJobs(root.jobs, this.phaseGraph);
|
|
2362
|
-
root.needsRebuild = false;
|
|
2363
|
-
}
|
|
2364
|
-
const providedState = root.getState?.() ?? {};
|
|
2365
|
-
const frameState = {
|
|
2366
|
-
...providedState,
|
|
2367
|
-
time: timestamp,
|
|
2368
|
-
delta,
|
|
2369
|
-
elapsed: this.loopState.elapsedTime / 1e3,
|
|
2370
|
-
// Convert ms to seconds
|
|
2371
|
-
frame: this.loopState.frameCount
|
|
2372
|
-
};
|
|
2373
|
-
for (const job of root.sortedJobs) {
|
|
2374
|
-
if (!shouldRun(job, timestamp)) continue;
|
|
2375
|
-
try {
|
|
2376
|
-
job.callback(frameState, delta);
|
|
2377
|
-
} catch (error) {
|
|
2378
|
-
console.error(`[Scheduler] Error in job "${job.id}":`, error);
|
|
2379
|
-
this.triggerError(error instanceof Error ? error : new Error(String(error)));
|
|
2380
|
-
}
|
|
2381
|
-
}
|
|
2382
|
-
}
|
|
2383
|
-
//* Debug & Inspection Methods ================================
|
|
2384
|
-
/**
|
|
2385
|
-
* Get the total number of registered jobs across all roots.
|
|
2386
|
-
* Includes both per-root jobs and global before/after jobs.
|
|
2387
|
-
* @returns {number} Total job count
|
|
2388
|
-
*/
|
|
2389
|
-
getJobCount() {
|
|
2390
|
-
let count = 0;
|
|
2391
|
-
for (const root of this.roots.values()) {
|
|
2392
|
-
count += root.jobs.size;
|
|
2393
|
-
}
|
|
2394
|
-
return count + this.globalBeforeJobs.size + this.globalAfterJobs.size;
|
|
2395
|
-
}
|
|
2396
|
-
/**
|
|
2397
|
-
* Get all registered job IDs across all roots.
|
|
2398
|
-
* Includes both per-root jobs and global before/after jobs.
|
|
2399
|
-
* @returns {string[]} Array of all job IDs
|
|
2400
|
-
*/
|
|
2401
|
-
getJobIds() {
|
|
2402
|
-
const ids = [];
|
|
2403
|
-
for (const root of this.roots.values()) {
|
|
2404
|
-
ids.push(...root.jobs.keys());
|
|
2405
|
-
}
|
|
2406
|
-
ids.push(...this.globalBeforeJobs.keys());
|
|
2407
|
-
ids.push(...this.globalAfterJobs.keys());
|
|
2408
|
-
return ids;
|
|
2409
|
-
}
|
|
2410
|
-
/**
|
|
2411
|
-
* Get the number of registered roots (Canvas instances).
|
|
2412
|
-
* @returns {number} Number of registered roots
|
|
2413
|
-
*/
|
|
2414
|
-
getRootCount() {
|
|
2415
|
-
return this.roots.size;
|
|
2416
|
-
}
|
|
2417
|
-
/**
|
|
2418
|
-
* Check if any user (non-system) jobs are registered in a specific phase.
|
|
2419
|
-
* Used by the default render job to know if a user has taken over rendering.
|
|
2420
|
-
*
|
|
2421
|
-
* @param phase The phase to check
|
|
2422
|
-
* @param rootId Optional root ID to check (checks all roots if not provided)
|
|
2423
|
-
* @returns true if any user jobs exist in the phase
|
|
2424
|
-
*/
|
|
2425
|
-
hasUserJobsInPhase(phase, rootId) {
|
|
2426
|
-
const rootsToCheck = rootId ? [this.roots.get(rootId)].filter(Boolean) : Array.from(this.roots.values());
|
|
2427
|
-
return rootsToCheck.some((root) => {
|
|
2428
|
-
if (!root) return false;
|
|
2429
|
-
for (const job of root.jobs.values()) {
|
|
2430
|
-
if (job.phase === phase && !job.system && job.enabled) return true;
|
|
2431
|
-
}
|
|
2432
|
-
return false;
|
|
2433
|
-
});
|
|
2434
|
-
}
|
|
2435
|
-
//* Utility Methods ================================
|
|
2436
|
-
/**
|
|
2437
|
-
* Generate a unique root ID for automatic root registration.
|
|
2438
|
-
* @returns {string} A unique root ID in the format 'root_N'
|
|
2439
|
-
*/
|
|
2440
|
-
generateRootId() {
|
|
2441
|
-
return `root_${this.nextRootIndex++}`;
|
|
2442
|
-
}
|
|
2443
|
-
/**
|
|
2444
|
-
* Generate a unique job ID.
|
|
2445
|
-
* @returns {string} A unique job ID in the format 'job_N'
|
|
2446
|
-
* @private
|
|
2447
|
-
*/
|
|
2448
|
-
generateJobId() {
|
|
2449
|
-
return `job_${this.nextJobIndex}`;
|
|
2450
|
-
}
|
|
2451
|
-
/**
|
|
2452
|
-
* Normalize before/after constraints to a Set.
|
|
2453
|
-
* Handles undefined, single string, or array inputs.
|
|
2454
|
-
* @param {string | string[] | undefined} value - The constraint value(s)
|
|
2455
|
-
* @returns {Set<string>} Normalized Set of constraint strings
|
|
2456
|
-
* @private
|
|
2457
|
-
*/
|
|
2458
|
-
normalizeConstraints(value) {
|
|
2459
|
-
if (!value) return /* @__PURE__ */ new Set();
|
|
2460
|
-
if (Array.isArray(value)) return new Set(value);
|
|
2461
|
-
return /* @__PURE__ */ new Set([value]);
|
|
2462
|
-
}
|
|
2463
|
-
};
|
|
2464
|
-
//* Static State & Methods (Singleton Usage) ================================
|
|
2465
|
-
//* Cross-Bundle Singleton Key ==============================
|
|
2466
|
-
// Use Symbol.for() to ensure scheduler is shared across bundle boundaries
|
|
2467
|
-
// This prevents issues when mixing imports from @react-three/fiber and @react-three/fiber/webgpu
|
|
2468
|
-
__publicField$1(_Scheduler, "INSTANCE_KEY", Symbol.for("@react-three/fiber.scheduler"));
|
|
2469
|
-
let Scheduler = _Scheduler;
|
|
2470
|
-
const getScheduler = () => Scheduler.get();
|
|
2471
|
-
if (hmrData) {
|
|
2472
|
-
hmrData.accept?.();
|
|
1672
|
+
const INTERNAL_LIB_MARKERS = ["zustand", "setState", "Object.assign"];
|
|
1673
|
+
function isInternalRendererAccess(stack, callerDepth = 2) {
|
|
1674
|
+
if (!stack) return false;
|
|
1675
|
+
const caller = stack.split("\n")[callerDepth] ?? "";
|
|
1676
|
+
return INTERNAL_LIB_MARKERS.some((m) => caller.includes(m));
|
|
2473
1677
|
}
|
|
2474
1678
|
|
|
2475
1679
|
const R3F_CONTEXT = Symbol.for("@react-three/fiber.context");
|
|
@@ -2509,7 +1713,14 @@ const createStore = (invalidate, advance) => {
|
|
|
2509
1713
|
frustum: new Frustum(),
|
|
2510
1714
|
autoUpdateFrustum: true,
|
|
2511
1715
|
raycaster: null,
|
|
2512
|
-
events: {
|
|
1716
|
+
events: {
|
|
1717
|
+
priority: 1,
|
|
1718
|
+
enabled: true,
|
|
1719
|
+
connected: false,
|
|
1720
|
+
frameTimedRaycasts: true,
|
|
1721
|
+
alwaysFireOnScroll: true,
|
|
1722
|
+
updateOnFrame: false
|
|
1723
|
+
},
|
|
2513
1724
|
scene: null,
|
|
2514
1725
|
rootScene: null,
|
|
2515
1726
|
xr: null,
|
|
@@ -2597,14 +1808,18 @@ const createStore = (invalidate, advance) => {
|
|
|
2597
1808
|
}),
|
|
2598
1809
|
setFrameloop: (frameloop = "always") => {
|
|
2599
1810
|
set(() => ({ frameloop }));
|
|
1811
|
+
getScheduler().frameloop = frameloop;
|
|
2600
1812
|
},
|
|
2601
1813
|
setError: (error) => set(() => ({ error })),
|
|
2602
1814
|
error: null,
|
|
2603
|
-
//* TSL State (managed via hooks: useUniforms, useNodes, useTextures,
|
|
1815
|
+
//* TSL State (managed via hooks: useUniforms, useNodes, useBuffers, useGPUStorage, useTextures, useRenderPipeline) ==============================
|
|
2604
1816
|
uniforms: {},
|
|
2605
1817
|
nodes: {},
|
|
1818
|
+
buffers: {},
|
|
1819
|
+
gpuStorage: {},
|
|
2606
1820
|
textures: /* @__PURE__ */ new Map(),
|
|
2607
|
-
|
|
1821
|
+
_textureRefs: /* @__PURE__ */ new Map(),
|
|
1822
|
+
renderPipeline: null,
|
|
2608
1823
|
passes: {},
|
|
2609
1824
|
_hmrVersion: 0,
|
|
2610
1825
|
_sizeImperative: false,
|
|
@@ -2613,12 +1828,16 @@ const createStore = (invalidate, advance) => {
|
|
|
2613
1828
|
internal: {
|
|
2614
1829
|
// Events
|
|
2615
1830
|
interaction: [],
|
|
2616
|
-
hovered: /* @__PURE__ */ new Map(),
|
|
2617
1831
|
subscribers: [],
|
|
1832
|
+
// Per-pointer state (new unified structure)
|
|
1833
|
+
pointerMap: /* @__PURE__ */ new Map(),
|
|
1834
|
+
pointerDirty: /* @__PURE__ */ new Map(),
|
|
1835
|
+
lastEvent: React.createRef(),
|
|
1836
|
+
// Deprecated but kept for backwards compatibility
|
|
1837
|
+
hovered: /* @__PURE__ */ new Map(),
|
|
2618
1838
|
initialClick: [0, 0],
|
|
2619
1839
|
initialHits: [],
|
|
2620
1840
|
capturedMap: /* @__PURE__ */ new Map(),
|
|
2621
|
-
lastEvent: React.createRef(),
|
|
2622
1841
|
// Visibility tracking (onFramed, onOccluded, onVisible)
|
|
2623
1842
|
visibilityRegistry: /* @__PURE__ */ new Map(),
|
|
2624
1843
|
// Occlusion system (WebGPU only)
|
|
@@ -2657,8 +1876,7 @@ const createStore = (invalidate, advance) => {
|
|
|
2657
1876
|
const currentState = rootStore.getState();
|
|
2658
1877
|
if (!currentState.isLegacy && currentState.internal.actualRenderer) {
|
|
2659
1878
|
const stack = new Error().stack || "";
|
|
2660
|
-
|
|
2661
|
-
if (!isInternalAccess) {
|
|
1879
|
+
if (!isInternalRendererAccess(stack)) {
|
|
2662
1880
|
const cleanedStack = stack.split("\n").slice(2).join("\n") || "Stack trace unavailable";
|
|
2663
1881
|
notifyDepreciated({
|
|
2664
1882
|
heading: "Accessing state.gl in WebGPU mode",
|
|
@@ -2706,14 +1924,16 @@ const createStore = (invalidate, advance) => {
|
|
|
2706
1924
|
oldSize = size;
|
|
2707
1925
|
oldDpr = viewport.dpr;
|
|
2708
1926
|
updateCamera(camera, size);
|
|
2709
|
-
if (canvasTarget) {
|
|
1927
|
+
if (internal.isSecondary && canvasTarget) {
|
|
2710
1928
|
if (viewport.dpr > 0) canvasTarget.setPixelRatio(viewport.dpr);
|
|
2711
|
-
|
|
2712
|
-
canvasTarget.setSize(size.width, size.height, updateStyle);
|
|
1929
|
+
canvasTarget.setSize(size.width, size.height, false);
|
|
2713
1930
|
} else {
|
|
2714
1931
|
if (viewport.dpr > 0) actualRenderer.setPixelRatio(viewport.dpr);
|
|
2715
|
-
|
|
2716
|
-
|
|
1932
|
+
actualRenderer.setSize(size.width, size.height, false);
|
|
1933
|
+
if (canvasTarget) {
|
|
1934
|
+
if (viewport.dpr > 0) canvasTarget.setPixelRatio(viewport.dpr);
|
|
1935
|
+
canvasTarget.setSize(size.width, size.height, false);
|
|
1936
|
+
}
|
|
2717
1937
|
}
|
|
2718
1938
|
}
|
|
2719
1939
|
if (camera !== oldCamera) {
|
|
@@ -2769,19 +1989,25 @@ function loadingFn(extensions, onProgress) {
|
|
|
2769
1989
|
);
|
|
2770
1990
|
};
|
|
2771
1991
|
}
|
|
2772
|
-
function useLoader(loader, input, extensions, onProgress) {
|
|
2773
|
-
const
|
|
1992
|
+
function useLoader(loader, input, extensions, onProgress, cacheKey) {
|
|
1993
|
+
const inputs = Array.isArray(input) ? input : [input];
|
|
1994
|
+
const cacheKeys = Array.isArray(cacheKey ?? input) ? cacheKey ?? input : [cacheKey ?? input];
|
|
2774
1995
|
const fn = loadingFn(extensions, onProgress);
|
|
2775
|
-
const results =
|
|
1996
|
+
const results = cacheKeys.map(
|
|
1997
|
+
(key, index) => suspend(() => fn(loader, inputs[index]), [loader, key], { equal: is.equ })
|
|
1998
|
+
);
|
|
2776
1999
|
return Array.isArray(input) ? results : results[0];
|
|
2777
2000
|
}
|
|
2778
|
-
useLoader.preload = function(loader, input, extensions, onProgress) {
|
|
2779
|
-
const
|
|
2780
|
-
|
|
2001
|
+
useLoader.preload = function(loader, input, extensions, onProgress, cacheKey) {
|
|
2002
|
+
const inputs = Array.isArray(input) ? input : [input];
|
|
2003
|
+
const cacheKeys = Array.isArray(cacheKey ?? input) ? cacheKey ?? input : [cacheKey ?? input];
|
|
2004
|
+
cacheKeys.forEach(
|
|
2005
|
+
(key, index) => preload(() => loadingFn(extensions, onProgress)(loader, inputs[index]), [loader, key])
|
|
2006
|
+
);
|
|
2781
2007
|
};
|
|
2782
|
-
useLoader.clear = function(loader, input) {
|
|
2783
|
-
const
|
|
2784
|
-
|
|
2008
|
+
useLoader.clear = function(loader, input, cacheKey) {
|
|
2009
|
+
const cacheKeys = Array.isArray(cacheKey ?? input) ? cacheKey ?? input : [cacheKey ?? input];
|
|
2010
|
+
cacheKeys.forEach((key) => clear([loader, key]));
|
|
2785
2011
|
};
|
|
2786
2012
|
useLoader.loader = getLoader;
|
|
2787
2013
|
|
|
@@ -2857,20 +2083,14 @@ function useFrame(callback, priorityOrOptions) {
|
|
|
2857
2083
|
}
|
|
2858
2084
|
};
|
|
2859
2085
|
} else {
|
|
2860
|
-
|
|
2861
|
-
|
|
2862
|
-
|
|
2863
|
-
|
|
2864
|
-
|
|
2865
|
-
|
|
2866
|
-
|
|
2867
|
-
|
|
2868
|
-
unregisterJob = registerOutside();
|
|
2869
|
-
});
|
|
2870
|
-
return () => {
|
|
2871
|
-
unsubReady();
|
|
2872
|
-
unregisterJob?.();
|
|
2873
|
-
};
|
|
2086
|
+
return scheduler.register(
|
|
2087
|
+
(state, delta) => {
|
|
2088
|
+
const frameState = state;
|
|
2089
|
+
if (!frameState.renderer) return;
|
|
2090
|
+
callbackRef.current?.(frameState, delta);
|
|
2091
|
+
},
|
|
2092
|
+
{ id, ...options }
|
|
2093
|
+
);
|
|
2874
2094
|
}
|
|
2875
2095
|
}, [store, scheduler, id, optionsKey, isLegacyPriority, isInsideCanvas]);
|
|
2876
2096
|
const isPaused = React.useSyncExternalStore(
|
|
@@ -2961,18 +2181,18 @@ function buildFromCache(input, textureCache) {
|
|
|
2961
2181
|
function useTexture(input, optionsOrOnLoad) {
|
|
2962
2182
|
const renderer = useThree((state) => state.internal.actualRenderer);
|
|
2963
2183
|
const store = useStore();
|
|
2964
|
-
const textureCache = useThree((state) => state.textures);
|
|
2965
2184
|
const options = typeof optionsOrOnLoad === "function" ? { onLoad: optionsOrOnLoad } : optionsOrOnLoad ?? {};
|
|
2966
|
-
const { onLoad, cache =
|
|
2185
|
+
const { onLoad, cache = true } = options;
|
|
2967
2186
|
const onLoadRef = useRef(onLoad);
|
|
2968
2187
|
onLoadRef.current = onLoad;
|
|
2969
2188
|
const onLoadCalledForRef = useRef(null);
|
|
2970
2189
|
const urls = useMemo(() => getUrls(input), [input]);
|
|
2971
2190
|
const cachedResult = useMemo(() => {
|
|
2972
2191
|
if (!cache) return null;
|
|
2973
|
-
|
|
2974
|
-
|
|
2975
|
-
|
|
2192
|
+
const textures = store.getState().textures;
|
|
2193
|
+
if (!allUrlsCached(urls, textures)) return null;
|
|
2194
|
+
return buildFromCache(input, textures);
|
|
2195
|
+
}, [cache, urls, input, store]);
|
|
2976
2196
|
const loadedTextures = useLoader(
|
|
2977
2197
|
TextureLoader,
|
|
2978
2198
|
IsObject(input) ? Object.values(input) : input
|
|
@@ -3016,8 +2236,6 @@ function useTexture(input, optionsOrOnLoad) {
|
|
|
3016
2236
|
}, [input, loadedTextures, cachedResult]);
|
|
3017
2237
|
useEffect(() => {
|
|
3018
2238
|
if (!cache) return;
|
|
3019
|
-
if (cachedResult) return;
|
|
3020
|
-
const set = store.setState;
|
|
3021
2239
|
const urlTextureMap = [];
|
|
3022
2240
|
if (typeof input === "string") {
|
|
3023
2241
|
urlTextureMap.push([input, mappedTextures]);
|
|
@@ -3031,18 +2249,32 @@ function useTexture(input, optionsOrOnLoad) {
|
|
|
3031
2249
|
urlTextureMap.push([url, textureRecord[key]]);
|
|
3032
2250
|
}
|
|
3033
2251
|
}
|
|
3034
|
-
|
|
3035
|
-
const
|
|
3036
|
-
let
|
|
2252
|
+
store.setState((state) => {
|
|
2253
|
+
const refs = new Map(state._textureRefs);
|
|
2254
|
+
let textures = state.textures;
|
|
2255
|
+
let added = false;
|
|
3037
2256
|
for (const [url, texture] of urlTextureMap) {
|
|
3038
|
-
if (!
|
|
3039
|
-
|
|
3040
|
-
|
|
2257
|
+
if (!textures.has(url)) {
|
|
2258
|
+
if (!added) {
|
|
2259
|
+
textures = new Map(textures);
|
|
2260
|
+
added = true;
|
|
2261
|
+
}
|
|
2262
|
+
textures.set(url, texture);
|
|
3041
2263
|
}
|
|
2264
|
+
refs.set(url, (refs.get(url) ?? 0) + 1);
|
|
3042
2265
|
}
|
|
3043
|
-
return
|
|
2266
|
+
return added ? { textures, _textureRefs: refs } : { _textureRefs: refs };
|
|
3044
2267
|
});
|
|
3045
|
-
|
|
2268
|
+
return () => store.setState((state) => {
|
|
2269
|
+
const refs = new Map(state._textureRefs);
|
|
2270
|
+
for (const [url] of urlTextureMap) {
|
|
2271
|
+
const next = (refs.get(url) ?? 0) - 1;
|
|
2272
|
+
if (next <= 0) refs.delete(url);
|
|
2273
|
+
else refs.set(url, next);
|
|
2274
|
+
}
|
|
2275
|
+
return { _textureRefs: refs };
|
|
2276
|
+
});
|
|
2277
|
+
}, [cache, input, mappedTextures, store]);
|
|
3046
2278
|
return mappedTextures;
|
|
3047
2279
|
}
|
|
3048
2280
|
useTexture.preload = (url) => useLoader.preload(TextureLoader, url);
|
|
@@ -3058,96 +2290,63 @@ const Texture = ({
|
|
|
3058
2290
|
return /* @__PURE__ */ jsx(Fragment, { children: children?.(ret) });
|
|
3059
2291
|
};
|
|
3060
2292
|
|
|
3061
|
-
function
|
|
3062
|
-
if (entry instanceof Texture$1) return entry;
|
|
3063
|
-
if (entry && typeof entry === "object" && "value" in entry && entry.value instanceof Texture$1) {
|
|
3064
|
-
return entry.value;
|
|
3065
|
-
}
|
|
3066
|
-
return null;
|
|
3067
|
-
}
|
|
3068
|
-
function useTextures() {
|
|
2293
|
+
function useTextures(selector) {
|
|
3069
2294
|
const store = useStore();
|
|
3070
|
-
|
|
3071
|
-
const set = store.setState;
|
|
2295
|
+
const registry = useMemo(() => {
|
|
3072
2296
|
const getState = store.getState;
|
|
3073
|
-
const
|
|
3074
|
-
|
|
3075
|
-
const newMap = new Map(state.textures);
|
|
3076
|
-
newMap.set(key, value);
|
|
3077
|
-
return { textures: newMap };
|
|
3078
|
-
});
|
|
3079
|
-
};
|
|
3080
|
-
const addMultiple = (items) => {
|
|
3081
|
-
set((state) => {
|
|
3082
|
-
const newMap = new Map(state.textures);
|
|
3083
|
-
const entries = items instanceof Map ? items.entries() : Object.entries(items);
|
|
3084
|
-
for (const [key, value] of entries) {
|
|
3085
|
-
newMap.set(key, value);
|
|
3086
|
-
}
|
|
3087
|
-
return { textures: newMap };
|
|
3088
|
-
});
|
|
3089
|
-
};
|
|
3090
|
-
const remove = (key) => {
|
|
3091
|
-
set((state) => {
|
|
3092
|
-
const newMap = new Map(state.textures);
|
|
3093
|
-
newMap.delete(key);
|
|
3094
|
-
return { textures: newMap };
|
|
3095
|
-
});
|
|
3096
|
-
};
|
|
3097
|
-
const removeMultiple = (keys) => {
|
|
3098
|
-
set((state) => {
|
|
3099
|
-
const newMap = new Map(state.textures);
|
|
3100
|
-
for (const key of keys) newMap.delete(key);
|
|
3101
|
-
return { textures: newMap };
|
|
3102
|
-
});
|
|
3103
|
-
};
|
|
3104
|
-
const dispose = (key) => {
|
|
3105
|
-
const entry = getState().textures.get(key);
|
|
3106
|
-
if (entry) {
|
|
3107
|
-
const tex = getTextureValue(entry);
|
|
3108
|
-
tex?.dispose();
|
|
3109
|
-
}
|
|
3110
|
-
remove(key);
|
|
3111
|
-
};
|
|
3112
|
-
const disposeMultiple = (keys) => {
|
|
3113
|
-
const textures = getState().textures;
|
|
3114
|
-
for (const key of keys) {
|
|
3115
|
-
const entry = textures.get(key);
|
|
3116
|
-
if (entry) {
|
|
3117
|
-
const tex = getTextureValue(entry);
|
|
3118
|
-
tex?.dispose();
|
|
3119
|
-
}
|
|
3120
|
-
}
|
|
3121
|
-
removeMultiple(keys);
|
|
3122
|
-
};
|
|
3123
|
-
const disposeAll = () => {
|
|
3124
|
-
const textures = getState().textures;
|
|
3125
|
-
for (const entry of textures.values()) {
|
|
3126
|
-
const tex = getTextureValue(entry);
|
|
3127
|
-
tex?.dispose();
|
|
3128
|
-
}
|
|
3129
|
-
set({ textures: /* @__PURE__ */ new Map() });
|
|
3130
|
-
};
|
|
2297
|
+
const setState = store.setState;
|
|
2298
|
+
const getOne = (key) => getState().textures.get(key);
|
|
3131
2299
|
return {
|
|
3132
|
-
|
|
3133
|
-
get textures() {
|
|
2300
|
+
get all() {
|
|
3134
2301
|
return getState().textures;
|
|
3135
2302
|
},
|
|
3136
|
-
|
|
3137
|
-
|
|
2303
|
+
get(input) {
|
|
2304
|
+
if (typeof input === "string") return getOne(input);
|
|
2305
|
+
if (Array.isArray(input)) return input.map(getOne);
|
|
2306
|
+
const out = {};
|
|
2307
|
+
for (const name in input) out[name] = getOne(input[name]);
|
|
2308
|
+
return out;
|
|
2309
|
+
},
|
|
3138
2310
|
has: (key) => getState().textures.has(key),
|
|
3139
|
-
|
|
3140
|
-
|
|
3141
|
-
|
|
3142
|
-
|
|
3143
|
-
|
|
3144
|
-
|
|
3145
|
-
|
|
3146
|
-
|
|
3147
|
-
|
|
3148
|
-
|
|
2311
|
+
add(keyOrRecord, texture) {
|
|
2312
|
+
setState((state) => {
|
|
2313
|
+
const textures = new Map(state.textures);
|
|
2314
|
+
if (typeof keyOrRecord === "string") {
|
|
2315
|
+
textures.set(keyOrRecord, texture);
|
|
2316
|
+
} else {
|
|
2317
|
+
for (const key in keyOrRecord) textures.set(key, keyOrRecord[key]);
|
|
2318
|
+
}
|
|
2319
|
+
return { textures };
|
|
2320
|
+
});
|
|
2321
|
+
},
|
|
2322
|
+
dispose(key, options) {
|
|
2323
|
+
const state = getState();
|
|
2324
|
+
const refs = state._textureRefs.get(key) ?? 0;
|
|
2325
|
+
if (refs > 0 && !options?.force) {
|
|
2326
|
+
console.warn(
|
|
2327
|
+
`[useTextures] "${key}" still has ${refs} active reference(s); skipping dispose. Pass { force: true } to override.`
|
|
2328
|
+
);
|
|
2329
|
+
return false;
|
|
2330
|
+
}
|
|
2331
|
+
state.textures.get(key)?.dispose();
|
|
2332
|
+
setState((s) => {
|
|
2333
|
+
const textures = new Map(s.textures);
|
|
2334
|
+
textures.delete(key);
|
|
2335
|
+
const nextRefs = new Map(s._textureRefs);
|
|
2336
|
+
nextRefs.delete(key);
|
|
2337
|
+
return { textures, _textureRefs: nextRefs };
|
|
2338
|
+
});
|
|
2339
|
+
return true;
|
|
2340
|
+
},
|
|
2341
|
+
disposeAll() {
|
|
2342
|
+
for (const texture of getState().textures.values()) texture.dispose();
|
|
2343
|
+
setState({ textures: /* @__PURE__ */ new Map(), _textureRefs: /* @__PURE__ */ new Map() });
|
|
2344
|
+
}
|
|
3149
2345
|
};
|
|
3150
2346
|
}, [store]);
|
|
2347
|
+
const subscribe = selector ? () => selector(registry) : (state) => state.textures;
|
|
2348
|
+
const selected = useThree(subscribe);
|
|
2349
|
+
return selector ? selected : registry;
|
|
3151
2350
|
}
|
|
3152
2351
|
|
|
3153
2352
|
function useRenderTarget(widthOrOptions, heightOrOptions, options) {
|
|
@@ -3228,7 +2427,7 @@ function advance(timestamp) {
|
|
|
3228
2427
|
getScheduler().step(timestamp);
|
|
3229
2428
|
}
|
|
3230
2429
|
|
|
3231
|
-
const version = "10.0.0-alpha.
|
|
2430
|
+
const version = "10.0.0-alpha.3";
|
|
3232
2431
|
const packageData = {
|
|
3233
2432
|
version: version};
|
|
3234
2433
|
|
|
@@ -14667,6 +13866,7 @@ function swapInstances() {
|
|
|
14667
13866
|
}
|
|
14668
13867
|
}
|
|
14669
13868
|
if (instance.isHidden) unhideInstance(instance);
|
|
13869
|
+
if (isObject3D(instance.object)) removeInteractivity(findInitialRoot(instance), instance.object);
|
|
14670
13870
|
if (instance.object.__r3f) delete instance.object.__r3f;
|
|
14671
13871
|
if (instance.type !== "primitive") disposeOnIdle(instance.object);
|
|
14672
13872
|
}
|
|
@@ -14679,6 +13879,8 @@ function swapInstances() {
|
|
|
14679
13879
|
instance.object.__r3f = instance;
|
|
14680
13880
|
setFiberRef(fiber, instance.object);
|
|
14681
13881
|
delete instance.appliedOnce;
|
|
13882
|
+
instance.eventCount = 0;
|
|
13883
|
+
instance.handlers = {};
|
|
14682
13884
|
applyProps(instance.object, instance.props);
|
|
14683
13885
|
if (instance.props.attach) {
|
|
14684
13886
|
attach(parent, instance);
|
|
@@ -14894,11 +14096,15 @@ const reconciler = /* @__PURE__ */ createReconciler({
|
|
|
14894
14096
|
cloneMutableTextInstance(textInstance) {
|
|
14895
14097
|
return textInstance;
|
|
14896
14098
|
},
|
|
14099
|
+
// React 19.2 added these for root-level view transitions. They only run for hosts that opt into
|
|
14100
|
+
// view transitions by returning a container from cloneRootViewTransitionContainer; R3F renders
|
|
14101
|
+
// into a WebGL/WebGPU canvas, where cloning the root has no meaning, so we never opt in and
|
|
14102
|
+
// React never calls them. They stay as no-ops rather than throws: the host config is shared by
|
|
14103
|
+
// every root, and a throw here would turn a React-internal probe into a hard crash for users.
|
|
14104
|
+
// Guarded by a test asserting a full render + unmount never reaches them.
|
|
14897
14105
|
cloneRootViewTransitionContainer(_rootContainer) {
|
|
14898
|
-
throw new Error("Not implemented.");
|
|
14899
14106
|
},
|
|
14900
14107
|
removeRootViewTransitionClone(_rootContainer, _clone) {
|
|
14901
|
-
throw new Error("Not implemented.");
|
|
14902
14108
|
},
|
|
14903
14109
|
// https://github.com/facebook/react/pull/32465
|
|
14904
14110
|
createFragmentInstance: (_fiber) => null,
|
|
@@ -14983,6 +14189,7 @@ function createRoot(canvas) {
|
|
|
14983
14189
|
const lastConfiguredProps = {};
|
|
14984
14190
|
let configured = false;
|
|
14985
14191
|
let pending = null;
|
|
14192
|
+
let rendererSetup = null;
|
|
14986
14193
|
return {
|
|
14987
14194
|
async configure(props = {}) {
|
|
14988
14195
|
let resolve;
|
|
@@ -14998,7 +14205,6 @@ function createRoot(canvas) {
|
|
|
14998
14205
|
events,
|
|
14999
14206
|
onCreated: onCreatedCallback,
|
|
15000
14207
|
shadows = false,
|
|
15001
|
-
textureColorSpace = SRGBColorSpace,
|
|
15002
14208
|
orthographic = false,
|
|
15003
14209
|
frameloop = "always",
|
|
15004
14210
|
dpr = [1, 2],
|
|
@@ -15013,7 +14219,8 @@ function createRoot(canvas) {
|
|
|
15013
14219
|
_sizeProps,
|
|
15014
14220
|
forceEven
|
|
15015
14221
|
} = props;
|
|
15016
|
-
const
|
|
14222
|
+
const textureColorSpace = is.obj(glConfig) && !is.fun(glConfig) && !isRenderer(glConfig) && glConfig.textureColorSpace || is.obj(rendererConfig) && !is.fun(rendererConfig) && !isRenderer(rendererConfig) && rendererConfig.textureColorSpace || SRGBColorSpace;
|
|
14223
|
+
let state = store.getState();
|
|
15017
14224
|
const defaultGPUProps = {
|
|
15018
14225
|
canvas,
|
|
15019
14226
|
antialias: true
|
|
@@ -15027,46 +14234,64 @@ function createRoot(canvas) {
|
|
|
15027
14234
|
throw new Error("Cannot use both gl and renderer props at the same time");
|
|
15028
14235
|
}
|
|
15029
14236
|
let renderer = state.internal.actualRenderer;
|
|
15030
|
-
if (
|
|
15031
|
-
|
|
15032
|
-
|
|
15033
|
-
|
|
15034
|
-
|
|
15035
|
-
|
|
15036
|
-
|
|
15037
|
-
|
|
15038
|
-
|
|
15039
|
-
|
|
15040
|
-
|
|
15041
|
-
|
|
15042
|
-
|
|
15043
|
-
|
|
15044
|
-
|
|
15045
|
-
|
|
15046
|
-
|
|
15047
|
-
|
|
15048
|
-
|
|
15049
|
-
|
|
15050
|
-
|
|
15051
|
-
|
|
15052
|
-
|
|
15053
|
-
|
|
15054
|
-
|
|
15055
|
-
|
|
15056
|
-
|
|
15057
|
-
|
|
15058
|
-
|
|
15059
|
-
|
|
15060
|
-
|
|
15061
|
-
|
|
15062
|
-
|
|
15063
|
-
|
|
15064
|
-
|
|
15065
|
-
|
|
15066
|
-
|
|
14237
|
+
if (!state.internal.actualRenderer) {
|
|
14238
|
+
if (!rendererSetup) {
|
|
14239
|
+
rendererSetup = (async () => {
|
|
14240
|
+
if (primaryCanvas) {
|
|
14241
|
+
const primary = await waitForPrimary(primaryCanvas);
|
|
14242
|
+
renderer = primary.renderer;
|
|
14243
|
+
state.internal.actualRenderer = renderer;
|
|
14244
|
+
const canvasTarget = new CanvasTarget(canvas);
|
|
14245
|
+
primary.store.setState((prev) => ({
|
|
14246
|
+
internal: { ...prev.internal, isMultiCanvas: true }
|
|
14247
|
+
}));
|
|
14248
|
+
state.set((prev) => ({
|
|
14249
|
+
webGPUSupported: primary.store.getState().webGPUSupported,
|
|
14250
|
+
renderer,
|
|
14251
|
+
primaryStore: primary.store,
|
|
14252
|
+
internal: {
|
|
14253
|
+
...prev.internal,
|
|
14254
|
+
canvasTarget,
|
|
14255
|
+
isMultiCanvas: true,
|
|
14256
|
+
isSecondary: true,
|
|
14257
|
+
targetId: primaryCanvas
|
|
14258
|
+
}
|
|
14259
|
+
}));
|
|
14260
|
+
} else {
|
|
14261
|
+
renderer = await resolveRenderer(rendererConfig, defaultGPUProps, WebGPURenderer);
|
|
14262
|
+
if (!renderer.hasInitialized?.()) {
|
|
14263
|
+
const size2 = computeInitialSize(canvas, propsSize);
|
|
14264
|
+
if (size2.width > 0 && size2.height > 0) {
|
|
14265
|
+
const pixelRatio = calculateDpr(dpr);
|
|
14266
|
+
canvas.width = size2.width * pixelRatio;
|
|
14267
|
+
canvas.height = size2.height * pixelRatio;
|
|
14268
|
+
}
|
|
14269
|
+
await renderer.init();
|
|
14270
|
+
}
|
|
14271
|
+
const backend = renderer.backend;
|
|
14272
|
+
const isWebGPUBackend = backend && "isWebGPUBackend" in backend;
|
|
14273
|
+
state.internal.actualRenderer = renderer;
|
|
14274
|
+
state.set({ webGPUSupported: isWebGPUBackend, renderer, primaryStore: store });
|
|
14275
|
+
if (canvasId && !state.internal.isSecondary) {
|
|
14276
|
+
const canvasTarget = new CanvasTarget(canvas);
|
|
14277
|
+
const unregisterPrimary = registerPrimary(canvasId, renderer, store);
|
|
14278
|
+
state.set((prev) => ({
|
|
14279
|
+
internal: {
|
|
14280
|
+
...prev.internal,
|
|
14281
|
+
canvasTarget,
|
|
14282
|
+
unregisterPrimary
|
|
14283
|
+
}
|
|
14284
|
+
}));
|
|
14285
|
+
}
|
|
15067
14286
|
}
|
|
15068
|
-
}))
|
|
14287
|
+
})().catch((err) => {
|
|
14288
|
+
rendererSetup = null;
|
|
14289
|
+
throw err;
|
|
14290
|
+
});
|
|
15069
14291
|
}
|
|
14292
|
+
await rendererSetup;
|
|
14293
|
+
state = store.getState();
|
|
14294
|
+
renderer = state.internal.actualRenderer;
|
|
15070
14295
|
}
|
|
15071
14296
|
let raycaster = state.raycaster;
|
|
15072
14297
|
if (!raycaster) state.set({ raycaster: raycaster = new Raycaster() });
|
|
@@ -15159,7 +14384,7 @@ function createRoot(canvas) {
|
|
|
15159
14384
|
lastConfiguredProps.performance = performance;
|
|
15160
14385
|
}
|
|
15161
14386
|
if (!state.xr) {
|
|
15162
|
-
const handleXRFrame = (timestamp,
|
|
14387
|
+
const handleXRFrame = (timestamp, _frame) => {
|
|
15163
14388
|
const state2 = store.getState();
|
|
15164
14389
|
if (state2.frameloop === "never") return;
|
|
15165
14390
|
advance(timestamp);
|
|
@@ -15195,15 +14420,22 @@ function createRoot(canvas) {
|
|
|
15195
14420
|
const oldType = renderer.shadowMap.type;
|
|
15196
14421
|
renderer.shadowMap.enabled = !!shadows;
|
|
15197
14422
|
if (is.boo(shadows)) {
|
|
15198
|
-
renderer.shadowMap.type =
|
|
14423
|
+
renderer.shadowMap.type = PCFShadowMap;
|
|
15199
14424
|
} else if (is.str(shadows)) {
|
|
14425
|
+
if (shadows === "soft") {
|
|
14426
|
+
notifyDepreciated({
|
|
14427
|
+
heading: 'shadows="soft" is deprecated',
|
|
14428
|
+
body: "Three has depreciated soft and improved basic PCFShadows, we converted for you.",
|
|
14429
|
+
link: "https://github.com/mrdoob/three.js/wiki/Migration-Guide?utm_source=chatgpt.com#181--182"
|
|
14430
|
+
});
|
|
14431
|
+
}
|
|
15200
14432
|
const types = {
|
|
15201
14433
|
basic: BasicShadowMap,
|
|
15202
14434
|
percentage: PCFShadowMap,
|
|
15203
|
-
soft:
|
|
14435
|
+
soft: PCFShadowMap,
|
|
15204
14436
|
variance: VSMShadowMap
|
|
15205
14437
|
};
|
|
15206
|
-
renderer.shadowMap.type = types[shadows] ??
|
|
14438
|
+
renderer.shadowMap.type = types[shadows] ?? PCFShadowMap;
|
|
15207
14439
|
} else if (is.obj(shadows)) {
|
|
15208
14440
|
Object.assign(renderer.shadowMap, shadows);
|
|
15209
14441
|
}
|
|
@@ -15219,13 +14451,24 @@ function createRoot(canvas) {
|
|
|
15219
14451
|
if (state.textureColorSpace !== textureColorSpace) state.set(() => ({ textureColorSpace }));
|
|
15220
14452
|
lastConfiguredProps.textureColorSpace = textureColorSpace;
|
|
15221
14453
|
}
|
|
14454
|
+
const r3fProps = ["textureColorSpace"];
|
|
14455
|
+
const constructorOnlyProps = ["samples", "antialias", "alpha", "canvas", "powerPreference"];
|
|
14456
|
+
const nonApplyProps = [...r3fProps, ...constructorOnlyProps];
|
|
15222
14457
|
if (glConfig && !is.fun(glConfig) && !isRenderer(glConfig) && !is.equ(glConfig, renderer, shallowLoose)) {
|
|
15223
|
-
|
|
14458
|
+
const glProps = {};
|
|
14459
|
+
for (const key in glConfig) {
|
|
14460
|
+
if (!nonApplyProps.includes(key)) glProps[key] = glConfig[key];
|
|
14461
|
+
}
|
|
14462
|
+
applyProps(renderer, glProps);
|
|
15224
14463
|
}
|
|
15225
14464
|
if (rendererConfig && !is.fun(rendererConfig) && !isRenderer(rendererConfig) && state.renderer) {
|
|
15226
14465
|
const currentRenderer = state.renderer;
|
|
15227
14466
|
if (!is.equ(rendererConfig, currentRenderer, shallowLoose)) {
|
|
15228
|
-
|
|
14467
|
+
const rendererProps = {};
|
|
14468
|
+
for (const key in rendererConfig) {
|
|
14469
|
+
if (!nonApplyProps.includes(key)) rendererProps[key] = rendererConfig[key];
|
|
14470
|
+
}
|
|
14471
|
+
applyProps(currentRenderer, rendererProps);
|
|
15229
14472
|
}
|
|
15230
14473
|
}
|
|
15231
14474
|
const scheduler = getScheduler();
|
|
@@ -15251,6 +14494,18 @@ function createRoot(canvas) {
|
|
|
15251
14494
|
system: true
|
|
15252
14495
|
}
|
|
15253
14496
|
);
|
|
14497
|
+
const unregisterEventsFlush = scheduler.register(
|
|
14498
|
+
() => {
|
|
14499
|
+
const state2 = store.getState();
|
|
14500
|
+
state2.events.flush?.();
|
|
14501
|
+
},
|
|
14502
|
+
{
|
|
14503
|
+
id: `${newRootId}_events`,
|
|
14504
|
+
rootId: newRootId,
|
|
14505
|
+
phase: "input",
|
|
14506
|
+
system: true
|
|
14507
|
+
}
|
|
14508
|
+
);
|
|
15254
14509
|
const unregisterFrustum = scheduler.register(
|
|
15255
14510
|
() => {
|
|
15256
14511
|
const state2 = store.getState();
|
|
@@ -15261,7 +14516,7 @@ function createRoot(canvas) {
|
|
|
15261
14516
|
{
|
|
15262
14517
|
id: `${newRootId}_frustum`,
|
|
15263
14518
|
rootId: newRootId,
|
|
15264
|
-
|
|
14519
|
+
before: "render",
|
|
15265
14520
|
system: true
|
|
15266
14521
|
}
|
|
15267
14522
|
);
|
|
@@ -15273,7 +14528,7 @@ function createRoot(canvas) {
|
|
|
15273
14528
|
{
|
|
15274
14529
|
id: `${newRootId}_visibility`,
|
|
15275
14530
|
rootId: newRootId,
|
|
15276
|
-
|
|
14531
|
+
before: "render",
|
|
15277
14532
|
system: true,
|
|
15278
14533
|
after: `${newRootId}_frustum`
|
|
15279
14534
|
}
|
|
@@ -15285,7 +14540,7 @@ function createRoot(canvas) {
|
|
|
15285
14540
|
const userHandlesRender = scheduler.hasUserJobsInPhase("render", newRootId);
|
|
15286
14541
|
if (userHandlesRender || state2.internal.priority) return;
|
|
15287
14542
|
try {
|
|
15288
|
-
if (state2.
|
|
14543
|
+
if (state2.renderPipeline?.render) state2.renderPipeline.render();
|
|
15289
14544
|
else if (renderer2?.render) renderer2.render(state2.scene, state2.camera);
|
|
15290
14545
|
} catch (error) {
|
|
15291
14546
|
state2.setError(error instanceof Error ? error : new Error(String(error)));
|
|
@@ -15310,6 +14565,7 @@ function createRoot(canvas) {
|
|
|
15310
14565
|
unregisterRoot: () => {
|
|
15311
14566
|
unregisterRoot();
|
|
15312
14567
|
unregisterCanvasTarget();
|
|
14568
|
+
unregisterEventsFlush();
|
|
15313
14569
|
unregisterFrustum();
|
|
15314
14570
|
unregisterVisibility();
|
|
15315
14571
|
unregisterRender();
|
|
@@ -15385,7 +14641,8 @@ function unmountComponentAtNode(canvas, callback) {
|
|
|
15385
14641
|
dispose(state.scene);
|
|
15386
14642
|
_roots.delete(canvas);
|
|
15387
14643
|
if (callback) callback(canvas);
|
|
15388
|
-
} catch {
|
|
14644
|
+
} catch (error) {
|
|
14645
|
+
console.warn("[R3F] Error while unmounting root; teardown may be incomplete:", error);
|
|
15389
14646
|
}
|
|
15390
14647
|
}, 500);
|
|
15391
14648
|
}
|
|
@@ -15448,6 +14705,7 @@ function PortalInner({ state = {}, children, container }) {
|
|
|
15448
14705
|
viewport = rootState.viewport.getCurrentViewport(camera, new Vector3(), resolvedSize);
|
|
15449
14706
|
if (camera !== rootState.camera) updateCamera(camera, resolvedSize);
|
|
15450
14707
|
}
|
|
14708
|
+
const set = injectState.set;
|
|
15451
14709
|
return {
|
|
15452
14710
|
// The intersect consists of the previous root state
|
|
15453
14711
|
...rootState,
|
|
@@ -15466,7 +14724,7 @@ function PortalInner({ state = {}, children, container }) {
|
|
|
15466
14724
|
size: resolvedSize,
|
|
15467
14725
|
viewport: { ...rootState.viewport, ...viewport },
|
|
15468
14726
|
// Layers are allowed to override events
|
|
15469
|
-
setEvents: (events2) =>
|
|
14727
|
+
setEvents: (events2) => set((state2) => ({ ...state2, events: { ...state2.events, ...events2 } })),
|
|
15470
14728
|
// Container for child attachment - the portalScene (injected or container itself)
|
|
15471
14729
|
internal: { ...rootState.internal, ...injectState.internal, container: portalScene }
|
|
15472
14730
|
};
|
|
@@ -15475,9 +14733,13 @@ function PortalInner({ state = {}, children, container }) {
|
|
|
15475
14733
|
const store = createWithEqualityFn((set, get) => ({ ...rest, set, get }));
|
|
15476
14734
|
const onMutate = (prev) => store.setState((state2) => inject.current(prev, state2));
|
|
15477
14735
|
onMutate(previousRoot.getState());
|
|
15478
|
-
previousRoot.subscribe(onMutate);
|
|
15479
14736
|
return store;
|
|
15480
14737
|
}, [previousRoot, container]);
|
|
14738
|
+
useIsomorphicLayoutEffect(() => {
|
|
14739
|
+
const onMutate = (prev) => usePortalStore.setState((state2) => inject.current(prev, state2));
|
|
14740
|
+
const unsubscribe = previousRoot.subscribe(onMutate);
|
|
14741
|
+
return unsubscribe;
|
|
14742
|
+
}, [previousRoot, usePortalStore]);
|
|
15481
14743
|
return (
|
|
15482
14744
|
// @ts-ignore, reconciler types are not maintained
|
|
15483
14745
|
/* @__PURE__ */ jsx(Fragment, { children: reconciler.createPortal(
|
|
@@ -15491,6 +14753,59 @@ function flushSync(fn) {
|
|
|
15491
14753
|
return reconciler.flushSyncFromReconciler(fn);
|
|
15492
14754
|
}
|
|
15493
14755
|
|
|
14756
|
+
function parseBackground(background) {
|
|
14757
|
+
if (!background) return null;
|
|
14758
|
+
if (typeof background === "object" && !background.isColor) {
|
|
14759
|
+
const { backgroundMap, envMap, files, preset, ...rest } = background;
|
|
14760
|
+
return {
|
|
14761
|
+
...rest,
|
|
14762
|
+
preset,
|
|
14763
|
+
files: envMap || files,
|
|
14764
|
+
backgroundFiles: backgroundMap,
|
|
14765
|
+
background: true
|
|
14766
|
+
};
|
|
14767
|
+
}
|
|
14768
|
+
if (typeof background === "number") {
|
|
14769
|
+
return { color: background, background: true };
|
|
14770
|
+
}
|
|
14771
|
+
if (typeof background === "string") {
|
|
14772
|
+
if (background in presetsObj) {
|
|
14773
|
+
return { preset: background, background: true };
|
|
14774
|
+
}
|
|
14775
|
+
if (/^(https?:\/\/|\/|\.\/|\.\.\/)|\.(hdr|exr|jpg|jpeg|png|webp|gif)$/i.test(background)) {
|
|
14776
|
+
return { files: background, background: true };
|
|
14777
|
+
}
|
|
14778
|
+
return { color: background, background: true };
|
|
14779
|
+
}
|
|
14780
|
+
if (background.isColor) {
|
|
14781
|
+
return { color: background, background: true };
|
|
14782
|
+
}
|
|
14783
|
+
return null;
|
|
14784
|
+
}
|
|
14785
|
+
|
|
14786
|
+
function parseRendererConfig(rendererProp) {
|
|
14787
|
+
const isRendererConfig = typeof rendererProp === "object" && rendererProp !== null && !("render" in rendererProp) && ("primaryCanvas" in rendererProp || "scheduler" in rendererProp);
|
|
14788
|
+
if (isRendererConfig) {
|
|
14789
|
+
const { primaryCanvas: pc, scheduler: sc, ...rest } = rendererProp;
|
|
14790
|
+
return {
|
|
14791
|
+
primaryCanvas: pc,
|
|
14792
|
+
scheduler: sc,
|
|
14793
|
+
renderer: Object.keys(rest).length > 0 ? rest : rendererProp
|
|
14794
|
+
};
|
|
14795
|
+
}
|
|
14796
|
+
return { primaryCanvas: void 0, scheduler: void 0, renderer: rendererProp };
|
|
14797
|
+
}
|
|
14798
|
+
|
|
14799
|
+
function clearHmrCaches(store) {
|
|
14800
|
+
store.setState((state) => ({
|
|
14801
|
+
nodes: {},
|
|
14802
|
+
uniforms: {},
|
|
14803
|
+
buffers: {},
|
|
14804
|
+
gpuStorage: {},
|
|
14805
|
+
_hmrVersion: state._hmrVersion + 1
|
|
14806
|
+
}));
|
|
14807
|
+
}
|
|
14808
|
+
|
|
15494
14809
|
function CanvasImpl({
|
|
15495
14810
|
ref,
|
|
15496
14811
|
children,
|
|
@@ -15511,6 +14826,8 @@ function CanvasImpl({
|
|
|
15511
14826
|
raycaster,
|
|
15512
14827
|
camera,
|
|
15513
14828
|
scene,
|
|
14829
|
+
autoUpdateFrustum,
|
|
14830
|
+
occlusion,
|
|
15514
14831
|
onPointerMissed,
|
|
15515
14832
|
onDragOverMissed,
|
|
15516
14833
|
onDropMissed,
|
|
@@ -15522,39 +14839,10 @@ function CanvasImpl({
|
|
|
15522
14839
|
forceEven,
|
|
15523
14840
|
...props
|
|
15524
14841
|
}) {
|
|
15525
|
-
const { primaryCanvas, scheduler,
|
|
15526
|
-
const renderer = Object.keys(rendererConfig).length > 0 ? rendererConfig : rendererProp;
|
|
14842
|
+
const { primaryCanvas, scheduler, renderer } = parseRendererConfig(rendererProp);
|
|
15527
14843
|
React.useMemo(() => extend(THREE), []);
|
|
15528
14844
|
const Bridge = useBridge();
|
|
15529
|
-
const backgroundProps = React.useMemo(() =>
|
|
15530
|
-
if (!background) return null;
|
|
15531
|
-
if (typeof background === "object" && !background.isColor) {
|
|
15532
|
-
const { backgroundMap, envMap, files, preset, ...rest } = background;
|
|
15533
|
-
return {
|
|
15534
|
-
...rest,
|
|
15535
|
-
preset,
|
|
15536
|
-
files: envMap || files,
|
|
15537
|
-
backgroundFiles: backgroundMap,
|
|
15538
|
-
background: true
|
|
15539
|
-
};
|
|
15540
|
-
}
|
|
15541
|
-
if (typeof background === "number") {
|
|
15542
|
-
return { color: background, background: true };
|
|
15543
|
-
}
|
|
15544
|
-
if (typeof background === "string") {
|
|
15545
|
-
if (background in presetsObj) {
|
|
15546
|
-
return { preset: background, background: true };
|
|
15547
|
-
}
|
|
15548
|
-
if (/^(https?:\/\/|\/|\.\/|\.\.\/)|\\.(hdr|exr|jpg|jpeg|png|webp|gif)$/i.test(background)) {
|
|
15549
|
-
return { files: background, background: true };
|
|
15550
|
-
}
|
|
15551
|
-
return { color: background, background: true };
|
|
15552
|
-
}
|
|
15553
|
-
if (background.isColor) {
|
|
15554
|
-
return { color: background, background: true };
|
|
15555
|
-
}
|
|
15556
|
-
return null;
|
|
15557
|
-
}, [background]);
|
|
14845
|
+
const backgroundProps = React.useMemo(() => parseBackground(background), [background]);
|
|
15558
14846
|
const hasInitialSizeRef = React.useRef(false);
|
|
15559
14847
|
const measureConfig = React.useMemo(() => {
|
|
15560
14848
|
if (!hasInitialSizeRef.current) {
|
|
@@ -15596,6 +14884,7 @@ function CanvasImpl({
|
|
|
15596
14884
|
const handleDropMissed = useMutableCallback(onDropMissed);
|
|
15597
14885
|
const [block, setBlock] = React.useState(false);
|
|
15598
14886
|
const [error, setError] = React.useState(false);
|
|
14887
|
+
const [fallbackVisible, setFallbackVisible] = React.useState(false);
|
|
15599
14888
|
if (block) throw block;
|
|
15600
14889
|
if (error) throw error;
|
|
15601
14890
|
const root = React.useRef(null);
|
|
@@ -15603,6 +14892,7 @@ function CanvasImpl({
|
|
|
15603
14892
|
const unsubscribeErrorRef = React.useRef(null);
|
|
15604
14893
|
useIsomorphicLayoutEffect(() => {
|
|
15605
14894
|
effectActiveRef.current = true;
|
|
14895
|
+
if (fallbackVisible) return;
|
|
15606
14896
|
const canvas = canvasRef.current;
|
|
15607
14897
|
if (effectiveSize.width > 0 && effectiveSize.height > 0 && canvas) {
|
|
15608
14898
|
if (!root.current) {
|
|
@@ -15623,7 +14913,7 @@ function CanvasImpl({
|
|
|
15623
14913
|
}
|
|
15624
14914
|
async function run() {
|
|
15625
14915
|
if (!effectActiveRef.current || !root.current) return;
|
|
15626
|
-
await root.current.configure({
|
|
14916
|
+
const configured = await root.current.configure({
|
|
15627
14917
|
id,
|
|
15628
14918
|
primaryCanvas,
|
|
15629
14919
|
scheduler,
|
|
@@ -15638,6 +14928,8 @@ function CanvasImpl({
|
|
|
15638
14928
|
performance,
|
|
15639
14929
|
raycaster,
|
|
15640
14930
|
camera,
|
|
14931
|
+
autoUpdateFrustum,
|
|
14932
|
+
occlusion,
|
|
15641
14933
|
size: effectiveSize,
|
|
15642
14934
|
// Store size props for reset functionality
|
|
15643
14935
|
_sizeProps: width !== void 0 || height !== void 0 ? { width, height } : null,
|
|
@@ -15662,8 +14954,20 @@ function CanvasImpl({
|
|
|
15662
14954
|
}
|
|
15663
14955
|
onCreated?.(state);
|
|
15664
14956
|
}
|
|
15665
|
-
})
|
|
15666
|
-
|
|
14957
|
+
}).then(
|
|
14958
|
+
() => true,
|
|
14959
|
+
// Renderer setup failed (e.g. no WebGL/WebGPU support). The `fallback` prop lives
|
|
14960
|
+
// inside <canvas>, which browsers don't display, so surface it as visible DOM
|
|
14961
|
+
// instead; with no fallback, rethrow to an external error boundary. (#3757)
|
|
14962
|
+
(setupError) => {
|
|
14963
|
+
if (effectActiveRef.current) {
|
|
14964
|
+
if (fallback != null) setFallbackVisible(true);
|
|
14965
|
+
else setError(setupError);
|
|
14966
|
+
}
|
|
14967
|
+
return false;
|
|
14968
|
+
}
|
|
14969
|
+
);
|
|
14970
|
+
if (!configured || !effectActiveRef.current || !root.current) return;
|
|
15667
14971
|
root.current.render(
|
|
15668
14972
|
/* @__PURE__ */ jsx(Bridge, { children: /* @__PURE__ */ jsx(ErrorBoundary, { set: setError, children: /* @__PURE__ */ jsxs(React.Suspense, { fallback: /* @__PURE__ */ jsx(Block, { set: setBlock }), children: [
|
|
15669
14973
|
backgroundProps && /* @__PURE__ */ jsx(Environment, { ...backgroundProps }),
|
|
@@ -15697,20 +15001,13 @@ function CanvasImpl({
|
|
|
15697
15001
|
const handleHMR = () => {
|
|
15698
15002
|
queueMicrotask(() => {
|
|
15699
15003
|
const rootEntry = _roots.get(canvas);
|
|
15700
|
-
if (rootEntry?.store)
|
|
15701
|
-
rootEntry.store.setState((state) => ({
|
|
15702
|
-
nodes: {},
|
|
15703
|
-
uniforms: {},
|
|
15704
|
-
_hmrVersion: state._hmrVersion + 1
|
|
15705
|
-
}));
|
|
15706
|
-
}
|
|
15004
|
+
if (rootEntry?.store) clearHmrCaches(rootEntry.store);
|
|
15707
15005
|
});
|
|
15708
15006
|
};
|
|
15709
15007
|
if (typeof import.meta !== "undefined" && import.meta.hot) {
|
|
15710
15008
|
const hot = import.meta.hot;
|
|
15711
15009
|
hot.on("vite:afterUpdate", handleHMR);
|
|
15712
|
-
return () => hot.
|
|
15713
|
-
});
|
|
15010
|
+
return () => hot.off?.("vite:afterUpdate", handleHMR);
|
|
15714
15011
|
}
|
|
15715
15012
|
if (typeof module !== "undefined" && module.hot) {
|
|
15716
15013
|
const hot = module.hot;
|
|
@@ -15733,7 +15030,20 @@ function CanvasImpl({
|
|
|
15733
15030
|
...style
|
|
15734
15031
|
},
|
|
15735
15032
|
...props,
|
|
15736
|
-
children:
|
|
15033
|
+
children: fallbackVisible ? (
|
|
15034
|
+
// Renderer setup failed: render the fallback as visible DOM. Inside <canvas> (below)
|
|
15035
|
+
// it exists in the tree but browsers never paint it, which is the whole bug (#3757).
|
|
15036
|
+
fallback
|
|
15037
|
+
) : /* @__PURE__ */ jsx("div", { ref: containerRef, className: "r3f-canvas-container", style: { width: "100%", height: "100%" }, children: /* @__PURE__ */ jsx(
|
|
15038
|
+
"canvas",
|
|
15039
|
+
{
|
|
15040
|
+
ref: canvasRef,
|
|
15041
|
+
id,
|
|
15042
|
+
className: "r3f-canvas",
|
|
15043
|
+
style: { display: "block", width: "100%", height: "100%" },
|
|
15044
|
+
children: fallback
|
|
15045
|
+
}
|
|
15046
|
+
) })
|
|
15737
15047
|
}
|
|
15738
15048
|
);
|
|
15739
15049
|
}
|
|
@@ -15809,6 +15119,8 @@ function createScopedStore(data) {
|
|
|
15809
15119
|
function createLazyCreatorState(state) {
|
|
15810
15120
|
let _uniforms = null;
|
|
15811
15121
|
let _nodes = null;
|
|
15122
|
+
let _buffers = null;
|
|
15123
|
+
let _gpuStorage = null;
|
|
15812
15124
|
return Object.create(state, {
|
|
15813
15125
|
uniforms: {
|
|
15814
15126
|
get() {
|
|
@@ -15819,10 +15131,34 @@ function createLazyCreatorState(state) {
|
|
|
15819
15131
|
get() {
|
|
15820
15132
|
return _nodes ?? (_nodes = createScopedStore(state.nodes));
|
|
15821
15133
|
}
|
|
15134
|
+
},
|
|
15135
|
+
buffers: {
|
|
15136
|
+
get() {
|
|
15137
|
+
return _buffers ?? (_buffers = createScopedStore(state.buffers));
|
|
15138
|
+
}
|
|
15139
|
+
},
|
|
15140
|
+
gpuStorage: {
|
|
15141
|
+
get() {
|
|
15142
|
+
return _gpuStorage ?? (_gpuStorage = createScopedStore(state.gpuStorage));
|
|
15143
|
+
}
|
|
15822
15144
|
}
|
|
15823
15145
|
});
|
|
15824
15146
|
}
|
|
15825
15147
|
|
|
15148
|
+
function resolvePrimary(local) {
|
|
15149
|
+
return local.getState().primaryStore ?? local;
|
|
15150
|
+
}
|
|
15151
|
+
function usePrimaryStore() {
|
|
15152
|
+
const local = useStore();
|
|
15153
|
+
const primary = local.getState().primaryStore;
|
|
15154
|
+
return useMemo(() => primary ?? local, [primary, local]);
|
|
15155
|
+
}
|
|
15156
|
+
function usePrimaryThree(selector = (state) => state, equalityFn) {
|
|
15157
|
+
const local = useStore();
|
|
15158
|
+
const primary = resolvePrimary(local);
|
|
15159
|
+
return primary(selector, equalityFn);
|
|
15160
|
+
}
|
|
15161
|
+
|
|
15826
15162
|
function addTexture(set, key, value) {
|
|
15827
15163
|
set((state) => {
|
|
15828
15164
|
const newMap = new Map(state.textures);
|
|
@@ -15901,6 +15237,10 @@ function vectorize(inObject) {
|
|
|
15901
15237
|
if (obj.isVector2 || obj.isVector3 || obj.isVector4) return inObject;
|
|
15902
15238
|
if (obj.isMatrix3 || obj.isMatrix4) return inObject;
|
|
15903
15239
|
if (obj.isColor || obj.isEuler || obj.isQuaternion || obj.isSpherical) return inObject;
|
|
15240
|
+
if ("r" in obj && "g" in obj && "b" in obj && typeof obj.r === "number" && typeof obj.g === "number" && typeof obj.b === "number") {
|
|
15241
|
+
const scale = obj.r > 1 || obj.g > 1 || obj.b > 1 ? 1 / 255 : 1;
|
|
15242
|
+
return new Color(obj.r * scale, obj.g * scale, obj.b * scale);
|
|
15243
|
+
}
|
|
15904
15244
|
if ("x" in obj && "y" in obj && typeof obj.x === "number" && typeof obj.y === "number") {
|
|
15905
15245
|
if ("w" in obj && typeof obj.w === "number" && "z" in obj && typeof obj.z === "number") {
|
|
15906
15246
|
return new Vector4(obj.x, obj.y, obj.z, obj.w);
|
|
@@ -15924,7 +15264,7 @@ function useCompareMemoize(value, deep) {
|
|
|
15924
15264
|
|
|
15925
15265
|
const isUniformNode$1 = (value) => value !== null && typeof value === "object" && "value" in value && "uuid" in value;
|
|
15926
15266
|
function useUniforms(creatorOrScope, scope) {
|
|
15927
|
-
const store =
|
|
15267
|
+
const store = usePrimaryStore();
|
|
15928
15268
|
const removeUniforms2 = useCallback(
|
|
15929
15269
|
(names, targetScope) => {
|
|
15930
15270
|
const nameArray = Array.isArray(names) ? names : [names];
|
|
@@ -15994,8 +15334,8 @@ function useUniforms(creatorOrScope, scope) {
|
|
|
15994
15334
|
}, [creatorOrScope, store]);
|
|
15995
15335
|
const memoizedInput = useCompareMemoize(inputForMemoization);
|
|
15996
15336
|
const isReader = memoizedInput === void 0 || typeof memoizedInput === "string";
|
|
15997
|
-
const storeUniforms =
|
|
15998
|
-
const hmrVersion =
|
|
15337
|
+
const storeUniforms = usePrimaryThree((s) => s.uniforms);
|
|
15338
|
+
const hmrVersion = usePrimaryThree((s) => s._hmrVersion);
|
|
15999
15339
|
const readerDep = isReader ? storeUniforms : null;
|
|
16000
15340
|
const creatorDep = isReader ? null : hmrVersion;
|
|
16001
15341
|
const uniforms = useMemo(() => {
|
|
@@ -16056,6 +15396,7 @@ function useUniforms(creatorOrScope, scope) {
|
|
|
16056
15396
|
return { ...uniforms, removeUniforms: removeUniforms2, clearUniforms, rebuildUniforms };
|
|
16057
15397
|
}
|
|
16058
15398
|
function rebuildAllUniforms(store, scope) {
|
|
15399
|
+
store = store.getState().primaryStore ?? store;
|
|
16059
15400
|
store.setState((state) => {
|
|
16060
15401
|
let newUniforms = {};
|
|
16061
15402
|
if (scope && scope !== "root") {
|
|
@@ -16131,6 +15472,7 @@ function isSameThreeType(a, b) {
|
|
|
16131
15472
|
return obj_a.isColor && obj_b.isColor || obj_a.isMatrix3 && obj_b.isMatrix3 || obj_a.isMatrix4 && obj_b.isMatrix4 || obj_a.isEuler && obj_b.isEuler || obj_a.isQuaternion && obj_b.isQuaternion;
|
|
16132
15473
|
}
|
|
16133
15474
|
|
|
15475
|
+
const uniformOf = uniform;
|
|
16134
15476
|
const isUniformNode = (value) => value !== null && typeof value === "object" && "value" in value && "uuid" in value;
|
|
16135
15477
|
const isTSLNode$1 = (value) => value !== null && typeof value === "object" && "uuid" in value && "nodeType" in value;
|
|
16136
15478
|
function useUniform(name, value) {
|
|
@@ -16163,11 +15505,11 @@ function useUniform(name, value) {
|
|
|
16163
15505
|
}
|
|
16164
15506
|
let node;
|
|
16165
15507
|
if (isTSLNode$1(value)) {
|
|
16166
|
-
node =
|
|
15508
|
+
node = uniformOf(value);
|
|
16167
15509
|
} else if (typeof value === "string") {
|
|
16168
15510
|
node = uniform(new Color(value));
|
|
16169
15511
|
} else {
|
|
16170
|
-
node =
|
|
15512
|
+
node = uniformOf(value);
|
|
16171
15513
|
}
|
|
16172
15514
|
if (typeof node.setName === "function") {
|
|
16173
15515
|
node.setName(name);
|
|
@@ -16184,7 +15526,7 @@ function useUniform(name, value) {
|
|
|
16184
15526
|
|
|
16185
15527
|
const isTSLNode = (value) => value !== null && typeof value === "object" && ("uuid" in value || "nodeType" in value);
|
|
16186
15528
|
function useNodes(creatorOrScope, scope) {
|
|
16187
|
-
const store =
|
|
15529
|
+
const store = usePrimaryStore();
|
|
16188
15530
|
const removeNodes2 = useCallback(
|
|
16189
15531
|
(names, targetScope) => {
|
|
16190
15532
|
const nameArray = Array.isArray(names) ? names : [names];
|
|
@@ -16241,8 +15583,8 @@ function useNodes(creatorOrScope, scope) {
|
|
|
16241
15583
|
[store]
|
|
16242
15584
|
);
|
|
16243
15585
|
const isReader = creatorOrScope === void 0 || typeof creatorOrScope === "string";
|
|
16244
|
-
const storeNodes =
|
|
16245
|
-
const hmrVersion =
|
|
15586
|
+
const storeNodes = usePrimaryThree((s) => s.nodes);
|
|
15587
|
+
const hmrVersion = usePrimaryThree((s) => s._hmrVersion);
|
|
16246
15588
|
const scopeDep = typeof creatorOrScope === "string" ? creatorOrScope : scope;
|
|
16247
15589
|
const readerDep = isReader ? storeNodes : null;
|
|
16248
15590
|
const creatorDep = isReader ? null : hmrVersion;
|
|
@@ -16301,6 +15643,7 @@ function useNodes(creatorOrScope, scope) {
|
|
|
16301
15643
|
return { ...nodes, removeNodes: removeNodes2, clearNodes, rebuildNodes };
|
|
16302
15644
|
}
|
|
16303
15645
|
function rebuildAllNodes(store, scope) {
|
|
15646
|
+
store = store.getState().primaryStore ?? store;
|
|
16304
15647
|
store.setState((state) => {
|
|
16305
15648
|
let newNodes = state.nodes;
|
|
16306
15649
|
if (scope && scope !== "root") {
|
|
@@ -16345,18 +15688,364 @@ function clearRootNodes(set) {
|
|
|
16345
15688
|
});
|
|
16346
15689
|
}
|
|
16347
15690
|
function useLocalNodes(creator) {
|
|
16348
|
-
const store =
|
|
16349
|
-
const uniforms =
|
|
16350
|
-
const nodes =
|
|
16351
|
-
const textures =
|
|
16352
|
-
const hmrVersion =
|
|
15691
|
+
const store = usePrimaryStore();
|
|
15692
|
+
const uniforms = usePrimaryThree((s) => s.uniforms);
|
|
15693
|
+
const nodes = usePrimaryThree((s) => s.nodes);
|
|
15694
|
+
const textures = usePrimaryThree((s) => s.textures);
|
|
15695
|
+
const hmrVersion = usePrimaryThree((s) => s._hmrVersion);
|
|
16353
15696
|
return useMemo(() => {
|
|
16354
15697
|
const wrappedState = createLazyCreatorState(store.getState());
|
|
16355
15698
|
return creator(wrappedState);
|
|
16356
15699
|
}, [store, creator, uniforms, nodes, textures, hmrVersion]);
|
|
16357
15700
|
}
|
|
16358
15701
|
|
|
16359
|
-
|
|
15702
|
+
const isBufferLike = (value) => {
|
|
15703
|
+
if (value === null || typeof value !== "object") return false;
|
|
15704
|
+
if (ArrayBuffer.isView(value)) return true;
|
|
15705
|
+
if ("isBufferAttribute" in value) return true;
|
|
15706
|
+
if ("uuid" in value || "nodeType" in value) return true;
|
|
15707
|
+
return false;
|
|
15708
|
+
};
|
|
15709
|
+
const disposeBuffer = (buffer) => {
|
|
15710
|
+
if (buffer === null || typeof buffer !== "object") return;
|
|
15711
|
+
if ("dispose" in buffer && typeof buffer.dispose === "function") {
|
|
15712
|
+
buffer.dispose();
|
|
15713
|
+
}
|
|
15714
|
+
};
|
|
15715
|
+
function useBuffers(creatorOrScope, scope) {
|
|
15716
|
+
const store = usePrimaryStore();
|
|
15717
|
+
const removeBuffers = useCallback(
|
|
15718
|
+
(names, targetScope) => {
|
|
15719
|
+
const nameArray = Array.isArray(names) ? names : [names];
|
|
15720
|
+
store.setState((state) => {
|
|
15721
|
+
if (targetScope) {
|
|
15722
|
+
const currentScope = { ...state.buffers[targetScope] };
|
|
15723
|
+
for (const name of nameArray) delete currentScope[name];
|
|
15724
|
+
return { buffers: { ...state.buffers, [targetScope]: currentScope } };
|
|
15725
|
+
}
|
|
15726
|
+
const buffers2 = { ...state.buffers };
|
|
15727
|
+
for (const name of nameArray) if (isBufferLike(buffers2[name])) delete buffers2[name];
|
|
15728
|
+
return { buffers: buffers2 };
|
|
15729
|
+
});
|
|
15730
|
+
},
|
|
15731
|
+
[store]
|
|
15732
|
+
);
|
|
15733
|
+
const clearBuffers = useCallback(
|
|
15734
|
+
(targetScope) => {
|
|
15735
|
+
store.setState((state) => {
|
|
15736
|
+
if (targetScope && targetScope !== "root") {
|
|
15737
|
+
const { [targetScope]: _, ...rest } = state.buffers;
|
|
15738
|
+
return { buffers: rest };
|
|
15739
|
+
}
|
|
15740
|
+
if (targetScope === "root") {
|
|
15741
|
+
const buffers2 = {};
|
|
15742
|
+
for (const [key, value] of Object.entries(state.buffers)) {
|
|
15743
|
+
if (!isBufferLike(value)) buffers2[key] = value;
|
|
15744
|
+
}
|
|
15745
|
+
return { buffers: buffers2 };
|
|
15746
|
+
}
|
|
15747
|
+
return { buffers: {} };
|
|
15748
|
+
});
|
|
15749
|
+
},
|
|
15750
|
+
[store]
|
|
15751
|
+
);
|
|
15752
|
+
const rebuildBuffers = useCallback(
|
|
15753
|
+
(targetScope) => {
|
|
15754
|
+
store.setState((state) => {
|
|
15755
|
+
let newBuffers = state.buffers;
|
|
15756
|
+
if (targetScope && targetScope !== "root") {
|
|
15757
|
+
const { [targetScope]: _, ...rest } = state.buffers;
|
|
15758
|
+
newBuffers = rest;
|
|
15759
|
+
} else if (targetScope === "root") {
|
|
15760
|
+
newBuffers = {};
|
|
15761
|
+
for (const [key, value] of Object.entries(state.buffers)) {
|
|
15762
|
+
if (!isBufferLike(value)) newBuffers[key] = value;
|
|
15763
|
+
}
|
|
15764
|
+
} else {
|
|
15765
|
+
newBuffers = {};
|
|
15766
|
+
}
|
|
15767
|
+
return { buffers: newBuffers, _hmrVersion: state._hmrVersion + 1 };
|
|
15768
|
+
});
|
|
15769
|
+
},
|
|
15770
|
+
[store]
|
|
15771
|
+
);
|
|
15772
|
+
const disposeBuffers = useCallback(
|
|
15773
|
+
(names, targetScope) => {
|
|
15774
|
+
const nameArray = Array.isArray(names) ? names : [names];
|
|
15775
|
+
const state = store.getState();
|
|
15776
|
+
for (const name of nameArray) {
|
|
15777
|
+
const buffer = targetScope ? state.buffers[targetScope]?.[name] : state.buffers[name];
|
|
15778
|
+
if (buffer && isBufferLike(buffer)) {
|
|
15779
|
+
disposeBuffer(buffer);
|
|
15780
|
+
}
|
|
15781
|
+
}
|
|
15782
|
+
removeBuffers(names, targetScope);
|
|
15783
|
+
},
|
|
15784
|
+
[store, removeBuffers]
|
|
15785
|
+
);
|
|
15786
|
+
const isReader = creatorOrScope === void 0 || typeof creatorOrScope === "string";
|
|
15787
|
+
const storeBuffers = usePrimaryThree((s) => s.buffers);
|
|
15788
|
+
const hmrVersion = usePrimaryThree((s) => s._hmrVersion);
|
|
15789
|
+
const scopeDep = typeof creatorOrScope === "string" ? creatorOrScope : scope;
|
|
15790
|
+
const readerDep = isReader ? storeBuffers : null;
|
|
15791
|
+
const creatorDep = isReader ? null : hmrVersion;
|
|
15792
|
+
const buffers = useMemo(() => {
|
|
15793
|
+
if (creatorOrScope === void 0) {
|
|
15794
|
+
return storeBuffers;
|
|
15795
|
+
}
|
|
15796
|
+
if (typeof creatorOrScope === "string") {
|
|
15797
|
+
const scopeData = storeBuffers[creatorOrScope];
|
|
15798
|
+
if (scopeData && !isBufferLike(scopeData)) return scopeData;
|
|
15799
|
+
return {};
|
|
15800
|
+
}
|
|
15801
|
+
const state = store.getState();
|
|
15802
|
+
const set = store.setState;
|
|
15803
|
+
const creator = creatorOrScope;
|
|
15804
|
+
const wrappedState = createLazyCreatorState(state);
|
|
15805
|
+
const created = creator(wrappedState);
|
|
15806
|
+
const result = {};
|
|
15807
|
+
let hasNewBuffers = false;
|
|
15808
|
+
if (scope) {
|
|
15809
|
+
const currentScope = state.buffers[scope] ?? {};
|
|
15810
|
+
for (const [name, buffer] of Object.entries(created)) {
|
|
15811
|
+
if (currentScope[name]) {
|
|
15812
|
+
result[name] = currentScope[name];
|
|
15813
|
+
} else {
|
|
15814
|
+
if ("setName" in buffer && typeof buffer.setName === "function") {
|
|
15815
|
+
buffer.setName(`${scope}.${name}`);
|
|
15816
|
+
}
|
|
15817
|
+
result[name] = buffer;
|
|
15818
|
+
hasNewBuffers = true;
|
|
15819
|
+
}
|
|
15820
|
+
}
|
|
15821
|
+
if (hasNewBuffers) {
|
|
15822
|
+
set((s) => ({
|
|
15823
|
+
buffers: {
|
|
15824
|
+
...s.buffers,
|
|
15825
|
+
[scope]: { ...s.buffers[scope], ...result }
|
|
15826
|
+
}
|
|
15827
|
+
}));
|
|
15828
|
+
}
|
|
15829
|
+
return result;
|
|
15830
|
+
}
|
|
15831
|
+
for (const [name, buffer] of Object.entries(created)) {
|
|
15832
|
+
const existing = state.buffers[name];
|
|
15833
|
+
if (existing && isBufferLike(existing)) {
|
|
15834
|
+
result[name] = existing;
|
|
15835
|
+
} else {
|
|
15836
|
+
if ("setName" in buffer && typeof buffer.setName === "function") {
|
|
15837
|
+
buffer.setName(name);
|
|
15838
|
+
}
|
|
15839
|
+
result[name] = buffer;
|
|
15840
|
+
hasNewBuffers = true;
|
|
15841
|
+
}
|
|
15842
|
+
}
|
|
15843
|
+
if (hasNewBuffers) {
|
|
15844
|
+
set((s) => ({ buffers: { ...s.buffers, ...result } }));
|
|
15845
|
+
}
|
|
15846
|
+
return result;
|
|
15847
|
+
}, [store, scopeDep, readerDep, creatorDep]);
|
|
15848
|
+
return { ...buffers, removeBuffers, clearBuffers, rebuildBuffers, disposeBuffers };
|
|
15849
|
+
}
|
|
15850
|
+
function rebuildAllBuffers(store, scope) {
|
|
15851
|
+
store = store.getState().primaryStore ?? store;
|
|
15852
|
+
store.setState((state) => {
|
|
15853
|
+
let newBuffers = state.buffers;
|
|
15854
|
+
if (scope && scope !== "root") {
|
|
15855
|
+
const { [scope]: _, ...rest } = state.buffers;
|
|
15856
|
+
newBuffers = rest;
|
|
15857
|
+
} else if (scope === "root") {
|
|
15858
|
+
newBuffers = {};
|
|
15859
|
+
for (const [key, value] of Object.entries(state.buffers)) {
|
|
15860
|
+
if (!isBufferLike(value)) newBuffers[key] = value;
|
|
15861
|
+
}
|
|
15862
|
+
} else {
|
|
15863
|
+
newBuffers = {};
|
|
15864
|
+
}
|
|
15865
|
+
return { buffers: newBuffers, _hmrVersion: state._hmrVersion + 1 };
|
|
15866
|
+
});
|
|
15867
|
+
}
|
|
15868
|
+
|
|
15869
|
+
const isStorageLike = (value) => {
|
|
15870
|
+
if (value === null || typeof value !== "object") return false;
|
|
15871
|
+
if ("isTexture" in value) return true;
|
|
15872
|
+
if ("isData3DTexture" in value) return true;
|
|
15873
|
+
if ("uuid" in value || "nodeType" in value) return true;
|
|
15874
|
+
return false;
|
|
15875
|
+
};
|
|
15876
|
+
const disposeStorage = (storage) => {
|
|
15877
|
+
if (storage === null || typeof storage !== "object") return;
|
|
15878
|
+
if ("dispose" in storage && typeof storage.dispose === "function") {
|
|
15879
|
+
storage.dispose();
|
|
15880
|
+
}
|
|
15881
|
+
};
|
|
15882
|
+
function useGPUStorage(creatorOrScope, scope) {
|
|
15883
|
+
const store = usePrimaryStore();
|
|
15884
|
+
const removeStorage = useCallback(
|
|
15885
|
+
(names, targetScope) => {
|
|
15886
|
+
const nameArray = Array.isArray(names) ? names : [names];
|
|
15887
|
+
store.setState((state) => {
|
|
15888
|
+
if (targetScope) {
|
|
15889
|
+
const currentScope = { ...state.gpuStorage[targetScope] };
|
|
15890
|
+
for (const name of nameArray) delete currentScope[name];
|
|
15891
|
+
return { gpuStorage: { ...state.gpuStorage, [targetScope]: currentScope } };
|
|
15892
|
+
}
|
|
15893
|
+
const gpuStorage2 = { ...state.gpuStorage };
|
|
15894
|
+
for (const name of nameArray) if (isStorageLike(gpuStorage2[name])) delete gpuStorage2[name];
|
|
15895
|
+
return { gpuStorage: gpuStorage2 };
|
|
15896
|
+
});
|
|
15897
|
+
},
|
|
15898
|
+
[store]
|
|
15899
|
+
);
|
|
15900
|
+
const clearStorage = useCallback(
|
|
15901
|
+
(targetScope) => {
|
|
15902
|
+
store.setState((state) => {
|
|
15903
|
+
if (targetScope && targetScope !== "root") {
|
|
15904
|
+
const { [targetScope]: _, ...rest } = state.gpuStorage;
|
|
15905
|
+
return { gpuStorage: rest };
|
|
15906
|
+
}
|
|
15907
|
+
if (targetScope === "root") {
|
|
15908
|
+
const gpuStorage2 = {};
|
|
15909
|
+
for (const [key, value] of Object.entries(state.gpuStorage)) {
|
|
15910
|
+
if (!isStorageLike(value)) gpuStorage2[key] = value;
|
|
15911
|
+
}
|
|
15912
|
+
return { gpuStorage: gpuStorage2 };
|
|
15913
|
+
}
|
|
15914
|
+
return { gpuStorage: {} };
|
|
15915
|
+
});
|
|
15916
|
+
},
|
|
15917
|
+
[store]
|
|
15918
|
+
);
|
|
15919
|
+
const rebuildStorage = useCallback(
|
|
15920
|
+
(targetScope) => {
|
|
15921
|
+
store.setState((state) => {
|
|
15922
|
+
let newStorage = state.gpuStorage;
|
|
15923
|
+
if (targetScope && targetScope !== "root") {
|
|
15924
|
+
const { [targetScope]: _, ...rest } = state.gpuStorage;
|
|
15925
|
+
newStorage = rest;
|
|
15926
|
+
} else if (targetScope === "root") {
|
|
15927
|
+
newStorage = {};
|
|
15928
|
+
for (const [key, value] of Object.entries(state.gpuStorage)) {
|
|
15929
|
+
if (!isStorageLike(value)) newStorage[key] = value;
|
|
15930
|
+
}
|
|
15931
|
+
} else {
|
|
15932
|
+
newStorage = {};
|
|
15933
|
+
}
|
|
15934
|
+
return { gpuStorage: newStorage, _hmrVersion: state._hmrVersion + 1 };
|
|
15935
|
+
});
|
|
15936
|
+
},
|
|
15937
|
+
[store]
|
|
15938
|
+
);
|
|
15939
|
+
const disposeStorageFn = useCallback(
|
|
15940
|
+
(names, targetScope) => {
|
|
15941
|
+
const nameArray = Array.isArray(names) ? names : [names];
|
|
15942
|
+
const state = store.getState();
|
|
15943
|
+
for (const name of nameArray) {
|
|
15944
|
+
const storage = targetScope ? state.gpuStorage[targetScope]?.[name] : state.gpuStorage[name];
|
|
15945
|
+
if (storage && isStorageLike(storage)) {
|
|
15946
|
+
disposeStorage(storage);
|
|
15947
|
+
}
|
|
15948
|
+
}
|
|
15949
|
+
removeStorage(names, targetScope);
|
|
15950
|
+
},
|
|
15951
|
+
[store, removeStorage]
|
|
15952
|
+
);
|
|
15953
|
+
const isReader = creatorOrScope === void 0 || typeof creatorOrScope === "string";
|
|
15954
|
+
const storeStorage = usePrimaryThree((s) => s.gpuStorage);
|
|
15955
|
+
const hmrVersion = usePrimaryThree((s) => s._hmrVersion);
|
|
15956
|
+
const scopeDep = typeof creatorOrScope === "string" ? creatorOrScope : scope;
|
|
15957
|
+
const readerDep = isReader ? storeStorage : null;
|
|
15958
|
+
const creatorDep = isReader ? null : hmrVersion;
|
|
15959
|
+
const gpuStorage = useMemo(() => {
|
|
15960
|
+
if (creatorOrScope === void 0) {
|
|
15961
|
+
return storeStorage;
|
|
15962
|
+
}
|
|
15963
|
+
if (typeof creatorOrScope === "string") {
|
|
15964
|
+
const scopeData = storeStorage[creatorOrScope];
|
|
15965
|
+
if (scopeData && !isStorageLike(scopeData)) return scopeData;
|
|
15966
|
+
return {};
|
|
15967
|
+
}
|
|
15968
|
+
const state = store.getState();
|
|
15969
|
+
const set = store.setState;
|
|
15970
|
+
const creator = creatorOrScope;
|
|
15971
|
+
const wrappedState = createLazyCreatorState(state);
|
|
15972
|
+
const created = creator(wrappedState);
|
|
15973
|
+
const result = {};
|
|
15974
|
+
let hasNewStorage = false;
|
|
15975
|
+
if (scope) {
|
|
15976
|
+
const currentScope = state.gpuStorage[scope] ?? {};
|
|
15977
|
+
for (const [name, storage] of Object.entries(created)) {
|
|
15978
|
+
if (currentScope[name]) {
|
|
15979
|
+
result[name] = currentScope[name];
|
|
15980
|
+
} else {
|
|
15981
|
+
if ("setName" in storage && typeof storage.setName === "function") {
|
|
15982
|
+
storage.setName(`${scope}.${name}`);
|
|
15983
|
+
}
|
|
15984
|
+
if ("name" in storage && typeof storage.name === "string") {
|
|
15985
|
+
storage.name = `${scope}.${name}`;
|
|
15986
|
+
}
|
|
15987
|
+
result[name] = storage;
|
|
15988
|
+
hasNewStorage = true;
|
|
15989
|
+
}
|
|
15990
|
+
}
|
|
15991
|
+
if (hasNewStorage) {
|
|
15992
|
+
set((s) => ({
|
|
15993
|
+
gpuStorage: {
|
|
15994
|
+
...s.gpuStorage,
|
|
15995
|
+
[scope]: { ...s.gpuStorage[scope], ...result }
|
|
15996
|
+
}
|
|
15997
|
+
}));
|
|
15998
|
+
}
|
|
15999
|
+
return result;
|
|
16000
|
+
}
|
|
16001
|
+
for (const [name, storage] of Object.entries(created)) {
|
|
16002
|
+
const existing = state.gpuStorage[name];
|
|
16003
|
+
if (existing && isStorageLike(existing)) {
|
|
16004
|
+
result[name] = existing;
|
|
16005
|
+
} else {
|
|
16006
|
+
if ("setName" in storage && typeof storage.setName === "function") {
|
|
16007
|
+
storage.setName(name);
|
|
16008
|
+
}
|
|
16009
|
+
if ("name" in storage && typeof storage.name === "string") {
|
|
16010
|
+
storage.name = name;
|
|
16011
|
+
}
|
|
16012
|
+
result[name] = storage;
|
|
16013
|
+
hasNewStorage = true;
|
|
16014
|
+
}
|
|
16015
|
+
}
|
|
16016
|
+
if (hasNewStorage) {
|
|
16017
|
+
set((s) => ({ gpuStorage: { ...s.gpuStorage, ...result } }));
|
|
16018
|
+
}
|
|
16019
|
+
return result;
|
|
16020
|
+
}, [store, scopeDep, readerDep, creatorDep]);
|
|
16021
|
+
return {
|
|
16022
|
+
...gpuStorage,
|
|
16023
|
+
removeStorage,
|
|
16024
|
+
clearStorage,
|
|
16025
|
+
rebuildStorage,
|
|
16026
|
+
disposeStorage: disposeStorageFn
|
|
16027
|
+
};
|
|
16028
|
+
}
|
|
16029
|
+
function rebuildAllStorage(store, scope) {
|
|
16030
|
+
store = store.getState().primaryStore ?? store;
|
|
16031
|
+
store.setState((state) => {
|
|
16032
|
+
let newStorage = state.gpuStorage;
|
|
16033
|
+
if (scope && scope !== "root") {
|
|
16034
|
+
const { [scope]: _, ...rest } = state.gpuStorage;
|
|
16035
|
+
newStorage = rest;
|
|
16036
|
+
} else if (scope === "root") {
|
|
16037
|
+
newStorage = {};
|
|
16038
|
+
for (const [key, value] of Object.entries(state.gpuStorage)) {
|
|
16039
|
+
if (!isStorageLike(value)) newStorage[key] = value;
|
|
16040
|
+
}
|
|
16041
|
+
} else {
|
|
16042
|
+
newStorage = {};
|
|
16043
|
+
}
|
|
16044
|
+
return { gpuStorage: newStorage, _hmrVersion: state._hmrVersion + 1 };
|
|
16045
|
+
});
|
|
16046
|
+
}
|
|
16047
|
+
|
|
16048
|
+
function useRenderPipeline(mainCB, setupCB) {
|
|
16360
16049
|
const store = useStore();
|
|
16361
16050
|
const { scene, camera, renderer, isLegacy } = useThree();
|
|
16362
16051
|
const callbacksRanRef = useRef(false);
|
|
@@ -16375,7 +16064,7 @@ function usePostProcessing(mainCB, setupCB) {
|
|
|
16375
16064
|
}, [store]);
|
|
16376
16065
|
const reset = useCallback(() => {
|
|
16377
16066
|
store.setState({
|
|
16378
|
-
|
|
16067
|
+
renderPipeline: null,
|
|
16379
16068
|
passes: {}
|
|
16380
16069
|
});
|
|
16381
16070
|
callbacksRanRef.current = false;
|
|
@@ -16388,18 +16077,18 @@ function usePostProcessing(mainCB, setupCB) {
|
|
|
16388
16077
|
}, []);
|
|
16389
16078
|
useLayoutEffect(() => {
|
|
16390
16079
|
if (isLegacy) {
|
|
16391
|
-
throw new Error("
|
|
16080
|
+
throw new Error("useRenderPipeline is only available with WebGPU renderer. Set renderer prop on Canvas.");
|
|
16392
16081
|
}
|
|
16393
16082
|
if (!renderer || !scene || !camera) return;
|
|
16394
16083
|
const state = store.getState();
|
|
16395
16084
|
const set = store.setState;
|
|
16396
16085
|
try {
|
|
16397
|
-
let
|
|
16086
|
+
let pipeline = state.renderPipeline;
|
|
16398
16087
|
let currentPasses = { ...state.passes };
|
|
16399
|
-
let
|
|
16400
|
-
if (!
|
|
16401
|
-
|
|
16402
|
-
|
|
16088
|
+
let justCreatedPipeline = false;
|
|
16089
|
+
if (!pipeline) {
|
|
16090
|
+
pipeline = new RenderPipeline(renderer);
|
|
16091
|
+
justCreatedPipeline = true;
|
|
16403
16092
|
}
|
|
16404
16093
|
const cacheValid = scenePassCacheRef.current && scenePassCacheRef.current.sceneUuid === scene.uuid && scenePassCacheRef.current.cameraUuid === camera.uuid;
|
|
16405
16094
|
let scenePass;
|
|
@@ -16410,9 +16099,9 @@ function usePostProcessing(mainCB, setupCB) {
|
|
|
16410
16099
|
scenePassCacheRef.current = { sceneUuid: scene.uuid, cameraUuid: camera.uuid, scenePass };
|
|
16411
16100
|
}
|
|
16412
16101
|
currentPasses.scenePass = scenePass;
|
|
16413
|
-
if (!
|
|
16414
|
-
set({
|
|
16415
|
-
const shouldRunCallbacks =
|
|
16102
|
+
if (!pipeline.outputNode || justCreatedPipeline) pipeline.outputNode = scenePass;
|
|
16103
|
+
set({ renderPipeline: pipeline, passes: currentPasses });
|
|
16104
|
+
const shouldRunCallbacks = justCreatedPipeline || !callbacksRanRef.current || !cacheValid;
|
|
16416
16105
|
if (shouldRunCallbacks) {
|
|
16417
16106
|
if (setupCBRef.current) {
|
|
16418
16107
|
const freshState = store.getState();
|
|
@@ -16433,22 +16122,22 @@ function usePostProcessing(mainCB, setupCB) {
|
|
|
16433
16122
|
callbacksRanRef.current = true;
|
|
16434
16123
|
}
|
|
16435
16124
|
} catch (error) {
|
|
16436
|
-
console.
|
|
16125
|
+
console.warn("[useRenderPipeline] Setup failed; the render pipeline was not configured:", error);
|
|
16437
16126
|
}
|
|
16438
16127
|
}, [store, renderer, scene, camera, isLegacy, rebuildVersion]);
|
|
16439
16128
|
const passes = useThree((s) => s.passes);
|
|
16440
|
-
const
|
|
16129
|
+
const renderPipeline = useThree((s) => s.renderPipeline);
|
|
16441
16130
|
return {
|
|
16442
16131
|
passes,
|
|
16443
|
-
|
|
16132
|
+
renderPipeline,
|
|
16444
16133
|
clearPasses,
|
|
16445
16134
|
reset,
|
|
16446
16135
|
rebuild,
|
|
16447
|
-
// isReady indicates if
|
|
16448
|
-
isReady:
|
|
16136
|
+
// isReady indicates if RenderPipeline is configured and ready for rendering
|
|
16137
|
+
isReady: renderPipeline !== null
|
|
16449
16138
|
};
|
|
16450
16139
|
}
|
|
16451
16140
|
|
|
16452
16141
|
extend(THREE);
|
|
16453
16142
|
|
|
16454
|
-
export { Block, Canvas, Environment, EnvironmentCube, EnvironmentMap, EnvironmentPortal, ErrorBoundary, FROM_REF, IsObject, ONCE, Portal, R3F_BUILD_LEGACY, R3F_BUILD_WEBGPU, REACT_INTERNAL_PROPS, RESERVED_PROPS,
|
|
16143
|
+
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, clearNodeScope, clearRootNodes, clearRootUniforms, clearScope, context, createEvents, createPointerEvents, createPortal, createRoot, createScopedStore, createStore, createTextureOperations, 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, rebuildAllBuffers, rebuildAllNodes, rebuildAllStorage, rebuildAllUniforms, reconciler, registerPrimary, removeInteractivity, removeNodes, removeUniforms, resolve, unmountComponentAtNode, unregisterPrimary, updateCamera, updateFrustum, useBridge, useBuffers, useEnvironment, useFrame, useGPUStorage, useGraph, useInstanceHandle, useIsomorphicLayoutEffect, useLoader, useLocalNodes, useMutableCallback, useNodes, useRenderPipeline, useRenderTarget, useStore, useTexture, useTextures, useThree, useUniform, useUniforms, waitForPrimary };
|