@react-three/fiber 10.0.0-canary.dbbe704 → 10.0.0-canary.f046a54
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 +648 -1361
- package/dist/index.d.cts +249 -788
- package/dist/index.d.mts +249 -788
- package/dist/index.d.ts +249 -788
- package/dist/index.mjs +622 -1334
- package/dist/legacy.cjs +603 -1322
- package/dist/legacy.d.cts +249 -788
- package/dist/legacy.d.mts +249 -788
- package/dist/legacy.d.ts +249 -788
- package/dist/legacy.mjs +577 -1295
- package/dist/webgpu/index.cjs +1048 -1379
- package/dist/webgpu/index.d.cts +334 -801
- package/dist/webgpu/index.d.mts +334 -801
- package/dist/webgpu/index.d.ts +334 -801
- package/dist/webgpu/index.mjs +1017 -1351
- package/package.json +2 -1
- package/readme.md +2 -2
package/dist/legacy.mjs
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import * as three from 'three';
|
|
2
|
-
import { WebGLRenderTarget, CubeReflectionMapping, EquirectangularReflectionMapping, CubeTextureLoader, Scene, WebGLCubeRenderTarget, HalfFloatType, Color, Frustum, Matrix4, Group, BoxGeometry, MeshBasicNodeMaterial, Mesh, Node, NodeUpdateType, Layers, SRGBColorSpace, RGBAFormat, UnsignedByteType, Vector3, Vector2, TextureLoader, Texture as Texture$1, Raycaster, OrthographicCamera, PerspectiveCamera,
|
|
2
|
+
import { WebGLRenderTarget, CubeReflectionMapping, EquirectangularReflectionMapping, CubeTextureLoader, Scene, WebGLCubeRenderTarget, HalfFloatType, Color, Frustum, Matrix4, Group, BoxGeometry, MeshBasicNodeMaterial, Mesh, Node, NodeUpdateType, Layers, ShaderMaterial, Uniform, SRGBColorSpace, RGBAFormat, UnsignedByteType, Vector3, Vector2, TextureLoader, Texture as Texture$1, Raycaster, OrthographicCamera, PerspectiveCamera, PCFShadowMap, VSMShadowMap, BasicShadowMap, ACESFilmicToneMapping, WebGLRenderer } from 'three';
|
|
3
3
|
import { jsx, Fragment, jsxs } from 'react/jsx-runtime';
|
|
4
4
|
import * as React from 'react';
|
|
5
5
|
import React__default, { useLayoutEffect, useRef, useMemo, useEffect, useContext, useImperativeHandle, useCallback, useState } from 'react';
|
|
@@ -13,6 +13,8 @@ import { UltraHDRLoader } from 'three/examples/jsm/loaders/UltraHDRLoader.js';
|
|
|
13
13
|
import { GainMapLoader } from '@monogrid/gainmap-js';
|
|
14
14
|
import Tb, { unstable_scheduleCallback, unstable_IdlePriority } from 'scheduler';
|
|
15
15
|
import { createWithEqualityFn } from 'zustand/traditional';
|
|
16
|
+
import { getScheduler } from '@pmndrs/scheduler';
|
|
17
|
+
export { Scheduler, getScheduler } from '@pmndrs/scheduler';
|
|
16
18
|
import { suspend, preload, clear } from 'suspend-react';
|
|
17
19
|
|
|
18
20
|
function _mergeNamespaces(n, m) {
|
|
@@ -148,7 +150,7 @@ function useEnvironment({
|
|
|
148
150
|
useLoader$1.clear(loader, multiFile ? [files] : files);
|
|
149
151
|
}
|
|
150
152
|
renderer.domElement.addEventListener("webglcontextlost", clearGainmapTexture, { once: true });
|
|
151
|
-
}, [files, renderer.domElement]);
|
|
153
|
+
}, [extension, files, loader, multiFile, renderer.domElement]);
|
|
152
154
|
const loaderResult = useLoader$1(
|
|
153
155
|
loader,
|
|
154
156
|
multiFile ? [files] : files,
|
|
@@ -348,7 +350,22 @@ function EnvironmentPortal({
|
|
|
348
350
|
environmentIntensity,
|
|
349
351
|
environmentRotation
|
|
350
352
|
});
|
|
351
|
-
}, [
|
|
353
|
+
}, [
|
|
354
|
+
children,
|
|
355
|
+
virtualScene,
|
|
356
|
+
fbo.texture,
|
|
357
|
+
scene,
|
|
358
|
+
defaultScene,
|
|
359
|
+
background,
|
|
360
|
+
frames,
|
|
361
|
+
gl,
|
|
362
|
+
blur,
|
|
363
|
+
backgroundBlurriness,
|
|
364
|
+
backgroundIntensity,
|
|
365
|
+
backgroundRotation,
|
|
366
|
+
environmentIntensity,
|
|
367
|
+
environmentRotation
|
|
368
|
+
]);
|
|
352
369
|
let count = 1;
|
|
353
370
|
useFrame$1(() => {
|
|
354
371
|
if (frames === Infinity || count < frames) {
|
|
@@ -419,9 +436,9 @@ function Environment(props) {
|
|
|
419
436
|
return props.ground ? /* @__PURE__ */ jsx(EnvironmentGround, { ...props }) : props.map ? /* @__PURE__ */ jsx(EnvironmentMap, { ...props }) : props.children ? /* @__PURE__ */ jsx(EnvironmentPortal, { ...props }) : /* @__PURE__ */ jsx(EnvironmentCube, { ...props });
|
|
420
437
|
}
|
|
421
438
|
|
|
422
|
-
var __defProp
|
|
423
|
-
var __defNormalProp
|
|
424
|
-
var __publicField
|
|
439
|
+
var __defProp = Object.defineProperty;
|
|
440
|
+
var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
|
|
441
|
+
var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
|
|
425
442
|
const act = React["act"];
|
|
426
443
|
const useIsomorphicLayoutEffect = /* @__PURE__ */ (() => typeof window !== "undefined" && (window.document?.createElement || window.navigator?.product === "ReactNative"))() ? React.useLayoutEffect : React.useEffect;
|
|
427
444
|
function useMutableCallback(fn) {
|
|
@@ -453,7 +470,7 @@ const ErrorBoundary = /* @__PURE__ */ (() => {
|
|
|
453
470
|
return _a = class extends React.Component {
|
|
454
471
|
constructor() {
|
|
455
472
|
super(...arguments);
|
|
456
|
-
__publicField
|
|
473
|
+
__publicField(this, "state", { error: false });
|
|
457
474
|
}
|
|
458
475
|
componentDidCatch(err) {
|
|
459
476
|
this.props.set(err);
|
|
@@ -461,7 +478,7 @@ const ErrorBoundary = /* @__PURE__ */ (() => {
|
|
|
461
478
|
render() {
|
|
462
479
|
return this.state.error ? null : this.props.children;
|
|
463
480
|
}
|
|
464
|
-
}, __publicField
|
|
481
|
+
}, __publicField(_a, "getDerivedStateFromError", () => ({ error: true })), _a;
|
|
465
482
|
})();
|
|
466
483
|
|
|
467
484
|
const is = {
|
|
@@ -982,8 +999,24 @@ function applyProps(object, props) {
|
|
|
982
999
|
} else if (isVectorLike(target) && is.num(value)) {
|
|
983
1000
|
if ("setScalar" in target && typeof target.setScalar === "function") target.setScalar(value);
|
|
984
1001
|
else target.set(value);
|
|
1002
|
+
} else if (root instanceof ShaderMaterial && key === "uniforms" && is.obj(value)) {
|
|
1003
|
+
if (!is.obj(root.uniforms)) root.uniforms = {};
|
|
1004
|
+
const uniforms = root.uniforms;
|
|
1005
|
+
const nextUniforms = value;
|
|
1006
|
+
for (const name in nextUniforms) {
|
|
1007
|
+
const uniform = nextUniforms[name];
|
|
1008
|
+
const targetUniform = uniforms[name];
|
|
1009
|
+
if (targetUniform) Object.assign(targetUniform, uniform);
|
|
1010
|
+
else {
|
|
1011
|
+
const nextUniform = uniform instanceof Uniform ? uniform.clone() : new Uniform(uniform.value);
|
|
1012
|
+
uniforms[name] = nextUniform;
|
|
1013
|
+
}
|
|
1014
|
+
}
|
|
985
1015
|
} else {
|
|
986
1016
|
root[key] = value;
|
|
1017
|
+
if (key.endsWith("Node") && root.isMaterial) {
|
|
1018
|
+
root.needsUpdate = true;
|
|
1019
|
+
}
|
|
987
1020
|
if (rootState && rootState.renderer?.outputColorSpace === SRGBColorSpace && colorMaps.includes(key) && isTexture(value) && root[key]?.isTexture && // sRGB textures must be RGBA8 since r137 https://github.com/mrdoob/three.js/pull/23129
|
|
988
1021
|
root[key].format === RGBAFormat && root[key].type === UnsignedByteType) {
|
|
989
1022
|
root[key].colorSpace = rootState.textureColorSpace;
|
|
@@ -1017,38 +1050,60 @@ function applyProps(object, props) {
|
|
|
1017
1050
|
return object;
|
|
1018
1051
|
}
|
|
1019
1052
|
|
|
1053
|
+
const DEFAULT_POINTER_ID = 0;
|
|
1054
|
+
const XR_POINTER_ID_START = 1e3;
|
|
1055
|
+
function getPointerState(internal, pointerId) {
|
|
1056
|
+
let state = internal.pointerMap.get(pointerId);
|
|
1057
|
+
if (!state) {
|
|
1058
|
+
state = {
|
|
1059
|
+
hovered: /* @__PURE__ */ new Map(),
|
|
1060
|
+
captured: /* @__PURE__ */ new Map(),
|
|
1061
|
+
initialClick: [0, 0],
|
|
1062
|
+
initialHits: []
|
|
1063
|
+
};
|
|
1064
|
+
internal.pointerMap.set(pointerId, state);
|
|
1065
|
+
}
|
|
1066
|
+
return state;
|
|
1067
|
+
}
|
|
1068
|
+
function getPointerId(event) {
|
|
1069
|
+
return "pointerId" in event ? event.pointerId : DEFAULT_POINTER_ID;
|
|
1070
|
+
}
|
|
1020
1071
|
function makeId(event) {
|
|
1021
1072
|
return (event.eventObject || event.object).uuid + "/" + event.index + event.instanceId;
|
|
1022
1073
|
}
|
|
1023
|
-
function releaseInternalPointerCapture(
|
|
1024
|
-
const
|
|
1074
|
+
function releaseInternalPointerCapture(internal, obj, pointerId) {
|
|
1075
|
+
const pointerState = internal.pointerMap.get(pointerId);
|
|
1076
|
+
if (!pointerState) return;
|
|
1077
|
+
const captureData = pointerState.captured.get(obj);
|
|
1025
1078
|
if (captureData) {
|
|
1026
|
-
|
|
1027
|
-
|
|
1028
|
-
capturedMap.delete(pointerId);
|
|
1029
|
-
captureData.target.releasePointerCapture(pointerId);
|
|
1030
|
-
}
|
|
1079
|
+
pointerState.captured.delete(obj);
|
|
1080
|
+
captureData.target.releasePointerCapture(pointerId);
|
|
1031
1081
|
}
|
|
1032
1082
|
}
|
|
1033
1083
|
function removeInteractivity(store, object) {
|
|
1034
1084
|
const { internal } = store.getState();
|
|
1035
1085
|
internal.interaction = internal.interaction.filter((o) => o !== object);
|
|
1036
|
-
|
|
1037
|
-
|
|
1038
|
-
|
|
1039
|
-
|
|
1086
|
+
for (const [pointerId, pointerState] of internal.pointerMap) {
|
|
1087
|
+
pointerState.initialHits = pointerState.initialHits.filter((o) => o !== object);
|
|
1088
|
+
pointerState.hovered.forEach((value, key) => {
|
|
1089
|
+
if (value.eventObject === object || value.object === object) {
|
|
1090
|
+
pointerState.hovered.delete(key);
|
|
1091
|
+
}
|
|
1092
|
+
});
|
|
1093
|
+
if (pointerState.captured.has(object)) {
|
|
1094
|
+
releaseInternalPointerCapture(internal, object, pointerId);
|
|
1040
1095
|
}
|
|
1041
|
-
}
|
|
1042
|
-
internal.capturedMap.forEach((captures, pointerId) => {
|
|
1043
|
-
releaseInternalPointerCapture(internal.capturedMap, object, captures, pointerId);
|
|
1044
|
-
});
|
|
1096
|
+
}
|
|
1045
1097
|
unregisterVisibility(store, object);
|
|
1046
1098
|
}
|
|
1047
1099
|
function createEvents(store) {
|
|
1048
|
-
function calculateDistance(event) {
|
|
1100
|
+
function calculateDistance(event, pointerId) {
|
|
1049
1101
|
const { internal } = store.getState();
|
|
1050
|
-
const
|
|
1051
|
-
|
|
1102
|
+
const pointerState = internal.pointerMap.get(pointerId);
|
|
1103
|
+
if (!pointerState) return 0;
|
|
1104
|
+
const [initialX, initialY] = pointerState.initialClick;
|
|
1105
|
+
const dx = event.offsetX - initialX;
|
|
1106
|
+
const dy = event.offsetY - initialY;
|
|
1052
1107
|
return Math.round(Math.sqrt(dx * dx + dy * dy));
|
|
1053
1108
|
}
|
|
1054
1109
|
function filterPointerEvents(objects) {
|
|
@@ -1084,6 +1139,15 @@ function createEvents(store) {
|
|
|
1084
1139
|
return state2.raycaster.camera ? state2.raycaster.intersectObject(obj, true) : [];
|
|
1085
1140
|
}
|
|
1086
1141
|
let hits = eventsObjects.flatMap(handleRaycast).sort((a, b) => {
|
|
1142
|
+
const aInteractivePriority = a.object.userData?.interactivePriority;
|
|
1143
|
+
const bInteractivePriority = b.object.userData?.interactivePriority;
|
|
1144
|
+
if (aInteractivePriority !== void 0 || bInteractivePriority !== void 0) {
|
|
1145
|
+
if (aInteractivePriority !== void 0 && bInteractivePriority === void 0) return -1;
|
|
1146
|
+
if (bInteractivePriority !== void 0 && aInteractivePriority === void 0) return 1;
|
|
1147
|
+
if (aInteractivePriority !== bInteractivePriority) {
|
|
1148
|
+
return (bInteractivePriority ?? 0) - (aInteractivePriority ?? 0);
|
|
1149
|
+
}
|
|
1150
|
+
}
|
|
1087
1151
|
const aState = getRootState(a.object);
|
|
1088
1152
|
const bState = getRootState(b.object);
|
|
1089
1153
|
const aPriority = aState?.events?.priority ?? 1;
|
|
@@ -1105,9 +1169,13 @@ function createEvents(store) {
|
|
|
1105
1169
|
eventObject = eventObject.parent;
|
|
1106
1170
|
}
|
|
1107
1171
|
}
|
|
1108
|
-
if ("pointerId" in event
|
|
1109
|
-
|
|
1110
|
-
|
|
1172
|
+
if ("pointerId" in event) {
|
|
1173
|
+
const pointerId = event.pointerId;
|
|
1174
|
+
const pointerState = state.internal.pointerMap.get(pointerId);
|
|
1175
|
+
if (pointerState?.captured.size) {
|
|
1176
|
+
for (const captureData of pointerState.captured.values()) {
|
|
1177
|
+
if (!duplicates.has(makeId(captureData.intersection))) intersections.push(captureData.intersection);
|
|
1178
|
+
}
|
|
1111
1179
|
}
|
|
1112
1180
|
}
|
|
1113
1181
|
return intersections;
|
|
@@ -1120,27 +1188,25 @@ function createEvents(store) {
|
|
|
1120
1188
|
if (state) {
|
|
1121
1189
|
const { raycaster, pointer, camera, internal } = state;
|
|
1122
1190
|
const unprojectedPoint = new Vector3(pointer.x, pointer.y, 0).unproject(camera);
|
|
1123
|
-
const hasPointerCapture = (id) =>
|
|
1191
|
+
const hasPointerCapture = (id) => {
|
|
1192
|
+
const pointerState = internal.pointerMap.get(id);
|
|
1193
|
+
return pointerState?.captured.has(hit.eventObject) ?? false;
|
|
1194
|
+
};
|
|
1124
1195
|
const setPointerCapture = (id) => {
|
|
1125
1196
|
const captureData = { intersection: hit, target: event.target };
|
|
1126
|
-
|
|
1127
|
-
|
|
1128
|
-
} else {
|
|
1129
|
-
internal.capturedMap.set(id, /* @__PURE__ */ new Map([[hit.eventObject, captureData]]));
|
|
1130
|
-
}
|
|
1197
|
+
const pointerState = getPointerState(internal, id);
|
|
1198
|
+
pointerState.captured.set(hit.eventObject, captureData);
|
|
1131
1199
|
event.target.setPointerCapture(id);
|
|
1132
1200
|
};
|
|
1133
1201
|
const releasePointerCapture = (id) => {
|
|
1134
|
-
|
|
1135
|
-
if (captures) {
|
|
1136
|
-
releaseInternalPointerCapture(internal.capturedMap, hit.eventObject, captures, id);
|
|
1137
|
-
}
|
|
1202
|
+
releaseInternalPointerCapture(internal, hit.eventObject, id);
|
|
1138
1203
|
};
|
|
1139
1204
|
const extractEventProps = {};
|
|
1140
1205
|
for (const prop in event) {
|
|
1141
1206
|
const property = event[prop];
|
|
1142
1207
|
if (typeof property !== "function") extractEventProps[prop] = property;
|
|
1143
1208
|
}
|
|
1209
|
+
const eventPointerId = "pointerId" in event ? event.pointerId : void 0;
|
|
1144
1210
|
const raycastEvent = {
|
|
1145
1211
|
...hit,
|
|
1146
1212
|
...extractEventProps,
|
|
@@ -1151,18 +1217,19 @@ function createEvents(store) {
|
|
|
1151
1217
|
unprojectedPoint,
|
|
1152
1218
|
ray: raycaster.ray,
|
|
1153
1219
|
camera,
|
|
1220
|
+
pointerId: eventPointerId,
|
|
1154
1221
|
// Hijack stopPropagation, which just sets a flag
|
|
1155
1222
|
stopPropagation() {
|
|
1156
|
-
const
|
|
1223
|
+
const pointerState = eventPointerId !== void 0 ? internal.pointerMap.get(eventPointerId) : void 0;
|
|
1157
1224
|
if (
|
|
1158
1225
|
// ...if this pointer hasn't been captured
|
|
1159
|
-
!
|
|
1160
|
-
|
|
1226
|
+
!pointerState?.captured.size || // ... or if the hit object is capturing the pointer
|
|
1227
|
+
pointerState.captured.has(hit.eventObject)
|
|
1161
1228
|
) {
|
|
1162
1229
|
raycastEvent.stopped = localState.stopped = true;
|
|
1163
|
-
if (
|
|
1230
|
+
if (pointerState?.hovered.size && Array.from(pointerState.hovered.values()).find((i) => i.eventObject === hit.eventObject)) {
|
|
1164
1231
|
const higher = intersections.slice(0, intersections.indexOf(hit));
|
|
1165
|
-
cancelPointer([...higher, hit]);
|
|
1232
|
+
cancelPointer([...higher, hit], eventPointerId);
|
|
1166
1233
|
}
|
|
1167
1234
|
}
|
|
1168
1235
|
},
|
|
@@ -1178,15 +1245,18 @@ function createEvents(store) {
|
|
|
1178
1245
|
}
|
|
1179
1246
|
return intersections;
|
|
1180
1247
|
}
|
|
1181
|
-
function cancelPointer(intersections) {
|
|
1248
|
+
function cancelPointer(intersections, pointerId) {
|
|
1182
1249
|
const { internal } = store.getState();
|
|
1183
|
-
|
|
1250
|
+
const pid = pointerId ?? DEFAULT_POINTER_ID;
|
|
1251
|
+
const pointerState = internal.pointerMap.get(pid);
|
|
1252
|
+
if (!pointerState) return;
|
|
1253
|
+
for (const [hoveredId, hoveredObj] of pointerState.hovered) {
|
|
1184
1254
|
if (!intersections.length || !intersections.find(
|
|
1185
1255
|
(hit) => hit.object === hoveredObj.object && hit.index === hoveredObj.index && hit.instanceId === hoveredObj.instanceId
|
|
1186
1256
|
)) {
|
|
1187
1257
|
const eventObject = hoveredObj.eventObject;
|
|
1188
1258
|
const instance = eventObject.__r3f;
|
|
1189
|
-
|
|
1259
|
+
pointerState.hovered.delete(hoveredId);
|
|
1190
1260
|
if (instance?.eventCount) {
|
|
1191
1261
|
const handlers = instance.handlers;
|
|
1192
1262
|
const data = { ...hoveredObj, intersections };
|
|
@@ -1215,41 +1285,118 @@ function createEvents(store) {
|
|
|
1215
1285
|
instance?.handlers.onDropMissed?.(event);
|
|
1216
1286
|
}
|
|
1217
1287
|
}
|
|
1288
|
+
function cleanupPointer(pointerId) {
|
|
1289
|
+
const { internal } = store.getState();
|
|
1290
|
+
const pointerState = internal.pointerMap.get(pointerId);
|
|
1291
|
+
if (pointerState) {
|
|
1292
|
+
for (const [, hoveredObj] of pointerState.hovered) {
|
|
1293
|
+
const eventObject = hoveredObj.eventObject;
|
|
1294
|
+
const instance = eventObject.__r3f;
|
|
1295
|
+
if (instance?.eventCount) {
|
|
1296
|
+
const handlers = instance.handlers;
|
|
1297
|
+
const data = { ...hoveredObj, intersections: [] };
|
|
1298
|
+
handlers.onPointerOut?.(data);
|
|
1299
|
+
handlers.onPointerLeave?.(data);
|
|
1300
|
+
}
|
|
1301
|
+
}
|
|
1302
|
+
internal.pointerMap.delete(pointerId);
|
|
1303
|
+
}
|
|
1304
|
+
internal.pointerDirty.delete(pointerId);
|
|
1305
|
+
}
|
|
1306
|
+
function processDeferredPointer(event, pointerId) {
|
|
1307
|
+
const state = store.getState();
|
|
1308
|
+
const { internal } = state;
|
|
1309
|
+
if (!state.events.enabled) return;
|
|
1310
|
+
const filter = filterPointerEvents;
|
|
1311
|
+
const hits = intersect(event, filter);
|
|
1312
|
+
cancelPointer(hits, pointerId);
|
|
1313
|
+
function onIntersect(data) {
|
|
1314
|
+
const eventObject = data.eventObject;
|
|
1315
|
+
const instance = eventObject.__r3f;
|
|
1316
|
+
if (!instance?.eventCount) return;
|
|
1317
|
+
const handlers = instance.handlers;
|
|
1318
|
+
if (handlers.onPointerOver || handlers.onPointerEnter || handlers.onPointerOut || handlers.onPointerLeave) {
|
|
1319
|
+
const id = makeId(data);
|
|
1320
|
+
const pointerState = getPointerState(internal, pointerId);
|
|
1321
|
+
const hoveredItem = pointerState.hovered.get(id);
|
|
1322
|
+
if (!hoveredItem) {
|
|
1323
|
+
pointerState.hovered.set(id, data);
|
|
1324
|
+
handlers.onPointerOver?.(data);
|
|
1325
|
+
handlers.onPointerEnter?.(data);
|
|
1326
|
+
} else if (hoveredItem.stopped) {
|
|
1327
|
+
data.stopPropagation();
|
|
1328
|
+
}
|
|
1329
|
+
}
|
|
1330
|
+
handlers.onPointerMove?.(data);
|
|
1331
|
+
}
|
|
1332
|
+
handleIntersects(hits, event, 0, onIntersect);
|
|
1333
|
+
}
|
|
1218
1334
|
function handlePointer(name) {
|
|
1219
1335
|
switch (name) {
|
|
1220
1336
|
case "onPointerLeave":
|
|
1221
|
-
case "onPointerCancel":
|
|
1222
1337
|
case "onDragLeave":
|
|
1223
1338
|
return () => cancelPointer([]);
|
|
1339
|
+
// Global cancel of these events
|
|
1340
|
+
case "onPointerCancel":
|
|
1341
|
+
return (event) => {
|
|
1342
|
+
const pointerId = getPointerId(event);
|
|
1343
|
+
cleanupPointer(pointerId);
|
|
1344
|
+
};
|
|
1224
1345
|
case "onLostPointerCapture":
|
|
1225
1346
|
return (event) => {
|
|
1226
1347
|
const { internal } = store.getState();
|
|
1227
|
-
|
|
1348
|
+
const pointerId = getPointerId(event);
|
|
1349
|
+
const pointerState = internal.pointerMap.get(pointerId);
|
|
1350
|
+
if (pointerState?.captured.size) {
|
|
1228
1351
|
requestAnimationFrame(() => {
|
|
1229
|
-
|
|
1230
|
-
|
|
1231
|
-
|
|
1352
|
+
const pointerState2 = internal.pointerMap.get(pointerId);
|
|
1353
|
+
if (pointerState2?.captured.size) {
|
|
1354
|
+
pointerState2.captured.clear();
|
|
1232
1355
|
}
|
|
1356
|
+
cancelPointer([], pointerId);
|
|
1233
1357
|
});
|
|
1234
1358
|
}
|
|
1235
1359
|
};
|
|
1236
1360
|
}
|
|
1237
1361
|
return function handleEvent(event) {
|
|
1238
1362
|
const state = store.getState();
|
|
1239
|
-
const { onPointerMissed, onDragOverMissed, onDropMissed, internal } = state;
|
|
1363
|
+
const { onPointerMissed, onDragOverMissed, onDropMissed, internal, events } = state;
|
|
1364
|
+
const pointerId = getPointerId(event);
|
|
1240
1365
|
internal.lastEvent.current = event;
|
|
1241
|
-
if (!
|
|
1366
|
+
if (!events.enabled) return;
|
|
1242
1367
|
const isPointerMove = name === "onPointerMove";
|
|
1243
1368
|
const isDragOver = name === "onDragOver";
|
|
1244
1369
|
const isDrop = name === "onDrop";
|
|
1245
1370
|
const isClickEvent = name === "onClick" || name === "onContextMenu" || name === "onDoubleClick";
|
|
1371
|
+
const isPointerDown = name === "onPointerDown";
|
|
1372
|
+
const isPointerUp = name === "onPointerUp";
|
|
1373
|
+
const isWheel = name === "onWheel";
|
|
1374
|
+
const canDeferRaycasts = events.frameTimedRaycasts && state.frameloop === "always";
|
|
1375
|
+
if (isPointerMove && canDeferRaycasts) {
|
|
1376
|
+
events.compute?.(event, state);
|
|
1377
|
+
internal.pointerDirty.set(pointerId, event);
|
|
1378
|
+
return;
|
|
1379
|
+
}
|
|
1380
|
+
if (isWheel && canDeferRaycasts && !events.alwaysFireOnScroll) {
|
|
1381
|
+
events.compute?.(event, state);
|
|
1382
|
+
internal.pointerDirty.set(pointerId, event);
|
|
1383
|
+
return;
|
|
1384
|
+
}
|
|
1385
|
+
if ((isClickEvent || isPointerDown || isPointerUp) && internal.pointerDirty.has(pointerId)) {
|
|
1386
|
+
const deferredEvent = internal.pointerDirty.get(pointerId);
|
|
1387
|
+
internal.pointerDirty.delete(pointerId);
|
|
1388
|
+
processDeferredPointer(deferredEvent, pointerId);
|
|
1389
|
+
}
|
|
1246
1390
|
const filter = isPointerMove || isDragOver || isDrop ? filterPointerEvents : void 0;
|
|
1247
1391
|
const hits = intersect(event, filter);
|
|
1248
|
-
const delta = isClickEvent ? calculateDistance(event) : 0;
|
|
1249
|
-
if (
|
|
1250
|
-
|
|
1251
|
-
|
|
1252
|
-
|
|
1392
|
+
const delta = isClickEvent ? calculateDistance(event, pointerId) : 0;
|
|
1393
|
+
if (isPointerDown) {
|
|
1394
|
+
const pointerState2 = getPointerState(internal, pointerId);
|
|
1395
|
+
pointerState2.initialClick = [event.offsetX, event.offsetY];
|
|
1396
|
+
pointerState2.initialHits = hits.map((hit) => hit.eventObject);
|
|
1397
|
+
}
|
|
1398
|
+
const pointerState = internal.pointerMap.get(pointerId);
|
|
1399
|
+
const initialHits = pointerState?.initialHits ?? [];
|
|
1253
1400
|
if (isClickEvent && !hits.length) {
|
|
1254
1401
|
if (delta <= 2) {
|
|
1255
1402
|
pointerMissed(event, internal.interaction);
|
|
@@ -1264,7 +1411,9 @@ function createEvents(store) {
|
|
|
1264
1411
|
dropMissed(event, internal.interaction);
|
|
1265
1412
|
if (onDropMissed) onDropMissed(event);
|
|
1266
1413
|
}
|
|
1267
|
-
if (isPointerMove || isDragOver)
|
|
1414
|
+
if (isPointerMove || isDragOver) {
|
|
1415
|
+
cancelPointer(hits, pointerId);
|
|
1416
|
+
}
|
|
1268
1417
|
function onIntersect(data) {
|
|
1269
1418
|
const eventObject = data.eventObject;
|
|
1270
1419
|
const instance = eventObject.__r3f;
|
|
@@ -1273,9 +1422,10 @@ function createEvents(store) {
|
|
|
1273
1422
|
if (isPointerMove) {
|
|
1274
1423
|
if (handlers.onPointerOver || handlers.onPointerEnter || handlers.onPointerOut || handlers.onPointerLeave) {
|
|
1275
1424
|
const id = makeId(data);
|
|
1276
|
-
const
|
|
1425
|
+
const pointerState2 = getPointerState(internal, pointerId);
|
|
1426
|
+
const hoveredItem = pointerState2.hovered.get(id);
|
|
1277
1427
|
if (!hoveredItem) {
|
|
1278
|
-
|
|
1428
|
+
pointerState2.hovered.set(id, data);
|
|
1279
1429
|
handlers.onPointerOver?.(data);
|
|
1280
1430
|
handlers.onPointerEnter?.(data);
|
|
1281
1431
|
} else if (hoveredItem.stopped) {
|
|
@@ -1285,9 +1435,10 @@ function createEvents(store) {
|
|
|
1285
1435
|
handlers.onPointerMove?.(data);
|
|
1286
1436
|
} else if (isDragOver) {
|
|
1287
1437
|
const id = makeId(data);
|
|
1288
|
-
const
|
|
1438
|
+
const pointerState2 = getPointerState(internal, pointerId);
|
|
1439
|
+
const hoveredItem = pointerState2.hovered.get(id);
|
|
1289
1440
|
if (!hoveredItem) {
|
|
1290
|
-
|
|
1441
|
+
pointerState2.hovered.set(id, data);
|
|
1291
1442
|
handlers.onDragOverEnter?.(data);
|
|
1292
1443
|
} else if (hoveredItem.stopped) {
|
|
1293
1444
|
data.stopPropagation();
|
|
@@ -1298,18 +1449,18 @@ function createEvents(store) {
|
|
|
1298
1449
|
} else {
|
|
1299
1450
|
const handler = handlers[name];
|
|
1300
1451
|
if (handler) {
|
|
1301
|
-
if (!isClickEvent ||
|
|
1452
|
+
if (!isClickEvent || initialHits.includes(eventObject)) {
|
|
1302
1453
|
pointerMissed(
|
|
1303
1454
|
event,
|
|
1304
|
-
internal.interaction.filter((object) => !
|
|
1455
|
+
internal.interaction.filter((object) => !initialHits.includes(object))
|
|
1305
1456
|
);
|
|
1306
1457
|
handler(data);
|
|
1307
1458
|
}
|
|
1308
1459
|
} else {
|
|
1309
|
-
if (isClickEvent &&
|
|
1460
|
+
if (isClickEvent && initialHits.includes(eventObject)) {
|
|
1310
1461
|
pointerMissed(
|
|
1311
1462
|
event,
|
|
1312
|
-
internal.interaction.filter((object) => !
|
|
1463
|
+
internal.interaction.filter((object) => !initialHits.includes(object))
|
|
1313
1464
|
);
|
|
1314
1465
|
}
|
|
1315
1466
|
}
|
|
@@ -1318,7 +1469,15 @@ function createEvents(store) {
|
|
|
1318
1469
|
handleIntersects(hits, event, delta, onIntersect);
|
|
1319
1470
|
};
|
|
1320
1471
|
}
|
|
1321
|
-
|
|
1472
|
+
function flushDeferredPointers() {
|
|
1473
|
+
const { internal, events } = store.getState();
|
|
1474
|
+
if (!events.frameTimedRaycasts) return;
|
|
1475
|
+
for (const [pointerId, event] of internal.pointerDirty) {
|
|
1476
|
+
processDeferredPointer(event, pointerId);
|
|
1477
|
+
}
|
|
1478
|
+
internal.pointerDirty.clear();
|
|
1479
|
+
}
|
|
1480
|
+
return { handlePointer, flushDeferredPointers, processDeferredPointer };
|
|
1322
1481
|
}
|
|
1323
1482
|
const DOM_EVENTS = {
|
|
1324
1483
|
onClick: ["click", false],
|
|
@@ -1337,10 +1496,15 @@ const DOM_EVENTS = {
|
|
|
1337
1496
|
onLostPointerCapture: ["lostpointercapture", true]
|
|
1338
1497
|
};
|
|
1339
1498
|
function createPointerEvents(store) {
|
|
1340
|
-
const { handlePointer } = createEvents(store);
|
|
1499
|
+
const { handlePointer, flushDeferredPointers, processDeferredPointer } = createEvents(store);
|
|
1500
|
+
let nextXRPointerId = XR_POINTER_ID_START;
|
|
1501
|
+
const xrPointers = /* @__PURE__ */ new Map();
|
|
1341
1502
|
return {
|
|
1342
1503
|
priority: 1,
|
|
1343
1504
|
enabled: true,
|
|
1505
|
+
frameTimedRaycasts: true,
|
|
1506
|
+
alwaysFireOnScroll: true,
|
|
1507
|
+
updateOnFrame: false,
|
|
1344
1508
|
compute(event, state) {
|
|
1345
1509
|
state.pointer.set(event.offsetX / state.size.width * 2 - 1, -(event.offsetY / state.size.height) * 2 + 1);
|
|
1346
1510
|
state.raycaster.setFromCamera(state.pointer, state.camera);
|
|
@@ -1350,11 +1514,33 @@ function createPointerEvents(store) {
|
|
|
1350
1514
|
(acc, key) => ({ ...acc, [key]: handlePointer(key) }),
|
|
1351
1515
|
{}
|
|
1352
1516
|
),
|
|
1353
|
-
update: () => {
|
|
1517
|
+
update: (pointerId) => {
|
|
1518
|
+
const { events, internal } = store.getState();
|
|
1519
|
+
if (!events.handlers) return;
|
|
1520
|
+
if (pointerId !== void 0) {
|
|
1521
|
+
const event = internal.pointerDirty.get(pointerId);
|
|
1522
|
+
if (event) {
|
|
1523
|
+
internal.pointerDirty.delete(pointerId);
|
|
1524
|
+
processDeferredPointer(event, pointerId);
|
|
1525
|
+
} else if (internal.lastEvent?.current) {
|
|
1526
|
+
processDeferredPointer(internal.lastEvent.current, pointerId);
|
|
1527
|
+
}
|
|
1528
|
+
} else {
|
|
1529
|
+
flushDeferredPointers();
|
|
1530
|
+
if (internal.lastEvent?.current) {
|
|
1531
|
+
events.handlers.onPointerMove(internal.lastEvent.current);
|
|
1532
|
+
}
|
|
1533
|
+
}
|
|
1534
|
+
},
|
|
1535
|
+
flush: () => {
|
|
1354
1536
|
const { events, internal } = store.getState();
|
|
1355
|
-
|
|
1537
|
+
flushDeferredPointers();
|
|
1538
|
+
if (events.updateOnFrame && internal.lastEvent?.current && events.handlers) {
|
|
1539
|
+
events.handlers.onPointerMove(internal.lastEvent.current);
|
|
1540
|
+
}
|
|
1356
1541
|
},
|
|
1357
1542
|
connect: (target) => {
|
|
1543
|
+
if (!target) return;
|
|
1358
1544
|
const { set, events } = store.getState();
|
|
1359
1545
|
events.disconnect?.();
|
|
1360
1546
|
set((state) => ({ events: { ...state.events, connected: target } }));
|
|
@@ -1378,6 +1564,32 @@ function createPointerEvents(store) {
|
|
|
1378
1564
|
}
|
|
1379
1565
|
set((state) => ({ events: { ...state.events, connected: void 0 } }));
|
|
1380
1566
|
}
|
|
1567
|
+
},
|
|
1568
|
+
registerPointer: (config) => {
|
|
1569
|
+
const pointerId = nextXRPointerId++;
|
|
1570
|
+
xrPointers.set(pointerId, config);
|
|
1571
|
+
const { internal } = store.getState();
|
|
1572
|
+
getPointerState(internal, pointerId);
|
|
1573
|
+
return pointerId;
|
|
1574
|
+
},
|
|
1575
|
+
unregisterPointer: (pointerId) => {
|
|
1576
|
+
xrPointers.delete(pointerId);
|
|
1577
|
+
const { internal } = store.getState();
|
|
1578
|
+
const pointerState = internal.pointerMap.get(pointerId);
|
|
1579
|
+
if (pointerState) {
|
|
1580
|
+
for (const [, hoveredObj] of pointerState.hovered) {
|
|
1581
|
+
const eventObject = hoveredObj.eventObject;
|
|
1582
|
+
const instance = eventObject.__r3f;
|
|
1583
|
+
if (instance?.eventCount) {
|
|
1584
|
+
const handlers = instance.handlers;
|
|
1585
|
+
const data = { ...hoveredObj, intersections: [] };
|
|
1586
|
+
handlers.onPointerOut?.(data);
|
|
1587
|
+
handlers.onPointerLeave?.(data);
|
|
1588
|
+
}
|
|
1589
|
+
}
|
|
1590
|
+
internal.pointerMap.delete(pointerId);
|
|
1591
|
+
}
|
|
1592
|
+
internal.pointerDirty.delete(pointerId);
|
|
1381
1593
|
}
|
|
1382
1594
|
};
|
|
1383
1595
|
}
|
|
@@ -1439,1036 +1651,12 @@ function notifyAlpha({ message, link }) {
|
|
|
1439
1651
|
}
|
|
1440
1652
|
}
|
|
1441
1653
|
|
|
1442
|
-
|
|
1443
|
-
|
|
1444
|
-
|
|
1445
|
-
|
|
1446
|
-
|
|
1447
|
-
|
|
1448
|
-
/** Ordered list of phase nodes */
|
|
1449
|
-
__publicField$1(this, "phases", []);
|
|
1450
|
-
/** Quick lookup by name */
|
|
1451
|
-
__publicField$1(this, "phaseMap", /* @__PURE__ */ new Map());
|
|
1452
|
-
/** Cached ordered names (invalidated on changes) */
|
|
1453
|
-
__publicField$1(this, "orderedNamesCache", null);
|
|
1454
|
-
this.initializeDefaultPhases();
|
|
1455
|
-
}
|
|
1456
|
-
//* Initialization --------------------------------
|
|
1457
|
-
initializeDefaultPhases() {
|
|
1458
|
-
for (const name of DEFAULT_PHASES) {
|
|
1459
|
-
const node = { name, isAutoGenerated: false };
|
|
1460
|
-
this.phases.push(node);
|
|
1461
|
-
this.phaseMap.set(name, node);
|
|
1462
|
-
}
|
|
1463
|
-
this.invalidateCache();
|
|
1464
|
-
}
|
|
1465
|
-
//* Public API --------------------------------
|
|
1466
|
-
/**
|
|
1467
|
-
* Add a named phase to the graph
|
|
1468
|
-
* @param name - Phase name (must be unique)
|
|
1469
|
-
* @param options - Position options (before or after another phase)
|
|
1470
|
-
*/
|
|
1471
|
-
addPhase(name, options = {}) {
|
|
1472
|
-
if (this.phaseMap.has(name)) {
|
|
1473
|
-
console.warn(`[useFrame] Phase "${name}" already exists`);
|
|
1474
|
-
return;
|
|
1475
|
-
}
|
|
1476
|
-
const { before, after } = options;
|
|
1477
|
-
const node = { name, isAutoGenerated: false };
|
|
1478
|
-
let insertIndex = this.phases.length;
|
|
1479
|
-
const targetIndex = this.getPhaseIndex(before ?? after);
|
|
1480
|
-
if (targetIndex !== -1) {
|
|
1481
|
-
insertIndex = before ? targetIndex : targetIndex + 1;
|
|
1482
|
-
} else {
|
|
1483
|
-
const constraintType = before ? "before" : "after";
|
|
1484
|
-
console.warn(`[useFrame] Phase "${before ?? after}" not found for '${constraintType}' constraint`);
|
|
1485
|
-
}
|
|
1486
|
-
this.phases.splice(insertIndex, 0, node);
|
|
1487
|
-
this.phaseMap.set(name, node);
|
|
1488
|
-
this.invalidateCache();
|
|
1489
|
-
}
|
|
1490
|
-
/**
|
|
1491
|
-
* Get ordered list of phase names
|
|
1492
|
-
*/
|
|
1493
|
-
getOrderedPhases() {
|
|
1494
|
-
if (this.orderedNamesCache === null) this.orderedNamesCache = this.phases.map((p) => p.name);
|
|
1495
|
-
return this.orderedNamesCache;
|
|
1496
|
-
}
|
|
1497
|
-
/**
|
|
1498
|
-
* Check if a phase exists
|
|
1499
|
-
*/
|
|
1500
|
-
hasPhase(name) {
|
|
1501
|
-
return this.phaseMap.has(name);
|
|
1502
|
-
}
|
|
1503
|
-
/**
|
|
1504
|
-
* Get the index of a phase (-1 if not found)
|
|
1505
|
-
*/
|
|
1506
|
-
getPhaseIndex(name) {
|
|
1507
|
-
if (!name) return -1;
|
|
1508
|
-
return this.phases.findIndex((p) => p.name === name);
|
|
1509
|
-
}
|
|
1510
|
-
/**
|
|
1511
|
-
* Ensure a phase exists, creating an auto-generated one if needed.
|
|
1512
|
-
* Used for resolving before/after constraints.
|
|
1513
|
-
*
|
|
1514
|
-
* @param name - The phase name to ensure exists
|
|
1515
|
-
* @returns The phase name (may be auto-generated like 'before:render')
|
|
1516
|
-
*/
|
|
1517
|
-
ensurePhase(name) {
|
|
1518
|
-
if (this.phaseMap.has(name)) return name;
|
|
1519
|
-
const node = { name, isAutoGenerated: true };
|
|
1520
|
-
this.phases.push(node);
|
|
1521
|
-
this.phaseMap.set(name, node);
|
|
1522
|
-
this.invalidateCache();
|
|
1523
|
-
return name;
|
|
1524
|
-
}
|
|
1525
|
-
/**
|
|
1526
|
-
* Resolve where a job with before/after constraints should go.
|
|
1527
|
-
* Creates auto-generated phases if needed.
|
|
1528
|
-
*
|
|
1529
|
-
* @param before - Phase(s) to run before
|
|
1530
|
-
* @param after - Phase(s) to run after
|
|
1531
|
-
* @returns The resolved phase name
|
|
1532
|
-
*/
|
|
1533
|
-
resolveConstraintPhase(before, after) {
|
|
1534
|
-
const beforeArr = before ? Array.isArray(before) ? before : [before] : [];
|
|
1535
|
-
const afterArr = after ? Array.isArray(after) ? after : [after] : [];
|
|
1536
|
-
if (beforeArr.length > 0) {
|
|
1537
|
-
return this.ensureAutoPhase(beforeArr[0], "before", 0);
|
|
1538
|
-
}
|
|
1539
|
-
if (afterArr.length > 0) {
|
|
1540
|
-
return this.ensureAutoPhase(afterArr[0], "after", 1);
|
|
1541
|
-
}
|
|
1542
|
-
return "update";
|
|
1543
|
-
}
|
|
1544
|
-
/**
|
|
1545
|
-
* Ensure an auto-generated phase exists relative to a target phase.
|
|
1546
|
-
* Creates the phase if it doesn't exist, inserting it at the correct position.
|
|
1547
|
-
*
|
|
1548
|
-
* @param target - The target phase name to position relative to
|
|
1549
|
-
* @param prefix - Prefix for auto-generated phase name ('before' or 'after')
|
|
1550
|
-
* @param offset - Insertion offset (0 for before, 1 for after)
|
|
1551
|
-
* @returns The auto-generated phase name
|
|
1552
|
-
*/
|
|
1553
|
-
ensureAutoPhase(target, prefix, offset) {
|
|
1554
|
-
const autoName = `${prefix}:${target}`;
|
|
1555
|
-
if (this.phaseMap.has(autoName)) return autoName;
|
|
1556
|
-
const node = { name: autoName, isAutoGenerated: true };
|
|
1557
|
-
const targetIndex = this.getPhaseIndex(target);
|
|
1558
|
-
if (targetIndex !== -1) this.phases.splice(targetIndex + offset, 0, node);
|
|
1559
|
-
else this.phases.push(node);
|
|
1560
|
-
this.phaseMap.set(autoName, node);
|
|
1561
|
-
this.invalidateCache();
|
|
1562
|
-
return autoName;
|
|
1563
|
-
}
|
|
1564
|
-
// Internal --------------------------------
|
|
1565
|
-
invalidateCache() {
|
|
1566
|
-
this.orderedNamesCache = null;
|
|
1567
|
-
}
|
|
1568
|
-
}
|
|
1569
|
-
|
|
1570
|
-
function rebuildSortedJobs(jobs, phaseGraph) {
|
|
1571
|
-
const orderedPhases = phaseGraph.getOrderedPhases();
|
|
1572
|
-
const buckets = /* @__PURE__ */ new Map();
|
|
1573
|
-
for (const phase of orderedPhases) {
|
|
1574
|
-
buckets.set(phase, []);
|
|
1575
|
-
}
|
|
1576
|
-
for (const job of jobs.values()) {
|
|
1577
|
-
if (!job.enabled) continue;
|
|
1578
|
-
let bucket = buckets.get(job.phase);
|
|
1579
|
-
if (!bucket) {
|
|
1580
|
-
bucket = [];
|
|
1581
|
-
buckets.set(job.phase, bucket);
|
|
1582
|
-
}
|
|
1583
|
-
bucket.push(job);
|
|
1584
|
-
}
|
|
1585
|
-
const sortedBuckets = [];
|
|
1586
|
-
for (const phase of orderedPhases) {
|
|
1587
|
-
const bucket = buckets.get(phase);
|
|
1588
|
-
if (!bucket || bucket.length === 0) continue;
|
|
1589
|
-
bucket.sort((a, b) => {
|
|
1590
|
-
if (a.priority !== b.priority) return b.priority - a.priority;
|
|
1591
|
-
return a.index - b.index;
|
|
1592
|
-
});
|
|
1593
|
-
sortedBuckets.push(hasCrossJobConstraints(bucket) ? topologicalSort(bucket) : bucket);
|
|
1594
|
-
}
|
|
1595
|
-
for (const [phase, bucket] of buckets) {
|
|
1596
|
-
if (!orderedPhases.includes(phase) && bucket.length > 0) {
|
|
1597
|
-
bucket.sort((a, b) => {
|
|
1598
|
-
if (a.priority !== b.priority) return b.priority - a.priority;
|
|
1599
|
-
return a.index - b.index;
|
|
1600
|
-
});
|
|
1601
|
-
sortedBuckets.push(bucket);
|
|
1602
|
-
}
|
|
1603
|
-
}
|
|
1604
|
-
return sortedBuckets.flat();
|
|
1605
|
-
}
|
|
1606
|
-
function hasCrossJobConstraints(bucket) {
|
|
1607
|
-
const jobIds = new Set(bucket.map((j) => j.id));
|
|
1608
|
-
for (const job of bucket) {
|
|
1609
|
-
for (const ref of job.before) {
|
|
1610
|
-
if (jobIds.has(ref)) return true;
|
|
1611
|
-
}
|
|
1612
|
-
for (const ref of job.after) {
|
|
1613
|
-
if (jobIds.has(ref)) return true;
|
|
1614
|
-
}
|
|
1615
|
-
}
|
|
1616
|
-
return false;
|
|
1617
|
-
}
|
|
1618
|
-
function topologicalSort(jobs) {
|
|
1619
|
-
const n = jobs.length;
|
|
1620
|
-
if (n <= 1) return jobs;
|
|
1621
|
-
const jobMap = /* @__PURE__ */ new Map();
|
|
1622
|
-
const inDegree = /* @__PURE__ */ new Map();
|
|
1623
|
-
const adjacency = /* @__PURE__ */ new Map();
|
|
1624
|
-
for (const job of jobs) {
|
|
1625
|
-
jobMap.set(job.id, job);
|
|
1626
|
-
inDegree.set(job.id, 0);
|
|
1627
|
-
adjacency.set(job.id, []);
|
|
1628
|
-
}
|
|
1629
|
-
for (const job of jobs) {
|
|
1630
|
-
for (const ref of job.before) {
|
|
1631
|
-
if (jobMap.has(ref)) {
|
|
1632
|
-
adjacency.get(job.id).push(ref);
|
|
1633
|
-
inDegree.set(ref, inDegree.get(ref) + 1);
|
|
1634
|
-
}
|
|
1635
|
-
}
|
|
1636
|
-
for (const ref of job.after) {
|
|
1637
|
-
if (jobMap.has(ref)) {
|
|
1638
|
-
adjacency.get(ref).push(job.id);
|
|
1639
|
-
inDegree.set(job.id, inDegree.get(job.id) + 1);
|
|
1640
|
-
}
|
|
1641
|
-
}
|
|
1642
|
-
}
|
|
1643
|
-
const queue = [];
|
|
1644
|
-
for (const job of jobs) {
|
|
1645
|
-
if (inDegree.get(job.id) === 0) {
|
|
1646
|
-
queue.push(job);
|
|
1647
|
-
}
|
|
1648
|
-
}
|
|
1649
|
-
queue.sort((a, b) => {
|
|
1650
|
-
if (a.priority !== b.priority) return b.priority - a.priority;
|
|
1651
|
-
return a.index - b.index;
|
|
1652
|
-
});
|
|
1653
|
-
const result = [];
|
|
1654
|
-
while (queue.length > 0) {
|
|
1655
|
-
const job = queue.shift();
|
|
1656
|
-
result.push(job);
|
|
1657
|
-
const neighbors = adjacency.get(job.id) || [];
|
|
1658
|
-
for (const neighborId of neighbors) {
|
|
1659
|
-
const newDegree = inDegree.get(neighborId) - 1;
|
|
1660
|
-
inDegree.set(neighborId, newDegree);
|
|
1661
|
-
if (newDegree === 0) {
|
|
1662
|
-
const neighbor = jobMap.get(neighborId);
|
|
1663
|
-
insertSorted(queue, neighbor);
|
|
1664
|
-
}
|
|
1665
|
-
}
|
|
1666
|
-
}
|
|
1667
|
-
if (result.length !== n) {
|
|
1668
|
-
console.warn("[useFrame] Circular dependency detected in job constraints");
|
|
1669
|
-
const resultIds = new Set(result.map((j) => j.id));
|
|
1670
|
-
for (const job of jobs) {
|
|
1671
|
-
if (!resultIds.has(job.id)) result.push(job);
|
|
1672
|
-
}
|
|
1673
|
-
}
|
|
1674
|
-
return result;
|
|
1675
|
-
}
|
|
1676
|
-
function insertSorted(arr, job) {
|
|
1677
|
-
let i = 0;
|
|
1678
|
-
while (i < arr.length) {
|
|
1679
|
-
const cmp = arr[i];
|
|
1680
|
-
if (job.priority > cmp.priority || job.priority === cmp.priority && job.index < cmp.index) {
|
|
1681
|
-
break;
|
|
1682
|
-
}
|
|
1683
|
-
i++;
|
|
1684
|
-
}
|
|
1685
|
-
arr.splice(i, 0, job);
|
|
1686
|
-
}
|
|
1687
|
-
|
|
1688
|
-
function shouldRun(job, now) {
|
|
1689
|
-
if (!job.enabled) return false;
|
|
1690
|
-
if (!job.fps) return true;
|
|
1691
|
-
const minInterval = 1e3 / job.fps;
|
|
1692
|
-
const lastRun = job.lastRun ?? 0;
|
|
1693
|
-
const elapsed = now - lastRun;
|
|
1694
|
-
if (elapsed < minInterval) return false;
|
|
1695
|
-
if (job.drop) {
|
|
1696
|
-
job.lastRun = now;
|
|
1697
|
-
} else {
|
|
1698
|
-
const steps = Math.floor(elapsed / minInterval);
|
|
1699
|
-
job.lastRun = lastRun + steps * minInterval;
|
|
1700
|
-
if (job.lastRun < now - minInterval) {
|
|
1701
|
-
job.lastRun = now;
|
|
1702
|
-
}
|
|
1703
|
-
}
|
|
1704
|
-
return true;
|
|
1705
|
-
}
|
|
1706
|
-
function resetJobTiming(job) {
|
|
1707
|
-
job.lastRun = void 0;
|
|
1708
|
-
}
|
|
1709
|
-
|
|
1710
|
-
var __defProp = Object.defineProperty;
|
|
1711
|
-
var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
|
|
1712
|
-
var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
|
|
1713
|
-
const hmrData = (() => {
|
|
1714
|
-
if (typeof process !== "undefined" && process.env.NODE_ENV === "test") return void 0;
|
|
1715
|
-
if (typeof import_meta_hot !== "undefined") return import_meta_hot;
|
|
1716
|
-
try {
|
|
1717
|
-
return (0, eval)("import.meta.hot");
|
|
1718
|
-
} catch {
|
|
1719
|
-
return void 0;
|
|
1720
|
-
}
|
|
1721
|
-
})();
|
|
1722
|
-
const _Scheduler = class _Scheduler {
|
|
1723
|
-
//* Constructor ================================
|
|
1724
|
-
constructor() {
|
|
1725
|
-
//* Critical State ================================
|
|
1726
|
-
__publicField(this, "roots", /* @__PURE__ */ new Map());
|
|
1727
|
-
__publicField(this, "phaseGraph");
|
|
1728
|
-
__publicField(this, "loopState", {
|
|
1729
|
-
running: false,
|
|
1730
|
-
rafHandle: null,
|
|
1731
|
-
lastTime: null,
|
|
1732
|
-
// null = uninitialized, 0+ = valid timestamp
|
|
1733
|
-
frameCount: 0,
|
|
1734
|
-
elapsedTime: 0,
|
|
1735
|
-
createdAt: performance.now()
|
|
1736
|
-
});
|
|
1737
|
-
__publicField(this, "stoppedTime", 0);
|
|
1738
|
-
//* Private State ================================
|
|
1739
|
-
__publicField(this, "nextRootIndex", 0);
|
|
1740
|
-
__publicField(this, "globalBeforeJobs", /* @__PURE__ */ new Map());
|
|
1741
|
-
__publicField(this, "globalAfterJobs", /* @__PURE__ */ new Map());
|
|
1742
|
-
__publicField(this, "nextGlobalIndex", 0);
|
|
1743
|
-
__publicField(this, "idleCallbacks", /* @__PURE__ */ new Set());
|
|
1744
|
-
__publicField(this, "nextJobIndex", 0);
|
|
1745
|
-
__publicField(this, "jobStateListeners", /* @__PURE__ */ new Map());
|
|
1746
|
-
__publicField(this, "pendingFrames", 0);
|
|
1747
|
-
__publicField(this, "_frameloop", "always");
|
|
1748
|
-
//* Independent Mode & Error Handling State ================================
|
|
1749
|
-
__publicField(this, "_independent", false);
|
|
1750
|
-
__publicField(this, "errorHandler", null);
|
|
1751
|
-
__publicField(this, "rootReadyCallbacks", /* @__PURE__ */ new Set());
|
|
1752
|
-
//* Core Loop Execution Methods ================================
|
|
1753
|
-
/**
|
|
1754
|
-
* Main RAF loop callback.
|
|
1755
|
-
* Executes frame, handles demand mode, and schedules next frame.
|
|
1756
|
-
* @param {number} timestamp - RAF timestamp in milliseconds
|
|
1757
|
-
* @returns {void}
|
|
1758
|
-
* @private
|
|
1759
|
-
*/
|
|
1760
|
-
__publicField(this, "loop", (timestamp) => {
|
|
1761
|
-
if (!this.loopState.running) return;
|
|
1762
|
-
this.executeFrame(timestamp);
|
|
1763
|
-
if (this._frameloop === "demand") {
|
|
1764
|
-
this.pendingFrames = Math.max(0, this.pendingFrames - 1);
|
|
1765
|
-
if (this.pendingFrames === 0) {
|
|
1766
|
-
this.notifyIdle(timestamp);
|
|
1767
|
-
return this.stop();
|
|
1768
|
-
}
|
|
1769
|
-
}
|
|
1770
|
-
this.loopState.rafHandle = requestAnimationFrame(this.loop);
|
|
1771
|
-
});
|
|
1772
|
-
this.phaseGraph = new PhaseGraph();
|
|
1773
|
-
}
|
|
1774
|
-
static get instance() {
|
|
1775
|
-
return globalThis[_Scheduler.INSTANCE_KEY] ?? null;
|
|
1776
|
-
}
|
|
1777
|
-
static set instance(value) {
|
|
1778
|
-
globalThis[_Scheduler.INSTANCE_KEY] = value;
|
|
1779
|
-
}
|
|
1780
|
-
/**
|
|
1781
|
-
* Get the global scheduler instance (creates if doesn't exist).
|
|
1782
|
-
* Uses HMR data to preserve instance across hot reloads.
|
|
1783
|
-
* @returns {Scheduler} The singleton scheduler instance
|
|
1784
|
-
*/
|
|
1785
|
-
static get() {
|
|
1786
|
-
if (!_Scheduler.instance && hmrData?.data?.scheduler) {
|
|
1787
|
-
_Scheduler.instance = hmrData.data.scheduler;
|
|
1788
|
-
}
|
|
1789
|
-
if (!_Scheduler.instance) {
|
|
1790
|
-
_Scheduler.instance = new _Scheduler();
|
|
1791
|
-
if (hmrData?.data) {
|
|
1792
|
-
hmrData.data.scheduler = _Scheduler.instance;
|
|
1793
|
-
}
|
|
1794
|
-
}
|
|
1795
|
-
return _Scheduler.instance;
|
|
1796
|
-
}
|
|
1797
|
-
/**
|
|
1798
|
-
* Reset the singleton instance. Stops the loop and clears all state.
|
|
1799
|
-
* Primarily used for testing to ensure clean state between tests.
|
|
1800
|
-
* @returns {void}
|
|
1801
|
-
*/
|
|
1802
|
-
static reset() {
|
|
1803
|
-
if (_Scheduler.instance) {
|
|
1804
|
-
_Scheduler.instance.stop();
|
|
1805
|
-
_Scheduler.instance = null;
|
|
1806
|
-
}
|
|
1807
|
-
if (hmrData?.data) {
|
|
1808
|
-
hmrData.data.scheduler = null;
|
|
1809
|
-
}
|
|
1810
|
-
}
|
|
1811
|
-
//* Getters & Setters ================================
|
|
1812
|
-
get phases() {
|
|
1813
|
-
return this.phaseGraph.getOrderedPhases();
|
|
1814
|
-
}
|
|
1815
|
-
get frameloop() {
|
|
1816
|
-
return this._frameloop;
|
|
1817
|
-
}
|
|
1818
|
-
set frameloop(mode) {
|
|
1819
|
-
if (this._frameloop === mode) return;
|
|
1820
|
-
const wasAlways = this._frameloop === "always";
|
|
1821
|
-
this._frameloop = mode;
|
|
1822
|
-
if (mode === "always" && !this.loopState.running && this.roots.size > 0) this.start();
|
|
1823
|
-
else if (mode !== "always" && wasAlways) this.stop();
|
|
1824
|
-
}
|
|
1825
|
-
get isRunning() {
|
|
1826
|
-
return this.loopState.running;
|
|
1827
|
-
}
|
|
1828
|
-
get isReady() {
|
|
1829
|
-
return this.roots.size > 0;
|
|
1830
|
-
}
|
|
1831
|
-
get independent() {
|
|
1832
|
-
return this._independent;
|
|
1833
|
-
}
|
|
1834
|
-
set independent(value) {
|
|
1835
|
-
this._independent = value;
|
|
1836
|
-
if (value) this.ensureDefaultRoot();
|
|
1837
|
-
}
|
|
1838
|
-
//* Root Management Methods ================================
|
|
1839
|
-
/**
|
|
1840
|
-
* Register a root (Canvas) with the scheduler.
|
|
1841
|
-
* The first root to register starts the RAF loop (if frameloop='always').
|
|
1842
|
-
* @param {string} id - Unique identifier for this root
|
|
1843
|
-
* @param {RootOptions} [options] - Optional configuration with getState and onError callbacks
|
|
1844
|
-
* @returns {() => void} Unsubscribe function to remove this root
|
|
1845
|
-
*/
|
|
1846
|
-
registerRoot(id, options = {}) {
|
|
1847
|
-
if (this.roots.has(id)) {
|
|
1848
|
-
console.warn(`[Scheduler] Root "${id}" already registered`);
|
|
1849
|
-
return () => this.unregisterRoot(id);
|
|
1850
|
-
}
|
|
1851
|
-
const entry = {
|
|
1852
|
-
id,
|
|
1853
|
-
getState: options.getState ?? (() => ({})),
|
|
1854
|
-
jobs: /* @__PURE__ */ new Map(),
|
|
1855
|
-
sortedJobs: [],
|
|
1856
|
-
needsRebuild: false
|
|
1857
|
-
};
|
|
1858
|
-
if (options.onError) {
|
|
1859
|
-
this.errorHandler = options.onError;
|
|
1860
|
-
}
|
|
1861
|
-
this.roots.set(id, entry);
|
|
1862
|
-
if (this.roots.size === 1) {
|
|
1863
|
-
this.notifyRootReady();
|
|
1864
|
-
if (this._frameloop === "always") this.start();
|
|
1865
|
-
}
|
|
1866
|
-
return () => this.unregisterRoot(id);
|
|
1867
|
-
}
|
|
1868
|
-
/**
|
|
1869
|
-
* Unregister a root from the scheduler.
|
|
1870
|
-
* Cleans up all job state listeners for this root's jobs.
|
|
1871
|
-
* The last root to unregister stops the RAF loop.
|
|
1872
|
-
* @param {string} id - The root ID to unregister
|
|
1873
|
-
* @returns {void}
|
|
1874
|
-
*/
|
|
1875
|
-
unregisterRoot(id) {
|
|
1876
|
-
const root = this.roots.get(id);
|
|
1877
|
-
if (!root) return;
|
|
1878
|
-
for (const jobId of root.jobs.keys()) {
|
|
1879
|
-
this.jobStateListeners.delete(jobId);
|
|
1880
|
-
}
|
|
1881
|
-
this.roots.delete(id);
|
|
1882
|
-
if (this.roots.size === 0) {
|
|
1883
|
-
this.stop();
|
|
1884
|
-
this.errorHandler = null;
|
|
1885
|
-
}
|
|
1886
|
-
}
|
|
1887
|
-
/**
|
|
1888
|
-
* Subscribe to be notified when a root becomes available.
|
|
1889
|
-
* Fires immediately if a root already exists.
|
|
1890
|
-
* @param {() => void} callback - Function called when first root registers
|
|
1891
|
-
* @returns {() => void} Unsubscribe function
|
|
1892
|
-
*/
|
|
1893
|
-
onRootReady(callback) {
|
|
1894
|
-
if (this.roots.size > 0) {
|
|
1895
|
-
callback();
|
|
1896
|
-
return () => {
|
|
1897
|
-
};
|
|
1898
|
-
}
|
|
1899
|
-
this.rootReadyCallbacks.add(callback);
|
|
1900
|
-
return () => this.rootReadyCallbacks.delete(callback);
|
|
1901
|
-
}
|
|
1902
|
-
/**
|
|
1903
|
-
* Notify all registered root-ready callbacks.
|
|
1904
|
-
* Called when the first root registers.
|
|
1905
|
-
* @returns {void}
|
|
1906
|
-
* @private
|
|
1907
|
-
*/
|
|
1908
|
-
notifyRootReady() {
|
|
1909
|
-
for (const cb of this.rootReadyCallbacks) {
|
|
1910
|
-
try {
|
|
1911
|
-
cb();
|
|
1912
|
-
} catch (error) {
|
|
1913
|
-
console.error("[Scheduler] Error in root-ready callback:", error);
|
|
1914
|
-
}
|
|
1915
|
-
}
|
|
1916
|
-
this.rootReadyCallbacks.clear();
|
|
1917
|
-
}
|
|
1918
|
-
/**
|
|
1919
|
-
* Ensure a default root exists for independent mode.
|
|
1920
|
-
* Creates a minimal root with no state provider.
|
|
1921
|
-
* @returns {void}
|
|
1922
|
-
* @private
|
|
1923
|
-
*/
|
|
1924
|
-
ensureDefaultRoot() {
|
|
1925
|
-
if (!this.roots.has("__default__")) {
|
|
1926
|
-
this.registerRoot("__default__");
|
|
1927
|
-
}
|
|
1928
|
-
}
|
|
1929
|
-
/**
|
|
1930
|
-
* Trigger error handling for job errors.
|
|
1931
|
-
* Uses the bound error handler if available, otherwise logs to console.
|
|
1932
|
-
* @param {Error} error - The error to handle
|
|
1933
|
-
* @returns {void}
|
|
1934
|
-
*/
|
|
1935
|
-
triggerError(error) {
|
|
1936
|
-
if (this.errorHandler) this.errorHandler(error);
|
|
1937
|
-
else console.error("[Scheduler]", error);
|
|
1938
|
-
}
|
|
1939
|
-
//* Phase Management Methods ================================
|
|
1940
|
-
/**
|
|
1941
|
-
* Add a named phase to the scheduler's execution order.
|
|
1942
|
-
* Marks all roots for rebuild to incorporate the new phase.
|
|
1943
|
-
* @param {string} name - The phase name (e.g., 'physics', 'postprocess')
|
|
1944
|
-
* @param {AddPhaseOptions} [options] - Positioning options (before/after other phases)
|
|
1945
|
-
* @returns {void}
|
|
1946
|
-
* @example
|
|
1947
|
-
* scheduler.addPhase('physics', { before: 'update' });
|
|
1948
|
-
* scheduler.addPhase('postprocess', { after: 'render' });
|
|
1949
|
-
*/
|
|
1950
|
-
addPhase(name, options) {
|
|
1951
|
-
this.phaseGraph.addPhase(name, options);
|
|
1952
|
-
for (const root of this.roots.values()) {
|
|
1953
|
-
root.needsRebuild = true;
|
|
1954
|
-
}
|
|
1955
|
-
}
|
|
1956
|
-
/**
|
|
1957
|
-
* Check if a phase exists in the scheduler.
|
|
1958
|
-
* @param {string} name - The phase name to check
|
|
1959
|
-
* @returns {boolean} True if the phase exists
|
|
1960
|
-
*/
|
|
1961
|
-
hasPhase(name) {
|
|
1962
|
-
return this.phaseGraph.hasPhase(name);
|
|
1963
|
-
}
|
|
1964
|
-
//* Global Job Registration Methods (Deprecated APIs) ================================
|
|
1965
|
-
/**
|
|
1966
|
-
* Register a global job that runs once per frame (not per-root).
|
|
1967
|
-
* Used internally by deprecated addEffect/addAfterEffect APIs.
|
|
1968
|
-
* @param {'before' | 'after'} phase - When to run: 'before' all roots or 'after' all roots
|
|
1969
|
-
* @param {string} id - Unique identifier for this global job
|
|
1970
|
-
* @param {(timestamp: number) => void} callback - Function called each frame with RAF timestamp
|
|
1971
|
-
* @returns {() => void} Unsubscribe function to remove this global job
|
|
1972
|
-
* @deprecated Use useFrame with phases instead
|
|
1973
|
-
*/
|
|
1974
|
-
registerGlobal(phase, id, callback) {
|
|
1975
|
-
const job = { id, callback };
|
|
1976
|
-
if (phase === "before") {
|
|
1977
|
-
this.globalBeforeJobs.set(id, job);
|
|
1978
|
-
} else {
|
|
1979
|
-
this.globalAfterJobs.set(id, job);
|
|
1980
|
-
}
|
|
1981
|
-
return () => {
|
|
1982
|
-
if (phase === "before") this.globalBeforeJobs.delete(id);
|
|
1983
|
-
else this.globalAfterJobs.delete(id);
|
|
1984
|
-
};
|
|
1985
|
-
}
|
|
1986
|
-
//* Idle Callback Methods (Deprecated API) ================================
|
|
1987
|
-
/**
|
|
1988
|
-
* Register an idle callback that fires when the loop stops.
|
|
1989
|
-
* Used internally by deprecated addTail API.
|
|
1990
|
-
* @param {(timestamp: number) => void} callback - Function called when loop becomes idle
|
|
1991
|
-
* @returns {() => void} Unsubscribe function to remove this idle callback
|
|
1992
|
-
* @deprecated Use demand mode with invalidate() instead
|
|
1993
|
-
*/
|
|
1994
|
-
onIdle(callback) {
|
|
1995
|
-
this.idleCallbacks.add(callback);
|
|
1996
|
-
return () => this.idleCallbacks.delete(callback);
|
|
1997
|
-
}
|
|
1998
|
-
/**
|
|
1999
|
-
* Notify all registered idle callbacks.
|
|
2000
|
-
* Called when the loop stops in demand mode.
|
|
2001
|
-
* @param {number} timestamp - The RAF timestamp when idle occurred
|
|
2002
|
-
* @returns {void}
|
|
2003
|
-
* @private
|
|
2004
|
-
*/
|
|
2005
|
-
notifyIdle(timestamp) {
|
|
2006
|
-
for (const cb of this.idleCallbacks) {
|
|
2007
|
-
try {
|
|
2008
|
-
cb(timestamp);
|
|
2009
|
-
} catch (error) {
|
|
2010
|
-
console.error("[Scheduler] Error in idle callback:", error);
|
|
2011
|
-
}
|
|
2012
|
-
}
|
|
2013
|
-
}
|
|
2014
|
-
//* Job Registration & Management Methods ================================
|
|
2015
|
-
/**
|
|
2016
|
-
* Register a job (frame callback) with a specific root.
|
|
2017
|
-
* This is the core registration method used by useFrame internally.
|
|
2018
|
-
* @param {FrameNextCallback} callback - The function to call each frame
|
|
2019
|
-
* @param {JobOptions & { rootId?: string; system?: boolean }} [options] - Job configuration
|
|
2020
|
-
* @param {string} [options.rootId] - Target root ID (defaults to first registered root)
|
|
2021
|
-
* @param {string} [options.id] - Unique job ID (auto-generated if not provided)
|
|
2022
|
-
* @param {string} [options.phase] - Execution phase (defaults to 'update')
|
|
2023
|
-
* @param {number} [options.priority] - Priority within phase (higher = earlier, default 0)
|
|
2024
|
-
* @param {number} [options.fps] - FPS throttle limit
|
|
2025
|
-
* @param {boolean} [options.drop] - Drop frames when behind (default true)
|
|
2026
|
-
* @param {boolean} [options.enabled] - Whether job is active (default true)
|
|
2027
|
-
* @param {boolean} [options.system] - Internal flag for system jobs (not user-facing)
|
|
2028
|
-
* @returns {() => void} Unsubscribe function to remove this job
|
|
2029
|
-
*/
|
|
2030
|
-
register(callback, options = {}) {
|
|
2031
|
-
const rootId = options.rootId;
|
|
2032
|
-
const root = rootId ? this.roots.get(rootId) : this.roots.values().next().value;
|
|
2033
|
-
if (!root) {
|
|
2034
|
-
console.warn("[Scheduler] No root registered. Is this inside a Canvas?");
|
|
2035
|
-
return () => {
|
|
2036
|
-
};
|
|
2037
|
-
}
|
|
2038
|
-
const id = options.id ?? this.generateJobId();
|
|
2039
|
-
let phase = options.phase ?? "update";
|
|
2040
|
-
if (!options.phase && (options.before || options.after)) {
|
|
2041
|
-
phase = this.phaseGraph.resolveConstraintPhase(options.before, options.after);
|
|
2042
|
-
}
|
|
2043
|
-
const before = this.normalizeConstraints(options.before);
|
|
2044
|
-
const after = this.normalizeConstraints(options.after);
|
|
2045
|
-
const job = {
|
|
2046
|
-
id,
|
|
2047
|
-
callback,
|
|
2048
|
-
phase,
|
|
2049
|
-
before,
|
|
2050
|
-
after,
|
|
2051
|
-
priority: options.priority ?? 0,
|
|
2052
|
-
index: this.nextJobIndex++,
|
|
2053
|
-
fps: options.fps,
|
|
2054
|
-
drop: options.drop ?? true,
|
|
2055
|
-
enabled: options.enabled ?? true,
|
|
2056
|
-
system: options.system ?? false
|
|
2057
|
-
};
|
|
2058
|
-
if (root.jobs.has(id)) {
|
|
2059
|
-
console.warn(`[useFrame] Job with id "${id}" already exists, replacing`);
|
|
2060
|
-
}
|
|
2061
|
-
root.jobs.set(id, job);
|
|
2062
|
-
root.needsRebuild = true;
|
|
2063
|
-
return () => this.unregister(id, root.id);
|
|
2064
|
-
}
|
|
2065
|
-
/**
|
|
2066
|
-
* Unregister a job by its ID.
|
|
2067
|
-
* Searches all roots if rootId is not provided.
|
|
2068
|
-
* @param {string} id - The job ID to unregister
|
|
2069
|
-
* @param {string} [rootId] - Optional root ID to search (searches all if not provided)
|
|
2070
|
-
* @returns {void}
|
|
2071
|
-
*/
|
|
2072
|
-
unregister(id, rootId) {
|
|
2073
|
-
const root = rootId ? this.roots.get(rootId) : Array.from(this.roots.values()).find((r) => r.jobs.has(id));
|
|
2074
|
-
if (root?.jobs.delete(id)) {
|
|
2075
|
-
root.needsRebuild = true;
|
|
2076
|
-
this.jobStateListeners.delete(id);
|
|
2077
|
-
}
|
|
2078
|
-
}
|
|
2079
|
-
/**
|
|
2080
|
-
* Update a job's options dynamically.
|
|
2081
|
-
* Searches all roots to find the job by ID.
|
|
2082
|
-
* Phase/constraint changes trigger a rebuild of the sorted job list.
|
|
2083
|
-
* @param {string} id - The job ID to update
|
|
2084
|
-
* @param {Partial<JobOptions>} options - The options to update
|
|
2085
|
-
* @returns {void}
|
|
2086
|
-
*/
|
|
2087
|
-
updateJob(id, options) {
|
|
2088
|
-
let job;
|
|
2089
|
-
let root;
|
|
2090
|
-
for (const r of this.roots.values()) {
|
|
2091
|
-
job = r.jobs.get(id);
|
|
2092
|
-
if (job) {
|
|
2093
|
-
root = r;
|
|
2094
|
-
break;
|
|
2095
|
-
}
|
|
2096
|
-
}
|
|
2097
|
-
if (!job || !root) return;
|
|
2098
|
-
if (options.priority !== void 0) job.priority = options.priority;
|
|
2099
|
-
if (options.fps !== void 0) job.fps = options.fps;
|
|
2100
|
-
if (options.drop !== void 0) job.drop = options.drop;
|
|
2101
|
-
if (options.enabled !== void 0) {
|
|
2102
|
-
const wasEnabled = job.enabled;
|
|
2103
|
-
job.enabled = options.enabled;
|
|
2104
|
-
if (!wasEnabled && job.enabled) resetJobTiming(job);
|
|
2105
|
-
if (wasEnabled !== job.enabled) root.needsRebuild = true;
|
|
2106
|
-
}
|
|
2107
|
-
if (options.phase !== void 0 || options.before !== void 0 || options.after !== void 0) {
|
|
2108
|
-
if (options.phase) job.phase = options.phase;
|
|
2109
|
-
if (options.before !== void 0) job.before = this.normalizeConstraints(options.before);
|
|
2110
|
-
if (options.after !== void 0) job.after = this.normalizeConstraints(options.after);
|
|
2111
|
-
root.needsRebuild = true;
|
|
2112
|
-
}
|
|
2113
|
-
}
|
|
2114
|
-
//* Job State Management Methods ================================
|
|
2115
|
-
/**
|
|
2116
|
-
* Check if a job is currently paused (disabled).
|
|
2117
|
-
* @param {string} id - The job ID to check
|
|
2118
|
-
* @returns {boolean} True if the job exists and is paused
|
|
2119
|
-
*/
|
|
2120
|
-
isJobPaused(id) {
|
|
2121
|
-
for (const root of this.roots.values()) {
|
|
2122
|
-
const job = root.jobs.get(id);
|
|
2123
|
-
if (job) return !job.enabled;
|
|
2124
|
-
}
|
|
2125
|
-
return false;
|
|
2126
|
-
}
|
|
2127
|
-
/**
|
|
2128
|
-
* Subscribe to state changes for a specific job.
|
|
2129
|
-
* Listener is called when job is paused or resumed.
|
|
2130
|
-
* @param {string} id - The job ID to subscribe to
|
|
2131
|
-
* @param {() => void} listener - Callback invoked on state changes
|
|
2132
|
-
* @returns {() => void} Unsubscribe function
|
|
2133
|
-
*/
|
|
2134
|
-
subscribeJobState(id, listener) {
|
|
2135
|
-
if (!this.jobStateListeners.has(id)) {
|
|
2136
|
-
this.jobStateListeners.set(id, /* @__PURE__ */ new Set());
|
|
2137
|
-
}
|
|
2138
|
-
this.jobStateListeners.get(id).add(listener);
|
|
2139
|
-
return () => {
|
|
2140
|
-
this.jobStateListeners.get(id)?.delete(listener);
|
|
2141
|
-
if (this.jobStateListeners.get(id)?.size === 0) {
|
|
2142
|
-
this.jobStateListeners.delete(id);
|
|
2143
|
-
}
|
|
2144
|
-
};
|
|
2145
|
-
}
|
|
2146
|
-
/**
|
|
2147
|
-
* Notify all listeners that a job's state has changed.
|
|
2148
|
-
* @param {string} id - The job ID that changed
|
|
2149
|
-
* @returns {void}
|
|
2150
|
-
* @private
|
|
2151
|
-
*/
|
|
2152
|
-
notifyJobStateChange(id) {
|
|
2153
|
-
this.jobStateListeners.get(id)?.forEach((listener) => listener());
|
|
2154
|
-
}
|
|
2155
|
-
/**
|
|
2156
|
-
* Pause a job by ID (sets enabled=false).
|
|
2157
|
-
* Notifies any subscribed state listeners.
|
|
2158
|
-
* @param {string} id - The job ID to pause
|
|
2159
|
-
* @returns {void}
|
|
2160
|
-
*/
|
|
2161
|
-
pauseJob(id) {
|
|
2162
|
-
this.updateJob(id, { enabled: false });
|
|
2163
|
-
this.notifyJobStateChange(id);
|
|
2164
|
-
}
|
|
2165
|
-
/**
|
|
2166
|
-
* Resume a paused job by ID (sets enabled=true).
|
|
2167
|
-
* Resets job timing to prevent frame accumulation.
|
|
2168
|
-
* Notifies any subscribed state listeners.
|
|
2169
|
-
* @param {string} id - The job ID to resume
|
|
2170
|
-
* @returns {void}
|
|
2171
|
-
*/
|
|
2172
|
-
resumeJob(id) {
|
|
2173
|
-
this.updateJob(id, { enabled: true });
|
|
2174
|
-
this.notifyJobStateChange(id);
|
|
2175
|
-
}
|
|
2176
|
-
//* Frame Loop Control Methods ================================
|
|
2177
|
-
/**
|
|
2178
|
-
* Start the requestAnimationFrame loop.
|
|
2179
|
-
* Resets timing state (elapsedTime, frameCount) on start.
|
|
2180
|
-
* No-op if already running.
|
|
2181
|
-
* @returns {void}
|
|
2182
|
-
*/
|
|
2183
|
-
start() {
|
|
2184
|
-
if (this.loopState.running) return;
|
|
2185
|
-
const { elapsedTime, createdAt } = this.loopState;
|
|
2186
|
-
let adjustedCreated = 0;
|
|
2187
|
-
if (this.stoppedTime > 0) {
|
|
2188
|
-
adjustedCreated = createdAt - (performance.now() - this.stoppedTime);
|
|
2189
|
-
this.stoppedTime = 0;
|
|
2190
|
-
}
|
|
2191
|
-
Object.assign(this.loopState, {
|
|
2192
|
-
running: true,
|
|
2193
|
-
elapsedTime: elapsedTime ?? 0,
|
|
2194
|
-
lastTime: performance.now(),
|
|
2195
|
-
createdAt: adjustedCreated > 0 ? adjustedCreated : performance.now(),
|
|
2196
|
-
frameCount: 0,
|
|
2197
|
-
rafHandle: requestAnimationFrame(this.loop)
|
|
2198
|
-
});
|
|
2199
|
-
}
|
|
2200
|
-
/**
|
|
2201
|
-
* Stop the requestAnimationFrame loop.
|
|
2202
|
-
* Cancels any pending RAF callback.
|
|
2203
|
-
* No-op if not running.
|
|
2204
|
-
* @returns {void}
|
|
2205
|
-
*/
|
|
2206
|
-
stop() {
|
|
2207
|
-
if (!this.loopState.running) return;
|
|
2208
|
-
this.loopState.running = false;
|
|
2209
|
-
if (this.loopState.rafHandle !== null) {
|
|
2210
|
-
cancelAnimationFrame(this.loopState.rafHandle);
|
|
2211
|
-
this.loopState.rafHandle = null;
|
|
2212
|
-
}
|
|
2213
|
-
this.stoppedTime = performance.now();
|
|
2214
|
-
}
|
|
2215
|
-
/**
|
|
2216
|
-
* Request frames to be rendered in demand mode.
|
|
2217
|
-
* Accumulates pending frames (capped at 60) and starts the loop if not running.
|
|
2218
|
-
* No-op if frameloop is not 'demand'.
|
|
2219
|
-
* @param {number} [frames=1] - Number of frames to request
|
|
2220
|
-
* @param {boolean} [stackFrames=false] - Whether to add frames to existing pending count
|
|
2221
|
-
* - `false` (default): Sets pending frames to the specified value (replaces existing count)
|
|
2222
|
-
* - `true`: Adds frames to existing pending count (useful for accumulating invalidations)
|
|
2223
|
-
* @returns {void}
|
|
2224
|
-
* @example
|
|
2225
|
-
* // Request a single frame render
|
|
2226
|
-
* scheduler.invalidate();
|
|
2227
|
-
*
|
|
2228
|
-
* @example
|
|
2229
|
-
* // Request 5 frames (e.g., for animations)
|
|
2230
|
-
* scheduler.invalidate(5);
|
|
2231
|
-
*
|
|
2232
|
-
* @example
|
|
2233
|
-
* // Set pending frames to exactly 3 (don't stack with existing)
|
|
2234
|
-
* scheduler.invalidate(3, false);
|
|
2235
|
-
*
|
|
2236
|
-
* @example
|
|
2237
|
-
* // Add 2 more frames to existing pending count
|
|
2238
|
-
* scheduler.invalidate(2, true);
|
|
2239
|
-
*/
|
|
2240
|
-
invalidate(frames = 1, stackFrames = false) {
|
|
2241
|
-
if (this._frameloop !== "demand") return;
|
|
2242
|
-
const baseFrames = stackFrames ? this.pendingFrames : 0;
|
|
2243
|
-
this.pendingFrames = Math.min(60, baseFrames + frames);
|
|
2244
|
-
if (!this.loopState.running && this.pendingFrames > 0) this.start();
|
|
2245
|
-
}
|
|
2246
|
-
/**
|
|
2247
|
-
* Reset timing state for deterministic testing.
|
|
2248
|
-
* Preserves jobs and roots but resets lastTime, frameCount, elapsedTime, etc.
|
|
2249
|
-
* @returns {void}
|
|
2250
|
-
*/
|
|
2251
|
-
resetTiming() {
|
|
2252
|
-
this.loopState.lastTime = null;
|
|
2253
|
-
this.loopState.frameCount = 0;
|
|
2254
|
-
this.loopState.elapsedTime = 0;
|
|
2255
|
-
this.loopState.createdAt = performance.now();
|
|
2256
|
-
}
|
|
2257
|
-
//* Manual Stepping Methods ================================
|
|
2258
|
-
/**
|
|
2259
|
-
* Manually execute a single frame for all roots.
|
|
2260
|
-
* Useful for frameloop='never' mode or testing scenarios.
|
|
2261
|
-
* @param {number} [timestamp] - Optional timestamp (defaults to performance.now())
|
|
2262
|
-
* @returns {void}
|
|
2263
|
-
* @example
|
|
2264
|
-
* // Manual control mode
|
|
2265
|
-
* scheduler.frameloop = 'never';
|
|
2266
|
-
* scheduler.step(); // Execute one frame
|
|
2267
|
-
*/
|
|
2268
|
-
step(timestamp) {
|
|
2269
|
-
const now = timestamp ?? performance.now();
|
|
2270
|
-
this.executeFrame(now);
|
|
2271
|
-
}
|
|
2272
|
-
/**
|
|
2273
|
-
* Manually execute a single job by its ID.
|
|
2274
|
-
* Useful for testing individual job callbacks in isolation.
|
|
2275
|
-
* @param {string} id - The job ID to step
|
|
2276
|
-
* @param {number} [timestamp] - Optional timestamp (defaults to performance.now())
|
|
2277
|
-
* @returns {void}
|
|
2278
|
-
*/
|
|
2279
|
-
stepJob(id, timestamp) {
|
|
2280
|
-
let job;
|
|
2281
|
-
let root;
|
|
2282
|
-
for (const r of this.roots.values()) {
|
|
2283
|
-
job = r.jobs.get(id);
|
|
2284
|
-
if (job) {
|
|
2285
|
-
root = r;
|
|
2286
|
-
break;
|
|
2287
|
-
}
|
|
2288
|
-
}
|
|
2289
|
-
if (!job || !root) {
|
|
2290
|
-
console.warn(`[Scheduler] Job "${id}" not found`);
|
|
2291
|
-
return;
|
|
2292
|
-
}
|
|
2293
|
-
const now = timestamp ?? performance.now();
|
|
2294
|
-
const deltaMs = this.loopState.lastTime !== null ? now - this.loopState.lastTime : 0;
|
|
2295
|
-
const delta = deltaMs / 1e3;
|
|
2296
|
-
const elapsed = now - this.loopState.createdAt;
|
|
2297
|
-
const providedState = root.getState?.() ?? {};
|
|
2298
|
-
const frameState = {
|
|
2299
|
-
...providedState,
|
|
2300
|
-
time: now,
|
|
2301
|
-
delta,
|
|
2302
|
-
elapsed,
|
|
2303
|
-
frame: this.loopState.frameCount
|
|
2304
|
-
};
|
|
2305
|
-
try {
|
|
2306
|
-
job.callback(frameState, delta);
|
|
2307
|
-
} catch (error) {
|
|
2308
|
-
console.error(`[Scheduler] Error in job "${job.id}":`, error);
|
|
2309
|
-
this.triggerError(error instanceof Error ? error : new Error(String(error)));
|
|
2310
|
-
}
|
|
2311
|
-
}
|
|
2312
|
-
/**
|
|
2313
|
-
* Execute a single frame across all roots.
|
|
2314
|
-
* Order: globalBefore → each root's jobs → globalAfter
|
|
2315
|
-
* @param {number} timestamp - RAF timestamp in milliseconds
|
|
2316
|
-
* @returns {void}
|
|
2317
|
-
* @private
|
|
2318
|
-
*/
|
|
2319
|
-
executeFrame(timestamp) {
|
|
2320
|
-
const deltaMs = this.loopState.lastTime !== null ? timestamp - this.loopState.lastTime : 0;
|
|
2321
|
-
const delta = deltaMs / 1e3;
|
|
2322
|
-
this.loopState.lastTime = timestamp;
|
|
2323
|
-
this.loopState.frameCount++;
|
|
2324
|
-
this.loopState.elapsedTime += deltaMs;
|
|
2325
|
-
this.runGlobalJobs(this.globalBeforeJobs, timestamp);
|
|
2326
|
-
for (const root of this.roots.values()) {
|
|
2327
|
-
this.tickRoot(root, timestamp, delta);
|
|
2328
|
-
}
|
|
2329
|
-
this.runGlobalJobs(this.globalAfterJobs, timestamp);
|
|
2330
|
-
}
|
|
2331
|
-
/**
|
|
2332
|
-
* Run all global jobs from a job map.
|
|
2333
|
-
* Catches and logs errors without stopping execution.
|
|
2334
|
-
* @param {Map<string, GlobalJob>} jobs - The global jobs map to execute
|
|
2335
|
-
* @param {number} timestamp - RAF timestamp in milliseconds
|
|
2336
|
-
* @returns {void}
|
|
2337
|
-
* @private
|
|
2338
|
-
*/
|
|
2339
|
-
runGlobalJobs(jobs, timestamp) {
|
|
2340
|
-
for (const job of jobs.values()) {
|
|
2341
|
-
try {
|
|
2342
|
-
job.callback(timestamp);
|
|
2343
|
-
} catch (error) {
|
|
2344
|
-
console.error(`[Scheduler] Error in global job "${job.id}":`, error);
|
|
2345
|
-
}
|
|
2346
|
-
}
|
|
2347
|
-
}
|
|
2348
|
-
/**
|
|
2349
|
-
* Execute all jobs for a single root in sorted order.
|
|
2350
|
-
* Rebuilds sorted job list if needed, then dispatches each job.
|
|
2351
|
-
* Errors are caught and propagated via triggerError.
|
|
2352
|
-
* @param {RootEntry} root - The root entry to tick
|
|
2353
|
-
* @param {number} timestamp - RAF timestamp in milliseconds
|
|
2354
|
-
* @param {number} delta - Time since last frame in seconds
|
|
2355
|
-
* @returns {void}
|
|
2356
|
-
* @private
|
|
2357
|
-
*/
|
|
2358
|
-
tickRoot(root, timestamp, delta) {
|
|
2359
|
-
if (root.needsRebuild) {
|
|
2360
|
-
root.sortedJobs = rebuildSortedJobs(root.jobs, this.phaseGraph);
|
|
2361
|
-
root.needsRebuild = false;
|
|
2362
|
-
}
|
|
2363
|
-
const providedState = root.getState?.() ?? {};
|
|
2364
|
-
const frameState = {
|
|
2365
|
-
...providedState,
|
|
2366
|
-
time: timestamp,
|
|
2367
|
-
delta,
|
|
2368
|
-
elapsed: this.loopState.elapsedTime / 1e3,
|
|
2369
|
-
// Convert ms to seconds
|
|
2370
|
-
frame: this.loopState.frameCount
|
|
2371
|
-
};
|
|
2372
|
-
for (const job of root.sortedJobs) {
|
|
2373
|
-
if (!shouldRun(job, timestamp)) continue;
|
|
2374
|
-
try {
|
|
2375
|
-
job.callback(frameState, delta);
|
|
2376
|
-
} catch (error) {
|
|
2377
|
-
console.error(`[Scheduler] Error in job "${job.id}":`, error);
|
|
2378
|
-
this.triggerError(error instanceof Error ? error : new Error(String(error)));
|
|
2379
|
-
}
|
|
2380
|
-
}
|
|
2381
|
-
}
|
|
2382
|
-
//* Debug & Inspection Methods ================================
|
|
2383
|
-
/**
|
|
2384
|
-
* Get the total number of registered jobs across all roots.
|
|
2385
|
-
* Includes both per-root jobs and global before/after jobs.
|
|
2386
|
-
* @returns {number} Total job count
|
|
2387
|
-
*/
|
|
2388
|
-
getJobCount() {
|
|
2389
|
-
let count = 0;
|
|
2390
|
-
for (const root of this.roots.values()) {
|
|
2391
|
-
count += root.jobs.size;
|
|
2392
|
-
}
|
|
2393
|
-
return count + this.globalBeforeJobs.size + this.globalAfterJobs.size;
|
|
2394
|
-
}
|
|
2395
|
-
/**
|
|
2396
|
-
* Get all registered job IDs across all roots.
|
|
2397
|
-
* Includes both per-root jobs and global before/after jobs.
|
|
2398
|
-
* @returns {string[]} Array of all job IDs
|
|
2399
|
-
*/
|
|
2400
|
-
getJobIds() {
|
|
2401
|
-
const ids = [];
|
|
2402
|
-
for (const root of this.roots.values()) {
|
|
2403
|
-
ids.push(...root.jobs.keys());
|
|
2404
|
-
}
|
|
2405
|
-
ids.push(...this.globalBeforeJobs.keys());
|
|
2406
|
-
ids.push(...this.globalAfterJobs.keys());
|
|
2407
|
-
return ids;
|
|
2408
|
-
}
|
|
2409
|
-
/**
|
|
2410
|
-
* Get the number of registered roots (Canvas instances).
|
|
2411
|
-
* @returns {number} Number of registered roots
|
|
2412
|
-
*/
|
|
2413
|
-
getRootCount() {
|
|
2414
|
-
return this.roots.size;
|
|
2415
|
-
}
|
|
2416
|
-
/**
|
|
2417
|
-
* Check if any user (non-system) jobs are registered in a specific phase.
|
|
2418
|
-
* Used by the default render job to know if a user has taken over rendering.
|
|
2419
|
-
*
|
|
2420
|
-
* @param phase The phase to check
|
|
2421
|
-
* @param rootId Optional root ID to check (checks all roots if not provided)
|
|
2422
|
-
* @returns true if any user jobs exist in the phase
|
|
2423
|
-
*/
|
|
2424
|
-
hasUserJobsInPhase(phase, rootId) {
|
|
2425
|
-
const rootsToCheck = rootId ? [this.roots.get(rootId)].filter(Boolean) : Array.from(this.roots.values());
|
|
2426
|
-
return rootsToCheck.some((root) => {
|
|
2427
|
-
if (!root) return false;
|
|
2428
|
-
for (const job of root.jobs.values()) {
|
|
2429
|
-
if (job.phase === phase && !job.system && job.enabled) return true;
|
|
2430
|
-
}
|
|
2431
|
-
return false;
|
|
2432
|
-
});
|
|
2433
|
-
}
|
|
2434
|
-
//* Utility Methods ================================
|
|
2435
|
-
/**
|
|
2436
|
-
* Generate a unique root ID for automatic root registration.
|
|
2437
|
-
* @returns {string} A unique root ID in the format 'root_N'
|
|
2438
|
-
*/
|
|
2439
|
-
generateRootId() {
|
|
2440
|
-
return `root_${this.nextRootIndex++}`;
|
|
2441
|
-
}
|
|
2442
|
-
/**
|
|
2443
|
-
* Generate a unique job ID.
|
|
2444
|
-
* @returns {string} A unique job ID in the format 'job_N'
|
|
2445
|
-
* @private
|
|
2446
|
-
*/
|
|
2447
|
-
generateJobId() {
|
|
2448
|
-
return `job_${this.nextJobIndex}`;
|
|
2449
|
-
}
|
|
2450
|
-
/**
|
|
2451
|
-
* Normalize before/after constraints to a Set.
|
|
2452
|
-
* Handles undefined, single string, or array inputs.
|
|
2453
|
-
* @param {string | string[] | undefined} value - The constraint value(s)
|
|
2454
|
-
* @returns {Set<string>} Normalized Set of constraint strings
|
|
2455
|
-
* @private
|
|
2456
|
-
*/
|
|
2457
|
-
normalizeConstraints(value) {
|
|
2458
|
-
if (!value) return /* @__PURE__ */ new Set();
|
|
2459
|
-
if (Array.isArray(value)) return new Set(value);
|
|
2460
|
-
return /* @__PURE__ */ new Set([value]);
|
|
2461
|
-
}
|
|
2462
|
-
};
|
|
2463
|
-
//* Static State & Methods (Singleton Usage) ================================
|
|
2464
|
-
//* Cross-Bundle Singleton Key ==============================
|
|
2465
|
-
// Use Symbol.for() to ensure scheduler is shared across bundle boundaries
|
|
2466
|
-
// This prevents issues when mixing imports from @react-three/fiber and @react-three/fiber/webgpu
|
|
2467
|
-
__publicField(_Scheduler, "INSTANCE_KEY", Symbol.for("@react-three/fiber.scheduler"));
|
|
2468
|
-
let Scheduler = _Scheduler;
|
|
2469
|
-
const getScheduler = () => Scheduler.get();
|
|
2470
|
-
if (hmrData) {
|
|
2471
|
-
hmrData.accept?.();
|
|
1654
|
+
const INTERNAL_LIB_MARKERS = ["zustand", "setState", "Object.assign"];
|
|
1655
|
+
const INTERNAL_FIBER_MARKERS = ["packages/fiber/src", "packages/fiber/dist", "@react-three/fiber", "@react-three_fiber"];
|
|
1656
|
+
function isInternalRendererAccess(stack, callerDepth = 2) {
|
|
1657
|
+
if (!stack) return false;
|
|
1658
|
+
const caller = stack.split("\n")[callerDepth] ?? "";
|
|
1659
|
+
return INTERNAL_LIB_MARKERS.some((m) => caller.includes(m)) || INTERNAL_FIBER_MARKERS.some((m) => caller.includes(m));
|
|
2472
1660
|
}
|
|
2473
1661
|
|
|
2474
1662
|
const R3F_CONTEXT = Symbol.for("@react-three/fiber.context");
|
|
@@ -2508,7 +1696,14 @@ const createStore = (invalidate, advance) => {
|
|
|
2508
1696
|
frustum: new Frustum(),
|
|
2509
1697
|
autoUpdateFrustum: true,
|
|
2510
1698
|
raycaster: null,
|
|
2511
|
-
events: {
|
|
1699
|
+
events: {
|
|
1700
|
+
priority: 1,
|
|
1701
|
+
enabled: true,
|
|
1702
|
+
connected: false,
|
|
1703
|
+
frameTimedRaycasts: true,
|
|
1704
|
+
alwaysFireOnScroll: true,
|
|
1705
|
+
updateOnFrame: false
|
|
1706
|
+
},
|
|
2512
1707
|
scene: null,
|
|
2513
1708
|
rootScene: null,
|
|
2514
1709
|
xr: null,
|
|
@@ -2599,11 +1794,14 @@ const createStore = (invalidate, advance) => {
|
|
|
2599
1794
|
},
|
|
2600
1795
|
setError: (error) => set(() => ({ error })),
|
|
2601
1796
|
error: null,
|
|
2602
|
-
//* TSL State (managed via hooks: useUniforms, useNodes, useTextures,
|
|
1797
|
+
//* TSL State (managed via hooks: useUniforms, useNodes, useBuffers, useGPUStorage, useTextures, useRenderPipeline) ==============================
|
|
2603
1798
|
uniforms: {},
|
|
2604
1799
|
nodes: {},
|
|
1800
|
+
buffers: {},
|
|
1801
|
+
gpuStorage: {},
|
|
2605
1802
|
textures: /* @__PURE__ */ new Map(),
|
|
2606
|
-
|
|
1803
|
+
_textureRefs: /* @__PURE__ */ new Map(),
|
|
1804
|
+
renderPipeline: null,
|
|
2607
1805
|
passes: {},
|
|
2608
1806
|
_hmrVersion: 0,
|
|
2609
1807
|
_sizeImperative: false,
|
|
@@ -2612,12 +1810,16 @@ const createStore = (invalidate, advance) => {
|
|
|
2612
1810
|
internal: {
|
|
2613
1811
|
// Events
|
|
2614
1812
|
interaction: [],
|
|
2615
|
-
hovered: /* @__PURE__ */ new Map(),
|
|
2616
1813
|
subscribers: [],
|
|
1814
|
+
// Per-pointer state (new unified structure)
|
|
1815
|
+
pointerMap: /* @__PURE__ */ new Map(),
|
|
1816
|
+
pointerDirty: /* @__PURE__ */ new Map(),
|
|
1817
|
+
lastEvent: React.createRef(),
|
|
1818
|
+
// Deprecated but kept for backwards compatibility
|
|
1819
|
+
hovered: /* @__PURE__ */ new Map(),
|
|
2617
1820
|
initialClick: [0, 0],
|
|
2618
1821
|
initialHits: [],
|
|
2619
1822
|
capturedMap: /* @__PURE__ */ new Map(),
|
|
2620
|
-
lastEvent: React.createRef(),
|
|
2621
1823
|
// Visibility tracking (onFramed, onOccluded, onVisible)
|
|
2622
1824
|
visibilityRegistry: /* @__PURE__ */ new Map(),
|
|
2623
1825
|
// Occlusion system (WebGPU only)
|
|
@@ -2656,8 +1858,7 @@ const createStore = (invalidate, advance) => {
|
|
|
2656
1858
|
const currentState = rootStore.getState();
|
|
2657
1859
|
if (!currentState.isLegacy && currentState.internal.actualRenderer) {
|
|
2658
1860
|
const stack = new Error().stack || "";
|
|
2659
|
-
|
|
2660
|
-
if (!isInternalAccess) {
|
|
1861
|
+
if (!isInternalRendererAccess(stack)) {
|
|
2661
1862
|
const cleanedStack = stack.split("\n").slice(2).join("\n") || "Stack trace unavailable";
|
|
2662
1863
|
notifyDepreciated({
|
|
2663
1864
|
heading: "Accessing state.gl in WebGPU mode",
|
|
@@ -2705,14 +1906,16 @@ const createStore = (invalidate, advance) => {
|
|
|
2705
1906
|
oldSize = size;
|
|
2706
1907
|
oldDpr = viewport.dpr;
|
|
2707
1908
|
updateCamera(camera, size);
|
|
2708
|
-
if (canvasTarget) {
|
|
1909
|
+
if (internal.isSecondary && canvasTarget) {
|
|
2709
1910
|
if (viewport.dpr > 0) canvasTarget.setPixelRatio(viewport.dpr);
|
|
2710
|
-
|
|
2711
|
-
canvasTarget.setSize(size.width, size.height, updateStyle);
|
|
1911
|
+
canvasTarget.setSize(size.width, size.height, false);
|
|
2712
1912
|
} else {
|
|
2713
1913
|
if (viewport.dpr > 0) actualRenderer.setPixelRatio(viewport.dpr);
|
|
2714
|
-
|
|
2715
|
-
|
|
1914
|
+
actualRenderer.setSize(size.width, size.height, false);
|
|
1915
|
+
if (canvasTarget) {
|
|
1916
|
+
if (viewport.dpr > 0) canvasTarget.setPixelRatio(viewport.dpr);
|
|
1917
|
+
canvasTarget.setSize(size.width, size.height, false);
|
|
1918
|
+
}
|
|
2716
1919
|
}
|
|
2717
1920
|
}
|
|
2718
1921
|
if (camera !== oldCamera) {
|
|
@@ -2768,19 +1971,25 @@ function loadingFn(extensions, onProgress) {
|
|
|
2768
1971
|
);
|
|
2769
1972
|
};
|
|
2770
1973
|
}
|
|
2771
|
-
function useLoader(loader, input, extensions, onProgress) {
|
|
2772
|
-
const
|
|
1974
|
+
function useLoader(loader, input, extensions, onProgress, cacheKey) {
|
|
1975
|
+
const inputs = Array.isArray(input) ? input : [input];
|
|
1976
|
+
const cacheKeys = Array.isArray(cacheKey ?? input) ? cacheKey ?? input : [cacheKey ?? input];
|
|
2773
1977
|
const fn = loadingFn(extensions, onProgress);
|
|
2774
|
-
const results =
|
|
1978
|
+
const results = cacheKeys.map(
|
|
1979
|
+
(key, index) => suspend(() => fn(loader, inputs[index]), [loader, key], { equal: is.equ })
|
|
1980
|
+
);
|
|
2775
1981
|
return Array.isArray(input) ? results : results[0];
|
|
2776
1982
|
}
|
|
2777
|
-
useLoader.preload = function(loader, input, extensions, onProgress) {
|
|
2778
|
-
const
|
|
2779
|
-
|
|
1983
|
+
useLoader.preload = function(loader, input, extensions, onProgress, cacheKey) {
|
|
1984
|
+
const inputs = Array.isArray(input) ? input : [input];
|
|
1985
|
+
const cacheKeys = Array.isArray(cacheKey ?? input) ? cacheKey ?? input : [cacheKey ?? input];
|
|
1986
|
+
cacheKeys.forEach(
|
|
1987
|
+
(key, index) => preload(() => loadingFn(extensions, onProgress)(loader, inputs[index]), [loader, key])
|
|
1988
|
+
);
|
|
2780
1989
|
};
|
|
2781
|
-
useLoader.clear = function(loader, input) {
|
|
2782
|
-
const
|
|
2783
|
-
|
|
1990
|
+
useLoader.clear = function(loader, input, cacheKey) {
|
|
1991
|
+
const cacheKeys = Array.isArray(cacheKey ?? input) ? cacheKey ?? input : [cacheKey ?? input];
|
|
1992
|
+
cacheKeys.forEach((key) => clear([loader, key]));
|
|
2784
1993
|
};
|
|
2785
1994
|
useLoader.loader = getLoader;
|
|
2786
1995
|
|
|
@@ -2856,20 +2065,14 @@ function useFrame(callback, priorityOrOptions) {
|
|
|
2856
2065
|
}
|
|
2857
2066
|
};
|
|
2858
2067
|
} else {
|
|
2859
|
-
|
|
2860
|
-
|
|
2861
|
-
|
|
2862
|
-
|
|
2863
|
-
|
|
2864
|
-
|
|
2865
|
-
|
|
2866
|
-
|
|
2867
|
-
unregisterJob = registerOutside();
|
|
2868
|
-
});
|
|
2869
|
-
return () => {
|
|
2870
|
-
unsubReady();
|
|
2871
|
-
unregisterJob?.();
|
|
2872
|
-
};
|
|
2068
|
+
return scheduler.register(
|
|
2069
|
+
(state, delta) => {
|
|
2070
|
+
const frameState = state;
|
|
2071
|
+
if (!frameState.renderer) return;
|
|
2072
|
+
callbackRef.current?.(frameState, delta);
|
|
2073
|
+
},
|
|
2074
|
+
{ id, ...options }
|
|
2075
|
+
);
|
|
2873
2076
|
}
|
|
2874
2077
|
}, [store, scheduler, id, optionsKey, isLegacyPriority, isInsideCanvas]);
|
|
2875
2078
|
const isPaused = React.useSyncExternalStore(
|
|
@@ -2960,18 +2163,18 @@ function buildFromCache(input, textureCache) {
|
|
|
2960
2163
|
function useTexture(input, optionsOrOnLoad) {
|
|
2961
2164
|
const renderer = useThree((state) => state.internal.actualRenderer);
|
|
2962
2165
|
const store = useStore();
|
|
2963
|
-
const textureCache = useThree((state) => state.textures);
|
|
2964
2166
|
const options = typeof optionsOrOnLoad === "function" ? { onLoad: optionsOrOnLoad } : optionsOrOnLoad ?? {};
|
|
2965
|
-
const { onLoad, cache =
|
|
2167
|
+
const { onLoad, cache = true } = options;
|
|
2966
2168
|
const onLoadRef = useRef(onLoad);
|
|
2967
2169
|
onLoadRef.current = onLoad;
|
|
2968
2170
|
const onLoadCalledForRef = useRef(null);
|
|
2969
2171
|
const urls = useMemo(() => getUrls(input), [input]);
|
|
2970
2172
|
const cachedResult = useMemo(() => {
|
|
2971
2173
|
if (!cache) return null;
|
|
2972
|
-
|
|
2973
|
-
|
|
2974
|
-
|
|
2174
|
+
const textures = store.getState().textures;
|
|
2175
|
+
if (!allUrlsCached(urls, textures)) return null;
|
|
2176
|
+
return buildFromCache(input, textures);
|
|
2177
|
+
}, [cache, urls, input, store]);
|
|
2975
2178
|
const loadedTextures = useLoader(
|
|
2976
2179
|
TextureLoader,
|
|
2977
2180
|
IsObject(input) ? Object.values(input) : input
|
|
@@ -3015,8 +2218,6 @@ function useTexture(input, optionsOrOnLoad) {
|
|
|
3015
2218
|
}, [input, loadedTextures, cachedResult]);
|
|
3016
2219
|
useEffect(() => {
|
|
3017
2220
|
if (!cache) return;
|
|
3018
|
-
if (cachedResult) return;
|
|
3019
|
-
const set = store.setState;
|
|
3020
2221
|
const urlTextureMap = [];
|
|
3021
2222
|
if (typeof input === "string") {
|
|
3022
2223
|
urlTextureMap.push([input, mappedTextures]);
|
|
@@ -3030,18 +2231,32 @@ function useTexture(input, optionsOrOnLoad) {
|
|
|
3030
2231
|
urlTextureMap.push([url, textureRecord[key]]);
|
|
3031
2232
|
}
|
|
3032
2233
|
}
|
|
3033
|
-
|
|
3034
|
-
const
|
|
3035
|
-
let
|
|
2234
|
+
store.setState((state) => {
|
|
2235
|
+
const refs = new Map(state._textureRefs);
|
|
2236
|
+
let textures = state.textures;
|
|
2237
|
+
let added = false;
|
|
3036
2238
|
for (const [url, texture] of urlTextureMap) {
|
|
3037
|
-
if (!
|
|
3038
|
-
|
|
3039
|
-
|
|
2239
|
+
if (!textures.has(url)) {
|
|
2240
|
+
if (!added) {
|
|
2241
|
+
textures = new Map(textures);
|
|
2242
|
+
added = true;
|
|
2243
|
+
}
|
|
2244
|
+
textures.set(url, texture);
|
|
3040
2245
|
}
|
|
2246
|
+
refs.set(url, (refs.get(url) ?? 0) + 1);
|
|
3041
2247
|
}
|
|
3042
|
-
return
|
|
2248
|
+
return added ? { textures, _textureRefs: refs } : { _textureRefs: refs };
|
|
2249
|
+
});
|
|
2250
|
+
return () => store.setState((state) => {
|
|
2251
|
+
const refs = new Map(state._textureRefs);
|
|
2252
|
+
for (const [url] of urlTextureMap) {
|
|
2253
|
+
const next = (refs.get(url) ?? 0) - 1;
|
|
2254
|
+
if (next <= 0) refs.delete(url);
|
|
2255
|
+
else refs.set(url, next);
|
|
2256
|
+
}
|
|
2257
|
+
return { _textureRefs: refs };
|
|
3043
2258
|
});
|
|
3044
|
-
}, [cache, input, mappedTextures, store
|
|
2259
|
+
}, [cache, input, mappedTextures, store]);
|
|
3045
2260
|
return mappedTextures;
|
|
3046
2261
|
}
|
|
3047
2262
|
useTexture.preload = (url) => useLoader.preload(TextureLoader, url);
|
|
@@ -3057,96 +2272,63 @@ const Texture = ({
|
|
|
3057
2272
|
return /* @__PURE__ */ jsx(Fragment, { children: children?.(ret) });
|
|
3058
2273
|
};
|
|
3059
2274
|
|
|
3060
|
-
function
|
|
3061
|
-
if (entry instanceof Texture$1) return entry;
|
|
3062
|
-
if (entry && typeof entry === "object" && "value" in entry && entry.value instanceof Texture$1) {
|
|
3063
|
-
return entry.value;
|
|
3064
|
-
}
|
|
3065
|
-
return null;
|
|
3066
|
-
}
|
|
3067
|
-
function useTextures() {
|
|
2275
|
+
function useTextures(selector) {
|
|
3068
2276
|
const store = useStore();
|
|
3069
|
-
|
|
3070
|
-
const set = store.setState;
|
|
2277
|
+
const registry = useMemo(() => {
|
|
3071
2278
|
const getState = store.getState;
|
|
3072
|
-
const
|
|
3073
|
-
|
|
3074
|
-
const newMap = new Map(state.textures);
|
|
3075
|
-
newMap.set(key, value);
|
|
3076
|
-
return { textures: newMap };
|
|
3077
|
-
});
|
|
3078
|
-
};
|
|
3079
|
-
const addMultiple = (items) => {
|
|
3080
|
-
set((state) => {
|
|
3081
|
-
const newMap = new Map(state.textures);
|
|
3082
|
-
const entries = items instanceof Map ? items.entries() : Object.entries(items);
|
|
3083
|
-
for (const [key, value] of entries) {
|
|
3084
|
-
newMap.set(key, value);
|
|
3085
|
-
}
|
|
3086
|
-
return { textures: newMap };
|
|
3087
|
-
});
|
|
3088
|
-
};
|
|
3089
|
-
const remove = (key) => {
|
|
3090
|
-
set((state) => {
|
|
3091
|
-
const newMap = new Map(state.textures);
|
|
3092
|
-
newMap.delete(key);
|
|
3093
|
-
return { textures: newMap };
|
|
3094
|
-
});
|
|
3095
|
-
};
|
|
3096
|
-
const removeMultiple = (keys) => {
|
|
3097
|
-
set((state) => {
|
|
3098
|
-
const newMap = new Map(state.textures);
|
|
3099
|
-
for (const key of keys) newMap.delete(key);
|
|
3100
|
-
return { textures: newMap };
|
|
3101
|
-
});
|
|
3102
|
-
};
|
|
3103
|
-
const dispose = (key) => {
|
|
3104
|
-
const entry = getState().textures.get(key);
|
|
3105
|
-
if (entry) {
|
|
3106
|
-
const tex = getTextureValue(entry);
|
|
3107
|
-
tex?.dispose();
|
|
3108
|
-
}
|
|
3109
|
-
remove(key);
|
|
3110
|
-
};
|
|
3111
|
-
const disposeMultiple = (keys) => {
|
|
3112
|
-
const textures = getState().textures;
|
|
3113
|
-
for (const key of keys) {
|
|
3114
|
-
const entry = textures.get(key);
|
|
3115
|
-
if (entry) {
|
|
3116
|
-
const tex = getTextureValue(entry);
|
|
3117
|
-
tex?.dispose();
|
|
3118
|
-
}
|
|
3119
|
-
}
|
|
3120
|
-
removeMultiple(keys);
|
|
3121
|
-
};
|
|
3122
|
-
const disposeAll = () => {
|
|
3123
|
-
const textures = getState().textures;
|
|
3124
|
-
for (const entry of textures.values()) {
|
|
3125
|
-
const tex = getTextureValue(entry);
|
|
3126
|
-
tex?.dispose();
|
|
3127
|
-
}
|
|
3128
|
-
set({ textures: /* @__PURE__ */ new Map() });
|
|
3129
|
-
};
|
|
2279
|
+
const setState = store.setState;
|
|
2280
|
+
const getOne = (key) => getState().textures.get(key);
|
|
3130
2281
|
return {
|
|
3131
|
-
|
|
3132
|
-
get textures() {
|
|
2282
|
+
get all() {
|
|
3133
2283
|
return getState().textures;
|
|
3134
2284
|
},
|
|
3135
|
-
|
|
3136
|
-
|
|
2285
|
+
get(input) {
|
|
2286
|
+
if (typeof input === "string") return getOne(input);
|
|
2287
|
+
if (Array.isArray(input)) return input.map(getOne);
|
|
2288
|
+
const out = {};
|
|
2289
|
+
for (const name in input) out[name] = getOne(input[name]);
|
|
2290
|
+
return out;
|
|
2291
|
+
},
|
|
3137
2292
|
has: (key) => getState().textures.has(key),
|
|
3138
|
-
|
|
3139
|
-
|
|
3140
|
-
|
|
3141
|
-
|
|
3142
|
-
|
|
3143
|
-
|
|
3144
|
-
|
|
3145
|
-
|
|
3146
|
-
|
|
3147
|
-
|
|
2293
|
+
add(keyOrRecord, texture) {
|
|
2294
|
+
setState((state) => {
|
|
2295
|
+
const textures = new Map(state.textures);
|
|
2296
|
+
if (typeof keyOrRecord === "string") {
|
|
2297
|
+
textures.set(keyOrRecord, texture);
|
|
2298
|
+
} else {
|
|
2299
|
+
for (const key in keyOrRecord) textures.set(key, keyOrRecord[key]);
|
|
2300
|
+
}
|
|
2301
|
+
return { textures };
|
|
2302
|
+
});
|
|
2303
|
+
},
|
|
2304
|
+
dispose(key, options) {
|
|
2305
|
+
const state = getState();
|
|
2306
|
+
const refs = state._textureRefs.get(key) ?? 0;
|
|
2307
|
+
if (refs > 0 && !options?.force) {
|
|
2308
|
+
console.warn(
|
|
2309
|
+
`[useTextures] "${key}" still has ${refs} active reference(s); skipping dispose. Pass { force: true } to override.`
|
|
2310
|
+
);
|
|
2311
|
+
return false;
|
|
2312
|
+
}
|
|
2313
|
+
state.textures.get(key)?.dispose();
|
|
2314
|
+
setState((s) => {
|
|
2315
|
+
const textures = new Map(s.textures);
|
|
2316
|
+
textures.delete(key);
|
|
2317
|
+
const nextRefs = new Map(s._textureRefs);
|
|
2318
|
+
nextRefs.delete(key);
|
|
2319
|
+
return { textures, _textureRefs: nextRefs };
|
|
2320
|
+
});
|
|
2321
|
+
return true;
|
|
2322
|
+
},
|
|
2323
|
+
disposeAll() {
|
|
2324
|
+
for (const texture of getState().textures.values()) texture.dispose();
|
|
2325
|
+
setState({ textures: /* @__PURE__ */ new Map(), _textureRefs: /* @__PURE__ */ new Map() });
|
|
2326
|
+
}
|
|
3148
2327
|
};
|
|
3149
2328
|
}, [store]);
|
|
2329
|
+
const subscribe = selector ? () => selector(registry) : (state) => state.textures;
|
|
2330
|
+
const selected = useThree(subscribe);
|
|
2331
|
+
return selector ? selected : registry;
|
|
3150
2332
|
}
|
|
3151
2333
|
|
|
3152
2334
|
function useRenderTarget(widthOrOptions, heightOrOptions, options) {
|
|
@@ -14666,6 +13848,7 @@ function swapInstances() {
|
|
|
14666
13848
|
}
|
|
14667
13849
|
}
|
|
14668
13850
|
if (instance.isHidden) unhideInstance(instance);
|
|
13851
|
+
if (isObject3D(instance.object)) removeInteractivity(findInitialRoot(instance), instance.object);
|
|
14669
13852
|
if (instance.object.__r3f) delete instance.object.__r3f;
|
|
14670
13853
|
if (instance.type !== "primitive") disposeOnIdle(instance.object);
|
|
14671
13854
|
}
|
|
@@ -14678,6 +13861,8 @@ function swapInstances() {
|
|
|
14678
13861
|
instance.object.__r3f = instance;
|
|
14679
13862
|
setFiberRef(fiber, instance.object);
|
|
14680
13863
|
delete instance.appliedOnce;
|
|
13864
|
+
instance.eventCount = 0;
|
|
13865
|
+
instance.handlers = {};
|
|
14681
13866
|
applyProps(instance.object, instance.props);
|
|
14682
13867
|
if (instance.props.attach) {
|
|
14683
13868
|
attach(parent, instance);
|
|
@@ -14982,6 +14167,7 @@ function createRoot(canvas) {
|
|
|
14982
14167
|
const lastConfiguredProps = {};
|
|
14983
14168
|
let configured = false;
|
|
14984
14169
|
let pending = null;
|
|
14170
|
+
let rendererSetup = null;
|
|
14985
14171
|
return {
|
|
14986
14172
|
async configure(props = {}) {
|
|
14987
14173
|
let resolve;
|
|
@@ -14997,7 +14183,6 @@ function createRoot(canvas) {
|
|
|
14997
14183
|
events,
|
|
14998
14184
|
onCreated: onCreatedCallback,
|
|
14999
14185
|
shadows = false,
|
|
15000
|
-
textureColorSpace = SRGBColorSpace,
|
|
15001
14186
|
orthographic = false,
|
|
15002
14187
|
frameloop = "always",
|
|
15003
14188
|
dpr = [1, 2],
|
|
@@ -15012,7 +14197,8 @@ function createRoot(canvas) {
|
|
|
15012
14197
|
_sizeProps,
|
|
15013
14198
|
forceEven
|
|
15014
14199
|
} = props;
|
|
15015
|
-
const
|
|
14200
|
+
const textureColorSpace = is.obj(glConfig) && !is.fun(glConfig) && !isRenderer(glConfig) && glConfig.textureColorSpace || is.obj(rendererConfig) && !is.fun(rendererConfig) && !isRenderer(rendererConfig) && rendererConfig.textureColorSpace || SRGBColorSpace;
|
|
14201
|
+
let state = store.getState();
|
|
15016
14202
|
const defaultGLProps = {
|
|
15017
14203
|
canvas,
|
|
15018
14204
|
powerPreference: "high-performance",
|
|
@@ -15040,9 +14226,21 @@ function createRoot(canvas) {
|
|
|
15040
14226
|
);
|
|
15041
14227
|
}
|
|
15042
14228
|
if (!state.internal.actualRenderer) {
|
|
15043
|
-
|
|
15044
|
-
|
|
15045
|
-
|
|
14229
|
+
if (!rendererSetup) {
|
|
14230
|
+
rendererSetup = (async () => {
|
|
14231
|
+
{
|
|
14232
|
+
renderer = await resolveRenderer(glConfig, defaultGLProps, WebGLRenderer);
|
|
14233
|
+
state.internal.actualRenderer = renderer;
|
|
14234
|
+
state.set({ isLegacy: true, gl: renderer, renderer, primaryStore: store });
|
|
14235
|
+
}
|
|
14236
|
+
})().catch((err) => {
|
|
14237
|
+
rendererSetup = null;
|
|
14238
|
+
throw err;
|
|
14239
|
+
});
|
|
14240
|
+
}
|
|
14241
|
+
await rendererSetup;
|
|
14242
|
+
state = store.getState();
|
|
14243
|
+
renderer = state.internal.actualRenderer;
|
|
15046
14244
|
}
|
|
15047
14245
|
let raycaster = state.raycaster;
|
|
15048
14246
|
if (!raycaster) state.set({ raycaster: raycaster = new Raycaster() });
|
|
@@ -15135,7 +14333,7 @@ function createRoot(canvas) {
|
|
|
15135
14333
|
lastConfiguredProps.performance = performance;
|
|
15136
14334
|
}
|
|
15137
14335
|
if (!state.xr) {
|
|
15138
|
-
const handleXRFrame = (timestamp,
|
|
14336
|
+
const handleXRFrame = (timestamp, _frame) => {
|
|
15139
14337
|
const state2 = store.getState();
|
|
15140
14338
|
if (state2.frameloop === "never") return;
|
|
15141
14339
|
advance(timestamp);
|
|
@@ -15171,15 +14369,22 @@ function createRoot(canvas) {
|
|
|
15171
14369
|
const oldType = renderer.shadowMap.type;
|
|
15172
14370
|
renderer.shadowMap.enabled = !!shadows;
|
|
15173
14371
|
if (is.boo(shadows)) {
|
|
15174
|
-
renderer.shadowMap.type =
|
|
14372
|
+
renderer.shadowMap.type = PCFShadowMap;
|
|
15175
14373
|
} else if (is.str(shadows)) {
|
|
14374
|
+
if (shadows === "soft") {
|
|
14375
|
+
notifyDepreciated({
|
|
14376
|
+
heading: 'shadows="soft" is deprecated',
|
|
14377
|
+
body: "Three has depreciated soft and improved basic PCFShadows, we converted for you.",
|
|
14378
|
+
link: "https://github.com/mrdoob/three.js/wiki/Migration-Guide?utm_source=chatgpt.com#181--182"
|
|
14379
|
+
});
|
|
14380
|
+
}
|
|
15176
14381
|
const types = {
|
|
15177
14382
|
basic: BasicShadowMap,
|
|
15178
14383
|
percentage: PCFShadowMap,
|
|
15179
|
-
soft:
|
|
14384
|
+
soft: PCFShadowMap,
|
|
15180
14385
|
variance: VSMShadowMap
|
|
15181
14386
|
};
|
|
15182
|
-
renderer.shadowMap.type = types[shadows] ??
|
|
14387
|
+
renderer.shadowMap.type = types[shadows] ?? PCFShadowMap;
|
|
15183
14388
|
} else if (is.obj(shadows)) {
|
|
15184
14389
|
Object.assign(renderer.shadowMap, shadows);
|
|
15185
14390
|
}
|
|
@@ -15195,13 +14400,24 @@ function createRoot(canvas) {
|
|
|
15195
14400
|
if (state.textureColorSpace !== textureColorSpace) state.set(() => ({ textureColorSpace }));
|
|
15196
14401
|
lastConfiguredProps.textureColorSpace = textureColorSpace;
|
|
15197
14402
|
}
|
|
14403
|
+
const r3fProps = ["textureColorSpace"];
|
|
14404
|
+
const constructorOnlyProps = ["samples", "antialias", "alpha", "canvas", "powerPreference"];
|
|
14405
|
+
const nonApplyProps = [...r3fProps, ...constructorOnlyProps];
|
|
15198
14406
|
if (glConfig && !is.fun(glConfig) && !isRenderer(glConfig) && !is.equ(glConfig, renderer, shallowLoose)) {
|
|
15199
|
-
|
|
14407
|
+
const glProps = {};
|
|
14408
|
+
for (const key in glConfig) {
|
|
14409
|
+
if (!nonApplyProps.includes(key)) glProps[key] = glConfig[key];
|
|
14410
|
+
}
|
|
14411
|
+
applyProps(renderer, glProps);
|
|
15200
14412
|
}
|
|
15201
14413
|
if (rendererConfig && !is.fun(rendererConfig) && !isRenderer(rendererConfig) && state.renderer) {
|
|
15202
14414
|
const currentRenderer = state.renderer;
|
|
15203
14415
|
if (!is.equ(rendererConfig, currentRenderer, shallowLoose)) {
|
|
15204
|
-
|
|
14416
|
+
const rendererProps = {};
|
|
14417
|
+
for (const key in rendererConfig) {
|
|
14418
|
+
if (!nonApplyProps.includes(key)) rendererProps[key] = rendererConfig[key];
|
|
14419
|
+
}
|
|
14420
|
+
applyProps(currentRenderer, rendererProps);
|
|
15205
14421
|
}
|
|
15206
14422
|
}
|
|
15207
14423
|
const scheduler = getScheduler();
|
|
@@ -15227,6 +14443,18 @@ function createRoot(canvas) {
|
|
|
15227
14443
|
system: true
|
|
15228
14444
|
}
|
|
15229
14445
|
);
|
|
14446
|
+
const unregisterEventsFlush = scheduler.register(
|
|
14447
|
+
() => {
|
|
14448
|
+
const state2 = store.getState();
|
|
14449
|
+
state2.events.flush?.();
|
|
14450
|
+
},
|
|
14451
|
+
{
|
|
14452
|
+
id: `${newRootId}_events`,
|
|
14453
|
+
rootId: newRootId,
|
|
14454
|
+
phase: "input",
|
|
14455
|
+
system: true
|
|
14456
|
+
}
|
|
14457
|
+
);
|
|
15230
14458
|
const unregisterFrustum = scheduler.register(
|
|
15231
14459
|
() => {
|
|
15232
14460
|
const state2 = store.getState();
|
|
@@ -15237,7 +14465,7 @@ function createRoot(canvas) {
|
|
|
15237
14465
|
{
|
|
15238
14466
|
id: `${newRootId}_frustum`,
|
|
15239
14467
|
rootId: newRootId,
|
|
15240
|
-
|
|
14468
|
+
before: "render",
|
|
15241
14469
|
system: true
|
|
15242
14470
|
}
|
|
15243
14471
|
);
|
|
@@ -15249,7 +14477,7 @@ function createRoot(canvas) {
|
|
|
15249
14477
|
{
|
|
15250
14478
|
id: `${newRootId}_visibility`,
|
|
15251
14479
|
rootId: newRootId,
|
|
15252
|
-
|
|
14480
|
+
before: "render",
|
|
15253
14481
|
system: true,
|
|
15254
14482
|
after: `${newRootId}_frustum`
|
|
15255
14483
|
}
|
|
@@ -15261,7 +14489,7 @@ function createRoot(canvas) {
|
|
|
15261
14489
|
const userHandlesRender = scheduler.hasUserJobsInPhase("render", newRootId);
|
|
15262
14490
|
if (userHandlesRender || state2.internal.priority) return;
|
|
15263
14491
|
try {
|
|
15264
|
-
if (state2.
|
|
14492
|
+
if (state2.renderPipeline?.render) state2.renderPipeline.render();
|
|
15265
14493
|
else if (renderer2?.render) renderer2.render(state2.scene, state2.camera);
|
|
15266
14494
|
} catch (error) {
|
|
15267
14495
|
state2.setError(error instanceof Error ? error : new Error(String(error)));
|
|
@@ -15286,6 +14514,7 @@ function createRoot(canvas) {
|
|
|
15286
14514
|
unregisterRoot: () => {
|
|
15287
14515
|
unregisterRoot();
|
|
15288
14516
|
unregisterCanvasTarget();
|
|
14517
|
+
unregisterEventsFlush();
|
|
15289
14518
|
unregisterFrustum();
|
|
15290
14519
|
unregisterVisibility();
|
|
15291
14520
|
unregisterRender();
|
|
@@ -15424,6 +14653,7 @@ function PortalInner({ state = {}, children, container }) {
|
|
|
15424
14653
|
viewport = rootState.viewport.getCurrentViewport(camera, new Vector3(), resolvedSize);
|
|
15425
14654
|
if (camera !== rootState.camera) updateCamera(camera, resolvedSize);
|
|
15426
14655
|
}
|
|
14656
|
+
const set = injectState.set;
|
|
15427
14657
|
return {
|
|
15428
14658
|
// The intersect consists of the previous root state
|
|
15429
14659
|
...rootState,
|
|
@@ -15442,7 +14672,7 @@ function PortalInner({ state = {}, children, container }) {
|
|
|
15442
14672
|
size: resolvedSize,
|
|
15443
14673
|
viewport: { ...rootState.viewport, ...viewport },
|
|
15444
14674
|
// Layers are allowed to override events
|
|
15445
|
-
setEvents: (events2) =>
|
|
14675
|
+
setEvents: (events2) => set((state2) => ({ ...state2, events: { ...state2.events, ...events2 } })),
|
|
15446
14676
|
// Container for child attachment - the portalScene (injected or container itself)
|
|
15447
14677
|
internal: { ...rootState.internal, ...injectState.internal, container: portalScene }
|
|
15448
14678
|
};
|
|
@@ -15451,9 +14681,13 @@ function PortalInner({ state = {}, children, container }) {
|
|
|
15451
14681
|
const store = createWithEqualityFn((set, get) => ({ ...rest, set, get }));
|
|
15452
14682
|
const onMutate = (prev) => store.setState((state2) => inject.current(prev, state2));
|
|
15453
14683
|
onMutate(previousRoot.getState());
|
|
15454
|
-
previousRoot.subscribe(onMutate);
|
|
15455
14684
|
return store;
|
|
15456
14685
|
}, [previousRoot, container]);
|
|
14686
|
+
useIsomorphicLayoutEffect(() => {
|
|
14687
|
+
const onMutate = (prev) => usePortalStore.setState((state2) => inject.current(prev, state2));
|
|
14688
|
+
const unsubscribe = previousRoot.subscribe(onMutate);
|
|
14689
|
+
return unsubscribe;
|
|
14690
|
+
}, [previousRoot, usePortalStore]);
|
|
15457
14691
|
return (
|
|
15458
14692
|
// @ts-ignore, reconciler types are not maintained
|
|
15459
14693
|
/* @__PURE__ */ jsx(Fragment, { children: reconciler.createPortal(
|
|
@@ -15467,6 +14701,59 @@ function flushSync(fn) {
|
|
|
15467
14701
|
return reconciler.flushSyncFromReconciler(fn);
|
|
15468
14702
|
}
|
|
15469
14703
|
|
|
14704
|
+
function parseBackground(background) {
|
|
14705
|
+
if (!background) return null;
|
|
14706
|
+
if (typeof background === "object" && !background.isColor) {
|
|
14707
|
+
const { backgroundMap, envMap, files, preset, ...rest } = background;
|
|
14708
|
+
return {
|
|
14709
|
+
...rest,
|
|
14710
|
+
preset,
|
|
14711
|
+
files: envMap || files,
|
|
14712
|
+
backgroundFiles: backgroundMap,
|
|
14713
|
+
background: true
|
|
14714
|
+
};
|
|
14715
|
+
}
|
|
14716
|
+
if (typeof background === "number") {
|
|
14717
|
+
return { color: background, background: true };
|
|
14718
|
+
}
|
|
14719
|
+
if (typeof background === "string") {
|
|
14720
|
+
if (background in presetsObj) {
|
|
14721
|
+
return { preset: background, background: true };
|
|
14722
|
+
}
|
|
14723
|
+
if (/^(https?:\/\/|\/|\.\/|\.\.\/)|\.(hdr|exr|jpg|jpeg|png|webp|gif)$/i.test(background)) {
|
|
14724
|
+
return { files: background, background: true };
|
|
14725
|
+
}
|
|
14726
|
+
return { color: background, background: true };
|
|
14727
|
+
}
|
|
14728
|
+
if (background.isColor) {
|
|
14729
|
+
return { color: background, background: true };
|
|
14730
|
+
}
|
|
14731
|
+
return null;
|
|
14732
|
+
}
|
|
14733
|
+
|
|
14734
|
+
function parseRendererConfig(rendererProp) {
|
|
14735
|
+
const isRendererConfig = typeof rendererProp === "object" && rendererProp !== null && !("render" in rendererProp) && ("primaryCanvas" in rendererProp || "scheduler" in rendererProp);
|
|
14736
|
+
if (isRendererConfig) {
|
|
14737
|
+
const { primaryCanvas: pc, scheduler: sc, ...rest } = rendererProp;
|
|
14738
|
+
return {
|
|
14739
|
+
primaryCanvas: pc,
|
|
14740
|
+
scheduler: sc,
|
|
14741
|
+
renderer: Object.keys(rest).length > 0 ? rest : rendererProp
|
|
14742
|
+
};
|
|
14743
|
+
}
|
|
14744
|
+
return { primaryCanvas: void 0, scheduler: void 0, renderer: rendererProp };
|
|
14745
|
+
}
|
|
14746
|
+
|
|
14747
|
+
function clearHmrCaches(store) {
|
|
14748
|
+
store.setState((state) => ({
|
|
14749
|
+
nodes: {},
|
|
14750
|
+
uniforms: {},
|
|
14751
|
+
buffers: {},
|
|
14752
|
+
gpuStorage: {},
|
|
14753
|
+
_hmrVersion: state._hmrVersion + 1
|
|
14754
|
+
}));
|
|
14755
|
+
}
|
|
14756
|
+
|
|
15470
14757
|
function CanvasImpl({
|
|
15471
14758
|
ref,
|
|
15472
14759
|
children,
|
|
@@ -15487,6 +14774,8 @@ function CanvasImpl({
|
|
|
15487
14774
|
raycaster,
|
|
15488
14775
|
camera,
|
|
15489
14776
|
scene,
|
|
14777
|
+
autoUpdateFrustum,
|
|
14778
|
+
occlusion,
|
|
15490
14779
|
onPointerMissed,
|
|
15491
14780
|
onDragOverMissed,
|
|
15492
14781
|
onDropMissed,
|
|
@@ -15498,39 +14787,10 @@ function CanvasImpl({
|
|
|
15498
14787
|
forceEven,
|
|
15499
14788
|
...props
|
|
15500
14789
|
}) {
|
|
15501
|
-
const { primaryCanvas, scheduler,
|
|
15502
|
-
const renderer = Object.keys(rendererConfig).length > 0 ? rendererConfig : rendererProp;
|
|
14790
|
+
const { primaryCanvas, scheduler, renderer } = parseRendererConfig(rendererProp);
|
|
15503
14791
|
React.useMemo(() => extend(THREE), []);
|
|
15504
14792
|
const Bridge = useBridge();
|
|
15505
|
-
const backgroundProps = React.useMemo(() =>
|
|
15506
|
-
if (!background) return null;
|
|
15507
|
-
if (typeof background === "object" && !background.isColor) {
|
|
15508
|
-
const { backgroundMap, envMap, files, preset, ...rest } = background;
|
|
15509
|
-
return {
|
|
15510
|
-
...rest,
|
|
15511
|
-
preset,
|
|
15512
|
-
files: envMap || files,
|
|
15513
|
-
backgroundFiles: backgroundMap,
|
|
15514
|
-
background: true
|
|
15515
|
-
};
|
|
15516
|
-
}
|
|
15517
|
-
if (typeof background === "number") {
|
|
15518
|
-
return { color: background, background: true };
|
|
15519
|
-
}
|
|
15520
|
-
if (typeof background === "string") {
|
|
15521
|
-
if (background in presetsObj) {
|
|
15522
|
-
return { preset: background, background: true };
|
|
15523
|
-
}
|
|
15524
|
-
if (/^(https?:\/\/|\/|\.\/|\.\.\/)|\\.(hdr|exr|jpg|jpeg|png|webp|gif)$/i.test(background)) {
|
|
15525
|
-
return { files: background, background: true };
|
|
15526
|
-
}
|
|
15527
|
-
return { color: background, background: true };
|
|
15528
|
-
}
|
|
15529
|
-
if (background.isColor) {
|
|
15530
|
-
return { color: background, background: true };
|
|
15531
|
-
}
|
|
15532
|
-
return null;
|
|
15533
|
-
}, [background]);
|
|
14793
|
+
const backgroundProps = React.useMemo(() => parseBackground(background), [background]);
|
|
15534
14794
|
const hasInitialSizeRef = React.useRef(false);
|
|
15535
14795
|
const measureConfig = React.useMemo(() => {
|
|
15536
14796
|
if (!hasInitialSizeRef.current) {
|
|
@@ -15572,6 +14832,7 @@ function CanvasImpl({
|
|
|
15572
14832
|
const handleDropMissed = useMutableCallback(onDropMissed);
|
|
15573
14833
|
const [block, setBlock] = React.useState(false);
|
|
15574
14834
|
const [error, setError] = React.useState(false);
|
|
14835
|
+
const [fallbackVisible, setFallbackVisible] = React.useState(false);
|
|
15575
14836
|
if (block) throw block;
|
|
15576
14837
|
if (error) throw error;
|
|
15577
14838
|
const root = React.useRef(null);
|
|
@@ -15579,6 +14840,7 @@ function CanvasImpl({
|
|
|
15579
14840
|
const unsubscribeErrorRef = React.useRef(null);
|
|
15580
14841
|
useIsomorphicLayoutEffect(() => {
|
|
15581
14842
|
effectActiveRef.current = true;
|
|
14843
|
+
if (fallbackVisible) return;
|
|
15582
14844
|
const canvas = canvasRef.current;
|
|
15583
14845
|
if (effectiveSize.width > 0 && effectiveSize.height > 0 && canvas) {
|
|
15584
14846
|
if (!root.current) {
|
|
@@ -15599,7 +14861,7 @@ function CanvasImpl({
|
|
|
15599
14861
|
}
|
|
15600
14862
|
async function run() {
|
|
15601
14863
|
if (!effectActiveRef.current || !root.current) return;
|
|
15602
|
-
await root.current.configure({
|
|
14864
|
+
const configured = await root.current.configure({
|
|
15603
14865
|
id,
|
|
15604
14866
|
primaryCanvas,
|
|
15605
14867
|
scheduler,
|
|
@@ -15614,6 +14876,8 @@ function CanvasImpl({
|
|
|
15614
14876
|
performance,
|
|
15615
14877
|
raycaster,
|
|
15616
14878
|
camera,
|
|
14879
|
+
autoUpdateFrustum,
|
|
14880
|
+
occlusion,
|
|
15617
14881
|
size: effectiveSize,
|
|
15618
14882
|
// Store size props for reset functionality
|
|
15619
14883
|
_sizeProps: width !== void 0 || height !== void 0 ? { width, height } : null,
|
|
@@ -15638,8 +14902,20 @@ function CanvasImpl({
|
|
|
15638
14902
|
}
|
|
15639
14903
|
onCreated?.(state);
|
|
15640
14904
|
}
|
|
15641
|
-
})
|
|
15642
|
-
|
|
14905
|
+
}).then(
|
|
14906
|
+
() => true,
|
|
14907
|
+
// Renderer setup failed (e.g. no WebGL/WebGPU support). The `fallback` prop lives
|
|
14908
|
+
// inside <canvas>, which browsers don't display, so surface it as visible DOM
|
|
14909
|
+
// instead; with no fallback, rethrow to an external error boundary. (#3757)
|
|
14910
|
+
(setupError) => {
|
|
14911
|
+
if (effectActiveRef.current) {
|
|
14912
|
+
if (fallback != null) setFallbackVisible(true);
|
|
14913
|
+
else setError(setupError);
|
|
14914
|
+
}
|
|
14915
|
+
return false;
|
|
14916
|
+
}
|
|
14917
|
+
);
|
|
14918
|
+
if (!configured || !effectActiveRef.current || !root.current) return;
|
|
15643
14919
|
root.current.render(
|
|
15644
14920
|
/* @__PURE__ */ jsx(Bridge, { children: /* @__PURE__ */ jsx(ErrorBoundary, { set: setError, children: /* @__PURE__ */ jsxs(React.Suspense, { fallback: /* @__PURE__ */ jsx(Block, { set: setBlock }), children: [
|
|
15645
14921
|
backgroundProps && /* @__PURE__ */ jsx(Environment, { ...backgroundProps }),
|
|
@@ -15673,20 +14949,13 @@ function CanvasImpl({
|
|
|
15673
14949
|
const handleHMR = () => {
|
|
15674
14950
|
queueMicrotask(() => {
|
|
15675
14951
|
const rootEntry = _roots.get(canvas);
|
|
15676
|
-
if (rootEntry?.store)
|
|
15677
|
-
rootEntry.store.setState((state) => ({
|
|
15678
|
-
nodes: {},
|
|
15679
|
-
uniforms: {},
|
|
15680
|
-
_hmrVersion: state._hmrVersion + 1
|
|
15681
|
-
}));
|
|
15682
|
-
}
|
|
14952
|
+
if (rootEntry?.store) clearHmrCaches(rootEntry.store);
|
|
15683
14953
|
});
|
|
15684
14954
|
};
|
|
15685
14955
|
if (typeof import.meta !== "undefined" && import.meta.hot) {
|
|
15686
14956
|
const hot = import.meta.hot;
|
|
15687
14957
|
hot.on("vite:afterUpdate", handleHMR);
|
|
15688
|
-
return () => hot.
|
|
15689
|
-
});
|
|
14958
|
+
return () => hot.off?.("vite:afterUpdate", handleHMR);
|
|
15690
14959
|
}
|
|
15691
14960
|
if (typeof module !== "undefined" && module.hot) {
|
|
15692
14961
|
const hot = module.hot;
|
|
@@ -15709,7 +14978,20 @@ function CanvasImpl({
|
|
|
15709
14978
|
...style
|
|
15710
14979
|
},
|
|
15711
14980
|
...props,
|
|
15712
|
-
children:
|
|
14981
|
+
children: fallbackVisible ? (
|
|
14982
|
+
// Renderer setup failed: render the fallback as visible DOM. Inside <canvas> (below)
|
|
14983
|
+
// it exists in the tree but browsers never paint it, which is the whole bug (#3757).
|
|
14984
|
+
fallback
|
|
14985
|
+
) : /* @__PURE__ */ jsx("div", { ref: containerRef, className: "r3f-canvas-container", style: { width: "100%", height: "100%" }, children: /* @__PURE__ */ jsx(
|
|
14986
|
+
"canvas",
|
|
14987
|
+
{
|
|
14988
|
+
ref: canvasRef,
|
|
14989
|
+
id,
|
|
14990
|
+
className: "r3f-canvas",
|
|
14991
|
+
style: { display: "block", width: "100%", height: "100%" },
|
|
14992
|
+
children: fallback
|
|
14993
|
+
}
|
|
14994
|
+
) })
|
|
15713
14995
|
}
|
|
15714
14996
|
);
|
|
15715
14997
|
}
|
|
@@ -15719,4 +15001,4 @@ function Canvas(props) {
|
|
|
15719
15001
|
|
|
15720
15002
|
extend(THREE);
|
|
15721
15003
|
|
|
15722
|
-
export { Block, Canvas, Environment, EnvironmentCube, EnvironmentMap, EnvironmentPortal, ErrorBoundary, FROM_REF, IsObject, ONCE, Portal, R3F_BUILD_LEGACY, R3F_BUILD_WEBGPU, REACT_INTERNAL_PROPS, RESERVED_PROPS,
|
|
15004
|
+
export { Block, Canvas, Environment, EnvironmentCube, EnvironmentMap, EnvironmentPortal, ErrorBoundary, FROM_REF, IsObject, ONCE, Portal, R3F_BUILD_LEGACY, R3F_BUILD_WEBGPU, REACT_INTERNAL_PROPS, RESERVED_PROPS, Texture, _roots, act, addAfterEffect, addEffect, addTail, advance, applyProps, attach, buildGraph, calculateDpr, context, createEvents, createPointerEvents, createPortal, createRoot, createStore, detach, diffProps, dispose, createPointerEvents as events, extend, findInitialRoot, flushSync, fromRef, getInstanceProps, getPrimary, getPrimaryIds, getRootState, getUuidPrefix, hasConstructor, hasPrimary, invalidate, invalidateInstance, is, isColorRepresentation, isCopyable, isFromRef, isObject3D, isOnce, isOrthographicCamera, isRef, isRenderer, isTexture, isVectorLike, once, prepare, presetsObj, reconciler, registerPrimary, removeInteractivity, resolve, unmountComponentAtNode, unregisterPrimary, updateCamera, updateFrustum, useBridge, useEnvironment, useFrame, useGraph, useInstanceHandle, useIsomorphicLayoutEffect, useLoader, useMutableCallback, useRenderTarget, useStore, useTexture, useTextures, useThree, waitForPrimary };
|