@react-three/fiber 10.0.0-canary.604355a → 10.0.0-canary.6d6e5ab
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.cjs +844 -1423
- package/dist/index.d.cts +291 -811
- package/dist/index.d.mts +291 -811
- package/dist/index.d.ts +291 -811
- package/dist/index.mjs +820 -1397
- package/dist/legacy.cjs +799 -1384
- package/dist/legacy.d.cts +292 -811
- package/dist/legacy.d.mts +292 -811
- package/dist/legacy.d.ts +292 -811
- package/dist/legacy.mjs +774 -1357
- package/dist/webgpu/index.cjs +1300 -1738
- package/dist/webgpu/index.d.cts +407 -825
- package/dist/webgpu/index.d.mts +407 -825
- package/dist/webgpu/index.d.ts +407 -825
- package/dist/webgpu/index.mjs +1270 -1710
- package/package.json +4 -3
- package/readme.md +2 -3
package/dist/webgpu/index.cjs
CHANGED
|
@@ -14,6 +14,7 @@ const UltraHDRLoader_js = require('three/examples/jsm/loaders/UltraHDRLoader.js'
|
|
|
14
14
|
const gainmapJs = require('@monogrid/gainmap-js');
|
|
15
15
|
const Tb = require('scheduler');
|
|
16
16
|
const traditional = require('zustand/traditional');
|
|
17
|
+
const scheduler = require('@pmndrs/scheduler');
|
|
17
18
|
const suspendReact = require('suspend-react');
|
|
18
19
|
const lite = require('dequal/lite');
|
|
19
20
|
require('zustand/shallow');
|
|
@@ -62,13 +63,16 @@ const WebGLRenderer = class WebGLRenderer2 {
|
|
|
62
63
|
}
|
|
63
64
|
};
|
|
64
65
|
const WebGLRenderTarget = null;
|
|
66
|
+
const WebGLCubeRenderTarget = null;
|
|
65
67
|
|
|
66
68
|
const THREE = /*#__PURE__*/_mergeNamespaces({
|
|
67
69
|
__proto__: null,
|
|
70
|
+
CubeRenderTargetCompat: webgpu.CubeRenderTarget,
|
|
68
71
|
Inspector: Inspector_js.Inspector,
|
|
69
72
|
R3F_BUILD_LEGACY: R3F_BUILD_LEGACY,
|
|
70
73
|
R3F_BUILD_WEBGPU: R3F_BUILD_WEBGPU,
|
|
71
74
|
RenderTargetCompat: webgpu.RenderTarget,
|
|
75
|
+
WebGLCubeRenderTarget: WebGLCubeRenderTarget,
|
|
72
76
|
WebGLRenderTarget: WebGLRenderTarget,
|
|
73
77
|
WebGLRenderer: WebGLRenderer
|
|
74
78
|
}, [webgpu__namespace]);
|
|
@@ -170,7 +174,7 @@ function useEnvironment({
|
|
|
170
174
|
fiber.useLoader.clear(loader, multiFile ? [files] : files);
|
|
171
175
|
}
|
|
172
176
|
renderer.domElement.addEventListener("webglcontextlost", clearGainmapTexture, { once: true });
|
|
173
|
-
}, [files, renderer.domElement]);
|
|
177
|
+
}, [extension, files, loader, multiFile, renderer.domElement]);
|
|
174
178
|
const loaderResult = fiber.useLoader(
|
|
175
179
|
loader,
|
|
176
180
|
multiFile ? [files] : files,
|
|
@@ -342,15 +346,16 @@ function EnvironmentPortal({
|
|
|
342
346
|
preset = void 0,
|
|
343
347
|
extensions
|
|
344
348
|
}) {
|
|
345
|
-
const
|
|
349
|
+
const renderer = fiber.useThree((state) => state.renderer);
|
|
350
|
+
const isLegacy = fiber.useThree((state) => state.isLegacy);
|
|
346
351
|
const defaultScene = fiber.useThree((state) => state.scene);
|
|
347
352
|
const camera = React__namespace.useRef(null);
|
|
348
353
|
const [virtualScene] = React__namespace.useState(() => new webgpu.Scene());
|
|
349
354
|
const fbo = React__namespace.useMemo(() => {
|
|
350
|
-
const fbo2 = new webgpu.
|
|
355
|
+
const fbo2 = isLegacy ? new WebGLCubeRenderTarget(resolution) : new webgpu.CubeRenderTarget(resolution);
|
|
351
356
|
fbo2.texture.type = webgpu.HalfFloatType;
|
|
352
357
|
return fbo2;
|
|
353
|
-
}, [resolution]);
|
|
358
|
+
}, [resolution, isLegacy]);
|
|
354
359
|
React__namespace.useEffect(() => {
|
|
355
360
|
return () => {
|
|
356
361
|
fbo.dispose();
|
|
@@ -358,10 +363,10 @@ function EnvironmentPortal({
|
|
|
358
363
|
}, [fbo]);
|
|
359
364
|
React__namespace.useLayoutEffect(() => {
|
|
360
365
|
if (frames === 1) {
|
|
361
|
-
const autoClear =
|
|
362
|
-
|
|
363
|
-
camera.current.update(
|
|
364
|
-
|
|
366
|
+
const autoClear = renderer.autoClear;
|
|
367
|
+
renderer.autoClear = true;
|
|
368
|
+
camera.current.update(renderer, virtualScene);
|
|
369
|
+
renderer.autoClear = autoClear;
|
|
365
370
|
}
|
|
366
371
|
return setEnvProps(background, scene, defaultScene, fbo.texture, {
|
|
367
372
|
backgroundBlurriness: blur ?? backgroundBlurriness,
|
|
@@ -370,14 +375,29 @@ function EnvironmentPortal({
|
|
|
370
375
|
environmentIntensity,
|
|
371
376
|
environmentRotation
|
|
372
377
|
});
|
|
373
|
-
}, [
|
|
378
|
+
}, [
|
|
379
|
+
children,
|
|
380
|
+
virtualScene,
|
|
381
|
+
fbo.texture,
|
|
382
|
+
scene,
|
|
383
|
+
defaultScene,
|
|
384
|
+
background,
|
|
385
|
+
frames,
|
|
386
|
+
renderer,
|
|
387
|
+
blur,
|
|
388
|
+
backgroundBlurriness,
|
|
389
|
+
backgroundIntensity,
|
|
390
|
+
backgroundRotation,
|
|
391
|
+
environmentIntensity,
|
|
392
|
+
environmentRotation
|
|
393
|
+
]);
|
|
374
394
|
let count = 1;
|
|
375
395
|
fiber.useFrame(() => {
|
|
376
396
|
if (frames === Infinity || count < frames) {
|
|
377
|
-
const autoClear =
|
|
378
|
-
|
|
379
|
-
camera.current.update(
|
|
380
|
-
|
|
397
|
+
const autoClear = renderer.autoClear;
|
|
398
|
+
renderer.autoClear = true;
|
|
399
|
+
camera.current.update(renderer, virtualScene);
|
|
400
|
+
renderer.autoClear = autoClear;
|
|
381
401
|
count++;
|
|
382
402
|
}
|
|
383
403
|
});
|
|
@@ -441,10 +461,9 @@ function Environment(props) {
|
|
|
441
461
|
return props.ground ? /* @__PURE__ */ jsxRuntime.jsx(EnvironmentGround, { ...props }) : props.map ? /* @__PURE__ */ jsxRuntime.jsx(EnvironmentMap, { ...props }) : props.children ? /* @__PURE__ */ jsxRuntime.jsx(EnvironmentPortal, { ...props }) : /* @__PURE__ */ jsxRuntime.jsx(EnvironmentCube, { ...props });
|
|
442
462
|
}
|
|
443
463
|
|
|
444
|
-
var __defProp$
|
|
445
|
-
var __defNormalProp$
|
|
446
|
-
var __publicField$
|
|
447
|
-
const act = React__namespace["act"];
|
|
464
|
+
var __defProp$1 = Object.defineProperty;
|
|
465
|
+
var __defNormalProp$1 = (obj, key, value) => key in obj ? __defProp$1(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
|
|
466
|
+
var __publicField$1 = (obj, key, value) => __defNormalProp$1(obj, typeof key !== "symbol" ? key + "" : key, value);
|
|
448
467
|
const useIsomorphicLayoutEffect = /* @__PURE__ */ (() => typeof window !== "undefined" && (window.document?.createElement || window.navigator?.product === "ReactNative"))() ? React__namespace.useLayoutEffect : React__namespace.useEffect;
|
|
449
468
|
function useMutableCallback(fn) {
|
|
450
469
|
const ref = React__namespace.useRef(fn);
|
|
@@ -475,7 +494,7 @@ const ErrorBoundary = /* @__PURE__ */ (() => {
|
|
|
475
494
|
return _a = class extends React__namespace.Component {
|
|
476
495
|
constructor() {
|
|
477
496
|
super(...arguments);
|
|
478
|
-
__publicField$
|
|
497
|
+
__publicField$1(this, "state", { error: false });
|
|
479
498
|
}
|
|
480
499
|
componentDidCatch(err) {
|
|
481
500
|
this.props.set(err);
|
|
@@ -483,7 +502,7 @@ const ErrorBoundary = /* @__PURE__ */ (() => {
|
|
|
483
502
|
render() {
|
|
484
503
|
return this.state.error ? null : this.props.children;
|
|
485
504
|
}
|
|
486
|
-
}, __publicField$
|
|
505
|
+
}, __publicField$1(_a, "getDerivedStateFromError", () => ({ error: true })), _a;
|
|
487
506
|
})();
|
|
488
507
|
|
|
489
508
|
const is = {
|
|
@@ -620,8 +639,7 @@ function prepare(target, root, type, props) {
|
|
|
620
639
|
object,
|
|
621
640
|
eventCount: 0,
|
|
622
641
|
handlers: {},
|
|
623
|
-
isHidden: false
|
|
624
|
-
deferredRefs: []
|
|
642
|
+
isHidden: false
|
|
625
643
|
};
|
|
626
644
|
if (object) object.__r3f = instance;
|
|
627
645
|
}
|
|
@@ -778,6 +796,17 @@ function unregisterVisibility(store, object) {
|
|
|
778
796
|
internal.visibilityRegistry.delete(object.uuid);
|
|
779
797
|
internal.occlusionCache.delete(object);
|
|
780
798
|
}
|
|
799
|
+
function updateVisibilityHandlers(store, object, handlers) {
|
|
800
|
+
const { internal } = store.getState();
|
|
801
|
+
const entry = internal.visibilityRegistry.get(object.uuid);
|
|
802
|
+
if (!entry) return false;
|
|
803
|
+
entry.handlers = handlers;
|
|
804
|
+
if ((handlers.onOccluded || handlers.onVisible) && !internal.occlusionEnabled) {
|
|
805
|
+
object.occlusionTest = true;
|
|
806
|
+
enableOcclusion(store);
|
|
807
|
+
}
|
|
808
|
+
return true;
|
|
809
|
+
}
|
|
781
810
|
function checkVisibility(state) {
|
|
782
811
|
const { internal, camera } = state;
|
|
783
812
|
const registry = internal.visibilityRegistry;
|
|
@@ -938,9 +967,9 @@ function diffProps(instance, newProps) {
|
|
|
938
967
|
const { root, key } = resolve(instance.object, prop);
|
|
939
968
|
if (root.constructor && root.constructor.length === 0) {
|
|
940
969
|
const ctor = getMemoizedPrototype(root);
|
|
941
|
-
if (!is.und(ctor)) changedProps[
|
|
970
|
+
if (!is.und(ctor)) changedProps[prop] = ctor[key];
|
|
942
971
|
} else {
|
|
943
|
-
changedProps[
|
|
972
|
+
changedProps[prop] = 0;
|
|
944
973
|
}
|
|
945
974
|
}
|
|
946
975
|
return changedProps;
|
|
@@ -965,10 +994,7 @@ function applyProps(object, props) {
|
|
|
965
994
|
continue;
|
|
966
995
|
}
|
|
967
996
|
if (value === void 0) continue;
|
|
968
|
-
if (isFromRef(value))
|
|
969
|
-
instance?.deferredRefs?.push({ prop, ref: value[FROM_REF] });
|
|
970
|
-
continue;
|
|
971
|
-
}
|
|
997
|
+
if (isFromRef(value)) continue;
|
|
972
998
|
if (isOnce(value)) {
|
|
973
999
|
if (instance?.appliedOnce?.has(prop)) continue;
|
|
974
1000
|
if (instance) {
|
|
@@ -1004,8 +1030,24 @@ function applyProps(object, props) {
|
|
|
1004
1030
|
} else if (isVectorLike(target) && is.num(value)) {
|
|
1005
1031
|
if ("setScalar" in target && typeof target.setScalar === "function") target.setScalar(value);
|
|
1006
1032
|
else target.set(value);
|
|
1033
|
+
} else if (root instanceof webgpu.ShaderMaterial && key === "uniforms" && is.obj(value)) {
|
|
1034
|
+
if (!is.obj(root.uniforms)) root.uniforms = {};
|
|
1035
|
+
const uniforms = root.uniforms;
|
|
1036
|
+
const nextUniforms = value;
|
|
1037
|
+
for (const name in nextUniforms) {
|
|
1038
|
+
const uniform = nextUniforms[name];
|
|
1039
|
+
const targetUniform = uniforms[name];
|
|
1040
|
+
if (targetUniform) Object.assign(targetUniform, uniform);
|
|
1041
|
+
else {
|
|
1042
|
+
const nextUniform = uniform instanceof webgpu.Uniform ? uniform.clone() : new webgpu.Uniform(uniform.value);
|
|
1043
|
+
uniforms[name] = nextUniform;
|
|
1044
|
+
}
|
|
1045
|
+
}
|
|
1007
1046
|
} else {
|
|
1008
1047
|
root[key] = value;
|
|
1048
|
+
if (key.endsWith("Node") && root.isMaterial) {
|
|
1049
|
+
root.needsUpdate = true;
|
|
1050
|
+
}
|
|
1009
1051
|
if (rootState && rootState.renderer?.outputColorSpace === webgpu.SRGBColorSpace && colorMaps.includes(key) && isTexture(value) && root[key]?.isTexture && // sRGB textures must be RGBA8 since r137 https://github.com/mrdoob/three.js/pull/23129
|
|
1010
1052
|
root[key].format === webgpu.RGBAFormat && root[key].type === webgpu.UnsignedByteType) {
|
|
1011
1053
|
root[key].colorSpace = rootState.textureColorSpace;
|
|
@@ -1019,6 +1061,9 @@ function applyProps(object, props) {
|
|
|
1019
1061
|
if (instance.eventCount && object2.raycast !== null) {
|
|
1020
1062
|
rootState.internal.interaction.push(object2);
|
|
1021
1063
|
}
|
|
1064
|
+
}
|
|
1065
|
+
if (instance?.parent && rootState?.internal && instance.object?.isObject3D) {
|
|
1066
|
+
const object2 = instance.object;
|
|
1022
1067
|
const root = findInitialRoot(instance);
|
|
1023
1068
|
const visibilityHandlers = {
|
|
1024
1069
|
onFramed: instance.handlers.onFramed,
|
|
@@ -1026,7 +1071,9 @@ function applyProps(object, props) {
|
|
|
1026
1071
|
onVisible: instance.handlers.onVisible
|
|
1027
1072
|
};
|
|
1028
1073
|
if (hasVisibilityHandlers(visibilityHandlers)) {
|
|
1029
|
-
|
|
1074
|
+
if (!updateVisibilityHandlers(root, object2, visibilityHandlers)) {
|
|
1075
|
+
registerVisibility(root, object2, visibilityHandlers);
|
|
1076
|
+
}
|
|
1030
1077
|
} else {
|
|
1031
1078
|
unregisterVisibility(root, object2);
|
|
1032
1079
|
}
|
|
@@ -1039,38 +1086,60 @@ function applyProps(object, props) {
|
|
|
1039
1086
|
return object;
|
|
1040
1087
|
}
|
|
1041
1088
|
|
|
1089
|
+
const DEFAULT_POINTER_ID = 0;
|
|
1090
|
+
const XR_POINTER_ID_START = 1e3;
|
|
1091
|
+
function getPointerState(internal, pointerId) {
|
|
1092
|
+
let state = internal.pointerMap.get(pointerId);
|
|
1093
|
+
if (!state) {
|
|
1094
|
+
state = {
|
|
1095
|
+
hovered: /* @__PURE__ */ new Map(),
|
|
1096
|
+
captured: /* @__PURE__ */ new Map(),
|
|
1097
|
+
initialClick: [0, 0],
|
|
1098
|
+
initialHits: []
|
|
1099
|
+
};
|
|
1100
|
+
internal.pointerMap.set(pointerId, state);
|
|
1101
|
+
}
|
|
1102
|
+
return state;
|
|
1103
|
+
}
|
|
1104
|
+
function getPointerId(event) {
|
|
1105
|
+
return "pointerId" in event ? event.pointerId : DEFAULT_POINTER_ID;
|
|
1106
|
+
}
|
|
1042
1107
|
function makeId(event) {
|
|
1043
1108
|
return (event.eventObject || event.object).uuid + "/" + event.index + event.instanceId;
|
|
1044
1109
|
}
|
|
1045
|
-
function releaseInternalPointerCapture(
|
|
1046
|
-
const
|
|
1110
|
+
function releaseInternalPointerCapture(internal, obj, pointerId) {
|
|
1111
|
+
const pointerState = internal.pointerMap.get(pointerId);
|
|
1112
|
+
if (!pointerState) return;
|
|
1113
|
+
const captureData = pointerState.captured.get(obj);
|
|
1047
1114
|
if (captureData) {
|
|
1048
|
-
|
|
1049
|
-
|
|
1050
|
-
capturedMap.delete(pointerId);
|
|
1051
|
-
captureData.target.releasePointerCapture(pointerId);
|
|
1052
|
-
}
|
|
1115
|
+
pointerState.captured.delete(obj);
|
|
1116
|
+
captureData.target.releasePointerCapture(pointerId);
|
|
1053
1117
|
}
|
|
1054
1118
|
}
|
|
1055
1119
|
function removeInteractivity(store, object) {
|
|
1056
1120
|
const { internal } = store.getState();
|
|
1057
1121
|
internal.interaction = internal.interaction.filter((o) => o !== object);
|
|
1058
|
-
|
|
1059
|
-
|
|
1060
|
-
|
|
1061
|
-
|
|
1122
|
+
for (const [pointerId, pointerState] of internal.pointerMap) {
|
|
1123
|
+
pointerState.initialHits = pointerState.initialHits.filter((o) => o !== object);
|
|
1124
|
+
pointerState.hovered.forEach((value, key) => {
|
|
1125
|
+
if (value.eventObject === object || value.object === object) {
|
|
1126
|
+
pointerState.hovered.delete(key);
|
|
1127
|
+
}
|
|
1128
|
+
});
|
|
1129
|
+
if (pointerState.captured.has(object)) {
|
|
1130
|
+
releaseInternalPointerCapture(internal, object, pointerId);
|
|
1062
1131
|
}
|
|
1063
|
-
}
|
|
1064
|
-
internal.capturedMap.forEach((captures, pointerId) => {
|
|
1065
|
-
releaseInternalPointerCapture(internal.capturedMap, object, captures, pointerId);
|
|
1066
|
-
});
|
|
1132
|
+
}
|
|
1067
1133
|
unregisterVisibility(store, object);
|
|
1068
1134
|
}
|
|
1069
1135
|
function createEvents(store) {
|
|
1070
|
-
function calculateDistance(event) {
|
|
1136
|
+
function calculateDistance(event, pointerId) {
|
|
1071
1137
|
const { internal } = store.getState();
|
|
1072
|
-
const
|
|
1073
|
-
|
|
1138
|
+
const pointerState = internal.pointerMap.get(pointerId);
|
|
1139
|
+
if (!pointerState) return 0;
|
|
1140
|
+
const [initialX, initialY] = pointerState.initialClick;
|
|
1141
|
+
const dx = event.offsetX - initialX;
|
|
1142
|
+
const dy = event.offsetY - initialY;
|
|
1074
1143
|
return Math.round(Math.sqrt(dx * dx + dy * dy));
|
|
1075
1144
|
}
|
|
1076
1145
|
function filterPointerEvents(objects) {
|
|
@@ -1106,6 +1175,15 @@ function createEvents(store) {
|
|
|
1106
1175
|
return state2.raycaster.camera ? state2.raycaster.intersectObject(obj, true) : [];
|
|
1107
1176
|
}
|
|
1108
1177
|
let hits = eventsObjects.flatMap(handleRaycast).sort((a, b) => {
|
|
1178
|
+
const aInteractivePriority = a.object.userData?.interactivePriority;
|
|
1179
|
+
const bInteractivePriority = b.object.userData?.interactivePriority;
|
|
1180
|
+
if (aInteractivePriority !== void 0 || bInteractivePriority !== void 0) {
|
|
1181
|
+
if (aInteractivePriority !== void 0 && bInteractivePriority === void 0) return -1;
|
|
1182
|
+
if (bInteractivePriority !== void 0 && aInteractivePriority === void 0) return 1;
|
|
1183
|
+
if (aInteractivePriority !== bInteractivePriority) {
|
|
1184
|
+
return (bInteractivePriority ?? 0) - (aInteractivePriority ?? 0);
|
|
1185
|
+
}
|
|
1186
|
+
}
|
|
1109
1187
|
const aState = getRootState(a.object);
|
|
1110
1188
|
const bState = getRootState(b.object);
|
|
1111
1189
|
const aPriority = aState?.events?.priority ?? 1;
|
|
@@ -1127,9 +1205,13 @@ function createEvents(store) {
|
|
|
1127
1205
|
eventObject = eventObject.parent;
|
|
1128
1206
|
}
|
|
1129
1207
|
}
|
|
1130
|
-
if ("pointerId" in event
|
|
1131
|
-
|
|
1132
|
-
|
|
1208
|
+
if ("pointerId" in event) {
|
|
1209
|
+
const pointerId = event.pointerId;
|
|
1210
|
+
const pointerState = state.internal.pointerMap.get(pointerId);
|
|
1211
|
+
if (pointerState?.captured.size) {
|
|
1212
|
+
for (const captureData of pointerState.captured.values()) {
|
|
1213
|
+
if (!duplicates.has(makeId(captureData.intersection))) intersections.push(captureData.intersection);
|
|
1214
|
+
}
|
|
1133
1215
|
}
|
|
1134
1216
|
}
|
|
1135
1217
|
return intersections;
|
|
@@ -1142,27 +1224,25 @@ function createEvents(store) {
|
|
|
1142
1224
|
if (state) {
|
|
1143
1225
|
const { raycaster, pointer, camera, internal } = state;
|
|
1144
1226
|
const unprojectedPoint = new webgpu.Vector3(pointer.x, pointer.y, 0).unproject(camera);
|
|
1145
|
-
const hasPointerCapture = (id) =>
|
|
1227
|
+
const hasPointerCapture = (id) => {
|
|
1228
|
+
const pointerState = internal.pointerMap.get(id);
|
|
1229
|
+
return pointerState?.captured.has(hit.eventObject) ?? false;
|
|
1230
|
+
};
|
|
1146
1231
|
const setPointerCapture = (id) => {
|
|
1147
1232
|
const captureData = { intersection: hit, target: event.target };
|
|
1148
|
-
|
|
1149
|
-
|
|
1150
|
-
} else {
|
|
1151
|
-
internal.capturedMap.set(id, /* @__PURE__ */ new Map([[hit.eventObject, captureData]]));
|
|
1152
|
-
}
|
|
1233
|
+
const pointerState = getPointerState(internal, id);
|
|
1234
|
+
pointerState.captured.set(hit.eventObject, captureData);
|
|
1153
1235
|
event.target.setPointerCapture(id);
|
|
1154
1236
|
};
|
|
1155
1237
|
const releasePointerCapture = (id) => {
|
|
1156
|
-
|
|
1157
|
-
if (captures) {
|
|
1158
|
-
releaseInternalPointerCapture(internal.capturedMap, hit.eventObject, captures, id);
|
|
1159
|
-
}
|
|
1238
|
+
releaseInternalPointerCapture(internal, hit.eventObject, id);
|
|
1160
1239
|
};
|
|
1161
1240
|
const extractEventProps = {};
|
|
1162
1241
|
for (const prop in event) {
|
|
1163
1242
|
const property = event[prop];
|
|
1164
1243
|
if (typeof property !== "function") extractEventProps[prop] = property;
|
|
1165
1244
|
}
|
|
1245
|
+
const eventPointerId = "pointerId" in event ? event.pointerId : void 0;
|
|
1166
1246
|
const raycastEvent = {
|
|
1167
1247
|
...hit,
|
|
1168
1248
|
...extractEventProps,
|
|
@@ -1173,18 +1253,19 @@ function createEvents(store) {
|
|
|
1173
1253
|
unprojectedPoint,
|
|
1174
1254
|
ray: raycaster.ray,
|
|
1175
1255
|
camera,
|
|
1256
|
+
pointerId: eventPointerId,
|
|
1176
1257
|
// Hijack stopPropagation, which just sets a flag
|
|
1177
1258
|
stopPropagation() {
|
|
1178
|
-
const
|
|
1259
|
+
const pointerState = eventPointerId !== void 0 ? internal.pointerMap.get(eventPointerId) : void 0;
|
|
1179
1260
|
if (
|
|
1180
1261
|
// ...if this pointer hasn't been captured
|
|
1181
|
-
!
|
|
1182
|
-
|
|
1262
|
+
!pointerState?.captured.size || // ... or if the hit object is capturing the pointer
|
|
1263
|
+
pointerState.captured.has(hit.eventObject)
|
|
1183
1264
|
) {
|
|
1184
1265
|
raycastEvent.stopped = localState.stopped = true;
|
|
1185
|
-
if (
|
|
1266
|
+
if (pointerState?.hovered.size && Array.from(pointerState.hovered.values()).find((i) => i.eventObject === hit.eventObject)) {
|
|
1186
1267
|
const higher = intersections.slice(0, intersections.indexOf(hit));
|
|
1187
|
-
cancelPointer([...higher, hit]);
|
|
1268
|
+
cancelPointer([...higher, hit], eventPointerId);
|
|
1188
1269
|
}
|
|
1189
1270
|
}
|
|
1190
1271
|
},
|
|
@@ -1200,15 +1281,18 @@ function createEvents(store) {
|
|
|
1200
1281
|
}
|
|
1201
1282
|
return intersections;
|
|
1202
1283
|
}
|
|
1203
|
-
function cancelPointer(intersections) {
|
|
1284
|
+
function cancelPointer(intersections, pointerId) {
|
|
1204
1285
|
const { internal } = store.getState();
|
|
1205
|
-
|
|
1286
|
+
const pid = pointerId ?? DEFAULT_POINTER_ID;
|
|
1287
|
+
const pointerState = internal.pointerMap.get(pid);
|
|
1288
|
+
if (!pointerState) return;
|
|
1289
|
+
for (const [hoveredId, hoveredObj] of pointerState.hovered) {
|
|
1206
1290
|
if (!intersections.length || !intersections.find(
|
|
1207
1291
|
(hit) => hit.object === hoveredObj.object && hit.index === hoveredObj.index && hit.instanceId === hoveredObj.instanceId
|
|
1208
1292
|
)) {
|
|
1209
1293
|
const eventObject = hoveredObj.eventObject;
|
|
1210
1294
|
const instance = eventObject.__r3f;
|
|
1211
|
-
|
|
1295
|
+
pointerState.hovered.delete(hoveredId);
|
|
1212
1296
|
if (instance?.eventCount) {
|
|
1213
1297
|
const handlers = instance.handlers;
|
|
1214
1298
|
const data = { ...hoveredObj, intersections };
|
|
@@ -1237,41 +1321,118 @@ function createEvents(store) {
|
|
|
1237
1321
|
instance?.handlers.onDropMissed?.(event);
|
|
1238
1322
|
}
|
|
1239
1323
|
}
|
|
1324
|
+
function cleanupPointer(pointerId) {
|
|
1325
|
+
const { internal } = store.getState();
|
|
1326
|
+
const pointerState = internal.pointerMap.get(pointerId);
|
|
1327
|
+
if (pointerState) {
|
|
1328
|
+
for (const [, hoveredObj] of pointerState.hovered) {
|
|
1329
|
+
const eventObject = hoveredObj.eventObject;
|
|
1330
|
+
const instance = eventObject.__r3f;
|
|
1331
|
+
if (instance?.eventCount) {
|
|
1332
|
+
const handlers = instance.handlers;
|
|
1333
|
+
const data = { ...hoveredObj, intersections: [] };
|
|
1334
|
+
handlers.onPointerOut?.(data);
|
|
1335
|
+
handlers.onPointerLeave?.(data);
|
|
1336
|
+
}
|
|
1337
|
+
}
|
|
1338
|
+
internal.pointerMap.delete(pointerId);
|
|
1339
|
+
}
|
|
1340
|
+
internal.pointerDirty.delete(pointerId);
|
|
1341
|
+
}
|
|
1342
|
+
function processDeferredPointer(event, pointerId) {
|
|
1343
|
+
const state = store.getState();
|
|
1344
|
+
const { internal } = state;
|
|
1345
|
+
if (!state.events.enabled) return;
|
|
1346
|
+
const filter = filterPointerEvents;
|
|
1347
|
+
const hits = intersect(event, filter);
|
|
1348
|
+
cancelPointer(hits, pointerId);
|
|
1349
|
+
function onIntersect(data) {
|
|
1350
|
+
const eventObject = data.eventObject;
|
|
1351
|
+
const instance = eventObject.__r3f;
|
|
1352
|
+
if (!instance?.eventCount) return;
|
|
1353
|
+
const handlers = instance.handlers;
|
|
1354
|
+
if (handlers.onPointerOver || handlers.onPointerEnter || handlers.onPointerOut || handlers.onPointerLeave) {
|
|
1355
|
+
const id = makeId(data);
|
|
1356
|
+
const pointerState = getPointerState(internal, pointerId);
|
|
1357
|
+
const hoveredItem = pointerState.hovered.get(id);
|
|
1358
|
+
if (!hoveredItem) {
|
|
1359
|
+
pointerState.hovered.set(id, data);
|
|
1360
|
+
handlers.onPointerOver?.(data);
|
|
1361
|
+
handlers.onPointerEnter?.(data);
|
|
1362
|
+
} else if (hoveredItem.stopped) {
|
|
1363
|
+
data.stopPropagation();
|
|
1364
|
+
}
|
|
1365
|
+
}
|
|
1366
|
+
handlers.onPointerMove?.(data);
|
|
1367
|
+
}
|
|
1368
|
+
handleIntersects(hits, event, 0, onIntersect);
|
|
1369
|
+
}
|
|
1240
1370
|
function handlePointer(name) {
|
|
1241
1371
|
switch (name) {
|
|
1242
1372
|
case "onPointerLeave":
|
|
1243
|
-
case "onPointerCancel":
|
|
1244
1373
|
case "onDragLeave":
|
|
1245
1374
|
return () => cancelPointer([]);
|
|
1375
|
+
// Global cancel of these events
|
|
1376
|
+
case "onPointerCancel":
|
|
1377
|
+
return (event) => {
|
|
1378
|
+
const pointerId = getPointerId(event);
|
|
1379
|
+
cleanupPointer(pointerId);
|
|
1380
|
+
};
|
|
1246
1381
|
case "onLostPointerCapture":
|
|
1247
1382
|
return (event) => {
|
|
1248
1383
|
const { internal } = store.getState();
|
|
1249
|
-
|
|
1384
|
+
const pointerId = getPointerId(event);
|
|
1385
|
+
const pointerState = internal.pointerMap.get(pointerId);
|
|
1386
|
+
if (pointerState?.captured.size) {
|
|
1250
1387
|
requestAnimationFrame(() => {
|
|
1251
|
-
|
|
1252
|
-
|
|
1253
|
-
|
|
1388
|
+
const pointerState2 = internal.pointerMap.get(pointerId);
|
|
1389
|
+
if (pointerState2?.captured.size) {
|
|
1390
|
+
pointerState2.captured.clear();
|
|
1254
1391
|
}
|
|
1392
|
+
cancelPointer([], pointerId);
|
|
1255
1393
|
});
|
|
1256
1394
|
}
|
|
1257
1395
|
};
|
|
1258
1396
|
}
|
|
1259
1397
|
return function handleEvent(event) {
|
|
1260
1398
|
const state = store.getState();
|
|
1261
|
-
const { onPointerMissed, onDragOverMissed, onDropMissed, internal } = state;
|
|
1399
|
+
const { onPointerMissed, onDragOverMissed, onDropMissed, internal, events } = state;
|
|
1400
|
+
const pointerId = getPointerId(event);
|
|
1262
1401
|
internal.lastEvent.current = event;
|
|
1263
|
-
if (!
|
|
1402
|
+
if (!events.enabled) return;
|
|
1264
1403
|
const isPointerMove = name === "onPointerMove";
|
|
1265
1404
|
const isDragOver = name === "onDragOver";
|
|
1266
1405
|
const isDrop = name === "onDrop";
|
|
1267
1406
|
const isClickEvent = name === "onClick" || name === "onContextMenu" || name === "onDoubleClick";
|
|
1407
|
+
const isPointerDown = name === "onPointerDown";
|
|
1408
|
+
const isPointerUp = name === "onPointerUp";
|
|
1409
|
+
const isWheel = name === "onWheel";
|
|
1410
|
+
const canDeferRaycasts = events.frameTimedRaycasts && state.frameloop === "always";
|
|
1411
|
+
if (isPointerMove && canDeferRaycasts) {
|
|
1412
|
+
events.compute?.(event, state);
|
|
1413
|
+
internal.pointerDirty.set(pointerId, event);
|
|
1414
|
+
return;
|
|
1415
|
+
}
|
|
1416
|
+
if (isWheel && canDeferRaycasts && !events.alwaysFireOnScroll) {
|
|
1417
|
+
events.compute?.(event, state);
|
|
1418
|
+
internal.pointerDirty.set(pointerId, event);
|
|
1419
|
+
return;
|
|
1420
|
+
}
|
|
1421
|
+
if ((isClickEvent || isPointerDown || isPointerUp) && internal.pointerDirty.has(pointerId)) {
|
|
1422
|
+
const deferredEvent = internal.pointerDirty.get(pointerId);
|
|
1423
|
+
internal.pointerDirty.delete(pointerId);
|
|
1424
|
+
processDeferredPointer(deferredEvent, pointerId);
|
|
1425
|
+
}
|
|
1268
1426
|
const filter = isPointerMove || isDragOver || isDrop ? filterPointerEvents : void 0;
|
|
1269
1427
|
const hits = intersect(event, filter);
|
|
1270
|
-
const delta = isClickEvent ? calculateDistance(event) : 0;
|
|
1271
|
-
if (
|
|
1272
|
-
|
|
1273
|
-
|
|
1274
|
-
|
|
1428
|
+
const delta = isClickEvent ? calculateDistance(event, pointerId) : 0;
|
|
1429
|
+
if (isPointerDown) {
|
|
1430
|
+
const pointerState2 = getPointerState(internal, pointerId);
|
|
1431
|
+
pointerState2.initialClick = [event.offsetX, event.offsetY];
|
|
1432
|
+
pointerState2.initialHits = hits.map((hit) => hit.eventObject);
|
|
1433
|
+
}
|
|
1434
|
+
const pointerState = internal.pointerMap.get(pointerId);
|
|
1435
|
+
const initialHits = pointerState?.initialHits ?? [];
|
|
1275
1436
|
if (isClickEvent && !hits.length) {
|
|
1276
1437
|
if (delta <= 2) {
|
|
1277
1438
|
pointerMissed(event, internal.interaction);
|
|
@@ -1286,7 +1447,9 @@ function createEvents(store) {
|
|
|
1286
1447
|
dropMissed(event, internal.interaction);
|
|
1287
1448
|
if (onDropMissed) onDropMissed(event);
|
|
1288
1449
|
}
|
|
1289
|
-
if (isPointerMove || isDragOver)
|
|
1450
|
+
if (isPointerMove || isDragOver) {
|
|
1451
|
+
cancelPointer(hits, pointerId);
|
|
1452
|
+
}
|
|
1290
1453
|
function onIntersect(data) {
|
|
1291
1454
|
const eventObject = data.eventObject;
|
|
1292
1455
|
const instance = eventObject.__r3f;
|
|
@@ -1295,9 +1458,10 @@ function createEvents(store) {
|
|
|
1295
1458
|
if (isPointerMove) {
|
|
1296
1459
|
if (handlers.onPointerOver || handlers.onPointerEnter || handlers.onPointerOut || handlers.onPointerLeave) {
|
|
1297
1460
|
const id = makeId(data);
|
|
1298
|
-
const
|
|
1461
|
+
const pointerState2 = getPointerState(internal, pointerId);
|
|
1462
|
+
const hoveredItem = pointerState2.hovered.get(id);
|
|
1299
1463
|
if (!hoveredItem) {
|
|
1300
|
-
|
|
1464
|
+
pointerState2.hovered.set(id, data);
|
|
1301
1465
|
handlers.onPointerOver?.(data);
|
|
1302
1466
|
handlers.onPointerEnter?.(data);
|
|
1303
1467
|
} else if (hoveredItem.stopped) {
|
|
@@ -1307,9 +1471,10 @@ function createEvents(store) {
|
|
|
1307
1471
|
handlers.onPointerMove?.(data);
|
|
1308
1472
|
} else if (isDragOver) {
|
|
1309
1473
|
const id = makeId(data);
|
|
1310
|
-
const
|
|
1474
|
+
const pointerState2 = getPointerState(internal, pointerId);
|
|
1475
|
+
const hoveredItem = pointerState2.hovered.get(id);
|
|
1311
1476
|
if (!hoveredItem) {
|
|
1312
|
-
|
|
1477
|
+
pointerState2.hovered.set(id, data);
|
|
1313
1478
|
handlers.onDragOverEnter?.(data);
|
|
1314
1479
|
} else if (hoveredItem.stopped) {
|
|
1315
1480
|
data.stopPropagation();
|
|
@@ -1320,18 +1485,18 @@ function createEvents(store) {
|
|
|
1320
1485
|
} else {
|
|
1321
1486
|
const handler = handlers[name];
|
|
1322
1487
|
if (handler) {
|
|
1323
|
-
if (!isClickEvent ||
|
|
1488
|
+
if (!isClickEvent || initialHits.includes(eventObject)) {
|
|
1324
1489
|
pointerMissed(
|
|
1325
1490
|
event,
|
|
1326
|
-
internal.interaction.filter((object) => !
|
|
1491
|
+
internal.interaction.filter((object) => !initialHits.includes(object))
|
|
1327
1492
|
);
|
|
1328
1493
|
handler(data);
|
|
1329
1494
|
}
|
|
1330
1495
|
} else {
|
|
1331
|
-
if (isClickEvent &&
|
|
1496
|
+
if (isClickEvent && initialHits.includes(eventObject)) {
|
|
1332
1497
|
pointerMissed(
|
|
1333
1498
|
event,
|
|
1334
|
-
internal.interaction.filter((object) => !
|
|
1499
|
+
internal.interaction.filter((object) => !initialHits.includes(object))
|
|
1335
1500
|
);
|
|
1336
1501
|
}
|
|
1337
1502
|
}
|
|
@@ -1340,7 +1505,15 @@ function createEvents(store) {
|
|
|
1340
1505
|
handleIntersects(hits, event, delta, onIntersect);
|
|
1341
1506
|
};
|
|
1342
1507
|
}
|
|
1343
|
-
|
|
1508
|
+
function flushDeferredPointers() {
|
|
1509
|
+
const { internal, events } = store.getState();
|
|
1510
|
+
if (!events.frameTimedRaycasts) return;
|
|
1511
|
+
for (const [pointerId, event] of internal.pointerDirty) {
|
|
1512
|
+
processDeferredPointer(event, pointerId);
|
|
1513
|
+
}
|
|
1514
|
+
internal.pointerDirty.clear();
|
|
1515
|
+
}
|
|
1516
|
+
return { handlePointer, flushDeferredPointers, processDeferredPointer };
|
|
1344
1517
|
}
|
|
1345
1518
|
const DOM_EVENTS = {
|
|
1346
1519
|
onClick: ["click", false],
|
|
@@ -1359,10 +1532,15 @@ const DOM_EVENTS = {
|
|
|
1359
1532
|
onLostPointerCapture: ["lostpointercapture", true]
|
|
1360
1533
|
};
|
|
1361
1534
|
function createPointerEvents(store) {
|
|
1362
|
-
const { handlePointer } = createEvents(store);
|
|
1535
|
+
const { handlePointer, flushDeferredPointers, processDeferredPointer } = createEvents(store);
|
|
1536
|
+
let nextXRPointerId = XR_POINTER_ID_START;
|
|
1537
|
+
const xrPointers = /* @__PURE__ */ new Map();
|
|
1363
1538
|
return {
|
|
1364
1539
|
priority: 1,
|
|
1365
1540
|
enabled: true,
|
|
1541
|
+
frameTimedRaycasts: true,
|
|
1542
|
+
alwaysFireOnScroll: true,
|
|
1543
|
+
updateOnFrame: false,
|
|
1366
1544
|
compute(event, state) {
|
|
1367
1545
|
state.pointer.set(event.offsetX / state.size.width * 2 - 1, -(event.offsetY / state.size.height) * 2 + 1);
|
|
1368
1546
|
state.raycaster.setFromCamera(state.pointer, state.camera);
|
|
@@ -1372,11 +1550,33 @@ function createPointerEvents(store) {
|
|
|
1372
1550
|
(acc, key) => ({ ...acc, [key]: handlePointer(key) }),
|
|
1373
1551
|
{}
|
|
1374
1552
|
),
|
|
1375
|
-
update: () => {
|
|
1553
|
+
update: (pointerId) => {
|
|
1554
|
+
const { events, internal } = store.getState();
|
|
1555
|
+
if (!events.handlers) return;
|
|
1556
|
+
if (pointerId !== void 0) {
|
|
1557
|
+
const event = internal.pointerDirty.get(pointerId);
|
|
1558
|
+
if (event) {
|
|
1559
|
+
internal.pointerDirty.delete(pointerId);
|
|
1560
|
+
processDeferredPointer(event, pointerId);
|
|
1561
|
+
} else if (internal.lastEvent?.current) {
|
|
1562
|
+
processDeferredPointer(internal.lastEvent.current, pointerId);
|
|
1563
|
+
}
|
|
1564
|
+
} else {
|
|
1565
|
+
flushDeferredPointers();
|
|
1566
|
+
if (internal.lastEvent?.current) {
|
|
1567
|
+
events.handlers.onPointerMove(internal.lastEvent.current);
|
|
1568
|
+
}
|
|
1569
|
+
}
|
|
1570
|
+
},
|
|
1571
|
+
flush: () => {
|
|
1376
1572
|
const { events, internal } = store.getState();
|
|
1377
|
-
|
|
1573
|
+
flushDeferredPointers();
|
|
1574
|
+
if (events.updateOnFrame && internal.lastEvent?.current && events.handlers) {
|
|
1575
|
+
events.handlers.onPointerMove(internal.lastEvent.current);
|
|
1576
|
+
}
|
|
1378
1577
|
},
|
|
1379
1578
|
connect: (target) => {
|
|
1579
|
+
if (!target) return;
|
|
1380
1580
|
const { set, events } = store.getState();
|
|
1381
1581
|
events.disconnect?.();
|
|
1382
1582
|
set((state) => ({ events: { ...state.events, connected: target } }));
|
|
@@ -1400,6 +1600,33 @@ function createPointerEvents(store) {
|
|
|
1400
1600
|
}
|
|
1401
1601
|
set((state) => ({ events: { ...state.events, connected: void 0 } }));
|
|
1402
1602
|
}
|
|
1603
|
+
},
|
|
1604
|
+
// PREVIEW (A8): the XR pointer registration API may change before stable.
|
|
1605
|
+
registerPointer: (config) => {
|
|
1606
|
+
const pointerId = nextXRPointerId++;
|
|
1607
|
+
xrPointers.set(pointerId, config);
|
|
1608
|
+
const { internal } = store.getState();
|
|
1609
|
+
getPointerState(internal, pointerId);
|
|
1610
|
+
return pointerId;
|
|
1611
|
+
},
|
|
1612
|
+
unregisterPointer: (pointerId) => {
|
|
1613
|
+
xrPointers.delete(pointerId);
|
|
1614
|
+
const { internal } = store.getState();
|
|
1615
|
+
const pointerState = internal.pointerMap.get(pointerId);
|
|
1616
|
+
if (pointerState) {
|
|
1617
|
+
for (const [, hoveredObj] of pointerState.hovered) {
|
|
1618
|
+
const eventObject = hoveredObj.eventObject;
|
|
1619
|
+
const instance = eventObject.__r3f;
|
|
1620
|
+
if (instance?.eventCount) {
|
|
1621
|
+
const handlers = instance.handlers;
|
|
1622
|
+
const data = { ...hoveredObj, intersections: [] };
|
|
1623
|
+
handlers.onPointerOut?.(data);
|
|
1624
|
+
handlers.onPointerLeave?.(data);
|
|
1625
|
+
}
|
|
1626
|
+
}
|
|
1627
|
+
internal.pointerMap.delete(pointerId);
|
|
1628
|
+
}
|
|
1629
|
+
internal.pointerDirty.delete(pointerId);
|
|
1403
1630
|
}
|
|
1404
1631
|
};
|
|
1405
1632
|
}
|
|
@@ -1461,1058 +1688,33 @@ function notifyAlpha({ message, link }) {
|
|
|
1461
1688
|
}
|
|
1462
1689
|
}
|
|
1463
1690
|
|
|
1464
|
-
|
|
1465
|
-
|
|
1466
|
-
|
|
1467
|
-
const
|
|
1468
|
-
|
|
1469
|
-
constructor() {
|
|
1470
|
-
/** Ordered list of phase nodes */
|
|
1471
|
-
__publicField$2(this, "phases", []);
|
|
1472
|
-
/** Quick lookup by name */
|
|
1473
|
-
__publicField$2(this, "phaseMap", /* @__PURE__ */ new Map());
|
|
1474
|
-
/** Cached ordered names (invalidated on changes) */
|
|
1475
|
-
__publicField$2(this, "orderedNamesCache", null);
|
|
1476
|
-
this.initializeDefaultPhases();
|
|
1477
|
-
}
|
|
1478
|
-
//* Initialization --------------------------------
|
|
1479
|
-
initializeDefaultPhases() {
|
|
1480
|
-
for (const name of DEFAULT_PHASES) {
|
|
1481
|
-
const node = { name, isAutoGenerated: false };
|
|
1482
|
-
this.phases.push(node);
|
|
1483
|
-
this.phaseMap.set(name, node);
|
|
1484
|
-
}
|
|
1485
|
-
this.invalidateCache();
|
|
1486
|
-
}
|
|
1487
|
-
//* Public API --------------------------------
|
|
1488
|
-
/**
|
|
1489
|
-
* Add a named phase to the graph
|
|
1490
|
-
* @param name - Phase name (must be unique)
|
|
1491
|
-
* @param options - Position options (before or after another phase)
|
|
1492
|
-
*/
|
|
1493
|
-
addPhase(name, options = {}) {
|
|
1494
|
-
if (this.phaseMap.has(name)) {
|
|
1495
|
-
console.warn(`[useFrame] Phase "${name}" already exists`);
|
|
1496
|
-
return;
|
|
1497
|
-
}
|
|
1498
|
-
const { before, after } = options;
|
|
1499
|
-
const node = { name, isAutoGenerated: false };
|
|
1500
|
-
let insertIndex = this.phases.length;
|
|
1501
|
-
const targetIndex = this.getPhaseIndex(before ?? after);
|
|
1502
|
-
if (targetIndex !== -1) {
|
|
1503
|
-
insertIndex = before ? targetIndex : targetIndex + 1;
|
|
1504
|
-
} else {
|
|
1505
|
-
const constraintType = before ? "before" : "after";
|
|
1506
|
-
console.warn(`[useFrame] Phase "${before ?? after}" not found for '${constraintType}' constraint`);
|
|
1507
|
-
}
|
|
1508
|
-
this.phases.splice(insertIndex, 0, node);
|
|
1509
|
-
this.phaseMap.set(name, node);
|
|
1510
|
-
this.invalidateCache();
|
|
1511
|
-
}
|
|
1512
|
-
/**
|
|
1513
|
-
* Get ordered list of phase names
|
|
1514
|
-
*/
|
|
1515
|
-
getOrderedPhases() {
|
|
1516
|
-
if (this.orderedNamesCache === null) this.orderedNamesCache = this.phases.map((p) => p.name);
|
|
1517
|
-
return this.orderedNamesCache;
|
|
1518
|
-
}
|
|
1519
|
-
/**
|
|
1520
|
-
* Check if a phase exists
|
|
1521
|
-
*/
|
|
1522
|
-
hasPhase(name) {
|
|
1523
|
-
return this.phaseMap.has(name);
|
|
1524
|
-
}
|
|
1525
|
-
/**
|
|
1526
|
-
* Get the index of a phase (-1 if not found)
|
|
1527
|
-
*/
|
|
1528
|
-
getPhaseIndex(name) {
|
|
1529
|
-
if (!name) return -1;
|
|
1530
|
-
return this.phases.findIndex((p) => p.name === name);
|
|
1531
|
-
}
|
|
1532
|
-
/**
|
|
1533
|
-
* Ensure a phase exists, creating an auto-generated one if needed.
|
|
1534
|
-
* Used for resolving before/after constraints.
|
|
1535
|
-
*
|
|
1536
|
-
* @param name - The phase name to ensure exists
|
|
1537
|
-
* @returns The phase name (may be auto-generated like 'before:render')
|
|
1538
|
-
*/
|
|
1539
|
-
ensurePhase(name) {
|
|
1540
|
-
if (this.phaseMap.has(name)) return name;
|
|
1541
|
-
const node = { name, isAutoGenerated: true };
|
|
1542
|
-
this.phases.push(node);
|
|
1543
|
-
this.phaseMap.set(name, node);
|
|
1544
|
-
this.invalidateCache();
|
|
1545
|
-
return name;
|
|
1546
|
-
}
|
|
1547
|
-
/**
|
|
1548
|
-
* Resolve where a job with before/after constraints should go.
|
|
1549
|
-
* Creates auto-generated phases if needed.
|
|
1550
|
-
*
|
|
1551
|
-
* @param before - Phase(s) to run before
|
|
1552
|
-
* @param after - Phase(s) to run after
|
|
1553
|
-
* @returns The resolved phase name
|
|
1554
|
-
*/
|
|
1555
|
-
resolveConstraintPhase(before, after) {
|
|
1556
|
-
const beforeArr = before ? Array.isArray(before) ? before : [before] : [];
|
|
1557
|
-
const afterArr = after ? Array.isArray(after) ? after : [after] : [];
|
|
1558
|
-
if (beforeArr.length > 0) {
|
|
1559
|
-
return this.ensureAutoPhase(beforeArr[0], "before", 0);
|
|
1560
|
-
}
|
|
1561
|
-
if (afterArr.length > 0) {
|
|
1562
|
-
return this.ensureAutoPhase(afterArr[0], "after", 1);
|
|
1563
|
-
}
|
|
1564
|
-
return "update";
|
|
1565
|
-
}
|
|
1566
|
-
/**
|
|
1567
|
-
* Ensure an auto-generated phase exists relative to a target phase.
|
|
1568
|
-
* Creates the phase if it doesn't exist, inserting it at the correct position.
|
|
1569
|
-
*
|
|
1570
|
-
* @param target - The target phase name to position relative to
|
|
1571
|
-
* @param prefix - Prefix for auto-generated phase name ('before' or 'after')
|
|
1572
|
-
* @param offset - Insertion offset (0 for before, 1 for after)
|
|
1573
|
-
* @returns The auto-generated phase name
|
|
1574
|
-
*/
|
|
1575
|
-
ensureAutoPhase(target, prefix, offset) {
|
|
1576
|
-
const autoName = `${prefix}:${target}`;
|
|
1577
|
-
if (this.phaseMap.has(autoName)) return autoName;
|
|
1578
|
-
const node = { name: autoName, isAutoGenerated: true };
|
|
1579
|
-
const targetIndex = this.getPhaseIndex(target);
|
|
1580
|
-
if (targetIndex !== -1) this.phases.splice(targetIndex + offset, 0, node);
|
|
1581
|
-
else this.phases.push(node);
|
|
1582
|
-
this.phaseMap.set(autoName, node);
|
|
1583
|
-
this.invalidateCache();
|
|
1584
|
-
return autoName;
|
|
1585
|
-
}
|
|
1586
|
-
// Internal --------------------------------
|
|
1587
|
-
invalidateCache() {
|
|
1588
|
-
this.orderedNamesCache = null;
|
|
1589
|
-
}
|
|
1590
|
-
}
|
|
1591
|
-
|
|
1592
|
-
function rebuildSortedJobs(jobs, phaseGraph) {
|
|
1593
|
-
const orderedPhases = phaseGraph.getOrderedPhases();
|
|
1594
|
-
const buckets = /* @__PURE__ */ new Map();
|
|
1595
|
-
for (const phase of orderedPhases) {
|
|
1596
|
-
buckets.set(phase, []);
|
|
1597
|
-
}
|
|
1598
|
-
for (const job of jobs.values()) {
|
|
1599
|
-
if (!job.enabled) continue;
|
|
1600
|
-
let bucket = buckets.get(job.phase);
|
|
1601
|
-
if (!bucket) {
|
|
1602
|
-
bucket = [];
|
|
1603
|
-
buckets.set(job.phase, bucket);
|
|
1604
|
-
}
|
|
1605
|
-
bucket.push(job);
|
|
1606
|
-
}
|
|
1607
|
-
const sortedBuckets = [];
|
|
1608
|
-
for (const phase of orderedPhases) {
|
|
1609
|
-
const bucket = buckets.get(phase);
|
|
1610
|
-
if (!bucket || bucket.length === 0) continue;
|
|
1611
|
-
bucket.sort((a, b) => {
|
|
1612
|
-
if (a.priority !== b.priority) return b.priority - a.priority;
|
|
1613
|
-
return a.index - b.index;
|
|
1614
|
-
});
|
|
1615
|
-
sortedBuckets.push(hasCrossJobConstraints(bucket) ? topologicalSort(bucket) : bucket);
|
|
1616
|
-
}
|
|
1617
|
-
for (const [phase, bucket] of buckets) {
|
|
1618
|
-
if (!orderedPhases.includes(phase) && bucket.length > 0) {
|
|
1619
|
-
bucket.sort((a, b) => {
|
|
1620
|
-
if (a.priority !== b.priority) return b.priority - a.priority;
|
|
1621
|
-
return a.index - b.index;
|
|
1622
|
-
});
|
|
1623
|
-
sortedBuckets.push(bucket);
|
|
1624
|
-
}
|
|
1625
|
-
}
|
|
1626
|
-
return sortedBuckets.flat();
|
|
1627
|
-
}
|
|
1628
|
-
function hasCrossJobConstraints(bucket) {
|
|
1629
|
-
const jobIds = new Set(bucket.map((j) => j.id));
|
|
1630
|
-
for (const job of bucket) {
|
|
1631
|
-
for (const ref of job.before) {
|
|
1632
|
-
if (jobIds.has(ref)) return true;
|
|
1633
|
-
}
|
|
1634
|
-
for (const ref of job.after) {
|
|
1635
|
-
if (jobIds.has(ref)) return true;
|
|
1636
|
-
}
|
|
1637
|
-
}
|
|
1638
|
-
return false;
|
|
1639
|
-
}
|
|
1640
|
-
function topologicalSort(jobs) {
|
|
1641
|
-
const n = jobs.length;
|
|
1642
|
-
if (n <= 1) return jobs;
|
|
1643
|
-
const jobMap = /* @__PURE__ */ new Map();
|
|
1644
|
-
const inDegree = /* @__PURE__ */ new Map();
|
|
1645
|
-
const adjacency = /* @__PURE__ */ new Map();
|
|
1646
|
-
for (const job of jobs) {
|
|
1647
|
-
jobMap.set(job.id, job);
|
|
1648
|
-
inDegree.set(job.id, 0);
|
|
1649
|
-
adjacency.set(job.id, []);
|
|
1650
|
-
}
|
|
1651
|
-
for (const job of jobs) {
|
|
1652
|
-
for (const ref of job.before) {
|
|
1653
|
-
if (jobMap.has(ref)) {
|
|
1654
|
-
adjacency.get(job.id).push(ref);
|
|
1655
|
-
inDegree.set(ref, inDegree.get(ref) + 1);
|
|
1656
|
-
}
|
|
1657
|
-
}
|
|
1658
|
-
for (const ref of job.after) {
|
|
1659
|
-
if (jobMap.has(ref)) {
|
|
1660
|
-
adjacency.get(ref).push(job.id);
|
|
1661
|
-
inDegree.set(job.id, inDegree.get(job.id) + 1);
|
|
1662
|
-
}
|
|
1663
|
-
}
|
|
1664
|
-
}
|
|
1665
|
-
const queue = [];
|
|
1666
|
-
for (const job of jobs) {
|
|
1667
|
-
if (inDegree.get(job.id) === 0) {
|
|
1668
|
-
queue.push(job);
|
|
1669
|
-
}
|
|
1670
|
-
}
|
|
1671
|
-
queue.sort((a, b) => {
|
|
1672
|
-
if (a.priority !== b.priority) return b.priority - a.priority;
|
|
1673
|
-
return a.index - b.index;
|
|
1674
|
-
});
|
|
1675
|
-
const result = [];
|
|
1676
|
-
while (queue.length > 0) {
|
|
1677
|
-
const job = queue.shift();
|
|
1678
|
-
result.push(job);
|
|
1679
|
-
const neighbors = adjacency.get(job.id) || [];
|
|
1680
|
-
for (const neighborId of neighbors) {
|
|
1681
|
-
const newDegree = inDegree.get(neighborId) - 1;
|
|
1682
|
-
inDegree.set(neighborId, newDegree);
|
|
1683
|
-
if (newDegree === 0) {
|
|
1684
|
-
const neighbor = jobMap.get(neighborId);
|
|
1685
|
-
insertSorted(queue, neighbor);
|
|
1686
|
-
}
|
|
1687
|
-
}
|
|
1688
|
-
}
|
|
1689
|
-
if (result.length !== n) {
|
|
1690
|
-
console.warn("[useFrame] Circular dependency detected in job constraints");
|
|
1691
|
-
const resultIds = new Set(result.map((j) => j.id));
|
|
1692
|
-
for (const job of jobs) {
|
|
1693
|
-
if (!resultIds.has(job.id)) result.push(job);
|
|
1694
|
-
}
|
|
1695
|
-
}
|
|
1696
|
-
return result;
|
|
1697
|
-
}
|
|
1698
|
-
function insertSorted(arr, job) {
|
|
1699
|
-
let i = 0;
|
|
1700
|
-
while (i < arr.length) {
|
|
1701
|
-
const cmp = arr[i];
|
|
1702
|
-
if (job.priority > cmp.priority || job.priority === cmp.priority && job.index < cmp.index) {
|
|
1703
|
-
break;
|
|
1704
|
-
}
|
|
1705
|
-
i++;
|
|
1706
|
-
}
|
|
1707
|
-
arr.splice(i, 0, job);
|
|
1708
|
-
}
|
|
1709
|
-
|
|
1710
|
-
function shouldRun(job, now) {
|
|
1711
|
-
if (!job.enabled) return false;
|
|
1712
|
-
if (!job.fps) return true;
|
|
1713
|
-
const minInterval = 1e3 / job.fps;
|
|
1714
|
-
const lastRun = job.lastRun ?? 0;
|
|
1715
|
-
const elapsed = now - lastRun;
|
|
1716
|
-
if (elapsed < minInterval) return false;
|
|
1717
|
-
if (job.drop) {
|
|
1718
|
-
job.lastRun = now;
|
|
1719
|
-
} else {
|
|
1720
|
-
const steps = Math.floor(elapsed / minInterval);
|
|
1721
|
-
job.lastRun = lastRun + steps * minInterval;
|
|
1722
|
-
if (job.lastRun < now - minInterval) {
|
|
1723
|
-
job.lastRun = now;
|
|
1724
|
-
}
|
|
1725
|
-
}
|
|
1726
|
-
return true;
|
|
1727
|
-
}
|
|
1728
|
-
function resetJobTiming(job) {
|
|
1729
|
-
job.lastRun = void 0;
|
|
1691
|
+
const INTERNAL_LIB_MARKERS = ["zustand", "setState", "Object.assign"];
|
|
1692
|
+
function isInternalRendererAccess(stack, callerDepth = 2) {
|
|
1693
|
+
if (!stack) return false;
|
|
1694
|
+
const caller = stack.split("\n")[callerDepth] ?? "";
|
|
1695
|
+
return INTERNAL_LIB_MARKERS.some((m) => caller.includes(m));
|
|
1730
1696
|
}
|
|
1731
1697
|
|
|
1732
|
-
|
|
1733
|
-
|
|
1734
|
-
|
|
1735
|
-
const
|
|
1736
|
-
|
|
1737
|
-
|
|
1738
|
-
|
|
1739
|
-
|
|
1740
|
-
|
|
1741
|
-
|
|
1742
|
-
|
|
1743
|
-
|
|
1744
|
-
const
|
|
1745
|
-
|
|
1746
|
-
|
|
1747
|
-
|
|
1748
|
-
|
|
1749
|
-
|
|
1750
|
-
|
|
1751
|
-
|
|
1752
|
-
rafHandle: null,
|
|
1753
|
-
lastTime: null,
|
|
1754
|
-
// null = uninitialized, 0+ = valid timestamp
|
|
1755
|
-
frameCount: 0,
|
|
1756
|
-
elapsedTime: 0,
|
|
1757
|
-
createdAt: performance.now()
|
|
1758
|
-
});
|
|
1759
|
-
__publicField$1(this, "stoppedTime", 0);
|
|
1760
|
-
//* Private State ================================
|
|
1761
|
-
__publicField$1(this, "nextRootIndex", 0);
|
|
1762
|
-
__publicField$1(this, "globalBeforeJobs", /* @__PURE__ */ new Map());
|
|
1763
|
-
__publicField$1(this, "globalAfterJobs", /* @__PURE__ */ new Map());
|
|
1764
|
-
__publicField$1(this, "nextGlobalIndex", 0);
|
|
1765
|
-
__publicField$1(this, "idleCallbacks", /* @__PURE__ */ new Set());
|
|
1766
|
-
__publicField$1(this, "nextJobIndex", 0);
|
|
1767
|
-
__publicField$1(this, "jobStateListeners", /* @__PURE__ */ new Map());
|
|
1768
|
-
__publicField$1(this, "pendingFrames", 0);
|
|
1769
|
-
__publicField$1(this, "_frameloop", "always");
|
|
1770
|
-
//* Independent Mode & Error Handling State ================================
|
|
1771
|
-
__publicField$1(this, "_independent", false);
|
|
1772
|
-
__publicField$1(this, "errorHandler", null);
|
|
1773
|
-
__publicField$1(this, "rootReadyCallbacks", /* @__PURE__ */ new Set());
|
|
1774
|
-
//* Core Loop Execution Methods ================================
|
|
1775
|
-
/**
|
|
1776
|
-
* Main RAF loop callback.
|
|
1777
|
-
* Executes frame, handles demand mode, and schedules next frame.
|
|
1778
|
-
* @param {number} timestamp - RAF timestamp in milliseconds
|
|
1779
|
-
* @returns {void}
|
|
1780
|
-
* @private
|
|
1781
|
-
*/
|
|
1782
|
-
__publicField$1(this, "loop", (timestamp) => {
|
|
1783
|
-
if (!this.loopState.running) return;
|
|
1784
|
-
this.executeFrame(timestamp);
|
|
1785
|
-
if (this._frameloop === "demand") {
|
|
1786
|
-
this.pendingFrames = Math.max(0, this.pendingFrames - 1);
|
|
1787
|
-
if (this.pendingFrames === 0) {
|
|
1788
|
-
this.notifyIdle(timestamp);
|
|
1789
|
-
return this.stop();
|
|
1790
|
-
}
|
|
1791
|
-
}
|
|
1792
|
-
this.loopState.rafHandle = requestAnimationFrame(this.loop);
|
|
1793
|
-
});
|
|
1794
|
-
this.phaseGraph = new PhaseGraph();
|
|
1795
|
-
}
|
|
1796
|
-
static get instance() {
|
|
1797
|
-
return globalThis[_Scheduler.INSTANCE_KEY] ?? null;
|
|
1798
|
-
}
|
|
1799
|
-
static set instance(value) {
|
|
1800
|
-
globalThis[_Scheduler.INSTANCE_KEY] = value;
|
|
1801
|
-
}
|
|
1802
|
-
/**
|
|
1803
|
-
* Get the global scheduler instance (creates if doesn't exist).
|
|
1804
|
-
* Uses HMR data to preserve instance across hot reloads.
|
|
1805
|
-
* @returns {Scheduler} The singleton scheduler instance
|
|
1806
|
-
*/
|
|
1807
|
-
static get() {
|
|
1808
|
-
if (!_Scheduler.instance && hmrData?.data?.scheduler) {
|
|
1809
|
-
_Scheduler.instance = hmrData.data.scheduler;
|
|
1810
|
-
}
|
|
1811
|
-
if (!_Scheduler.instance) {
|
|
1812
|
-
_Scheduler.instance = new _Scheduler();
|
|
1813
|
-
if (hmrData?.data) {
|
|
1814
|
-
hmrData.data.scheduler = _Scheduler.instance;
|
|
1815
|
-
}
|
|
1816
|
-
}
|
|
1817
|
-
return _Scheduler.instance;
|
|
1818
|
-
}
|
|
1819
|
-
/**
|
|
1820
|
-
* Reset the singleton instance. Stops the loop and clears all state.
|
|
1821
|
-
* Primarily used for testing to ensure clean state between tests.
|
|
1822
|
-
* @returns {void}
|
|
1823
|
-
*/
|
|
1824
|
-
static reset() {
|
|
1825
|
-
if (_Scheduler.instance) {
|
|
1826
|
-
_Scheduler.instance.stop();
|
|
1827
|
-
_Scheduler.instance = null;
|
|
1828
|
-
}
|
|
1829
|
-
if (hmrData?.data) {
|
|
1830
|
-
hmrData.data.scheduler = null;
|
|
1831
|
-
}
|
|
1832
|
-
}
|
|
1833
|
-
//* Getters & Setters ================================
|
|
1834
|
-
get phases() {
|
|
1835
|
-
return this.phaseGraph.getOrderedPhases();
|
|
1836
|
-
}
|
|
1837
|
-
get frameloop() {
|
|
1838
|
-
return this._frameloop;
|
|
1839
|
-
}
|
|
1840
|
-
set frameloop(mode) {
|
|
1841
|
-
if (this._frameloop === mode) return;
|
|
1842
|
-
const wasAlways = this._frameloop === "always";
|
|
1843
|
-
this._frameloop = mode;
|
|
1844
|
-
if (mode === "always" && !this.loopState.running && this.roots.size > 0) this.start();
|
|
1845
|
-
else if (mode !== "always" && wasAlways) this.stop();
|
|
1846
|
-
}
|
|
1847
|
-
get isRunning() {
|
|
1848
|
-
return this.loopState.running;
|
|
1849
|
-
}
|
|
1850
|
-
get isReady() {
|
|
1851
|
-
return this.roots.size > 0;
|
|
1852
|
-
}
|
|
1853
|
-
get independent() {
|
|
1854
|
-
return this._independent;
|
|
1855
|
-
}
|
|
1856
|
-
set independent(value) {
|
|
1857
|
-
this._independent = value;
|
|
1858
|
-
if (value) this.ensureDefaultRoot();
|
|
1859
|
-
}
|
|
1860
|
-
//* Root Management Methods ================================
|
|
1861
|
-
/**
|
|
1862
|
-
* Register a root (Canvas) with the scheduler.
|
|
1863
|
-
* The first root to register starts the RAF loop (if frameloop='always').
|
|
1864
|
-
* @param {string} id - Unique identifier for this root
|
|
1865
|
-
* @param {RootOptions} [options] - Optional configuration with getState and onError callbacks
|
|
1866
|
-
* @returns {() => void} Unsubscribe function to remove this root
|
|
1867
|
-
*/
|
|
1868
|
-
registerRoot(id, options = {}) {
|
|
1869
|
-
if (this.roots.has(id)) {
|
|
1870
|
-
console.warn(`[Scheduler] Root "${id}" already registered`);
|
|
1871
|
-
return () => this.unregisterRoot(id);
|
|
1872
|
-
}
|
|
1873
|
-
const entry = {
|
|
1874
|
-
id,
|
|
1875
|
-
getState: options.getState ?? (() => ({})),
|
|
1876
|
-
jobs: /* @__PURE__ */ new Map(),
|
|
1877
|
-
sortedJobs: [],
|
|
1878
|
-
needsRebuild: false
|
|
1879
|
-
};
|
|
1880
|
-
if (options.onError) {
|
|
1881
|
-
this.errorHandler = options.onError;
|
|
1882
|
-
}
|
|
1883
|
-
this.roots.set(id, entry);
|
|
1884
|
-
if (this.roots.size === 1) {
|
|
1885
|
-
this.notifyRootReady();
|
|
1886
|
-
if (this._frameloop === "always") this.start();
|
|
1887
|
-
}
|
|
1888
|
-
return () => this.unregisterRoot(id);
|
|
1889
|
-
}
|
|
1890
|
-
/**
|
|
1891
|
-
* Unregister a root from the scheduler.
|
|
1892
|
-
* Cleans up all job state listeners for this root's jobs.
|
|
1893
|
-
* The last root to unregister stops the RAF loop.
|
|
1894
|
-
* @param {string} id - The root ID to unregister
|
|
1895
|
-
* @returns {void}
|
|
1896
|
-
*/
|
|
1897
|
-
unregisterRoot(id) {
|
|
1898
|
-
const root = this.roots.get(id);
|
|
1899
|
-
if (!root) return;
|
|
1900
|
-
for (const jobId of root.jobs.keys()) {
|
|
1901
|
-
this.jobStateListeners.delete(jobId);
|
|
1902
|
-
}
|
|
1903
|
-
this.roots.delete(id);
|
|
1904
|
-
if (this.roots.size === 0) {
|
|
1905
|
-
this.stop();
|
|
1906
|
-
this.errorHandler = null;
|
|
1907
|
-
}
|
|
1908
|
-
}
|
|
1909
|
-
/**
|
|
1910
|
-
* Subscribe to be notified when a root becomes available.
|
|
1911
|
-
* Fires immediately if a root already exists.
|
|
1912
|
-
* @param {() => void} callback - Function called when first root registers
|
|
1913
|
-
* @returns {() => void} Unsubscribe function
|
|
1914
|
-
*/
|
|
1915
|
-
onRootReady(callback) {
|
|
1916
|
-
if (this.roots.size > 0) {
|
|
1917
|
-
callback();
|
|
1918
|
-
return () => {
|
|
1919
|
-
};
|
|
1920
|
-
}
|
|
1921
|
-
this.rootReadyCallbacks.add(callback);
|
|
1922
|
-
return () => this.rootReadyCallbacks.delete(callback);
|
|
1923
|
-
}
|
|
1924
|
-
/**
|
|
1925
|
-
* Notify all registered root-ready callbacks.
|
|
1926
|
-
* Called when the first root registers.
|
|
1927
|
-
* @returns {void}
|
|
1928
|
-
* @private
|
|
1929
|
-
*/
|
|
1930
|
-
notifyRootReady() {
|
|
1931
|
-
for (const cb of this.rootReadyCallbacks) {
|
|
1932
|
-
try {
|
|
1933
|
-
cb();
|
|
1934
|
-
} catch (error) {
|
|
1935
|
-
console.error("[Scheduler] Error in root-ready callback:", error);
|
|
1936
|
-
}
|
|
1937
|
-
}
|
|
1938
|
-
this.rootReadyCallbacks.clear();
|
|
1939
|
-
}
|
|
1940
|
-
/**
|
|
1941
|
-
* Ensure a default root exists for independent mode.
|
|
1942
|
-
* Creates a minimal root with no state provider.
|
|
1943
|
-
* @returns {void}
|
|
1944
|
-
* @private
|
|
1945
|
-
*/
|
|
1946
|
-
ensureDefaultRoot() {
|
|
1947
|
-
if (!this.roots.has("__default__")) {
|
|
1948
|
-
this.registerRoot("__default__");
|
|
1949
|
-
}
|
|
1950
|
-
}
|
|
1951
|
-
/**
|
|
1952
|
-
* Trigger error handling for job errors.
|
|
1953
|
-
* Uses the bound error handler if available, otherwise logs to console.
|
|
1954
|
-
* @param {Error} error - The error to handle
|
|
1955
|
-
* @returns {void}
|
|
1956
|
-
*/
|
|
1957
|
-
triggerError(error) {
|
|
1958
|
-
if (this.errorHandler) this.errorHandler(error);
|
|
1959
|
-
else console.error("[Scheduler]", error);
|
|
1960
|
-
}
|
|
1961
|
-
//* Phase Management Methods ================================
|
|
1962
|
-
/**
|
|
1963
|
-
* Add a named phase to the scheduler's execution order.
|
|
1964
|
-
* Marks all roots for rebuild to incorporate the new phase.
|
|
1965
|
-
* @param {string} name - The phase name (e.g., 'physics', 'postprocess')
|
|
1966
|
-
* @param {AddPhaseOptions} [options] - Positioning options (before/after other phases)
|
|
1967
|
-
* @returns {void}
|
|
1968
|
-
* @example
|
|
1969
|
-
* scheduler.addPhase('physics', { before: 'update' });
|
|
1970
|
-
* scheduler.addPhase('postprocess', { after: 'render' });
|
|
1971
|
-
*/
|
|
1972
|
-
addPhase(name, options) {
|
|
1973
|
-
this.phaseGraph.addPhase(name, options);
|
|
1974
|
-
for (const root of this.roots.values()) {
|
|
1975
|
-
root.needsRebuild = true;
|
|
1976
|
-
}
|
|
1977
|
-
}
|
|
1978
|
-
/**
|
|
1979
|
-
* Check if a phase exists in the scheduler.
|
|
1980
|
-
* @param {string} name - The phase name to check
|
|
1981
|
-
* @returns {boolean} True if the phase exists
|
|
1982
|
-
*/
|
|
1983
|
-
hasPhase(name) {
|
|
1984
|
-
return this.phaseGraph.hasPhase(name);
|
|
1985
|
-
}
|
|
1986
|
-
//* Global Job Registration Methods (Deprecated APIs) ================================
|
|
1987
|
-
/**
|
|
1988
|
-
* Register a global job that runs once per frame (not per-root).
|
|
1989
|
-
* Used internally by deprecated addEffect/addAfterEffect APIs.
|
|
1990
|
-
* @param {'before' | 'after'} phase - When to run: 'before' all roots or 'after' all roots
|
|
1991
|
-
* @param {string} id - Unique identifier for this global job
|
|
1992
|
-
* @param {(timestamp: number) => void} callback - Function called each frame with RAF timestamp
|
|
1993
|
-
* @returns {() => void} Unsubscribe function to remove this global job
|
|
1994
|
-
* @deprecated Use useFrame with phases instead
|
|
1995
|
-
*/
|
|
1996
|
-
registerGlobal(phase, id, callback) {
|
|
1997
|
-
const job = { id, callback };
|
|
1998
|
-
if (phase === "before") {
|
|
1999
|
-
this.globalBeforeJobs.set(id, job);
|
|
2000
|
-
} else {
|
|
2001
|
-
this.globalAfterJobs.set(id, job);
|
|
2002
|
-
}
|
|
2003
|
-
return () => {
|
|
2004
|
-
if (phase === "before") this.globalBeforeJobs.delete(id);
|
|
2005
|
-
else this.globalAfterJobs.delete(id);
|
|
2006
|
-
};
|
|
2007
|
-
}
|
|
2008
|
-
//* Idle Callback Methods (Deprecated API) ================================
|
|
2009
|
-
/**
|
|
2010
|
-
* Register an idle callback that fires when the loop stops.
|
|
2011
|
-
* Used internally by deprecated addTail API.
|
|
2012
|
-
* @param {(timestamp: number) => void} callback - Function called when loop becomes idle
|
|
2013
|
-
* @returns {() => void} Unsubscribe function to remove this idle callback
|
|
2014
|
-
* @deprecated Use demand mode with invalidate() instead
|
|
2015
|
-
*/
|
|
2016
|
-
onIdle(callback) {
|
|
2017
|
-
this.idleCallbacks.add(callback);
|
|
2018
|
-
return () => this.idleCallbacks.delete(callback);
|
|
2019
|
-
}
|
|
2020
|
-
/**
|
|
2021
|
-
* Notify all registered idle callbacks.
|
|
2022
|
-
* Called when the loop stops in demand mode.
|
|
2023
|
-
* @param {number} timestamp - The RAF timestamp when idle occurred
|
|
2024
|
-
* @returns {void}
|
|
2025
|
-
* @private
|
|
2026
|
-
*/
|
|
2027
|
-
notifyIdle(timestamp) {
|
|
2028
|
-
for (const cb of this.idleCallbacks) {
|
|
2029
|
-
try {
|
|
2030
|
-
cb(timestamp);
|
|
2031
|
-
} catch (error) {
|
|
2032
|
-
console.error("[Scheduler] Error in idle callback:", error);
|
|
2033
|
-
}
|
|
2034
|
-
}
|
|
2035
|
-
}
|
|
2036
|
-
//* Job Registration & Management Methods ================================
|
|
2037
|
-
/**
|
|
2038
|
-
* Register a job (frame callback) with a specific root.
|
|
2039
|
-
* This is the core registration method used by useFrame internally.
|
|
2040
|
-
* @param {FrameNextCallback} callback - The function to call each frame
|
|
2041
|
-
* @param {JobOptions & { rootId?: string; system?: boolean }} [options] - Job configuration
|
|
2042
|
-
* @param {string} [options.rootId] - Target root ID (defaults to first registered root)
|
|
2043
|
-
* @param {string} [options.id] - Unique job ID (auto-generated if not provided)
|
|
2044
|
-
* @param {string} [options.phase] - Execution phase (defaults to 'update')
|
|
2045
|
-
* @param {number} [options.priority] - Priority within phase (higher = earlier, default 0)
|
|
2046
|
-
* @param {number} [options.fps] - FPS throttle limit
|
|
2047
|
-
* @param {boolean} [options.drop] - Drop frames when behind (default true)
|
|
2048
|
-
* @param {boolean} [options.enabled] - Whether job is active (default true)
|
|
2049
|
-
* @param {boolean} [options.system] - Internal flag for system jobs (not user-facing)
|
|
2050
|
-
* @returns {() => void} Unsubscribe function to remove this job
|
|
2051
|
-
*/
|
|
2052
|
-
register(callback, options = {}) {
|
|
2053
|
-
const rootId = options.rootId;
|
|
2054
|
-
const root = rootId ? this.roots.get(rootId) : this.roots.values().next().value;
|
|
2055
|
-
if (!root) {
|
|
2056
|
-
console.warn("[Scheduler] No root registered. Is this inside a Canvas?");
|
|
2057
|
-
return () => {
|
|
2058
|
-
};
|
|
2059
|
-
}
|
|
2060
|
-
const id = options.id ?? this.generateJobId();
|
|
2061
|
-
let phase = options.phase ?? "update";
|
|
2062
|
-
if (!options.phase && (options.before || options.after)) {
|
|
2063
|
-
phase = this.phaseGraph.resolveConstraintPhase(options.before, options.after);
|
|
2064
|
-
}
|
|
2065
|
-
const before = this.normalizeConstraints(options.before);
|
|
2066
|
-
const after = this.normalizeConstraints(options.after);
|
|
2067
|
-
const job = {
|
|
2068
|
-
id,
|
|
2069
|
-
callback,
|
|
2070
|
-
phase,
|
|
2071
|
-
before,
|
|
2072
|
-
after,
|
|
2073
|
-
priority: options.priority ?? 0,
|
|
2074
|
-
index: this.nextJobIndex++,
|
|
2075
|
-
fps: options.fps,
|
|
2076
|
-
drop: options.drop ?? true,
|
|
2077
|
-
enabled: options.enabled ?? true,
|
|
2078
|
-
system: options.system ?? false
|
|
2079
|
-
};
|
|
2080
|
-
if (root.jobs.has(id)) {
|
|
2081
|
-
console.warn(`[useFrame] Job with id "${id}" already exists, replacing`);
|
|
2082
|
-
}
|
|
2083
|
-
root.jobs.set(id, job);
|
|
2084
|
-
root.needsRebuild = true;
|
|
2085
|
-
return () => this.unregister(id, root.id);
|
|
2086
|
-
}
|
|
2087
|
-
/**
|
|
2088
|
-
* Unregister a job by its ID.
|
|
2089
|
-
* Searches all roots if rootId is not provided.
|
|
2090
|
-
* @param {string} id - The job ID to unregister
|
|
2091
|
-
* @param {string} [rootId] - Optional root ID to search (searches all if not provided)
|
|
2092
|
-
* @returns {void}
|
|
2093
|
-
*/
|
|
2094
|
-
unregister(id, rootId) {
|
|
2095
|
-
const root = rootId ? this.roots.get(rootId) : Array.from(this.roots.values()).find((r) => r.jobs.has(id));
|
|
2096
|
-
if (root?.jobs.delete(id)) {
|
|
2097
|
-
root.needsRebuild = true;
|
|
2098
|
-
this.jobStateListeners.delete(id);
|
|
2099
|
-
}
|
|
2100
|
-
}
|
|
2101
|
-
/**
|
|
2102
|
-
* Update a job's options dynamically.
|
|
2103
|
-
* Searches all roots to find the job by ID.
|
|
2104
|
-
* Phase/constraint changes trigger a rebuild of the sorted job list.
|
|
2105
|
-
* @param {string} id - The job ID to update
|
|
2106
|
-
* @param {Partial<JobOptions>} options - The options to update
|
|
2107
|
-
* @returns {void}
|
|
2108
|
-
*/
|
|
2109
|
-
updateJob(id, options) {
|
|
2110
|
-
let job;
|
|
2111
|
-
let root;
|
|
2112
|
-
for (const r of this.roots.values()) {
|
|
2113
|
-
job = r.jobs.get(id);
|
|
2114
|
-
if (job) {
|
|
2115
|
-
root = r;
|
|
2116
|
-
break;
|
|
2117
|
-
}
|
|
2118
|
-
}
|
|
2119
|
-
if (!job || !root) return;
|
|
2120
|
-
if (options.priority !== void 0) job.priority = options.priority;
|
|
2121
|
-
if (options.fps !== void 0) job.fps = options.fps;
|
|
2122
|
-
if (options.drop !== void 0) job.drop = options.drop;
|
|
2123
|
-
if (options.enabled !== void 0) {
|
|
2124
|
-
const wasEnabled = job.enabled;
|
|
2125
|
-
job.enabled = options.enabled;
|
|
2126
|
-
if (!wasEnabled && job.enabled) resetJobTiming(job);
|
|
2127
|
-
if (wasEnabled !== job.enabled) root.needsRebuild = true;
|
|
2128
|
-
}
|
|
2129
|
-
if (options.phase !== void 0 || options.before !== void 0 || options.after !== void 0) {
|
|
2130
|
-
if (options.phase) job.phase = options.phase;
|
|
2131
|
-
if (options.before !== void 0) job.before = this.normalizeConstraints(options.before);
|
|
2132
|
-
if (options.after !== void 0) job.after = this.normalizeConstraints(options.after);
|
|
2133
|
-
root.needsRebuild = true;
|
|
2134
|
-
}
|
|
2135
|
-
}
|
|
2136
|
-
//* Job State Management Methods ================================
|
|
2137
|
-
/**
|
|
2138
|
-
* Check if a job is currently paused (disabled).
|
|
2139
|
-
* @param {string} id - The job ID to check
|
|
2140
|
-
* @returns {boolean} True if the job exists and is paused
|
|
2141
|
-
*/
|
|
2142
|
-
isJobPaused(id) {
|
|
2143
|
-
for (const root of this.roots.values()) {
|
|
2144
|
-
const job = root.jobs.get(id);
|
|
2145
|
-
if (job) return !job.enabled;
|
|
2146
|
-
}
|
|
2147
|
-
return false;
|
|
2148
|
-
}
|
|
2149
|
-
/**
|
|
2150
|
-
* Subscribe to state changes for a specific job.
|
|
2151
|
-
* Listener is called when job is paused or resumed.
|
|
2152
|
-
* @param {string} id - The job ID to subscribe to
|
|
2153
|
-
* @param {() => void} listener - Callback invoked on state changes
|
|
2154
|
-
* @returns {() => void} Unsubscribe function
|
|
2155
|
-
*/
|
|
2156
|
-
subscribeJobState(id, listener) {
|
|
2157
|
-
if (!this.jobStateListeners.has(id)) {
|
|
2158
|
-
this.jobStateListeners.set(id, /* @__PURE__ */ new Set());
|
|
2159
|
-
}
|
|
2160
|
-
this.jobStateListeners.get(id).add(listener);
|
|
2161
|
-
return () => {
|
|
2162
|
-
this.jobStateListeners.get(id)?.delete(listener);
|
|
2163
|
-
if (this.jobStateListeners.get(id)?.size === 0) {
|
|
2164
|
-
this.jobStateListeners.delete(id);
|
|
2165
|
-
}
|
|
2166
|
-
};
|
|
2167
|
-
}
|
|
2168
|
-
/**
|
|
2169
|
-
* Notify all listeners that a job's state has changed.
|
|
2170
|
-
* @param {string} id - The job ID that changed
|
|
2171
|
-
* @returns {void}
|
|
2172
|
-
* @private
|
|
2173
|
-
*/
|
|
2174
|
-
notifyJobStateChange(id) {
|
|
2175
|
-
this.jobStateListeners.get(id)?.forEach((listener) => listener());
|
|
2176
|
-
}
|
|
2177
|
-
/**
|
|
2178
|
-
* Pause a job by ID (sets enabled=false).
|
|
2179
|
-
* Notifies any subscribed state listeners.
|
|
2180
|
-
* @param {string} id - The job ID to pause
|
|
2181
|
-
* @returns {void}
|
|
2182
|
-
*/
|
|
2183
|
-
pauseJob(id) {
|
|
2184
|
-
this.updateJob(id, { enabled: false });
|
|
2185
|
-
this.notifyJobStateChange(id);
|
|
2186
|
-
}
|
|
2187
|
-
/**
|
|
2188
|
-
* Resume a paused job by ID (sets enabled=true).
|
|
2189
|
-
* Resets job timing to prevent frame accumulation.
|
|
2190
|
-
* Notifies any subscribed state listeners.
|
|
2191
|
-
* @param {string} id - The job ID to resume
|
|
2192
|
-
* @returns {void}
|
|
2193
|
-
*/
|
|
2194
|
-
resumeJob(id) {
|
|
2195
|
-
this.updateJob(id, { enabled: true });
|
|
2196
|
-
this.notifyJobStateChange(id);
|
|
2197
|
-
}
|
|
2198
|
-
//* Frame Loop Control Methods ================================
|
|
2199
|
-
/**
|
|
2200
|
-
* Start the requestAnimationFrame loop.
|
|
2201
|
-
* Resets timing state (elapsedTime, frameCount) on start.
|
|
2202
|
-
* No-op if already running.
|
|
2203
|
-
* @returns {void}
|
|
2204
|
-
*/
|
|
2205
|
-
start() {
|
|
2206
|
-
if (this.loopState.running) return;
|
|
2207
|
-
const { elapsedTime, createdAt } = this.loopState;
|
|
2208
|
-
let adjustedCreated = 0;
|
|
2209
|
-
if (this.stoppedTime > 0) {
|
|
2210
|
-
adjustedCreated = createdAt - (performance.now() - this.stoppedTime);
|
|
2211
|
-
this.stoppedTime = 0;
|
|
2212
|
-
}
|
|
2213
|
-
Object.assign(this.loopState, {
|
|
2214
|
-
running: true,
|
|
2215
|
-
elapsedTime: elapsedTime ?? 0,
|
|
2216
|
-
lastTime: performance.now(),
|
|
2217
|
-
createdAt: adjustedCreated > 0 ? adjustedCreated : performance.now(),
|
|
2218
|
-
frameCount: 0,
|
|
2219
|
-
rafHandle: requestAnimationFrame(this.loop)
|
|
2220
|
-
});
|
|
2221
|
-
}
|
|
2222
|
-
/**
|
|
2223
|
-
* Stop the requestAnimationFrame loop.
|
|
2224
|
-
* Cancels any pending RAF callback.
|
|
2225
|
-
* No-op if not running.
|
|
2226
|
-
* @returns {void}
|
|
2227
|
-
*/
|
|
2228
|
-
stop() {
|
|
2229
|
-
if (!this.loopState.running) return;
|
|
2230
|
-
this.loopState.running = false;
|
|
2231
|
-
if (this.loopState.rafHandle !== null) {
|
|
2232
|
-
cancelAnimationFrame(this.loopState.rafHandle);
|
|
2233
|
-
this.loopState.rafHandle = null;
|
|
2234
|
-
}
|
|
2235
|
-
this.stoppedTime = performance.now();
|
|
2236
|
-
}
|
|
2237
|
-
/**
|
|
2238
|
-
* Request frames to be rendered in demand mode.
|
|
2239
|
-
* Accumulates pending frames (capped at 60) and starts the loop if not running.
|
|
2240
|
-
* No-op if frameloop is not 'demand'.
|
|
2241
|
-
* @param {number} [frames=1] - Number of frames to request
|
|
2242
|
-
* @param {boolean} [stackFrames=false] - Whether to add frames to existing pending count
|
|
2243
|
-
* - `false` (default): Sets pending frames to the specified value (replaces existing count)
|
|
2244
|
-
* - `true`: Adds frames to existing pending count (useful for accumulating invalidations)
|
|
2245
|
-
* @returns {void}
|
|
2246
|
-
* @example
|
|
2247
|
-
* // Request a single frame render
|
|
2248
|
-
* scheduler.invalidate();
|
|
2249
|
-
*
|
|
2250
|
-
* @example
|
|
2251
|
-
* // Request 5 frames (e.g., for animations)
|
|
2252
|
-
* scheduler.invalidate(5);
|
|
2253
|
-
*
|
|
2254
|
-
* @example
|
|
2255
|
-
* // Set pending frames to exactly 3 (don't stack with existing)
|
|
2256
|
-
* scheduler.invalidate(3, false);
|
|
2257
|
-
*
|
|
2258
|
-
* @example
|
|
2259
|
-
* // Add 2 more frames to existing pending count
|
|
2260
|
-
* scheduler.invalidate(2, true);
|
|
2261
|
-
*/
|
|
2262
|
-
invalidate(frames = 1, stackFrames = false) {
|
|
2263
|
-
if (this._frameloop !== "demand") return;
|
|
2264
|
-
const baseFrames = stackFrames ? this.pendingFrames : 0;
|
|
2265
|
-
this.pendingFrames = Math.min(60, baseFrames + frames);
|
|
2266
|
-
if (!this.loopState.running && this.pendingFrames > 0) this.start();
|
|
2267
|
-
}
|
|
2268
|
-
/**
|
|
2269
|
-
* Reset timing state for deterministic testing.
|
|
2270
|
-
* Preserves jobs and roots but resets lastTime, frameCount, elapsedTime, etc.
|
|
2271
|
-
* @returns {void}
|
|
2272
|
-
*/
|
|
2273
|
-
resetTiming() {
|
|
2274
|
-
this.loopState.lastTime = null;
|
|
2275
|
-
this.loopState.frameCount = 0;
|
|
2276
|
-
this.loopState.elapsedTime = 0;
|
|
2277
|
-
this.loopState.createdAt = performance.now();
|
|
2278
|
-
}
|
|
2279
|
-
//* Manual Stepping Methods ================================
|
|
2280
|
-
/**
|
|
2281
|
-
* Manually execute a single frame for all roots.
|
|
2282
|
-
* Useful for frameloop='never' mode or testing scenarios.
|
|
2283
|
-
* @param {number} [timestamp] - Optional timestamp (defaults to performance.now())
|
|
2284
|
-
* @returns {void}
|
|
2285
|
-
* @example
|
|
2286
|
-
* // Manual control mode
|
|
2287
|
-
* scheduler.frameloop = 'never';
|
|
2288
|
-
* scheduler.step(); // Execute one frame
|
|
2289
|
-
*/
|
|
2290
|
-
step(timestamp) {
|
|
2291
|
-
const now = timestamp ?? performance.now();
|
|
2292
|
-
this.executeFrame(now);
|
|
2293
|
-
}
|
|
2294
|
-
/**
|
|
2295
|
-
* Manually execute a single job by its ID.
|
|
2296
|
-
* Useful for testing individual job callbacks in isolation.
|
|
2297
|
-
* @param {string} id - The job ID to step
|
|
2298
|
-
* @param {number} [timestamp] - Optional timestamp (defaults to performance.now())
|
|
2299
|
-
* @returns {void}
|
|
2300
|
-
*/
|
|
2301
|
-
stepJob(id, timestamp) {
|
|
2302
|
-
let job;
|
|
2303
|
-
let root;
|
|
2304
|
-
for (const r of this.roots.values()) {
|
|
2305
|
-
job = r.jobs.get(id);
|
|
2306
|
-
if (job) {
|
|
2307
|
-
root = r;
|
|
2308
|
-
break;
|
|
2309
|
-
}
|
|
2310
|
-
}
|
|
2311
|
-
if (!job || !root) {
|
|
2312
|
-
console.warn(`[Scheduler] Job "${id}" not found`);
|
|
2313
|
-
return;
|
|
2314
|
-
}
|
|
2315
|
-
const now = timestamp ?? performance.now();
|
|
2316
|
-
const deltaMs = this.loopState.lastTime !== null ? now - this.loopState.lastTime : 0;
|
|
2317
|
-
const delta = deltaMs / 1e3;
|
|
2318
|
-
const elapsed = now - this.loopState.createdAt;
|
|
2319
|
-
const providedState = root.getState?.() ?? {};
|
|
2320
|
-
const frameState = {
|
|
2321
|
-
...providedState,
|
|
2322
|
-
time: now,
|
|
2323
|
-
delta,
|
|
2324
|
-
elapsed,
|
|
2325
|
-
frame: this.loopState.frameCount
|
|
2326
|
-
};
|
|
2327
|
-
try {
|
|
2328
|
-
job.callback(frameState, delta);
|
|
2329
|
-
} catch (error) {
|
|
2330
|
-
console.error(`[Scheduler] Error in job "${job.id}":`, error);
|
|
2331
|
-
this.triggerError(error instanceof Error ? error : new Error(String(error)));
|
|
2332
|
-
}
|
|
2333
|
-
}
|
|
2334
|
-
/**
|
|
2335
|
-
* Execute a single frame across all roots.
|
|
2336
|
-
* Order: globalBefore → each root's jobs → globalAfter
|
|
2337
|
-
* @param {number} timestamp - RAF timestamp in milliseconds
|
|
2338
|
-
* @returns {void}
|
|
2339
|
-
* @private
|
|
2340
|
-
*/
|
|
2341
|
-
executeFrame(timestamp) {
|
|
2342
|
-
const deltaMs = this.loopState.lastTime !== null ? timestamp - this.loopState.lastTime : 0;
|
|
2343
|
-
const delta = deltaMs / 1e3;
|
|
2344
|
-
this.loopState.lastTime = timestamp;
|
|
2345
|
-
this.loopState.frameCount++;
|
|
2346
|
-
this.loopState.elapsedTime += deltaMs;
|
|
2347
|
-
this.runGlobalJobs(this.globalBeforeJobs, timestamp);
|
|
2348
|
-
for (const root of this.roots.values()) {
|
|
2349
|
-
this.tickRoot(root, timestamp, delta);
|
|
2350
|
-
}
|
|
2351
|
-
this.runGlobalJobs(this.globalAfterJobs, timestamp);
|
|
2352
|
-
}
|
|
2353
|
-
/**
|
|
2354
|
-
* Run all global jobs from a job map.
|
|
2355
|
-
* Catches and logs errors without stopping execution.
|
|
2356
|
-
* @param {Map<string, GlobalJob>} jobs - The global jobs map to execute
|
|
2357
|
-
* @param {number} timestamp - RAF timestamp in milliseconds
|
|
2358
|
-
* @returns {void}
|
|
2359
|
-
* @private
|
|
2360
|
-
*/
|
|
2361
|
-
runGlobalJobs(jobs, timestamp) {
|
|
2362
|
-
for (const job of jobs.values()) {
|
|
2363
|
-
try {
|
|
2364
|
-
job.callback(timestamp);
|
|
2365
|
-
} catch (error) {
|
|
2366
|
-
console.error(`[Scheduler] Error in global job "${job.id}":`, error);
|
|
2367
|
-
}
|
|
2368
|
-
}
|
|
2369
|
-
}
|
|
2370
|
-
/**
|
|
2371
|
-
* Execute all jobs for a single root in sorted order.
|
|
2372
|
-
* Rebuilds sorted job list if needed, then dispatches each job.
|
|
2373
|
-
* Errors are caught and propagated via triggerError.
|
|
2374
|
-
* @param {RootEntry} root - The root entry to tick
|
|
2375
|
-
* @param {number} timestamp - RAF timestamp in milliseconds
|
|
2376
|
-
* @param {number} delta - Time since last frame in seconds
|
|
2377
|
-
* @returns {void}
|
|
2378
|
-
* @private
|
|
2379
|
-
*/
|
|
2380
|
-
tickRoot(root, timestamp, delta) {
|
|
2381
|
-
if (root.needsRebuild) {
|
|
2382
|
-
root.sortedJobs = rebuildSortedJobs(root.jobs, this.phaseGraph);
|
|
2383
|
-
root.needsRebuild = false;
|
|
2384
|
-
}
|
|
2385
|
-
const providedState = root.getState?.() ?? {};
|
|
2386
|
-
const frameState = {
|
|
2387
|
-
...providedState,
|
|
2388
|
-
time: timestamp,
|
|
2389
|
-
delta,
|
|
2390
|
-
elapsed: this.loopState.elapsedTime / 1e3,
|
|
2391
|
-
// Convert ms to seconds
|
|
2392
|
-
frame: this.loopState.frameCount
|
|
2393
|
-
};
|
|
2394
|
-
for (const job of root.sortedJobs) {
|
|
2395
|
-
if (!shouldRun(job, timestamp)) continue;
|
|
2396
|
-
try {
|
|
2397
|
-
job.callback(frameState, delta);
|
|
2398
|
-
} catch (error) {
|
|
2399
|
-
console.error(`[Scheduler] Error in job "${job.id}":`, error);
|
|
2400
|
-
this.triggerError(error instanceof Error ? error : new Error(String(error)));
|
|
2401
|
-
}
|
|
2402
|
-
}
|
|
2403
|
-
}
|
|
2404
|
-
//* Debug & Inspection Methods ================================
|
|
2405
|
-
/**
|
|
2406
|
-
* Get the total number of registered jobs across all roots.
|
|
2407
|
-
* Includes both per-root jobs and global before/after jobs.
|
|
2408
|
-
* @returns {number} Total job count
|
|
2409
|
-
*/
|
|
2410
|
-
getJobCount() {
|
|
2411
|
-
let count = 0;
|
|
2412
|
-
for (const root of this.roots.values()) {
|
|
2413
|
-
count += root.jobs.size;
|
|
2414
|
-
}
|
|
2415
|
-
return count + this.globalBeforeJobs.size + this.globalAfterJobs.size;
|
|
2416
|
-
}
|
|
2417
|
-
/**
|
|
2418
|
-
* Get all registered job IDs across all roots.
|
|
2419
|
-
* Includes both per-root jobs and global before/after jobs.
|
|
2420
|
-
* @returns {string[]} Array of all job IDs
|
|
2421
|
-
*/
|
|
2422
|
-
getJobIds() {
|
|
2423
|
-
const ids = [];
|
|
2424
|
-
for (const root of this.roots.values()) {
|
|
2425
|
-
ids.push(...root.jobs.keys());
|
|
2426
|
-
}
|
|
2427
|
-
ids.push(...this.globalBeforeJobs.keys());
|
|
2428
|
-
ids.push(...this.globalAfterJobs.keys());
|
|
2429
|
-
return ids;
|
|
2430
|
-
}
|
|
2431
|
-
/**
|
|
2432
|
-
* Get the number of registered roots (Canvas instances).
|
|
2433
|
-
* @returns {number} Number of registered roots
|
|
2434
|
-
*/
|
|
2435
|
-
getRootCount() {
|
|
2436
|
-
return this.roots.size;
|
|
2437
|
-
}
|
|
2438
|
-
/**
|
|
2439
|
-
* Check if any user (non-system) jobs are registered in a specific phase.
|
|
2440
|
-
* Used by the default render job to know if a user has taken over rendering.
|
|
2441
|
-
*
|
|
2442
|
-
* @param phase The phase to check
|
|
2443
|
-
* @param rootId Optional root ID to check (checks all roots if not provided)
|
|
2444
|
-
* @returns true if any user jobs exist in the phase
|
|
2445
|
-
*/
|
|
2446
|
-
hasUserJobsInPhase(phase, rootId) {
|
|
2447
|
-
const rootsToCheck = rootId ? [this.roots.get(rootId)].filter(Boolean) : Array.from(this.roots.values());
|
|
2448
|
-
return rootsToCheck.some((root) => {
|
|
2449
|
-
if (!root) return false;
|
|
2450
|
-
for (const job of root.jobs.values()) {
|
|
2451
|
-
if (job.phase === phase && !job.system && job.enabled) return true;
|
|
2452
|
-
}
|
|
2453
|
-
return false;
|
|
2454
|
-
});
|
|
2455
|
-
}
|
|
2456
|
-
//* Utility Methods ================================
|
|
2457
|
-
/**
|
|
2458
|
-
* Generate a unique root ID for automatic root registration.
|
|
2459
|
-
* @returns {string} A unique root ID in the format 'root_N'
|
|
2460
|
-
*/
|
|
2461
|
-
generateRootId() {
|
|
2462
|
-
return `root_${this.nextRootIndex++}`;
|
|
2463
|
-
}
|
|
2464
|
-
/**
|
|
2465
|
-
* Generate a unique job ID.
|
|
2466
|
-
* @returns {string} A unique job ID in the format 'job_N'
|
|
2467
|
-
* @private
|
|
2468
|
-
*/
|
|
2469
|
-
generateJobId() {
|
|
2470
|
-
return `job_${this.nextJobIndex}`;
|
|
2471
|
-
}
|
|
2472
|
-
/**
|
|
2473
|
-
* Normalize before/after constraints to a Set.
|
|
2474
|
-
* Handles undefined, single string, or array inputs.
|
|
2475
|
-
* @param {string | string[] | undefined} value - The constraint value(s)
|
|
2476
|
-
* @returns {Set<string>} Normalized Set of constraint strings
|
|
2477
|
-
* @private
|
|
2478
|
-
*/
|
|
2479
|
-
normalizeConstraints(value) {
|
|
2480
|
-
if (!value) return /* @__PURE__ */ new Set();
|
|
2481
|
-
if (Array.isArray(value)) return new Set(value);
|
|
2482
|
-
return /* @__PURE__ */ new Set([value]);
|
|
2483
|
-
}
|
|
2484
|
-
};
|
|
2485
|
-
//* Static State & Methods (Singleton Usage) ================================
|
|
2486
|
-
//* Cross-Bundle Singleton Key ==============================
|
|
2487
|
-
// Use Symbol.for() to ensure scheduler is shared across bundle boundaries
|
|
2488
|
-
// This prevents issues when mixing imports from @react-three/fiber and @react-three/fiber/webgpu
|
|
2489
|
-
__publicField$1(_Scheduler, "INSTANCE_KEY", Symbol.for("@react-three/fiber.scheduler"));
|
|
2490
|
-
let Scheduler = _Scheduler;
|
|
2491
|
-
const getScheduler = () => Scheduler.get();
|
|
2492
|
-
if (hmrData) {
|
|
2493
|
-
hmrData.accept?.();
|
|
2494
|
-
}
|
|
2495
|
-
|
|
2496
|
-
const R3F_CONTEXT = Symbol.for("@react-three/fiber.context");
|
|
2497
|
-
const context = globalThis[R3F_CONTEXT] ?? (globalThis[R3F_CONTEXT] = React__namespace.createContext(null));
|
|
2498
|
-
const createStore = (invalidate, advance) => {
|
|
2499
|
-
const rootStore = traditional.createWithEqualityFn((set, get) => {
|
|
2500
|
-
const position = new webgpu.Vector3();
|
|
2501
|
-
const defaultTarget = new webgpu.Vector3();
|
|
2502
|
-
const tempTarget = new webgpu.Vector3();
|
|
2503
|
-
function getCurrentViewport(camera = get().camera, target = defaultTarget, size = get().size) {
|
|
2504
|
-
const { width, height, top, left } = size;
|
|
2505
|
-
const aspect = width / height;
|
|
2506
|
-
if (target.isVector3) tempTarget.copy(target);
|
|
2507
|
-
else tempTarget.set(...target);
|
|
2508
|
-
const distance = camera.getWorldPosition(position).distanceTo(tempTarget);
|
|
2509
|
-
if (isOrthographicCamera(camera)) {
|
|
2510
|
-
return { width: width / camera.zoom, height: height / camera.zoom, top, left, factor: 1, distance, aspect };
|
|
2511
|
-
} else {
|
|
2512
|
-
const fov = camera.fov * Math.PI / 180;
|
|
2513
|
-
const h = 2 * Math.tan(fov / 2) * distance;
|
|
2514
|
-
const w = h * (width / height);
|
|
2515
|
-
return { width: w, height: h, top, left, factor: width / w, distance, aspect };
|
|
1698
|
+
const R3F_CONTEXT = Symbol.for("@react-three/fiber.context");
|
|
1699
|
+
const context = globalThis[R3F_CONTEXT] ?? (globalThis[R3F_CONTEXT] = React__namespace.createContext(null));
|
|
1700
|
+
const createStore = (invalidate, advance) => {
|
|
1701
|
+
const rootStore = traditional.createWithEqualityFn((set, get) => {
|
|
1702
|
+
const position = new webgpu.Vector3();
|
|
1703
|
+
const defaultTarget = new webgpu.Vector3();
|
|
1704
|
+
const tempTarget = new webgpu.Vector3();
|
|
1705
|
+
function getCurrentViewport(camera = get().camera, target = defaultTarget, size = get().size) {
|
|
1706
|
+
const { width, height, top, left } = size;
|
|
1707
|
+
const aspect = width / height;
|
|
1708
|
+
if (target.isVector3) tempTarget.copy(target);
|
|
1709
|
+
else tempTarget.set(...target);
|
|
1710
|
+
const distance = camera.getWorldPosition(position).distanceTo(tempTarget);
|
|
1711
|
+
if (isOrthographicCamera(camera)) {
|
|
1712
|
+
return { width: width / camera.zoom, height: height / camera.zoom, top, left, factor: 1, distance, aspect };
|
|
1713
|
+
} else {
|
|
1714
|
+
const fov = camera.fov * Math.PI / 180;
|
|
1715
|
+
const h = 2 * Math.tan(fov / 2) * distance;
|
|
1716
|
+
const w = h * (width / height);
|
|
1717
|
+
return { width: w, height: h, top, left, factor: width / w, distance, aspect };
|
|
2516
1718
|
}
|
|
2517
1719
|
}
|
|
2518
1720
|
let performanceTimeout = void 0;
|
|
@@ -2530,7 +1732,14 @@ const createStore = (invalidate, advance) => {
|
|
|
2530
1732
|
frustum: new webgpu.Frustum(),
|
|
2531
1733
|
autoUpdateFrustum: true,
|
|
2532
1734
|
raycaster: null,
|
|
2533
|
-
events: {
|
|
1735
|
+
events: {
|
|
1736
|
+
priority: 1,
|
|
1737
|
+
enabled: true,
|
|
1738
|
+
connected: false,
|
|
1739
|
+
frameTimedRaycasts: true,
|
|
1740
|
+
alwaysFireOnScroll: true,
|
|
1741
|
+
updateOnFrame: false
|
|
1742
|
+
},
|
|
2534
1743
|
scene: null,
|
|
2535
1744
|
rootScene: null,
|
|
2536
1745
|
xr: null,
|
|
@@ -2595,7 +1804,7 @@ const createStore = (invalidate, advance) => {
|
|
|
2595
1804
|
size: newSize,
|
|
2596
1805
|
viewport: { ...s.viewport, ...getCurrentViewport(state2.camera, defaultTarget, newSize) }
|
|
2597
1806
|
}));
|
|
2598
|
-
getScheduler().invalidate();
|
|
1807
|
+
scheduler.getScheduler().invalidate();
|
|
2599
1808
|
}
|
|
2600
1809
|
}
|
|
2601
1810
|
return;
|
|
@@ -2610,7 +1819,7 @@ const createStore = (invalidate, advance) => {
|
|
|
2610
1819
|
viewport: { ...s.viewport, ...getCurrentViewport(state2.camera, defaultTarget, size) },
|
|
2611
1820
|
_sizeImperative: true
|
|
2612
1821
|
}));
|
|
2613
|
-
getScheduler().invalidate();
|
|
1822
|
+
scheduler.getScheduler().invalidate();
|
|
2614
1823
|
},
|
|
2615
1824
|
setDpr: (dpr) => set((state2) => {
|
|
2616
1825
|
const resolved = calculateDpr(dpr);
|
|
@@ -2618,14 +1827,18 @@ const createStore = (invalidate, advance) => {
|
|
|
2618
1827
|
}),
|
|
2619
1828
|
setFrameloop: (frameloop = "always") => {
|
|
2620
1829
|
set(() => ({ frameloop }));
|
|
1830
|
+
scheduler.getScheduler().frameloop = frameloop;
|
|
2621
1831
|
},
|
|
2622
1832
|
setError: (error) => set(() => ({ error })),
|
|
2623
1833
|
error: null,
|
|
2624
|
-
//* TSL State (managed via hooks: useUniforms, useNodes, useTextures,
|
|
1834
|
+
//* TSL State (managed via hooks: useUniforms, useNodes, useBuffers, useGPUStorage, useTextures, useRenderPipeline) ==============================
|
|
2625
1835
|
uniforms: {},
|
|
2626
1836
|
nodes: {},
|
|
1837
|
+
buffers: {},
|
|
1838
|
+
gpuStorage: {},
|
|
2627
1839
|
textures: /* @__PURE__ */ new Map(),
|
|
2628
|
-
|
|
1840
|
+
_textureRefs: /* @__PURE__ */ new Map(),
|
|
1841
|
+
renderPipeline: null,
|
|
2629
1842
|
passes: {},
|
|
2630
1843
|
_hmrVersion: 0,
|
|
2631
1844
|
_sizeImperative: false,
|
|
@@ -2634,12 +1847,16 @@ const createStore = (invalidate, advance) => {
|
|
|
2634
1847
|
internal: {
|
|
2635
1848
|
// Events
|
|
2636
1849
|
interaction: [],
|
|
2637
|
-
hovered: /* @__PURE__ */ new Map(),
|
|
2638
1850
|
subscribers: [],
|
|
1851
|
+
// Per-pointer state (new unified structure)
|
|
1852
|
+
pointerMap: /* @__PURE__ */ new Map(),
|
|
1853
|
+
pointerDirty: /* @__PURE__ */ new Map(),
|
|
1854
|
+
lastEvent: React__namespace.createRef(),
|
|
1855
|
+
// Deprecated but kept for backwards compatibility
|
|
1856
|
+
hovered: /* @__PURE__ */ new Map(),
|
|
2639
1857
|
initialClick: [0, 0],
|
|
2640
1858
|
initialHits: [],
|
|
2641
1859
|
capturedMap: /* @__PURE__ */ new Map(),
|
|
2642
|
-
lastEvent: React__namespace.createRef(),
|
|
2643
1860
|
// Visibility tracking (onFramed, onOccluded, onVisible)
|
|
2644
1861
|
visibilityRegistry: /* @__PURE__ */ new Map(),
|
|
2645
1862
|
// Occlusion system (WebGPU only)
|
|
@@ -2678,8 +1895,7 @@ const createStore = (invalidate, advance) => {
|
|
|
2678
1895
|
const currentState = rootStore.getState();
|
|
2679
1896
|
if (!currentState.isLegacy && currentState.internal.actualRenderer) {
|
|
2680
1897
|
const stack = new Error().stack || "";
|
|
2681
|
-
|
|
2682
|
-
if (!isInternalAccess) {
|
|
1898
|
+
if (!isInternalRendererAccess(stack)) {
|
|
2683
1899
|
const cleanedStack = stack.split("\n").slice(2).join("\n") || "Stack trace unavailable";
|
|
2684
1900
|
notifyDepreciated({
|
|
2685
1901
|
heading: "Accessing state.gl in WebGPU mode",
|
|
@@ -2727,14 +1943,16 @@ const createStore = (invalidate, advance) => {
|
|
|
2727
1943
|
oldSize = size;
|
|
2728
1944
|
oldDpr = viewport.dpr;
|
|
2729
1945
|
updateCamera(camera, size);
|
|
2730
|
-
if (canvasTarget) {
|
|
1946
|
+
if (internal.isSecondary && canvasTarget) {
|
|
2731
1947
|
if (viewport.dpr > 0) canvasTarget.setPixelRatio(viewport.dpr);
|
|
2732
|
-
|
|
2733
|
-
canvasTarget.setSize(size.width, size.height, updateStyle);
|
|
1948
|
+
canvasTarget.setSize(size.width, size.height, false);
|
|
2734
1949
|
} else {
|
|
2735
1950
|
if (viewport.dpr > 0) actualRenderer.setPixelRatio(viewport.dpr);
|
|
2736
|
-
|
|
2737
|
-
|
|
1951
|
+
actualRenderer.setSize(size.width, size.height, false);
|
|
1952
|
+
if (canvasTarget) {
|
|
1953
|
+
if (viewport.dpr > 0) canvasTarget.setPixelRatio(viewport.dpr);
|
|
1954
|
+
canvasTarget.setSize(size.width, size.height, false);
|
|
1955
|
+
}
|
|
2738
1956
|
}
|
|
2739
1957
|
}
|
|
2740
1958
|
if (camera !== oldCamera) {
|
|
@@ -2790,26 +2008,32 @@ function loadingFn(extensions, onProgress) {
|
|
|
2790
2008
|
);
|
|
2791
2009
|
};
|
|
2792
2010
|
}
|
|
2793
|
-
function useLoader(loader, input, extensions, onProgress) {
|
|
2794
|
-
const
|
|
2011
|
+
function useLoader(loader, input, extensions, onProgress, cacheKey) {
|
|
2012
|
+
const inputs = Array.isArray(input) ? input : [input];
|
|
2013
|
+
const cacheKeys = Array.isArray(cacheKey ?? input) ? cacheKey ?? input : [cacheKey ?? input];
|
|
2795
2014
|
const fn = loadingFn(extensions, onProgress);
|
|
2796
|
-
const results =
|
|
2015
|
+
const results = cacheKeys.map(
|
|
2016
|
+
(key, index) => suspendReact.suspend(() => fn(loader, inputs[index]), [loader, key], { equal: is.equ })
|
|
2017
|
+
);
|
|
2797
2018
|
return Array.isArray(input) ? results : results[0];
|
|
2798
2019
|
}
|
|
2799
|
-
useLoader.preload = function(loader, input, extensions, onProgress) {
|
|
2800
|
-
const
|
|
2801
|
-
|
|
2020
|
+
useLoader.preload = function(loader, input, extensions, onProgress, cacheKey) {
|
|
2021
|
+
const inputs = Array.isArray(input) ? input : [input];
|
|
2022
|
+
const cacheKeys = Array.isArray(cacheKey ?? input) ? cacheKey ?? input : [cacheKey ?? input];
|
|
2023
|
+
cacheKeys.forEach(
|
|
2024
|
+
(key, index) => suspendReact.preload(() => loadingFn(extensions, onProgress)(loader, inputs[index]), [loader, key])
|
|
2025
|
+
);
|
|
2802
2026
|
};
|
|
2803
|
-
useLoader.clear = function(loader, input) {
|
|
2804
|
-
const
|
|
2805
|
-
|
|
2027
|
+
useLoader.clear = function(loader, input, cacheKey) {
|
|
2028
|
+
const cacheKeys = Array.isArray(cacheKey ?? input) ? cacheKey ?? input : [cacheKey ?? input];
|
|
2029
|
+
cacheKeys.forEach((key) => suspendReact.clear([loader, key]));
|
|
2806
2030
|
};
|
|
2807
2031
|
useLoader.loader = getLoader;
|
|
2808
2032
|
|
|
2809
2033
|
function useFrame(callback, priorityOrOptions) {
|
|
2810
2034
|
const store = React__namespace.useContext(context);
|
|
2811
2035
|
const isInsideCanvas = store !== null;
|
|
2812
|
-
const scheduler = getScheduler();
|
|
2036
|
+
const scheduler$1 = scheduler.getScheduler();
|
|
2813
2037
|
const optionsKey = typeof priorityOrOptions === "number" ? `p:${priorityOrOptions}` : priorityOrOptions ? JSON.stringify({
|
|
2814
2038
|
id: priorityOrOptions.id,
|
|
2815
2039
|
phase: priorityOrOptions.phase,
|
|
@@ -2857,7 +2081,7 @@ function useFrame(callback, priorityOrOptions) {
|
|
|
2857
2081
|
};
|
|
2858
2082
|
callbackRef.current?.(mergedState, delta);
|
|
2859
2083
|
};
|
|
2860
|
-
const unregister = scheduler.register(wrappedCallback, {
|
|
2084
|
+
const unregister = scheduler$1.register(wrappedCallback, {
|
|
2861
2085
|
id,
|
|
2862
2086
|
rootId,
|
|
2863
2087
|
...options
|
|
@@ -2878,37 +2102,31 @@ function useFrame(callback, priorityOrOptions) {
|
|
|
2878
2102
|
}
|
|
2879
2103
|
};
|
|
2880
2104
|
} else {
|
|
2881
|
-
|
|
2882
|
-
|
|
2883
|
-
|
|
2884
|
-
|
|
2885
|
-
|
|
2886
|
-
|
|
2887
|
-
|
|
2888
|
-
|
|
2889
|
-
unregisterJob = registerOutside();
|
|
2890
|
-
});
|
|
2891
|
-
return () => {
|
|
2892
|
-
unsubReady();
|
|
2893
|
-
unregisterJob?.();
|
|
2894
|
-
};
|
|
2105
|
+
return scheduler$1.register(
|
|
2106
|
+
(state, delta) => {
|
|
2107
|
+
const frameState = state;
|
|
2108
|
+
if (!frameState.renderer) return;
|
|
2109
|
+
callbackRef.current?.(frameState, delta);
|
|
2110
|
+
},
|
|
2111
|
+
{ id, ...options }
|
|
2112
|
+
);
|
|
2895
2113
|
}
|
|
2896
|
-
}, [store, scheduler, id, optionsKey, isLegacyPriority, isInsideCanvas]);
|
|
2114
|
+
}, [store, scheduler$1, id, optionsKey, isLegacyPriority, isInsideCanvas]);
|
|
2897
2115
|
const isPaused = React__namespace.useSyncExternalStore(
|
|
2898
2116
|
// Subscribe function
|
|
2899
2117
|
React__namespace.useCallback(
|
|
2900
2118
|
(onStoreChange) => {
|
|
2901
|
-
return getScheduler().subscribeJobState(id, onStoreChange);
|
|
2119
|
+
return scheduler.getScheduler().subscribeJobState(id, onStoreChange);
|
|
2902
2120
|
},
|
|
2903
2121
|
[id]
|
|
2904
2122
|
),
|
|
2905
2123
|
// getSnapshot function
|
|
2906
|
-
React__namespace.useCallback(() => getScheduler().isJobPaused(id), [id]),
|
|
2124
|
+
React__namespace.useCallback(() => scheduler.getScheduler().isJobPaused(id), [id]),
|
|
2907
2125
|
// getServerSnapshot function (SSR)
|
|
2908
2126
|
React__namespace.useCallback(() => false, [])
|
|
2909
2127
|
);
|
|
2910
2128
|
const controls = React__namespace.useMemo(() => {
|
|
2911
|
-
const scheduler2 = getScheduler();
|
|
2129
|
+
const scheduler2 = scheduler.getScheduler();
|
|
2912
2130
|
return {
|
|
2913
2131
|
/** The job's unique ID */
|
|
2914
2132
|
id,
|
|
@@ -2923,7 +2141,7 @@ function useFrame(callback, priorityOrOptions) {
|
|
|
2923
2141
|
* @param timestamp Optional timestamp (defaults to performance.now())
|
|
2924
2142
|
*/
|
|
2925
2143
|
step: (timestamp) => {
|
|
2926
|
-
getScheduler().stepJob(id, timestamp);
|
|
2144
|
+
scheduler.getScheduler().stepJob(id, timestamp);
|
|
2927
2145
|
},
|
|
2928
2146
|
/**
|
|
2929
2147
|
* Manually step ALL jobs in the scheduler.
|
|
@@ -2931,20 +2149,20 @@ function useFrame(callback, priorityOrOptions) {
|
|
|
2931
2149
|
* @param timestamp Optional timestamp (defaults to performance.now())
|
|
2932
2150
|
*/
|
|
2933
2151
|
stepAll: (timestamp) => {
|
|
2934
|
-
getScheduler().step(timestamp);
|
|
2152
|
+
scheduler.getScheduler().step(timestamp);
|
|
2935
2153
|
},
|
|
2936
2154
|
/**
|
|
2937
2155
|
* Pause this job (set enabled=false).
|
|
2938
2156
|
* Job remains registered but won't run.
|
|
2939
2157
|
*/
|
|
2940
2158
|
pause: () => {
|
|
2941
|
-
getScheduler().pauseJob(id);
|
|
2159
|
+
scheduler.getScheduler().pauseJob(id);
|
|
2942
2160
|
},
|
|
2943
2161
|
/**
|
|
2944
2162
|
* Resume this job (set enabled=true).
|
|
2945
2163
|
*/
|
|
2946
2164
|
resume: () => {
|
|
2947
|
-
getScheduler().resumeJob(id);
|
|
2165
|
+
scheduler.getScheduler().resumeJob(id);
|
|
2948
2166
|
},
|
|
2949
2167
|
/**
|
|
2950
2168
|
* Reactive paused state - automatically updates when pause/resume is called.
|
|
@@ -2982,18 +2200,18 @@ function buildFromCache(input, textureCache) {
|
|
|
2982
2200
|
function useTexture(input, optionsOrOnLoad) {
|
|
2983
2201
|
const renderer = useThree((state) => state.internal.actualRenderer);
|
|
2984
2202
|
const store = useStore();
|
|
2985
|
-
const textureCache = useThree((state) => state.textures);
|
|
2986
2203
|
const options = typeof optionsOrOnLoad === "function" ? { onLoad: optionsOrOnLoad } : optionsOrOnLoad ?? {};
|
|
2987
|
-
const { onLoad, cache =
|
|
2204
|
+
const { onLoad, cache = true } = options;
|
|
2988
2205
|
const onLoadRef = React.useRef(onLoad);
|
|
2989
2206
|
onLoadRef.current = onLoad;
|
|
2990
2207
|
const onLoadCalledForRef = React.useRef(null);
|
|
2991
2208
|
const urls = React.useMemo(() => getUrls(input), [input]);
|
|
2992
2209
|
const cachedResult = React.useMemo(() => {
|
|
2993
2210
|
if (!cache) return null;
|
|
2994
|
-
|
|
2995
|
-
|
|
2996
|
-
|
|
2211
|
+
const textures = store.getState().textures;
|
|
2212
|
+
if (!allUrlsCached(urls, textures)) return null;
|
|
2213
|
+
return buildFromCache(input, textures);
|
|
2214
|
+
}, [cache, urls, input, store]);
|
|
2997
2215
|
const loadedTextures = useLoader(
|
|
2998
2216
|
webgpu.TextureLoader,
|
|
2999
2217
|
IsObject(input) ? Object.values(input) : input
|
|
@@ -3037,8 +2255,6 @@ function useTexture(input, optionsOrOnLoad) {
|
|
|
3037
2255
|
}, [input, loadedTextures, cachedResult]);
|
|
3038
2256
|
React.useEffect(() => {
|
|
3039
2257
|
if (!cache) return;
|
|
3040
|
-
if (cachedResult) return;
|
|
3041
|
-
const set = store.setState;
|
|
3042
2258
|
const urlTextureMap = [];
|
|
3043
2259
|
if (typeof input === "string") {
|
|
3044
2260
|
urlTextureMap.push([input, mappedTextures]);
|
|
@@ -3052,18 +2268,32 @@ function useTexture(input, optionsOrOnLoad) {
|
|
|
3052
2268
|
urlTextureMap.push([url, textureRecord[key]]);
|
|
3053
2269
|
}
|
|
3054
2270
|
}
|
|
3055
|
-
|
|
3056
|
-
const
|
|
3057
|
-
let
|
|
2271
|
+
store.setState((state) => {
|
|
2272
|
+
const refs = new Map(state._textureRefs);
|
|
2273
|
+
let textures = state.textures;
|
|
2274
|
+
let added = false;
|
|
3058
2275
|
for (const [url, texture] of urlTextureMap) {
|
|
3059
|
-
if (!
|
|
3060
|
-
|
|
3061
|
-
|
|
2276
|
+
if (!textures.has(url)) {
|
|
2277
|
+
if (!added) {
|
|
2278
|
+
textures = new Map(textures);
|
|
2279
|
+
added = true;
|
|
2280
|
+
}
|
|
2281
|
+
textures.set(url, texture);
|
|
3062
2282
|
}
|
|
2283
|
+
refs.set(url, (refs.get(url) ?? 0) + 1);
|
|
3063
2284
|
}
|
|
3064
|
-
return
|
|
2285
|
+
return added ? { textures, _textureRefs: refs } : { _textureRefs: refs };
|
|
3065
2286
|
});
|
|
3066
|
-
|
|
2287
|
+
return () => store.setState((state) => {
|
|
2288
|
+
const refs = new Map(state._textureRefs);
|
|
2289
|
+
for (const [url] of urlTextureMap) {
|
|
2290
|
+
const next = (refs.get(url) ?? 0) - 1;
|
|
2291
|
+
if (next <= 0) refs.delete(url);
|
|
2292
|
+
else refs.set(url, next);
|
|
2293
|
+
}
|
|
2294
|
+
return { _textureRefs: refs };
|
|
2295
|
+
});
|
|
2296
|
+
}, [cache, input, mappedTextures, store]);
|
|
3067
2297
|
return mappedTextures;
|
|
3068
2298
|
}
|
|
3069
2299
|
useTexture.preload = (url) => useLoader.preload(webgpu.TextureLoader, url);
|
|
@@ -3079,96 +2309,63 @@ const Texture = ({
|
|
|
3079
2309
|
return /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children: children?.(ret) });
|
|
3080
2310
|
};
|
|
3081
2311
|
|
|
3082
|
-
function
|
|
3083
|
-
if (entry instanceof webgpu.Texture) return entry;
|
|
3084
|
-
if (entry && typeof entry === "object" && "value" in entry && entry.value instanceof webgpu.Texture) {
|
|
3085
|
-
return entry.value;
|
|
3086
|
-
}
|
|
3087
|
-
return null;
|
|
3088
|
-
}
|
|
3089
|
-
function useTextures() {
|
|
2312
|
+
function useTextures(selector) {
|
|
3090
2313
|
const store = useStore();
|
|
3091
|
-
|
|
3092
|
-
const set = store.setState;
|
|
2314
|
+
const registry = React.useMemo(() => {
|
|
3093
2315
|
const getState = store.getState;
|
|
3094
|
-
const
|
|
3095
|
-
|
|
3096
|
-
const newMap = new Map(state.textures);
|
|
3097
|
-
newMap.set(key, value);
|
|
3098
|
-
return { textures: newMap };
|
|
3099
|
-
});
|
|
3100
|
-
};
|
|
3101
|
-
const addMultiple = (items) => {
|
|
3102
|
-
set((state) => {
|
|
3103
|
-
const newMap = new Map(state.textures);
|
|
3104
|
-
const entries = items instanceof Map ? items.entries() : Object.entries(items);
|
|
3105
|
-
for (const [key, value] of entries) {
|
|
3106
|
-
newMap.set(key, value);
|
|
3107
|
-
}
|
|
3108
|
-
return { textures: newMap };
|
|
3109
|
-
});
|
|
3110
|
-
};
|
|
3111
|
-
const remove = (key) => {
|
|
3112
|
-
set((state) => {
|
|
3113
|
-
const newMap = new Map(state.textures);
|
|
3114
|
-
newMap.delete(key);
|
|
3115
|
-
return { textures: newMap };
|
|
3116
|
-
});
|
|
3117
|
-
};
|
|
3118
|
-
const removeMultiple = (keys) => {
|
|
3119
|
-
set((state) => {
|
|
3120
|
-
const newMap = new Map(state.textures);
|
|
3121
|
-
for (const key of keys) newMap.delete(key);
|
|
3122
|
-
return { textures: newMap };
|
|
3123
|
-
});
|
|
3124
|
-
};
|
|
3125
|
-
const dispose = (key) => {
|
|
3126
|
-
const entry = getState().textures.get(key);
|
|
3127
|
-
if (entry) {
|
|
3128
|
-
const tex = getTextureValue(entry);
|
|
3129
|
-
tex?.dispose();
|
|
3130
|
-
}
|
|
3131
|
-
remove(key);
|
|
3132
|
-
};
|
|
3133
|
-
const disposeMultiple = (keys) => {
|
|
3134
|
-
const textures = getState().textures;
|
|
3135
|
-
for (const key of keys) {
|
|
3136
|
-
const entry = textures.get(key);
|
|
3137
|
-
if (entry) {
|
|
3138
|
-
const tex = getTextureValue(entry);
|
|
3139
|
-
tex?.dispose();
|
|
3140
|
-
}
|
|
3141
|
-
}
|
|
3142
|
-
removeMultiple(keys);
|
|
3143
|
-
};
|
|
3144
|
-
const disposeAll = () => {
|
|
3145
|
-
const textures = getState().textures;
|
|
3146
|
-
for (const entry of textures.values()) {
|
|
3147
|
-
const tex = getTextureValue(entry);
|
|
3148
|
-
tex?.dispose();
|
|
3149
|
-
}
|
|
3150
|
-
set({ textures: /* @__PURE__ */ new Map() });
|
|
3151
|
-
};
|
|
2316
|
+
const setState = store.setState;
|
|
2317
|
+
const getOne = (key) => getState().textures.get(key);
|
|
3152
2318
|
return {
|
|
3153
|
-
|
|
3154
|
-
get textures() {
|
|
2319
|
+
get all() {
|
|
3155
2320
|
return getState().textures;
|
|
3156
2321
|
},
|
|
3157
|
-
|
|
3158
|
-
|
|
2322
|
+
get(input) {
|
|
2323
|
+
if (typeof input === "string") return getOne(input);
|
|
2324
|
+
if (Array.isArray(input)) return input.map(getOne);
|
|
2325
|
+
const out = {};
|
|
2326
|
+
for (const name in input) out[name] = getOne(input[name]);
|
|
2327
|
+
return out;
|
|
2328
|
+
},
|
|
3159
2329
|
has: (key) => getState().textures.has(key),
|
|
3160
|
-
|
|
3161
|
-
|
|
3162
|
-
|
|
3163
|
-
|
|
3164
|
-
|
|
3165
|
-
|
|
3166
|
-
|
|
3167
|
-
|
|
3168
|
-
|
|
3169
|
-
|
|
2330
|
+
add(keyOrRecord, texture) {
|
|
2331
|
+
setState((state) => {
|
|
2332
|
+
const textures = new Map(state.textures);
|
|
2333
|
+
if (typeof keyOrRecord === "string") {
|
|
2334
|
+
textures.set(keyOrRecord, texture);
|
|
2335
|
+
} else {
|
|
2336
|
+
for (const key in keyOrRecord) textures.set(key, keyOrRecord[key]);
|
|
2337
|
+
}
|
|
2338
|
+
return { textures };
|
|
2339
|
+
});
|
|
2340
|
+
},
|
|
2341
|
+
dispose(key, options) {
|
|
2342
|
+
const state = getState();
|
|
2343
|
+
const refs = state._textureRefs.get(key) ?? 0;
|
|
2344
|
+
if (refs > 0 && !options?.force) {
|
|
2345
|
+
console.warn(
|
|
2346
|
+
`[useTextures] "${key}" still has ${refs} active reference(s); skipping dispose. Pass { force: true } to override.`
|
|
2347
|
+
);
|
|
2348
|
+
return false;
|
|
2349
|
+
}
|
|
2350
|
+
state.textures.get(key)?.dispose();
|
|
2351
|
+
setState((s) => {
|
|
2352
|
+
const textures = new Map(s.textures);
|
|
2353
|
+
textures.delete(key);
|
|
2354
|
+
const nextRefs = new Map(s._textureRefs);
|
|
2355
|
+
nextRefs.delete(key);
|
|
2356
|
+
return { textures, _textureRefs: nextRefs };
|
|
2357
|
+
});
|
|
2358
|
+
return true;
|
|
2359
|
+
},
|
|
2360
|
+
disposeAll() {
|
|
2361
|
+
for (const texture of getState().textures.values()) texture.dispose();
|
|
2362
|
+
setState({ textures: /* @__PURE__ */ new Map(), _textureRefs: /* @__PURE__ */ new Map() });
|
|
2363
|
+
}
|
|
3170
2364
|
};
|
|
3171
2365
|
}, [store]);
|
|
2366
|
+
const subscribe = selector ? () => selector(registry) : (state) => state.textures;
|
|
2367
|
+
const selected = useThree(subscribe);
|
|
2368
|
+
return selector ? selected : registry;
|
|
3172
2369
|
}
|
|
3173
2370
|
|
|
3174
2371
|
function useRenderTarget(widthOrOptions, heightOrOptions, options) {
|
|
@@ -3223,7 +2420,7 @@ function addEffect(callback) {
|
|
|
3223
2420
|
link: "https://docs.pmnd.rs/react-three-fiber/api/hooks#useframe"
|
|
3224
2421
|
});
|
|
3225
2422
|
const id = `legacy_effect_${effectId++}`;
|
|
3226
|
-
return getScheduler().registerGlobal("before", id, callback);
|
|
2423
|
+
return scheduler.getScheduler().registerGlobal("before", id, callback);
|
|
3227
2424
|
}
|
|
3228
2425
|
function addAfterEffect(callback) {
|
|
3229
2426
|
notifyDepreciated({
|
|
@@ -3232,7 +2429,7 @@ function addAfterEffect(callback) {
|
|
|
3232
2429
|
link: "https://docs.pmnd.rs/react-three-fiber/api/hooks#useframe"
|
|
3233
2430
|
});
|
|
3234
2431
|
const id = `legacy_afterEffect_${effectId++}`;
|
|
3235
|
-
return getScheduler().registerGlobal("after", id, callback);
|
|
2432
|
+
return scheduler.getScheduler().registerGlobal("after", id, callback);
|
|
3236
2433
|
}
|
|
3237
2434
|
function addTail(callback) {
|
|
3238
2435
|
notifyDepreciated({
|
|
@@ -3240,16 +2437,16 @@ function addTail(callback) {
|
|
|
3240
2437
|
body: "Use scheduler.onIdle(callback) instead.\naddTail will be removed in a future version.",
|
|
3241
2438
|
link: "https://docs.pmnd.rs/react-three-fiber/api/hooks#useframe"
|
|
3242
2439
|
});
|
|
3243
|
-
return getScheduler().onIdle(callback);
|
|
2440
|
+
return scheduler.getScheduler().onIdle(callback);
|
|
3244
2441
|
}
|
|
3245
2442
|
function invalidate(state, frames = 1, stackFrames = false) {
|
|
3246
|
-
getScheduler().invalidate(frames, stackFrames);
|
|
2443
|
+
scheduler.getScheduler().invalidate(frames, stackFrames);
|
|
3247
2444
|
}
|
|
3248
2445
|
function advance(timestamp) {
|
|
3249
|
-
getScheduler().step(timestamp);
|
|
2446
|
+
scheduler.getScheduler().step(timestamp);
|
|
3250
2447
|
}
|
|
3251
2448
|
|
|
3252
|
-
const version = "10.0.0-alpha.
|
|
2449
|
+
const version = "10.0.0-alpha.3";
|
|
3253
2450
|
const packageData = {
|
|
3254
2451
|
version: version};
|
|
3255
2452
|
|
|
@@ -14505,7 +13702,7 @@ function n0() {
|
|
|
14505
13702
|
var t0 = n0();
|
|
14506
13703
|
const r0 = Xb(t0);
|
|
14507
13704
|
|
|
14508
|
-
const t = 1, o = 8, r = 32, e = 2;
|
|
13705
|
+
const t = 1, o = 8, r = 32, e = 2, i$1 = 268435456;
|
|
14509
13706
|
|
|
14510
13707
|
function createReconciler(config) {
|
|
14511
13708
|
const reconciler2 = r0(config);
|
|
@@ -14670,7 +13867,15 @@ function setFiberRef(fiber, publicInstance) {
|
|
|
14670
13867
|
}
|
|
14671
13868
|
}
|
|
14672
13869
|
const reconstructed = [];
|
|
14673
|
-
function
|
|
13870
|
+
function flushReconstructedInstances() {
|
|
13871
|
+
if (reconstructed.length === 0) return;
|
|
13872
|
+
try {
|
|
13873
|
+
swapReconstructedInstances();
|
|
13874
|
+
} finally {
|
|
13875
|
+
reconstructed.length = 0;
|
|
13876
|
+
}
|
|
13877
|
+
}
|
|
13878
|
+
function swapReconstructedInstances() {
|
|
14674
13879
|
for (const [instance] of reconstructed) {
|
|
14675
13880
|
const parent = instance.parent;
|
|
14676
13881
|
if (parent) {
|
|
@@ -14688,6 +13893,7 @@ function swapInstances() {
|
|
|
14688
13893
|
}
|
|
14689
13894
|
}
|
|
14690
13895
|
if (instance.isHidden) unhideInstance(instance);
|
|
13896
|
+
if (isObject3D(instance.object)) removeInteractivity(findInitialRoot(instance), instance.object);
|
|
14691
13897
|
if (instance.object.__r3f) delete instance.object.__r3f;
|
|
14692
13898
|
if (instance.type !== "primitive") disposeOnIdle(instance.object);
|
|
14693
13899
|
}
|
|
@@ -14700,6 +13906,8 @@ function swapInstances() {
|
|
|
14700
13906
|
instance.object.__r3f = instance;
|
|
14701
13907
|
setFiberRef(fiber, instance.object);
|
|
14702
13908
|
delete instance.appliedOnce;
|
|
13909
|
+
instance.eventCount = 0;
|
|
13910
|
+
instance.handlers = {};
|
|
14703
13911
|
applyProps(instance.object, instance.props);
|
|
14704
13912
|
if (instance.props.attach) {
|
|
14705
13913
|
attach(parent, instance);
|
|
@@ -14716,14 +13924,114 @@ function swapInstances() {
|
|
|
14716
13924
|
invalidateInstance(instance);
|
|
14717
13925
|
}
|
|
14718
13926
|
}
|
|
14719
|
-
reconstructed.length = 0;
|
|
14720
13927
|
}
|
|
14721
13928
|
const handleTextInstance = () => {
|
|
14722
13929
|
};
|
|
14723
13930
|
const NO_CONTEXT = {};
|
|
14724
13931
|
let currentUpdatePriority = NoEventPriority;
|
|
14725
|
-
|
|
14726
|
-
|
|
13932
|
+
function getEventPriority(type) {
|
|
13933
|
+
switch (type) {
|
|
13934
|
+
case "beforetoggle":
|
|
13935
|
+
case "cancel":
|
|
13936
|
+
case "click":
|
|
13937
|
+
case "close":
|
|
13938
|
+
case "contextmenu":
|
|
13939
|
+
case "copy":
|
|
13940
|
+
case "cut":
|
|
13941
|
+
case "auxclick":
|
|
13942
|
+
case "dblclick":
|
|
13943
|
+
case "dragend":
|
|
13944
|
+
case "dragstart":
|
|
13945
|
+
case "drop":
|
|
13946
|
+
case "focusin":
|
|
13947
|
+
case "focusout":
|
|
13948
|
+
case "input":
|
|
13949
|
+
case "invalid":
|
|
13950
|
+
case "keydown":
|
|
13951
|
+
case "keypress":
|
|
13952
|
+
case "keyup":
|
|
13953
|
+
case "mousedown":
|
|
13954
|
+
case "mouseup":
|
|
13955
|
+
case "paste":
|
|
13956
|
+
case "pause":
|
|
13957
|
+
case "play":
|
|
13958
|
+
case "pointercancel":
|
|
13959
|
+
case "pointerdown":
|
|
13960
|
+
case "pointerup":
|
|
13961
|
+
case "ratechange":
|
|
13962
|
+
case "reset":
|
|
13963
|
+
case "resize":
|
|
13964
|
+
case "seeked":
|
|
13965
|
+
case "submit":
|
|
13966
|
+
case "touchcancel":
|
|
13967
|
+
case "touchend":
|
|
13968
|
+
case "touchstart":
|
|
13969
|
+
case "volumechange":
|
|
13970
|
+
case "change":
|
|
13971
|
+
case "selectionchange":
|
|
13972
|
+
case "compositionstart":
|
|
13973
|
+
case "compositionend":
|
|
13974
|
+
case "compositionupdate":
|
|
13975
|
+
case "beforeinput":
|
|
13976
|
+
case "blur":
|
|
13977
|
+
case "fullscreenchange":
|
|
13978
|
+
case "focus":
|
|
13979
|
+
case "hashchange":
|
|
13980
|
+
case "popstate":
|
|
13981
|
+
case "select":
|
|
13982
|
+
case "selectstart":
|
|
13983
|
+
return e;
|
|
13984
|
+
case "drag":
|
|
13985
|
+
case "dragenter":
|
|
13986
|
+
case "dragexit":
|
|
13987
|
+
case "dragleave":
|
|
13988
|
+
case "dragover":
|
|
13989
|
+
case "mousemove":
|
|
13990
|
+
case "mouseout":
|
|
13991
|
+
case "mouseover":
|
|
13992
|
+
case "pointermove":
|
|
13993
|
+
case "pointerout":
|
|
13994
|
+
case "pointerover":
|
|
13995
|
+
case "scroll":
|
|
13996
|
+
case "touchmove":
|
|
13997
|
+
case "wheel":
|
|
13998
|
+
case "mouseenter":
|
|
13999
|
+
case "mouseleave":
|
|
14000
|
+
case "pointerenter":
|
|
14001
|
+
case "pointerleave":
|
|
14002
|
+
return o;
|
|
14003
|
+
case "message": {
|
|
14004
|
+
switch (Tb.unstable_getCurrentPriorityLevel()) {
|
|
14005
|
+
case Tb.unstable_ImmediatePriority:
|
|
14006
|
+
return e;
|
|
14007
|
+
case Tb.unstable_UserBlockingPriority:
|
|
14008
|
+
return o;
|
|
14009
|
+
case Tb.unstable_NormalPriority:
|
|
14010
|
+
case Tb.unstable_LowPriority:
|
|
14011
|
+
return r;
|
|
14012
|
+
case Tb.unstable_IdlePriority:
|
|
14013
|
+
return i$1;
|
|
14014
|
+
default:
|
|
14015
|
+
return r;
|
|
14016
|
+
}
|
|
14017
|
+
}
|
|
14018
|
+
default:
|
|
14019
|
+
return r;
|
|
14020
|
+
}
|
|
14021
|
+
}
|
|
14022
|
+
function scheduleMicrotask(callback) {
|
|
14023
|
+
if (typeof queueMicrotask === "function") {
|
|
14024
|
+
queueMicrotask(callback);
|
|
14025
|
+
} else if (typeof Promise !== "undefined") {
|
|
14026
|
+
Promise.resolve().then(callback).catch((error) => {
|
|
14027
|
+
setTimeout(() => {
|
|
14028
|
+
throw error;
|
|
14029
|
+
});
|
|
14030
|
+
});
|
|
14031
|
+
} else {
|
|
14032
|
+
setTimeout(callback);
|
|
14033
|
+
}
|
|
14034
|
+
}
|
|
14727
14035
|
const reconciler = /* @__PURE__ */ createReconciler({
|
|
14728
14036
|
isPrimaryRenderer: false,
|
|
14729
14037
|
warnsIfNotActing: false,
|
|
@@ -14762,16 +14070,15 @@ const reconciler = /* @__PURE__ */ createReconciler({
|
|
|
14762
14070
|
else if (newProps.args?.length !== oldProps.args?.length) reconstruct = true;
|
|
14763
14071
|
else if (newProps.args?.some((value, index) => value !== oldProps.args?.[index])) reconstruct = true;
|
|
14764
14072
|
if (reconstruct) {
|
|
14765
|
-
reconstructed.push([instance,
|
|
14073
|
+
reconstructed.push([instance, getInstanceProps(newProps), fiber]);
|
|
14766
14074
|
} else {
|
|
14767
14075
|
const changedProps = diffProps(instance, newProps);
|
|
14768
|
-
|
|
14769
|
-
|
|
14770
|
-
|
|
14771
|
-
|
|
14076
|
+
const attach2 = instance.props.attach;
|
|
14077
|
+
instance.props = getInstanceProps(newProps);
|
|
14078
|
+
if (attach2 !== void 0) instance.props.attach = attach2;
|
|
14079
|
+
else delete instance.props.attach;
|
|
14080
|
+
if (Object.keys(changedProps).length) applyProps(instance.object, changedProps);
|
|
14772
14081
|
}
|
|
14773
|
-
const isTailSibling = fiber.sibling === null || (fiber.flags & Update) === NoFlags;
|
|
14774
|
-
if (isTailSibling) swapInstances();
|
|
14775
14082
|
},
|
|
14776
14083
|
finalizeInitialChildren: (instance) => {
|
|
14777
14084
|
for (const prop in instance.props) {
|
|
@@ -14796,8 +14103,9 @@ const reconciler = /* @__PURE__ */ createReconciler({
|
|
|
14796
14103
|
const target = container.getState().internal.container ?? container.getState().scene;
|
|
14797
14104
|
return prepare(target, container, "", {});
|
|
14798
14105
|
},
|
|
14799
|
-
|
|
14800
|
-
|
|
14106
|
+
// Reconstructed instances are swapped once all mutations are committed,
|
|
14107
|
+
// before layout effects run so refs point to the new objects
|
|
14108
|
+
resetAfterCommit: flushReconstructedInstances,
|
|
14801
14109
|
shouldSetTextContent: () => false,
|
|
14802
14110
|
clearContainer: () => false,
|
|
14803
14111
|
hideInstance,
|
|
@@ -14805,6 +14113,9 @@ const reconciler = /* @__PURE__ */ createReconciler({
|
|
|
14805
14113
|
createTextInstance: handleTextInstance,
|
|
14806
14114
|
hideTextInstance: handleTextInstance,
|
|
14807
14115
|
unhideTextInstance: handleTextInstance,
|
|
14116
|
+
// Mirrors react-dom, which flushes discrete work in microtasks
|
|
14117
|
+
supportsMicrotasks: true,
|
|
14118
|
+
scheduleMicrotask,
|
|
14808
14119
|
scheduleTimeout: typeof setTimeout === "function" ? setTimeout : void 0,
|
|
14809
14120
|
cancelTimeout: typeof clearTimeout === "function" ? clearTimeout : void 0,
|
|
14810
14121
|
noTimeout: -1,
|
|
@@ -14845,28 +14156,9 @@ const reconciler = /* @__PURE__ */ createReconciler({
|
|
|
14845
14156
|
},
|
|
14846
14157
|
resolveUpdatePriority() {
|
|
14847
14158
|
if (currentUpdatePriority !== NoEventPriority) return currentUpdatePriority;
|
|
14848
|
-
|
|
14849
|
-
|
|
14850
|
-
|
|
14851
|
-
case "dblclick":
|
|
14852
|
-
case "dragenter":
|
|
14853
|
-
case "dragleave":
|
|
14854
|
-
case "drop":
|
|
14855
|
-
case "pointercancel":
|
|
14856
|
-
case "pointerdown":
|
|
14857
|
-
case "pointerup":
|
|
14858
|
-
return e;
|
|
14859
|
-
case "dragover":
|
|
14860
|
-
case "pointermove":
|
|
14861
|
-
case "pointerout":
|
|
14862
|
-
case "pointerover":
|
|
14863
|
-
case "pointerenter":
|
|
14864
|
-
case "pointerleave":
|
|
14865
|
-
case "wheel":
|
|
14866
|
-
return o;
|
|
14867
|
-
default:
|
|
14868
|
-
return r;
|
|
14869
|
-
}
|
|
14159
|
+
const eventType = typeof window !== "undefined" ? window.event?.type : void 0;
|
|
14160
|
+
if (eventType === void 0) return r;
|
|
14161
|
+
return getEventPriority(eventType);
|
|
14870
14162
|
},
|
|
14871
14163
|
resetFormInstance() {
|
|
14872
14164
|
},
|
|
@@ -14915,11 +14207,15 @@ const reconciler = /* @__PURE__ */ createReconciler({
|
|
|
14915
14207
|
cloneMutableTextInstance(textInstance) {
|
|
14916
14208
|
return textInstance;
|
|
14917
14209
|
},
|
|
14210
|
+
// React 19.2 added these for root-level view transitions. They only run for hosts that opt into
|
|
14211
|
+
// view transitions by returning a container from cloneRootViewTransitionContainer; R3F renders
|
|
14212
|
+
// into a WebGL/WebGPU canvas, where cloning the root has no meaning, so we never opt in and
|
|
14213
|
+
// React never calls them. They stay as no-ops rather than throws: the host config is shared by
|
|
14214
|
+
// every root, and a throw here would turn a React-internal probe into a hard crash for users.
|
|
14215
|
+
// Guarded by a test asserting a full render + unmount never reaches them.
|
|
14918
14216
|
cloneRootViewTransitionContainer(_rootContainer) {
|
|
14919
|
-
throw new Error("Not implemented.");
|
|
14920
14217
|
},
|
|
14921
14218
|
removeRootViewTransitionClone(_rootContainer, _clone) {
|
|
14922
|
-
throw new Error("Not implemented.");
|
|
14923
14219
|
},
|
|
14924
14220
|
// https://github.com/facebook/react/pull/32465
|
|
14925
14221
|
createFragmentInstance: (_fiber) => null,
|
|
@@ -15004,6 +14300,7 @@ function createRoot(canvas) {
|
|
|
15004
14300
|
const lastConfiguredProps = {};
|
|
15005
14301
|
let configured = false;
|
|
15006
14302
|
let pending = null;
|
|
14303
|
+
let rendererSetup = null;
|
|
15007
14304
|
return {
|
|
15008
14305
|
async configure(props = {}) {
|
|
15009
14306
|
let resolve;
|
|
@@ -15019,7 +14316,6 @@ function createRoot(canvas) {
|
|
|
15019
14316
|
events,
|
|
15020
14317
|
onCreated: onCreatedCallback,
|
|
15021
14318
|
shadows = false,
|
|
15022
|
-
textureColorSpace = webgpu.SRGBColorSpace,
|
|
15023
14319
|
orthographic = false,
|
|
15024
14320
|
frameloop = "always",
|
|
15025
14321
|
dpr = [1, 2],
|
|
@@ -15034,7 +14330,8 @@ function createRoot(canvas) {
|
|
|
15034
14330
|
_sizeProps,
|
|
15035
14331
|
forceEven
|
|
15036
14332
|
} = props;
|
|
15037
|
-
const
|
|
14333
|
+
const textureColorSpace = is.obj(glConfig) && !is.fun(glConfig) && !isRenderer(glConfig) && glConfig.textureColorSpace || is.obj(rendererConfig) && !is.fun(rendererConfig) && !isRenderer(rendererConfig) && rendererConfig.textureColorSpace || webgpu.SRGBColorSpace;
|
|
14334
|
+
let state = store.getState();
|
|
15038
14335
|
const defaultGPUProps = {
|
|
15039
14336
|
canvas,
|
|
15040
14337
|
antialias: true
|
|
@@ -15048,46 +14345,64 @@ function createRoot(canvas) {
|
|
|
15048
14345
|
throw new Error("Cannot use both gl and renderer props at the same time");
|
|
15049
14346
|
}
|
|
15050
14347
|
let renderer = state.internal.actualRenderer;
|
|
15051
|
-
if (
|
|
15052
|
-
|
|
15053
|
-
|
|
15054
|
-
|
|
15055
|
-
|
|
15056
|
-
|
|
15057
|
-
|
|
15058
|
-
|
|
15059
|
-
|
|
15060
|
-
|
|
15061
|
-
|
|
15062
|
-
|
|
15063
|
-
|
|
15064
|
-
|
|
15065
|
-
|
|
15066
|
-
|
|
15067
|
-
|
|
15068
|
-
|
|
15069
|
-
|
|
15070
|
-
|
|
15071
|
-
|
|
15072
|
-
|
|
15073
|
-
|
|
15074
|
-
|
|
15075
|
-
|
|
15076
|
-
|
|
15077
|
-
|
|
15078
|
-
|
|
15079
|
-
|
|
15080
|
-
|
|
15081
|
-
|
|
15082
|
-
|
|
15083
|
-
|
|
15084
|
-
|
|
15085
|
-
|
|
15086
|
-
|
|
15087
|
-
|
|
14348
|
+
if (!state.internal.actualRenderer) {
|
|
14349
|
+
if (!rendererSetup) {
|
|
14350
|
+
rendererSetup = (async () => {
|
|
14351
|
+
if (primaryCanvas) {
|
|
14352
|
+
const primary = await waitForPrimary(primaryCanvas);
|
|
14353
|
+
renderer = primary.renderer;
|
|
14354
|
+
state.internal.actualRenderer = renderer;
|
|
14355
|
+
const canvasTarget = new webgpu.CanvasTarget(canvas);
|
|
14356
|
+
primary.store.setState((prev) => ({
|
|
14357
|
+
internal: { ...prev.internal, isMultiCanvas: true }
|
|
14358
|
+
}));
|
|
14359
|
+
state.set((prev) => ({
|
|
14360
|
+
webGPUSupported: primary.store.getState().webGPUSupported,
|
|
14361
|
+
renderer,
|
|
14362
|
+
primaryStore: primary.store,
|
|
14363
|
+
internal: {
|
|
14364
|
+
...prev.internal,
|
|
14365
|
+
canvasTarget,
|
|
14366
|
+
isMultiCanvas: true,
|
|
14367
|
+
isSecondary: true,
|
|
14368
|
+
targetId: primaryCanvas
|
|
14369
|
+
}
|
|
14370
|
+
}));
|
|
14371
|
+
} else {
|
|
14372
|
+
renderer = await resolveRenderer(rendererConfig, defaultGPUProps, webgpu.WebGPURenderer);
|
|
14373
|
+
if (!renderer.hasInitialized?.()) {
|
|
14374
|
+
const size2 = computeInitialSize(canvas, propsSize);
|
|
14375
|
+
if (size2.width > 0 && size2.height > 0) {
|
|
14376
|
+
const pixelRatio = calculateDpr(dpr);
|
|
14377
|
+
canvas.width = size2.width * pixelRatio;
|
|
14378
|
+
canvas.height = size2.height * pixelRatio;
|
|
14379
|
+
}
|
|
14380
|
+
await renderer.init();
|
|
14381
|
+
}
|
|
14382
|
+
const backend = renderer.backend;
|
|
14383
|
+
const isWebGPUBackend = backend && "isWebGPUBackend" in backend;
|
|
14384
|
+
state.internal.actualRenderer = renderer;
|
|
14385
|
+
state.set({ webGPUSupported: isWebGPUBackend, renderer, primaryStore: store });
|
|
14386
|
+
if (canvasId && !state.internal.isSecondary) {
|
|
14387
|
+
const canvasTarget = new webgpu.CanvasTarget(canvas);
|
|
14388
|
+
const unregisterPrimary = registerPrimary(canvasId, renderer, store);
|
|
14389
|
+
state.set((prev) => ({
|
|
14390
|
+
internal: {
|
|
14391
|
+
...prev.internal,
|
|
14392
|
+
canvasTarget,
|
|
14393
|
+
unregisterPrimary
|
|
14394
|
+
}
|
|
14395
|
+
}));
|
|
14396
|
+
}
|
|
15088
14397
|
}
|
|
15089
|
-
}))
|
|
14398
|
+
})().catch((err) => {
|
|
14399
|
+
rendererSetup = null;
|
|
14400
|
+
throw err;
|
|
14401
|
+
});
|
|
15090
14402
|
}
|
|
14403
|
+
await rendererSetup;
|
|
14404
|
+
state = store.getState();
|
|
14405
|
+
renderer = state.internal.actualRenderer;
|
|
15091
14406
|
}
|
|
15092
14407
|
let raycaster = state.raycaster;
|
|
15093
14408
|
if (!raycaster) state.set({ raycaster: raycaster = new webgpu.Raycaster() });
|
|
@@ -15180,7 +14495,7 @@ function createRoot(canvas) {
|
|
|
15180
14495
|
lastConfiguredProps.performance = performance;
|
|
15181
14496
|
}
|
|
15182
14497
|
if (!state.xr) {
|
|
15183
|
-
const handleXRFrame = (timestamp,
|
|
14498
|
+
const handleXRFrame = (timestamp, _frame) => {
|
|
15184
14499
|
const state2 = store.getState();
|
|
15185
14500
|
if (state2.frameloop === "never") return;
|
|
15186
14501
|
advance(timestamp);
|
|
@@ -15216,15 +14531,22 @@ function createRoot(canvas) {
|
|
|
15216
14531
|
const oldType = renderer.shadowMap.type;
|
|
15217
14532
|
renderer.shadowMap.enabled = !!shadows;
|
|
15218
14533
|
if (is.boo(shadows)) {
|
|
15219
|
-
renderer.shadowMap.type = webgpu.
|
|
14534
|
+
renderer.shadowMap.type = webgpu.PCFShadowMap;
|
|
15220
14535
|
} else if (is.str(shadows)) {
|
|
14536
|
+
if (shadows === "soft") {
|
|
14537
|
+
notifyDepreciated({
|
|
14538
|
+
heading: 'shadows="soft" is deprecated',
|
|
14539
|
+
body: "Three has depreciated soft and improved basic PCFShadows, we converted for you.",
|
|
14540
|
+
link: "https://github.com/mrdoob/three.js/wiki/Migration-Guide?utm_source=chatgpt.com#181--182"
|
|
14541
|
+
});
|
|
14542
|
+
}
|
|
15221
14543
|
const types = {
|
|
15222
14544
|
basic: webgpu.BasicShadowMap,
|
|
15223
14545
|
percentage: webgpu.PCFShadowMap,
|
|
15224
|
-
soft: webgpu.
|
|
14546
|
+
soft: webgpu.PCFShadowMap,
|
|
15225
14547
|
variance: webgpu.VSMShadowMap
|
|
15226
14548
|
};
|
|
15227
|
-
renderer.shadowMap.type = types[shadows] ?? webgpu.
|
|
14549
|
+
renderer.shadowMap.type = types[shadows] ?? webgpu.PCFShadowMap;
|
|
15228
14550
|
} else if (is.obj(shadows)) {
|
|
15229
14551
|
Object.assign(renderer.shadowMap, shadows);
|
|
15230
14552
|
}
|
|
@@ -15240,24 +14562,35 @@ function createRoot(canvas) {
|
|
|
15240
14562
|
if (state.textureColorSpace !== textureColorSpace) state.set(() => ({ textureColorSpace }));
|
|
15241
14563
|
lastConfiguredProps.textureColorSpace = textureColorSpace;
|
|
15242
14564
|
}
|
|
14565
|
+
const r3fProps = ["textureColorSpace"];
|
|
14566
|
+
const constructorOnlyProps = ["samples", "antialias", "alpha", "canvas", "powerPreference"];
|
|
14567
|
+
const nonApplyProps = [...r3fProps, ...constructorOnlyProps];
|
|
15243
14568
|
if (glConfig && !is.fun(glConfig) && !isRenderer(glConfig) && !is.equ(glConfig, renderer, shallowLoose)) {
|
|
15244
|
-
|
|
14569
|
+
const glProps = {};
|
|
14570
|
+
for (const key in glConfig) {
|
|
14571
|
+
if (!nonApplyProps.includes(key)) glProps[key] = glConfig[key];
|
|
14572
|
+
}
|
|
14573
|
+
applyProps(renderer, glProps);
|
|
15245
14574
|
}
|
|
15246
14575
|
if (rendererConfig && !is.fun(rendererConfig) && !isRenderer(rendererConfig) && state.renderer) {
|
|
15247
14576
|
const currentRenderer = state.renderer;
|
|
15248
14577
|
if (!is.equ(rendererConfig, currentRenderer, shallowLoose)) {
|
|
15249
|
-
|
|
14578
|
+
const rendererProps = {};
|
|
14579
|
+
for (const key in rendererConfig) {
|
|
14580
|
+
if (!nonApplyProps.includes(key)) rendererProps[key] = rendererConfig[key];
|
|
14581
|
+
}
|
|
14582
|
+
applyProps(currentRenderer, rendererProps);
|
|
15250
14583
|
}
|
|
15251
14584
|
}
|
|
15252
|
-
const scheduler = getScheduler();
|
|
14585
|
+
const scheduler$1 = scheduler.getScheduler();
|
|
15253
14586
|
const rootId = state.internal.rootId;
|
|
15254
14587
|
if (!rootId) {
|
|
15255
|
-
const newRootId = canvasId || scheduler.generateRootId();
|
|
15256
|
-
const unregisterRoot = scheduler.registerRoot(newRootId, {
|
|
14588
|
+
const newRootId = canvasId || scheduler$1.generateRootId();
|
|
14589
|
+
const unregisterRoot = scheduler$1.registerRoot(newRootId, {
|
|
15257
14590
|
getState: () => store.getState(),
|
|
15258
14591
|
onError: (err) => store.getState().setError(err)
|
|
15259
14592
|
});
|
|
15260
|
-
const unregisterCanvasTarget = scheduler.register(
|
|
14593
|
+
const unregisterCanvasTarget = scheduler$1.register(
|
|
15261
14594
|
() => {
|
|
15262
14595
|
const state2 = store.getState();
|
|
15263
14596
|
if (state2.internal.isMultiCanvas && state2.internal.canvasTarget) {
|
|
@@ -15272,7 +14605,19 @@ function createRoot(canvas) {
|
|
|
15272
14605
|
system: true
|
|
15273
14606
|
}
|
|
15274
14607
|
);
|
|
15275
|
-
const
|
|
14608
|
+
const unregisterEventsFlush = scheduler$1.register(
|
|
14609
|
+
() => {
|
|
14610
|
+
const state2 = store.getState();
|
|
14611
|
+
state2.events.flush?.();
|
|
14612
|
+
},
|
|
14613
|
+
{
|
|
14614
|
+
id: `${newRootId}_events`,
|
|
14615
|
+
rootId: newRootId,
|
|
14616
|
+
phase: "input",
|
|
14617
|
+
system: true
|
|
14618
|
+
}
|
|
14619
|
+
);
|
|
14620
|
+
const unregisterFrustum = scheduler$1.register(
|
|
15276
14621
|
() => {
|
|
15277
14622
|
const state2 = store.getState();
|
|
15278
14623
|
if (state2.autoUpdateFrustum && state2.camera) {
|
|
@@ -15282,11 +14627,11 @@ function createRoot(canvas) {
|
|
|
15282
14627
|
{
|
|
15283
14628
|
id: `${newRootId}_frustum`,
|
|
15284
14629
|
rootId: newRootId,
|
|
15285
|
-
|
|
14630
|
+
before: "render",
|
|
15286
14631
|
system: true
|
|
15287
14632
|
}
|
|
15288
14633
|
);
|
|
15289
|
-
const unregisterVisibility = scheduler.register(
|
|
14634
|
+
const unregisterVisibility = scheduler$1.register(
|
|
15290
14635
|
() => {
|
|
15291
14636
|
const state2 = store.getState();
|
|
15292
14637
|
checkVisibility(state2);
|
|
@@ -15294,19 +14639,19 @@ function createRoot(canvas) {
|
|
|
15294
14639
|
{
|
|
15295
14640
|
id: `${newRootId}_visibility`,
|
|
15296
14641
|
rootId: newRootId,
|
|
15297
|
-
|
|
14642
|
+
before: "render",
|
|
15298
14643
|
system: true,
|
|
15299
14644
|
after: `${newRootId}_frustum`
|
|
15300
14645
|
}
|
|
15301
14646
|
);
|
|
15302
|
-
const unregisterRender = scheduler.register(
|
|
14647
|
+
const unregisterRender = scheduler$1.register(
|
|
15303
14648
|
() => {
|
|
15304
14649
|
const state2 = store.getState();
|
|
15305
14650
|
const renderer2 = state2.internal.actualRenderer;
|
|
15306
|
-
const userHandlesRender = scheduler.hasUserJobsInPhase("render", newRootId);
|
|
14651
|
+
const userHandlesRender = scheduler$1.hasUserJobsInPhase("render", newRootId);
|
|
15307
14652
|
if (userHandlesRender || state2.internal.priority) return;
|
|
15308
14653
|
try {
|
|
15309
|
-
if (state2.
|
|
14654
|
+
if (state2.renderPipeline?.render) state2.renderPipeline.render();
|
|
15310
14655
|
else if (renderer2?.render) renderer2.render(state2.scene, state2.camera);
|
|
15311
14656
|
} catch (error) {
|
|
15312
14657
|
state2.setError(error instanceof Error ? error : new Error(String(error)));
|
|
@@ -15331,15 +14676,16 @@ function createRoot(canvas) {
|
|
|
15331
14676
|
unregisterRoot: () => {
|
|
15332
14677
|
unregisterRoot();
|
|
15333
14678
|
unregisterCanvasTarget();
|
|
14679
|
+
unregisterEventsFlush();
|
|
15334
14680
|
unregisterFrustum();
|
|
15335
14681
|
unregisterVisibility();
|
|
15336
14682
|
unregisterRender();
|
|
15337
14683
|
},
|
|
15338
|
-
scheduler
|
|
14684
|
+
scheduler: scheduler$1
|
|
15339
14685
|
}
|
|
15340
14686
|
}));
|
|
15341
14687
|
}
|
|
15342
|
-
scheduler.frameloop = frameloop;
|
|
14688
|
+
scheduler$1.frameloop = frameloop;
|
|
15343
14689
|
onCreated = onCreatedCallback;
|
|
15344
14690
|
configured = true;
|
|
15345
14691
|
resolve();
|
|
@@ -15406,7 +14752,8 @@ function unmountComponentAtNode(canvas, callback) {
|
|
|
15406
14752
|
dispose(state.scene);
|
|
15407
14753
|
_roots.delete(canvas);
|
|
15408
14754
|
if (callback) callback(canvas);
|
|
15409
|
-
} catch {
|
|
14755
|
+
} catch (error) {
|
|
14756
|
+
console.warn("[R3F] Error while unmounting root; teardown may be incomplete:", error);
|
|
15410
14757
|
}
|
|
15411
14758
|
}, 500);
|
|
15412
14759
|
}
|
|
@@ -15469,6 +14816,7 @@ function PortalInner({ state = {}, children, container }) {
|
|
|
15469
14816
|
viewport = rootState.viewport.getCurrentViewport(camera, new webgpu.Vector3(), resolvedSize);
|
|
15470
14817
|
if (camera !== rootState.camera) updateCamera(camera, resolvedSize);
|
|
15471
14818
|
}
|
|
14819
|
+
const set = injectState.set;
|
|
15472
14820
|
return {
|
|
15473
14821
|
// The intersect consists of the previous root state
|
|
15474
14822
|
...rootState,
|
|
@@ -15487,7 +14835,7 @@ function PortalInner({ state = {}, children, container }) {
|
|
|
15487
14835
|
size: resolvedSize,
|
|
15488
14836
|
viewport: { ...rootState.viewport, ...viewport },
|
|
15489
14837
|
// Layers are allowed to override events
|
|
15490
|
-
setEvents: (events2) =>
|
|
14838
|
+
setEvents: (events2) => set((state2) => ({ ...state2, events: { ...state2.events, ...events2 } })),
|
|
15491
14839
|
// Container for child attachment - the portalScene (injected or container itself)
|
|
15492
14840
|
internal: { ...rootState.internal, ...injectState.internal, container: portalScene }
|
|
15493
14841
|
};
|
|
@@ -15496,9 +14844,13 @@ function PortalInner({ state = {}, children, container }) {
|
|
|
15496
14844
|
const store = traditional.createWithEqualityFn((set, get) => ({ ...rest, set, get }));
|
|
15497
14845
|
const onMutate = (prev) => store.setState((state2) => inject.current(prev, state2));
|
|
15498
14846
|
onMutate(previousRoot.getState());
|
|
15499
|
-
previousRoot.subscribe(onMutate);
|
|
15500
14847
|
return store;
|
|
15501
14848
|
}, [previousRoot, container]);
|
|
14849
|
+
useIsomorphicLayoutEffect(() => {
|
|
14850
|
+
const onMutate = (prev) => usePortalStore.setState((state2) => inject.current(prev, state2));
|
|
14851
|
+
const unsubscribe = previousRoot.subscribe(onMutate);
|
|
14852
|
+
return unsubscribe;
|
|
14853
|
+
}, [previousRoot, usePortalStore]);
|
|
15502
14854
|
return (
|
|
15503
14855
|
// @ts-ignore, reconciler types are not maintained
|
|
15504
14856
|
/* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children: reconciler.createPortal(
|
|
@@ -15512,6 +14864,178 @@ function flushSync(fn) {
|
|
|
15512
14864
|
return reconciler.flushSyncFromReconciler(fn);
|
|
15513
14865
|
}
|
|
15514
14866
|
|
|
14867
|
+
function parseBackground(background) {
|
|
14868
|
+
if (!background) return null;
|
|
14869
|
+
if (typeof background === "object" && !background.isColor) {
|
|
14870
|
+
const { backgroundMap, envMap, files, preset, ...rest } = background;
|
|
14871
|
+
return {
|
|
14872
|
+
...rest,
|
|
14873
|
+
preset,
|
|
14874
|
+
files: envMap || files,
|
|
14875
|
+
backgroundFiles: backgroundMap,
|
|
14876
|
+
background: true
|
|
14877
|
+
};
|
|
14878
|
+
}
|
|
14879
|
+
if (typeof background === "number") {
|
|
14880
|
+
return { color: background, background: true };
|
|
14881
|
+
}
|
|
14882
|
+
if (typeof background === "string") {
|
|
14883
|
+
if (background in presetsObj) {
|
|
14884
|
+
return { preset: background, background: true };
|
|
14885
|
+
}
|
|
14886
|
+
if (/^(https?:\/\/|\/|\.\/|\.\.\/)|\.(hdr|exr|jpg|jpeg|png|webp|gif)$/i.test(background)) {
|
|
14887
|
+
return { files: background, background: true };
|
|
14888
|
+
}
|
|
14889
|
+
return { color: background, background: true };
|
|
14890
|
+
}
|
|
14891
|
+
if (background.isColor) {
|
|
14892
|
+
return { color: background, background: true };
|
|
14893
|
+
}
|
|
14894
|
+
return null;
|
|
14895
|
+
}
|
|
14896
|
+
|
|
14897
|
+
function parseRendererConfig(rendererProp) {
|
|
14898
|
+
const isRendererConfig = typeof rendererProp === "object" && rendererProp !== null && !("render" in rendererProp) && ("primaryCanvas" in rendererProp || "scheduler" in rendererProp);
|
|
14899
|
+
if (isRendererConfig) {
|
|
14900
|
+
const { primaryCanvas: pc, scheduler: sc, ...rest } = rendererProp;
|
|
14901
|
+
return {
|
|
14902
|
+
primaryCanvas: pc,
|
|
14903
|
+
scheduler: sc,
|
|
14904
|
+
renderer: Object.keys(rest).length > 0 ? rest : rendererProp
|
|
14905
|
+
};
|
|
14906
|
+
}
|
|
14907
|
+
return { primaryCanvas: void 0, scheduler: void 0, renderer: rendererProp };
|
|
14908
|
+
}
|
|
14909
|
+
|
|
14910
|
+
const RESOURCE_KINDS = ["nodes", "uniforms", "buffers", "gpuStorage"];
|
|
14911
|
+
const ROOT_SCOPE = "";
|
|
14912
|
+
const registries = /* @__PURE__ */ new WeakMap();
|
|
14913
|
+
function getKindRegistry(store, kind) {
|
|
14914
|
+
let registry = registries.get(store);
|
|
14915
|
+
if (!registry) {
|
|
14916
|
+
registry = {
|
|
14917
|
+
nodes: { valid: /* @__PURE__ */ new Set(), staged: /* @__PURE__ */ new Map() },
|
|
14918
|
+
uniforms: { valid: /* @__PURE__ */ new Set(), staged: /* @__PURE__ */ new Map() },
|
|
14919
|
+
buffers: { valid: /* @__PURE__ */ new Set(), staged: /* @__PURE__ */ new Map() },
|
|
14920
|
+
gpuStorage: { valid: /* @__PURE__ */ new Set(), staged: /* @__PURE__ */ new Map() }
|
|
14921
|
+
};
|
|
14922
|
+
registries.set(store, registry);
|
|
14923
|
+
}
|
|
14924
|
+
return registry[kind];
|
|
14925
|
+
}
|
|
14926
|
+
function resolvePrimary$1(store) {
|
|
14927
|
+
return store.getState().primaryStore ?? store;
|
|
14928
|
+
}
|
|
14929
|
+
function isScopeValid(store, kind, scopeKey) {
|
|
14930
|
+
return getKindRegistry(store, kind).valid.has(scopeKey);
|
|
14931
|
+
}
|
|
14932
|
+
function peekStaged(store, kind, scopeKey) {
|
|
14933
|
+
return getKindRegistry(store, kind).staged.get(scopeKey);
|
|
14934
|
+
}
|
|
14935
|
+
function stageEntries(store, kind, scopeKey, entries) {
|
|
14936
|
+
const { staged } = getKindRegistry(store, kind);
|
|
14937
|
+
const current = staged.get(scopeKey);
|
|
14938
|
+
if (current) Object.assign(current, entries);
|
|
14939
|
+
else staged.set(scopeKey, { ...entries });
|
|
14940
|
+
}
|
|
14941
|
+
function readCommittedScope(map, scopeKey, isLeaf) {
|
|
14942
|
+
if (scopeKey === ROOT_SCOPE) {
|
|
14943
|
+
const leaves = {};
|
|
14944
|
+
for (const [key, value] of Object.entries(map)) if (isLeaf(value)) leaves[key] = value;
|
|
14945
|
+
return leaves;
|
|
14946
|
+
}
|
|
14947
|
+
const scopeData = map[scopeKey];
|
|
14948
|
+
if (scopeData && typeof scopeData === "object" && !isLeaf(scopeData)) return scopeData;
|
|
14949
|
+
return {};
|
|
14950
|
+
}
|
|
14951
|
+
function withStagedOverlay(store, kind, committed) {
|
|
14952
|
+
const { staged } = getKindRegistry(store, kind);
|
|
14953
|
+
if (staged.size === 0) return committed;
|
|
14954
|
+
const view = { ...committed };
|
|
14955
|
+
for (const [scopeKey, entries] of staged) {
|
|
14956
|
+
if (scopeKey === ROOT_SCOPE) Object.assign(view, entries);
|
|
14957
|
+
else view[scopeKey] = { ...view[scopeKey], ...entries };
|
|
14958
|
+
}
|
|
14959
|
+
return view;
|
|
14960
|
+
}
|
|
14961
|
+
function flushStagedScope(store, kind, scopeKey, isLeaf) {
|
|
14962
|
+
const registry = getKindRegistry(store, kind);
|
|
14963
|
+
const staged = registry.staged.get(scopeKey);
|
|
14964
|
+
if (!staged) return;
|
|
14965
|
+
registry.staged.delete(scopeKey);
|
|
14966
|
+
const replace = !registry.valid.has(scopeKey);
|
|
14967
|
+
store.setState((state) => {
|
|
14968
|
+
const map = state[kind];
|
|
14969
|
+
if (scopeKey === ROOT_SCOPE) {
|
|
14970
|
+
if (!replace) return { [kind]: { ...map, ...staged } };
|
|
14971
|
+
const next = {};
|
|
14972
|
+
for (const [key, value] of Object.entries(map)) if (!isLeaf(value)) next[key] = value;
|
|
14973
|
+
return { [kind]: { ...next, ...staged } };
|
|
14974
|
+
}
|
|
14975
|
+
const current = replace ? {} : map[scopeKey] ?? {};
|
|
14976
|
+
return { [kind]: { ...map, [scopeKey]: { ...current, ...staged } } };
|
|
14977
|
+
});
|
|
14978
|
+
registry.valid.add(scopeKey);
|
|
14979
|
+
}
|
|
14980
|
+
function invalidateResource(store, kind, scopeKey) {
|
|
14981
|
+
const registry = getKindRegistry(store, kind);
|
|
14982
|
+
if (scopeKey === void 0) {
|
|
14983
|
+
registry.valid.clear();
|
|
14984
|
+
registry.staged.clear();
|
|
14985
|
+
} else {
|
|
14986
|
+
registry.valid.delete(scopeKey);
|
|
14987
|
+
registry.staged.delete(scopeKey);
|
|
14988
|
+
}
|
|
14989
|
+
}
|
|
14990
|
+
function rebuildResource(store, kind, userScope) {
|
|
14991
|
+
const primary = resolvePrimary$1(store);
|
|
14992
|
+
invalidateResource(primary, kind, userScope === "root" ? ROOT_SCOPE : userScope);
|
|
14993
|
+
primary.setState((state) => ({ _hmrVersion: state._hmrVersion + 1 }));
|
|
14994
|
+
}
|
|
14995
|
+
function invalidateAllResources(store) {
|
|
14996
|
+
for (const kind of RESOURCE_KINDS) invalidateResource(store, kind);
|
|
14997
|
+
}
|
|
14998
|
+
function removeResourceEntries(store, kind, names, scope, isLeaf) {
|
|
14999
|
+
const staged = peekStaged(store, kind, scope ?? ROOT_SCOPE);
|
|
15000
|
+
if (staged) for (const name of names) delete staged[name];
|
|
15001
|
+
store.setState((state) => {
|
|
15002
|
+
const map = state[kind];
|
|
15003
|
+
if (scope) {
|
|
15004
|
+
const currentScope = { ...map[scope] };
|
|
15005
|
+
for (const name of names) delete currentScope[name];
|
|
15006
|
+
return { [kind]: { ...map, [scope]: currentScope } };
|
|
15007
|
+
}
|
|
15008
|
+
const next = { ...map };
|
|
15009
|
+
for (const name of names) if (isLeaf(next[name])) delete next[name];
|
|
15010
|
+
return { [kind]: next };
|
|
15011
|
+
});
|
|
15012
|
+
}
|
|
15013
|
+
function clearResourceEntries(store, kind, scope, isLeaf) {
|
|
15014
|
+
const registry = getKindRegistry(store, kind);
|
|
15015
|
+
if (scope && scope !== "root") registry.staged.delete(scope);
|
|
15016
|
+
else if (scope === "root") registry.staged.delete(ROOT_SCOPE);
|
|
15017
|
+
else registry.staged.clear();
|
|
15018
|
+
store.setState((state) => {
|
|
15019
|
+
const map = state[kind];
|
|
15020
|
+
if (scope && scope !== "root") {
|
|
15021
|
+
const { [scope]: _, ...rest } = map;
|
|
15022
|
+
return { [kind]: rest };
|
|
15023
|
+
}
|
|
15024
|
+
if (scope === "root") {
|
|
15025
|
+
const next = {};
|
|
15026
|
+
for (const [key, value] of Object.entries(map)) if (!isLeaf(value)) next[key] = value;
|
|
15027
|
+
return { [kind]: next };
|
|
15028
|
+
}
|
|
15029
|
+
return { [kind]: {} };
|
|
15030
|
+
});
|
|
15031
|
+
}
|
|
15032
|
+
|
|
15033
|
+
function clearHmrCaches(store) {
|
|
15034
|
+
const primary = store.getState().primaryStore ?? store;
|
|
15035
|
+
invalidateAllResources(primary);
|
|
15036
|
+
primary.setState((state) => ({ _hmrVersion: state._hmrVersion + 1 }));
|
|
15037
|
+
}
|
|
15038
|
+
|
|
15515
15039
|
function CanvasImpl({
|
|
15516
15040
|
ref,
|
|
15517
15041
|
children,
|
|
@@ -15532,6 +15056,8 @@ function CanvasImpl({
|
|
|
15532
15056
|
raycaster,
|
|
15533
15057
|
camera,
|
|
15534
15058
|
scene,
|
|
15059
|
+
autoUpdateFrustum,
|
|
15060
|
+
occlusion,
|
|
15535
15061
|
onPointerMissed,
|
|
15536
15062
|
onDragOverMissed,
|
|
15537
15063
|
onDropMissed,
|
|
@@ -15543,39 +15069,10 @@ function CanvasImpl({
|
|
|
15543
15069
|
forceEven,
|
|
15544
15070
|
...props
|
|
15545
15071
|
}) {
|
|
15546
|
-
const { primaryCanvas, scheduler,
|
|
15547
|
-
const renderer = Object.keys(rendererConfig).length > 0 ? rendererConfig : rendererProp;
|
|
15072
|
+
const { primaryCanvas, scheduler, renderer } = parseRendererConfig(rendererProp);
|
|
15548
15073
|
React__namespace.useMemo(() => extend(THREE), []);
|
|
15549
15074
|
const Bridge = useBridge();
|
|
15550
|
-
const backgroundProps = React__namespace.useMemo(() =>
|
|
15551
|
-
if (!background) return null;
|
|
15552
|
-
if (typeof background === "object" && !background.isColor) {
|
|
15553
|
-
const { backgroundMap, envMap, files, preset, ...rest } = background;
|
|
15554
|
-
return {
|
|
15555
|
-
...rest,
|
|
15556
|
-
preset,
|
|
15557
|
-
files: envMap || files,
|
|
15558
|
-
backgroundFiles: backgroundMap,
|
|
15559
|
-
background: true
|
|
15560
|
-
};
|
|
15561
|
-
}
|
|
15562
|
-
if (typeof background === "number") {
|
|
15563
|
-
return { color: background, background: true };
|
|
15564
|
-
}
|
|
15565
|
-
if (typeof background === "string") {
|
|
15566
|
-
if (background in presetsObj) {
|
|
15567
|
-
return { preset: background, background: true };
|
|
15568
|
-
}
|
|
15569
|
-
if (/^(https?:\/\/|\/|\.\/|\.\.\/)|\\.(hdr|exr|jpg|jpeg|png|webp|gif)$/i.test(background)) {
|
|
15570
|
-
return { files: background, background: true };
|
|
15571
|
-
}
|
|
15572
|
-
return { color: background, background: true };
|
|
15573
|
-
}
|
|
15574
|
-
if (background.isColor) {
|
|
15575
|
-
return { color: background, background: true };
|
|
15576
|
-
}
|
|
15577
|
-
return null;
|
|
15578
|
-
}, [background]);
|
|
15075
|
+
const backgroundProps = React__namespace.useMemo(() => parseBackground(background), [background]);
|
|
15579
15076
|
const hasInitialSizeRef = React__namespace.useRef(false);
|
|
15580
15077
|
const measureConfig = React__namespace.useMemo(() => {
|
|
15581
15078
|
if (!hasInitialSizeRef.current) {
|
|
@@ -15617,6 +15114,7 @@ function CanvasImpl({
|
|
|
15617
15114
|
const handleDropMissed = useMutableCallback(onDropMissed);
|
|
15618
15115
|
const [block, setBlock] = React__namespace.useState(false);
|
|
15619
15116
|
const [error, setError] = React__namespace.useState(false);
|
|
15117
|
+
const [fallbackVisible, setFallbackVisible] = React__namespace.useState(false);
|
|
15620
15118
|
if (block) throw block;
|
|
15621
15119
|
if (error) throw error;
|
|
15622
15120
|
const root = React__namespace.useRef(null);
|
|
@@ -15624,6 +15122,7 @@ function CanvasImpl({
|
|
|
15624
15122
|
const unsubscribeErrorRef = React__namespace.useRef(null);
|
|
15625
15123
|
useIsomorphicLayoutEffect(() => {
|
|
15626
15124
|
effectActiveRef.current = true;
|
|
15125
|
+
if (fallbackVisible) return;
|
|
15627
15126
|
const canvas = canvasRef.current;
|
|
15628
15127
|
if (effectiveSize.width > 0 && effectiveSize.height > 0 && canvas) {
|
|
15629
15128
|
if (!root.current) {
|
|
@@ -15644,7 +15143,7 @@ function CanvasImpl({
|
|
|
15644
15143
|
}
|
|
15645
15144
|
async function run() {
|
|
15646
15145
|
if (!effectActiveRef.current || !root.current) return;
|
|
15647
|
-
await root.current.configure({
|
|
15146
|
+
const configured = await root.current.configure({
|
|
15648
15147
|
id,
|
|
15649
15148
|
primaryCanvas,
|
|
15650
15149
|
scheduler,
|
|
@@ -15659,6 +15158,8 @@ function CanvasImpl({
|
|
|
15659
15158
|
performance,
|
|
15660
15159
|
raycaster,
|
|
15661
15160
|
camera,
|
|
15161
|
+
autoUpdateFrustum,
|
|
15162
|
+
occlusion,
|
|
15662
15163
|
size: effectiveSize,
|
|
15663
15164
|
// Store size props for reset functionality
|
|
15664
15165
|
_sizeProps: width !== void 0 || height !== void 0 ? { width, height } : null,
|
|
@@ -15683,8 +15184,20 @@ function CanvasImpl({
|
|
|
15683
15184
|
}
|
|
15684
15185
|
onCreated?.(state);
|
|
15685
15186
|
}
|
|
15686
|
-
})
|
|
15687
|
-
|
|
15187
|
+
}).then(
|
|
15188
|
+
() => true,
|
|
15189
|
+
// Renderer setup failed (e.g. no WebGL/WebGPU support). The `fallback` prop lives
|
|
15190
|
+
// inside <canvas>, which browsers don't display, so surface it as visible DOM
|
|
15191
|
+
// instead; with no fallback, rethrow to an external error boundary. (#3757)
|
|
15192
|
+
(setupError) => {
|
|
15193
|
+
if (effectActiveRef.current) {
|
|
15194
|
+
if (fallback != null) setFallbackVisible(true);
|
|
15195
|
+
else setError(setupError);
|
|
15196
|
+
}
|
|
15197
|
+
return false;
|
|
15198
|
+
}
|
|
15199
|
+
);
|
|
15200
|
+
if (!configured || !effectActiveRef.current || !root.current) return;
|
|
15688
15201
|
root.current.render(
|
|
15689
15202
|
/* @__PURE__ */ jsxRuntime.jsx(Bridge, { children: /* @__PURE__ */ jsxRuntime.jsx(ErrorBoundary, { set: setError, children: /* @__PURE__ */ jsxRuntime.jsxs(React__namespace.Suspense, { fallback: /* @__PURE__ */ jsxRuntime.jsx(Block, { set: setBlock }), children: [
|
|
15690
15203
|
backgroundProps && /* @__PURE__ */ jsxRuntime.jsx(Environment, { ...backgroundProps }),
|
|
@@ -15718,20 +15231,13 @@ function CanvasImpl({
|
|
|
15718
15231
|
const handleHMR = () => {
|
|
15719
15232
|
queueMicrotask(() => {
|
|
15720
15233
|
const rootEntry = _roots.get(canvas);
|
|
15721
|
-
if (rootEntry?.store)
|
|
15722
|
-
rootEntry.store.setState((state) => ({
|
|
15723
|
-
nodes: {},
|
|
15724
|
-
uniforms: {},
|
|
15725
|
-
_hmrVersion: state._hmrVersion + 1
|
|
15726
|
-
}));
|
|
15727
|
-
}
|
|
15234
|
+
if (rootEntry?.store) clearHmrCaches(rootEntry.store);
|
|
15728
15235
|
});
|
|
15729
15236
|
};
|
|
15730
15237
|
if (typeof ({ url: (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index.cjs', document.baseURI).href)) }) !== "undefined" && undefined) {
|
|
15731
15238
|
const hot = undefined;
|
|
15732
15239
|
hot.on("vite:afterUpdate", handleHMR);
|
|
15733
|
-
return () => hot.
|
|
15734
|
-
});
|
|
15240
|
+
return () => hot.off?.("vite:afterUpdate", handleHMR);
|
|
15735
15241
|
}
|
|
15736
15242
|
if (typeof module !== "undefined" && module.hot) {
|
|
15737
15243
|
const hot = module.hot;
|
|
@@ -15754,7 +15260,20 @@ function CanvasImpl({
|
|
|
15754
15260
|
...style
|
|
15755
15261
|
},
|
|
15756
15262
|
...props,
|
|
15757
|
-
children:
|
|
15263
|
+
children: fallbackVisible ? (
|
|
15264
|
+
// Renderer setup failed: render the fallback as visible DOM. Inside <canvas> (below)
|
|
15265
|
+
// it exists in the tree but browsers never paint it, which is the whole bug (#3757).
|
|
15266
|
+
fallback
|
|
15267
|
+
) : /* @__PURE__ */ jsxRuntime.jsx("div", { ref: containerRef, className: "r3f-canvas-container", style: { width: "100%", height: "100%" }, children: /* @__PURE__ */ jsxRuntime.jsx(
|
|
15268
|
+
"canvas",
|
|
15269
|
+
{
|
|
15270
|
+
ref: canvasRef,
|
|
15271
|
+
id,
|
|
15272
|
+
className: "r3f-canvas",
|
|
15273
|
+
style: { display: "block", width: "100%", height: "100%" },
|
|
15274
|
+
children: fallback
|
|
15275
|
+
}
|
|
15276
|
+
) })
|
|
15758
15277
|
}
|
|
15759
15278
|
);
|
|
15760
15279
|
}
|
|
@@ -15827,23 +15346,50 @@ let ScopedStore = _ScopedStore;
|
|
|
15827
15346
|
function createScopedStore(data) {
|
|
15828
15347
|
return new ScopedStore(data);
|
|
15829
15348
|
}
|
|
15830
|
-
function createLazyCreatorState(state) {
|
|
15349
|
+
function createLazyCreatorState(state, store) {
|
|
15831
15350
|
let _uniforms = null;
|
|
15832
15351
|
let _nodes = null;
|
|
15352
|
+
let _buffers = null;
|
|
15353
|
+
let _gpuStorage = null;
|
|
15354
|
+
const view = (kind) => store ? withStagedOverlay(store, kind, state[kind]) : state[kind];
|
|
15833
15355
|
return Object.create(state, {
|
|
15834
15356
|
uniforms: {
|
|
15835
15357
|
get() {
|
|
15836
|
-
return _uniforms ?? (_uniforms = createScopedStore(
|
|
15358
|
+
return _uniforms ?? (_uniforms = createScopedStore(view("uniforms")));
|
|
15837
15359
|
}
|
|
15838
15360
|
},
|
|
15839
15361
|
nodes: {
|
|
15840
15362
|
get() {
|
|
15841
|
-
return _nodes ?? (_nodes = createScopedStore(
|
|
15363
|
+
return _nodes ?? (_nodes = createScopedStore(view("nodes")));
|
|
15364
|
+
}
|
|
15365
|
+
},
|
|
15366
|
+
buffers: {
|
|
15367
|
+
get() {
|
|
15368
|
+
return _buffers ?? (_buffers = createScopedStore(view("buffers")));
|
|
15369
|
+
}
|
|
15370
|
+
},
|
|
15371
|
+
gpuStorage: {
|
|
15372
|
+
get() {
|
|
15373
|
+
return _gpuStorage ?? (_gpuStorage = createScopedStore(view("gpuStorage")));
|
|
15842
15374
|
}
|
|
15843
15375
|
}
|
|
15844
15376
|
});
|
|
15845
15377
|
}
|
|
15846
15378
|
|
|
15379
|
+
function resolvePrimary(local) {
|
|
15380
|
+
return local.getState().primaryStore ?? local;
|
|
15381
|
+
}
|
|
15382
|
+
function usePrimaryStore() {
|
|
15383
|
+
const local = useStore();
|
|
15384
|
+
const primary = local.getState().primaryStore;
|
|
15385
|
+
return React.useMemo(() => primary ?? local, [primary, local]);
|
|
15386
|
+
}
|
|
15387
|
+
function usePrimaryThree(selector = (state) => state, equalityFn) {
|
|
15388
|
+
const local = useStore();
|
|
15389
|
+
const primary = resolvePrimary(local);
|
|
15390
|
+
return primary(selector, equalityFn);
|
|
15391
|
+
}
|
|
15392
|
+
|
|
15847
15393
|
function addTexture(set, key, value) {
|
|
15848
15394
|
set((state) => {
|
|
15849
15395
|
const newMap = new Map(state.textures);
|
|
@@ -15922,6 +15468,10 @@ function vectorize(inObject) {
|
|
|
15922
15468
|
if (obj.isVector2 || obj.isVector3 || obj.isVector4) return inObject;
|
|
15923
15469
|
if (obj.isMatrix3 || obj.isMatrix4) return inObject;
|
|
15924
15470
|
if (obj.isColor || obj.isEuler || obj.isQuaternion || obj.isSpherical) return inObject;
|
|
15471
|
+
if ("r" in obj && "g" in obj && "b" in obj && typeof obj.r === "number" && typeof obj.g === "number" && typeof obj.b === "number") {
|
|
15472
|
+
const scale = obj.r > 1 || obj.g > 1 || obj.b > 1 ? 1 / 255 : 1;
|
|
15473
|
+
return new webgpu.Color(obj.r * scale, obj.g * scale, obj.b * scale);
|
|
15474
|
+
}
|
|
15925
15475
|
if ("x" in obj && "y" in obj && typeof obj.x === "number" && typeof obj.y === "number") {
|
|
15926
15476
|
if ("w" in obj && typeof obj.w === "number" && "z" in obj && typeof obj.z === "number") {
|
|
15927
15477
|
return new webgpu.Vector4(obj.x, obj.y, obj.z, obj.w);
|
|
@@ -15943,65 +15493,56 @@ function useCompareMemoize(value, deep) {
|
|
|
15943
15493
|
return ref.current;
|
|
15944
15494
|
}
|
|
15945
15495
|
|
|
15496
|
+
function useScopedResource(options) {
|
|
15497
|
+
const { store, kind, scope, isLeaf, create, prepare, reconcile, input } = options;
|
|
15498
|
+
const scopeKey = scope ?? ROOT_SCOPE;
|
|
15499
|
+
const version = store((s) => s._hmrVersion);
|
|
15500
|
+
const entries = React.useMemo(() => {
|
|
15501
|
+
const staged = peekStaged(store, kind, scopeKey);
|
|
15502
|
+
const reusable = isScopeValid(store, kind, scopeKey);
|
|
15503
|
+
const map = store.getState()[kind];
|
|
15504
|
+
const committed = reusable ? readCommittedScope(map, scopeKey, isLeaf) : void 0;
|
|
15505
|
+
const result = {};
|
|
15506
|
+
let fresh = null;
|
|
15507
|
+
for (const [name, candidate] of Object.entries(create())) {
|
|
15508
|
+
const existing = staged?.[name] ?? committed?.[name];
|
|
15509
|
+
if (existing !== void 0) {
|
|
15510
|
+
result[name] = existing;
|
|
15511
|
+
reconcile?.(existing, candidate);
|
|
15512
|
+
} else {
|
|
15513
|
+
const value = prepare ? prepare(name, candidate) : candidate;
|
|
15514
|
+
result[name] = value;
|
|
15515
|
+
(fresh ?? (fresh = {}))[name] = value;
|
|
15516
|
+
}
|
|
15517
|
+
}
|
|
15518
|
+
if (fresh) stageEntries(store, kind, scopeKey, fresh);
|
|
15519
|
+
return result;
|
|
15520
|
+
}, [store, kind, scopeKey, version, input]);
|
|
15521
|
+
useIsomorphicLayoutEffect(() => {
|
|
15522
|
+
flushStagedScope(store, kind, scopeKey, isLeaf);
|
|
15523
|
+
});
|
|
15524
|
+
return entries;
|
|
15525
|
+
}
|
|
15526
|
+
|
|
15946
15527
|
const isUniformNode$1 = (value) => value !== null && typeof value === "object" && "value" in value && "uuid" in value;
|
|
15947
15528
|
function useUniforms(creatorOrScope, scope) {
|
|
15948
|
-
const store =
|
|
15529
|
+
const store = usePrimaryStore();
|
|
15949
15530
|
const removeUniforms2 = React.useCallback(
|
|
15950
|
-
(names, targetScope) =>
|
|
15951
|
-
const nameArray = Array.isArray(names) ? names : [names];
|
|
15952
|
-
store.setState((state) => {
|
|
15953
|
-
if (targetScope) {
|
|
15954
|
-
const currentScope = { ...state.uniforms[targetScope] };
|
|
15955
|
-
for (const name of nameArray) delete currentScope[name];
|
|
15956
|
-
return { uniforms: { ...state.uniforms, [targetScope]: currentScope } };
|
|
15957
|
-
}
|
|
15958
|
-
const uniforms2 = { ...state.uniforms };
|
|
15959
|
-
for (const name of nameArray) if (isUniformNode$1(uniforms2[name])) delete uniforms2[name];
|
|
15960
|
-
return { uniforms: uniforms2 };
|
|
15961
|
-
});
|
|
15962
|
-
},
|
|
15531
|
+
(names, targetScope) => removeResourceEntries(store, "uniforms", Array.isArray(names) ? names : [names], targetScope, isUniformNode$1),
|
|
15963
15532
|
[store]
|
|
15964
15533
|
);
|
|
15965
15534
|
const clearUniforms = React.useCallback(
|
|
15966
|
-
(targetScope) =>
|
|
15967
|
-
store.setState((state) => {
|
|
15968
|
-
if (targetScope && targetScope !== "root") {
|
|
15969
|
-
const { [targetScope]: _, ...rest } = state.uniforms;
|
|
15970
|
-
return { uniforms: rest };
|
|
15971
|
-
}
|
|
15972
|
-
if (targetScope === "root") {
|
|
15973
|
-
const uniforms2 = {};
|
|
15974
|
-
for (const [key, value] of Object.entries(state.uniforms)) {
|
|
15975
|
-
if (!isUniformNode$1(value)) uniforms2[key] = value;
|
|
15976
|
-
}
|
|
15977
|
-
return { uniforms: uniforms2 };
|
|
15978
|
-
}
|
|
15979
|
-
return { uniforms: {} };
|
|
15980
|
-
});
|
|
15981
|
-
},
|
|
15535
|
+
(targetScope) => clearResourceEntries(store, "uniforms", targetScope, isUniformNode$1),
|
|
15982
15536
|
[store]
|
|
15983
15537
|
);
|
|
15984
15538
|
const rebuildUniforms = React.useCallback(
|
|
15985
|
-
(targetScope) =>
|
|
15986
|
-
store.setState((state) => {
|
|
15987
|
-
let newUniforms = {};
|
|
15988
|
-
if (targetScope && targetScope !== "root") {
|
|
15989
|
-
const { [targetScope]: _, ...rest } = state.uniforms;
|
|
15990
|
-
newUniforms = rest;
|
|
15991
|
-
} else if (targetScope === "root") {
|
|
15992
|
-
for (const [key, value] of Object.entries(state.uniforms)) {
|
|
15993
|
-
if (!isUniformNode$1(value)) newUniforms[key] = value;
|
|
15994
|
-
}
|
|
15995
|
-
}
|
|
15996
|
-
return { uniforms: newUniforms, _hmrVersion: state._hmrVersion + 1 };
|
|
15997
|
-
});
|
|
15998
|
-
},
|
|
15539
|
+
(targetScope) => rebuildResource(store, "uniforms", targetScope),
|
|
15999
15540
|
[store]
|
|
16000
15541
|
);
|
|
16001
15542
|
const inputForMemoization = React.useMemo(() => {
|
|
16002
15543
|
let raw = creatorOrScope;
|
|
16003
15544
|
if (is.fun(creatorOrScope)) {
|
|
16004
|
-
const wrappedState = createLazyCreatorState(store.getState());
|
|
15545
|
+
const wrappedState = createLazyCreatorState(store.getState(), store);
|
|
16005
15546
|
raw = creatorOrScope(wrappedState);
|
|
16006
15547
|
}
|
|
16007
15548
|
if (raw && typeof raw === "object" && !Array.isArray(raw)) {
|
|
@@ -16015,80 +15556,44 @@ function useUniforms(creatorOrScope, scope) {
|
|
|
16015
15556
|
}, [creatorOrScope, store]);
|
|
16016
15557
|
const memoizedInput = useCompareMemoize(inputForMemoization);
|
|
16017
15558
|
const isReader = memoizedInput === void 0 || typeof memoizedInput === "string";
|
|
16018
|
-
const storeUniforms =
|
|
16019
|
-
const
|
|
16020
|
-
|
|
16021
|
-
|
|
16022
|
-
|
|
16023
|
-
|
|
16024
|
-
|
|
16025
|
-
|
|
16026
|
-
|
|
16027
|
-
|
|
16028
|
-
|
|
16029
|
-
|
|
16030
|
-
|
|
16031
|
-
|
|
16032
|
-
|
|
16033
|
-
|
|
16034
|
-
|
|
16035
|
-
|
|
16036
|
-
|
|
16037
|
-
|
|
16038
|
-
|
|
16039
|
-
|
|
16040
|
-
if (scope) {
|
|
16041
|
-
if (!state.uniforms[scope]) state.uniforms[scope] = {};
|
|
16042
|
-
targetRecord = state.uniforms[scope];
|
|
16043
|
-
}
|
|
16044
|
-
for (const [name, node] of Object.entries(created)) {
|
|
16045
|
-
if (targetRecord[name]) {
|
|
16046
|
-
result[name] = targetRecord[name];
|
|
16047
|
-
const existingVal = result[name].value;
|
|
16048
|
-
const newVal = vectorize(node);
|
|
16049
|
-
let equals = newVal === existingVal;
|
|
16050
|
-
if (!equals && hasEqualsMethod(existingVal) && hasEqualsMethod(newVal)) {
|
|
16051
|
-
if (isThreeVector(existingVal) && isThreeVector(newVal)) {
|
|
16052
|
-
equals = vectorEquals(existingVal, newVal);
|
|
16053
|
-
} else if (isSameThreeType(existingVal, newVal)) {
|
|
16054
|
-
equals = existingVal.equals(newVal);
|
|
16055
|
-
}
|
|
15559
|
+
const storeUniforms = usePrimaryThree((s) => s.uniforms);
|
|
15560
|
+
const created = useScopedResource({
|
|
15561
|
+
store,
|
|
15562
|
+
kind: "uniforms",
|
|
15563
|
+
scope: isReader ? void 0 : scope,
|
|
15564
|
+
isLeaf: isUniformNode$1,
|
|
15565
|
+
input: memoizedInput,
|
|
15566
|
+
create: () => {
|
|
15567
|
+
if (isReader) return {};
|
|
15568
|
+
if (typeof memoizedInput !== "object" || memoizedInput === null) throw new Error("Invalid uniform input");
|
|
15569
|
+
return memoizedInput;
|
|
15570
|
+
},
|
|
15571
|
+
prepare: (name, candidate) => createUniform(name, candidate, scope),
|
|
15572
|
+
reconcile: (existing, candidate) => {
|
|
15573
|
+
const existingVal = existing.value;
|
|
15574
|
+
const newVal = vectorize(candidate);
|
|
15575
|
+
let equals = newVal === existingVal;
|
|
15576
|
+
if (!equals && hasEqualsMethod(existingVal) && hasEqualsMethod(newVal)) {
|
|
15577
|
+
if (isThreeVector(existingVal) && isThreeVector(newVal)) {
|
|
15578
|
+
equals = vectorEquals(existingVal, newVal);
|
|
15579
|
+
} else if (isSameThreeType(existingVal, newVal)) {
|
|
15580
|
+
equals = existingVal.equals(newVal);
|
|
16056
15581
|
}
|
|
16057
|
-
if (!equals) result[name].value = newVal;
|
|
16058
|
-
} else {
|
|
16059
|
-
result[name] = createUniform(name, node, scope);
|
|
16060
|
-
hasNewUniforms = true;
|
|
16061
15582
|
}
|
|
15583
|
+
if (!equals) existing.value = newVal;
|
|
16062
15584
|
}
|
|
16063
|
-
|
|
16064
|
-
|
|
16065
|
-
|
|
16066
|
-
|
|
16067
|
-
|
|
16068
|
-
|
|
16069
|
-
|
|
16070
|
-
|
|
16071
|
-
} else {
|
|
16072
|
-
set((s) => ({ uniforms: { ...s.uniforms, ...result } }));
|
|
16073
|
-
}
|
|
16074
|
-
}
|
|
16075
|
-
return result;
|
|
16076
|
-
}, [store, memoizedInput, scope, readerDep, creatorDep]);
|
|
15585
|
+
});
|
|
15586
|
+
let uniforms = created;
|
|
15587
|
+
if (memoizedInput === void 0) {
|
|
15588
|
+
uniforms = storeUniforms;
|
|
15589
|
+
} else if (typeof memoizedInput === "string") {
|
|
15590
|
+
const scopeData = storeUniforms[memoizedInput];
|
|
15591
|
+
uniforms = scopeData && !isUniformNode$1(scopeData) ? scopeData : {};
|
|
15592
|
+
}
|
|
16077
15593
|
return { ...uniforms, removeUniforms: removeUniforms2, clearUniforms, rebuildUniforms };
|
|
16078
15594
|
}
|
|
16079
15595
|
function rebuildAllUniforms(store, scope) {
|
|
16080
|
-
store
|
|
16081
|
-
let newUniforms = {};
|
|
16082
|
-
if (scope && scope !== "root") {
|
|
16083
|
-
const { [scope]: _, ...rest } = state.uniforms;
|
|
16084
|
-
newUniforms = rest;
|
|
16085
|
-
} else if (scope === "root") {
|
|
16086
|
-
for (const [key, value] of Object.entries(state.uniforms)) {
|
|
16087
|
-
if (!isUniformNode$1(value)) newUniforms[key] = value;
|
|
16088
|
-
}
|
|
16089
|
-
}
|
|
16090
|
-
return { uniforms: newUniforms, _hmrVersion: state._hmrVersion + 1 };
|
|
16091
|
-
});
|
|
15596
|
+
rebuildResource(store, "uniforms", scope);
|
|
16092
15597
|
}
|
|
16093
15598
|
function removeUniforms(set, names, scope) {
|
|
16094
15599
|
set((state) => {
|
|
@@ -16152,191 +15657,91 @@ function isSameThreeType(a, b) {
|
|
|
16152
15657
|
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;
|
|
16153
15658
|
}
|
|
16154
15659
|
|
|
15660
|
+
const uniformOf = tsl.uniform;
|
|
16155
15661
|
const isUniformNode = (value) => value !== null && typeof value === "object" && "value" in value && "uuid" in value;
|
|
16156
15662
|
const isTSLNode$1 = (value) => value !== null && typeof value === "object" && "uuid" in value && "nodeType" in value;
|
|
16157
15663
|
function useUniform(name, value) {
|
|
16158
15664
|
const store = useStore();
|
|
16159
|
-
const
|
|
16160
|
-
|
|
16161
|
-
|
|
16162
|
-
|
|
16163
|
-
|
|
16164
|
-
|
|
15665
|
+
const registered = useScopedResource({
|
|
15666
|
+
store,
|
|
15667
|
+
kind: "uniforms",
|
|
15668
|
+
scope: void 0,
|
|
15669
|
+
isLeaf: isUniformNode,
|
|
15670
|
+
input: name,
|
|
15671
|
+
create: () => value === void 0 ? {} : { [name]: value },
|
|
15672
|
+
prepare: createNamedUniform,
|
|
15673
|
+
reconcile: (existing2) => {
|
|
16165
15674
|
if (value !== void 0 && !isTSLNode$1(value) && !isUniformNode(value)) {
|
|
16166
|
-
|
|
15675
|
+
existing2.value = typeof value === "string" ? new webgpu.Color(value) : value;
|
|
16167
15676
|
}
|
|
16168
|
-
return existing;
|
|
16169
|
-
}
|
|
16170
|
-
if (value === void 0) {
|
|
16171
|
-
throw new Error(
|
|
16172
|
-
`[useUniform] Uniform "${name}" not found. Create it first with: useUniform('${name}', initialValue)`
|
|
16173
|
-
);
|
|
16174
|
-
}
|
|
16175
|
-
if (isUniformNode(value)) {
|
|
16176
|
-
const node2 = value;
|
|
16177
|
-
if (typeof node2.setName === "function") {
|
|
16178
|
-
node2.setName(name);
|
|
16179
|
-
}
|
|
16180
|
-
set((s) => ({
|
|
16181
|
-
uniforms: { ...s.uniforms, [name]: node2 }
|
|
16182
|
-
}));
|
|
16183
|
-
return node2;
|
|
16184
15677
|
}
|
|
16185
|
-
|
|
16186
|
-
|
|
16187
|
-
|
|
16188
|
-
|
|
16189
|
-
|
|
16190
|
-
}
|
|
16191
|
-
|
|
16192
|
-
|
|
16193
|
-
|
|
16194
|
-
|
|
16195
|
-
|
|
16196
|
-
|
|
16197
|
-
|
|
16198
|
-
|
|
16199
|
-
|
|
16200
|
-
|
|
16201
|
-
|
|
16202
|
-
|
|
16203
|
-
}
|
|
15678
|
+
});
|
|
15679
|
+
if (registered[name]) return registered[name];
|
|
15680
|
+
const existing = peekStaged(store, "uniforms", ROOT_SCOPE)?.[name] ?? store.getState().uniforms[name];
|
|
15681
|
+
if (existing && isUniformNode(existing)) return existing;
|
|
15682
|
+
throw new Error(
|
|
15683
|
+
`[useUniform] Uniform "${name}" not found. Create it first with: useUniform('${name}', initialValue)`
|
|
15684
|
+
);
|
|
15685
|
+
}
|
|
15686
|
+
function createNamedUniform(name, value) {
|
|
15687
|
+
let node;
|
|
15688
|
+
if (isUniformNode(value)) {
|
|
15689
|
+
node = value;
|
|
15690
|
+
} else if (isTSLNode$1(value)) {
|
|
15691
|
+
node = uniformOf(value);
|
|
15692
|
+
} else if (typeof value === "string") {
|
|
15693
|
+
node = tsl.uniform(new webgpu.Color(value));
|
|
15694
|
+
} else {
|
|
15695
|
+
node = uniformOf(value);
|
|
15696
|
+
}
|
|
15697
|
+
if (typeof node.setName === "function") {
|
|
15698
|
+
node.setName(name);
|
|
15699
|
+
}
|
|
15700
|
+
return node;
|
|
16204
15701
|
}
|
|
16205
15702
|
|
|
16206
15703
|
const isTSLNode = (value) => value !== null && typeof value === "object" && ("uuid" in value || "nodeType" in value);
|
|
16207
15704
|
function useNodes(creatorOrScope, scope) {
|
|
16208
|
-
const store =
|
|
15705
|
+
const store = usePrimaryStore();
|
|
16209
15706
|
const removeNodes2 = React.useCallback(
|
|
16210
|
-
(names, targetScope) =>
|
|
16211
|
-
const nameArray = Array.isArray(names) ? names : [names];
|
|
16212
|
-
store.setState((state) => {
|
|
16213
|
-
if (targetScope) {
|
|
16214
|
-
const currentScope = { ...state.nodes[targetScope] };
|
|
16215
|
-
for (const name of nameArray) delete currentScope[name];
|
|
16216
|
-
return { nodes: { ...state.nodes, [targetScope]: currentScope } };
|
|
16217
|
-
}
|
|
16218
|
-
const nodes2 = { ...state.nodes };
|
|
16219
|
-
for (const name of nameArray) if (isTSLNode(nodes2[name])) delete nodes2[name];
|
|
16220
|
-
return { nodes: nodes2 };
|
|
16221
|
-
});
|
|
16222
|
-
},
|
|
15707
|
+
(names, targetScope) => removeResourceEntries(store, "nodes", Array.isArray(names) ? names : [names], targetScope, isTSLNode),
|
|
16223
15708
|
[store]
|
|
16224
15709
|
);
|
|
16225
15710
|
const clearNodes = React.useCallback(
|
|
16226
|
-
(targetScope) =>
|
|
16227
|
-
store.setState((state) => {
|
|
16228
|
-
if (targetScope && targetScope !== "root") {
|
|
16229
|
-
const { [targetScope]: _, ...rest } = state.nodes;
|
|
16230
|
-
return { nodes: rest };
|
|
16231
|
-
}
|
|
16232
|
-
if (targetScope === "root") {
|
|
16233
|
-
const nodes2 = {};
|
|
16234
|
-
for (const [key, value] of Object.entries(state.nodes)) {
|
|
16235
|
-
if (!isTSLNode(value)) nodes2[key] = value;
|
|
16236
|
-
}
|
|
16237
|
-
return { nodes: nodes2 };
|
|
16238
|
-
}
|
|
16239
|
-
return { nodes: {} };
|
|
16240
|
-
});
|
|
16241
|
-
},
|
|
15711
|
+
(targetScope) => clearResourceEntries(store, "nodes", targetScope, isTSLNode),
|
|
16242
15712
|
[store]
|
|
16243
15713
|
);
|
|
16244
15714
|
const rebuildNodes = React.useCallback(
|
|
16245
|
-
(targetScope) =>
|
|
16246
|
-
store.setState((state) => {
|
|
16247
|
-
let newNodes = state.nodes;
|
|
16248
|
-
if (targetScope && targetScope !== "root") {
|
|
16249
|
-
const { [targetScope]: _, ...rest } = state.nodes;
|
|
16250
|
-
newNodes = rest;
|
|
16251
|
-
} else if (targetScope === "root") {
|
|
16252
|
-
newNodes = {};
|
|
16253
|
-
for (const [key, value] of Object.entries(state.nodes)) {
|
|
16254
|
-
if (!isTSLNode(value)) newNodes[key] = value;
|
|
16255
|
-
}
|
|
16256
|
-
} else {
|
|
16257
|
-
newNodes = {};
|
|
16258
|
-
}
|
|
16259
|
-
return { nodes: newNodes, _hmrVersion: state._hmrVersion + 1 };
|
|
16260
|
-
});
|
|
16261
|
-
},
|
|
15715
|
+
(targetScope) => rebuildResource(store, "nodes", targetScope),
|
|
16262
15716
|
[store]
|
|
16263
15717
|
);
|
|
16264
15718
|
const isReader = creatorOrScope === void 0 || typeof creatorOrScope === "string";
|
|
16265
|
-
const storeNodes =
|
|
16266
|
-
const
|
|
16267
|
-
|
|
16268
|
-
|
|
16269
|
-
|
|
16270
|
-
|
|
16271
|
-
|
|
16272
|
-
return
|
|
16273
|
-
|
|
16274
|
-
|
|
16275
|
-
|
|
16276
|
-
|
|
16277
|
-
return
|
|
16278
|
-
}
|
|
16279
|
-
const state = store.getState();
|
|
16280
|
-
const set = store.setState;
|
|
16281
|
-
const creator = creatorOrScope;
|
|
16282
|
-
const wrappedState = createLazyCreatorState(state);
|
|
16283
|
-
const created = creator(wrappedState);
|
|
16284
|
-
const result = {};
|
|
16285
|
-
let hasNewNodes = false;
|
|
16286
|
-
if (scope) {
|
|
16287
|
-
const currentScope = state.nodes[scope] ?? {};
|
|
16288
|
-
for (const [name, node] of Object.entries(created)) {
|
|
16289
|
-
if (currentScope[name]) {
|
|
16290
|
-
result[name] = currentScope[name];
|
|
16291
|
-
} else {
|
|
16292
|
-
node.setName?.(`${scope}.${name}`);
|
|
16293
|
-
result[name] = node;
|
|
16294
|
-
hasNewNodes = true;
|
|
16295
|
-
}
|
|
16296
|
-
}
|
|
16297
|
-
if (hasNewNodes) {
|
|
16298
|
-
set((s) => ({
|
|
16299
|
-
nodes: {
|
|
16300
|
-
...s.nodes,
|
|
16301
|
-
[scope]: { ...s.nodes[scope], ...result }
|
|
16302
|
-
}
|
|
16303
|
-
}));
|
|
16304
|
-
}
|
|
16305
|
-
return result;
|
|
16306
|
-
}
|
|
16307
|
-
for (const [name, node] of Object.entries(created)) {
|
|
16308
|
-
const existing = state.nodes[name];
|
|
16309
|
-
if (existing && isTSLNode(existing)) {
|
|
16310
|
-
result[name] = existing;
|
|
16311
|
-
} else {
|
|
16312
|
-
node.setName?.(name);
|
|
16313
|
-
result[name] = node;
|
|
16314
|
-
hasNewNodes = true;
|
|
16315
|
-
}
|
|
16316
|
-
}
|
|
16317
|
-
if (hasNewNodes) {
|
|
16318
|
-
set((s) => ({ nodes: { ...s.nodes, ...result } }));
|
|
15719
|
+
const storeNodes = usePrimaryThree((s) => s.nodes);
|
|
15720
|
+
const created = useScopedResource({
|
|
15721
|
+
store,
|
|
15722
|
+
kind: "nodes",
|
|
15723
|
+
scope: isReader ? void 0 : scope,
|
|
15724
|
+
isLeaf: isTSLNode,
|
|
15725
|
+
create: () => {
|
|
15726
|
+
if (isReader) return {};
|
|
15727
|
+
return creatorOrScope(createLazyCreatorState(store.getState(), store));
|
|
15728
|
+
},
|
|
15729
|
+
prepare: (name, node) => {
|
|
15730
|
+
node.setName?.(scope ? `${scope}.${name}` : name);
|
|
15731
|
+
return node;
|
|
16319
15732
|
}
|
|
16320
|
-
|
|
16321
|
-
|
|
15733
|
+
});
|
|
15734
|
+
let nodes = created;
|
|
15735
|
+
if (creatorOrScope === void 0) {
|
|
15736
|
+
nodes = storeNodes;
|
|
15737
|
+
} else if (typeof creatorOrScope === "string") {
|
|
15738
|
+
const scopeData = storeNodes[creatorOrScope];
|
|
15739
|
+
nodes = scopeData && !isTSLNode(scopeData) ? scopeData : {};
|
|
15740
|
+
}
|
|
16322
15741
|
return { ...nodes, removeNodes: removeNodes2, clearNodes, rebuildNodes };
|
|
16323
15742
|
}
|
|
16324
15743
|
function rebuildAllNodes(store, scope) {
|
|
16325
|
-
store
|
|
16326
|
-
let newNodes = state.nodes;
|
|
16327
|
-
if (scope && scope !== "root") {
|
|
16328
|
-
const { [scope]: _, ...rest } = state.nodes;
|
|
16329
|
-
newNodes = rest;
|
|
16330
|
-
} else if (scope === "root") {
|
|
16331
|
-
newNodes = {};
|
|
16332
|
-
for (const [key, value] of Object.entries(state.nodes)) {
|
|
16333
|
-
if (!isTSLNode(value)) newNodes[key] = value;
|
|
16334
|
-
}
|
|
16335
|
-
} else {
|
|
16336
|
-
newNodes = {};
|
|
16337
|
-
}
|
|
16338
|
-
return { nodes: newNodes, _hmrVersion: state._hmrVersion + 1 };
|
|
16339
|
-
});
|
|
15744
|
+
rebuildResource(store, "nodes", scope);
|
|
16340
15745
|
}
|
|
16341
15746
|
function removeNodes(set, names, scope) {
|
|
16342
15747
|
set((state) => {
|
|
@@ -16366,18 +15771,172 @@ function clearRootNodes(set) {
|
|
|
16366
15771
|
});
|
|
16367
15772
|
}
|
|
16368
15773
|
function useLocalNodes(creator) {
|
|
16369
|
-
const store =
|
|
16370
|
-
const uniforms =
|
|
16371
|
-
const nodes =
|
|
16372
|
-
const textures =
|
|
16373
|
-
const hmrVersion =
|
|
15774
|
+
const store = usePrimaryStore();
|
|
15775
|
+
const uniforms = usePrimaryThree((s) => s.uniforms);
|
|
15776
|
+
const nodes = usePrimaryThree((s) => s.nodes);
|
|
15777
|
+
const textures = usePrimaryThree((s) => s.textures);
|
|
15778
|
+
const hmrVersion = usePrimaryThree((s) => s._hmrVersion);
|
|
16374
15779
|
return React.useMemo(() => {
|
|
16375
|
-
const wrappedState = createLazyCreatorState(store.getState());
|
|
15780
|
+
const wrappedState = createLazyCreatorState(store.getState(), store);
|
|
16376
15781
|
return creator(wrappedState);
|
|
16377
15782
|
}, [store, creator, uniforms, nodes, textures, hmrVersion]);
|
|
16378
15783
|
}
|
|
16379
15784
|
|
|
16380
|
-
|
|
15785
|
+
const isBufferLike = (value) => {
|
|
15786
|
+
if (value === null || typeof value !== "object") return false;
|
|
15787
|
+
if (ArrayBuffer.isView(value)) return true;
|
|
15788
|
+
if ("isBufferAttribute" in value) return true;
|
|
15789
|
+
if ("uuid" in value || "nodeType" in value) return true;
|
|
15790
|
+
return false;
|
|
15791
|
+
};
|
|
15792
|
+
const disposeBuffer = (buffer) => {
|
|
15793
|
+
if (buffer === null || typeof buffer !== "object") return;
|
|
15794
|
+
if ("dispose" in buffer && typeof buffer.dispose === "function") {
|
|
15795
|
+
buffer.dispose();
|
|
15796
|
+
}
|
|
15797
|
+
};
|
|
15798
|
+
function useBuffers(creatorOrScope, scope) {
|
|
15799
|
+
const store = usePrimaryStore();
|
|
15800
|
+
const removeBuffers = React.useCallback(
|
|
15801
|
+
(names, targetScope) => removeResourceEntries(store, "buffers", Array.isArray(names) ? names : [names], targetScope, isBufferLike),
|
|
15802
|
+
[store]
|
|
15803
|
+
);
|
|
15804
|
+
const clearBuffers = React.useCallback(
|
|
15805
|
+
(targetScope) => clearResourceEntries(store, "buffers", targetScope, isBufferLike),
|
|
15806
|
+
[store]
|
|
15807
|
+
);
|
|
15808
|
+
const rebuildBuffers = React.useCallback(
|
|
15809
|
+
(targetScope) => rebuildResource(store, "buffers", targetScope),
|
|
15810
|
+
[store]
|
|
15811
|
+
);
|
|
15812
|
+
const disposeBuffers = React.useCallback(
|
|
15813
|
+
(names, targetScope) => {
|
|
15814
|
+
const nameArray = Array.isArray(names) ? names : [names];
|
|
15815
|
+
const state = store.getState();
|
|
15816
|
+
for (const name of nameArray) {
|
|
15817
|
+
const buffer = targetScope ? state.buffers[targetScope]?.[name] : state.buffers[name];
|
|
15818
|
+
if (buffer && isBufferLike(buffer)) {
|
|
15819
|
+
disposeBuffer(buffer);
|
|
15820
|
+
}
|
|
15821
|
+
}
|
|
15822
|
+
removeBuffers(names, targetScope);
|
|
15823
|
+
},
|
|
15824
|
+
[store, removeBuffers]
|
|
15825
|
+
);
|
|
15826
|
+
const isReader = creatorOrScope === void 0 || typeof creatorOrScope === "string";
|
|
15827
|
+
const storeBuffers = usePrimaryThree((s) => s.buffers);
|
|
15828
|
+
const created = useScopedResource({
|
|
15829
|
+
store,
|
|
15830
|
+
kind: "buffers",
|
|
15831
|
+
scope: isReader ? void 0 : scope,
|
|
15832
|
+
isLeaf: isBufferLike,
|
|
15833
|
+
create: () => {
|
|
15834
|
+
if (isReader) return {};
|
|
15835
|
+
return creatorOrScope(createLazyCreatorState(store.getState(), store));
|
|
15836
|
+
},
|
|
15837
|
+
prepare: (name, buffer) => {
|
|
15838
|
+
if ("setName" in buffer && typeof buffer.setName === "function") {
|
|
15839
|
+
buffer.setName(scope ? `${scope}.${name}` : name);
|
|
15840
|
+
}
|
|
15841
|
+
return buffer;
|
|
15842
|
+
}
|
|
15843
|
+
});
|
|
15844
|
+
let buffers = created;
|
|
15845
|
+
if (creatorOrScope === void 0) {
|
|
15846
|
+
buffers = storeBuffers;
|
|
15847
|
+
} else if (typeof creatorOrScope === "string") {
|
|
15848
|
+
const scopeData = storeBuffers[creatorOrScope];
|
|
15849
|
+
buffers = scopeData && !isBufferLike(scopeData) ? scopeData : {};
|
|
15850
|
+
}
|
|
15851
|
+
return { ...buffers, removeBuffers, clearBuffers, rebuildBuffers, disposeBuffers };
|
|
15852
|
+
}
|
|
15853
|
+
function rebuildAllBuffers(store, scope) {
|
|
15854
|
+
rebuildResource(store, "buffers", scope);
|
|
15855
|
+
}
|
|
15856
|
+
|
|
15857
|
+
const isStorageLike = (value) => {
|
|
15858
|
+
if (value === null || typeof value !== "object") return false;
|
|
15859
|
+
if ("isTexture" in value) return true;
|
|
15860
|
+
if ("isData3DTexture" in value) return true;
|
|
15861
|
+
if ("uuid" in value || "nodeType" in value) return true;
|
|
15862
|
+
return false;
|
|
15863
|
+
};
|
|
15864
|
+
const disposeStorage = (storage) => {
|
|
15865
|
+
if (storage === null || typeof storage !== "object") return;
|
|
15866
|
+
if ("dispose" in storage && typeof storage.dispose === "function") {
|
|
15867
|
+
storage.dispose();
|
|
15868
|
+
}
|
|
15869
|
+
};
|
|
15870
|
+
function useGPUStorage(creatorOrScope, scope) {
|
|
15871
|
+
const store = usePrimaryStore();
|
|
15872
|
+
const removeStorage = React.useCallback(
|
|
15873
|
+
(names, targetScope) => removeResourceEntries(store, "gpuStorage", Array.isArray(names) ? names : [names], targetScope, isStorageLike),
|
|
15874
|
+
[store]
|
|
15875
|
+
);
|
|
15876
|
+
const clearStorage = React.useCallback(
|
|
15877
|
+
(targetScope) => clearResourceEntries(store, "gpuStorage", targetScope, isStorageLike),
|
|
15878
|
+
[store]
|
|
15879
|
+
);
|
|
15880
|
+
const rebuildStorage = React.useCallback(
|
|
15881
|
+
(targetScope) => rebuildResource(store, "gpuStorage", targetScope),
|
|
15882
|
+
[store]
|
|
15883
|
+
);
|
|
15884
|
+
const disposeStorageFn = React.useCallback(
|
|
15885
|
+
(names, targetScope) => {
|
|
15886
|
+
const nameArray = Array.isArray(names) ? names : [names];
|
|
15887
|
+
const state = store.getState();
|
|
15888
|
+
for (const name of nameArray) {
|
|
15889
|
+
const storage = targetScope ? state.gpuStorage[targetScope]?.[name] : state.gpuStorage[name];
|
|
15890
|
+
if (storage && isStorageLike(storage)) {
|
|
15891
|
+
disposeStorage(storage);
|
|
15892
|
+
}
|
|
15893
|
+
}
|
|
15894
|
+
removeStorage(names, targetScope);
|
|
15895
|
+
},
|
|
15896
|
+
[store, removeStorage]
|
|
15897
|
+
);
|
|
15898
|
+
const isReader = creatorOrScope === void 0 || typeof creatorOrScope === "string";
|
|
15899
|
+
const storeStorage = usePrimaryThree((s) => s.gpuStorage);
|
|
15900
|
+
const created = useScopedResource({
|
|
15901
|
+
store,
|
|
15902
|
+
kind: "gpuStorage",
|
|
15903
|
+
scope: isReader ? void 0 : scope,
|
|
15904
|
+
isLeaf: isStorageLike,
|
|
15905
|
+
create: () => {
|
|
15906
|
+
if (isReader) return {};
|
|
15907
|
+
return creatorOrScope(createLazyCreatorState(store.getState(), store));
|
|
15908
|
+
},
|
|
15909
|
+
prepare: (name, storage) => {
|
|
15910
|
+
const label = scope ? `${scope}.${name}` : name;
|
|
15911
|
+
if ("setName" in storage && typeof storage.setName === "function") {
|
|
15912
|
+
storage.setName(label);
|
|
15913
|
+
}
|
|
15914
|
+
if ("name" in storage && typeof storage.name === "string") {
|
|
15915
|
+
storage.name = label;
|
|
15916
|
+
}
|
|
15917
|
+
return storage;
|
|
15918
|
+
}
|
|
15919
|
+
});
|
|
15920
|
+
let gpuStorage = created;
|
|
15921
|
+
if (creatorOrScope === void 0) {
|
|
15922
|
+
gpuStorage = storeStorage;
|
|
15923
|
+
} else if (typeof creatorOrScope === "string") {
|
|
15924
|
+
const scopeData = storeStorage[creatorOrScope];
|
|
15925
|
+
gpuStorage = scopeData && !isStorageLike(scopeData) ? scopeData : {};
|
|
15926
|
+
}
|
|
15927
|
+
return {
|
|
15928
|
+
...gpuStorage,
|
|
15929
|
+
removeStorage,
|
|
15930
|
+
clearStorage,
|
|
15931
|
+
rebuildStorage,
|
|
15932
|
+
disposeStorage: disposeStorageFn
|
|
15933
|
+
};
|
|
15934
|
+
}
|
|
15935
|
+
function rebuildAllStorage(store, scope) {
|
|
15936
|
+
rebuildResource(store, "gpuStorage", scope);
|
|
15937
|
+
}
|
|
15938
|
+
|
|
15939
|
+
function useRenderPipeline(mainCB, setupCB) {
|
|
16381
15940
|
const store = useStore();
|
|
16382
15941
|
const { scene, camera, renderer, isLegacy } = useThree();
|
|
16383
15942
|
const callbacksRanRef = React.useRef(false);
|
|
@@ -16396,7 +15955,7 @@ function usePostProcessing(mainCB, setupCB) {
|
|
|
16396
15955
|
}, [store]);
|
|
16397
15956
|
const reset = React.useCallback(() => {
|
|
16398
15957
|
store.setState({
|
|
16399
|
-
|
|
15958
|
+
renderPipeline: null,
|
|
16400
15959
|
passes: {}
|
|
16401
15960
|
});
|
|
16402
15961
|
callbacksRanRef.current = false;
|
|
@@ -16409,18 +15968,18 @@ function usePostProcessing(mainCB, setupCB) {
|
|
|
16409
15968
|
}, []);
|
|
16410
15969
|
React.useLayoutEffect(() => {
|
|
16411
15970
|
if (isLegacy) {
|
|
16412
|
-
throw new Error("
|
|
15971
|
+
throw new Error("useRenderPipeline is only available with WebGPU renderer. Set renderer prop on Canvas.");
|
|
16413
15972
|
}
|
|
16414
15973
|
if (!renderer || !scene || !camera) return;
|
|
16415
15974
|
const state = store.getState();
|
|
16416
15975
|
const set = store.setState;
|
|
16417
15976
|
try {
|
|
16418
|
-
let
|
|
15977
|
+
let pipeline = state.renderPipeline;
|
|
16419
15978
|
let currentPasses = { ...state.passes };
|
|
16420
|
-
let
|
|
16421
|
-
if (!
|
|
16422
|
-
|
|
16423
|
-
|
|
15979
|
+
let justCreatedPipeline = false;
|
|
15980
|
+
if (!pipeline) {
|
|
15981
|
+
pipeline = new webgpu.RenderPipeline(renderer);
|
|
15982
|
+
justCreatedPipeline = true;
|
|
16424
15983
|
}
|
|
16425
15984
|
const cacheValid = scenePassCacheRef.current && scenePassCacheRef.current.sceneUuid === scene.uuid && scenePassCacheRef.current.cameraUuid === camera.uuid;
|
|
16426
15985
|
let scenePass;
|
|
@@ -16431,9 +15990,9 @@ function usePostProcessing(mainCB, setupCB) {
|
|
|
16431
15990
|
scenePassCacheRef.current = { sceneUuid: scene.uuid, cameraUuid: camera.uuid, scenePass };
|
|
16432
15991
|
}
|
|
16433
15992
|
currentPasses.scenePass = scenePass;
|
|
16434
|
-
if (!
|
|
16435
|
-
set({
|
|
16436
|
-
const shouldRunCallbacks =
|
|
15993
|
+
if (!pipeline.outputNode || justCreatedPipeline) pipeline.outputNode = scenePass;
|
|
15994
|
+
set({ renderPipeline: pipeline, passes: currentPasses });
|
|
15995
|
+
const shouldRunCallbacks = justCreatedPipeline || !callbacksRanRef.current || !cacheValid;
|
|
16437
15996
|
if (shouldRunCallbacks) {
|
|
16438
15997
|
if (setupCBRef.current) {
|
|
16439
15998
|
const freshState = store.getState();
|
|
@@ -16454,24 +16013,26 @@ function usePostProcessing(mainCB, setupCB) {
|
|
|
16454
16013
|
callbacksRanRef.current = true;
|
|
16455
16014
|
}
|
|
16456
16015
|
} catch (error) {
|
|
16457
|
-
console.
|
|
16016
|
+
console.warn("[useRenderPipeline] Setup failed; the render pipeline was not configured:", error);
|
|
16458
16017
|
}
|
|
16459
16018
|
}, [store, renderer, scene, camera, isLegacy, rebuildVersion]);
|
|
16460
16019
|
const passes = useThree((s) => s.passes);
|
|
16461
|
-
const
|
|
16020
|
+
const renderPipeline = useThree((s) => s.renderPipeline);
|
|
16462
16021
|
return {
|
|
16463
16022
|
passes,
|
|
16464
|
-
|
|
16023
|
+
renderPipeline,
|
|
16465
16024
|
clearPasses,
|
|
16466
16025
|
reset,
|
|
16467
16026
|
rebuild,
|
|
16468
|
-
// isReady indicates if
|
|
16469
|
-
isReady:
|
|
16027
|
+
// isReady indicates if RenderPipeline is configured and ready for rendering
|
|
16028
|
+
isReady: renderPipeline !== null
|
|
16470
16029
|
};
|
|
16471
16030
|
}
|
|
16472
16031
|
|
|
16473
16032
|
extend(THREE);
|
|
16474
16033
|
|
|
16034
|
+
exports.Scheduler = scheduler.Scheduler;
|
|
16035
|
+
exports.getScheduler = scheduler.getScheduler;
|
|
16475
16036
|
exports.Block = Block;
|
|
16476
16037
|
exports.Canvas = Canvas;
|
|
16477
16038
|
exports.Environment = Environment;
|
|
@@ -16487,10 +16048,8 @@ exports.R3F_BUILD_LEGACY = R3F_BUILD_LEGACY;
|
|
|
16487
16048
|
exports.R3F_BUILD_WEBGPU = R3F_BUILD_WEBGPU;
|
|
16488
16049
|
exports.REACT_INTERNAL_PROPS = REACT_INTERNAL_PROPS;
|
|
16489
16050
|
exports.RESERVED_PROPS = RESERVED_PROPS;
|
|
16490
|
-
exports.Scheduler = Scheduler;
|
|
16491
16051
|
exports.Texture = Texture;
|
|
16492
16052
|
exports._roots = _roots;
|
|
16493
|
-
exports.act = act;
|
|
16494
16053
|
exports.addAfterEffect = addAfterEffect;
|
|
16495
16054
|
exports.addEffect = addEffect;
|
|
16496
16055
|
exports.addTail = addTail;
|
|
@@ -16523,7 +16082,6 @@ exports.getInstanceProps = getInstanceProps;
|
|
|
16523
16082
|
exports.getPrimary = getPrimary;
|
|
16524
16083
|
exports.getPrimaryIds = getPrimaryIds;
|
|
16525
16084
|
exports.getRootState = getRootState;
|
|
16526
|
-
exports.getScheduler = getScheduler;
|
|
16527
16085
|
exports.getUuidPrefix = getUuidPrefix;
|
|
16528
16086
|
exports.hasConstructor = hasConstructor;
|
|
16529
16087
|
exports.hasPrimary = hasPrimary;
|
|
@@ -16543,7 +16101,9 @@ exports.isVectorLike = isVectorLike;
|
|
|
16543
16101
|
exports.once = once;
|
|
16544
16102
|
exports.prepare = prepare;
|
|
16545
16103
|
exports.presetsObj = presetsObj;
|
|
16104
|
+
exports.rebuildAllBuffers = rebuildAllBuffers;
|
|
16546
16105
|
exports.rebuildAllNodes = rebuildAllNodes;
|
|
16106
|
+
exports.rebuildAllStorage = rebuildAllStorage;
|
|
16547
16107
|
exports.rebuildAllUniforms = rebuildAllUniforms;
|
|
16548
16108
|
exports.reconciler = reconciler;
|
|
16549
16109
|
exports.registerPrimary = registerPrimary;
|
|
@@ -16556,8 +16116,10 @@ exports.unregisterPrimary = unregisterPrimary;
|
|
|
16556
16116
|
exports.updateCamera = updateCamera;
|
|
16557
16117
|
exports.updateFrustum = updateFrustum;
|
|
16558
16118
|
exports.useBridge = useBridge;
|
|
16119
|
+
exports.useBuffers = useBuffers;
|
|
16559
16120
|
exports.useEnvironment = useEnvironment;
|
|
16560
16121
|
exports.useFrame = useFrame;
|
|
16122
|
+
exports.useGPUStorage = useGPUStorage;
|
|
16561
16123
|
exports.useGraph = useGraph;
|
|
16562
16124
|
exports.useInstanceHandle = useInstanceHandle;
|
|
16563
16125
|
exports.useIsomorphicLayoutEffect = useIsomorphicLayoutEffect;
|
|
@@ -16565,7 +16127,7 @@ exports.useLoader = useLoader;
|
|
|
16565
16127
|
exports.useLocalNodes = useLocalNodes;
|
|
16566
16128
|
exports.useMutableCallback = useMutableCallback;
|
|
16567
16129
|
exports.useNodes = useNodes;
|
|
16568
|
-
exports.
|
|
16130
|
+
exports.useRenderPipeline = useRenderPipeline;
|
|
16569
16131
|
exports.useRenderTarget = useRenderTarget;
|
|
16570
16132
|
exports.useStore = useStore;
|
|
16571
16133
|
exports.useTexture = useTexture;
|