@react-three/fiber 10.0.0-canary.b0fafc8 → 10.0.0-canary.c49d4cb
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.cjs +692 -1383
- package/dist/index.d.cts +291 -806
- package/dist/index.d.mts +291 -806
- package/dist/index.d.ts +291 -806
- package/dist/index.mjs +667 -1357
- package/dist/legacy.cjs +647 -1344
- package/dist/legacy.d.cts +292 -806
- package/dist/legacy.d.mts +292 -806
- package/dist/legacy.d.ts +292 -806
- package/dist/legacy.mjs +621 -1317
- package/dist/webgpu/index.cjs +1101 -1409
- package/dist/webgpu/index.d.cts +393 -818
- package/dist/webgpu/index.d.mts +393 -818
- package/dist/webgpu/index.d.ts +393 -818
- package/dist/webgpu/index.mjs +1070 -1381
- package/package.json +4 -3
- package/readme.md +2 -3
package/dist/webgpu/index.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,9 +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$
|
|
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);
|
|
447
467
|
const act = React__namespace["act"];
|
|
448
468
|
const useIsomorphicLayoutEffect = /* @__PURE__ */ (() => typeof window !== "undefined" && (window.document?.createElement || window.navigator?.product === "ReactNative"))() ? React__namespace.useLayoutEffect : React__namespace.useEffect;
|
|
449
469
|
function useMutableCallback(fn) {
|
|
@@ -475,7 +495,7 @@ const ErrorBoundary = /* @__PURE__ */ (() => {
|
|
|
475
495
|
return _a = class extends React__namespace.Component {
|
|
476
496
|
constructor() {
|
|
477
497
|
super(...arguments);
|
|
478
|
-
__publicField$
|
|
498
|
+
__publicField$1(this, "state", { error: false });
|
|
479
499
|
}
|
|
480
500
|
componentDidCatch(err) {
|
|
481
501
|
this.props.set(err);
|
|
@@ -483,7 +503,7 @@ const ErrorBoundary = /* @__PURE__ */ (() => {
|
|
|
483
503
|
render() {
|
|
484
504
|
return this.state.error ? null : this.props.children;
|
|
485
505
|
}
|
|
486
|
-
}, __publicField$
|
|
506
|
+
}, __publicField$1(_a, "getDerivedStateFromError", () => ({ error: true })), _a;
|
|
487
507
|
})();
|
|
488
508
|
|
|
489
509
|
const is = {
|
|
@@ -620,8 +640,7 @@ function prepare(target, root, type, props) {
|
|
|
620
640
|
object,
|
|
621
641
|
eventCount: 0,
|
|
622
642
|
handlers: {},
|
|
623
|
-
isHidden: false
|
|
624
|
-
deferredRefs: []
|
|
643
|
+
isHidden: false
|
|
625
644
|
};
|
|
626
645
|
if (object) object.__r3f = instance;
|
|
627
646
|
}
|
|
@@ -778,6 +797,17 @@ function unregisterVisibility(store, object) {
|
|
|
778
797
|
internal.visibilityRegistry.delete(object.uuid);
|
|
779
798
|
internal.occlusionCache.delete(object);
|
|
780
799
|
}
|
|
800
|
+
function updateVisibilityHandlers(store, object, handlers) {
|
|
801
|
+
const { internal } = store.getState();
|
|
802
|
+
const entry = internal.visibilityRegistry.get(object.uuid);
|
|
803
|
+
if (!entry) return false;
|
|
804
|
+
entry.handlers = handlers;
|
|
805
|
+
if ((handlers.onOccluded || handlers.onVisible) && !internal.occlusionEnabled) {
|
|
806
|
+
object.occlusionTest = true;
|
|
807
|
+
enableOcclusion(store);
|
|
808
|
+
}
|
|
809
|
+
return true;
|
|
810
|
+
}
|
|
781
811
|
function checkVisibility(state) {
|
|
782
812
|
const { internal, camera } = state;
|
|
783
813
|
const registry = internal.visibilityRegistry;
|
|
@@ -965,10 +995,7 @@ function applyProps(object, props) {
|
|
|
965
995
|
continue;
|
|
966
996
|
}
|
|
967
997
|
if (value === void 0) continue;
|
|
968
|
-
if (isFromRef(value))
|
|
969
|
-
instance?.deferredRefs?.push({ prop, ref: value[FROM_REF] });
|
|
970
|
-
continue;
|
|
971
|
-
}
|
|
998
|
+
if (isFromRef(value)) continue;
|
|
972
999
|
if (isOnce(value)) {
|
|
973
1000
|
if (instance?.appliedOnce?.has(prop)) continue;
|
|
974
1001
|
if (instance) {
|
|
@@ -1004,8 +1031,24 @@ function applyProps(object, props) {
|
|
|
1004
1031
|
} else if (isVectorLike(target) && is.num(value)) {
|
|
1005
1032
|
if ("setScalar" in target && typeof target.setScalar === "function") target.setScalar(value);
|
|
1006
1033
|
else target.set(value);
|
|
1034
|
+
} else if (root instanceof webgpu.ShaderMaterial && key === "uniforms" && is.obj(value)) {
|
|
1035
|
+
if (!is.obj(root.uniforms)) root.uniforms = {};
|
|
1036
|
+
const uniforms = root.uniforms;
|
|
1037
|
+
const nextUniforms = value;
|
|
1038
|
+
for (const name in nextUniforms) {
|
|
1039
|
+
const uniform = nextUniforms[name];
|
|
1040
|
+
const targetUniform = uniforms[name];
|
|
1041
|
+
if (targetUniform) Object.assign(targetUniform, uniform);
|
|
1042
|
+
else {
|
|
1043
|
+
const nextUniform = uniform instanceof webgpu.Uniform ? uniform.clone() : new webgpu.Uniform(uniform.value);
|
|
1044
|
+
uniforms[name] = nextUniform;
|
|
1045
|
+
}
|
|
1046
|
+
}
|
|
1007
1047
|
} else {
|
|
1008
1048
|
root[key] = value;
|
|
1049
|
+
if (key.endsWith("Node") && root.isMaterial) {
|
|
1050
|
+
root.needsUpdate = true;
|
|
1051
|
+
}
|
|
1009
1052
|
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
1053
|
root[key].format === webgpu.RGBAFormat && root[key].type === webgpu.UnsignedByteType) {
|
|
1011
1054
|
root[key].colorSpace = rootState.textureColorSpace;
|
|
@@ -1019,6 +1062,9 @@ function applyProps(object, props) {
|
|
|
1019
1062
|
if (instance.eventCount && object2.raycast !== null) {
|
|
1020
1063
|
rootState.internal.interaction.push(object2);
|
|
1021
1064
|
}
|
|
1065
|
+
}
|
|
1066
|
+
if (instance?.parent && rootState?.internal && instance.object?.isObject3D) {
|
|
1067
|
+
const object2 = instance.object;
|
|
1022
1068
|
const root = findInitialRoot(instance);
|
|
1023
1069
|
const visibilityHandlers = {
|
|
1024
1070
|
onFramed: instance.handlers.onFramed,
|
|
@@ -1026,7 +1072,9 @@ function applyProps(object, props) {
|
|
|
1026
1072
|
onVisible: instance.handlers.onVisible
|
|
1027
1073
|
};
|
|
1028
1074
|
if (hasVisibilityHandlers(visibilityHandlers)) {
|
|
1029
|
-
|
|
1075
|
+
if (!updateVisibilityHandlers(root, object2, visibilityHandlers)) {
|
|
1076
|
+
registerVisibility(root, object2, visibilityHandlers);
|
|
1077
|
+
}
|
|
1030
1078
|
} else {
|
|
1031
1079
|
unregisterVisibility(root, object2);
|
|
1032
1080
|
}
|
|
@@ -1039,38 +1087,60 @@ function applyProps(object, props) {
|
|
|
1039
1087
|
return object;
|
|
1040
1088
|
}
|
|
1041
1089
|
|
|
1090
|
+
const DEFAULT_POINTER_ID = 0;
|
|
1091
|
+
const XR_POINTER_ID_START = 1e3;
|
|
1092
|
+
function getPointerState(internal, pointerId) {
|
|
1093
|
+
let state = internal.pointerMap.get(pointerId);
|
|
1094
|
+
if (!state) {
|
|
1095
|
+
state = {
|
|
1096
|
+
hovered: /* @__PURE__ */ new Map(),
|
|
1097
|
+
captured: /* @__PURE__ */ new Map(),
|
|
1098
|
+
initialClick: [0, 0],
|
|
1099
|
+
initialHits: []
|
|
1100
|
+
};
|
|
1101
|
+
internal.pointerMap.set(pointerId, state);
|
|
1102
|
+
}
|
|
1103
|
+
return state;
|
|
1104
|
+
}
|
|
1105
|
+
function getPointerId(event) {
|
|
1106
|
+
return "pointerId" in event ? event.pointerId : DEFAULT_POINTER_ID;
|
|
1107
|
+
}
|
|
1042
1108
|
function makeId(event) {
|
|
1043
1109
|
return (event.eventObject || event.object).uuid + "/" + event.index + event.instanceId;
|
|
1044
1110
|
}
|
|
1045
|
-
function releaseInternalPointerCapture(
|
|
1046
|
-
const
|
|
1111
|
+
function releaseInternalPointerCapture(internal, obj, pointerId) {
|
|
1112
|
+
const pointerState = internal.pointerMap.get(pointerId);
|
|
1113
|
+
if (!pointerState) return;
|
|
1114
|
+
const captureData = pointerState.captured.get(obj);
|
|
1047
1115
|
if (captureData) {
|
|
1048
|
-
|
|
1049
|
-
|
|
1050
|
-
capturedMap.delete(pointerId);
|
|
1051
|
-
captureData.target.releasePointerCapture(pointerId);
|
|
1052
|
-
}
|
|
1116
|
+
pointerState.captured.delete(obj);
|
|
1117
|
+
captureData.target.releasePointerCapture(pointerId);
|
|
1053
1118
|
}
|
|
1054
1119
|
}
|
|
1055
1120
|
function removeInteractivity(store, object) {
|
|
1056
1121
|
const { internal } = store.getState();
|
|
1057
1122
|
internal.interaction = internal.interaction.filter((o) => o !== object);
|
|
1058
|
-
|
|
1059
|
-
|
|
1060
|
-
|
|
1061
|
-
|
|
1123
|
+
for (const [pointerId, pointerState] of internal.pointerMap) {
|
|
1124
|
+
pointerState.initialHits = pointerState.initialHits.filter((o) => o !== object);
|
|
1125
|
+
pointerState.hovered.forEach((value, key) => {
|
|
1126
|
+
if (value.eventObject === object || value.object === object) {
|
|
1127
|
+
pointerState.hovered.delete(key);
|
|
1128
|
+
}
|
|
1129
|
+
});
|
|
1130
|
+
if (pointerState.captured.has(object)) {
|
|
1131
|
+
releaseInternalPointerCapture(internal, object, pointerId);
|
|
1062
1132
|
}
|
|
1063
|
-
}
|
|
1064
|
-
internal.capturedMap.forEach((captures, pointerId) => {
|
|
1065
|
-
releaseInternalPointerCapture(internal.capturedMap, object, captures, pointerId);
|
|
1066
|
-
});
|
|
1133
|
+
}
|
|
1067
1134
|
unregisterVisibility(store, object);
|
|
1068
1135
|
}
|
|
1069
1136
|
function createEvents(store) {
|
|
1070
|
-
function calculateDistance(event) {
|
|
1137
|
+
function calculateDistance(event, pointerId) {
|
|
1071
1138
|
const { internal } = store.getState();
|
|
1072
|
-
const
|
|
1073
|
-
|
|
1139
|
+
const pointerState = internal.pointerMap.get(pointerId);
|
|
1140
|
+
if (!pointerState) return 0;
|
|
1141
|
+
const [initialX, initialY] = pointerState.initialClick;
|
|
1142
|
+
const dx = event.offsetX - initialX;
|
|
1143
|
+
const dy = event.offsetY - initialY;
|
|
1074
1144
|
return Math.round(Math.sqrt(dx * dx + dy * dy));
|
|
1075
1145
|
}
|
|
1076
1146
|
function filterPointerEvents(objects) {
|
|
@@ -1106,6 +1176,15 @@ function createEvents(store) {
|
|
|
1106
1176
|
return state2.raycaster.camera ? state2.raycaster.intersectObject(obj, true) : [];
|
|
1107
1177
|
}
|
|
1108
1178
|
let hits = eventsObjects.flatMap(handleRaycast).sort((a, b) => {
|
|
1179
|
+
const aInteractivePriority = a.object.userData?.interactivePriority;
|
|
1180
|
+
const bInteractivePriority = b.object.userData?.interactivePriority;
|
|
1181
|
+
if (aInteractivePriority !== void 0 || bInteractivePriority !== void 0) {
|
|
1182
|
+
if (aInteractivePriority !== void 0 && bInteractivePriority === void 0) return -1;
|
|
1183
|
+
if (bInteractivePriority !== void 0 && aInteractivePriority === void 0) return 1;
|
|
1184
|
+
if (aInteractivePriority !== bInteractivePriority) {
|
|
1185
|
+
return (bInteractivePriority ?? 0) - (aInteractivePriority ?? 0);
|
|
1186
|
+
}
|
|
1187
|
+
}
|
|
1109
1188
|
const aState = getRootState(a.object);
|
|
1110
1189
|
const bState = getRootState(b.object);
|
|
1111
1190
|
const aPriority = aState?.events?.priority ?? 1;
|
|
@@ -1127,9 +1206,13 @@ function createEvents(store) {
|
|
|
1127
1206
|
eventObject = eventObject.parent;
|
|
1128
1207
|
}
|
|
1129
1208
|
}
|
|
1130
|
-
if ("pointerId" in event
|
|
1131
|
-
|
|
1132
|
-
|
|
1209
|
+
if ("pointerId" in event) {
|
|
1210
|
+
const pointerId = event.pointerId;
|
|
1211
|
+
const pointerState = state.internal.pointerMap.get(pointerId);
|
|
1212
|
+
if (pointerState?.captured.size) {
|
|
1213
|
+
for (const captureData of pointerState.captured.values()) {
|
|
1214
|
+
if (!duplicates.has(makeId(captureData.intersection))) intersections.push(captureData.intersection);
|
|
1215
|
+
}
|
|
1133
1216
|
}
|
|
1134
1217
|
}
|
|
1135
1218
|
return intersections;
|
|
@@ -1142,27 +1225,25 @@ function createEvents(store) {
|
|
|
1142
1225
|
if (state) {
|
|
1143
1226
|
const { raycaster, pointer, camera, internal } = state;
|
|
1144
1227
|
const unprojectedPoint = new webgpu.Vector3(pointer.x, pointer.y, 0).unproject(camera);
|
|
1145
|
-
const hasPointerCapture = (id) =>
|
|
1228
|
+
const hasPointerCapture = (id) => {
|
|
1229
|
+
const pointerState = internal.pointerMap.get(id);
|
|
1230
|
+
return pointerState?.captured.has(hit.eventObject) ?? false;
|
|
1231
|
+
};
|
|
1146
1232
|
const setPointerCapture = (id) => {
|
|
1147
1233
|
const captureData = { intersection: hit, target: event.target };
|
|
1148
|
-
|
|
1149
|
-
|
|
1150
|
-
} else {
|
|
1151
|
-
internal.capturedMap.set(id, /* @__PURE__ */ new Map([[hit.eventObject, captureData]]));
|
|
1152
|
-
}
|
|
1234
|
+
const pointerState = getPointerState(internal, id);
|
|
1235
|
+
pointerState.captured.set(hit.eventObject, captureData);
|
|
1153
1236
|
event.target.setPointerCapture(id);
|
|
1154
1237
|
};
|
|
1155
1238
|
const releasePointerCapture = (id) => {
|
|
1156
|
-
|
|
1157
|
-
if (captures) {
|
|
1158
|
-
releaseInternalPointerCapture(internal.capturedMap, hit.eventObject, captures, id);
|
|
1159
|
-
}
|
|
1239
|
+
releaseInternalPointerCapture(internal, hit.eventObject, id);
|
|
1160
1240
|
};
|
|
1161
1241
|
const extractEventProps = {};
|
|
1162
1242
|
for (const prop in event) {
|
|
1163
1243
|
const property = event[prop];
|
|
1164
1244
|
if (typeof property !== "function") extractEventProps[prop] = property;
|
|
1165
1245
|
}
|
|
1246
|
+
const eventPointerId = "pointerId" in event ? event.pointerId : void 0;
|
|
1166
1247
|
const raycastEvent = {
|
|
1167
1248
|
...hit,
|
|
1168
1249
|
...extractEventProps,
|
|
@@ -1173,18 +1254,19 @@ function createEvents(store) {
|
|
|
1173
1254
|
unprojectedPoint,
|
|
1174
1255
|
ray: raycaster.ray,
|
|
1175
1256
|
camera,
|
|
1257
|
+
pointerId: eventPointerId,
|
|
1176
1258
|
// Hijack stopPropagation, which just sets a flag
|
|
1177
1259
|
stopPropagation() {
|
|
1178
|
-
const
|
|
1260
|
+
const pointerState = eventPointerId !== void 0 ? internal.pointerMap.get(eventPointerId) : void 0;
|
|
1179
1261
|
if (
|
|
1180
1262
|
// ...if this pointer hasn't been captured
|
|
1181
|
-
!
|
|
1182
|
-
|
|
1263
|
+
!pointerState?.captured.size || // ... or if the hit object is capturing the pointer
|
|
1264
|
+
pointerState.captured.has(hit.eventObject)
|
|
1183
1265
|
) {
|
|
1184
1266
|
raycastEvent.stopped = localState.stopped = true;
|
|
1185
|
-
if (
|
|
1267
|
+
if (pointerState?.hovered.size && Array.from(pointerState.hovered.values()).find((i) => i.eventObject === hit.eventObject)) {
|
|
1186
1268
|
const higher = intersections.slice(0, intersections.indexOf(hit));
|
|
1187
|
-
cancelPointer([...higher, hit]);
|
|
1269
|
+
cancelPointer([...higher, hit], eventPointerId);
|
|
1188
1270
|
}
|
|
1189
1271
|
}
|
|
1190
1272
|
},
|
|
@@ -1200,15 +1282,18 @@ function createEvents(store) {
|
|
|
1200
1282
|
}
|
|
1201
1283
|
return intersections;
|
|
1202
1284
|
}
|
|
1203
|
-
function cancelPointer(intersections) {
|
|
1285
|
+
function cancelPointer(intersections, pointerId) {
|
|
1204
1286
|
const { internal } = store.getState();
|
|
1205
|
-
|
|
1287
|
+
const pid = pointerId ?? DEFAULT_POINTER_ID;
|
|
1288
|
+
const pointerState = internal.pointerMap.get(pid);
|
|
1289
|
+
if (!pointerState) return;
|
|
1290
|
+
for (const [hoveredId, hoveredObj] of pointerState.hovered) {
|
|
1206
1291
|
if (!intersections.length || !intersections.find(
|
|
1207
1292
|
(hit) => hit.object === hoveredObj.object && hit.index === hoveredObj.index && hit.instanceId === hoveredObj.instanceId
|
|
1208
1293
|
)) {
|
|
1209
1294
|
const eventObject = hoveredObj.eventObject;
|
|
1210
1295
|
const instance = eventObject.__r3f;
|
|
1211
|
-
|
|
1296
|
+
pointerState.hovered.delete(hoveredId);
|
|
1212
1297
|
if (instance?.eventCount) {
|
|
1213
1298
|
const handlers = instance.handlers;
|
|
1214
1299
|
const data = { ...hoveredObj, intersections };
|
|
@@ -1237,41 +1322,118 @@ function createEvents(store) {
|
|
|
1237
1322
|
instance?.handlers.onDropMissed?.(event);
|
|
1238
1323
|
}
|
|
1239
1324
|
}
|
|
1325
|
+
function cleanupPointer(pointerId) {
|
|
1326
|
+
const { internal } = store.getState();
|
|
1327
|
+
const pointerState = internal.pointerMap.get(pointerId);
|
|
1328
|
+
if (pointerState) {
|
|
1329
|
+
for (const [, hoveredObj] of pointerState.hovered) {
|
|
1330
|
+
const eventObject = hoveredObj.eventObject;
|
|
1331
|
+
const instance = eventObject.__r3f;
|
|
1332
|
+
if (instance?.eventCount) {
|
|
1333
|
+
const handlers = instance.handlers;
|
|
1334
|
+
const data = { ...hoveredObj, intersections: [] };
|
|
1335
|
+
handlers.onPointerOut?.(data);
|
|
1336
|
+
handlers.onPointerLeave?.(data);
|
|
1337
|
+
}
|
|
1338
|
+
}
|
|
1339
|
+
internal.pointerMap.delete(pointerId);
|
|
1340
|
+
}
|
|
1341
|
+
internal.pointerDirty.delete(pointerId);
|
|
1342
|
+
}
|
|
1343
|
+
function processDeferredPointer(event, pointerId) {
|
|
1344
|
+
const state = store.getState();
|
|
1345
|
+
const { internal } = state;
|
|
1346
|
+
if (!state.events.enabled) return;
|
|
1347
|
+
const filter = filterPointerEvents;
|
|
1348
|
+
const hits = intersect(event, filter);
|
|
1349
|
+
cancelPointer(hits, pointerId);
|
|
1350
|
+
function onIntersect(data) {
|
|
1351
|
+
const eventObject = data.eventObject;
|
|
1352
|
+
const instance = eventObject.__r3f;
|
|
1353
|
+
if (!instance?.eventCount) return;
|
|
1354
|
+
const handlers = instance.handlers;
|
|
1355
|
+
if (handlers.onPointerOver || handlers.onPointerEnter || handlers.onPointerOut || handlers.onPointerLeave) {
|
|
1356
|
+
const id = makeId(data);
|
|
1357
|
+
const pointerState = getPointerState(internal, pointerId);
|
|
1358
|
+
const hoveredItem = pointerState.hovered.get(id);
|
|
1359
|
+
if (!hoveredItem) {
|
|
1360
|
+
pointerState.hovered.set(id, data);
|
|
1361
|
+
handlers.onPointerOver?.(data);
|
|
1362
|
+
handlers.onPointerEnter?.(data);
|
|
1363
|
+
} else if (hoveredItem.stopped) {
|
|
1364
|
+
data.stopPropagation();
|
|
1365
|
+
}
|
|
1366
|
+
}
|
|
1367
|
+
handlers.onPointerMove?.(data);
|
|
1368
|
+
}
|
|
1369
|
+
handleIntersects(hits, event, 0, onIntersect);
|
|
1370
|
+
}
|
|
1240
1371
|
function handlePointer(name) {
|
|
1241
1372
|
switch (name) {
|
|
1242
1373
|
case "onPointerLeave":
|
|
1243
|
-
case "onPointerCancel":
|
|
1244
1374
|
case "onDragLeave":
|
|
1245
1375
|
return () => cancelPointer([]);
|
|
1376
|
+
// Global cancel of these events
|
|
1377
|
+
case "onPointerCancel":
|
|
1378
|
+
return (event) => {
|
|
1379
|
+
const pointerId = getPointerId(event);
|
|
1380
|
+
cleanupPointer(pointerId);
|
|
1381
|
+
};
|
|
1246
1382
|
case "onLostPointerCapture":
|
|
1247
1383
|
return (event) => {
|
|
1248
1384
|
const { internal } = store.getState();
|
|
1249
|
-
|
|
1385
|
+
const pointerId = getPointerId(event);
|
|
1386
|
+
const pointerState = internal.pointerMap.get(pointerId);
|
|
1387
|
+
if (pointerState?.captured.size) {
|
|
1250
1388
|
requestAnimationFrame(() => {
|
|
1251
|
-
|
|
1252
|
-
|
|
1253
|
-
|
|
1389
|
+
const pointerState2 = internal.pointerMap.get(pointerId);
|
|
1390
|
+
if (pointerState2?.captured.size) {
|
|
1391
|
+
pointerState2.captured.clear();
|
|
1254
1392
|
}
|
|
1393
|
+
cancelPointer([], pointerId);
|
|
1255
1394
|
});
|
|
1256
1395
|
}
|
|
1257
1396
|
};
|
|
1258
1397
|
}
|
|
1259
1398
|
return function handleEvent(event) {
|
|
1260
1399
|
const state = store.getState();
|
|
1261
|
-
const { onPointerMissed, onDragOverMissed, onDropMissed, internal } = state;
|
|
1400
|
+
const { onPointerMissed, onDragOverMissed, onDropMissed, internal, events } = state;
|
|
1401
|
+
const pointerId = getPointerId(event);
|
|
1262
1402
|
internal.lastEvent.current = event;
|
|
1263
|
-
if (!
|
|
1403
|
+
if (!events.enabled) return;
|
|
1264
1404
|
const isPointerMove = name === "onPointerMove";
|
|
1265
1405
|
const isDragOver = name === "onDragOver";
|
|
1266
1406
|
const isDrop = name === "onDrop";
|
|
1267
1407
|
const isClickEvent = name === "onClick" || name === "onContextMenu" || name === "onDoubleClick";
|
|
1408
|
+
const isPointerDown = name === "onPointerDown";
|
|
1409
|
+
const isPointerUp = name === "onPointerUp";
|
|
1410
|
+
const isWheel = name === "onWheel";
|
|
1411
|
+
const canDeferRaycasts = events.frameTimedRaycasts && state.frameloop === "always";
|
|
1412
|
+
if (isPointerMove && canDeferRaycasts) {
|
|
1413
|
+
events.compute?.(event, state);
|
|
1414
|
+
internal.pointerDirty.set(pointerId, event);
|
|
1415
|
+
return;
|
|
1416
|
+
}
|
|
1417
|
+
if (isWheel && canDeferRaycasts && !events.alwaysFireOnScroll) {
|
|
1418
|
+
events.compute?.(event, state);
|
|
1419
|
+
internal.pointerDirty.set(pointerId, event);
|
|
1420
|
+
return;
|
|
1421
|
+
}
|
|
1422
|
+
if ((isClickEvent || isPointerDown || isPointerUp) && internal.pointerDirty.has(pointerId)) {
|
|
1423
|
+
const deferredEvent = internal.pointerDirty.get(pointerId);
|
|
1424
|
+
internal.pointerDirty.delete(pointerId);
|
|
1425
|
+
processDeferredPointer(deferredEvent, pointerId);
|
|
1426
|
+
}
|
|
1268
1427
|
const filter = isPointerMove || isDragOver || isDrop ? filterPointerEvents : void 0;
|
|
1269
1428
|
const hits = intersect(event, filter);
|
|
1270
|
-
const delta = isClickEvent ? calculateDistance(event) : 0;
|
|
1271
|
-
if (
|
|
1272
|
-
|
|
1273
|
-
|
|
1274
|
-
|
|
1429
|
+
const delta = isClickEvent ? calculateDistance(event, pointerId) : 0;
|
|
1430
|
+
if (isPointerDown) {
|
|
1431
|
+
const pointerState2 = getPointerState(internal, pointerId);
|
|
1432
|
+
pointerState2.initialClick = [event.offsetX, event.offsetY];
|
|
1433
|
+
pointerState2.initialHits = hits.map((hit) => hit.eventObject);
|
|
1434
|
+
}
|
|
1435
|
+
const pointerState = internal.pointerMap.get(pointerId);
|
|
1436
|
+
const initialHits = pointerState?.initialHits ?? [];
|
|
1275
1437
|
if (isClickEvent && !hits.length) {
|
|
1276
1438
|
if (delta <= 2) {
|
|
1277
1439
|
pointerMissed(event, internal.interaction);
|
|
@@ -1286,7 +1448,9 @@ function createEvents(store) {
|
|
|
1286
1448
|
dropMissed(event, internal.interaction);
|
|
1287
1449
|
if (onDropMissed) onDropMissed(event);
|
|
1288
1450
|
}
|
|
1289
|
-
if (isPointerMove || isDragOver)
|
|
1451
|
+
if (isPointerMove || isDragOver) {
|
|
1452
|
+
cancelPointer(hits, pointerId);
|
|
1453
|
+
}
|
|
1290
1454
|
function onIntersect(data) {
|
|
1291
1455
|
const eventObject = data.eventObject;
|
|
1292
1456
|
const instance = eventObject.__r3f;
|
|
@@ -1295,9 +1459,10 @@ function createEvents(store) {
|
|
|
1295
1459
|
if (isPointerMove) {
|
|
1296
1460
|
if (handlers.onPointerOver || handlers.onPointerEnter || handlers.onPointerOut || handlers.onPointerLeave) {
|
|
1297
1461
|
const id = makeId(data);
|
|
1298
|
-
const
|
|
1462
|
+
const pointerState2 = getPointerState(internal, pointerId);
|
|
1463
|
+
const hoveredItem = pointerState2.hovered.get(id);
|
|
1299
1464
|
if (!hoveredItem) {
|
|
1300
|
-
|
|
1465
|
+
pointerState2.hovered.set(id, data);
|
|
1301
1466
|
handlers.onPointerOver?.(data);
|
|
1302
1467
|
handlers.onPointerEnter?.(data);
|
|
1303
1468
|
} else if (hoveredItem.stopped) {
|
|
@@ -1307,9 +1472,10 @@ function createEvents(store) {
|
|
|
1307
1472
|
handlers.onPointerMove?.(data);
|
|
1308
1473
|
} else if (isDragOver) {
|
|
1309
1474
|
const id = makeId(data);
|
|
1310
|
-
const
|
|
1475
|
+
const pointerState2 = getPointerState(internal, pointerId);
|
|
1476
|
+
const hoveredItem = pointerState2.hovered.get(id);
|
|
1311
1477
|
if (!hoveredItem) {
|
|
1312
|
-
|
|
1478
|
+
pointerState2.hovered.set(id, data);
|
|
1313
1479
|
handlers.onDragOverEnter?.(data);
|
|
1314
1480
|
} else if (hoveredItem.stopped) {
|
|
1315
1481
|
data.stopPropagation();
|
|
@@ -1320,18 +1486,18 @@ function createEvents(store) {
|
|
|
1320
1486
|
} else {
|
|
1321
1487
|
const handler = handlers[name];
|
|
1322
1488
|
if (handler) {
|
|
1323
|
-
if (!isClickEvent ||
|
|
1489
|
+
if (!isClickEvent || initialHits.includes(eventObject)) {
|
|
1324
1490
|
pointerMissed(
|
|
1325
1491
|
event,
|
|
1326
|
-
internal.interaction.filter((object) => !
|
|
1492
|
+
internal.interaction.filter((object) => !initialHits.includes(object))
|
|
1327
1493
|
);
|
|
1328
1494
|
handler(data);
|
|
1329
1495
|
}
|
|
1330
1496
|
} else {
|
|
1331
|
-
if (isClickEvent &&
|
|
1497
|
+
if (isClickEvent && initialHits.includes(eventObject)) {
|
|
1332
1498
|
pointerMissed(
|
|
1333
1499
|
event,
|
|
1334
|
-
internal.interaction.filter((object) => !
|
|
1500
|
+
internal.interaction.filter((object) => !initialHits.includes(object))
|
|
1335
1501
|
);
|
|
1336
1502
|
}
|
|
1337
1503
|
}
|
|
@@ -1340,7 +1506,15 @@ function createEvents(store) {
|
|
|
1340
1506
|
handleIntersects(hits, event, delta, onIntersect);
|
|
1341
1507
|
};
|
|
1342
1508
|
}
|
|
1343
|
-
|
|
1509
|
+
function flushDeferredPointers() {
|
|
1510
|
+
const { internal, events } = store.getState();
|
|
1511
|
+
if (!events.frameTimedRaycasts) return;
|
|
1512
|
+
for (const [pointerId, event] of internal.pointerDirty) {
|
|
1513
|
+
processDeferredPointer(event, pointerId);
|
|
1514
|
+
}
|
|
1515
|
+
internal.pointerDirty.clear();
|
|
1516
|
+
}
|
|
1517
|
+
return { handlePointer, flushDeferredPointers, processDeferredPointer };
|
|
1344
1518
|
}
|
|
1345
1519
|
const DOM_EVENTS = {
|
|
1346
1520
|
onClick: ["click", false],
|
|
@@ -1359,10 +1533,15 @@ const DOM_EVENTS = {
|
|
|
1359
1533
|
onLostPointerCapture: ["lostpointercapture", true]
|
|
1360
1534
|
};
|
|
1361
1535
|
function createPointerEvents(store) {
|
|
1362
|
-
const { handlePointer } = createEvents(store);
|
|
1536
|
+
const { handlePointer, flushDeferredPointers, processDeferredPointer } = createEvents(store);
|
|
1537
|
+
let nextXRPointerId = XR_POINTER_ID_START;
|
|
1538
|
+
const xrPointers = /* @__PURE__ */ new Map();
|
|
1363
1539
|
return {
|
|
1364
1540
|
priority: 1,
|
|
1365
1541
|
enabled: true,
|
|
1542
|
+
frameTimedRaycasts: true,
|
|
1543
|
+
alwaysFireOnScroll: true,
|
|
1544
|
+
updateOnFrame: false,
|
|
1366
1545
|
compute(event, state) {
|
|
1367
1546
|
state.pointer.set(event.offsetX / state.size.width * 2 - 1, -(event.offsetY / state.size.height) * 2 + 1);
|
|
1368
1547
|
state.raycaster.setFromCamera(state.pointer, state.camera);
|
|
@@ -1372,11 +1551,33 @@ function createPointerEvents(store) {
|
|
|
1372
1551
|
(acc, key) => ({ ...acc, [key]: handlePointer(key) }),
|
|
1373
1552
|
{}
|
|
1374
1553
|
),
|
|
1375
|
-
update: () => {
|
|
1554
|
+
update: (pointerId) => {
|
|
1376
1555
|
const { events, internal } = store.getState();
|
|
1377
|
-
if (
|
|
1556
|
+
if (!events.handlers) return;
|
|
1557
|
+
if (pointerId !== void 0) {
|
|
1558
|
+
const event = internal.pointerDirty.get(pointerId);
|
|
1559
|
+
if (event) {
|
|
1560
|
+
internal.pointerDirty.delete(pointerId);
|
|
1561
|
+
processDeferredPointer(event, pointerId);
|
|
1562
|
+
} else if (internal.lastEvent?.current) {
|
|
1563
|
+
processDeferredPointer(internal.lastEvent.current, pointerId);
|
|
1564
|
+
}
|
|
1565
|
+
} else {
|
|
1566
|
+
flushDeferredPointers();
|
|
1567
|
+
if (internal.lastEvent?.current) {
|
|
1568
|
+
events.handlers.onPointerMove(internal.lastEvent.current);
|
|
1569
|
+
}
|
|
1570
|
+
}
|
|
1571
|
+
},
|
|
1572
|
+
flush: () => {
|
|
1573
|
+
const { events, internal } = store.getState();
|
|
1574
|
+
flushDeferredPointers();
|
|
1575
|
+
if (events.updateOnFrame && internal.lastEvent?.current && events.handlers) {
|
|
1576
|
+
events.handlers.onPointerMove(internal.lastEvent.current);
|
|
1577
|
+
}
|
|
1378
1578
|
},
|
|
1379
1579
|
connect: (target) => {
|
|
1580
|
+
if (!target) return;
|
|
1380
1581
|
const { set, events } = store.getState();
|
|
1381
1582
|
events.disconnect?.();
|
|
1382
1583
|
set((state) => ({ events: { ...state.events, connected: target } }));
|
|
@@ -1400,6 +1601,33 @@ function createPointerEvents(store) {
|
|
|
1400
1601
|
}
|
|
1401
1602
|
set((state) => ({ events: { ...state.events, connected: void 0 } }));
|
|
1402
1603
|
}
|
|
1604
|
+
},
|
|
1605
|
+
// PREVIEW (A8): the XR pointer registration API may change before stable.
|
|
1606
|
+
registerPointer: (config) => {
|
|
1607
|
+
const pointerId = nextXRPointerId++;
|
|
1608
|
+
xrPointers.set(pointerId, config);
|
|
1609
|
+
const { internal } = store.getState();
|
|
1610
|
+
getPointerState(internal, pointerId);
|
|
1611
|
+
return pointerId;
|
|
1612
|
+
},
|
|
1613
|
+
unregisterPointer: (pointerId) => {
|
|
1614
|
+
xrPointers.delete(pointerId);
|
|
1615
|
+
const { internal } = store.getState();
|
|
1616
|
+
const pointerState = internal.pointerMap.get(pointerId);
|
|
1617
|
+
if (pointerState) {
|
|
1618
|
+
for (const [, hoveredObj] of pointerState.hovered) {
|
|
1619
|
+
const eventObject = hoveredObj.eventObject;
|
|
1620
|
+
const instance = eventObject.__r3f;
|
|
1621
|
+
if (instance?.eventCount) {
|
|
1622
|
+
const handlers = instance.handlers;
|
|
1623
|
+
const data = { ...hoveredObj, intersections: [] };
|
|
1624
|
+
handlers.onPointerOut?.(data);
|
|
1625
|
+
handlers.onPointerLeave?.(data);
|
|
1626
|
+
}
|
|
1627
|
+
}
|
|
1628
|
+
internal.pointerMap.delete(pointerId);
|
|
1629
|
+
}
|
|
1630
|
+
internal.pointerDirty.delete(pointerId);
|
|
1403
1631
|
}
|
|
1404
1632
|
};
|
|
1405
1633
|
}
|
|
@@ -1461,1036 +1689,11 @@ function notifyAlpha({ message, link }) {
|
|
|
1461
1689
|
}
|
|
1462
1690
|
}
|
|
1463
1691
|
|
|
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;
|
|
1730
|
-
}
|
|
1731
|
-
|
|
1732
|
-
var __defProp$1 = Object.defineProperty;
|
|
1733
|
-
var __defNormalProp$1 = (obj, key, value) => key in obj ? __defProp$1(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
|
|
1734
|
-
var __publicField$1 = (obj, key, value) => __defNormalProp$1(obj, typeof key !== "symbol" ? key + "" : key, value);
|
|
1735
|
-
const hmrData = (() => {
|
|
1736
|
-
if (typeof process !== "undefined" && process.env.NODE_ENV === "test") return void 0;
|
|
1737
|
-
if (typeof import_meta_hot !== "undefined") return import_meta_hot;
|
|
1738
|
-
try {
|
|
1739
|
-
return (0, eval)("import.meta.hot");
|
|
1740
|
-
} catch {
|
|
1741
|
-
return void 0;
|
|
1742
|
-
}
|
|
1743
|
-
})();
|
|
1744
|
-
const _Scheduler = class _Scheduler {
|
|
1745
|
-
//* Constructor ================================
|
|
1746
|
-
constructor() {
|
|
1747
|
-
//* Critical State ================================
|
|
1748
|
-
__publicField$1(this, "roots", /* @__PURE__ */ new Map());
|
|
1749
|
-
__publicField$1(this, "phaseGraph");
|
|
1750
|
-
__publicField$1(this, "loopState", {
|
|
1751
|
-
running: false,
|
|
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?.();
|
|
1692
|
+
const INTERNAL_LIB_MARKERS = ["zustand", "setState", "Object.assign"];
|
|
1693
|
+
function isInternalRendererAccess(stack, callerDepth = 2) {
|
|
1694
|
+
if (!stack) return false;
|
|
1695
|
+
const caller = stack.split("\n")[callerDepth] ?? "";
|
|
1696
|
+
return INTERNAL_LIB_MARKERS.some((m) => caller.includes(m));
|
|
2494
1697
|
}
|
|
2495
1698
|
|
|
2496
1699
|
const R3F_CONTEXT = Symbol.for("@react-three/fiber.context");
|
|
@@ -2530,7 +1733,14 @@ const createStore = (invalidate, advance) => {
|
|
|
2530
1733
|
frustum: new webgpu.Frustum(),
|
|
2531
1734
|
autoUpdateFrustum: true,
|
|
2532
1735
|
raycaster: null,
|
|
2533
|
-
events: {
|
|
1736
|
+
events: {
|
|
1737
|
+
priority: 1,
|
|
1738
|
+
enabled: true,
|
|
1739
|
+
connected: false,
|
|
1740
|
+
frameTimedRaycasts: true,
|
|
1741
|
+
alwaysFireOnScroll: true,
|
|
1742
|
+
updateOnFrame: false
|
|
1743
|
+
},
|
|
2534
1744
|
scene: null,
|
|
2535
1745
|
rootScene: null,
|
|
2536
1746
|
xr: null,
|
|
@@ -2595,7 +1805,7 @@ const createStore = (invalidate, advance) => {
|
|
|
2595
1805
|
size: newSize,
|
|
2596
1806
|
viewport: { ...s.viewport, ...getCurrentViewport(state2.camera, defaultTarget, newSize) }
|
|
2597
1807
|
}));
|
|
2598
|
-
getScheduler().invalidate();
|
|
1808
|
+
scheduler.getScheduler().invalidate();
|
|
2599
1809
|
}
|
|
2600
1810
|
}
|
|
2601
1811
|
return;
|
|
@@ -2610,7 +1820,7 @@ const createStore = (invalidate, advance) => {
|
|
|
2610
1820
|
viewport: { ...s.viewport, ...getCurrentViewport(state2.camera, defaultTarget, size) },
|
|
2611
1821
|
_sizeImperative: true
|
|
2612
1822
|
}));
|
|
2613
|
-
getScheduler().invalidate();
|
|
1823
|
+
scheduler.getScheduler().invalidate();
|
|
2614
1824
|
},
|
|
2615
1825
|
setDpr: (dpr) => set((state2) => {
|
|
2616
1826
|
const resolved = calculateDpr(dpr);
|
|
@@ -2618,14 +1828,18 @@ const createStore = (invalidate, advance) => {
|
|
|
2618
1828
|
}),
|
|
2619
1829
|
setFrameloop: (frameloop = "always") => {
|
|
2620
1830
|
set(() => ({ frameloop }));
|
|
1831
|
+
scheduler.getScheduler().frameloop = frameloop;
|
|
2621
1832
|
},
|
|
2622
1833
|
setError: (error) => set(() => ({ error })),
|
|
2623
1834
|
error: null,
|
|
2624
|
-
//* TSL State (managed via hooks: useUniforms, useNodes, useTextures,
|
|
1835
|
+
//* TSL State (managed via hooks: useUniforms, useNodes, useBuffers, useGPUStorage, useTextures, useRenderPipeline) ==============================
|
|
2625
1836
|
uniforms: {},
|
|
2626
1837
|
nodes: {},
|
|
1838
|
+
buffers: {},
|
|
1839
|
+
gpuStorage: {},
|
|
2627
1840
|
textures: /* @__PURE__ */ new Map(),
|
|
2628
|
-
|
|
1841
|
+
_textureRefs: /* @__PURE__ */ new Map(),
|
|
1842
|
+
renderPipeline: null,
|
|
2629
1843
|
passes: {},
|
|
2630
1844
|
_hmrVersion: 0,
|
|
2631
1845
|
_sizeImperative: false,
|
|
@@ -2634,12 +1848,16 @@ const createStore = (invalidate, advance) => {
|
|
|
2634
1848
|
internal: {
|
|
2635
1849
|
// Events
|
|
2636
1850
|
interaction: [],
|
|
2637
|
-
hovered: /* @__PURE__ */ new Map(),
|
|
2638
1851
|
subscribers: [],
|
|
1852
|
+
// Per-pointer state (new unified structure)
|
|
1853
|
+
pointerMap: /* @__PURE__ */ new Map(),
|
|
1854
|
+
pointerDirty: /* @__PURE__ */ new Map(),
|
|
1855
|
+
lastEvent: React__namespace.createRef(),
|
|
1856
|
+
// Deprecated but kept for backwards compatibility
|
|
1857
|
+
hovered: /* @__PURE__ */ new Map(),
|
|
2639
1858
|
initialClick: [0, 0],
|
|
2640
1859
|
initialHits: [],
|
|
2641
1860
|
capturedMap: /* @__PURE__ */ new Map(),
|
|
2642
|
-
lastEvent: React__namespace.createRef(),
|
|
2643
1861
|
// Visibility tracking (onFramed, onOccluded, onVisible)
|
|
2644
1862
|
visibilityRegistry: /* @__PURE__ */ new Map(),
|
|
2645
1863
|
// Occlusion system (WebGPU only)
|
|
@@ -2678,8 +1896,7 @@ const createStore = (invalidate, advance) => {
|
|
|
2678
1896
|
const currentState = rootStore.getState();
|
|
2679
1897
|
if (!currentState.isLegacy && currentState.internal.actualRenderer) {
|
|
2680
1898
|
const stack = new Error().stack || "";
|
|
2681
|
-
|
|
2682
|
-
if (!isInternalAccess) {
|
|
1899
|
+
if (!isInternalRendererAccess(stack)) {
|
|
2683
1900
|
const cleanedStack = stack.split("\n").slice(2).join("\n") || "Stack trace unavailable";
|
|
2684
1901
|
notifyDepreciated({
|
|
2685
1902
|
heading: "Accessing state.gl in WebGPU mode",
|
|
@@ -2727,14 +1944,16 @@ const createStore = (invalidate, advance) => {
|
|
|
2727
1944
|
oldSize = size;
|
|
2728
1945
|
oldDpr = viewport.dpr;
|
|
2729
1946
|
updateCamera(camera, size);
|
|
2730
|
-
if (canvasTarget) {
|
|
1947
|
+
if (internal.isSecondary && canvasTarget) {
|
|
2731
1948
|
if (viewport.dpr > 0) canvasTarget.setPixelRatio(viewport.dpr);
|
|
2732
|
-
|
|
2733
|
-
canvasTarget.setSize(size.width, size.height, updateStyle);
|
|
1949
|
+
canvasTarget.setSize(size.width, size.height, false);
|
|
2734
1950
|
} else {
|
|
2735
1951
|
if (viewport.dpr > 0) actualRenderer.setPixelRatio(viewport.dpr);
|
|
2736
|
-
|
|
2737
|
-
|
|
1952
|
+
actualRenderer.setSize(size.width, size.height, false);
|
|
1953
|
+
if (canvasTarget) {
|
|
1954
|
+
if (viewport.dpr > 0) canvasTarget.setPixelRatio(viewport.dpr);
|
|
1955
|
+
canvasTarget.setSize(size.width, size.height, false);
|
|
1956
|
+
}
|
|
2738
1957
|
}
|
|
2739
1958
|
}
|
|
2740
1959
|
if (camera !== oldCamera) {
|
|
@@ -2790,26 +2009,32 @@ function loadingFn(extensions, onProgress) {
|
|
|
2790
2009
|
);
|
|
2791
2010
|
};
|
|
2792
2011
|
}
|
|
2793
|
-
function useLoader(loader, input, extensions, onProgress) {
|
|
2794
|
-
const
|
|
2012
|
+
function useLoader(loader, input, extensions, onProgress, cacheKey) {
|
|
2013
|
+
const inputs = Array.isArray(input) ? input : [input];
|
|
2014
|
+
const cacheKeys = Array.isArray(cacheKey ?? input) ? cacheKey ?? input : [cacheKey ?? input];
|
|
2795
2015
|
const fn = loadingFn(extensions, onProgress);
|
|
2796
|
-
const results =
|
|
2016
|
+
const results = cacheKeys.map(
|
|
2017
|
+
(key, index) => suspendReact.suspend(() => fn(loader, inputs[index]), [loader, key], { equal: is.equ })
|
|
2018
|
+
);
|
|
2797
2019
|
return Array.isArray(input) ? results : results[0];
|
|
2798
2020
|
}
|
|
2799
|
-
useLoader.preload = function(loader, input, extensions, onProgress) {
|
|
2800
|
-
const
|
|
2801
|
-
|
|
2021
|
+
useLoader.preload = function(loader, input, extensions, onProgress, cacheKey) {
|
|
2022
|
+
const inputs = Array.isArray(input) ? input : [input];
|
|
2023
|
+
const cacheKeys = Array.isArray(cacheKey ?? input) ? cacheKey ?? input : [cacheKey ?? input];
|
|
2024
|
+
cacheKeys.forEach(
|
|
2025
|
+
(key, index) => suspendReact.preload(() => loadingFn(extensions, onProgress)(loader, inputs[index]), [loader, key])
|
|
2026
|
+
);
|
|
2802
2027
|
};
|
|
2803
|
-
useLoader.clear = function(loader, input) {
|
|
2804
|
-
const
|
|
2805
|
-
|
|
2028
|
+
useLoader.clear = function(loader, input, cacheKey) {
|
|
2029
|
+
const cacheKeys = Array.isArray(cacheKey ?? input) ? cacheKey ?? input : [cacheKey ?? input];
|
|
2030
|
+
cacheKeys.forEach((key) => suspendReact.clear([loader, key]));
|
|
2806
2031
|
};
|
|
2807
2032
|
useLoader.loader = getLoader;
|
|
2808
2033
|
|
|
2809
2034
|
function useFrame(callback, priorityOrOptions) {
|
|
2810
2035
|
const store = React__namespace.useContext(context);
|
|
2811
2036
|
const isInsideCanvas = store !== null;
|
|
2812
|
-
const scheduler = getScheduler();
|
|
2037
|
+
const scheduler$1 = scheduler.getScheduler();
|
|
2813
2038
|
const optionsKey = typeof priorityOrOptions === "number" ? `p:${priorityOrOptions}` : priorityOrOptions ? JSON.stringify({
|
|
2814
2039
|
id: priorityOrOptions.id,
|
|
2815
2040
|
phase: priorityOrOptions.phase,
|
|
@@ -2857,7 +2082,7 @@ function useFrame(callback, priorityOrOptions) {
|
|
|
2857
2082
|
};
|
|
2858
2083
|
callbackRef.current?.(mergedState, delta);
|
|
2859
2084
|
};
|
|
2860
|
-
const unregister = scheduler.register(wrappedCallback, {
|
|
2085
|
+
const unregister = scheduler$1.register(wrappedCallback, {
|
|
2861
2086
|
id,
|
|
2862
2087
|
rootId,
|
|
2863
2088
|
...options
|
|
@@ -2878,37 +2103,31 @@ function useFrame(callback, priorityOrOptions) {
|
|
|
2878
2103
|
}
|
|
2879
2104
|
};
|
|
2880
2105
|
} else {
|
|
2881
|
-
|
|
2882
|
-
|
|
2883
|
-
|
|
2884
|
-
|
|
2885
|
-
|
|
2886
|
-
|
|
2887
|
-
|
|
2888
|
-
|
|
2889
|
-
unregisterJob = registerOutside();
|
|
2890
|
-
});
|
|
2891
|
-
return () => {
|
|
2892
|
-
unsubReady();
|
|
2893
|
-
unregisterJob?.();
|
|
2894
|
-
};
|
|
2106
|
+
return scheduler$1.register(
|
|
2107
|
+
(state, delta) => {
|
|
2108
|
+
const frameState = state;
|
|
2109
|
+
if (!frameState.renderer) return;
|
|
2110
|
+
callbackRef.current?.(frameState, delta);
|
|
2111
|
+
},
|
|
2112
|
+
{ id, ...options }
|
|
2113
|
+
);
|
|
2895
2114
|
}
|
|
2896
|
-
}, [store, scheduler, id, optionsKey, isLegacyPriority, isInsideCanvas]);
|
|
2115
|
+
}, [store, scheduler$1, id, optionsKey, isLegacyPriority, isInsideCanvas]);
|
|
2897
2116
|
const isPaused = React__namespace.useSyncExternalStore(
|
|
2898
2117
|
// Subscribe function
|
|
2899
2118
|
React__namespace.useCallback(
|
|
2900
2119
|
(onStoreChange) => {
|
|
2901
|
-
return getScheduler().subscribeJobState(id, onStoreChange);
|
|
2120
|
+
return scheduler.getScheduler().subscribeJobState(id, onStoreChange);
|
|
2902
2121
|
},
|
|
2903
2122
|
[id]
|
|
2904
2123
|
),
|
|
2905
2124
|
// getSnapshot function
|
|
2906
|
-
React__namespace.useCallback(() => getScheduler().isJobPaused(id), [id]),
|
|
2125
|
+
React__namespace.useCallback(() => scheduler.getScheduler().isJobPaused(id), [id]),
|
|
2907
2126
|
// getServerSnapshot function (SSR)
|
|
2908
2127
|
React__namespace.useCallback(() => false, [])
|
|
2909
2128
|
);
|
|
2910
2129
|
const controls = React__namespace.useMemo(() => {
|
|
2911
|
-
const scheduler2 = getScheduler();
|
|
2130
|
+
const scheduler2 = scheduler.getScheduler();
|
|
2912
2131
|
return {
|
|
2913
2132
|
/** The job's unique ID */
|
|
2914
2133
|
id,
|
|
@@ -2923,7 +2142,7 @@ function useFrame(callback, priorityOrOptions) {
|
|
|
2923
2142
|
* @param timestamp Optional timestamp (defaults to performance.now())
|
|
2924
2143
|
*/
|
|
2925
2144
|
step: (timestamp) => {
|
|
2926
|
-
getScheduler().stepJob(id, timestamp);
|
|
2145
|
+
scheduler.getScheduler().stepJob(id, timestamp);
|
|
2927
2146
|
},
|
|
2928
2147
|
/**
|
|
2929
2148
|
* Manually step ALL jobs in the scheduler.
|
|
@@ -2931,20 +2150,20 @@ function useFrame(callback, priorityOrOptions) {
|
|
|
2931
2150
|
* @param timestamp Optional timestamp (defaults to performance.now())
|
|
2932
2151
|
*/
|
|
2933
2152
|
stepAll: (timestamp) => {
|
|
2934
|
-
getScheduler().step(timestamp);
|
|
2153
|
+
scheduler.getScheduler().step(timestamp);
|
|
2935
2154
|
},
|
|
2936
2155
|
/**
|
|
2937
2156
|
* Pause this job (set enabled=false).
|
|
2938
2157
|
* Job remains registered but won't run.
|
|
2939
2158
|
*/
|
|
2940
2159
|
pause: () => {
|
|
2941
|
-
getScheduler().pauseJob(id);
|
|
2160
|
+
scheduler.getScheduler().pauseJob(id);
|
|
2942
2161
|
},
|
|
2943
2162
|
/**
|
|
2944
2163
|
* Resume this job (set enabled=true).
|
|
2945
2164
|
*/
|
|
2946
2165
|
resume: () => {
|
|
2947
|
-
getScheduler().resumeJob(id);
|
|
2166
|
+
scheduler.getScheduler().resumeJob(id);
|
|
2948
2167
|
},
|
|
2949
2168
|
/**
|
|
2950
2169
|
* Reactive paused state - automatically updates when pause/resume is called.
|
|
@@ -2982,18 +2201,18 @@ function buildFromCache(input, textureCache) {
|
|
|
2982
2201
|
function useTexture(input, optionsOrOnLoad) {
|
|
2983
2202
|
const renderer = useThree((state) => state.internal.actualRenderer);
|
|
2984
2203
|
const store = useStore();
|
|
2985
|
-
const textureCache = useThree((state) => state.textures);
|
|
2986
2204
|
const options = typeof optionsOrOnLoad === "function" ? { onLoad: optionsOrOnLoad } : optionsOrOnLoad ?? {};
|
|
2987
|
-
const { onLoad, cache =
|
|
2205
|
+
const { onLoad, cache = true } = options;
|
|
2988
2206
|
const onLoadRef = React.useRef(onLoad);
|
|
2989
2207
|
onLoadRef.current = onLoad;
|
|
2990
2208
|
const onLoadCalledForRef = React.useRef(null);
|
|
2991
2209
|
const urls = React.useMemo(() => getUrls(input), [input]);
|
|
2992
2210
|
const cachedResult = React.useMemo(() => {
|
|
2993
2211
|
if (!cache) return null;
|
|
2994
|
-
|
|
2995
|
-
|
|
2996
|
-
|
|
2212
|
+
const textures = store.getState().textures;
|
|
2213
|
+
if (!allUrlsCached(urls, textures)) return null;
|
|
2214
|
+
return buildFromCache(input, textures);
|
|
2215
|
+
}, [cache, urls, input, store]);
|
|
2997
2216
|
const loadedTextures = useLoader(
|
|
2998
2217
|
webgpu.TextureLoader,
|
|
2999
2218
|
IsObject(input) ? Object.values(input) : input
|
|
@@ -3037,8 +2256,6 @@ function useTexture(input, optionsOrOnLoad) {
|
|
|
3037
2256
|
}, [input, loadedTextures, cachedResult]);
|
|
3038
2257
|
React.useEffect(() => {
|
|
3039
2258
|
if (!cache) return;
|
|
3040
|
-
if (cachedResult) return;
|
|
3041
|
-
const set = store.setState;
|
|
3042
2259
|
const urlTextureMap = [];
|
|
3043
2260
|
if (typeof input === "string") {
|
|
3044
2261
|
urlTextureMap.push([input, mappedTextures]);
|
|
@@ -3052,18 +2269,32 @@ function useTexture(input, optionsOrOnLoad) {
|
|
|
3052
2269
|
urlTextureMap.push([url, textureRecord[key]]);
|
|
3053
2270
|
}
|
|
3054
2271
|
}
|
|
3055
|
-
|
|
3056
|
-
const
|
|
3057
|
-
let
|
|
2272
|
+
store.setState((state) => {
|
|
2273
|
+
const refs = new Map(state._textureRefs);
|
|
2274
|
+
let textures = state.textures;
|
|
2275
|
+
let added = false;
|
|
3058
2276
|
for (const [url, texture] of urlTextureMap) {
|
|
3059
|
-
if (!
|
|
3060
|
-
|
|
3061
|
-
|
|
2277
|
+
if (!textures.has(url)) {
|
|
2278
|
+
if (!added) {
|
|
2279
|
+
textures = new Map(textures);
|
|
2280
|
+
added = true;
|
|
2281
|
+
}
|
|
2282
|
+
textures.set(url, texture);
|
|
3062
2283
|
}
|
|
2284
|
+
refs.set(url, (refs.get(url) ?? 0) + 1);
|
|
3063
2285
|
}
|
|
3064
|
-
return
|
|
2286
|
+
return added ? { textures, _textureRefs: refs } : { _textureRefs: refs };
|
|
3065
2287
|
});
|
|
3066
|
-
|
|
2288
|
+
return () => store.setState((state) => {
|
|
2289
|
+
const refs = new Map(state._textureRefs);
|
|
2290
|
+
for (const [url] of urlTextureMap) {
|
|
2291
|
+
const next = (refs.get(url) ?? 0) - 1;
|
|
2292
|
+
if (next <= 0) refs.delete(url);
|
|
2293
|
+
else refs.set(url, next);
|
|
2294
|
+
}
|
|
2295
|
+
return { _textureRefs: refs };
|
|
2296
|
+
});
|
|
2297
|
+
}, [cache, input, mappedTextures, store]);
|
|
3067
2298
|
return mappedTextures;
|
|
3068
2299
|
}
|
|
3069
2300
|
useTexture.preload = (url) => useLoader.preload(webgpu.TextureLoader, url);
|
|
@@ -3079,96 +2310,63 @@ const Texture = ({
|
|
|
3079
2310
|
return /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children: children?.(ret) });
|
|
3080
2311
|
};
|
|
3081
2312
|
|
|
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() {
|
|
2313
|
+
function useTextures(selector) {
|
|
3090
2314
|
const store = useStore();
|
|
3091
|
-
|
|
3092
|
-
const set = store.setState;
|
|
2315
|
+
const registry = React.useMemo(() => {
|
|
3093
2316
|
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
|
-
};
|
|
2317
|
+
const setState = store.setState;
|
|
2318
|
+
const getOne = (key) => getState().textures.get(key);
|
|
3152
2319
|
return {
|
|
3153
|
-
|
|
3154
|
-
get textures() {
|
|
2320
|
+
get all() {
|
|
3155
2321
|
return getState().textures;
|
|
3156
2322
|
},
|
|
3157
|
-
|
|
3158
|
-
|
|
2323
|
+
get(input) {
|
|
2324
|
+
if (typeof input === "string") return getOne(input);
|
|
2325
|
+
if (Array.isArray(input)) return input.map(getOne);
|
|
2326
|
+
const out = {};
|
|
2327
|
+
for (const name in input) out[name] = getOne(input[name]);
|
|
2328
|
+
return out;
|
|
2329
|
+
},
|
|
3159
2330
|
has: (key) => getState().textures.has(key),
|
|
3160
|
-
|
|
3161
|
-
|
|
3162
|
-
|
|
3163
|
-
|
|
3164
|
-
|
|
3165
|
-
|
|
3166
|
-
|
|
3167
|
-
|
|
3168
|
-
|
|
3169
|
-
|
|
2331
|
+
add(keyOrRecord, texture) {
|
|
2332
|
+
setState((state) => {
|
|
2333
|
+
const textures = new Map(state.textures);
|
|
2334
|
+
if (typeof keyOrRecord === "string") {
|
|
2335
|
+
textures.set(keyOrRecord, texture);
|
|
2336
|
+
} else {
|
|
2337
|
+
for (const key in keyOrRecord) textures.set(key, keyOrRecord[key]);
|
|
2338
|
+
}
|
|
2339
|
+
return { textures };
|
|
2340
|
+
});
|
|
2341
|
+
},
|
|
2342
|
+
dispose(key, options) {
|
|
2343
|
+
const state = getState();
|
|
2344
|
+
const refs = state._textureRefs.get(key) ?? 0;
|
|
2345
|
+
if (refs > 0 && !options?.force) {
|
|
2346
|
+
console.warn(
|
|
2347
|
+
`[useTextures] "${key}" still has ${refs} active reference(s); skipping dispose. Pass { force: true } to override.`
|
|
2348
|
+
);
|
|
2349
|
+
return false;
|
|
2350
|
+
}
|
|
2351
|
+
state.textures.get(key)?.dispose();
|
|
2352
|
+
setState((s) => {
|
|
2353
|
+
const textures = new Map(s.textures);
|
|
2354
|
+
textures.delete(key);
|
|
2355
|
+
const nextRefs = new Map(s._textureRefs);
|
|
2356
|
+
nextRefs.delete(key);
|
|
2357
|
+
return { textures, _textureRefs: nextRefs };
|
|
2358
|
+
});
|
|
2359
|
+
return true;
|
|
2360
|
+
},
|
|
2361
|
+
disposeAll() {
|
|
2362
|
+
for (const texture of getState().textures.values()) texture.dispose();
|
|
2363
|
+
setState({ textures: /* @__PURE__ */ new Map(), _textureRefs: /* @__PURE__ */ new Map() });
|
|
2364
|
+
}
|
|
3170
2365
|
};
|
|
3171
2366
|
}, [store]);
|
|
2367
|
+
const subscribe = selector ? () => selector(registry) : (state) => state.textures;
|
|
2368
|
+
const selected = useThree(subscribe);
|
|
2369
|
+
return selector ? selected : registry;
|
|
3172
2370
|
}
|
|
3173
2371
|
|
|
3174
2372
|
function useRenderTarget(widthOrOptions, heightOrOptions, options) {
|
|
@@ -3223,7 +2421,7 @@ function addEffect(callback) {
|
|
|
3223
2421
|
link: "https://docs.pmnd.rs/react-three-fiber/api/hooks#useframe"
|
|
3224
2422
|
});
|
|
3225
2423
|
const id = `legacy_effect_${effectId++}`;
|
|
3226
|
-
return getScheduler().registerGlobal("before", id, callback);
|
|
2424
|
+
return scheduler.getScheduler().registerGlobal("before", id, callback);
|
|
3227
2425
|
}
|
|
3228
2426
|
function addAfterEffect(callback) {
|
|
3229
2427
|
notifyDepreciated({
|
|
@@ -3232,7 +2430,7 @@ function addAfterEffect(callback) {
|
|
|
3232
2430
|
link: "https://docs.pmnd.rs/react-three-fiber/api/hooks#useframe"
|
|
3233
2431
|
});
|
|
3234
2432
|
const id = `legacy_afterEffect_${effectId++}`;
|
|
3235
|
-
return getScheduler().registerGlobal("after", id, callback);
|
|
2433
|
+
return scheduler.getScheduler().registerGlobal("after", id, callback);
|
|
3236
2434
|
}
|
|
3237
2435
|
function addTail(callback) {
|
|
3238
2436
|
notifyDepreciated({
|
|
@@ -3240,16 +2438,16 @@ function addTail(callback) {
|
|
|
3240
2438
|
body: "Use scheduler.onIdle(callback) instead.\naddTail will be removed in a future version.",
|
|
3241
2439
|
link: "https://docs.pmnd.rs/react-three-fiber/api/hooks#useframe"
|
|
3242
2440
|
});
|
|
3243
|
-
return getScheduler().onIdle(callback);
|
|
2441
|
+
return scheduler.getScheduler().onIdle(callback);
|
|
3244
2442
|
}
|
|
3245
2443
|
function invalidate(state, frames = 1, stackFrames = false) {
|
|
3246
|
-
getScheduler().invalidate(frames, stackFrames);
|
|
2444
|
+
scheduler.getScheduler().invalidate(frames, stackFrames);
|
|
3247
2445
|
}
|
|
3248
2446
|
function advance(timestamp) {
|
|
3249
|
-
getScheduler().step(timestamp);
|
|
2447
|
+
scheduler.getScheduler().step(timestamp);
|
|
3250
2448
|
}
|
|
3251
2449
|
|
|
3252
|
-
const version = "10.0.0-alpha.
|
|
2450
|
+
const version = "10.0.0-alpha.3";
|
|
3253
2451
|
const packageData = {
|
|
3254
2452
|
version: version};
|
|
3255
2453
|
|
|
@@ -14688,6 +13886,7 @@ function swapInstances() {
|
|
|
14688
13886
|
}
|
|
14689
13887
|
}
|
|
14690
13888
|
if (instance.isHidden) unhideInstance(instance);
|
|
13889
|
+
if (isObject3D(instance.object)) removeInteractivity(findInitialRoot(instance), instance.object);
|
|
14691
13890
|
if (instance.object.__r3f) delete instance.object.__r3f;
|
|
14692
13891
|
if (instance.type !== "primitive") disposeOnIdle(instance.object);
|
|
14693
13892
|
}
|
|
@@ -14700,6 +13899,8 @@ function swapInstances() {
|
|
|
14700
13899
|
instance.object.__r3f = instance;
|
|
14701
13900
|
setFiberRef(fiber, instance.object);
|
|
14702
13901
|
delete instance.appliedOnce;
|
|
13902
|
+
instance.eventCount = 0;
|
|
13903
|
+
instance.handlers = {};
|
|
14703
13904
|
applyProps(instance.object, instance.props);
|
|
14704
13905
|
if (instance.props.attach) {
|
|
14705
13906
|
attach(parent, instance);
|
|
@@ -14915,11 +14116,15 @@ const reconciler = /* @__PURE__ */ createReconciler({
|
|
|
14915
14116
|
cloneMutableTextInstance(textInstance) {
|
|
14916
14117
|
return textInstance;
|
|
14917
14118
|
},
|
|
14119
|
+
// React 19.2 added these for root-level view transitions. They only run for hosts that opt into
|
|
14120
|
+
// view transitions by returning a container from cloneRootViewTransitionContainer; R3F renders
|
|
14121
|
+
// into a WebGL/WebGPU canvas, where cloning the root has no meaning, so we never opt in and
|
|
14122
|
+
// React never calls them. They stay as no-ops rather than throws: the host config is shared by
|
|
14123
|
+
// every root, and a throw here would turn a React-internal probe into a hard crash for users.
|
|
14124
|
+
// Guarded by a test asserting a full render + unmount never reaches them.
|
|
14918
14125
|
cloneRootViewTransitionContainer(_rootContainer) {
|
|
14919
|
-
throw new Error("Not implemented.");
|
|
14920
14126
|
},
|
|
14921
14127
|
removeRootViewTransitionClone(_rootContainer, _clone) {
|
|
14922
|
-
throw new Error("Not implemented.");
|
|
14923
14128
|
},
|
|
14924
14129
|
// https://github.com/facebook/react/pull/32465
|
|
14925
14130
|
createFragmentInstance: (_fiber) => null,
|
|
@@ -15004,6 +14209,7 @@ function createRoot(canvas) {
|
|
|
15004
14209
|
const lastConfiguredProps = {};
|
|
15005
14210
|
let configured = false;
|
|
15006
14211
|
let pending = null;
|
|
14212
|
+
let rendererSetup = null;
|
|
15007
14213
|
return {
|
|
15008
14214
|
async configure(props = {}) {
|
|
15009
14215
|
let resolve;
|
|
@@ -15019,7 +14225,6 @@ function createRoot(canvas) {
|
|
|
15019
14225
|
events,
|
|
15020
14226
|
onCreated: onCreatedCallback,
|
|
15021
14227
|
shadows = false,
|
|
15022
|
-
textureColorSpace = webgpu.SRGBColorSpace,
|
|
15023
14228
|
orthographic = false,
|
|
15024
14229
|
frameloop = "always",
|
|
15025
14230
|
dpr = [1, 2],
|
|
@@ -15034,7 +14239,8 @@ function createRoot(canvas) {
|
|
|
15034
14239
|
_sizeProps,
|
|
15035
14240
|
forceEven
|
|
15036
14241
|
} = props;
|
|
15037
|
-
const
|
|
14242
|
+
const textureColorSpace = is.obj(glConfig) && !is.fun(glConfig) && !isRenderer(glConfig) && glConfig.textureColorSpace || is.obj(rendererConfig) && !is.fun(rendererConfig) && !isRenderer(rendererConfig) && rendererConfig.textureColorSpace || webgpu.SRGBColorSpace;
|
|
14243
|
+
let state = store.getState();
|
|
15038
14244
|
const defaultGPUProps = {
|
|
15039
14245
|
canvas,
|
|
15040
14246
|
antialias: true
|
|
@@ -15048,46 +14254,64 @@ function createRoot(canvas) {
|
|
|
15048
14254
|
throw new Error("Cannot use both gl and renderer props at the same time");
|
|
15049
14255
|
}
|
|
15050
14256
|
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
|
-
|
|
14257
|
+
if (!state.internal.actualRenderer) {
|
|
14258
|
+
if (!rendererSetup) {
|
|
14259
|
+
rendererSetup = (async () => {
|
|
14260
|
+
if (primaryCanvas) {
|
|
14261
|
+
const primary = await waitForPrimary(primaryCanvas);
|
|
14262
|
+
renderer = primary.renderer;
|
|
14263
|
+
state.internal.actualRenderer = renderer;
|
|
14264
|
+
const canvasTarget = new webgpu.CanvasTarget(canvas);
|
|
14265
|
+
primary.store.setState((prev) => ({
|
|
14266
|
+
internal: { ...prev.internal, isMultiCanvas: true }
|
|
14267
|
+
}));
|
|
14268
|
+
state.set((prev) => ({
|
|
14269
|
+
webGPUSupported: primary.store.getState().webGPUSupported,
|
|
14270
|
+
renderer,
|
|
14271
|
+
primaryStore: primary.store,
|
|
14272
|
+
internal: {
|
|
14273
|
+
...prev.internal,
|
|
14274
|
+
canvasTarget,
|
|
14275
|
+
isMultiCanvas: true,
|
|
14276
|
+
isSecondary: true,
|
|
14277
|
+
targetId: primaryCanvas
|
|
14278
|
+
}
|
|
14279
|
+
}));
|
|
14280
|
+
} else {
|
|
14281
|
+
renderer = await resolveRenderer(rendererConfig, defaultGPUProps, webgpu.WebGPURenderer);
|
|
14282
|
+
if (!renderer.hasInitialized?.()) {
|
|
14283
|
+
const size2 = computeInitialSize(canvas, propsSize);
|
|
14284
|
+
if (size2.width > 0 && size2.height > 0) {
|
|
14285
|
+
const pixelRatio = calculateDpr(dpr);
|
|
14286
|
+
canvas.width = size2.width * pixelRatio;
|
|
14287
|
+
canvas.height = size2.height * pixelRatio;
|
|
14288
|
+
}
|
|
14289
|
+
await renderer.init();
|
|
14290
|
+
}
|
|
14291
|
+
const backend = renderer.backend;
|
|
14292
|
+
const isWebGPUBackend = backend && "isWebGPUBackend" in backend;
|
|
14293
|
+
state.internal.actualRenderer = renderer;
|
|
14294
|
+
state.set({ webGPUSupported: isWebGPUBackend, renderer, primaryStore: store });
|
|
14295
|
+
if (canvasId && !state.internal.isSecondary) {
|
|
14296
|
+
const canvasTarget = new webgpu.CanvasTarget(canvas);
|
|
14297
|
+
const unregisterPrimary = registerPrimary(canvasId, renderer, store);
|
|
14298
|
+
state.set((prev) => ({
|
|
14299
|
+
internal: {
|
|
14300
|
+
...prev.internal,
|
|
14301
|
+
canvasTarget,
|
|
14302
|
+
unregisterPrimary
|
|
14303
|
+
}
|
|
14304
|
+
}));
|
|
14305
|
+
}
|
|
15088
14306
|
}
|
|
15089
|
-
}))
|
|
14307
|
+
})().catch((err) => {
|
|
14308
|
+
rendererSetup = null;
|
|
14309
|
+
throw err;
|
|
14310
|
+
});
|
|
15090
14311
|
}
|
|
14312
|
+
await rendererSetup;
|
|
14313
|
+
state = store.getState();
|
|
14314
|
+
renderer = state.internal.actualRenderer;
|
|
15091
14315
|
}
|
|
15092
14316
|
let raycaster = state.raycaster;
|
|
15093
14317
|
if (!raycaster) state.set({ raycaster: raycaster = new webgpu.Raycaster() });
|
|
@@ -15180,7 +14404,7 @@ function createRoot(canvas) {
|
|
|
15180
14404
|
lastConfiguredProps.performance = performance;
|
|
15181
14405
|
}
|
|
15182
14406
|
if (!state.xr) {
|
|
15183
|
-
const handleXRFrame = (timestamp,
|
|
14407
|
+
const handleXRFrame = (timestamp, _frame) => {
|
|
15184
14408
|
const state2 = store.getState();
|
|
15185
14409
|
if (state2.frameloop === "never") return;
|
|
15186
14410
|
advance(timestamp);
|
|
@@ -15216,15 +14440,22 @@ function createRoot(canvas) {
|
|
|
15216
14440
|
const oldType = renderer.shadowMap.type;
|
|
15217
14441
|
renderer.shadowMap.enabled = !!shadows;
|
|
15218
14442
|
if (is.boo(shadows)) {
|
|
15219
|
-
renderer.shadowMap.type = webgpu.
|
|
14443
|
+
renderer.shadowMap.type = webgpu.PCFShadowMap;
|
|
15220
14444
|
} else if (is.str(shadows)) {
|
|
14445
|
+
if (shadows === "soft") {
|
|
14446
|
+
notifyDepreciated({
|
|
14447
|
+
heading: 'shadows="soft" is deprecated',
|
|
14448
|
+
body: "Three has depreciated soft and improved basic PCFShadows, we converted for you.",
|
|
14449
|
+
link: "https://github.com/mrdoob/three.js/wiki/Migration-Guide?utm_source=chatgpt.com#181--182"
|
|
14450
|
+
});
|
|
14451
|
+
}
|
|
15221
14452
|
const types = {
|
|
15222
14453
|
basic: webgpu.BasicShadowMap,
|
|
15223
14454
|
percentage: webgpu.PCFShadowMap,
|
|
15224
|
-
soft: webgpu.
|
|
14455
|
+
soft: webgpu.PCFShadowMap,
|
|
15225
14456
|
variance: webgpu.VSMShadowMap
|
|
15226
14457
|
};
|
|
15227
|
-
renderer.shadowMap.type = types[shadows] ?? webgpu.
|
|
14458
|
+
renderer.shadowMap.type = types[shadows] ?? webgpu.PCFShadowMap;
|
|
15228
14459
|
} else if (is.obj(shadows)) {
|
|
15229
14460
|
Object.assign(renderer.shadowMap, shadows);
|
|
15230
14461
|
}
|
|
@@ -15240,24 +14471,35 @@ function createRoot(canvas) {
|
|
|
15240
14471
|
if (state.textureColorSpace !== textureColorSpace) state.set(() => ({ textureColorSpace }));
|
|
15241
14472
|
lastConfiguredProps.textureColorSpace = textureColorSpace;
|
|
15242
14473
|
}
|
|
14474
|
+
const r3fProps = ["textureColorSpace"];
|
|
14475
|
+
const constructorOnlyProps = ["samples", "antialias", "alpha", "canvas", "powerPreference"];
|
|
14476
|
+
const nonApplyProps = [...r3fProps, ...constructorOnlyProps];
|
|
15243
14477
|
if (glConfig && !is.fun(glConfig) && !isRenderer(glConfig) && !is.equ(glConfig, renderer, shallowLoose)) {
|
|
15244
|
-
|
|
14478
|
+
const glProps = {};
|
|
14479
|
+
for (const key in glConfig) {
|
|
14480
|
+
if (!nonApplyProps.includes(key)) glProps[key] = glConfig[key];
|
|
14481
|
+
}
|
|
14482
|
+
applyProps(renderer, glProps);
|
|
15245
14483
|
}
|
|
15246
14484
|
if (rendererConfig && !is.fun(rendererConfig) && !isRenderer(rendererConfig) && state.renderer) {
|
|
15247
14485
|
const currentRenderer = state.renderer;
|
|
15248
14486
|
if (!is.equ(rendererConfig, currentRenderer, shallowLoose)) {
|
|
15249
|
-
|
|
14487
|
+
const rendererProps = {};
|
|
14488
|
+
for (const key in rendererConfig) {
|
|
14489
|
+
if (!nonApplyProps.includes(key)) rendererProps[key] = rendererConfig[key];
|
|
14490
|
+
}
|
|
14491
|
+
applyProps(currentRenderer, rendererProps);
|
|
15250
14492
|
}
|
|
15251
14493
|
}
|
|
15252
|
-
const scheduler = getScheduler();
|
|
14494
|
+
const scheduler$1 = scheduler.getScheduler();
|
|
15253
14495
|
const rootId = state.internal.rootId;
|
|
15254
14496
|
if (!rootId) {
|
|
15255
|
-
const newRootId = canvasId || scheduler.generateRootId();
|
|
15256
|
-
const unregisterRoot = scheduler.registerRoot(newRootId, {
|
|
14497
|
+
const newRootId = canvasId || scheduler$1.generateRootId();
|
|
14498
|
+
const unregisterRoot = scheduler$1.registerRoot(newRootId, {
|
|
15257
14499
|
getState: () => store.getState(),
|
|
15258
14500
|
onError: (err) => store.getState().setError(err)
|
|
15259
14501
|
});
|
|
15260
|
-
const unregisterCanvasTarget = scheduler.register(
|
|
14502
|
+
const unregisterCanvasTarget = scheduler$1.register(
|
|
15261
14503
|
() => {
|
|
15262
14504
|
const state2 = store.getState();
|
|
15263
14505
|
if (state2.internal.isMultiCanvas && state2.internal.canvasTarget) {
|
|
@@ -15272,7 +14514,19 @@ function createRoot(canvas) {
|
|
|
15272
14514
|
system: true
|
|
15273
14515
|
}
|
|
15274
14516
|
);
|
|
15275
|
-
const
|
|
14517
|
+
const unregisterEventsFlush = scheduler$1.register(
|
|
14518
|
+
() => {
|
|
14519
|
+
const state2 = store.getState();
|
|
14520
|
+
state2.events.flush?.();
|
|
14521
|
+
},
|
|
14522
|
+
{
|
|
14523
|
+
id: `${newRootId}_events`,
|
|
14524
|
+
rootId: newRootId,
|
|
14525
|
+
phase: "input",
|
|
14526
|
+
system: true
|
|
14527
|
+
}
|
|
14528
|
+
);
|
|
14529
|
+
const unregisterFrustum = scheduler$1.register(
|
|
15276
14530
|
() => {
|
|
15277
14531
|
const state2 = store.getState();
|
|
15278
14532
|
if (state2.autoUpdateFrustum && state2.camera) {
|
|
@@ -15282,11 +14536,11 @@ function createRoot(canvas) {
|
|
|
15282
14536
|
{
|
|
15283
14537
|
id: `${newRootId}_frustum`,
|
|
15284
14538
|
rootId: newRootId,
|
|
15285
|
-
|
|
14539
|
+
before: "render",
|
|
15286
14540
|
system: true
|
|
15287
14541
|
}
|
|
15288
14542
|
);
|
|
15289
|
-
const unregisterVisibility = scheduler.register(
|
|
14543
|
+
const unregisterVisibility = scheduler$1.register(
|
|
15290
14544
|
() => {
|
|
15291
14545
|
const state2 = store.getState();
|
|
15292
14546
|
checkVisibility(state2);
|
|
@@ -15294,19 +14548,19 @@ function createRoot(canvas) {
|
|
|
15294
14548
|
{
|
|
15295
14549
|
id: `${newRootId}_visibility`,
|
|
15296
14550
|
rootId: newRootId,
|
|
15297
|
-
|
|
14551
|
+
before: "render",
|
|
15298
14552
|
system: true,
|
|
15299
14553
|
after: `${newRootId}_frustum`
|
|
15300
14554
|
}
|
|
15301
14555
|
);
|
|
15302
|
-
const unregisterRender = scheduler.register(
|
|
14556
|
+
const unregisterRender = scheduler$1.register(
|
|
15303
14557
|
() => {
|
|
15304
14558
|
const state2 = store.getState();
|
|
15305
14559
|
const renderer2 = state2.internal.actualRenderer;
|
|
15306
|
-
const userHandlesRender = scheduler.hasUserJobsInPhase("render", newRootId);
|
|
14560
|
+
const userHandlesRender = scheduler$1.hasUserJobsInPhase("render", newRootId);
|
|
15307
14561
|
if (userHandlesRender || state2.internal.priority) return;
|
|
15308
14562
|
try {
|
|
15309
|
-
if (state2.
|
|
14563
|
+
if (state2.renderPipeline?.render) state2.renderPipeline.render();
|
|
15310
14564
|
else if (renderer2?.render) renderer2.render(state2.scene, state2.camera);
|
|
15311
14565
|
} catch (error) {
|
|
15312
14566
|
state2.setError(error instanceof Error ? error : new Error(String(error)));
|
|
@@ -15331,15 +14585,16 @@ function createRoot(canvas) {
|
|
|
15331
14585
|
unregisterRoot: () => {
|
|
15332
14586
|
unregisterRoot();
|
|
15333
14587
|
unregisterCanvasTarget();
|
|
14588
|
+
unregisterEventsFlush();
|
|
15334
14589
|
unregisterFrustum();
|
|
15335
14590
|
unregisterVisibility();
|
|
15336
14591
|
unregisterRender();
|
|
15337
14592
|
},
|
|
15338
|
-
scheduler
|
|
14593
|
+
scheduler: scheduler$1
|
|
15339
14594
|
}
|
|
15340
14595
|
}));
|
|
15341
14596
|
}
|
|
15342
|
-
scheduler.frameloop = frameloop;
|
|
14597
|
+
scheduler$1.frameloop = frameloop;
|
|
15343
14598
|
onCreated = onCreatedCallback;
|
|
15344
14599
|
configured = true;
|
|
15345
14600
|
resolve();
|
|
@@ -15406,7 +14661,8 @@ function unmountComponentAtNode(canvas, callback) {
|
|
|
15406
14661
|
dispose(state.scene);
|
|
15407
14662
|
_roots.delete(canvas);
|
|
15408
14663
|
if (callback) callback(canvas);
|
|
15409
|
-
} catch {
|
|
14664
|
+
} catch (error) {
|
|
14665
|
+
console.warn("[R3F] Error while unmounting root; teardown may be incomplete:", error);
|
|
15410
14666
|
}
|
|
15411
14667
|
}, 500);
|
|
15412
14668
|
}
|
|
@@ -15469,6 +14725,7 @@ function PortalInner({ state = {}, children, container }) {
|
|
|
15469
14725
|
viewport = rootState.viewport.getCurrentViewport(camera, new webgpu.Vector3(), resolvedSize);
|
|
15470
14726
|
if (camera !== rootState.camera) updateCamera(camera, resolvedSize);
|
|
15471
14727
|
}
|
|
14728
|
+
const set = injectState.set;
|
|
15472
14729
|
return {
|
|
15473
14730
|
// The intersect consists of the previous root state
|
|
15474
14731
|
...rootState,
|
|
@@ -15487,7 +14744,7 @@ function PortalInner({ state = {}, children, container }) {
|
|
|
15487
14744
|
size: resolvedSize,
|
|
15488
14745
|
viewport: { ...rootState.viewport, ...viewport },
|
|
15489
14746
|
// Layers are allowed to override events
|
|
15490
|
-
setEvents: (events2) =>
|
|
14747
|
+
setEvents: (events2) => set((state2) => ({ ...state2, events: { ...state2.events, ...events2 } })),
|
|
15491
14748
|
// Container for child attachment - the portalScene (injected or container itself)
|
|
15492
14749
|
internal: { ...rootState.internal, ...injectState.internal, container: portalScene }
|
|
15493
14750
|
};
|
|
@@ -15496,9 +14753,13 @@ function PortalInner({ state = {}, children, container }) {
|
|
|
15496
14753
|
const store = traditional.createWithEqualityFn((set, get) => ({ ...rest, set, get }));
|
|
15497
14754
|
const onMutate = (prev) => store.setState((state2) => inject.current(prev, state2));
|
|
15498
14755
|
onMutate(previousRoot.getState());
|
|
15499
|
-
previousRoot.subscribe(onMutate);
|
|
15500
14756
|
return store;
|
|
15501
14757
|
}, [previousRoot, container]);
|
|
14758
|
+
useIsomorphicLayoutEffect(() => {
|
|
14759
|
+
const onMutate = (prev) => usePortalStore.setState((state2) => inject.current(prev, state2));
|
|
14760
|
+
const unsubscribe = previousRoot.subscribe(onMutate);
|
|
14761
|
+
return unsubscribe;
|
|
14762
|
+
}, [previousRoot, usePortalStore]);
|
|
15502
14763
|
return (
|
|
15503
14764
|
// @ts-ignore, reconciler types are not maintained
|
|
15504
14765
|
/* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children: reconciler.createPortal(
|
|
@@ -15512,6 +14773,59 @@ function flushSync(fn) {
|
|
|
15512
14773
|
return reconciler.flushSyncFromReconciler(fn);
|
|
15513
14774
|
}
|
|
15514
14775
|
|
|
14776
|
+
function parseBackground(background) {
|
|
14777
|
+
if (!background) return null;
|
|
14778
|
+
if (typeof background === "object" && !background.isColor) {
|
|
14779
|
+
const { backgroundMap, envMap, files, preset, ...rest } = background;
|
|
14780
|
+
return {
|
|
14781
|
+
...rest,
|
|
14782
|
+
preset,
|
|
14783
|
+
files: envMap || files,
|
|
14784
|
+
backgroundFiles: backgroundMap,
|
|
14785
|
+
background: true
|
|
14786
|
+
};
|
|
14787
|
+
}
|
|
14788
|
+
if (typeof background === "number") {
|
|
14789
|
+
return { color: background, background: true };
|
|
14790
|
+
}
|
|
14791
|
+
if (typeof background === "string") {
|
|
14792
|
+
if (background in presetsObj) {
|
|
14793
|
+
return { preset: background, background: true };
|
|
14794
|
+
}
|
|
14795
|
+
if (/^(https?:\/\/|\/|\.\/|\.\.\/)|\.(hdr|exr|jpg|jpeg|png|webp|gif)$/i.test(background)) {
|
|
14796
|
+
return { files: background, background: true };
|
|
14797
|
+
}
|
|
14798
|
+
return { color: background, background: true };
|
|
14799
|
+
}
|
|
14800
|
+
if (background.isColor) {
|
|
14801
|
+
return { color: background, background: true };
|
|
14802
|
+
}
|
|
14803
|
+
return null;
|
|
14804
|
+
}
|
|
14805
|
+
|
|
14806
|
+
function parseRendererConfig(rendererProp) {
|
|
14807
|
+
const isRendererConfig = typeof rendererProp === "object" && rendererProp !== null && !("render" in rendererProp) && ("primaryCanvas" in rendererProp || "scheduler" in rendererProp);
|
|
14808
|
+
if (isRendererConfig) {
|
|
14809
|
+
const { primaryCanvas: pc, scheduler: sc, ...rest } = rendererProp;
|
|
14810
|
+
return {
|
|
14811
|
+
primaryCanvas: pc,
|
|
14812
|
+
scheduler: sc,
|
|
14813
|
+
renderer: Object.keys(rest).length > 0 ? rest : rendererProp
|
|
14814
|
+
};
|
|
14815
|
+
}
|
|
14816
|
+
return { primaryCanvas: void 0, scheduler: void 0, renderer: rendererProp };
|
|
14817
|
+
}
|
|
14818
|
+
|
|
14819
|
+
function clearHmrCaches(store) {
|
|
14820
|
+
store.setState((state) => ({
|
|
14821
|
+
nodes: {},
|
|
14822
|
+
uniforms: {},
|
|
14823
|
+
buffers: {},
|
|
14824
|
+
gpuStorage: {},
|
|
14825
|
+
_hmrVersion: state._hmrVersion + 1
|
|
14826
|
+
}));
|
|
14827
|
+
}
|
|
14828
|
+
|
|
15515
14829
|
function CanvasImpl({
|
|
15516
14830
|
ref,
|
|
15517
14831
|
children,
|
|
@@ -15532,6 +14846,8 @@ function CanvasImpl({
|
|
|
15532
14846
|
raycaster,
|
|
15533
14847
|
camera,
|
|
15534
14848
|
scene,
|
|
14849
|
+
autoUpdateFrustum,
|
|
14850
|
+
occlusion,
|
|
15535
14851
|
onPointerMissed,
|
|
15536
14852
|
onDragOverMissed,
|
|
15537
14853
|
onDropMissed,
|
|
@@ -15543,39 +14859,10 @@ function CanvasImpl({
|
|
|
15543
14859
|
forceEven,
|
|
15544
14860
|
...props
|
|
15545
14861
|
}) {
|
|
15546
|
-
const { primaryCanvas, scheduler,
|
|
15547
|
-
const renderer = Object.keys(rendererConfig).length > 0 ? rendererConfig : rendererProp;
|
|
14862
|
+
const { primaryCanvas, scheduler, renderer } = parseRendererConfig(rendererProp);
|
|
15548
14863
|
React__namespace.useMemo(() => extend(THREE), []);
|
|
15549
14864
|
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]);
|
|
14865
|
+
const backgroundProps = React__namespace.useMemo(() => parseBackground(background), [background]);
|
|
15579
14866
|
const hasInitialSizeRef = React__namespace.useRef(false);
|
|
15580
14867
|
const measureConfig = React__namespace.useMemo(() => {
|
|
15581
14868
|
if (!hasInitialSizeRef.current) {
|
|
@@ -15617,6 +14904,7 @@ function CanvasImpl({
|
|
|
15617
14904
|
const handleDropMissed = useMutableCallback(onDropMissed);
|
|
15618
14905
|
const [block, setBlock] = React__namespace.useState(false);
|
|
15619
14906
|
const [error, setError] = React__namespace.useState(false);
|
|
14907
|
+
const [fallbackVisible, setFallbackVisible] = React__namespace.useState(false);
|
|
15620
14908
|
if (block) throw block;
|
|
15621
14909
|
if (error) throw error;
|
|
15622
14910
|
const root = React__namespace.useRef(null);
|
|
@@ -15624,6 +14912,7 @@ function CanvasImpl({
|
|
|
15624
14912
|
const unsubscribeErrorRef = React__namespace.useRef(null);
|
|
15625
14913
|
useIsomorphicLayoutEffect(() => {
|
|
15626
14914
|
effectActiveRef.current = true;
|
|
14915
|
+
if (fallbackVisible) return;
|
|
15627
14916
|
const canvas = canvasRef.current;
|
|
15628
14917
|
if (effectiveSize.width > 0 && effectiveSize.height > 0 && canvas) {
|
|
15629
14918
|
if (!root.current) {
|
|
@@ -15644,7 +14933,7 @@ function CanvasImpl({
|
|
|
15644
14933
|
}
|
|
15645
14934
|
async function run() {
|
|
15646
14935
|
if (!effectActiveRef.current || !root.current) return;
|
|
15647
|
-
await root.current.configure({
|
|
14936
|
+
const configured = await root.current.configure({
|
|
15648
14937
|
id,
|
|
15649
14938
|
primaryCanvas,
|
|
15650
14939
|
scheduler,
|
|
@@ -15659,6 +14948,8 @@ function CanvasImpl({
|
|
|
15659
14948
|
performance,
|
|
15660
14949
|
raycaster,
|
|
15661
14950
|
camera,
|
|
14951
|
+
autoUpdateFrustum,
|
|
14952
|
+
occlusion,
|
|
15662
14953
|
size: effectiveSize,
|
|
15663
14954
|
// Store size props for reset functionality
|
|
15664
14955
|
_sizeProps: width !== void 0 || height !== void 0 ? { width, height } : null,
|
|
@@ -15683,8 +14974,20 @@ function CanvasImpl({
|
|
|
15683
14974
|
}
|
|
15684
14975
|
onCreated?.(state);
|
|
15685
14976
|
}
|
|
15686
|
-
})
|
|
15687
|
-
|
|
14977
|
+
}).then(
|
|
14978
|
+
() => true,
|
|
14979
|
+
// Renderer setup failed (e.g. no WebGL/WebGPU support). The `fallback` prop lives
|
|
14980
|
+
// inside <canvas>, which browsers don't display, so surface it as visible DOM
|
|
14981
|
+
// instead; with no fallback, rethrow to an external error boundary. (#3757)
|
|
14982
|
+
(setupError) => {
|
|
14983
|
+
if (effectActiveRef.current) {
|
|
14984
|
+
if (fallback != null) setFallbackVisible(true);
|
|
14985
|
+
else setError(setupError);
|
|
14986
|
+
}
|
|
14987
|
+
return false;
|
|
14988
|
+
}
|
|
14989
|
+
);
|
|
14990
|
+
if (!configured || !effectActiveRef.current || !root.current) return;
|
|
15688
14991
|
root.current.render(
|
|
15689
14992
|
/* @__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
14993
|
backgroundProps && /* @__PURE__ */ jsxRuntime.jsx(Environment, { ...backgroundProps }),
|
|
@@ -15718,20 +15021,13 @@ function CanvasImpl({
|
|
|
15718
15021
|
const handleHMR = () => {
|
|
15719
15022
|
queueMicrotask(() => {
|
|
15720
15023
|
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
|
-
}
|
|
15024
|
+
if (rootEntry?.store) clearHmrCaches(rootEntry.store);
|
|
15728
15025
|
});
|
|
15729
15026
|
};
|
|
15730
15027
|
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
15028
|
const hot = undefined;
|
|
15732
15029
|
hot.on("vite:afterUpdate", handleHMR);
|
|
15733
|
-
return () => hot.
|
|
15734
|
-
});
|
|
15030
|
+
return () => hot.off?.("vite:afterUpdate", handleHMR);
|
|
15735
15031
|
}
|
|
15736
15032
|
if (typeof module !== "undefined" && module.hot) {
|
|
15737
15033
|
const hot = module.hot;
|
|
@@ -15754,7 +15050,20 @@ function CanvasImpl({
|
|
|
15754
15050
|
...style
|
|
15755
15051
|
},
|
|
15756
15052
|
...props,
|
|
15757
|
-
children:
|
|
15053
|
+
children: fallbackVisible ? (
|
|
15054
|
+
// Renderer setup failed: render the fallback as visible DOM. Inside <canvas> (below)
|
|
15055
|
+
// it exists in the tree but browsers never paint it, which is the whole bug (#3757).
|
|
15056
|
+
fallback
|
|
15057
|
+
) : /* @__PURE__ */ jsxRuntime.jsx("div", { ref: containerRef, className: "r3f-canvas-container", style: { width: "100%", height: "100%" }, children: /* @__PURE__ */ jsxRuntime.jsx(
|
|
15058
|
+
"canvas",
|
|
15059
|
+
{
|
|
15060
|
+
ref: canvasRef,
|
|
15061
|
+
id,
|
|
15062
|
+
className: "r3f-canvas",
|
|
15063
|
+
style: { display: "block", width: "100%", height: "100%" },
|
|
15064
|
+
children: fallback
|
|
15065
|
+
}
|
|
15066
|
+
) })
|
|
15758
15067
|
}
|
|
15759
15068
|
);
|
|
15760
15069
|
}
|
|
@@ -15830,6 +15139,8 @@ function createScopedStore(data) {
|
|
|
15830
15139
|
function createLazyCreatorState(state) {
|
|
15831
15140
|
let _uniforms = null;
|
|
15832
15141
|
let _nodes = null;
|
|
15142
|
+
let _buffers = null;
|
|
15143
|
+
let _gpuStorage = null;
|
|
15833
15144
|
return Object.create(state, {
|
|
15834
15145
|
uniforms: {
|
|
15835
15146
|
get() {
|
|
@@ -15840,10 +15151,34 @@ function createLazyCreatorState(state) {
|
|
|
15840
15151
|
get() {
|
|
15841
15152
|
return _nodes ?? (_nodes = createScopedStore(state.nodes));
|
|
15842
15153
|
}
|
|
15154
|
+
},
|
|
15155
|
+
buffers: {
|
|
15156
|
+
get() {
|
|
15157
|
+
return _buffers ?? (_buffers = createScopedStore(state.buffers));
|
|
15158
|
+
}
|
|
15159
|
+
},
|
|
15160
|
+
gpuStorage: {
|
|
15161
|
+
get() {
|
|
15162
|
+
return _gpuStorage ?? (_gpuStorage = createScopedStore(state.gpuStorage));
|
|
15163
|
+
}
|
|
15843
15164
|
}
|
|
15844
15165
|
});
|
|
15845
15166
|
}
|
|
15846
15167
|
|
|
15168
|
+
function resolvePrimary(local) {
|
|
15169
|
+
return local.getState().primaryStore ?? local;
|
|
15170
|
+
}
|
|
15171
|
+
function usePrimaryStore() {
|
|
15172
|
+
const local = useStore();
|
|
15173
|
+
const primary = local.getState().primaryStore;
|
|
15174
|
+
return React.useMemo(() => primary ?? local, [primary, local]);
|
|
15175
|
+
}
|
|
15176
|
+
function usePrimaryThree(selector = (state) => state, equalityFn) {
|
|
15177
|
+
const local = useStore();
|
|
15178
|
+
const primary = resolvePrimary(local);
|
|
15179
|
+
return primary(selector, equalityFn);
|
|
15180
|
+
}
|
|
15181
|
+
|
|
15847
15182
|
function addTexture(set, key, value) {
|
|
15848
15183
|
set((state) => {
|
|
15849
15184
|
const newMap = new Map(state.textures);
|
|
@@ -15922,6 +15257,10 @@ function vectorize(inObject) {
|
|
|
15922
15257
|
if (obj.isVector2 || obj.isVector3 || obj.isVector4) return inObject;
|
|
15923
15258
|
if (obj.isMatrix3 || obj.isMatrix4) return inObject;
|
|
15924
15259
|
if (obj.isColor || obj.isEuler || obj.isQuaternion || obj.isSpherical) return inObject;
|
|
15260
|
+
if ("r" in obj && "g" in obj && "b" in obj && typeof obj.r === "number" && typeof obj.g === "number" && typeof obj.b === "number") {
|
|
15261
|
+
const scale = obj.r > 1 || obj.g > 1 || obj.b > 1 ? 1 / 255 : 1;
|
|
15262
|
+
return new webgpu.Color(obj.r * scale, obj.g * scale, obj.b * scale);
|
|
15263
|
+
}
|
|
15925
15264
|
if ("x" in obj && "y" in obj && typeof obj.x === "number" && typeof obj.y === "number") {
|
|
15926
15265
|
if ("w" in obj && typeof obj.w === "number" && "z" in obj && typeof obj.z === "number") {
|
|
15927
15266
|
return new webgpu.Vector4(obj.x, obj.y, obj.z, obj.w);
|
|
@@ -15945,7 +15284,7 @@ function useCompareMemoize(value, deep) {
|
|
|
15945
15284
|
|
|
15946
15285
|
const isUniformNode$1 = (value) => value !== null && typeof value === "object" && "value" in value && "uuid" in value;
|
|
15947
15286
|
function useUniforms(creatorOrScope, scope) {
|
|
15948
|
-
const store =
|
|
15287
|
+
const store = usePrimaryStore();
|
|
15949
15288
|
const removeUniforms2 = React.useCallback(
|
|
15950
15289
|
(names, targetScope) => {
|
|
15951
15290
|
const nameArray = Array.isArray(names) ? names : [names];
|
|
@@ -16015,8 +15354,8 @@ function useUniforms(creatorOrScope, scope) {
|
|
|
16015
15354
|
}, [creatorOrScope, store]);
|
|
16016
15355
|
const memoizedInput = useCompareMemoize(inputForMemoization);
|
|
16017
15356
|
const isReader = memoizedInput === void 0 || typeof memoizedInput === "string";
|
|
16018
|
-
const storeUniforms =
|
|
16019
|
-
const hmrVersion =
|
|
15357
|
+
const storeUniforms = usePrimaryThree((s) => s.uniforms);
|
|
15358
|
+
const hmrVersion = usePrimaryThree((s) => s._hmrVersion);
|
|
16020
15359
|
const readerDep = isReader ? storeUniforms : null;
|
|
16021
15360
|
const creatorDep = isReader ? null : hmrVersion;
|
|
16022
15361
|
const uniforms = React.useMemo(() => {
|
|
@@ -16077,6 +15416,7 @@ function useUniforms(creatorOrScope, scope) {
|
|
|
16077
15416
|
return { ...uniforms, removeUniforms: removeUniforms2, clearUniforms, rebuildUniforms };
|
|
16078
15417
|
}
|
|
16079
15418
|
function rebuildAllUniforms(store, scope) {
|
|
15419
|
+
store = store.getState().primaryStore ?? store;
|
|
16080
15420
|
store.setState((state) => {
|
|
16081
15421
|
let newUniforms = {};
|
|
16082
15422
|
if (scope && scope !== "root") {
|
|
@@ -16152,6 +15492,7 @@ function isSameThreeType(a, b) {
|
|
|
16152
15492
|
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
15493
|
}
|
|
16154
15494
|
|
|
15495
|
+
const uniformOf = tsl.uniform;
|
|
16155
15496
|
const isUniformNode = (value) => value !== null && typeof value === "object" && "value" in value && "uuid" in value;
|
|
16156
15497
|
const isTSLNode$1 = (value) => value !== null && typeof value === "object" && "uuid" in value && "nodeType" in value;
|
|
16157
15498
|
function useUniform(name, value) {
|
|
@@ -16184,11 +15525,11 @@ function useUniform(name, value) {
|
|
|
16184
15525
|
}
|
|
16185
15526
|
let node;
|
|
16186
15527
|
if (isTSLNode$1(value)) {
|
|
16187
|
-
node =
|
|
15528
|
+
node = uniformOf(value);
|
|
16188
15529
|
} else if (typeof value === "string") {
|
|
16189
15530
|
node = tsl.uniform(new webgpu.Color(value));
|
|
16190
15531
|
} else {
|
|
16191
|
-
node =
|
|
15532
|
+
node = uniformOf(value);
|
|
16192
15533
|
}
|
|
16193
15534
|
if (typeof node.setName === "function") {
|
|
16194
15535
|
node.setName(name);
|
|
@@ -16205,7 +15546,7 @@ function useUniform(name, value) {
|
|
|
16205
15546
|
|
|
16206
15547
|
const isTSLNode = (value) => value !== null && typeof value === "object" && ("uuid" in value || "nodeType" in value);
|
|
16207
15548
|
function useNodes(creatorOrScope, scope) {
|
|
16208
|
-
const store =
|
|
15549
|
+
const store = usePrimaryStore();
|
|
16209
15550
|
const removeNodes2 = React.useCallback(
|
|
16210
15551
|
(names, targetScope) => {
|
|
16211
15552
|
const nameArray = Array.isArray(names) ? names : [names];
|
|
@@ -16262,8 +15603,8 @@ function useNodes(creatorOrScope, scope) {
|
|
|
16262
15603
|
[store]
|
|
16263
15604
|
);
|
|
16264
15605
|
const isReader = creatorOrScope === void 0 || typeof creatorOrScope === "string";
|
|
16265
|
-
const storeNodes =
|
|
16266
|
-
const hmrVersion =
|
|
15606
|
+
const storeNodes = usePrimaryThree((s) => s.nodes);
|
|
15607
|
+
const hmrVersion = usePrimaryThree((s) => s._hmrVersion);
|
|
16267
15608
|
const scopeDep = typeof creatorOrScope === "string" ? creatorOrScope : scope;
|
|
16268
15609
|
const readerDep = isReader ? storeNodes : null;
|
|
16269
15610
|
const creatorDep = isReader ? null : hmrVersion;
|
|
@@ -16322,6 +15663,7 @@ function useNodes(creatorOrScope, scope) {
|
|
|
16322
15663
|
return { ...nodes, removeNodes: removeNodes2, clearNodes, rebuildNodes };
|
|
16323
15664
|
}
|
|
16324
15665
|
function rebuildAllNodes(store, scope) {
|
|
15666
|
+
store = store.getState().primaryStore ?? store;
|
|
16325
15667
|
store.setState((state) => {
|
|
16326
15668
|
let newNodes = state.nodes;
|
|
16327
15669
|
if (scope && scope !== "root") {
|
|
@@ -16366,18 +15708,364 @@ function clearRootNodes(set) {
|
|
|
16366
15708
|
});
|
|
16367
15709
|
}
|
|
16368
15710
|
function useLocalNodes(creator) {
|
|
16369
|
-
const store =
|
|
16370
|
-
const uniforms =
|
|
16371
|
-
const nodes =
|
|
16372
|
-
const textures =
|
|
16373
|
-
const hmrVersion =
|
|
15711
|
+
const store = usePrimaryStore();
|
|
15712
|
+
const uniforms = usePrimaryThree((s) => s.uniforms);
|
|
15713
|
+
const nodes = usePrimaryThree((s) => s.nodes);
|
|
15714
|
+
const textures = usePrimaryThree((s) => s.textures);
|
|
15715
|
+
const hmrVersion = usePrimaryThree((s) => s._hmrVersion);
|
|
16374
15716
|
return React.useMemo(() => {
|
|
16375
15717
|
const wrappedState = createLazyCreatorState(store.getState());
|
|
16376
15718
|
return creator(wrappedState);
|
|
16377
15719
|
}, [store, creator, uniforms, nodes, textures, hmrVersion]);
|
|
16378
15720
|
}
|
|
16379
15721
|
|
|
16380
|
-
|
|
15722
|
+
const isBufferLike = (value) => {
|
|
15723
|
+
if (value === null || typeof value !== "object") return false;
|
|
15724
|
+
if (ArrayBuffer.isView(value)) return true;
|
|
15725
|
+
if ("isBufferAttribute" in value) return true;
|
|
15726
|
+
if ("uuid" in value || "nodeType" in value) return true;
|
|
15727
|
+
return false;
|
|
15728
|
+
};
|
|
15729
|
+
const disposeBuffer = (buffer) => {
|
|
15730
|
+
if (buffer === null || typeof buffer !== "object") return;
|
|
15731
|
+
if ("dispose" in buffer && typeof buffer.dispose === "function") {
|
|
15732
|
+
buffer.dispose();
|
|
15733
|
+
}
|
|
15734
|
+
};
|
|
15735
|
+
function useBuffers(creatorOrScope, scope) {
|
|
15736
|
+
const store = usePrimaryStore();
|
|
15737
|
+
const removeBuffers = React.useCallback(
|
|
15738
|
+
(names, targetScope) => {
|
|
15739
|
+
const nameArray = Array.isArray(names) ? names : [names];
|
|
15740
|
+
store.setState((state) => {
|
|
15741
|
+
if (targetScope) {
|
|
15742
|
+
const currentScope = { ...state.buffers[targetScope] };
|
|
15743
|
+
for (const name of nameArray) delete currentScope[name];
|
|
15744
|
+
return { buffers: { ...state.buffers, [targetScope]: currentScope } };
|
|
15745
|
+
}
|
|
15746
|
+
const buffers2 = { ...state.buffers };
|
|
15747
|
+
for (const name of nameArray) if (isBufferLike(buffers2[name])) delete buffers2[name];
|
|
15748
|
+
return { buffers: buffers2 };
|
|
15749
|
+
});
|
|
15750
|
+
},
|
|
15751
|
+
[store]
|
|
15752
|
+
);
|
|
15753
|
+
const clearBuffers = React.useCallback(
|
|
15754
|
+
(targetScope) => {
|
|
15755
|
+
store.setState((state) => {
|
|
15756
|
+
if (targetScope && targetScope !== "root") {
|
|
15757
|
+
const { [targetScope]: _, ...rest } = state.buffers;
|
|
15758
|
+
return { buffers: rest };
|
|
15759
|
+
}
|
|
15760
|
+
if (targetScope === "root") {
|
|
15761
|
+
const buffers2 = {};
|
|
15762
|
+
for (const [key, value] of Object.entries(state.buffers)) {
|
|
15763
|
+
if (!isBufferLike(value)) buffers2[key] = value;
|
|
15764
|
+
}
|
|
15765
|
+
return { buffers: buffers2 };
|
|
15766
|
+
}
|
|
15767
|
+
return { buffers: {} };
|
|
15768
|
+
});
|
|
15769
|
+
},
|
|
15770
|
+
[store]
|
|
15771
|
+
);
|
|
15772
|
+
const rebuildBuffers = React.useCallback(
|
|
15773
|
+
(targetScope) => {
|
|
15774
|
+
store.setState((state) => {
|
|
15775
|
+
let newBuffers = state.buffers;
|
|
15776
|
+
if (targetScope && targetScope !== "root") {
|
|
15777
|
+
const { [targetScope]: _, ...rest } = state.buffers;
|
|
15778
|
+
newBuffers = rest;
|
|
15779
|
+
} else if (targetScope === "root") {
|
|
15780
|
+
newBuffers = {};
|
|
15781
|
+
for (const [key, value] of Object.entries(state.buffers)) {
|
|
15782
|
+
if (!isBufferLike(value)) newBuffers[key] = value;
|
|
15783
|
+
}
|
|
15784
|
+
} else {
|
|
15785
|
+
newBuffers = {};
|
|
15786
|
+
}
|
|
15787
|
+
return { buffers: newBuffers, _hmrVersion: state._hmrVersion + 1 };
|
|
15788
|
+
});
|
|
15789
|
+
},
|
|
15790
|
+
[store]
|
|
15791
|
+
);
|
|
15792
|
+
const disposeBuffers = React.useCallback(
|
|
15793
|
+
(names, targetScope) => {
|
|
15794
|
+
const nameArray = Array.isArray(names) ? names : [names];
|
|
15795
|
+
const state = store.getState();
|
|
15796
|
+
for (const name of nameArray) {
|
|
15797
|
+
const buffer = targetScope ? state.buffers[targetScope]?.[name] : state.buffers[name];
|
|
15798
|
+
if (buffer && isBufferLike(buffer)) {
|
|
15799
|
+
disposeBuffer(buffer);
|
|
15800
|
+
}
|
|
15801
|
+
}
|
|
15802
|
+
removeBuffers(names, targetScope);
|
|
15803
|
+
},
|
|
15804
|
+
[store, removeBuffers]
|
|
15805
|
+
);
|
|
15806
|
+
const isReader = creatorOrScope === void 0 || typeof creatorOrScope === "string";
|
|
15807
|
+
const storeBuffers = usePrimaryThree((s) => s.buffers);
|
|
15808
|
+
const hmrVersion = usePrimaryThree((s) => s._hmrVersion);
|
|
15809
|
+
const scopeDep = typeof creatorOrScope === "string" ? creatorOrScope : scope;
|
|
15810
|
+
const readerDep = isReader ? storeBuffers : null;
|
|
15811
|
+
const creatorDep = isReader ? null : hmrVersion;
|
|
15812
|
+
const buffers = React.useMemo(() => {
|
|
15813
|
+
if (creatorOrScope === void 0) {
|
|
15814
|
+
return storeBuffers;
|
|
15815
|
+
}
|
|
15816
|
+
if (typeof creatorOrScope === "string") {
|
|
15817
|
+
const scopeData = storeBuffers[creatorOrScope];
|
|
15818
|
+
if (scopeData && !isBufferLike(scopeData)) return scopeData;
|
|
15819
|
+
return {};
|
|
15820
|
+
}
|
|
15821
|
+
const state = store.getState();
|
|
15822
|
+
const set = store.setState;
|
|
15823
|
+
const creator = creatorOrScope;
|
|
15824
|
+
const wrappedState = createLazyCreatorState(state);
|
|
15825
|
+
const created = creator(wrappedState);
|
|
15826
|
+
const result = {};
|
|
15827
|
+
let hasNewBuffers = false;
|
|
15828
|
+
if (scope) {
|
|
15829
|
+
const currentScope = state.buffers[scope] ?? {};
|
|
15830
|
+
for (const [name, buffer] of Object.entries(created)) {
|
|
15831
|
+
if (currentScope[name]) {
|
|
15832
|
+
result[name] = currentScope[name];
|
|
15833
|
+
} else {
|
|
15834
|
+
if ("setName" in buffer && typeof buffer.setName === "function") {
|
|
15835
|
+
buffer.setName(`${scope}.${name}`);
|
|
15836
|
+
}
|
|
15837
|
+
result[name] = buffer;
|
|
15838
|
+
hasNewBuffers = true;
|
|
15839
|
+
}
|
|
15840
|
+
}
|
|
15841
|
+
if (hasNewBuffers) {
|
|
15842
|
+
set((s) => ({
|
|
15843
|
+
buffers: {
|
|
15844
|
+
...s.buffers,
|
|
15845
|
+
[scope]: { ...s.buffers[scope], ...result }
|
|
15846
|
+
}
|
|
15847
|
+
}));
|
|
15848
|
+
}
|
|
15849
|
+
return result;
|
|
15850
|
+
}
|
|
15851
|
+
for (const [name, buffer] of Object.entries(created)) {
|
|
15852
|
+
const existing = state.buffers[name];
|
|
15853
|
+
if (existing && isBufferLike(existing)) {
|
|
15854
|
+
result[name] = existing;
|
|
15855
|
+
} else {
|
|
15856
|
+
if ("setName" in buffer && typeof buffer.setName === "function") {
|
|
15857
|
+
buffer.setName(name);
|
|
15858
|
+
}
|
|
15859
|
+
result[name] = buffer;
|
|
15860
|
+
hasNewBuffers = true;
|
|
15861
|
+
}
|
|
15862
|
+
}
|
|
15863
|
+
if (hasNewBuffers) {
|
|
15864
|
+
set((s) => ({ buffers: { ...s.buffers, ...result } }));
|
|
15865
|
+
}
|
|
15866
|
+
return result;
|
|
15867
|
+
}, [store, scopeDep, readerDep, creatorDep]);
|
|
15868
|
+
return { ...buffers, removeBuffers, clearBuffers, rebuildBuffers, disposeBuffers };
|
|
15869
|
+
}
|
|
15870
|
+
function rebuildAllBuffers(store, scope) {
|
|
15871
|
+
store = store.getState().primaryStore ?? store;
|
|
15872
|
+
store.setState((state) => {
|
|
15873
|
+
let newBuffers = state.buffers;
|
|
15874
|
+
if (scope && scope !== "root") {
|
|
15875
|
+
const { [scope]: _, ...rest } = state.buffers;
|
|
15876
|
+
newBuffers = rest;
|
|
15877
|
+
} else if (scope === "root") {
|
|
15878
|
+
newBuffers = {};
|
|
15879
|
+
for (const [key, value] of Object.entries(state.buffers)) {
|
|
15880
|
+
if (!isBufferLike(value)) newBuffers[key] = value;
|
|
15881
|
+
}
|
|
15882
|
+
} else {
|
|
15883
|
+
newBuffers = {};
|
|
15884
|
+
}
|
|
15885
|
+
return { buffers: newBuffers, _hmrVersion: state._hmrVersion + 1 };
|
|
15886
|
+
});
|
|
15887
|
+
}
|
|
15888
|
+
|
|
15889
|
+
const isStorageLike = (value) => {
|
|
15890
|
+
if (value === null || typeof value !== "object") return false;
|
|
15891
|
+
if ("isTexture" in value) return true;
|
|
15892
|
+
if ("isData3DTexture" in value) return true;
|
|
15893
|
+
if ("uuid" in value || "nodeType" in value) return true;
|
|
15894
|
+
return false;
|
|
15895
|
+
};
|
|
15896
|
+
const disposeStorage = (storage) => {
|
|
15897
|
+
if (storage === null || typeof storage !== "object") return;
|
|
15898
|
+
if ("dispose" in storage && typeof storage.dispose === "function") {
|
|
15899
|
+
storage.dispose();
|
|
15900
|
+
}
|
|
15901
|
+
};
|
|
15902
|
+
function useGPUStorage(creatorOrScope, scope) {
|
|
15903
|
+
const store = usePrimaryStore();
|
|
15904
|
+
const removeStorage = React.useCallback(
|
|
15905
|
+
(names, targetScope) => {
|
|
15906
|
+
const nameArray = Array.isArray(names) ? names : [names];
|
|
15907
|
+
store.setState((state) => {
|
|
15908
|
+
if (targetScope) {
|
|
15909
|
+
const currentScope = { ...state.gpuStorage[targetScope] };
|
|
15910
|
+
for (const name of nameArray) delete currentScope[name];
|
|
15911
|
+
return { gpuStorage: { ...state.gpuStorage, [targetScope]: currentScope } };
|
|
15912
|
+
}
|
|
15913
|
+
const gpuStorage2 = { ...state.gpuStorage };
|
|
15914
|
+
for (const name of nameArray) if (isStorageLike(gpuStorage2[name])) delete gpuStorage2[name];
|
|
15915
|
+
return { gpuStorage: gpuStorage2 };
|
|
15916
|
+
});
|
|
15917
|
+
},
|
|
15918
|
+
[store]
|
|
15919
|
+
);
|
|
15920
|
+
const clearStorage = React.useCallback(
|
|
15921
|
+
(targetScope) => {
|
|
15922
|
+
store.setState((state) => {
|
|
15923
|
+
if (targetScope && targetScope !== "root") {
|
|
15924
|
+
const { [targetScope]: _, ...rest } = state.gpuStorage;
|
|
15925
|
+
return { gpuStorage: rest };
|
|
15926
|
+
}
|
|
15927
|
+
if (targetScope === "root") {
|
|
15928
|
+
const gpuStorage2 = {};
|
|
15929
|
+
for (const [key, value] of Object.entries(state.gpuStorage)) {
|
|
15930
|
+
if (!isStorageLike(value)) gpuStorage2[key] = value;
|
|
15931
|
+
}
|
|
15932
|
+
return { gpuStorage: gpuStorage2 };
|
|
15933
|
+
}
|
|
15934
|
+
return { gpuStorage: {} };
|
|
15935
|
+
});
|
|
15936
|
+
},
|
|
15937
|
+
[store]
|
|
15938
|
+
);
|
|
15939
|
+
const rebuildStorage = React.useCallback(
|
|
15940
|
+
(targetScope) => {
|
|
15941
|
+
store.setState((state) => {
|
|
15942
|
+
let newStorage = state.gpuStorage;
|
|
15943
|
+
if (targetScope && targetScope !== "root") {
|
|
15944
|
+
const { [targetScope]: _, ...rest } = state.gpuStorage;
|
|
15945
|
+
newStorage = rest;
|
|
15946
|
+
} else if (targetScope === "root") {
|
|
15947
|
+
newStorage = {};
|
|
15948
|
+
for (const [key, value] of Object.entries(state.gpuStorage)) {
|
|
15949
|
+
if (!isStorageLike(value)) newStorage[key] = value;
|
|
15950
|
+
}
|
|
15951
|
+
} else {
|
|
15952
|
+
newStorage = {};
|
|
15953
|
+
}
|
|
15954
|
+
return { gpuStorage: newStorage, _hmrVersion: state._hmrVersion + 1 };
|
|
15955
|
+
});
|
|
15956
|
+
},
|
|
15957
|
+
[store]
|
|
15958
|
+
);
|
|
15959
|
+
const disposeStorageFn = React.useCallback(
|
|
15960
|
+
(names, targetScope) => {
|
|
15961
|
+
const nameArray = Array.isArray(names) ? names : [names];
|
|
15962
|
+
const state = store.getState();
|
|
15963
|
+
for (const name of nameArray) {
|
|
15964
|
+
const storage = targetScope ? state.gpuStorage[targetScope]?.[name] : state.gpuStorage[name];
|
|
15965
|
+
if (storage && isStorageLike(storage)) {
|
|
15966
|
+
disposeStorage(storage);
|
|
15967
|
+
}
|
|
15968
|
+
}
|
|
15969
|
+
removeStorage(names, targetScope);
|
|
15970
|
+
},
|
|
15971
|
+
[store, removeStorage]
|
|
15972
|
+
);
|
|
15973
|
+
const isReader = creatorOrScope === void 0 || typeof creatorOrScope === "string";
|
|
15974
|
+
const storeStorage = usePrimaryThree((s) => s.gpuStorage);
|
|
15975
|
+
const hmrVersion = usePrimaryThree((s) => s._hmrVersion);
|
|
15976
|
+
const scopeDep = typeof creatorOrScope === "string" ? creatorOrScope : scope;
|
|
15977
|
+
const readerDep = isReader ? storeStorage : null;
|
|
15978
|
+
const creatorDep = isReader ? null : hmrVersion;
|
|
15979
|
+
const gpuStorage = React.useMemo(() => {
|
|
15980
|
+
if (creatorOrScope === void 0) {
|
|
15981
|
+
return storeStorage;
|
|
15982
|
+
}
|
|
15983
|
+
if (typeof creatorOrScope === "string") {
|
|
15984
|
+
const scopeData = storeStorage[creatorOrScope];
|
|
15985
|
+
if (scopeData && !isStorageLike(scopeData)) return scopeData;
|
|
15986
|
+
return {};
|
|
15987
|
+
}
|
|
15988
|
+
const state = store.getState();
|
|
15989
|
+
const set = store.setState;
|
|
15990
|
+
const creator = creatorOrScope;
|
|
15991
|
+
const wrappedState = createLazyCreatorState(state);
|
|
15992
|
+
const created = creator(wrappedState);
|
|
15993
|
+
const result = {};
|
|
15994
|
+
let hasNewStorage = false;
|
|
15995
|
+
if (scope) {
|
|
15996
|
+
const currentScope = state.gpuStorage[scope] ?? {};
|
|
15997
|
+
for (const [name, storage] of Object.entries(created)) {
|
|
15998
|
+
if (currentScope[name]) {
|
|
15999
|
+
result[name] = currentScope[name];
|
|
16000
|
+
} else {
|
|
16001
|
+
if ("setName" in storage && typeof storage.setName === "function") {
|
|
16002
|
+
storage.setName(`${scope}.${name}`);
|
|
16003
|
+
}
|
|
16004
|
+
if ("name" in storage && typeof storage.name === "string") {
|
|
16005
|
+
storage.name = `${scope}.${name}`;
|
|
16006
|
+
}
|
|
16007
|
+
result[name] = storage;
|
|
16008
|
+
hasNewStorage = true;
|
|
16009
|
+
}
|
|
16010
|
+
}
|
|
16011
|
+
if (hasNewStorage) {
|
|
16012
|
+
set((s) => ({
|
|
16013
|
+
gpuStorage: {
|
|
16014
|
+
...s.gpuStorage,
|
|
16015
|
+
[scope]: { ...s.gpuStorage[scope], ...result }
|
|
16016
|
+
}
|
|
16017
|
+
}));
|
|
16018
|
+
}
|
|
16019
|
+
return result;
|
|
16020
|
+
}
|
|
16021
|
+
for (const [name, storage] of Object.entries(created)) {
|
|
16022
|
+
const existing = state.gpuStorage[name];
|
|
16023
|
+
if (existing && isStorageLike(existing)) {
|
|
16024
|
+
result[name] = existing;
|
|
16025
|
+
} else {
|
|
16026
|
+
if ("setName" in storage && typeof storage.setName === "function") {
|
|
16027
|
+
storage.setName(name);
|
|
16028
|
+
}
|
|
16029
|
+
if ("name" in storage && typeof storage.name === "string") {
|
|
16030
|
+
storage.name = name;
|
|
16031
|
+
}
|
|
16032
|
+
result[name] = storage;
|
|
16033
|
+
hasNewStorage = true;
|
|
16034
|
+
}
|
|
16035
|
+
}
|
|
16036
|
+
if (hasNewStorage) {
|
|
16037
|
+
set((s) => ({ gpuStorage: { ...s.gpuStorage, ...result } }));
|
|
16038
|
+
}
|
|
16039
|
+
return result;
|
|
16040
|
+
}, [store, scopeDep, readerDep, creatorDep]);
|
|
16041
|
+
return {
|
|
16042
|
+
...gpuStorage,
|
|
16043
|
+
removeStorage,
|
|
16044
|
+
clearStorage,
|
|
16045
|
+
rebuildStorage,
|
|
16046
|
+
disposeStorage: disposeStorageFn
|
|
16047
|
+
};
|
|
16048
|
+
}
|
|
16049
|
+
function rebuildAllStorage(store, scope) {
|
|
16050
|
+
store = store.getState().primaryStore ?? store;
|
|
16051
|
+
store.setState((state) => {
|
|
16052
|
+
let newStorage = state.gpuStorage;
|
|
16053
|
+
if (scope && scope !== "root") {
|
|
16054
|
+
const { [scope]: _, ...rest } = state.gpuStorage;
|
|
16055
|
+
newStorage = rest;
|
|
16056
|
+
} else if (scope === "root") {
|
|
16057
|
+
newStorage = {};
|
|
16058
|
+
for (const [key, value] of Object.entries(state.gpuStorage)) {
|
|
16059
|
+
if (!isStorageLike(value)) newStorage[key] = value;
|
|
16060
|
+
}
|
|
16061
|
+
} else {
|
|
16062
|
+
newStorage = {};
|
|
16063
|
+
}
|
|
16064
|
+
return { gpuStorage: newStorage, _hmrVersion: state._hmrVersion + 1 };
|
|
16065
|
+
});
|
|
16066
|
+
}
|
|
16067
|
+
|
|
16068
|
+
function useRenderPipeline(mainCB, setupCB) {
|
|
16381
16069
|
const store = useStore();
|
|
16382
16070
|
const { scene, camera, renderer, isLegacy } = useThree();
|
|
16383
16071
|
const callbacksRanRef = React.useRef(false);
|
|
@@ -16396,7 +16084,7 @@ function usePostProcessing(mainCB, setupCB) {
|
|
|
16396
16084
|
}, [store]);
|
|
16397
16085
|
const reset = React.useCallback(() => {
|
|
16398
16086
|
store.setState({
|
|
16399
|
-
|
|
16087
|
+
renderPipeline: null,
|
|
16400
16088
|
passes: {}
|
|
16401
16089
|
});
|
|
16402
16090
|
callbacksRanRef.current = false;
|
|
@@ -16409,18 +16097,18 @@ function usePostProcessing(mainCB, setupCB) {
|
|
|
16409
16097
|
}, []);
|
|
16410
16098
|
React.useLayoutEffect(() => {
|
|
16411
16099
|
if (isLegacy) {
|
|
16412
|
-
throw new Error("
|
|
16100
|
+
throw new Error("useRenderPipeline is only available with WebGPU renderer. Set renderer prop on Canvas.");
|
|
16413
16101
|
}
|
|
16414
16102
|
if (!renderer || !scene || !camera) return;
|
|
16415
16103
|
const state = store.getState();
|
|
16416
16104
|
const set = store.setState;
|
|
16417
16105
|
try {
|
|
16418
|
-
let
|
|
16106
|
+
let pipeline = state.renderPipeline;
|
|
16419
16107
|
let currentPasses = { ...state.passes };
|
|
16420
|
-
let
|
|
16421
|
-
if (!
|
|
16422
|
-
|
|
16423
|
-
|
|
16108
|
+
let justCreatedPipeline = false;
|
|
16109
|
+
if (!pipeline) {
|
|
16110
|
+
pipeline = new webgpu.RenderPipeline(renderer);
|
|
16111
|
+
justCreatedPipeline = true;
|
|
16424
16112
|
}
|
|
16425
16113
|
const cacheValid = scenePassCacheRef.current && scenePassCacheRef.current.sceneUuid === scene.uuid && scenePassCacheRef.current.cameraUuid === camera.uuid;
|
|
16426
16114
|
let scenePass;
|
|
@@ -16431,9 +16119,9 @@ function usePostProcessing(mainCB, setupCB) {
|
|
|
16431
16119
|
scenePassCacheRef.current = { sceneUuid: scene.uuid, cameraUuid: camera.uuid, scenePass };
|
|
16432
16120
|
}
|
|
16433
16121
|
currentPasses.scenePass = scenePass;
|
|
16434
|
-
if (!
|
|
16435
|
-
set({
|
|
16436
|
-
const shouldRunCallbacks =
|
|
16122
|
+
if (!pipeline.outputNode || justCreatedPipeline) pipeline.outputNode = scenePass;
|
|
16123
|
+
set({ renderPipeline: pipeline, passes: currentPasses });
|
|
16124
|
+
const shouldRunCallbacks = justCreatedPipeline || !callbacksRanRef.current || !cacheValid;
|
|
16437
16125
|
if (shouldRunCallbacks) {
|
|
16438
16126
|
if (setupCBRef.current) {
|
|
16439
16127
|
const freshState = store.getState();
|
|
@@ -16454,24 +16142,26 @@ function usePostProcessing(mainCB, setupCB) {
|
|
|
16454
16142
|
callbacksRanRef.current = true;
|
|
16455
16143
|
}
|
|
16456
16144
|
} catch (error) {
|
|
16457
|
-
console.
|
|
16145
|
+
console.warn("[useRenderPipeline] Setup failed; the render pipeline was not configured:", error);
|
|
16458
16146
|
}
|
|
16459
16147
|
}, [store, renderer, scene, camera, isLegacy, rebuildVersion]);
|
|
16460
16148
|
const passes = useThree((s) => s.passes);
|
|
16461
|
-
const
|
|
16149
|
+
const renderPipeline = useThree((s) => s.renderPipeline);
|
|
16462
16150
|
return {
|
|
16463
16151
|
passes,
|
|
16464
|
-
|
|
16152
|
+
renderPipeline,
|
|
16465
16153
|
clearPasses,
|
|
16466
16154
|
reset,
|
|
16467
16155
|
rebuild,
|
|
16468
|
-
// isReady indicates if
|
|
16469
|
-
isReady:
|
|
16156
|
+
// isReady indicates if RenderPipeline is configured and ready for rendering
|
|
16157
|
+
isReady: renderPipeline !== null
|
|
16470
16158
|
};
|
|
16471
16159
|
}
|
|
16472
16160
|
|
|
16473
16161
|
extend(THREE);
|
|
16474
16162
|
|
|
16163
|
+
exports.Scheduler = scheduler.Scheduler;
|
|
16164
|
+
exports.getScheduler = scheduler.getScheduler;
|
|
16475
16165
|
exports.Block = Block;
|
|
16476
16166
|
exports.Canvas = Canvas;
|
|
16477
16167
|
exports.Environment = Environment;
|
|
@@ -16487,7 +16177,6 @@ exports.R3F_BUILD_LEGACY = R3F_BUILD_LEGACY;
|
|
|
16487
16177
|
exports.R3F_BUILD_WEBGPU = R3F_BUILD_WEBGPU;
|
|
16488
16178
|
exports.REACT_INTERNAL_PROPS = REACT_INTERNAL_PROPS;
|
|
16489
16179
|
exports.RESERVED_PROPS = RESERVED_PROPS;
|
|
16490
|
-
exports.Scheduler = Scheduler;
|
|
16491
16180
|
exports.Texture = Texture;
|
|
16492
16181
|
exports._roots = _roots;
|
|
16493
16182
|
exports.act = act;
|
|
@@ -16523,7 +16212,6 @@ exports.getInstanceProps = getInstanceProps;
|
|
|
16523
16212
|
exports.getPrimary = getPrimary;
|
|
16524
16213
|
exports.getPrimaryIds = getPrimaryIds;
|
|
16525
16214
|
exports.getRootState = getRootState;
|
|
16526
|
-
exports.getScheduler = getScheduler;
|
|
16527
16215
|
exports.getUuidPrefix = getUuidPrefix;
|
|
16528
16216
|
exports.hasConstructor = hasConstructor;
|
|
16529
16217
|
exports.hasPrimary = hasPrimary;
|
|
@@ -16543,7 +16231,9 @@ exports.isVectorLike = isVectorLike;
|
|
|
16543
16231
|
exports.once = once;
|
|
16544
16232
|
exports.prepare = prepare;
|
|
16545
16233
|
exports.presetsObj = presetsObj;
|
|
16234
|
+
exports.rebuildAllBuffers = rebuildAllBuffers;
|
|
16546
16235
|
exports.rebuildAllNodes = rebuildAllNodes;
|
|
16236
|
+
exports.rebuildAllStorage = rebuildAllStorage;
|
|
16547
16237
|
exports.rebuildAllUniforms = rebuildAllUniforms;
|
|
16548
16238
|
exports.reconciler = reconciler;
|
|
16549
16239
|
exports.registerPrimary = registerPrimary;
|
|
@@ -16556,8 +16246,10 @@ exports.unregisterPrimary = unregisterPrimary;
|
|
|
16556
16246
|
exports.updateCamera = updateCamera;
|
|
16557
16247
|
exports.updateFrustum = updateFrustum;
|
|
16558
16248
|
exports.useBridge = useBridge;
|
|
16249
|
+
exports.useBuffers = useBuffers;
|
|
16559
16250
|
exports.useEnvironment = useEnvironment;
|
|
16560
16251
|
exports.useFrame = useFrame;
|
|
16252
|
+
exports.useGPUStorage = useGPUStorage;
|
|
16561
16253
|
exports.useGraph = useGraph;
|
|
16562
16254
|
exports.useInstanceHandle = useInstanceHandle;
|
|
16563
16255
|
exports.useIsomorphicLayoutEffect = useIsomorphicLayoutEffect;
|
|
@@ -16565,7 +16257,7 @@ exports.useLoader = useLoader;
|
|
|
16565
16257
|
exports.useLocalNodes = useLocalNodes;
|
|
16566
16258
|
exports.useMutableCallback = useMutableCallback;
|
|
16567
16259
|
exports.useNodes = useNodes;
|
|
16568
|
-
exports.
|
|
16260
|
+
exports.useRenderPipeline = useRenderPipeline;
|
|
16569
16261
|
exports.useRenderTarget = useRenderTarget;
|
|
16570
16262
|
exports.useStore = useStore;
|
|
16571
16263
|
exports.useTexture = useTexture;
|