@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/webgpu/index.cjs
CHANGED
|
@@ -14,6 +14,7 @@ const UltraHDRLoader_js = require('three/examples/jsm/loaders/UltraHDRLoader.js'
|
|
|
14
14
|
const gainmapJs = require('@monogrid/gainmap-js');
|
|
15
15
|
const Tb = require('scheduler');
|
|
16
16
|
const traditional = require('zustand/traditional');
|
|
17
|
+
const scheduler = require('@pmndrs/scheduler');
|
|
17
18
|
const suspendReact = require('suspend-react');
|
|
18
19
|
const lite = require('dequal/lite');
|
|
19
20
|
require('zustand/shallow');
|
|
@@ -170,7 +171,7 @@ function useEnvironment({
|
|
|
170
171
|
fiber.useLoader.clear(loader, multiFile ? [files] : files);
|
|
171
172
|
}
|
|
172
173
|
renderer.domElement.addEventListener("webglcontextlost", clearGainmapTexture, { once: true });
|
|
173
|
-
}, [files, renderer.domElement]);
|
|
174
|
+
}, [extension, files, loader, multiFile, renderer.domElement]);
|
|
174
175
|
const loaderResult = fiber.useLoader(
|
|
175
176
|
loader,
|
|
176
177
|
multiFile ? [files] : files,
|
|
@@ -370,7 +371,22 @@ function EnvironmentPortal({
|
|
|
370
371
|
environmentIntensity,
|
|
371
372
|
environmentRotation
|
|
372
373
|
});
|
|
373
|
-
}, [
|
|
374
|
+
}, [
|
|
375
|
+
children,
|
|
376
|
+
virtualScene,
|
|
377
|
+
fbo.texture,
|
|
378
|
+
scene,
|
|
379
|
+
defaultScene,
|
|
380
|
+
background,
|
|
381
|
+
frames,
|
|
382
|
+
gl,
|
|
383
|
+
blur,
|
|
384
|
+
backgroundBlurriness,
|
|
385
|
+
backgroundIntensity,
|
|
386
|
+
backgroundRotation,
|
|
387
|
+
environmentIntensity,
|
|
388
|
+
environmentRotation
|
|
389
|
+
]);
|
|
374
390
|
let count = 1;
|
|
375
391
|
fiber.useFrame(() => {
|
|
376
392
|
if (frames === Infinity || count < frames) {
|
|
@@ -441,9 +457,9 @@ function Environment(props) {
|
|
|
441
457
|
return props.ground ? /* @__PURE__ */ jsxRuntime.jsx(EnvironmentGround, { ...props }) : props.map ? /* @__PURE__ */ jsxRuntime.jsx(EnvironmentMap, { ...props }) : props.children ? /* @__PURE__ */ jsxRuntime.jsx(EnvironmentPortal, { ...props }) : /* @__PURE__ */ jsxRuntime.jsx(EnvironmentCube, { ...props });
|
|
442
458
|
}
|
|
443
459
|
|
|
444
|
-
var __defProp$
|
|
445
|
-
var __defNormalProp$
|
|
446
|
-
var __publicField$
|
|
460
|
+
var __defProp$1 = Object.defineProperty;
|
|
461
|
+
var __defNormalProp$1 = (obj, key, value) => key in obj ? __defProp$1(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
|
|
462
|
+
var __publicField$1 = (obj, key, value) => __defNormalProp$1(obj, typeof key !== "symbol" ? key + "" : key, value);
|
|
447
463
|
const act = React__namespace["act"];
|
|
448
464
|
const useIsomorphicLayoutEffect = /* @__PURE__ */ (() => typeof window !== "undefined" && (window.document?.createElement || window.navigator?.product === "ReactNative"))() ? React__namespace.useLayoutEffect : React__namespace.useEffect;
|
|
449
465
|
function useMutableCallback(fn) {
|
|
@@ -475,7 +491,7 @@ const ErrorBoundary = /* @__PURE__ */ (() => {
|
|
|
475
491
|
return _a = class extends React__namespace.Component {
|
|
476
492
|
constructor() {
|
|
477
493
|
super(...arguments);
|
|
478
|
-
__publicField$
|
|
494
|
+
__publicField$1(this, "state", { error: false });
|
|
479
495
|
}
|
|
480
496
|
componentDidCatch(err) {
|
|
481
497
|
this.props.set(err);
|
|
@@ -483,7 +499,7 @@ const ErrorBoundary = /* @__PURE__ */ (() => {
|
|
|
483
499
|
render() {
|
|
484
500
|
return this.state.error ? null : this.props.children;
|
|
485
501
|
}
|
|
486
|
-
}, __publicField$
|
|
502
|
+
}, __publicField$1(_a, "getDerivedStateFromError", () => ({ error: true })), _a;
|
|
487
503
|
})();
|
|
488
504
|
|
|
489
505
|
const is = {
|
|
@@ -1004,8 +1020,24 @@ function applyProps(object, props) {
|
|
|
1004
1020
|
} else if (isVectorLike(target) && is.num(value)) {
|
|
1005
1021
|
if ("setScalar" in target && typeof target.setScalar === "function") target.setScalar(value);
|
|
1006
1022
|
else target.set(value);
|
|
1023
|
+
} else if (root instanceof webgpu.ShaderMaterial && key === "uniforms" && is.obj(value)) {
|
|
1024
|
+
if (!is.obj(root.uniforms)) root.uniforms = {};
|
|
1025
|
+
const uniforms = root.uniforms;
|
|
1026
|
+
const nextUniforms = value;
|
|
1027
|
+
for (const name in nextUniforms) {
|
|
1028
|
+
const uniform = nextUniforms[name];
|
|
1029
|
+
const targetUniform = uniforms[name];
|
|
1030
|
+
if (targetUniform) Object.assign(targetUniform, uniform);
|
|
1031
|
+
else {
|
|
1032
|
+
const nextUniform = uniform instanceof webgpu.Uniform ? uniform.clone() : new webgpu.Uniform(uniform.value);
|
|
1033
|
+
uniforms[name] = nextUniform;
|
|
1034
|
+
}
|
|
1035
|
+
}
|
|
1007
1036
|
} else {
|
|
1008
1037
|
root[key] = value;
|
|
1038
|
+
if (key.endsWith("Node") && root.isMaterial) {
|
|
1039
|
+
root.needsUpdate = true;
|
|
1040
|
+
}
|
|
1009
1041
|
if (rootState && rootState.renderer?.outputColorSpace === webgpu.SRGBColorSpace && colorMaps.includes(key) && isTexture(value) && root[key]?.isTexture && // sRGB textures must be RGBA8 since r137 https://github.com/mrdoob/three.js/pull/23129
|
|
1010
1042
|
root[key].format === webgpu.RGBAFormat && root[key].type === webgpu.UnsignedByteType) {
|
|
1011
1043
|
root[key].colorSpace = rootState.textureColorSpace;
|
|
@@ -1039,38 +1071,60 @@ function applyProps(object, props) {
|
|
|
1039
1071
|
return object;
|
|
1040
1072
|
}
|
|
1041
1073
|
|
|
1074
|
+
const DEFAULT_POINTER_ID = 0;
|
|
1075
|
+
const XR_POINTER_ID_START = 1e3;
|
|
1076
|
+
function getPointerState(internal, pointerId) {
|
|
1077
|
+
let state = internal.pointerMap.get(pointerId);
|
|
1078
|
+
if (!state) {
|
|
1079
|
+
state = {
|
|
1080
|
+
hovered: /* @__PURE__ */ new Map(),
|
|
1081
|
+
captured: /* @__PURE__ */ new Map(),
|
|
1082
|
+
initialClick: [0, 0],
|
|
1083
|
+
initialHits: []
|
|
1084
|
+
};
|
|
1085
|
+
internal.pointerMap.set(pointerId, state);
|
|
1086
|
+
}
|
|
1087
|
+
return state;
|
|
1088
|
+
}
|
|
1089
|
+
function getPointerId(event) {
|
|
1090
|
+
return "pointerId" in event ? event.pointerId : DEFAULT_POINTER_ID;
|
|
1091
|
+
}
|
|
1042
1092
|
function makeId(event) {
|
|
1043
1093
|
return (event.eventObject || event.object).uuid + "/" + event.index + event.instanceId;
|
|
1044
1094
|
}
|
|
1045
|
-
function releaseInternalPointerCapture(
|
|
1046
|
-
const
|
|
1095
|
+
function releaseInternalPointerCapture(internal, obj, pointerId) {
|
|
1096
|
+
const pointerState = internal.pointerMap.get(pointerId);
|
|
1097
|
+
if (!pointerState) return;
|
|
1098
|
+
const captureData = pointerState.captured.get(obj);
|
|
1047
1099
|
if (captureData) {
|
|
1048
|
-
|
|
1049
|
-
|
|
1050
|
-
capturedMap.delete(pointerId);
|
|
1051
|
-
captureData.target.releasePointerCapture(pointerId);
|
|
1052
|
-
}
|
|
1100
|
+
pointerState.captured.delete(obj);
|
|
1101
|
+
captureData.target.releasePointerCapture(pointerId);
|
|
1053
1102
|
}
|
|
1054
1103
|
}
|
|
1055
1104
|
function removeInteractivity(store, object) {
|
|
1056
1105
|
const { internal } = store.getState();
|
|
1057
1106
|
internal.interaction = internal.interaction.filter((o) => o !== object);
|
|
1058
|
-
|
|
1059
|
-
|
|
1060
|
-
|
|
1061
|
-
|
|
1107
|
+
for (const [pointerId, pointerState] of internal.pointerMap) {
|
|
1108
|
+
pointerState.initialHits = pointerState.initialHits.filter((o) => o !== object);
|
|
1109
|
+
pointerState.hovered.forEach((value, key) => {
|
|
1110
|
+
if (value.eventObject === object || value.object === object) {
|
|
1111
|
+
pointerState.hovered.delete(key);
|
|
1112
|
+
}
|
|
1113
|
+
});
|
|
1114
|
+
if (pointerState.captured.has(object)) {
|
|
1115
|
+
releaseInternalPointerCapture(internal, object, pointerId);
|
|
1062
1116
|
}
|
|
1063
|
-
}
|
|
1064
|
-
internal.capturedMap.forEach((captures, pointerId) => {
|
|
1065
|
-
releaseInternalPointerCapture(internal.capturedMap, object, captures, pointerId);
|
|
1066
|
-
});
|
|
1117
|
+
}
|
|
1067
1118
|
unregisterVisibility(store, object);
|
|
1068
1119
|
}
|
|
1069
1120
|
function createEvents(store) {
|
|
1070
|
-
function calculateDistance(event) {
|
|
1121
|
+
function calculateDistance(event, pointerId) {
|
|
1071
1122
|
const { internal } = store.getState();
|
|
1072
|
-
const
|
|
1073
|
-
|
|
1123
|
+
const pointerState = internal.pointerMap.get(pointerId);
|
|
1124
|
+
if (!pointerState) return 0;
|
|
1125
|
+
const [initialX, initialY] = pointerState.initialClick;
|
|
1126
|
+
const dx = event.offsetX - initialX;
|
|
1127
|
+
const dy = event.offsetY - initialY;
|
|
1074
1128
|
return Math.round(Math.sqrt(dx * dx + dy * dy));
|
|
1075
1129
|
}
|
|
1076
1130
|
function filterPointerEvents(objects) {
|
|
@@ -1106,6 +1160,15 @@ function createEvents(store) {
|
|
|
1106
1160
|
return state2.raycaster.camera ? state2.raycaster.intersectObject(obj, true) : [];
|
|
1107
1161
|
}
|
|
1108
1162
|
let hits = eventsObjects.flatMap(handleRaycast).sort((a, b) => {
|
|
1163
|
+
const aInteractivePriority = a.object.userData?.interactivePriority;
|
|
1164
|
+
const bInteractivePriority = b.object.userData?.interactivePriority;
|
|
1165
|
+
if (aInteractivePriority !== void 0 || bInteractivePriority !== void 0) {
|
|
1166
|
+
if (aInteractivePriority !== void 0 && bInteractivePriority === void 0) return -1;
|
|
1167
|
+
if (bInteractivePriority !== void 0 && aInteractivePriority === void 0) return 1;
|
|
1168
|
+
if (aInteractivePriority !== bInteractivePriority) {
|
|
1169
|
+
return (bInteractivePriority ?? 0) - (aInteractivePriority ?? 0);
|
|
1170
|
+
}
|
|
1171
|
+
}
|
|
1109
1172
|
const aState = getRootState(a.object);
|
|
1110
1173
|
const bState = getRootState(b.object);
|
|
1111
1174
|
const aPriority = aState?.events?.priority ?? 1;
|
|
@@ -1127,9 +1190,13 @@ function createEvents(store) {
|
|
|
1127
1190
|
eventObject = eventObject.parent;
|
|
1128
1191
|
}
|
|
1129
1192
|
}
|
|
1130
|
-
if ("pointerId" in event
|
|
1131
|
-
|
|
1132
|
-
|
|
1193
|
+
if ("pointerId" in event) {
|
|
1194
|
+
const pointerId = event.pointerId;
|
|
1195
|
+
const pointerState = state.internal.pointerMap.get(pointerId);
|
|
1196
|
+
if (pointerState?.captured.size) {
|
|
1197
|
+
for (const captureData of pointerState.captured.values()) {
|
|
1198
|
+
if (!duplicates.has(makeId(captureData.intersection))) intersections.push(captureData.intersection);
|
|
1199
|
+
}
|
|
1133
1200
|
}
|
|
1134
1201
|
}
|
|
1135
1202
|
return intersections;
|
|
@@ -1142,27 +1209,25 @@ function createEvents(store) {
|
|
|
1142
1209
|
if (state) {
|
|
1143
1210
|
const { raycaster, pointer, camera, internal } = state;
|
|
1144
1211
|
const unprojectedPoint = new webgpu.Vector3(pointer.x, pointer.y, 0).unproject(camera);
|
|
1145
|
-
const hasPointerCapture = (id) =>
|
|
1212
|
+
const hasPointerCapture = (id) => {
|
|
1213
|
+
const pointerState = internal.pointerMap.get(id);
|
|
1214
|
+
return pointerState?.captured.has(hit.eventObject) ?? false;
|
|
1215
|
+
};
|
|
1146
1216
|
const setPointerCapture = (id) => {
|
|
1147
1217
|
const captureData = { intersection: hit, target: event.target };
|
|
1148
|
-
|
|
1149
|
-
|
|
1150
|
-
} else {
|
|
1151
|
-
internal.capturedMap.set(id, /* @__PURE__ */ new Map([[hit.eventObject, captureData]]));
|
|
1152
|
-
}
|
|
1218
|
+
const pointerState = getPointerState(internal, id);
|
|
1219
|
+
pointerState.captured.set(hit.eventObject, captureData);
|
|
1153
1220
|
event.target.setPointerCapture(id);
|
|
1154
1221
|
};
|
|
1155
1222
|
const releasePointerCapture = (id) => {
|
|
1156
|
-
|
|
1157
|
-
if (captures) {
|
|
1158
|
-
releaseInternalPointerCapture(internal.capturedMap, hit.eventObject, captures, id);
|
|
1159
|
-
}
|
|
1223
|
+
releaseInternalPointerCapture(internal, hit.eventObject, id);
|
|
1160
1224
|
};
|
|
1161
1225
|
const extractEventProps = {};
|
|
1162
1226
|
for (const prop in event) {
|
|
1163
1227
|
const property = event[prop];
|
|
1164
1228
|
if (typeof property !== "function") extractEventProps[prop] = property;
|
|
1165
1229
|
}
|
|
1230
|
+
const eventPointerId = "pointerId" in event ? event.pointerId : void 0;
|
|
1166
1231
|
const raycastEvent = {
|
|
1167
1232
|
...hit,
|
|
1168
1233
|
...extractEventProps,
|
|
@@ -1173,18 +1238,19 @@ function createEvents(store) {
|
|
|
1173
1238
|
unprojectedPoint,
|
|
1174
1239
|
ray: raycaster.ray,
|
|
1175
1240
|
camera,
|
|
1241
|
+
pointerId: eventPointerId,
|
|
1176
1242
|
// Hijack stopPropagation, which just sets a flag
|
|
1177
1243
|
stopPropagation() {
|
|
1178
|
-
const
|
|
1244
|
+
const pointerState = eventPointerId !== void 0 ? internal.pointerMap.get(eventPointerId) : void 0;
|
|
1179
1245
|
if (
|
|
1180
1246
|
// ...if this pointer hasn't been captured
|
|
1181
|
-
!
|
|
1182
|
-
|
|
1247
|
+
!pointerState?.captured.size || // ... or if the hit object is capturing the pointer
|
|
1248
|
+
pointerState.captured.has(hit.eventObject)
|
|
1183
1249
|
) {
|
|
1184
1250
|
raycastEvent.stopped = localState.stopped = true;
|
|
1185
|
-
if (
|
|
1251
|
+
if (pointerState?.hovered.size && Array.from(pointerState.hovered.values()).find((i) => i.eventObject === hit.eventObject)) {
|
|
1186
1252
|
const higher = intersections.slice(0, intersections.indexOf(hit));
|
|
1187
|
-
cancelPointer([...higher, hit]);
|
|
1253
|
+
cancelPointer([...higher, hit], eventPointerId);
|
|
1188
1254
|
}
|
|
1189
1255
|
}
|
|
1190
1256
|
},
|
|
@@ -1200,15 +1266,18 @@ function createEvents(store) {
|
|
|
1200
1266
|
}
|
|
1201
1267
|
return intersections;
|
|
1202
1268
|
}
|
|
1203
|
-
function cancelPointer(intersections) {
|
|
1269
|
+
function cancelPointer(intersections, pointerId) {
|
|
1204
1270
|
const { internal } = store.getState();
|
|
1205
|
-
|
|
1271
|
+
const pid = pointerId ?? DEFAULT_POINTER_ID;
|
|
1272
|
+
const pointerState = internal.pointerMap.get(pid);
|
|
1273
|
+
if (!pointerState) return;
|
|
1274
|
+
for (const [hoveredId, hoveredObj] of pointerState.hovered) {
|
|
1206
1275
|
if (!intersections.length || !intersections.find(
|
|
1207
1276
|
(hit) => hit.object === hoveredObj.object && hit.index === hoveredObj.index && hit.instanceId === hoveredObj.instanceId
|
|
1208
1277
|
)) {
|
|
1209
1278
|
const eventObject = hoveredObj.eventObject;
|
|
1210
1279
|
const instance = eventObject.__r3f;
|
|
1211
|
-
|
|
1280
|
+
pointerState.hovered.delete(hoveredId);
|
|
1212
1281
|
if (instance?.eventCount) {
|
|
1213
1282
|
const handlers = instance.handlers;
|
|
1214
1283
|
const data = { ...hoveredObj, intersections };
|
|
@@ -1237,41 +1306,118 @@ function createEvents(store) {
|
|
|
1237
1306
|
instance?.handlers.onDropMissed?.(event);
|
|
1238
1307
|
}
|
|
1239
1308
|
}
|
|
1309
|
+
function cleanupPointer(pointerId) {
|
|
1310
|
+
const { internal } = store.getState();
|
|
1311
|
+
const pointerState = internal.pointerMap.get(pointerId);
|
|
1312
|
+
if (pointerState) {
|
|
1313
|
+
for (const [, hoveredObj] of pointerState.hovered) {
|
|
1314
|
+
const eventObject = hoveredObj.eventObject;
|
|
1315
|
+
const instance = eventObject.__r3f;
|
|
1316
|
+
if (instance?.eventCount) {
|
|
1317
|
+
const handlers = instance.handlers;
|
|
1318
|
+
const data = { ...hoveredObj, intersections: [] };
|
|
1319
|
+
handlers.onPointerOut?.(data);
|
|
1320
|
+
handlers.onPointerLeave?.(data);
|
|
1321
|
+
}
|
|
1322
|
+
}
|
|
1323
|
+
internal.pointerMap.delete(pointerId);
|
|
1324
|
+
}
|
|
1325
|
+
internal.pointerDirty.delete(pointerId);
|
|
1326
|
+
}
|
|
1327
|
+
function processDeferredPointer(event, pointerId) {
|
|
1328
|
+
const state = store.getState();
|
|
1329
|
+
const { internal } = state;
|
|
1330
|
+
if (!state.events.enabled) return;
|
|
1331
|
+
const filter = filterPointerEvents;
|
|
1332
|
+
const hits = intersect(event, filter);
|
|
1333
|
+
cancelPointer(hits, pointerId);
|
|
1334
|
+
function onIntersect(data) {
|
|
1335
|
+
const eventObject = data.eventObject;
|
|
1336
|
+
const instance = eventObject.__r3f;
|
|
1337
|
+
if (!instance?.eventCount) return;
|
|
1338
|
+
const handlers = instance.handlers;
|
|
1339
|
+
if (handlers.onPointerOver || handlers.onPointerEnter || handlers.onPointerOut || handlers.onPointerLeave) {
|
|
1340
|
+
const id = makeId(data);
|
|
1341
|
+
const pointerState = getPointerState(internal, pointerId);
|
|
1342
|
+
const hoveredItem = pointerState.hovered.get(id);
|
|
1343
|
+
if (!hoveredItem) {
|
|
1344
|
+
pointerState.hovered.set(id, data);
|
|
1345
|
+
handlers.onPointerOver?.(data);
|
|
1346
|
+
handlers.onPointerEnter?.(data);
|
|
1347
|
+
} else if (hoveredItem.stopped) {
|
|
1348
|
+
data.stopPropagation();
|
|
1349
|
+
}
|
|
1350
|
+
}
|
|
1351
|
+
handlers.onPointerMove?.(data);
|
|
1352
|
+
}
|
|
1353
|
+
handleIntersects(hits, event, 0, onIntersect);
|
|
1354
|
+
}
|
|
1240
1355
|
function handlePointer(name) {
|
|
1241
1356
|
switch (name) {
|
|
1242
1357
|
case "onPointerLeave":
|
|
1243
|
-
case "onPointerCancel":
|
|
1244
1358
|
case "onDragLeave":
|
|
1245
1359
|
return () => cancelPointer([]);
|
|
1360
|
+
// Global cancel of these events
|
|
1361
|
+
case "onPointerCancel":
|
|
1362
|
+
return (event) => {
|
|
1363
|
+
const pointerId = getPointerId(event);
|
|
1364
|
+
cleanupPointer(pointerId);
|
|
1365
|
+
};
|
|
1246
1366
|
case "onLostPointerCapture":
|
|
1247
1367
|
return (event) => {
|
|
1248
1368
|
const { internal } = store.getState();
|
|
1249
|
-
|
|
1369
|
+
const pointerId = getPointerId(event);
|
|
1370
|
+
const pointerState = internal.pointerMap.get(pointerId);
|
|
1371
|
+
if (pointerState?.captured.size) {
|
|
1250
1372
|
requestAnimationFrame(() => {
|
|
1251
|
-
|
|
1252
|
-
|
|
1253
|
-
|
|
1373
|
+
const pointerState2 = internal.pointerMap.get(pointerId);
|
|
1374
|
+
if (pointerState2?.captured.size) {
|
|
1375
|
+
pointerState2.captured.clear();
|
|
1254
1376
|
}
|
|
1377
|
+
cancelPointer([], pointerId);
|
|
1255
1378
|
});
|
|
1256
1379
|
}
|
|
1257
1380
|
};
|
|
1258
1381
|
}
|
|
1259
1382
|
return function handleEvent(event) {
|
|
1260
1383
|
const state = store.getState();
|
|
1261
|
-
const { onPointerMissed, onDragOverMissed, onDropMissed, internal } = state;
|
|
1384
|
+
const { onPointerMissed, onDragOverMissed, onDropMissed, internal, events } = state;
|
|
1385
|
+
const pointerId = getPointerId(event);
|
|
1262
1386
|
internal.lastEvent.current = event;
|
|
1263
|
-
if (!
|
|
1387
|
+
if (!events.enabled) return;
|
|
1264
1388
|
const isPointerMove = name === "onPointerMove";
|
|
1265
1389
|
const isDragOver = name === "onDragOver";
|
|
1266
1390
|
const isDrop = name === "onDrop";
|
|
1267
1391
|
const isClickEvent = name === "onClick" || name === "onContextMenu" || name === "onDoubleClick";
|
|
1392
|
+
const isPointerDown = name === "onPointerDown";
|
|
1393
|
+
const isPointerUp = name === "onPointerUp";
|
|
1394
|
+
const isWheel = name === "onWheel";
|
|
1395
|
+
const canDeferRaycasts = events.frameTimedRaycasts && state.frameloop === "always";
|
|
1396
|
+
if (isPointerMove && canDeferRaycasts) {
|
|
1397
|
+
events.compute?.(event, state);
|
|
1398
|
+
internal.pointerDirty.set(pointerId, event);
|
|
1399
|
+
return;
|
|
1400
|
+
}
|
|
1401
|
+
if (isWheel && canDeferRaycasts && !events.alwaysFireOnScroll) {
|
|
1402
|
+
events.compute?.(event, state);
|
|
1403
|
+
internal.pointerDirty.set(pointerId, event);
|
|
1404
|
+
return;
|
|
1405
|
+
}
|
|
1406
|
+
if ((isClickEvent || isPointerDown || isPointerUp) && internal.pointerDirty.has(pointerId)) {
|
|
1407
|
+
const deferredEvent = internal.pointerDirty.get(pointerId);
|
|
1408
|
+
internal.pointerDirty.delete(pointerId);
|
|
1409
|
+
processDeferredPointer(deferredEvent, pointerId);
|
|
1410
|
+
}
|
|
1268
1411
|
const filter = isPointerMove || isDragOver || isDrop ? filterPointerEvents : void 0;
|
|
1269
1412
|
const hits = intersect(event, filter);
|
|
1270
|
-
const delta = isClickEvent ? calculateDistance(event) : 0;
|
|
1271
|
-
if (
|
|
1272
|
-
|
|
1273
|
-
|
|
1274
|
-
|
|
1413
|
+
const delta = isClickEvent ? calculateDistance(event, pointerId) : 0;
|
|
1414
|
+
if (isPointerDown) {
|
|
1415
|
+
const pointerState2 = getPointerState(internal, pointerId);
|
|
1416
|
+
pointerState2.initialClick = [event.offsetX, event.offsetY];
|
|
1417
|
+
pointerState2.initialHits = hits.map((hit) => hit.eventObject);
|
|
1418
|
+
}
|
|
1419
|
+
const pointerState = internal.pointerMap.get(pointerId);
|
|
1420
|
+
const initialHits = pointerState?.initialHits ?? [];
|
|
1275
1421
|
if (isClickEvent && !hits.length) {
|
|
1276
1422
|
if (delta <= 2) {
|
|
1277
1423
|
pointerMissed(event, internal.interaction);
|
|
@@ -1286,7 +1432,9 @@ function createEvents(store) {
|
|
|
1286
1432
|
dropMissed(event, internal.interaction);
|
|
1287
1433
|
if (onDropMissed) onDropMissed(event);
|
|
1288
1434
|
}
|
|
1289
|
-
if (isPointerMove || isDragOver)
|
|
1435
|
+
if (isPointerMove || isDragOver) {
|
|
1436
|
+
cancelPointer(hits, pointerId);
|
|
1437
|
+
}
|
|
1290
1438
|
function onIntersect(data) {
|
|
1291
1439
|
const eventObject = data.eventObject;
|
|
1292
1440
|
const instance = eventObject.__r3f;
|
|
@@ -1295,9 +1443,10 @@ function createEvents(store) {
|
|
|
1295
1443
|
if (isPointerMove) {
|
|
1296
1444
|
if (handlers.onPointerOver || handlers.onPointerEnter || handlers.onPointerOut || handlers.onPointerLeave) {
|
|
1297
1445
|
const id = makeId(data);
|
|
1298
|
-
const
|
|
1446
|
+
const pointerState2 = getPointerState(internal, pointerId);
|
|
1447
|
+
const hoveredItem = pointerState2.hovered.get(id);
|
|
1299
1448
|
if (!hoveredItem) {
|
|
1300
|
-
|
|
1449
|
+
pointerState2.hovered.set(id, data);
|
|
1301
1450
|
handlers.onPointerOver?.(data);
|
|
1302
1451
|
handlers.onPointerEnter?.(data);
|
|
1303
1452
|
} else if (hoveredItem.stopped) {
|
|
@@ -1307,9 +1456,10 @@ function createEvents(store) {
|
|
|
1307
1456
|
handlers.onPointerMove?.(data);
|
|
1308
1457
|
} else if (isDragOver) {
|
|
1309
1458
|
const id = makeId(data);
|
|
1310
|
-
const
|
|
1459
|
+
const pointerState2 = getPointerState(internal, pointerId);
|
|
1460
|
+
const hoveredItem = pointerState2.hovered.get(id);
|
|
1311
1461
|
if (!hoveredItem) {
|
|
1312
|
-
|
|
1462
|
+
pointerState2.hovered.set(id, data);
|
|
1313
1463
|
handlers.onDragOverEnter?.(data);
|
|
1314
1464
|
} else if (hoveredItem.stopped) {
|
|
1315
1465
|
data.stopPropagation();
|
|
@@ -1320,18 +1470,18 @@ function createEvents(store) {
|
|
|
1320
1470
|
} else {
|
|
1321
1471
|
const handler = handlers[name];
|
|
1322
1472
|
if (handler) {
|
|
1323
|
-
if (!isClickEvent ||
|
|
1473
|
+
if (!isClickEvent || initialHits.includes(eventObject)) {
|
|
1324
1474
|
pointerMissed(
|
|
1325
1475
|
event,
|
|
1326
|
-
internal.interaction.filter((object) => !
|
|
1476
|
+
internal.interaction.filter((object) => !initialHits.includes(object))
|
|
1327
1477
|
);
|
|
1328
1478
|
handler(data);
|
|
1329
1479
|
}
|
|
1330
1480
|
} else {
|
|
1331
|
-
if (isClickEvent &&
|
|
1481
|
+
if (isClickEvent && initialHits.includes(eventObject)) {
|
|
1332
1482
|
pointerMissed(
|
|
1333
1483
|
event,
|
|
1334
|
-
internal.interaction.filter((object) => !
|
|
1484
|
+
internal.interaction.filter((object) => !initialHits.includes(object))
|
|
1335
1485
|
);
|
|
1336
1486
|
}
|
|
1337
1487
|
}
|
|
@@ -1340,7 +1490,15 @@ function createEvents(store) {
|
|
|
1340
1490
|
handleIntersects(hits, event, delta, onIntersect);
|
|
1341
1491
|
};
|
|
1342
1492
|
}
|
|
1343
|
-
|
|
1493
|
+
function flushDeferredPointers() {
|
|
1494
|
+
const { internal, events } = store.getState();
|
|
1495
|
+
if (!events.frameTimedRaycasts) return;
|
|
1496
|
+
for (const [pointerId, event] of internal.pointerDirty) {
|
|
1497
|
+
processDeferredPointer(event, pointerId);
|
|
1498
|
+
}
|
|
1499
|
+
internal.pointerDirty.clear();
|
|
1500
|
+
}
|
|
1501
|
+
return { handlePointer, flushDeferredPointers, processDeferredPointer };
|
|
1344
1502
|
}
|
|
1345
1503
|
const DOM_EVENTS = {
|
|
1346
1504
|
onClick: ["click", false],
|
|
@@ -1359,10 +1517,15 @@ const DOM_EVENTS = {
|
|
|
1359
1517
|
onLostPointerCapture: ["lostpointercapture", true]
|
|
1360
1518
|
};
|
|
1361
1519
|
function createPointerEvents(store) {
|
|
1362
|
-
const { handlePointer } = createEvents(store);
|
|
1520
|
+
const { handlePointer, flushDeferredPointers, processDeferredPointer } = createEvents(store);
|
|
1521
|
+
let nextXRPointerId = XR_POINTER_ID_START;
|
|
1522
|
+
const xrPointers = /* @__PURE__ */ new Map();
|
|
1363
1523
|
return {
|
|
1364
1524
|
priority: 1,
|
|
1365
1525
|
enabled: true,
|
|
1526
|
+
frameTimedRaycasts: true,
|
|
1527
|
+
alwaysFireOnScroll: true,
|
|
1528
|
+
updateOnFrame: false,
|
|
1366
1529
|
compute(event, state) {
|
|
1367
1530
|
state.pointer.set(event.offsetX / state.size.width * 2 - 1, -(event.offsetY / state.size.height) * 2 + 1);
|
|
1368
1531
|
state.raycaster.setFromCamera(state.pointer, state.camera);
|
|
@@ -1372,11 +1535,33 @@ function createPointerEvents(store) {
|
|
|
1372
1535
|
(acc, key) => ({ ...acc, [key]: handlePointer(key) }),
|
|
1373
1536
|
{}
|
|
1374
1537
|
),
|
|
1375
|
-
update: () => {
|
|
1538
|
+
update: (pointerId) => {
|
|
1539
|
+
const { events, internal } = store.getState();
|
|
1540
|
+
if (!events.handlers) return;
|
|
1541
|
+
if (pointerId !== void 0) {
|
|
1542
|
+
const event = internal.pointerDirty.get(pointerId);
|
|
1543
|
+
if (event) {
|
|
1544
|
+
internal.pointerDirty.delete(pointerId);
|
|
1545
|
+
processDeferredPointer(event, pointerId);
|
|
1546
|
+
} else if (internal.lastEvent?.current) {
|
|
1547
|
+
processDeferredPointer(internal.lastEvent.current, pointerId);
|
|
1548
|
+
}
|
|
1549
|
+
} else {
|
|
1550
|
+
flushDeferredPointers();
|
|
1551
|
+
if (internal.lastEvent?.current) {
|
|
1552
|
+
events.handlers.onPointerMove(internal.lastEvent.current);
|
|
1553
|
+
}
|
|
1554
|
+
}
|
|
1555
|
+
},
|
|
1556
|
+
flush: () => {
|
|
1376
1557
|
const { events, internal } = store.getState();
|
|
1377
|
-
|
|
1558
|
+
flushDeferredPointers();
|
|
1559
|
+
if (events.updateOnFrame && internal.lastEvent?.current && events.handlers) {
|
|
1560
|
+
events.handlers.onPointerMove(internal.lastEvent.current);
|
|
1561
|
+
}
|
|
1378
1562
|
},
|
|
1379
1563
|
connect: (target) => {
|
|
1564
|
+
if (!target) return;
|
|
1380
1565
|
const { set, events } = store.getState();
|
|
1381
1566
|
events.disconnect?.();
|
|
1382
1567
|
set((state) => ({ events: { ...state.events, connected: target } }));
|
|
@@ -1400,6 +1585,32 @@ function createPointerEvents(store) {
|
|
|
1400
1585
|
}
|
|
1401
1586
|
set((state) => ({ events: { ...state.events, connected: void 0 } }));
|
|
1402
1587
|
}
|
|
1588
|
+
},
|
|
1589
|
+
registerPointer: (config) => {
|
|
1590
|
+
const pointerId = nextXRPointerId++;
|
|
1591
|
+
xrPointers.set(pointerId, config);
|
|
1592
|
+
const { internal } = store.getState();
|
|
1593
|
+
getPointerState(internal, pointerId);
|
|
1594
|
+
return pointerId;
|
|
1595
|
+
},
|
|
1596
|
+
unregisterPointer: (pointerId) => {
|
|
1597
|
+
xrPointers.delete(pointerId);
|
|
1598
|
+
const { internal } = store.getState();
|
|
1599
|
+
const pointerState = internal.pointerMap.get(pointerId);
|
|
1600
|
+
if (pointerState) {
|
|
1601
|
+
for (const [, hoveredObj] of pointerState.hovered) {
|
|
1602
|
+
const eventObject = hoveredObj.eventObject;
|
|
1603
|
+
const instance = eventObject.__r3f;
|
|
1604
|
+
if (instance?.eventCount) {
|
|
1605
|
+
const handlers = instance.handlers;
|
|
1606
|
+
const data = { ...hoveredObj, intersections: [] };
|
|
1607
|
+
handlers.onPointerOut?.(data);
|
|
1608
|
+
handlers.onPointerLeave?.(data);
|
|
1609
|
+
}
|
|
1610
|
+
}
|
|
1611
|
+
internal.pointerMap.delete(pointerId);
|
|
1612
|
+
}
|
|
1613
|
+
internal.pointerDirty.delete(pointerId);
|
|
1403
1614
|
}
|
|
1404
1615
|
};
|
|
1405
1616
|
}
|
|
@@ -1461,1036 +1672,12 @@ function notifyAlpha({ message, link }) {
|
|
|
1461
1672
|
}
|
|
1462
1673
|
}
|
|
1463
1674
|
|
|
1464
|
-
|
|
1465
|
-
|
|
1466
|
-
|
|
1467
|
-
|
|
1468
|
-
|
|
1469
|
-
|
|
1470
|
-
/** Ordered list of phase nodes */
|
|
1471
|
-
__publicField$2(this, "phases", []);
|
|
1472
|
-
/** Quick lookup by name */
|
|
1473
|
-
__publicField$2(this, "phaseMap", /* @__PURE__ */ new Map());
|
|
1474
|
-
/** Cached ordered names (invalidated on changes) */
|
|
1475
|
-
__publicField$2(this, "orderedNamesCache", null);
|
|
1476
|
-
this.initializeDefaultPhases();
|
|
1477
|
-
}
|
|
1478
|
-
//* Initialization --------------------------------
|
|
1479
|
-
initializeDefaultPhases() {
|
|
1480
|
-
for (const name of DEFAULT_PHASES) {
|
|
1481
|
-
const node = { name, isAutoGenerated: false };
|
|
1482
|
-
this.phases.push(node);
|
|
1483
|
-
this.phaseMap.set(name, node);
|
|
1484
|
-
}
|
|
1485
|
-
this.invalidateCache();
|
|
1486
|
-
}
|
|
1487
|
-
//* Public API --------------------------------
|
|
1488
|
-
/**
|
|
1489
|
-
* Add a named phase to the graph
|
|
1490
|
-
* @param name - Phase name (must be unique)
|
|
1491
|
-
* @param options - Position options (before or after another phase)
|
|
1492
|
-
*/
|
|
1493
|
-
addPhase(name, options = {}) {
|
|
1494
|
-
if (this.phaseMap.has(name)) {
|
|
1495
|
-
console.warn(`[useFrame] Phase "${name}" already exists`);
|
|
1496
|
-
return;
|
|
1497
|
-
}
|
|
1498
|
-
const { before, after } = options;
|
|
1499
|
-
const node = { name, isAutoGenerated: false };
|
|
1500
|
-
let insertIndex = this.phases.length;
|
|
1501
|
-
const targetIndex = this.getPhaseIndex(before ?? after);
|
|
1502
|
-
if (targetIndex !== -1) {
|
|
1503
|
-
insertIndex = before ? targetIndex : targetIndex + 1;
|
|
1504
|
-
} else {
|
|
1505
|
-
const constraintType = before ? "before" : "after";
|
|
1506
|
-
console.warn(`[useFrame] Phase "${before ?? after}" not found for '${constraintType}' constraint`);
|
|
1507
|
-
}
|
|
1508
|
-
this.phases.splice(insertIndex, 0, node);
|
|
1509
|
-
this.phaseMap.set(name, node);
|
|
1510
|
-
this.invalidateCache();
|
|
1511
|
-
}
|
|
1512
|
-
/**
|
|
1513
|
-
* Get ordered list of phase names
|
|
1514
|
-
*/
|
|
1515
|
-
getOrderedPhases() {
|
|
1516
|
-
if (this.orderedNamesCache === null) this.orderedNamesCache = this.phases.map((p) => p.name);
|
|
1517
|
-
return this.orderedNamesCache;
|
|
1518
|
-
}
|
|
1519
|
-
/**
|
|
1520
|
-
* Check if a phase exists
|
|
1521
|
-
*/
|
|
1522
|
-
hasPhase(name) {
|
|
1523
|
-
return this.phaseMap.has(name);
|
|
1524
|
-
}
|
|
1525
|
-
/**
|
|
1526
|
-
* Get the index of a phase (-1 if not found)
|
|
1527
|
-
*/
|
|
1528
|
-
getPhaseIndex(name) {
|
|
1529
|
-
if (!name) return -1;
|
|
1530
|
-
return this.phases.findIndex((p) => p.name === name);
|
|
1531
|
-
}
|
|
1532
|
-
/**
|
|
1533
|
-
* Ensure a phase exists, creating an auto-generated one if needed.
|
|
1534
|
-
* Used for resolving before/after constraints.
|
|
1535
|
-
*
|
|
1536
|
-
* @param name - The phase name to ensure exists
|
|
1537
|
-
* @returns The phase name (may be auto-generated like 'before:render')
|
|
1538
|
-
*/
|
|
1539
|
-
ensurePhase(name) {
|
|
1540
|
-
if (this.phaseMap.has(name)) return name;
|
|
1541
|
-
const node = { name, isAutoGenerated: true };
|
|
1542
|
-
this.phases.push(node);
|
|
1543
|
-
this.phaseMap.set(name, node);
|
|
1544
|
-
this.invalidateCache();
|
|
1545
|
-
return name;
|
|
1546
|
-
}
|
|
1547
|
-
/**
|
|
1548
|
-
* Resolve where a job with before/after constraints should go.
|
|
1549
|
-
* Creates auto-generated phases if needed.
|
|
1550
|
-
*
|
|
1551
|
-
* @param before - Phase(s) to run before
|
|
1552
|
-
* @param after - Phase(s) to run after
|
|
1553
|
-
* @returns The resolved phase name
|
|
1554
|
-
*/
|
|
1555
|
-
resolveConstraintPhase(before, after) {
|
|
1556
|
-
const beforeArr = before ? Array.isArray(before) ? before : [before] : [];
|
|
1557
|
-
const afterArr = after ? Array.isArray(after) ? after : [after] : [];
|
|
1558
|
-
if (beforeArr.length > 0) {
|
|
1559
|
-
return this.ensureAutoPhase(beforeArr[0], "before", 0);
|
|
1560
|
-
}
|
|
1561
|
-
if (afterArr.length > 0) {
|
|
1562
|
-
return this.ensureAutoPhase(afterArr[0], "after", 1);
|
|
1563
|
-
}
|
|
1564
|
-
return "update";
|
|
1565
|
-
}
|
|
1566
|
-
/**
|
|
1567
|
-
* Ensure an auto-generated phase exists relative to a target phase.
|
|
1568
|
-
* Creates the phase if it doesn't exist, inserting it at the correct position.
|
|
1569
|
-
*
|
|
1570
|
-
* @param target - The target phase name to position relative to
|
|
1571
|
-
* @param prefix - Prefix for auto-generated phase name ('before' or 'after')
|
|
1572
|
-
* @param offset - Insertion offset (0 for before, 1 for after)
|
|
1573
|
-
* @returns The auto-generated phase name
|
|
1574
|
-
*/
|
|
1575
|
-
ensureAutoPhase(target, prefix, offset) {
|
|
1576
|
-
const autoName = `${prefix}:${target}`;
|
|
1577
|
-
if (this.phaseMap.has(autoName)) return autoName;
|
|
1578
|
-
const node = { name: autoName, isAutoGenerated: true };
|
|
1579
|
-
const targetIndex = this.getPhaseIndex(target);
|
|
1580
|
-
if (targetIndex !== -1) this.phases.splice(targetIndex + offset, 0, node);
|
|
1581
|
-
else this.phases.push(node);
|
|
1582
|
-
this.phaseMap.set(autoName, node);
|
|
1583
|
-
this.invalidateCache();
|
|
1584
|
-
return autoName;
|
|
1585
|
-
}
|
|
1586
|
-
// Internal --------------------------------
|
|
1587
|
-
invalidateCache() {
|
|
1588
|
-
this.orderedNamesCache = null;
|
|
1589
|
-
}
|
|
1590
|
-
}
|
|
1591
|
-
|
|
1592
|
-
function rebuildSortedJobs(jobs, phaseGraph) {
|
|
1593
|
-
const orderedPhases = phaseGraph.getOrderedPhases();
|
|
1594
|
-
const buckets = /* @__PURE__ */ new Map();
|
|
1595
|
-
for (const phase of orderedPhases) {
|
|
1596
|
-
buckets.set(phase, []);
|
|
1597
|
-
}
|
|
1598
|
-
for (const job of jobs.values()) {
|
|
1599
|
-
if (!job.enabled) continue;
|
|
1600
|
-
let bucket = buckets.get(job.phase);
|
|
1601
|
-
if (!bucket) {
|
|
1602
|
-
bucket = [];
|
|
1603
|
-
buckets.set(job.phase, bucket);
|
|
1604
|
-
}
|
|
1605
|
-
bucket.push(job);
|
|
1606
|
-
}
|
|
1607
|
-
const sortedBuckets = [];
|
|
1608
|
-
for (const phase of orderedPhases) {
|
|
1609
|
-
const bucket = buckets.get(phase);
|
|
1610
|
-
if (!bucket || bucket.length === 0) continue;
|
|
1611
|
-
bucket.sort((a, b) => {
|
|
1612
|
-
if (a.priority !== b.priority) return b.priority - a.priority;
|
|
1613
|
-
return a.index - b.index;
|
|
1614
|
-
});
|
|
1615
|
-
sortedBuckets.push(hasCrossJobConstraints(bucket) ? topologicalSort(bucket) : bucket);
|
|
1616
|
-
}
|
|
1617
|
-
for (const [phase, bucket] of buckets) {
|
|
1618
|
-
if (!orderedPhases.includes(phase) && bucket.length > 0) {
|
|
1619
|
-
bucket.sort((a, b) => {
|
|
1620
|
-
if (a.priority !== b.priority) return b.priority - a.priority;
|
|
1621
|
-
return a.index - b.index;
|
|
1622
|
-
});
|
|
1623
|
-
sortedBuckets.push(bucket);
|
|
1624
|
-
}
|
|
1625
|
-
}
|
|
1626
|
-
return sortedBuckets.flat();
|
|
1627
|
-
}
|
|
1628
|
-
function hasCrossJobConstraints(bucket) {
|
|
1629
|
-
const jobIds = new Set(bucket.map((j) => j.id));
|
|
1630
|
-
for (const job of bucket) {
|
|
1631
|
-
for (const ref of job.before) {
|
|
1632
|
-
if (jobIds.has(ref)) return true;
|
|
1633
|
-
}
|
|
1634
|
-
for (const ref of job.after) {
|
|
1635
|
-
if (jobIds.has(ref)) return true;
|
|
1636
|
-
}
|
|
1637
|
-
}
|
|
1638
|
-
return false;
|
|
1639
|
-
}
|
|
1640
|
-
function topologicalSort(jobs) {
|
|
1641
|
-
const n = jobs.length;
|
|
1642
|
-
if (n <= 1) return jobs;
|
|
1643
|
-
const jobMap = /* @__PURE__ */ new Map();
|
|
1644
|
-
const inDegree = /* @__PURE__ */ new Map();
|
|
1645
|
-
const adjacency = /* @__PURE__ */ new Map();
|
|
1646
|
-
for (const job of jobs) {
|
|
1647
|
-
jobMap.set(job.id, job);
|
|
1648
|
-
inDegree.set(job.id, 0);
|
|
1649
|
-
adjacency.set(job.id, []);
|
|
1650
|
-
}
|
|
1651
|
-
for (const job of jobs) {
|
|
1652
|
-
for (const ref of job.before) {
|
|
1653
|
-
if (jobMap.has(ref)) {
|
|
1654
|
-
adjacency.get(job.id).push(ref);
|
|
1655
|
-
inDegree.set(ref, inDegree.get(ref) + 1);
|
|
1656
|
-
}
|
|
1657
|
-
}
|
|
1658
|
-
for (const ref of job.after) {
|
|
1659
|
-
if (jobMap.has(ref)) {
|
|
1660
|
-
adjacency.get(ref).push(job.id);
|
|
1661
|
-
inDegree.set(job.id, inDegree.get(job.id) + 1);
|
|
1662
|
-
}
|
|
1663
|
-
}
|
|
1664
|
-
}
|
|
1665
|
-
const queue = [];
|
|
1666
|
-
for (const job of jobs) {
|
|
1667
|
-
if (inDegree.get(job.id) === 0) {
|
|
1668
|
-
queue.push(job);
|
|
1669
|
-
}
|
|
1670
|
-
}
|
|
1671
|
-
queue.sort((a, b) => {
|
|
1672
|
-
if (a.priority !== b.priority) return b.priority - a.priority;
|
|
1673
|
-
return a.index - b.index;
|
|
1674
|
-
});
|
|
1675
|
-
const result = [];
|
|
1676
|
-
while (queue.length > 0) {
|
|
1677
|
-
const job = queue.shift();
|
|
1678
|
-
result.push(job);
|
|
1679
|
-
const neighbors = adjacency.get(job.id) || [];
|
|
1680
|
-
for (const neighborId of neighbors) {
|
|
1681
|
-
const newDegree = inDegree.get(neighborId) - 1;
|
|
1682
|
-
inDegree.set(neighborId, newDegree);
|
|
1683
|
-
if (newDegree === 0) {
|
|
1684
|
-
const neighbor = jobMap.get(neighborId);
|
|
1685
|
-
insertSorted(queue, neighbor);
|
|
1686
|
-
}
|
|
1687
|
-
}
|
|
1688
|
-
}
|
|
1689
|
-
if (result.length !== n) {
|
|
1690
|
-
console.warn("[useFrame] Circular dependency detected in job constraints");
|
|
1691
|
-
const resultIds = new Set(result.map((j) => j.id));
|
|
1692
|
-
for (const job of jobs) {
|
|
1693
|
-
if (!resultIds.has(job.id)) result.push(job);
|
|
1694
|
-
}
|
|
1695
|
-
}
|
|
1696
|
-
return result;
|
|
1697
|
-
}
|
|
1698
|
-
function insertSorted(arr, job) {
|
|
1699
|
-
let i = 0;
|
|
1700
|
-
while (i < arr.length) {
|
|
1701
|
-
const cmp = arr[i];
|
|
1702
|
-
if (job.priority > cmp.priority || job.priority === cmp.priority && job.index < cmp.index) {
|
|
1703
|
-
break;
|
|
1704
|
-
}
|
|
1705
|
-
i++;
|
|
1706
|
-
}
|
|
1707
|
-
arr.splice(i, 0, job);
|
|
1708
|
-
}
|
|
1709
|
-
|
|
1710
|
-
function shouldRun(job, now) {
|
|
1711
|
-
if (!job.enabled) return false;
|
|
1712
|
-
if (!job.fps) return true;
|
|
1713
|
-
const minInterval = 1e3 / job.fps;
|
|
1714
|
-
const lastRun = job.lastRun ?? 0;
|
|
1715
|
-
const elapsed = now - lastRun;
|
|
1716
|
-
if (elapsed < minInterval) return false;
|
|
1717
|
-
if (job.drop) {
|
|
1718
|
-
job.lastRun = now;
|
|
1719
|
-
} else {
|
|
1720
|
-
const steps = Math.floor(elapsed / minInterval);
|
|
1721
|
-
job.lastRun = lastRun + steps * minInterval;
|
|
1722
|
-
if (job.lastRun < now - minInterval) {
|
|
1723
|
-
job.lastRun = now;
|
|
1724
|
-
}
|
|
1725
|
-
}
|
|
1726
|
-
return true;
|
|
1727
|
-
}
|
|
1728
|
-
function resetJobTiming(job) {
|
|
1729
|
-
job.lastRun = void 0;
|
|
1730
|
-
}
|
|
1731
|
-
|
|
1732
|
-
var __defProp$1 = Object.defineProperty;
|
|
1733
|
-
var __defNormalProp$1 = (obj, key, value) => key in obj ? __defProp$1(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
|
|
1734
|
-
var __publicField$1 = (obj, key, value) => __defNormalProp$1(obj, typeof key !== "symbol" ? key + "" : key, value);
|
|
1735
|
-
const hmrData = (() => {
|
|
1736
|
-
if (typeof process !== "undefined" && process.env.NODE_ENV === "test") return void 0;
|
|
1737
|
-
if (typeof import_meta_hot !== "undefined") return import_meta_hot;
|
|
1738
|
-
try {
|
|
1739
|
-
return (0, eval)("import.meta.hot");
|
|
1740
|
-
} catch {
|
|
1741
|
-
return void 0;
|
|
1742
|
-
}
|
|
1743
|
-
})();
|
|
1744
|
-
const _Scheduler = class _Scheduler {
|
|
1745
|
-
//* Constructor ================================
|
|
1746
|
-
constructor() {
|
|
1747
|
-
//* Critical State ================================
|
|
1748
|
-
__publicField$1(this, "roots", /* @__PURE__ */ new Map());
|
|
1749
|
-
__publicField$1(this, "phaseGraph");
|
|
1750
|
-
__publicField$1(this, "loopState", {
|
|
1751
|
-
running: false,
|
|
1752
|
-
rafHandle: null,
|
|
1753
|
-
lastTime: null,
|
|
1754
|
-
// null = uninitialized, 0+ = valid timestamp
|
|
1755
|
-
frameCount: 0,
|
|
1756
|
-
elapsedTime: 0,
|
|
1757
|
-
createdAt: performance.now()
|
|
1758
|
-
});
|
|
1759
|
-
__publicField$1(this, "stoppedTime", 0);
|
|
1760
|
-
//* Private State ================================
|
|
1761
|
-
__publicField$1(this, "nextRootIndex", 0);
|
|
1762
|
-
__publicField$1(this, "globalBeforeJobs", /* @__PURE__ */ new Map());
|
|
1763
|
-
__publicField$1(this, "globalAfterJobs", /* @__PURE__ */ new Map());
|
|
1764
|
-
__publicField$1(this, "nextGlobalIndex", 0);
|
|
1765
|
-
__publicField$1(this, "idleCallbacks", /* @__PURE__ */ new Set());
|
|
1766
|
-
__publicField$1(this, "nextJobIndex", 0);
|
|
1767
|
-
__publicField$1(this, "jobStateListeners", /* @__PURE__ */ new Map());
|
|
1768
|
-
__publicField$1(this, "pendingFrames", 0);
|
|
1769
|
-
__publicField$1(this, "_frameloop", "always");
|
|
1770
|
-
//* Independent Mode & Error Handling State ================================
|
|
1771
|
-
__publicField$1(this, "_independent", false);
|
|
1772
|
-
__publicField$1(this, "errorHandler", null);
|
|
1773
|
-
__publicField$1(this, "rootReadyCallbacks", /* @__PURE__ */ new Set());
|
|
1774
|
-
//* Core Loop Execution Methods ================================
|
|
1775
|
-
/**
|
|
1776
|
-
* Main RAF loop callback.
|
|
1777
|
-
* Executes frame, handles demand mode, and schedules next frame.
|
|
1778
|
-
* @param {number} timestamp - RAF timestamp in milliseconds
|
|
1779
|
-
* @returns {void}
|
|
1780
|
-
* @private
|
|
1781
|
-
*/
|
|
1782
|
-
__publicField$1(this, "loop", (timestamp) => {
|
|
1783
|
-
if (!this.loopState.running) return;
|
|
1784
|
-
this.executeFrame(timestamp);
|
|
1785
|
-
if (this._frameloop === "demand") {
|
|
1786
|
-
this.pendingFrames = Math.max(0, this.pendingFrames - 1);
|
|
1787
|
-
if (this.pendingFrames === 0) {
|
|
1788
|
-
this.notifyIdle(timestamp);
|
|
1789
|
-
return this.stop();
|
|
1790
|
-
}
|
|
1791
|
-
}
|
|
1792
|
-
this.loopState.rafHandle = requestAnimationFrame(this.loop);
|
|
1793
|
-
});
|
|
1794
|
-
this.phaseGraph = new PhaseGraph();
|
|
1795
|
-
}
|
|
1796
|
-
static get instance() {
|
|
1797
|
-
return globalThis[_Scheduler.INSTANCE_KEY] ?? null;
|
|
1798
|
-
}
|
|
1799
|
-
static set instance(value) {
|
|
1800
|
-
globalThis[_Scheduler.INSTANCE_KEY] = value;
|
|
1801
|
-
}
|
|
1802
|
-
/**
|
|
1803
|
-
* Get the global scheduler instance (creates if doesn't exist).
|
|
1804
|
-
* Uses HMR data to preserve instance across hot reloads.
|
|
1805
|
-
* @returns {Scheduler} The singleton scheduler instance
|
|
1806
|
-
*/
|
|
1807
|
-
static get() {
|
|
1808
|
-
if (!_Scheduler.instance && hmrData?.data?.scheduler) {
|
|
1809
|
-
_Scheduler.instance = hmrData.data.scheduler;
|
|
1810
|
-
}
|
|
1811
|
-
if (!_Scheduler.instance) {
|
|
1812
|
-
_Scheduler.instance = new _Scheduler();
|
|
1813
|
-
if (hmrData?.data) {
|
|
1814
|
-
hmrData.data.scheduler = _Scheduler.instance;
|
|
1815
|
-
}
|
|
1816
|
-
}
|
|
1817
|
-
return _Scheduler.instance;
|
|
1818
|
-
}
|
|
1819
|
-
/**
|
|
1820
|
-
* Reset the singleton instance. Stops the loop and clears all state.
|
|
1821
|
-
* Primarily used for testing to ensure clean state between tests.
|
|
1822
|
-
* @returns {void}
|
|
1823
|
-
*/
|
|
1824
|
-
static reset() {
|
|
1825
|
-
if (_Scheduler.instance) {
|
|
1826
|
-
_Scheduler.instance.stop();
|
|
1827
|
-
_Scheduler.instance = null;
|
|
1828
|
-
}
|
|
1829
|
-
if (hmrData?.data) {
|
|
1830
|
-
hmrData.data.scheduler = null;
|
|
1831
|
-
}
|
|
1832
|
-
}
|
|
1833
|
-
//* Getters & Setters ================================
|
|
1834
|
-
get phases() {
|
|
1835
|
-
return this.phaseGraph.getOrderedPhases();
|
|
1836
|
-
}
|
|
1837
|
-
get frameloop() {
|
|
1838
|
-
return this._frameloop;
|
|
1839
|
-
}
|
|
1840
|
-
set frameloop(mode) {
|
|
1841
|
-
if (this._frameloop === mode) return;
|
|
1842
|
-
const wasAlways = this._frameloop === "always";
|
|
1843
|
-
this._frameloop = mode;
|
|
1844
|
-
if (mode === "always" && !this.loopState.running && this.roots.size > 0) this.start();
|
|
1845
|
-
else if (mode !== "always" && wasAlways) this.stop();
|
|
1846
|
-
}
|
|
1847
|
-
get isRunning() {
|
|
1848
|
-
return this.loopState.running;
|
|
1849
|
-
}
|
|
1850
|
-
get isReady() {
|
|
1851
|
-
return this.roots.size > 0;
|
|
1852
|
-
}
|
|
1853
|
-
get independent() {
|
|
1854
|
-
return this._independent;
|
|
1855
|
-
}
|
|
1856
|
-
set independent(value) {
|
|
1857
|
-
this._independent = value;
|
|
1858
|
-
if (value) this.ensureDefaultRoot();
|
|
1859
|
-
}
|
|
1860
|
-
//* Root Management Methods ================================
|
|
1861
|
-
/**
|
|
1862
|
-
* Register a root (Canvas) with the scheduler.
|
|
1863
|
-
* The first root to register starts the RAF loop (if frameloop='always').
|
|
1864
|
-
* @param {string} id - Unique identifier for this root
|
|
1865
|
-
* @param {RootOptions} [options] - Optional configuration with getState and onError callbacks
|
|
1866
|
-
* @returns {() => void} Unsubscribe function to remove this root
|
|
1867
|
-
*/
|
|
1868
|
-
registerRoot(id, options = {}) {
|
|
1869
|
-
if (this.roots.has(id)) {
|
|
1870
|
-
console.warn(`[Scheduler] Root "${id}" already registered`);
|
|
1871
|
-
return () => this.unregisterRoot(id);
|
|
1872
|
-
}
|
|
1873
|
-
const entry = {
|
|
1874
|
-
id,
|
|
1875
|
-
getState: options.getState ?? (() => ({})),
|
|
1876
|
-
jobs: /* @__PURE__ */ new Map(),
|
|
1877
|
-
sortedJobs: [],
|
|
1878
|
-
needsRebuild: false
|
|
1879
|
-
};
|
|
1880
|
-
if (options.onError) {
|
|
1881
|
-
this.errorHandler = options.onError;
|
|
1882
|
-
}
|
|
1883
|
-
this.roots.set(id, entry);
|
|
1884
|
-
if (this.roots.size === 1) {
|
|
1885
|
-
this.notifyRootReady();
|
|
1886
|
-
if (this._frameloop === "always") this.start();
|
|
1887
|
-
}
|
|
1888
|
-
return () => this.unregisterRoot(id);
|
|
1889
|
-
}
|
|
1890
|
-
/**
|
|
1891
|
-
* Unregister a root from the scheduler.
|
|
1892
|
-
* Cleans up all job state listeners for this root's jobs.
|
|
1893
|
-
* The last root to unregister stops the RAF loop.
|
|
1894
|
-
* @param {string} id - The root ID to unregister
|
|
1895
|
-
* @returns {void}
|
|
1896
|
-
*/
|
|
1897
|
-
unregisterRoot(id) {
|
|
1898
|
-
const root = this.roots.get(id);
|
|
1899
|
-
if (!root) return;
|
|
1900
|
-
for (const jobId of root.jobs.keys()) {
|
|
1901
|
-
this.jobStateListeners.delete(jobId);
|
|
1902
|
-
}
|
|
1903
|
-
this.roots.delete(id);
|
|
1904
|
-
if (this.roots.size === 0) {
|
|
1905
|
-
this.stop();
|
|
1906
|
-
this.errorHandler = null;
|
|
1907
|
-
}
|
|
1908
|
-
}
|
|
1909
|
-
/**
|
|
1910
|
-
* Subscribe to be notified when a root becomes available.
|
|
1911
|
-
* Fires immediately if a root already exists.
|
|
1912
|
-
* @param {() => void} callback - Function called when first root registers
|
|
1913
|
-
* @returns {() => void} Unsubscribe function
|
|
1914
|
-
*/
|
|
1915
|
-
onRootReady(callback) {
|
|
1916
|
-
if (this.roots.size > 0) {
|
|
1917
|
-
callback();
|
|
1918
|
-
return () => {
|
|
1919
|
-
};
|
|
1920
|
-
}
|
|
1921
|
-
this.rootReadyCallbacks.add(callback);
|
|
1922
|
-
return () => this.rootReadyCallbacks.delete(callback);
|
|
1923
|
-
}
|
|
1924
|
-
/**
|
|
1925
|
-
* Notify all registered root-ready callbacks.
|
|
1926
|
-
* Called when the first root registers.
|
|
1927
|
-
* @returns {void}
|
|
1928
|
-
* @private
|
|
1929
|
-
*/
|
|
1930
|
-
notifyRootReady() {
|
|
1931
|
-
for (const cb of this.rootReadyCallbacks) {
|
|
1932
|
-
try {
|
|
1933
|
-
cb();
|
|
1934
|
-
} catch (error) {
|
|
1935
|
-
console.error("[Scheduler] Error in root-ready callback:", error);
|
|
1936
|
-
}
|
|
1937
|
-
}
|
|
1938
|
-
this.rootReadyCallbacks.clear();
|
|
1939
|
-
}
|
|
1940
|
-
/**
|
|
1941
|
-
* Ensure a default root exists for independent mode.
|
|
1942
|
-
* Creates a minimal root with no state provider.
|
|
1943
|
-
* @returns {void}
|
|
1944
|
-
* @private
|
|
1945
|
-
*/
|
|
1946
|
-
ensureDefaultRoot() {
|
|
1947
|
-
if (!this.roots.has("__default__")) {
|
|
1948
|
-
this.registerRoot("__default__");
|
|
1949
|
-
}
|
|
1950
|
-
}
|
|
1951
|
-
/**
|
|
1952
|
-
* Trigger error handling for job errors.
|
|
1953
|
-
* Uses the bound error handler if available, otherwise logs to console.
|
|
1954
|
-
* @param {Error} error - The error to handle
|
|
1955
|
-
* @returns {void}
|
|
1956
|
-
*/
|
|
1957
|
-
triggerError(error) {
|
|
1958
|
-
if (this.errorHandler) this.errorHandler(error);
|
|
1959
|
-
else console.error("[Scheduler]", error);
|
|
1960
|
-
}
|
|
1961
|
-
//* Phase Management Methods ================================
|
|
1962
|
-
/**
|
|
1963
|
-
* Add a named phase to the scheduler's execution order.
|
|
1964
|
-
* Marks all roots for rebuild to incorporate the new phase.
|
|
1965
|
-
* @param {string} name - The phase name (e.g., 'physics', 'postprocess')
|
|
1966
|
-
* @param {AddPhaseOptions} [options] - Positioning options (before/after other phases)
|
|
1967
|
-
* @returns {void}
|
|
1968
|
-
* @example
|
|
1969
|
-
* scheduler.addPhase('physics', { before: 'update' });
|
|
1970
|
-
* scheduler.addPhase('postprocess', { after: 'render' });
|
|
1971
|
-
*/
|
|
1972
|
-
addPhase(name, options) {
|
|
1973
|
-
this.phaseGraph.addPhase(name, options);
|
|
1974
|
-
for (const root of this.roots.values()) {
|
|
1975
|
-
root.needsRebuild = true;
|
|
1976
|
-
}
|
|
1977
|
-
}
|
|
1978
|
-
/**
|
|
1979
|
-
* Check if a phase exists in the scheduler.
|
|
1980
|
-
* @param {string} name - The phase name to check
|
|
1981
|
-
* @returns {boolean} True if the phase exists
|
|
1982
|
-
*/
|
|
1983
|
-
hasPhase(name) {
|
|
1984
|
-
return this.phaseGraph.hasPhase(name);
|
|
1985
|
-
}
|
|
1986
|
-
//* Global Job Registration Methods (Deprecated APIs) ================================
|
|
1987
|
-
/**
|
|
1988
|
-
* Register a global job that runs once per frame (not per-root).
|
|
1989
|
-
* Used internally by deprecated addEffect/addAfterEffect APIs.
|
|
1990
|
-
* @param {'before' | 'after'} phase - When to run: 'before' all roots or 'after' all roots
|
|
1991
|
-
* @param {string} id - Unique identifier for this global job
|
|
1992
|
-
* @param {(timestamp: number) => void} callback - Function called each frame with RAF timestamp
|
|
1993
|
-
* @returns {() => void} Unsubscribe function to remove this global job
|
|
1994
|
-
* @deprecated Use useFrame with phases instead
|
|
1995
|
-
*/
|
|
1996
|
-
registerGlobal(phase, id, callback) {
|
|
1997
|
-
const job = { id, callback };
|
|
1998
|
-
if (phase === "before") {
|
|
1999
|
-
this.globalBeforeJobs.set(id, job);
|
|
2000
|
-
} else {
|
|
2001
|
-
this.globalAfterJobs.set(id, job);
|
|
2002
|
-
}
|
|
2003
|
-
return () => {
|
|
2004
|
-
if (phase === "before") this.globalBeforeJobs.delete(id);
|
|
2005
|
-
else this.globalAfterJobs.delete(id);
|
|
2006
|
-
};
|
|
2007
|
-
}
|
|
2008
|
-
//* Idle Callback Methods (Deprecated API) ================================
|
|
2009
|
-
/**
|
|
2010
|
-
* Register an idle callback that fires when the loop stops.
|
|
2011
|
-
* Used internally by deprecated addTail API.
|
|
2012
|
-
* @param {(timestamp: number) => void} callback - Function called when loop becomes idle
|
|
2013
|
-
* @returns {() => void} Unsubscribe function to remove this idle callback
|
|
2014
|
-
* @deprecated Use demand mode with invalidate() instead
|
|
2015
|
-
*/
|
|
2016
|
-
onIdle(callback) {
|
|
2017
|
-
this.idleCallbacks.add(callback);
|
|
2018
|
-
return () => this.idleCallbacks.delete(callback);
|
|
2019
|
-
}
|
|
2020
|
-
/**
|
|
2021
|
-
* Notify all registered idle callbacks.
|
|
2022
|
-
* Called when the loop stops in demand mode.
|
|
2023
|
-
* @param {number} timestamp - The RAF timestamp when idle occurred
|
|
2024
|
-
* @returns {void}
|
|
2025
|
-
* @private
|
|
2026
|
-
*/
|
|
2027
|
-
notifyIdle(timestamp) {
|
|
2028
|
-
for (const cb of this.idleCallbacks) {
|
|
2029
|
-
try {
|
|
2030
|
-
cb(timestamp);
|
|
2031
|
-
} catch (error) {
|
|
2032
|
-
console.error("[Scheduler] Error in idle callback:", error);
|
|
2033
|
-
}
|
|
2034
|
-
}
|
|
2035
|
-
}
|
|
2036
|
-
//* Job Registration & Management Methods ================================
|
|
2037
|
-
/**
|
|
2038
|
-
* Register a job (frame callback) with a specific root.
|
|
2039
|
-
* This is the core registration method used by useFrame internally.
|
|
2040
|
-
* @param {FrameNextCallback} callback - The function to call each frame
|
|
2041
|
-
* @param {JobOptions & { rootId?: string; system?: boolean }} [options] - Job configuration
|
|
2042
|
-
* @param {string} [options.rootId] - Target root ID (defaults to first registered root)
|
|
2043
|
-
* @param {string} [options.id] - Unique job ID (auto-generated if not provided)
|
|
2044
|
-
* @param {string} [options.phase] - Execution phase (defaults to 'update')
|
|
2045
|
-
* @param {number} [options.priority] - Priority within phase (higher = earlier, default 0)
|
|
2046
|
-
* @param {number} [options.fps] - FPS throttle limit
|
|
2047
|
-
* @param {boolean} [options.drop] - Drop frames when behind (default true)
|
|
2048
|
-
* @param {boolean} [options.enabled] - Whether job is active (default true)
|
|
2049
|
-
* @param {boolean} [options.system] - Internal flag for system jobs (not user-facing)
|
|
2050
|
-
* @returns {() => void} Unsubscribe function to remove this job
|
|
2051
|
-
*/
|
|
2052
|
-
register(callback, options = {}) {
|
|
2053
|
-
const rootId = options.rootId;
|
|
2054
|
-
const root = rootId ? this.roots.get(rootId) : this.roots.values().next().value;
|
|
2055
|
-
if (!root) {
|
|
2056
|
-
console.warn("[Scheduler] No root registered. Is this inside a Canvas?");
|
|
2057
|
-
return () => {
|
|
2058
|
-
};
|
|
2059
|
-
}
|
|
2060
|
-
const id = options.id ?? this.generateJobId();
|
|
2061
|
-
let phase = options.phase ?? "update";
|
|
2062
|
-
if (!options.phase && (options.before || options.after)) {
|
|
2063
|
-
phase = this.phaseGraph.resolveConstraintPhase(options.before, options.after);
|
|
2064
|
-
}
|
|
2065
|
-
const before = this.normalizeConstraints(options.before);
|
|
2066
|
-
const after = this.normalizeConstraints(options.after);
|
|
2067
|
-
const job = {
|
|
2068
|
-
id,
|
|
2069
|
-
callback,
|
|
2070
|
-
phase,
|
|
2071
|
-
before,
|
|
2072
|
-
after,
|
|
2073
|
-
priority: options.priority ?? 0,
|
|
2074
|
-
index: this.nextJobIndex++,
|
|
2075
|
-
fps: options.fps,
|
|
2076
|
-
drop: options.drop ?? true,
|
|
2077
|
-
enabled: options.enabled ?? true,
|
|
2078
|
-
system: options.system ?? false
|
|
2079
|
-
};
|
|
2080
|
-
if (root.jobs.has(id)) {
|
|
2081
|
-
console.warn(`[useFrame] Job with id "${id}" already exists, replacing`);
|
|
2082
|
-
}
|
|
2083
|
-
root.jobs.set(id, job);
|
|
2084
|
-
root.needsRebuild = true;
|
|
2085
|
-
return () => this.unregister(id, root.id);
|
|
2086
|
-
}
|
|
2087
|
-
/**
|
|
2088
|
-
* Unregister a job by its ID.
|
|
2089
|
-
* Searches all roots if rootId is not provided.
|
|
2090
|
-
* @param {string} id - The job ID to unregister
|
|
2091
|
-
* @param {string} [rootId] - Optional root ID to search (searches all if not provided)
|
|
2092
|
-
* @returns {void}
|
|
2093
|
-
*/
|
|
2094
|
-
unregister(id, rootId) {
|
|
2095
|
-
const root = rootId ? this.roots.get(rootId) : Array.from(this.roots.values()).find((r) => r.jobs.has(id));
|
|
2096
|
-
if (root?.jobs.delete(id)) {
|
|
2097
|
-
root.needsRebuild = true;
|
|
2098
|
-
this.jobStateListeners.delete(id);
|
|
2099
|
-
}
|
|
2100
|
-
}
|
|
2101
|
-
/**
|
|
2102
|
-
* Update a job's options dynamically.
|
|
2103
|
-
* Searches all roots to find the job by ID.
|
|
2104
|
-
* Phase/constraint changes trigger a rebuild of the sorted job list.
|
|
2105
|
-
* @param {string} id - The job ID to update
|
|
2106
|
-
* @param {Partial<JobOptions>} options - The options to update
|
|
2107
|
-
* @returns {void}
|
|
2108
|
-
*/
|
|
2109
|
-
updateJob(id, options) {
|
|
2110
|
-
let job;
|
|
2111
|
-
let root;
|
|
2112
|
-
for (const r of this.roots.values()) {
|
|
2113
|
-
job = r.jobs.get(id);
|
|
2114
|
-
if (job) {
|
|
2115
|
-
root = r;
|
|
2116
|
-
break;
|
|
2117
|
-
}
|
|
2118
|
-
}
|
|
2119
|
-
if (!job || !root) return;
|
|
2120
|
-
if (options.priority !== void 0) job.priority = options.priority;
|
|
2121
|
-
if (options.fps !== void 0) job.fps = options.fps;
|
|
2122
|
-
if (options.drop !== void 0) job.drop = options.drop;
|
|
2123
|
-
if (options.enabled !== void 0) {
|
|
2124
|
-
const wasEnabled = job.enabled;
|
|
2125
|
-
job.enabled = options.enabled;
|
|
2126
|
-
if (!wasEnabled && job.enabled) resetJobTiming(job);
|
|
2127
|
-
if (wasEnabled !== job.enabled) root.needsRebuild = true;
|
|
2128
|
-
}
|
|
2129
|
-
if (options.phase !== void 0 || options.before !== void 0 || options.after !== void 0) {
|
|
2130
|
-
if (options.phase) job.phase = options.phase;
|
|
2131
|
-
if (options.before !== void 0) job.before = this.normalizeConstraints(options.before);
|
|
2132
|
-
if (options.after !== void 0) job.after = this.normalizeConstraints(options.after);
|
|
2133
|
-
root.needsRebuild = true;
|
|
2134
|
-
}
|
|
2135
|
-
}
|
|
2136
|
-
//* Job State Management Methods ================================
|
|
2137
|
-
/**
|
|
2138
|
-
* Check if a job is currently paused (disabled).
|
|
2139
|
-
* @param {string} id - The job ID to check
|
|
2140
|
-
* @returns {boolean} True if the job exists and is paused
|
|
2141
|
-
*/
|
|
2142
|
-
isJobPaused(id) {
|
|
2143
|
-
for (const root of this.roots.values()) {
|
|
2144
|
-
const job = root.jobs.get(id);
|
|
2145
|
-
if (job) return !job.enabled;
|
|
2146
|
-
}
|
|
2147
|
-
return false;
|
|
2148
|
-
}
|
|
2149
|
-
/**
|
|
2150
|
-
* Subscribe to state changes for a specific job.
|
|
2151
|
-
* Listener is called when job is paused or resumed.
|
|
2152
|
-
* @param {string} id - The job ID to subscribe to
|
|
2153
|
-
* @param {() => void} listener - Callback invoked on state changes
|
|
2154
|
-
* @returns {() => void} Unsubscribe function
|
|
2155
|
-
*/
|
|
2156
|
-
subscribeJobState(id, listener) {
|
|
2157
|
-
if (!this.jobStateListeners.has(id)) {
|
|
2158
|
-
this.jobStateListeners.set(id, /* @__PURE__ */ new Set());
|
|
2159
|
-
}
|
|
2160
|
-
this.jobStateListeners.get(id).add(listener);
|
|
2161
|
-
return () => {
|
|
2162
|
-
this.jobStateListeners.get(id)?.delete(listener);
|
|
2163
|
-
if (this.jobStateListeners.get(id)?.size === 0) {
|
|
2164
|
-
this.jobStateListeners.delete(id);
|
|
2165
|
-
}
|
|
2166
|
-
};
|
|
2167
|
-
}
|
|
2168
|
-
/**
|
|
2169
|
-
* Notify all listeners that a job's state has changed.
|
|
2170
|
-
* @param {string} id - The job ID that changed
|
|
2171
|
-
* @returns {void}
|
|
2172
|
-
* @private
|
|
2173
|
-
*/
|
|
2174
|
-
notifyJobStateChange(id) {
|
|
2175
|
-
this.jobStateListeners.get(id)?.forEach((listener) => listener());
|
|
2176
|
-
}
|
|
2177
|
-
/**
|
|
2178
|
-
* Pause a job by ID (sets enabled=false).
|
|
2179
|
-
* Notifies any subscribed state listeners.
|
|
2180
|
-
* @param {string} id - The job ID to pause
|
|
2181
|
-
* @returns {void}
|
|
2182
|
-
*/
|
|
2183
|
-
pauseJob(id) {
|
|
2184
|
-
this.updateJob(id, { enabled: false });
|
|
2185
|
-
this.notifyJobStateChange(id);
|
|
2186
|
-
}
|
|
2187
|
-
/**
|
|
2188
|
-
* Resume a paused job by ID (sets enabled=true).
|
|
2189
|
-
* Resets job timing to prevent frame accumulation.
|
|
2190
|
-
* Notifies any subscribed state listeners.
|
|
2191
|
-
* @param {string} id - The job ID to resume
|
|
2192
|
-
* @returns {void}
|
|
2193
|
-
*/
|
|
2194
|
-
resumeJob(id) {
|
|
2195
|
-
this.updateJob(id, { enabled: true });
|
|
2196
|
-
this.notifyJobStateChange(id);
|
|
2197
|
-
}
|
|
2198
|
-
//* Frame Loop Control Methods ================================
|
|
2199
|
-
/**
|
|
2200
|
-
* Start the requestAnimationFrame loop.
|
|
2201
|
-
* Resets timing state (elapsedTime, frameCount) on start.
|
|
2202
|
-
* No-op if already running.
|
|
2203
|
-
* @returns {void}
|
|
2204
|
-
*/
|
|
2205
|
-
start() {
|
|
2206
|
-
if (this.loopState.running) return;
|
|
2207
|
-
const { elapsedTime, createdAt } = this.loopState;
|
|
2208
|
-
let adjustedCreated = 0;
|
|
2209
|
-
if (this.stoppedTime > 0) {
|
|
2210
|
-
adjustedCreated = createdAt - (performance.now() - this.stoppedTime);
|
|
2211
|
-
this.stoppedTime = 0;
|
|
2212
|
-
}
|
|
2213
|
-
Object.assign(this.loopState, {
|
|
2214
|
-
running: true,
|
|
2215
|
-
elapsedTime: elapsedTime ?? 0,
|
|
2216
|
-
lastTime: performance.now(),
|
|
2217
|
-
createdAt: adjustedCreated > 0 ? adjustedCreated : performance.now(),
|
|
2218
|
-
frameCount: 0,
|
|
2219
|
-
rafHandle: requestAnimationFrame(this.loop)
|
|
2220
|
-
});
|
|
2221
|
-
}
|
|
2222
|
-
/**
|
|
2223
|
-
* Stop the requestAnimationFrame loop.
|
|
2224
|
-
* Cancels any pending RAF callback.
|
|
2225
|
-
* No-op if not running.
|
|
2226
|
-
* @returns {void}
|
|
2227
|
-
*/
|
|
2228
|
-
stop() {
|
|
2229
|
-
if (!this.loopState.running) return;
|
|
2230
|
-
this.loopState.running = false;
|
|
2231
|
-
if (this.loopState.rafHandle !== null) {
|
|
2232
|
-
cancelAnimationFrame(this.loopState.rafHandle);
|
|
2233
|
-
this.loopState.rafHandle = null;
|
|
2234
|
-
}
|
|
2235
|
-
this.stoppedTime = performance.now();
|
|
2236
|
-
}
|
|
2237
|
-
/**
|
|
2238
|
-
* Request frames to be rendered in demand mode.
|
|
2239
|
-
* Accumulates pending frames (capped at 60) and starts the loop if not running.
|
|
2240
|
-
* No-op if frameloop is not 'demand'.
|
|
2241
|
-
* @param {number} [frames=1] - Number of frames to request
|
|
2242
|
-
* @param {boolean} [stackFrames=false] - Whether to add frames to existing pending count
|
|
2243
|
-
* - `false` (default): Sets pending frames to the specified value (replaces existing count)
|
|
2244
|
-
* - `true`: Adds frames to existing pending count (useful for accumulating invalidations)
|
|
2245
|
-
* @returns {void}
|
|
2246
|
-
* @example
|
|
2247
|
-
* // Request a single frame render
|
|
2248
|
-
* scheduler.invalidate();
|
|
2249
|
-
*
|
|
2250
|
-
* @example
|
|
2251
|
-
* // Request 5 frames (e.g., for animations)
|
|
2252
|
-
* scheduler.invalidate(5);
|
|
2253
|
-
*
|
|
2254
|
-
* @example
|
|
2255
|
-
* // Set pending frames to exactly 3 (don't stack with existing)
|
|
2256
|
-
* scheduler.invalidate(3, false);
|
|
2257
|
-
*
|
|
2258
|
-
* @example
|
|
2259
|
-
* // Add 2 more frames to existing pending count
|
|
2260
|
-
* scheduler.invalidate(2, true);
|
|
2261
|
-
*/
|
|
2262
|
-
invalidate(frames = 1, stackFrames = false) {
|
|
2263
|
-
if (this._frameloop !== "demand") return;
|
|
2264
|
-
const baseFrames = stackFrames ? this.pendingFrames : 0;
|
|
2265
|
-
this.pendingFrames = Math.min(60, baseFrames + frames);
|
|
2266
|
-
if (!this.loopState.running && this.pendingFrames > 0) this.start();
|
|
2267
|
-
}
|
|
2268
|
-
/**
|
|
2269
|
-
* Reset timing state for deterministic testing.
|
|
2270
|
-
* Preserves jobs and roots but resets lastTime, frameCount, elapsedTime, etc.
|
|
2271
|
-
* @returns {void}
|
|
2272
|
-
*/
|
|
2273
|
-
resetTiming() {
|
|
2274
|
-
this.loopState.lastTime = null;
|
|
2275
|
-
this.loopState.frameCount = 0;
|
|
2276
|
-
this.loopState.elapsedTime = 0;
|
|
2277
|
-
this.loopState.createdAt = performance.now();
|
|
2278
|
-
}
|
|
2279
|
-
//* Manual Stepping Methods ================================
|
|
2280
|
-
/**
|
|
2281
|
-
* Manually execute a single frame for all roots.
|
|
2282
|
-
* Useful for frameloop='never' mode or testing scenarios.
|
|
2283
|
-
* @param {number} [timestamp] - Optional timestamp (defaults to performance.now())
|
|
2284
|
-
* @returns {void}
|
|
2285
|
-
* @example
|
|
2286
|
-
* // Manual control mode
|
|
2287
|
-
* scheduler.frameloop = 'never';
|
|
2288
|
-
* scheduler.step(); // Execute one frame
|
|
2289
|
-
*/
|
|
2290
|
-
step(timestamp) {
|
|
2291
|
-
const now = timestamp ?? performance.now();
|
|
2292
|
-
this.executeFrame(now);
|
|
2293
|
-
}
|
|
2294
|
-
/**
|
|
2295
|
-
* Manually execute a single job by its ID.
|
|
2296
|
-
* Useful for testing individual job callbacks in isolation.
|
|
2297
|
-
* @param {string} id - The job ID to step
|
|
2298
|
-
* @param {number} [timestamp] - Optional timestamp (defaults to performance.now())
|
|
2299
|
-
* @returns {void}
|
|
2300
|
-
*/
|
|
2301
|
-
stepJob(id, timestamp) {
|
|
2302
|
-
let job;
|
|
2303
|
-
let root;
|
|
2304
|
-
for (const r of this.roots.values()) {
|
|
2305
|
-
job = r.jobs.get(id);
|
|
2306
|
-
if (job) {
|
|
2307
|
-
root = r;
|
|
2308
|
-
break;
|
|
2309
|
-
}
|
|
2310
|
-
}
|
|
2311
|
-
if (!job || !root) {
|
|
2312
|
-
console.warn(`[Scheduler] Job "${id}" not found`);
|
|
2313
|
-
return;
|
|
2314
|
-
}
|
|
2315
|
-
const now = timestamp ?? performance.now();
|
|
2316
|
-
const deltaMs = this.loopState.lastTime !== null ? now - this.loopState.lastTime : 0;
|
|
2317
|
-
const delta = deltaMs / 1e3;
|
|
2318
|
-
const elapsed = now - this.loopState.createdAt;
|
|
2319
|
-
const providedState = root.getState?.() ?? {};
|
|
2320
|
-
const frameState = {
|
|
2321
|
-
...providedState,
|
|
2322
|
-
time: now,
|
|
2323
|
-
delta,
|
|
2324
|
-
elapsed,
|
|
2325
|
-
frame: this.loopState.frameCount
|
|
2326
|
-
};
|
|
2327
|
-
try {
|
|
2328
|
-
job.callback(frameState, delta);
|
|
2329
|
-
} catch (error) {
|
|
2330
|
-
console.error(`[Scheduler] Error in job "${job.id}":`, error);
|
|
2331
|
-
this.triggerError(error instanceof Error ? error : new Error(String(error)));
|
|
2332
|
-
}
|
|
2333
|
-
}
|
|
2334
|
-
/**
|
|
2335
|
-
* Execute a single frame across all roots.
|
|
2336
|
-
* Order: globalBefore → each root's jobs → globalAfter
|
|
2337
|
-
* @param {number} timestamp - RAF timestamp in milliseconds
|
|
2338
|
-
* @returns {void}
|
|
2339
|
-
* @private
|
|
2340
|
-
*/
|
|
2341
|
-
executeFrame(timestamp) {
|
|
2342
|
-
const deltaMs = this.loopState.lastTime !== null ? timestamp - this.loopState.lastTime : 0;
|
|
2343
|
-
const delta = deltaMs / 1e3;
|
|
2344
|
-
this.loopState.lastTime = timestamp;
|
|
2345
|
-
this.loopState.frameCount++;
|
|
2346
|
-
this.loopState.elapsedTime += deltaMs;
|
|
2347
|
-
this.runGlobalJobs(this.globalBeforeJobs, timestamp);
|
|
2348
|
-
for (const root of this.roots.values()) {
|
|
2349
|
-
this.tickRoot(root, timestamp, delta);
|
|
2350
|
-
}
|
|
2351
|
-
this.runGlobalJobs(this.globalAfterJobs, timestamp);
|
|
2352
|
-
}
|
|
2353
|
-
/**
|
|
2354
|
-
* Run all global jobs from a job map.
|
|
2355
|
-
* Catches and logs errors without stopping execution.
|
|
2356
|
-
* @param {Map<string, GlobalJob>} jobs - The global jobs map to execute
|
|
2357
|
-
* @param {number} timestamp - RAF timestamp in milliseconds
|
|
2358
|
-
* @returns {void}
|
|
2359
|
-
* @private
|
|
2360
|
-
*/
|
|
2361
|
-
runGlobalJobs(jobs, timestamp) {
|
|
2362
|
-
for (const job of jobs.values()) {
|
|
2363
|
-
try {
|
|
2364
|
-
job.callback(timestamp);
|
|
2365
|
-
} catch (error) {
|
|
2366
|
-
console.error(`[Scheduler] Error in global job "${job.id}":`, error);
|
|
2367
|
-
}
|
|
2368
|
-
}
|
|
2369
|
-
}
|
|
2370
|
-
/**
|
|
2371
|
-
* Execute all jobs for a single root in sorted order.
|
|
2372
|
-
* Rebuilds sorted job list if needed, then dispatches each job.
|
|
2373
|
-
* Errors are caught and propagated via triggerError.
|
|
2374
|
-
* @param {RootEntry} root - The root entry to tick
|
|
2375
|
-
* @param {number} timestamp - RAF timestamp in milliseconds
|
|
2376
|
-
* @param {number} delta - Time since last frame in seconds
|
|
2377
|
-
* @returns {void}
|
|
2378
|
-
* @private
|
|
2379
|
-
*/
|
|
2380
|
-
tickRoot(root, timestamp, delta) {
|
|
2381
|
-
if (root.needsRebuild) {
|
|
2382
|
-
root.sortedJobs = rebuildSortedJobs(root.jobs, this.phaseGraph);
|
|
2383
|
-
root.needsRebuild = false;
|
|
2384
|
-
}
|
|
2385
|
-
const providedState = root.getState?.() ?? {};
|
|
2386
|
-
const frameState = {
|
|
2387
|
-
...providedState,
|
|
2388
|
-
time: timestamp,
|
|
2389
|
-
delta,
|
|
2390
|
-
elapsed: this.loopState.elapsedTime / 1e3,
|
|
2391
|
-
// Convert ms to seconds
|
|
2392
|
-
frame: this.loopState.frameCount
|
|
2393
|
-
};
|
|
2394
|
-
for (const job of root.sortedJobs) {
|
|
2395
|
-
if (!shouldRun(job, timestamp)) continue;
|
|
2396
|
-
try {
|
|
2397
|
-
job.callback(frameState, delta);
|
|
2398
|
-
} catch (error) {
|
|
2399
|
-
console.error(`[Scheduler] Error in job "${job.id}":`, error);
|
|
2400
|
-
this.triggerError(error instanceof Error ? error : new Error(String(error)));
|
|
2401
|
-
}
|
|
2402
|
-
}
|
|
2403
|
-
}
|
|
2404
|
-
//* Debug & Inspection Methods ================================
|
|
2405
|
-
/**
|
|
2406
|
-
* Get the total number of registered jobs across all roots.
|
|
2407
|
-
* Includes both per-root jobs and global before/after jobs.
|
|
2408
|
-
* @returns {number} Total job count
|
|
2409
|
-
*/
|
|
2410
|
-
getJobCount() {
|
|
2411
|
-
let count = 0;
|
|
2412
|
-
for (const root of this.roots.values()) {
|
|
2413
|
-
count += root.jobs.size;
|
|
2414
|
-
}
|
|
2415
|
-
return count + this.globalBeforeJobs.size + this.globalAfterJobs.size;
|
|
2416
|
-
}
|
|
2417
|
-
/**
|
|
2418
|
-
* Get all registered job IDs across all roots.
|
|
2419
|
-
* Includes both per-root jobs and global before/after jobs.
|
|
2420
|
-
* @returns {string[]} Array of all job IDs
|
|
2421
|
-
*/
|
|
2422
|
-
getJobIds() {
|
|
2423
|
-
const ids = [];
|
|
2424
|
-
for (const root of this.roots.values()) {
|
|
2425
|
-
ids.push(...root.jobs.keys());
|
|
2426
|
-
}
|
|
2427
|
-
ids.push(...this.globalBeforeJobs.keys());
|
|
2428
|
-
ids.push(...this.globalAfterJobs.keys());
|
|
2429
|
-
return ids;
|
|
2430
|
-
}
|
|
2431
|
-
/**
|
|
2432
|
-
* Get the number of registered roots (Canvas instances).
|
|
2433
|
-
* @returns {number} Number of registered roots
|
|
2434
|
-
*/
|
|
2435
|
-
getRootCount() {
|
|
2436
|
-
return this.roots.size;
|
|
2437
|
-
}
|
|
2438
|
-
/**
|
|
2439
|
-
* Check if any user (non-system) jobs are registered in a specific phase.
|
|
2440
|
-
* Used by the default render job to know if a user has taken over rendering.
|
|
2441
|
-
*
|
|
2442
|
-
* @param phase The phase to check
|
|
2443
|
-
* @param rootId Optional root ID to check (checks all roots if not provided)
|
|
2444
|
-
* @returns true if any user jobs exist in the phase
|
|
2445
|
-
*/
|
|
2446
|
-
hasUserJobsInPhase(phase, rootId) {
|
|
2447
|
-
const rootsToCheck = rootId ? [this.roots.get(rootId)].filter(Boolean) : Array.from(this.roots.values());
|
|
2448
|
-
return rootsToCheck.some((root) => {
|
|
2449
|
-
if (!root) return false;
|
|
2450
|
-
for (const job of root.jobs.values()) {
|
|
2451
|
-
if (job.phase === phase && !job.system && job.enabled) return true;
|
|
2452
|
-
}
|
|
2453
|
-
return false;
|
|
2454
|
-
});
|
|
2455
|
-
}
|
|
2456
|
-
//* Utility Methods ================================
|
|
2457
|
-
/**
|
|
2458
|
-
* Generate a unique root ID for automatic root registration.
|
|
2459
|
-
* @returns {string} A unique root ID in the format 'root_N'
|
|
2460
|
-
*/
|
|
2461
|
-
generateRootId() {
|
|
2462
|
-
return `root_${this.nextRootIndex++}`;
|
|
2463
|
-
}
|
|
2464
|
-
/**
|
|
2465
|
-
* Generate a unique job ID.
|
|
2466
|
-
* @returns {string} A unique job ID in the format 'job_N'
|
|
2467
|
-
* @private
|
|
2468
|
-
*/
|
|
2469
|
-
generateJobId() {
|
|
2470
|
-
return `job_${this.nextJobIndex}`;
|
|
2471
|
-
}
|
|
2472
|
-
/**
|
|
2473
|
-
* Normalize before/after constraints to a Set.
|
|
2474
|
-
* Handles undefined, single string, or array inputs.
|
|
2475
|
-
* @param {string | string[] | undefined} value - The constraint value(s)
|
|
2476
|
-
* @returns {Set<string>} Normalized Set of constraint strings
|
|
2477
|
-
* @private
|
|
2478
|
-
*/
|
|
2479
|
-
normalizeConstraints(value) {
|
|
2480
|
-
if (!value) return /* @__PURE__ */ new Set();
|
|
2481
|
-
if (Array.isArray(value)) return new Set(value);
|
|
2482
|
-
return /* @__PURE__ */ new Set([value]);
|
|
2483
|
-
}
|
|
2484
|
-
};
|
|
2485
|
-
//* Static State & Methods (Singleton Usage) ================================
|
|
2486
|
-
//* Cross-Bundle Singleton Key ==============================
|
|
2487
|
-
// Use Symbol.for() to ensure scheduler is shared across bundle boundaries
|
|
2488
|
-
// This prevents issues when mixing imports from @react-three/fiber and @react-three/fiber/webgpu
|
|
2489
|
-
__publicField$1(_Scheduler, "INSTANCE_KEY", Symbol.for("@react-three/fiber.scheduler"));
|
|
2490
|
-
let Scheduler = _Scheduler;
|
|
2491
|
-
const getScheduler = () => Scheduler.get();
|
|
2492
|
-
if (hmrData) {
|
|
2493
|
-
hmrData.accept?.();
|
|
1675
|
+
const INTERNAL_LIB_MARKERS = ["zustand", "setState", "Object.assign"];
|
|
1676
|
+
const INTERNAL_FIBER_MARKERS = ["packages/fiber/src", "packages/fiber/dist", "@react-three/fiber", "@react-three_fiber"];
|
|
1677
|
+
function isInternalRendererAccess(stack, callerDepth = 2) {
|
|
1678
|
+
if (!stack) return false;
|
|
1679
|
+
const caller = stack.split("\n")[callerDepth] ?? "";
|
|
1680
|
+
return INTERNAL_LIB_MARKERS.some((m) => caller.includes(m)) || INTERNAL_FIBER_MARKERS.some((m) => caller.includes(m));
|
|
2494
1681
|
}
|
|
2495
1682
|
|
|
2496
1683
|
const R3F_CONTEXT = Symbol.for("@react-three/fiber.context");
|
|
@@ -2530,7 +1717,14 @@ const createStore = (invalidate, advance) => {
|
|
|
2530
1717
|
frustum: new webgpu.Frustum(),
|
|
2531
1718
|
autoUpdateFrustum: true,
|
|
2532
1719
|
raycaster: null,
|
|
2533
|
-
events: {
|
|
1720
|
+
events: {
|
|
1721
|
+
priority: 1,
|
|
1722
|
+
enabled: true,
|
|
1723
|
+
connected: false,
|
|
1724
|
+
frameTimedRaycasts: true,
|
|
1725
|
+
alwaysFireOnScroll: true,
|
|
1726
|
+
updateOnFrame: false
|
|
1727
|
+
},
|
|
2534
1728
|
scene: null,
|
|
2535
1729
|
rootScene: null,
|
|
2536
1730
|
xr: null,
|
|
@@ -2595,7 +1789,7 @@ const createStore = (invalidate, advance) => {
|
|
|
2595
1789
|
size: newSize,
|
|
2596
1790
|
viewport: { ...s.viewport, ...getCurrentViewport(state2.camera, defaultTarget, newSize) }
|
|
2597
1791
|
}));
|
|
2598
|
-
getScheduler().invalidate();
|
|
1792
|
+
scheduler.getScheduler().invalidate();
|
|
2599
1793
|
}
|
|
2600
1794
|
}
|
|
2601
1795
|
return;
|
|
@@ -2610,7 +1804,7 @@ const createStore = (invalidate, advance) => {
|
|
|
2610
1804
|
viewport: { ...s.viewport, ...getCurrentViewport(state2.camera, defaultTarget, size) },
|
|
2611
1805
|
_sizeImperative: true
|
|
2612
1806
|
}));
|
|
2613
|
-
getScheduler().invalidate();
|
|
1807
|
+
scheduler.getScheduler().invalidate();
|
|
2614
1808
|
},
|
|
2615
1809
|
setDpr: (dpr) => set((state2) => {
|
|
2616
1810
|
const resolved = calculateDpr(dpr);
|
|
@@ -2621,11 +1815,14 @@ const createStore = (invalidate, advance) => {
|
|
|
2621
1815
|
},
|
|
2622
1816
|
setError: (error) => set(() => ({ error })),
|
|
2623
1817
|
error: null,
|
|
2624
|
-
//* TSL State (managed via hooks: useUniforms, useNodes, useTextures,
|
|
1818
|
+
//* TSL State (managed via hooks: useUniforms, useNodes, useBuffers, useGPUStorage, useTextures, useRenderPipeline) ==============================
|
|
2625
1819
|
uniforms: {},
|
|
2626
1820
|
nodes: {},
|
|
1821
|
+
buffers: {},
|
|
1822
|
+
gpuStorage: {},
|
|
2627
1823
|
textures: /* @__PURE__ */ new Map(),
|
|
2628
|
-
|
|
1824
|
+
_textureRefs: /* @__PURE__ */ new Map(),
|
|
1825
|
+
renderPipeline: null,
|
|
2629
1826
|
passes: {},
|
|
2630
1827
|
_hmrVersion: 0,
|
|
2631
1828
|
_sizeImperative: false,
|
|
@@ -2634,12 +1831,16 @@ const createStore = (invalidate, advance) => {
|
|
|
2634
1831
|
internal: {
|
|
2635
1832
|
// Events
|
|
2636
1833
|
interaction: [],
|
|
2637
|
-
hovered: /* @__PURE__ */ new Map(),
|
|
2638
1834
|
subscribers: [],
|
|
1835
|
+
// Per-pointer state (new unified structure)
|
|
1836
|
+
pointerMap: /* @__PURE__ */ new Map(),
|
|
1837
|
+
pointerDirty: /* @__PURE__ */ new Map(),
|
|
1838
|
+
lastEvent: React__namespace.createRef(),
|
|
1839
|
+
// Deprecated but kept for backwards compatibility
|
|
1840
|
+
hovered: /* @__PURE__ */ new Map(),
|
|
2639
1841
|
initialClick: [0, 0],
|
|
2640
1842
|
initialHits: [],
|
|
2641
1843
|
capturedMap: /* @__PURE__ */ new Map(),
|
|
2642
|
-
lastEvent: React__namespace.createRef(),
|
|
2643
1844
|
// Visibility tracking (onFramed, onOccluded, onVisible)
|
|
2644
1845
|
visibilityRegistry: /* @__PURE__ */ new Map(),
|
|
2645
1846
|
// Occlusion system (WebGPU only)
|
|
@@ -2678,8 +1879,7 @@ const createStore = (invalidate, advance) => {
|
|
|
2678
1879
|
const currentState = rootStore.getState();
|
|
2679
1880
|
if (!currentState.isLegacy && currentState.internal.actualRenderer) {
|
|
2680
1881
|
const stack = new Error().stack || "";
|
|
2681
|
-
|
|
2682
|
-
if (!isInternalAccess) {
|
|
1882
|
+
if (!isInternalRendererAccess(stack)) {
|
|
2683
1883
|
const cleanedStack = stack.split("\n").slice(2).join("\n") || "Stack trace unavailable";
|
|
2684
1884
|
notifyDepreciated({
|
|
2685
1885
|
heading: "Accessing state.gl in WebGPU mode",
|
|
@@ -2727,14 +1927,16 @@ const createStore = (invalidate, advance) => {
|
|
|
2727
1927
|
oldSize = size;
|
|
2728
1928
|
oldDpr = viewport.dpr;
|
|
2729
1929
|
updateCamera(camera, size);
|
|
2730
|
-
if (canvasTarget) {
|
|
1930
|
+
if (internal.isSecondary && canvasTarget) {
|
|
2731
1931
|
if (viewport.dpr > 0) canvasTarget.setPixelRatio(viewport.dpr);
|
|
2732
|
-
|
|
2733
|
-
canvasTarget.setSize(size.width, size.height, updateStyle);
|
|
1932
|
+
canvasTarget.setSize(size.width, size.height, false);
|
|
2734
1933
|
} else {
|
|
2735
1934
|
if (viewport.dpr > 0) actualRenderer.setPixelRatio(viewport.dpr);
|
|
2736
|
-
|
|
2737
|
-
|
|
1935
|
+
actualRenderer.setSize(size.width, size.height, false);
|
|
1936
|
+
if (canvasTarget) {
|
|
1937
|
+
if (viewport.dpr > 0) canvasTarget.setPixelRatio(viewport.dpr);
|
|
1938
|
+
canvasTarget.setSize(size.width, size.height, false);
|
|
1939
|
+
}
|
|
2738
1940
|
}
|
|
2739
1941
|
}
|
|
2740
1942
|
if (camera !== oldCamera) {
|
|
@@ -2790,26 +1992,32 @@ function loadingFn(extensions, onProgress) {
|
|
|
2790
1992
|
);
|
|
2791
1993
|
};
|
|
2792
1994
|
}
|
|
2793
|
-
function useLoader(loader, input, extensions, onProgress) {
|
|
2794
|
-
const
|
|
1995
|
+
function useLoader(loader, input, extensions, onProgress, cacheKey) {
|
|
1996
|
+
const inputs = Array.isArray(input) ? input : [input];
|
|
1997
|
+
const cacheKeys = Array.isArray(cacheKey ?? input) ? cacheKey ?? input : [cacheKey ?? input];
|
|
2795
1998
|
const fn = loadingFn(extensions, onProgress);
|
|
2796
|
-
const results =
|
|
1999
|
+
const results = cacheKeys.map(
|
|
2000
|
+
(key, index) => suspendReact.suspend(() => fn(loader, inputs[index]), [loader, key], { equal: is.equ })
|
|
2001
|
+
);
|
|
2797
2002
|
return Array.isArray(input) ? results : results[0];
|
|
2798
2003
|
}
|
|
2799
|
-
useLoader.preload = function(loader, input, extensions, onProgress) {
|
|
2800
|
-
const
|
|
2801
|
-
|
|
2004
|
+
useLoader.preload = function(loader, input, extensions, onProgress, cacheKey) {
|
|
2005
|
+
const inputs = Array.isArray(input) ? input : [input];
|
|
2006
|
+
const cacheKeys = Array.isArray(cacheKey ?? input) ? cacheKey ?? input : [cacheKey ?? input];
|
|
2007
|
+
cacheKeys.forEach(
|
|
2008
|
+
(key, index) => suspendReact.preload(() => loadingFn(extensions, onProgress)(loader, inputs[index]), [loader, key])
|
|
2009
|
+
);
|
|
2802
2010
|
};
|
|
2803
|
-
useLoader.clear = function(loader, input) {
|
|
2804
|
-
const
|
|
2805
|
-
|
|
2011
|
+
useLoader.clear = function(loader, input, cacheKey) {
|
|
2012
|
+
const cacheKeys = Array.isArray(cacheKey ?? input) ? cacheKey ?? input : [cacheKey ?? input];
|
|
2013
|
+
cacheKeys.forEach((key) => suspendReact.clear([loader, key]));
|
|
2806
2014
|
};
|
|
2807
2015
|
useLoader.loader = getLoader;
|
|
2808
2016
|
|
|
2809
2017
|
function useFrame(callback, priorityOrOptions) {
|
|
2810
2018
|
const store = React__namespace.useContext(context);
|
|
2811
2019
|
const isInsideCanvas = store !== null;
|
|
2812
|
-
const scheduler = getScheduler();
|
|
2020
|
+
const scheduler$1 = scheduler.getScheduler();
|
|
2813
2021
|
const optionsKey = typeof priorityOrOptions === "number" ? `p:${priorityOrOptions}` : priorityOrOptions ? JSON.stringify({
|
|
2814
2022
|
id: priorityOrOptions.id,
|
|
2815
2023
|
phase: priorityOrOptions.phase,
|
|
@@ -2857,7 +2065,7 @@ function useFrame(callback, priorityOrOptions) {
|
|
|
2857
2065
|
};
|
|
2858
2066
|
callbackRef.current?.(mergedState, delta);
|
|
2859
2067
|
};
|
|
2860
|
-
const unregister = scheduler.register(wrappedCallback, {
|
|
2068
|
+
const unregister = scheduler$1.register(wrappedCallback, {
|
|
2861
2069
|
id,
|
|
2862
2070
|
rootId,
|
|
2863
2071
|
...options
|
|
@@ -2878,37 +2086,31 @@ function useFrame(callback, priorityOrOptions) {
|
|
|
2878
2086
|
}
|
|
2879
2087
|
};
|
|
2880
2088
|
} else {
|
|
2881
|
-
|
|
2882
|
-
|
|
2883
|
-
|
|
2884
|
-
|
|
2885
|
-
|
|
2886
|
-
|
|
2887
|
-
|
|
2888
|
-
|
|
2889
|
-
unregisterJob = registerOutside();
|
|
2890
|
-
});
|
|
2891
|
-
return () => {
|
|
2892
|
-
unsubReady();
|
|
2893
|
-
unregisterJob?.();
|
|
2894
|
-
};
|
|
2089
|
+
return scheduler$1.register(
|
|
2090
|
+
(state, delta) => {
|
|
2091
|
+
const frameState = state;
|
|
2092
|
+
if (!frameState.renderer) return;
|
|
2093
|
+
callbackRef.current?.(frameState, delta);
|
|
2094
|
+
},
|
|
2095
|
+
{ id, ...options }
|
|
2096
|
+
);
|
|
2895
2097
|
}
|
|
2896
|
-
}, [store, scheduler, id, optionsKey, isLegacyPriority, isInsideCanvas]);
|
|
2098
|
+
}, [store, scheduler$1, id, optionsKey, isLegacyPriority, isInsideCanvas]);
|
|
2897
2099
|
const isPaused = React__namespace.useSyncExternalStore(
|
|
2898
2100
|
// Subscribe function
|
|
2899
2101
|
React__namespace.useCallback(
|
|
2900
2102
|
(onStoreChange) => {
|
|
2901
|
-
return getScheduler().subscribeJobState(id, onStoreChange);
|
|
2103
|
+
return scheduler.getScheduler().subscribeJobState(id, onStoreChange);
|
|
2902
2104
|
},
|
|
2903
2105
|
[id]
|
|
2904
2106
|
),
|
|
2905
2107
|
// getSnapshot function
|
|
2906
|
-
React__namespace.useCallback(() => getScheduler().isJobPaused(id), [id]),
|
|
2108
|
+
React__namespace.useCallback(() => scheduler.getScheduler().isJobPaused(id), [id]),
|
|
2907
2109
|
// getServerSnapshot function (SSR)
|
|
2908
2110
|
React__namespace.useCallback(() => false, [])
|
|
2909
2111
|
);
|
|
2910
2112
|
const controls = React__namespace.useMemo(() => {
|
|
2911
|
-
const scheduler2 = getScheduler();
|
|
2113
|
+
const scheduler2 = scheduler.getScheduler();
|
|
2912
2114
|
return {
|
|
2913
2115
|
/** The job's unique ID */
|
|
2914
2116
|
id,
|
|
@@ -2923,7 +2125,7 @@ function useFrame(callback, priorityOrOptions) {
|
|
|
2923
2125
|
* @param timestamp Optional timestamp (defaults to performance.now())
|
|
2924
2126
|
*/
|
|
2925
2127
|
step: (timestamp) => {
|
|
2926
|
-
getScheduler().stepJob(id, timestamp);
|
|
2128
|
+
scheduler.getScheduler().stepJob(id, timestamp);
|
|
2927
2129
|
},
|
|
2928
2130
|
/**
|
|
2929
2131
|
* Manually step ALL jobs in the scheduler.
|
|
@@ -2931,20 +2133,20 @@ function useFrame(callback, priorityOrOptions) {
|
|
|
2931
2133
|
* @param timestamp Optional timestamp (defaults to performance.now())
|
|
2932
2134
|
*/
|
|
2933
2135
|
stepAll: (timestamp) => {
|
|
2934
|
-
getScheduler().step(timestamp);
|
|
2136
|
+
scheduler.getScheduler().step(timestamp);
|
|
2935
2137
|
},
|
|
2936
2138
|
/**
|
|
2937
2139
|
* Pause this job (set enabled=false).
|
|
2938
2140
|
* Job remains registered but won't run.
|
|
2939
2141
|
*/
|
|
2940
2142
|
pause: () => {
|
|
2941
|
-
getScheduler().pauseJob(id);
|
|
2143
|
+
scheduler.getScheduler().pauseJob(id);
|
|
2942
2144
|
},
|
|
2943
2145
|
/**
|
|
2944
2146
|
* Resume this job (set enabled=true).
|
|
2945
2147
|
*/
|
|
2946
2148
|
resume: () => {
|
|
2947
|
-
getScheduler().resumeJob(id);
|
|
2149
|
+
scheduler.getScheduler().resumeJob(id);
|
|
2948
2150
|
},
|
|
2949
2151
|
/**
|
|
2950
2152
|
* Reactive paused state - automatically updates when pause/resume is called.
|
|
@@ -2982,18 +2184,18 @@ function buildFromCache(input, textureCache) {
|
|
|
2982
2184
|
function useTexture(input, optionsOrOnLoad) {
|
|
2983
2185
|
const renderer = useThree((state) => state.internal.actualRenderer);
|
|
2984
2186
|
const store = useStore();
|
|
2985
|
-
const textureCache = useThree((state) => state.textures);
|
|
2986
2187
|
const options = typeof optionsOrOnLoad === "function" ? { onLoad: optionsOrOnLoad } : optionsOrOnLoad ?? {};
|
|
2987
|
-
const { onLoad, cache =
|
|
2188
|
+
const { onLoad, cache = true } = options;
|
|
2988
2189
|
const onLoadRef = React.useRef(onLoad);
|
|
2989
2190
|
onLoadRef.current = onLoad;
|
|
2990
2191
|
const onLoadCalledForRef = React.useRef(null);
|
|
2991
2192
|
const urls = React.useMemo(() => getUrls(input), [input]);
|
|
2992
2193
|
const cachedResult = React.useMemo(() => {
|
|
2993
2194
|
if (!cache) return null;
|
|
2994
|
-
|
|
2995
|
-
|
|
2996
|
-
|
|
2195
|
+
const textures = store.getState().textures;
|
|
2196
|
+
if (!allUrlsCached(urls, textures)) return null;
|
|
2197
|
+
return buildFromCache(input, textures);
|
|
2198
|
+
}, [cache, urls, input, store]);
|
|
2997
2199
|
const loadedTextures = useLoader(
|
|
2998
2200
|
webgpu.TextureLoader,
|
|
2999
2201
|
IsObject(input) ? Object.values(input) : input
|
|
@@ -3037,8 +2239,6 @@ function useTexture(input, optionsOrOnLoad) {
|
|
|
3037
2239
|
}, [input, loadedTextures, cachedResult]);
|
|
3038
2240
|
React.useEffect(() => {
|
|
3039
2241
|
if (!cache) return;
|
|
3040
|
-
if (cachedResult) return;
|
|
3041
|
-
const set = store.setState;
|
|
3042
2242
|
const urlTextureMap = [];
|
|
3043
2243
|
if (typeof input === "string") {
|
|
3044
2244
|
urlTextureMap.push([input, mappedTextures]);
|
|
@@ -3052,18 +2252,32 @@ function useTexture(input, optionsOrOnLoad) {
|
|
|
3052
2252
|
urlTextureMap.push([url, textureRecord[key]]);
|
|
3053
2253
|
}
|
|
3054
2254
|
}
|
|
3055
|
-
|
|
3056
|
-
const
|
|
3057
|
-
let
|
|
2255
|
+
store.setState((state) => {
|
|
2256
|
+
const refs = new Map(state._textureRefs);
|
|
2257
|
+
let textures = state.textures;
|
|
2258
|
+
let added = false;
|
|
3058
2259
|
for (const [url, texture] of urlTextureMap) {
|
|
3059
|
-
if (!
|
|
3060
|
-
|
|
3061
|
-
|
|
2260
|
+
if (!textures.has(url)) {
|
|
2261
|
+
if (!added) {
|
|
2262
|
+
textures = new Map(textures);
|
|
2263
|
+
added = true;
|
|
2264
|
+
}
|
|
2265
|
+
textures.set(url, texture);
|
|
3062
2266
|
}
|
|
2267
|
+
refs.set(url, (refs.get(url) ?? 0) + 1);
|
|
3063
2268
|
}
|
|
3064
|
-
return
|
|
2269
|
+
return added ? { textures, _textureRefs: refs } : { _textureRefs: refs };
|
|
3065
2270
|
});
|
|
3066
|
-
|
|
2271
|
+
return () => store.setState((state) => {
|
|
2272
|
+
const refs = new Map(state._textureRefs);
|
|
2273
|
+
for (const [url] of urlTextureMap) {
|
|
2274
|
+
const next = (refs.get(url) ?? 0) - 1;
|
|
2275
|
+
if (next <= 0) refs.delete(url);
|
|
2276
|
+
else refs.set(url, next);
|
|
2277
|
+
}
|
|
2278
|
+
return { _textureRefs: refs };
|
|
2279
|
+
});
|
|
2280
|
+
}, [cache, input, mappedTextures, store]);
|
|
3067
2281
|
return mappedTextures;
|
|
3068
2282
|
}
|
|
3069
2283
|
useTexture.preload = (url) => useLoader.preload(webgpu.TextureLoader, url);
|
|
@@ -3079,96 +2293,63 @@ const Texture = ({
|
|
|
3079
2293
|
return /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children: children?.(ret) });
|
|
3080
2294
|
};
|
|
3081
2295
|
|
|
3082
|
-
function
|
|
3083
|
-
if (entry instanceof webgpu.Texture) return entry;
|
|
3084
|
-
if (entry && typeof entry === "object" && "value" in entry && entry.value instanceof webgpu.Texture) {
|
|
3085
|
-
return entry.value;
|
|
3086
|
-
}
|
|
3087
|
-
return null;
|
|
3088
|
-
}
|
|
3089
|
-
function useTextures() {
|
|
2296
|
+
function useTextures(selector) {
|
|
3090
2297
|
const store = useStore();
|
|
3091
|
-
|
|
3092
|
-
const set = store.setState;
|
|
2298
|
+
const registry = React.useMemo(() => {
|
|
3093
2299
|
const getState = store.getState;
|
|
3094
|
-
const
|
|
3095
|
-
|
|
3096
|
-
const newMap = new Map(state.textures);
|
|
3097
|
-
newMap.set(key, value);
|
|
3098
|
-
return { textures: newMap };
|
|
3099
|
-
});
|
|
3100
|
-
};
|
|
3101
|
-
const addMultiple = (items) => {
|
|
3102
|
-
set((state) => {
|
|
3103
|
-
const newMap = new Map(state.textures);
|
|
3104
|
-
const entries = items instanceof Map ? items.entries() : Object.entries(items);
|
|
3105
|
-
for (const [key, value] of entries) {
|
|
3106
|
-
newMap.set(key, value);
|
|
3107
|
-
}
|
|
3108
|
-
return { textures: newMap };
|
|
3109
|
-
});
|
|
3110
|
-
};
|
|
3111
|
-
const remove = (key) => {
|
|
3112
|
-
set((state) => {
|
|
3113
|
-
const newMap = new Map(state.textures);
|
|
3114
|
-
newMap.delete(key);
|
|
3115
|
-
return { textures: newMap };
|
|
3116
|
-
});
|
|
3117
|
-
};
|
|
3118
|
-
const removeMultiple = (keys) => {
|
|
3119
|
-
set((state) => {
|
|
3120
|
-
const newMap = new Map(state.textures);
|
|
3121
|
-
for (const key of keys) newMap.delete(key);
|
|
3122
|
-
return { textures: newMap };
|
|
3123
|
-
});
|
|
3124
|
-
};
|
|
3125
|
-
const dispose = (key) => {
|
|
3126
|
-
const entry = getState().textures.get(key);
|
|
3127
|
-
if (entry) {
|
|
3128
|
-
const tex = getTextureValue(entry);
|
|
3129
|
-
tex?.dispose();
|
|
3130
|
-
}
|
|
3131
|
-
remove(key);
|
|
3132
|
-
};
|
|
3133
|
-
const disposeMultiple = (keys) => {
|
|
3134
|
-
const textures = getState().textures;
|
|
3135
|
-
for (const key of keys) {
|
|
3136
|
-
const entry = textures.get(key);
|
|
3137
|
-
if (entry) {
|
|
3138
|
-
const tex = getTextureValue(entry);
|
|
3139
|
-
tex?.dispose();
|
|
3140
|
-
}
|
|
3141
|
-
}
|
|
3142
|
-
removeMultiple(keys);
|
|
3143
|
-
};
|
|
3144
|
-
const disposeAll = () => {
|
|
3145
|
-
const textures = getState().textures;
|
|
3146
|
-
for (const entry of textures.values()) {
|
|
3147
|
-
const tex = getTextureValue(entry);
|
|
3148
|
-
tex?.dispose();
|
|
3149
|
-
}
|
|
3150
|
-
set({ textures: /* @__PURE__ */ new Map() });
|
|
3151
|
-
};
|
|
2300
|
+
const setState = store.setState;
|
|
2301
|
+
const getOne = (key) => getState().textures.get(key);
|
|
3152
2302
|
return {
|
|
3153
|
-
|
|
3154
|
-
get textures() {
|
|
2303
|
+
get all() {
|
|
3155
2304
|
return getState().textures;
|
|
3156
2305
|
},
|
|
3157
|
-
|
|
3158
|
-
|
|
2306
|
+
get(input) {
|
|
2307
|
+
if (typeof input === "string") return getOne(input);
|
|
2308
|
+
if (Array.isArray(input)) return input.map(getOne);
|
|
2309
|
+
const out = {};
|
|
2310
|
+
for (const name in input) out[name] = getOne(input[name]);
|
|
2311
|
+
return out;
|
|
2312
|
+
},
|
|
3159
2313
|
has: (key) => getState().textures.has(key),
|
|
3160
|
-
|
|
3161
|
-
|
|
3162
|
-
|
|
3163
|
-
|
|
3164
|
-
|
|
3165
|
-
|
|
3166
|
-
|
|
3167
|
-
|
|
3168
|
-
|
|
3169
|
-
|
|
2314
|
+
add(keyOrRecord, texture) {
|
|
2315
|
+
setState((state) => {
|
|
2316
|
+
const textures = new Map(state.textures);
|
|
2317
|
+
if (typeof keyOrRecord === "string") {
|
|
2318
|
+
textures.set(keyOrRecord, texture);
|
|
2319
|
+
} else {
|
|
2320
|
+
for (const key in keyOrRecord) textures.set(key, keyOrRecord[key]);
|
|
2321
|
+
}
|
|
2322
|
+
return { textures };
|
|
2323
|
+
});
|
|
2324
|
+
},
|
|
2325
|
+
dispose(key, options) {
|
|
2326
|
+
const state = getState();
|
|
2327
|
+
const refs = state._textureRefs.get(key) ?? 0;
|
|
2328
|
+
if (refs > 0 && !options?.force) {
|
|
2329
|
+
console.warn(
|
|
2330
|
+
`[useTextures] "${key}" still has ${refs} active reference(s); skipping dispose. Pass { force: true } to override.`
|
|
2331
|
+
);
|
|
2332
|
+
return false;
|
|
2333
|
+
}
|
|
2334
|
+
state.textures.get(key)?.dispose();
|
|
2335
|
+
setState((s) => {
|
|
2336
|
+
const textures = new Map(s.textures);
|
|
2337
|
+
textures.delete(key);
|
|
2338
|
+
const nextRefs = new Map(s._textureRefs);
|
|
2339
|
+
nextRefs.delete(key);
|
|
2340
|
+
return { textures, _textureRefs: nextRefs };
|
|
2341
|
+
});
|
|
2342
|
+
return true;
|
|
2343
|
+
},
|
|
2344
|
+
disposeAll() {
|
|
2345
|
+
for (const texture of getState().textures.values()) texture.dispose();
|
|
2346
|
+
setState({ textures: /* @__PURE__ */ new Map(), _textureRefs: /* @__PURE__ */ new Map() });
|
|
2347
|
+
}
|
|
3170
2348
|
};
|
|
3171
2349
|
}, [store]);
|
|
2350
|
+
const subscribe = selector ? () => selector(registry) : (state) => state.textures;
|
|
2351
|
+
const selected = useThree(subscribe);
|
|
2352
|
+
return selector ? selected : registry;
|
|
3172
2353
|
}
|
|
3173
2354
|
|
|
3174
2355
|
function useRenderTarget(widthOrOptions, heightOrOptions, options) {
|
|
@@ -3223,7 +2404,7 @@ function addEffect(callback) {
|
|
|
3223
2404
|
link: "https://docs.pmnd.rs/react-three-fiber/api/hooks#useframe"
|
|
3224
2405
|
});
|
|
3225
2406
|
const id = `legacy_effect_${effectId++}`;
|
|
3226
|
-
return getScheduler().registerGlobal("before", id, callback);
|
|
2407
|
+
return scheduler.getScheduler().registerGlobal("before", id, callback);
|
|
3227
2408
|
}
|
|
3228
2409
|
function addAfterEffect(callback) {
|
|
3229
2410
|
notifyDepreciated({
|
|
@@ -3232,7 +2413,7 @@ function addAfterEffect(callback) {
|
|
|
3232
2413
|
link: "https://docs.pmnd.rs/react-three-fiber/api/hooks#useframe"
|
|
3233
2414
|
});
|
|
3234
2415
|
const id = `legacy_afterEffect_${effectId++}`;
|
|
3235
|
-
return getScheduler().registerGlobal("after", id, callback);
|
|
2416
|
+
return scheduler.getScheduler().registerGlobal("after", id, callback);
|
|
3236
2417
|
}
|
|
3237
2418
|
function addTail(callback) {
|
|
3238
2419
|
notifyDepreciated({
|
|
@@ -3240,13 +2421,13 @@ function addTail(callback) {
|
|
|
3240
2421
|
body: "Use scheduler.onIdle(callback) instead.\naddTail will be removed in a future version.",
|
|
3241
2422
|
link: "https://docs.pmnd.rs/react-three-fiber/api/hooks#useframe"
|
|
3242
2423
|
});
|
|
3243
|
-
return getScheduler().onIdle(callback);
|
|
2424
|
+
return scheduler.getScheduler().onIdle(callback);
|
|
3244
2425
|
}
|
|
3245
2426
|
function invalidate(state, frames = 1, stackFrames = false) {
|
|
3246
|
-
getScheduler().invalidate(frames, stackFrames);
|
|
2427
|
+
scheduler.getScheduler().invalidate(frames, stackFrames);
|
|
3247
2428
|
}
|
|
3248
2429
|
function advance(timestamp) {
|
|
3249
|
-
getScheduler().step(timestamp);
|
|
2430
|
+
scheduler.getScheduler().step(timestamp);
|
|
3250
2431
|
}
|
|
3251
2432
|
|
|
3252
2433
|
const version = "10.0.0-alpha.2";
|
|
@@ -14688,6 +13869,7 @@ function swapInstances() {
|
|
|
14688
13869
|
}
|
|
14689
13870
|
}
|
|
14690
13871
|
if (instance.isHidden) unhideInstance(instance);
|
|
13872
|
+
if (isObject3D(instance.object)) removeInteractivity(findInitialRoot(instance), instance.object);
|
|
14691
13873
|
if (instance.object.__r3f) delete instance.object.__r3f;
|
|
14692
13874
|
if (instance.type !== "primitive") disposeOnIdle(instance.object);
|
|
14693
13875
|
}
|
|
@@ -14700,6 +13882,8 @@ function swapInstances() {
|
|
|
14700
13882
|
instance.object.__r3f = instance;
|
|
14701
13883
|
setFiberRef(fiber, instance.object);
|
|
14702
13884
|
delete instance.appliedOnce;
|
|
13885
|
+
instance.eventCount = 0;
|
|
13886
|
+
instance.handlers = {};
|
|
14703
13887
|
applyProps(instance.object, instance.props);
|
|
14704
13888
|
if (instance.props.attach) {
|
|
14705
13889
|
attach(parent, instance);
|
|
@@ -15004,6 +14188,7 @@ function createRoot(canvas) {
|
|
|
15004
14188
|
const lastConfiguredProps = {};
|
|
15005
14189
|
let configured = false;
|
|
15006
14190
|
let pending = null;
|
|
14191
|
+
let rendererSetup = null;
|
|
15007
14192
|
return {
|
|
15008
14193
|
async configure(props = {}) {
|
|
15009
14194
|
let resolve;
|
|
@@ -15019,7 +14204,6 @@ function createRoot(canvas) {
|
|
|
15019
14204
|
events,
|
|
15020
14205
|
onCreated: onCreatedCallback,
|
|
15021
14206
|
shadows = false,
|
|
15022
|
-
textureColorSpace = webgpu.SRGBColorSpace,
|
|
15023
14207
|
orthographic = false,
|
|
15024
14208
|
frameloop = "always",
|
|
15025
14209
|
dpr = [1, 2],
|
|
@@ -15034,7 +14218,8 @@ function createRoot(canvas) {
|
|
|
15034
14218
|
_sizeProps,
|
|
15035
14219
|
forceEven
|
|
15036
14220
|
} = props;
|
|
15037
|
-
const
|
|
14221
|
+
const textureColorSpace = is.obj(glConfig) && !is.fun(glConfig) && !isRenderer(glConfig) && glConfig.textureColorSpace || is.obj(rendererConfig) && !is.fun(rendererConfig) && !isRenderer(rendererConfig) && rendererConfig.textureColorSpace || webgpu.SRGBColorSpace;
|
|
14222
|
+
let state = store.getState();
|
|
15038
14223
|
const defaultGPUProps = {
|
|
15039
14224
|
canvas,
|
|
15040
14225
|
antialias: true
|
|
@@ -15048,46 +14233,64 @@ function createRoot(canvas) {
|
|
|
15048
14233
|
throw new Error("Cannot use both gl and renderer props at the same time");
|
|
15049
14234
|
}
|
|
15050
14235
|
let renderer = state.internal.actualRenderer;
|
|
15051
|
-
if (
|
|
15052
|
-
|
|
15053
|
-
|
|
15054
|
-
|
|
15055
|
-
|
|
15056
|
-
|
|
15057
|
-
|
|
15058
|
-
|
|
15059
|
-
|
|
15060
|
-
|
|
15061
|
-
|
|
15062
|
-
|
|
15063
|
-
|
|
15064
|
-
|
|
15065
|
-
|
|
15066
|
-
|
|
15067
|
-
|
|
15068
|
-
|
|
15069
|
-
|
|
15070
|
-
|
|
15071
|
-
|
|
15072
|
-
|
|
15073
|
-
|
|
15074
|
-
|
|
15075
|
-
|
|
15076
|
-
|
|
15077
|
-
|
|
15078
|
-
|
|
15079
|
-
|
|
15080
|
-
|
|
15081
|
-
|
|
15082
|
-
|
|
15083
|
-
|
|
15084
|
-
|
|
15085
|
-
|
|
15086
|
-
|
|
15087
|
-
|
|
14236
|
+
if (!state.internal.actualRenderer) {
|
|
14237
|
+
if (!rendererSetup) {
|
|
14238
|
+
rendererSetup = (async () => {
|
|
14239
|
+
if (primaryCanvas) {
|
|
14240
|
+
const primary = await waitForPrimary(primaryCanvas);
|
|
14241
|
+
renderer = primary.renderer;
|
|
14242
|
+
state.internal.actualRenderer = renderer;
|
|
14243
|
+
const canvasTarget = new webgpu.CanvasTarget(canvas);
|
|
14244
|
+
primary.store.setState((prev) => ({
|
|
14245
|
+
internal: { ...prev.internal, isMultiCanvas: true }
|
|
14246
|
+
}));
|
|
14247
|
+
state.set((prev) => ({
|
|
14248
|
+
webGPUSupported: primary.store.getState().webGPUSupported,
|
|
14249
|
+
renderer,
|
|
14250
|
+
primaryStore: primary.store,
|
|
14251
|
+
internal: {
|
|
14252
|
+
...prev.internal,
|
|
14253
|
+
canvasTarget,
|
|
14254
|
+
isMultiCanvas: true,
|
|
14255
|
+
isSecondary: true,
|
|
14256
|
+
targetId: primaryCanvas
|
|
14257
|
+
}
|
|
14258
|
+
}));
|
|
14259
|
+
} else {
|
|
14260
|
+
renderer = await resolveRenderer(rendererConfig, defaultGPUProps, webgpu.WebGPURenderer);
|
|
14261
|
+
if (!renderer.hasInitialized?.()) {
|
|
14262
|
+
const size2 = computeInitialSize(canvas, propsSize);
|
|
14263
|
+
if (size2.width > 0 && size2.height > 0) {
|
|
14264
|
+
const pixelRatio = calculateDpr(dpr);
|
|
14265
|
+
canvas.width = size2.width * pixelRatio;
|
|
14266
|
+
canvas.height = size2.height * pixelRatio;
|
|
14267
|
+
}
|
|
14268
|
+
await renderer.init();
|
|
14269
|
+
}
|
|
14270
|
+
const backend = renderer.backend;
|
|
14271
|
+
const isWebGPUBackend = backend && "isWebGPUBackend" in backend;
|
|
14272
|
+
state.internal.actualRenderer = renderer;
|
|
14273
|
+
state.set({ webGPUSupported: isWebGPUBackend, renderer, primaryStore: store });
|
|
14274
|
+
if (canvasId && !state.internal.isSecondary) {
|
|
14275
|
+
const canvasTarget = new webgpu.CanvasTarget(canvas);
|
|
14276
|
+
const unregisterPrimary = registerPrimary(canvasId, renderer, store);
|
|
14277
|
+
state.set((prev) => ({
|
|
14278
|
+
internal: {
|
|
14279
|
+
...prev.internal,
|
|
14280
|
+
canvasTarget,
|
|
14281
|
+
unregisterPrimary
|
|
14282
|
+
}
|
|
14283
|
+
}));
|
|
14284
|
+
}
|
|
15088
14285
|
}
|
|
15089
|
-
}))
|
|
14286
|
+
})().catch((err) => {
|
|
14287
|
+
rendererSetup = null;
|
|
14288
|
+
throw err;
|
|
14289
|
+
});
|
|
15090
14290
|
}
|
|
14291
|
+
await rendererSetup;
|
|
14292
|
+
state = store.getState();
|
|
14293
|
+
renderer = state.internal.actualRenderer;
|
|
15091
14294
|
}
|
|
15092
14295
|
let raycaster = state.raycaster;
|
|
15093
14296
|
if (!raycaster) state.set({ raycaster: raycaster = new webgpu.Raycaster() });
|
|
@@ -15180,7 +14383,7 @@ function createRoot(canvas) {
|
|
|
15180
14383
|
lastConfiguredProps.performance = performance;
|
|
15181
14384
|
}
|
|
15182
14385
|
if (!state.xr) {
|
|
15183
|
-
const handleXRFrame = (timestamp,
|
|
14386
|
+
const handleXRFrame = (timestamp, _frame) => {
|
|
15184
14387
|
const state2 = store.getState();
|
|
15185
14388
|
if (state2.frameloop === "never") return;
|
|
15186
14389
|
advance(timestamp);
|
|
@@ -15216,15 +14419,22 @@ function createRoot(canvas) {
|
|
|
15216
14419
|
const oldType = renderer.shadowMap.type;
|
|
15217
14420
|
renderer.shadowMap.enabled = !!shadows;
|
|
15218
14421
|
if (is.boo(shadows)) {
|
|
15219
|
-
renderer.shadowMap.type = webgpu.
|
|
14422
|
+
renderer.shadowMap.type = webgpu.PCFShadowMap;
|
|
15220
14423
|
} else if (is.str(shadows)) {
|
|
14424
|
+
if (shadows === "soft") {
|
|
14425
|
+
notifyDepreciated({
|
|
14426
|
+
heading: 'shadows="soft" is deprecated',
|
|
14427
|
+
body: "Three has depreciated soft and improved basic PCFShadows, we converted for you.",
|
|
14428
|
+
link: "https://github.com/mrdoob/three.js/wiki/Migration-Guide?utm_source=chatgpt.com#181--182"
|
|
14429
|
+
});
|
|
14430
|
+
}
|
|
15221
14431
|
const types = {
|
|
15222
14432
|
basic: webgpu.BasicShadowMap,
|
|
15223
14433
|
percentage: webgpu.PCFShadowMap,
|
|
15224
|
-
soft: webgpu.
|
|
14434
|
+
soft: webgpu.PCFShadowMap,
|
|
15225
14435
|
variance: webgpu.VSMShadowMap
|
|
15226
14436
|
};
|
|
15227
|
-
renderer.shadowMap.type = types[shadows] ?? webgpu.
|
|
14437
|
+
renderer.shadowMap.type = types[shadows] ?? webgpu.PCFShadowMap;
|
|
15228
14438
|
} else if (is.obj(shadows)) {
|
|
15229
14439
|
Object.assign(renderer.shadowMap, shadows);
|
|
15230
14440
|
}
|
|
@@ -15240,24 +14450,35 @@ function createRoot(canvas) {
|
|
|
15240
14450
|
if (state.textureColorSpace !== textureColorSpace) state.set(() => ({ textureColorSpace }));
|
|
15241
14451
|
lastConfiguredProps.textureColorSpace = textureColorSpace;
|
|
15242
14452
|
}
|
|
14453
|
+
const r3fProps = ["textureColorSpace"];
|
|
14454
|
+
const constructorOnlyProps = ["samples", "antialias", "alpha", "canvas", "powerPreference"];
|
|
14455
|
+
const nonApplyProps = [...r3fProps, ...constructorOnlyProps];
|
|
15243
14456
|
if (glConfig && !is.fun(glConfig) && !isRenderer(glConfig) && !is.equ(glConfig, renderer, shallowLoose)) {
|
|
15244
|
-
|
|
14457
|
+
const glProps = {};
|
|
14458
|
+
for (const key in glConfig) {
|
|
14459
|
+
if (!nonApplyProps.includes(key)) glProps[key] = glConfig[key];
|
|
14460
|
+
}
|
|
14461
|
+
applyProps(renderer, glProps);
|
|
15245
14462
|
}
|
|
15246
14463
|
if (rendererConfig && !is.fun(rendererConfig) && !isRenderer(rendererConfig) && state.renderer) {
|
|
15247
14464
|
const currentRenderer = state.renderer;
|
|
15248
14465
|
if (!is.equ(rendererConfig, currentRenderer, shallowLoose)) {
|
|
15249
|
-
|
|
14466
|
+
const rendererProps = {};
|
|
14467
|
+
for (const key in rendererConfig) {
|
|
14468
|
+
if (!nonApplyProps.includes(key)) rendererProps[key] = rendererConfig[key];
|
|
14469
|
+
}
|
|
14470
|
+
applyProps(currentRenderer, rendererProps);
|
|
15250
14471
|
}
|
|
15251
14472
|
}
|
|
15252
|
-
const scheduler = getScheduler();
|
|
14473
|
+
const scheduler$1 = scheduler.getScheduler();
|
|
15253
14474
|
const rootId = state.internal.rootId;
|
|
15254
14475
|
if (!rootId) {
|
|
15255
|
-
const newRootId = canvasId || scheduler.generateRootId();
|
|
15256
|
-
const unregisterRoot = scheduler.registerRoot(newRootId, {
|
|
14476
|
+
const newRootId = canvasId || scheduler$1.generateRootId();
|
|
14477
|
+
const unregisterRoot = scheduler$1.registerRoot(newRootId, {
|
|
15257
14478
|
getState: () => store.getState(),
|
|
15258
14479
|
onError: (err) => store.getState().setError(err)
|
|
15259
14480
|
});
|
|
15260
|
-
const unregisterCanvasTarget = scheduler.register(
|
|
14481
|
+
const unregisterCanvasTarget = scheduler$1.register(
|
|
15261
14482
|
() => {
|
|
15262
14483
|
const state2 = store.getState();
|
|
15263
14484
|
if (state2.internal.isMultiCanvas && state2.internal.canvasTarget) {
|
|
@@ -15272,7 +14493,19 @@ function createRoot(canvas) {
|
|
|
15272
14493
|
system: true
|
|
15273
14494
|
}
|
|
15274
14495
|
);
|
|
15275
|
-
const
|
|
14496
|
+
const unregisterEventsFlush = scheduler$1.register(
|
|
14497
|
+
() => {
|
|
14498
|
+
const state2 = store.getState();
|
|
14499
|
+
state2.events.flush?.();
|
|
14500
|
+
},
|
|
14501
|
+
{
|
|
14502
|
+
id: `${newRootId}_events`,
|
|
14503
|
+
rootId: newRootId,
|
|
14504
|
+
phase: "input",
|
|
14505
|
+
system: true
|
|
14506
|
+
}
|
|
14507
|
+
);
|
|
14508
|
+
const unregisterFrustum = scheduler$1.register(
|
|
15276
14509
|
() => {
|
|
15277
14510
|
const state2 = store.getState();
|
|
15278
14511
|
if (state2.autoUpdateFrustum && state2.camera) {
|
|
@@ -15282,11 +14515,11 @@ function createRoot(canvas) {
|
|
|
15282
14515
|
{
|
|
15283
14516
|
id: `${newRootId}_frustum`,
|
|
15284
14517
|
rootId: newRootId,
|
|
15285
|
-
|
|
14518
|
+
before: "render",
|
|
15286
14519
|
system: true
|
|
15287
14520
|
}
|
|
15288
14521
|
);
|
|
15289
|
-
const unregisterVisibility = scheduler.register(
|
|
14522
|
+
const unregisterVisibility = scheduler$1.register(
|
|
15290
14523
|
() => {
|
|
15291
14524
|
const state2 = store.getState();
|
|
15292
14525
|
checkVisibility(state2);
|
|
@@ -15294,19 +14527,19 @@ function createRoot(canvas) {
|
|
|
15294
14527
|
{
|
|
15295
14528
|
id: `${newRootId}_visibility`,
|
|
15296
14529
|
rootId: newRootId,
|
|
15297
|
-
|
|
14530
|
+
before: "render",
|
|
15298
14531
|
system: true,
|
|
15299
14532
|
after: `${newRootId}_frustum`
|
|
15300
14533
|
}
|
|
15301
14534
|
);
|
|
15302
|
-
const unregisterRender = scheduler.register(
|
|
14535
|
+
const unregisterRender = scheduler$1.register(
|
|
15303
14536
|
() => {
|
|
15304
14537
|
const state2 = store.getState();
|
|
15305
14538
|
const renderer2 = state2.internal.actualRenderer;
|
|
15306
|
-
const userHandlesRender = scheduler.hasUserJobsInPhase("render", newRootId);
|
|
14539
|
+
const userHandlesRender = scheduler$1.hasUserJobsInPhase("render", newRootId);
|
|
15307
14540
|
if (userHandlesRender || state2.internal.priority) return;
|
|
15308
14541
|
try {
|
|
15309
|
-
if (state2.
|
|
14542
|
+
if (state2.renderPipeline?.render) state2.renderPipeline.render();
|
|
15310
14543
|
else if (renderer2?.render) renderer2.render(state2.scene, state2.camera);
|
|
15311
14544
|
} catch (error) {
|
|
15312
14545
|
state2.setError(error instanceof Error ? error : new Error(String(error)));
|
|
@@ -15331,15 +14564,16 @@ function createRoot(canvas) {
|
|
|
15331
14564
|
unregisterRoot: () => {
|
|
15332
14565
|
unregisterRoot();
|
|
15333
14566
|
unregisterCanvasTarget();
|
|
14567
|
+
unregisterEventsFlush();
|
|
15334
14568
|
unregisterFrustum();
|
|
15335
14569
|
unregisterVisibility();
|
|
15336
14570
|
unregisterRender();
|
|
15337
14571
|
},
|
|
15338
|
-
scheduler
|
|
14572
|
+
scheduler: scheduler$1
|
|
15339
14573
|
}
|
|
15340
14574
|
}));
|
|
15341
14575
|
}
|
|
15342
|
-
scheduler.frameloop = frameloop;
|
|
14576
|
+
scheduler$1.frameloop = frameloop;
|
|
15343
14577
|
onCreated = onCreatedCallback;
|
|
15344
14578
|
configured = true;
|
|
15345
14579
|
resolve();
|
|
@@ -15469,6 +14703,7 @@ function PortalInner({ state = {}, children, container }) {
|
|
|
15469
14703
|
viewport = rootState.viewport.getCurrentViewport(camera, new webgpu.Vector3(), resolvedSize);
|
|
15470
14704
|
if (camera !== rootState.camera) updateCamera(camera, resolvedSize);
|
|
15471
14705
|
}
|
|
14706
|
+
const set = injectState.set;
|
|
15472
14707
|
return {
|
|
15473
14708
|
// The intersect consists of the previous root state
|
|
15474
14709
|
...rootState,
|
|
@@ -15487,7 +14722,7 @@ function PortalInner({ state = {}, children, container }) {
|
|
|
15487
14722
|
size: resolvedSize,
|
|
15488
14723
|
viewport: { ...rootState.viewport, ...viewport },
|
|
15489
14724
|
// Layers are allowed to override events
|
|
15490
|
-
setEvents: (events2) =>
|
|
14725
|
+
setEvents: (events2) => set((state2) => ({ ...state2, events: { ...state2.events, ...events2 } })),
|
|
15491
14726
|
// Container for child attachment - the portalScene (injected or container itself)
|
|
15492
14727
|
internal: { ...rootState.internal, ...injectState.internal, container: portalScene }
|
|
15493
14728
|
};
|
|
@@ -15496,9 +14731,13 @@ function PortalInner({ state = {}, children, container }) {
|
|
|
15496
14731
|
const store = traditional.createWithEqualityFn((set, get) => ({ ...rest, set, get }));
|
|
15497
14732
|
const onMutate = (prev) => store.setState((state2) => inject.current(prev, state2));
|
|
15498
14733
|
onMutate(previousRoot.getState());
|
|
15499
|
-
previousRoot.subscribe(onMutate);
|
|
15500
14734
|
return store;
|
|
15501
14735
|
}, [previousRoot, container]);
|
|
14736
|
+
useIsomorphicLayoutEffect(() => {
|
|
14737
|
+
const onMutate = (prev) => usePortalStore.setState((state2) => inject.current(prev, state2));
|
|
14738
|
+
const unsubscribe = previousRoot.subscribe(onMutate);
|
|
14739
|
+
return unsubscribe;
|
|
14740
|
+
}, [previousRoot, usePortalStore]);
|
|
15502
14741
|
return (
|
|
15503
14742
|
// @ts-ignore, reconciler types are not maintained
|
|
15504
14743
|
/* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children: reconciler.createPortal(
|
|
@@ -15512,6 +14751,59 @@ function flushSync(fn) {
|
|
|
15512
14751
|
return reconciler.flushSyncFromReconciler(fn);
|
|
15513
14752
|
}
|
|
15514
14753
|
|
|
14754
|
+
function parseBackground(background) {
|
|
14755
|
+
if (!background) return null;
|
|
14756
|
+
if (typeof background === "object" && !background.isColor) {
|
|
14757
|
+
const { backgroundMap, envMap, files, preset, ...rest } = background;
|
|
14758
|
+
return {
|
|
14759
|
+
...rest,
|
|
14760
|
+
preset,
|
|
14761
|
+
files: envMap || files,
|
|
14762
|
+
backgroundFiles: backgroundMap,
|
|
14763
|
+
background: true
|
|
14764
|
+
};
|
|
14765
|
+
}
|
|
14766
|
+
if (typeof background === "number") {
|
|
14767
|
+
return { color: background, background: true };
|
|
14768
|
+
}
|
|
14769
|
+
if (typeof background === "string") {
|
|
14770
|
+
if (background in presetsObj) {
|
|
14771
|
+
return { preset: background, background: true };
|
|
14772
|
+
}
|
|
14773
|
+
if (/^(https?:\/\/|\/|\.\/|\.\.\/)|\.(hdr|exr|jpg|jpeg|png|webp|gif)$/i.test(background)) {
|
|
14774
|
+
return { files: background, background: true };
|
|
14775
|
+
}
|
|
14776
|
+
return { color: background, background: true };
|
|
14777
|
+
}
|
|
14778
|
+
if (background.isColor) {
|
|
14779
|
+
return { color: background, background: true };
|
|
14780
|
+
}
|
|
14781
|
+
return null;
|
|
14782
|
+
}
|
|
14783
|
+
|
|
14784
|
+
function parseRendererConfig(rendererProp) {
|
|
14785
|
+
const isRendererConfig = typeof rendererProp === "object" && rendererProp !== null && !("render" in rendererProp) && ("primaryCanvas" in rendererProp || "scheduler" in rendererProp);
|
|
14786
|
+
if (isRendererConfig) {
|
|
14787
|
+
const { primaryCanvas: pc, scheduler: sc, ...rest } = rendererProp;
|
|
14788
|
+
return {
|
|
14789
|
+
primaryCanvas: pc,
|
|
14790
|
+
scheduler: sc,
|
|
14791
|
+
renderer: Object.keys(rest).length > 0 ? rest : rendererProp
|
|
14792
|
+
};
|
|
14793
|
+
}
|
|
14794
|
+
return { primaryCanvas: void 0, scheduler: void 0, renderer: rendererProp };
|
|
14795
|
+
}
|
|
14796
|
+
|
|
14797
|
+
function clearHmrCaches(store) {
|
|
14798
|
+
store.setState((state) => ({
|
|
14799
|
+
nodes: {},
|
|
14800
|
+
uniforms: {},
|
|
14801
|
+
buffers: {},
|
|
14802
|
+
gpuStorage: {},
|
|
14803
|
+
_hmrVersion: state._hmrVersion + 1
|
|
14804
|
+
}));
|
|
14805
|
+
}
|
|
14806
|
+
|
|
15515
14807
|
function CanvasImpl({
|
|
15516
14808
|
ref,
|
|
15517
14809
|
children,
|
|
@@ -15532,6 +14824,8 @@ function CanvasImpl({
|
|
|
15532
14824
|
raycaster,
|
|
15533
14825
|
camera,
|
|
15534
14826
|
scene,
|
|
14827
|
+
autoUpdateFrustum,
|
|
14828
|
+
occlusion,
|
|
15535
14829
|
onPointerMissed,
|
|
15536
14830
|
onDragOverMissed,
|
|
15537
14831
|
onDropMissed,
|
|
@@ -15543,39 +14837,10 @@ function CanvasImpl({
|
|
|
15543
14837
|
forceEven,
|
|
15544
14838
|
...props
|
|
15545
14839
|
}) {
|
|
15546
|
-
const { primaryCanvas, scheduler,
|
|
15547
|
-
const renderer = Object.keys(rendererConfig).length > 0 ? rendererConfig : rendererProp;
|
|
14840
|
+
const { primaryCanvas, scheduler, renderer } = parseRendererConfig(rendererProp);
|
|
15548
14841
|
React__namespace.useMemo(() => extend(THREE), []);
|
|
15549
14842
|
const Bridge = useBridge();
|
|
15550
|
-
const backgroundProps = React__namespace.useMemo(() =>
|
|
15551
|
-
if (!background) return null;
|
|
15552
|
-
if (typeof background === "object" && !background.isColor) {
|
|
15553
|
-
const { backgroundMap, envMap, files, preset, ...rest } = background;
|
|
15554
|
-
return {
|
|
15555
|
-
...rest,
|
|
15556
|
-
preset,
|
|
15557
|
-
files: envMap || files,
|
|
15558
|
-
backgroundFiles: backgroundMap,
|
|
15559
|
-
background: true
|
|
15560
|
-
};
|
|
15561
|
-
}
|
|
15562
|
-
if (typeof background === "number") {
|
|
15563
|
-
return { color: background, background: true };
|
|
15564
|
-
}
|
|
15565
|
-
if (typeof background === "string") {
|
|
15566
|
-
if (background in presetsObj) {
|
|
15567
|
-
return { preset: background, background: true };
|
|
15568
|
-
}
|
|
15569
|
-
if (/^(https?:\/\/|\/|\.\/|\.\.\/)|\\.(hdr|exr|jpg|jpeg|png|webp|gif)$/i.test(background)) {
|
|
15570
|
-
return { files: background, background: true };
|
|
15571
|
-
}
|
|
15572
|
-
return { color: background, background: true };
|
|
15573
|
-
}
|
|
15574
|
-
if (background.isColor) {
|
|
15575
|
-
return { color: background, background: true };
|
|
15576
|
-
}
|
|
15577
|
-
return null;
|
|
15578
|
-
}, [background]);
|
|
14843
|
+
const backgroundProps = React__namespace.useMemo(() => parseBackground(background), [background]);
|
|
15579
14844
|
const hasInitialSizeRef = React__namespace.useRef(false);
|
|
15580
14845
|
const measureConfig = React__namespace.useMemo(() => {
|
|
15581
14846
|
if (!hasInitialSizeRef.current) {
|
|
@@ -15617,6 +14882,7 @@ function CanvasImpl({
|
|
|
15617
14882
|
const handleDropMissed = useMutableCallback(onDropMissed);
|
|
15618
14883
|
const [block, setBlock] = React__namespace.useState(false);
|
|
15619
14884
|
const [error, setError] = React__namespace.useState(false);
|
|
14885
|
+
const [fallbackVisible, setFallbackVisible] = React__namespace.useState(false);
|
|
15620
14886
|
if (block) throw block;
|
|
15621
14887
|
if (error) throw error;
|
|
15622
14888
|
const root = React__namespace.useRef(null);
|
|
@@ -15624,6 +14890,7 @@ function CanvasImpl({
|
|
|
15624
14890
|
const unsubscribeErrorRef = React__namespace.useRef(null);
|
|
15625
14891
|
useIsomorphicLayoutEffect(() => {
|
|
15626
14892
|
effectActiveRef.current = true;
|
|
14893
|
+
if (fallbackVisible) return;
|
|
15627
14894
|
const canvas = canvasRef.current;
|
|
15628
14895
|
if (effectiveSize.width > 0 && effectiveSize.height > 0 && canvas) {
|
|
15629
14896
|
if (!root.current) {
|
|
@@ -15644,7 +14911,7 @@ function CanvasImpl({
|
|
|
15644
14911
|
}
|
|
15645
14912
|
async function run() {
|
|
15646
14913
|
if (!effectActiveRef.current || !root.current) return;
|
|
15647
|
-
await root.current.configure({
|
|
14914
|
+
const configured = await root.current.configure({
|
|
15648
14915
|
id,
|
|
15649
14916
|
primaryCanvas,
|
|
15650
14917
|
scheduler,
|
|
@@ -15659,6 +14926,8 @@ function CanvasImpl({
|
|
|
15659
14926
|
performance,
|
|
15660
14927
|
raycaster,
|
|
15661
14928
|
camera,
|
|
14929
|
+
autoUpdateFrustum,
|
|
14930
|
+
occlusion,
|
|
15662
14931
|
size: effectiveSize,
|
|
15663
14932
|
// Store size props for reset functionality
|
|
15664
14933
|
_sizeProps: width !== void 0 || height !== void 0 ? { width, height } : null,
|
|
@@ -15683,8 +14952,20 @@ function CanvasImpl({
|
|
|
15683
14952
|
}
|
|
15684
14953
|
onCreated?.(state);
|
|
15685
14954
|
}
|
|
15686
|
-
})
|
|
15687
|
-
|
|
14955
|
+
}).then(
|
|
14956
|
+
() => true,
|
|
14957
|
+
// Renderer setup failed (e.g. no WebGL/WebGPU support). The `fallback` prop lives
|
|
14958
|
+
// inside <canvas>, which browsers don't display, so surface it as visible DOM
|
|
14959
|
+
// instead; with no fallback, rethrow to an external error boundary. (#3757)
|
|
14960
|
+
(setupError) => {
|
|
14961
|
+
if (effectActiveRef.current) {
|
|
14962
|
+
if (fallback != null) setFallbackVisible(true);
|
|
14963
|
+
else setError(setupError);
|
|
14964
|
+
}
|
|
14965
|
+
return false;
|
|
14966
|
+
}
|
|
14967
|
+
);
|
|
14968
|
+
if (!configured || !effectActiveRef.current || !root.current) return;
|
|
15688
14969
|
root.current.render(
|
|
15689
14970
|
/* @__PURE__ */ jsxRuntime.jsx(Bridge, { children: /* @__PURE__ */ jsxRuntime.jsx(ErrorBoundary, { set: setError, children: /* @__PURE__ */ jsxRuntime.jsxs(React__namespace.Suspense, { fallback: /* @__PURE__ */ jsxRuntime.jsx(Block, { set: setBlock }), children: [
|
|
15690
14971
|
backgroundProps && /* @__PURE__ */ jsxRuntime.jsx(Environment, { ...backgroundProps }),
|
|
@@ -15718,20 +14999,13 @@ function CanvasImpl({
|
|
|
15718
14999
|
const handleHMR = () => {
|
|
15719
15000
|
queueMicrotask(() => {
|
|
15720
15001
|
const rootEntry = _roots.get(canvas);
|
|
15721
|
-
if (rootEntry?.store)
|
|
15722
|
-
rootEntry.store.setState((state) => ({
|
|
15723
|
-
nodes: {},
|
|
15724
|
-
uniforms: {},
|
|
15725
|
-
_hmrVersion: state._hmrVersion + 1
|
|
15726
|
-
}));
|
|
15727
|
-
}
|
|
15002
|
+
if (rootEntry?.store) clearHmrCaches(rootEntry.store);
|
|
15728
15003
|
});
|
|
15729
15004
|
};
|
|
15730
15005
|
if (typeof ({ url: (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index.cjs', document.baseURI).href)) }) !== "undefined" && undefined) {
|
|
15731
15006
|
const hot = undefined;
|
|
15732
15007
|
hot.on("vite:afterUpdate", handleHMR);
|
|
15733
|
-
return () => hot.
|
|
15734
|
-
});
|
|
15008
|
+
return () => hot.off?.("vite:afterUpdate", handleHMR);
|
|
15735
15009
|
}
|
|
15736
15010
|
if (typeof module !== "undefined" && module.hot) {
|
|
15737
15011
|
const hot = module.hot;
|
|
@@ -15754,7 +15028,20 @@ function CanvasImpl({
|
|
|
15754
15028
|
...style
|
|
15755
15029
|
},
|
|
15756
15030
|
...props,
|
|
15757
|
-
children:
|
|
15031
|
+
children: fallbackVisible ? (
|
|
15032
|
+
// Renderer setup failed: render the fallback as visible DOM. Inside <canvas> (below)
|
|
15033
|
+
// it exists in the tree but browsers never paint it, which is the whole bug (#3757).
|
|
15034
|
+
fallback
|
|
15035
|
+
) : /* @__PURE__ */ jsxRuntime.jsx("div", { ref: containerRef, className: "r3f-canvas-container", style: { width: "100%", height: "100%" }, children: /* @__PURE__ */ jsxRuntime.jsx(
|
|
15036
|
+
"canvas",
|
|
15037
|
+
{
|
|
15038
|
+
ref: canvasRef,
|
|
15039
|
+
id,
|
|
15040
|
+
className: "r3f-canvas",
|
|
15041
|
+
style: { display: "block", width: "100%", height: "100%" },
|
|
15042
|
+
children: fallback
|
|
15043
|
+
}
|
|
15044
|
+
) })
|
|
15758
15045
|
}
|
|
15759
15046
|
);
|
|
15760
15047
|
}
|
|
@@ -15830,6 +15117,8 @@ function createScopedStore(data) {
|
|
|
15830
15117
|
function createLazyCreatorState(state) {
|
|
15831
15118
|
let _uniforms = null;
|
|
15832
15119
|
let _nodes = null;
|
|
15120
|
+
let _buffers = null;
|
|
15121
|
+
let _gpuStorage = null;
|
|
15833
15122
|
return Object.create(state, {
|
|
15834
15123
|
uniforms: {
|
|
15835
15124
|
get() {
|
|
@@ -15840,10 +15129,34 @@ function createLazyCreatorState(state) {
|
|
|
15840
15129
|
get() {
|
|
15841
15130
|
return _nodes ?? (_nodes = createScopedStore(state.nodes));
|
|
15842
15131
|
}
|
|
15132
|
+
},
|
|
15133
|
+
buffers: {
|
|
15134
|
+
get() {
|
|
15135
|
+
return _buffers ?? (_buffers = createScopedStore(state.buffers));
|
|
15136
|
+
}
|
|
15137
|
+
},
|
|
15138
|
+
gpuStorage: {
|
|
15139
|
+
get() {
|
|
15140
|
+
return _gpuStorage ?? (_gpuStorage = createScopedStore(state.gpuStorage));
|
|
15141
|
+
}
|
|
15843
15142
|
}
|
|
15844
15143
|
});
|
|
15845
15144
|
}
|
|
15846
15145
|
|
|
15146
|
+
function resolvePrimary(local) {
|
|
15147
|
+
return local.getState().primaryStore ?? local;
|
|
15148
|
+
}
|
|
15149
|
+
function usePrimaryStore() {
|
|
15150
|
+
const local = useStore();
|
|
15151
|
+
const primary = local.getState().primaryStore;
|
|
15152
|
+
return React.useMemo(() => primary ?? local, [primary, local]);
|
|
15153
|
+
}
|
|
15154
|
+
function usePrimaryThree(selector = (state) => state, equalityFn) {
|
|
15155
|
+
const local = useStore();
|
|
15156
|
+
const primary = resolvePrimary(local);
|
|
15157
|
+
return primary(selector, equalityFn);
|
|
15158
|
+
}
|
|
15159
|
+
|
|
15847
15160
|
function addTexture(set, key, value) {
|
|
15848
15161
|
set((state) => {
|
|
15849
15162
|
const newMap = new Map(state.textures);
|
|
@@ -15922,6 +15235,10 @@ function vectorize(inObject) {
|
|
|
15922
15235
|
if (obj.isVector2 || obj.isVector3 || obj.isVector4) return inObject;
|
|
15923
15236
|
if (obj.isMatrix3 || obj.isMatrix4) return inObject;
|
|
15924
15237
|
if (obj.isColor || obj.isEuler || obj.isQuaternion || obj.isSpherical) return inObject;
|
|
15238
|
+
if ("r" in obj && "g" in obj && "b" in obj && typeof obj.r === "number" && typeof obj.g === "number" && typeof obj.b === "number") {
|
|
15239
|
+
const scale = obj.r > 1 || obj.g > 1 || obj.b > 1 ? 1 / 255 : 1;
|
|
15240
|
+
return new webgpu.Color(obj.r * scale, obj.g * scale, obj.b * scale);
|
|
15241
|
+
}
|
|
15925
15242
|
if ("x" in obj && "y" in obj && typeof obj.x === "number" && typeof obj.y === "number") {
|
|
15926
15243
|
if ("w" in obj && typeof obj.w === "number" && "z" in obj && typeof obj.z === "number") {
|
|
15927
15244
|
return new webgpu.Vector4(obj.x, obj.y, obj.z, obj.w);
|
|
@@ -15945,7 +15262,7 @@ function useCompareMemoize(value, deep) {
|
|
|
15945
15262
|
|
|
15946
15263
|
const isUniformNode$1 = (value) => value !== null && typeof value === "object" && "value" in value && "uuid" in value;
|
|
15947
15264
|
function useUniforms(creatorOrScope, scope) {
|
|
15948
|
-
const store =
|
|
15265
|
+
const store = usePrimaryStore();
|
|
15949
15266
|
const removeUniforms2 = React.useCallback(
|
|
15950
15267
|
(names, targetScope) => {
|
|
15951
15268
|
const nameArray = Array.isArray(names) ? names : [names];
|
|
@@ -16015,8 +15332,8 @@ function useUniforms(creatorOrScope, scope) {
|
|
|
16015
15332
|
}, [creatorOrScope, store]);
|
|
16016
15333
|
const memoizedInput = useCompareMemoize(inputForMemoization);
|
|
16017
15334
|
const isReader = memoizedInput === void 0 || typeof memoizedInput === "string";
|
|
16018
|
-
const storeUniforms =
|
|
16019
|
-
const hmrVersion =
|
|
15335
|
+
const storeUniforms = usePrimaryThree((s) => s.uniforms);
|
|
15336
|
+
const hmrVersion = usePrimaryThree((s) => s._hmrVersion);
|
|
16020
15337
|
const readerDep = isReader ? storeUniforms : null;
|
|
16021
15338
|
const creatorDep = isReader ? null : hmrVersion;
|
|
16022
15339
|
const uniforms = React.useMemo(() => {
|
|
@@ -16077,6 +15394,7 @@ function useUniforms(creatorOrScope, scope) {
|
|
|
16077
15394
|
return { ...uniforms, removeUniforms: removeUniforms2, clearUniforms, rebuildUniforms };
|
|
16078
15395
|
}
|
|
16079
15396
|
function rebuildAllUniforms(store, scope) {
|
|
15397
|
+
store = store.getState().primaryStore ?? store;
|
|
16080
15398
|
store.setState((state) => {
|
|
16081
15399
|
let newUniforms = {};
|
|
16082
15400
|
if (scope && scope !== "root") {
|
|
@@ -16205,7 +15523,7 @@ function useUniform(name, value) {
|
|
|
16205
15523
|
|
|
16206
15524
|
const isTSLNode = (value) => value !== null && typeof value === "object" && ("uuid" in value || "nodeType" in value);
|
|
16207
15525
|
function useNodes(creatorOrScope, scope) {
|
|
16208
|
-
const store =
|
|
15526
|
+
const store = usePrimaryStore();
|
|
16209
15527
|
const removeNodes2 = React.useCallback(
|
|
16210
15528
|
(names, targetScope) => {
|
|
16211
15529
|
const nameArray = Array.isArray(names) ? names : [names];
|
|
@@ -16262,8 +15580,8 @@ function useNodes(creatorOrScope, scope) {
|
|
|
16262
15580
|
[store]
|
|
16263
15581
|
);
|
|
16264
15582
|
const isReader = creatorOrScope === void 0 || typeof creatorOrScope === "string";
|
|
16265
|
-
const storeNodes =
|
|
16266
|
-
const hmrVersion =
|
|
15583
|
+
const storeNodes = usePrimaryThree((s) => s.nodes);
|
|
15584
|
+
const hmrVersion = usePrimaryThree((s) => s._hmrVersion);
|
|
16267
15585
|
const scopeDep = typeof creatorOrScope === "string" ? creatorOrScope : scope;
|
|
16268
15586
|
const readerDep = isReader ? storeNodes : null;
|
|
16269
15587
|
const creatorDep = isReader ? null : hmrVersion;
|
|
@@ -16322,6 +15640,7 @@ function useNodes(creatorOrScope, scope) {
|
|
|
16322
15640
|
return { ...nodes, removeNodes: removeNodes2, clearNodes, rebuildNodes };
|
|
16323
15641
|
}
|
|
16324
15642
|
function rebuildAllNodes(store, scope) {
|
|
15643
|
+
store = store.getState().primaryStore ?? store;
|
|
16325
15644
|
store.setState((state) => {
|
|
16326
15645
|
let newNodes = state.nodes;
|
|
16327
15646
|
if (scope && scope !== "root") {
|
|
@@ -16366,18 +15685,364 @@ function clearRootNodes(set) {
|
|
|
16366
15685
|
});
|
|
16367
15686
|
}
|
|
16368
15687
|
function useLocalNodes(creator) {
|
|
16369
|
-
const store =
|
|
16370
|
-
const uniforms =
|
|
16371
|
-
const nodes =
|
|
16372
|
-
const textures =
|
|
16373
|
-
const hmrVersion =
|
|
15688
|
+
const store = usePrimaryStore();
|
|
15689
|
+
const uniforms = usePrimaryThree((s) => s.uniforms);
|
|
15690
|
+
const nodes = usePrimaryThree((s) => s.nodes);
|
|
15691
|
+
const textures = usePrimaryThree((s) => s.textures);
|
|
15692
|
+
const hmrVersion = usePrimaryThree((s) => s._hmrVersion);
|
|
16374
15693
|
return React.useMemo(() => {
|
|
16375
15694
|
const wrappedState = createLazyCreatorState(store.getState());
|
|
16376
15695
|
return creator(wrappedState);
|
|
16377
15696
|
}, [store, creator, uniforms, nodes, textures, hmrVersion]);
|
|
16378
15697
|
}
|
|
16379
15698
|
|
|
16380
|
-
|
|
15699
|
+
const isBufferLike = (value) => {
|
|
15700
|
+
if (value === null || typeof value !== "object") return false;
|
|
15701
|
+
if (ArrayBuffer.isView(value)) return true;
|
|
15702
|
+
if ("isBufferAttribute" in value) return true;
|
|
15703
|
+
if ("uuid" in value || "nodeType" in value) return true;
|
|
15704
|
+
return false;
|
|
15705
|
+
};
|
|
15706
|
+
const disposeBuffer = (buffer) => {
|
|
15707
|
+
if (buffer === null || typeof buffer !== "object") return;
|
|
15708
|
+
if ("dispose" in buffer && typeof buffer.dispose === "function") {
|
|
15709
|
+
buffer.dispose();
|
|
15710
|
+
}
|
|
15711
|
+
};
|
|
15712
|
+
function useBuffers(creatorOrScope, scope) {
|
|
15713
|
+
const store = usePrimaryStore();
|
|
15714
|
+
const removeBuffers = React.useCallback(
|
|
15715
|
+
(names, targetScope) => {
|
|
15716
|
+
const nameArray = Array.isArray(names) ? names : [names];
|
|
15717
|
+
store.setState((state) => {
|
|
15718
|
+
if (targetScope) {
|
|
15719
|
+
const currentScope = { ...state.buffers[targetScope] };
|
|
15720
|
+
for (const name of nameArray) delete currentScope[name];
|
|
15721
|
+
return { buffers: { ...state.buffers, [targetScope]: currentScope } };
|
|
15722
|
+
}
|
|
15723
|
+
const buffers2 = { ...state.buffers };
|
|
15724
|
+
for (const name of nameArray) if (isBufferLike(buffers2[name])) delete buffers2[name];
|
|
15725
|
+
return { buffers: buffers2 };
|
|
15726
|
+
});
|
|
15727
|
+
},
|
|
15728
|
+
[store]
|
|
15729
|
+
);
|
|
15730
|
+
const clearBuffers = React.useCallback(
|
|
15731
|
+
(targetScope) => {
|
|
15732
|
+
store.setState((state) => {
|
|
15733
|
+
if (targetScope && targetScope !== "root") {
|
|
15734
|
+
const { [targetScope]: _, ...rest } = state.buffers;
|
|
15735
|
+
return { buffers: rest };
|
|
15736
|
+
}
|
|
15737
|
+
if (targetScope === "root") {
|
|
15738
|
+
const buffers2 = {};
|
|
15739
|
+
for (const [key, value] of Object.entries(state.buffers)) {
|
|
15740
|
+
if (!isBufferLike(value)) buffers2[key] = value;
|
|
15741
|
+
}
|
|
15742
|
+
return { buffers: buffers2 };
|
|
15743
|
+
}
|
|
15744
|
+
return { buffers: {} };
|
|
15745
|
+
});
|
|
15746
|
+
},
|
|
15747
|
+
[store]
|
|
15748
|
+
);
|
|
15749
|
+
const rebuildBuffers = React.useCallback(
|
|
15750
|
+
(targetScope) => {
|
|
15751
|
+
store.setState((state) => {
|
|
15752
|
+
let newBuffers = state.buffers;
|
|
15753
|
+
if (targetScope && targetScope !== "root") {
|
|
15754
|
+
const { [targetScope]: _, ...rest } = state.buffers;
|
|
15755
|
+
newBuffers = rest;
|
|
15756
|
+
} else if (targetScope === "root") {
|
|
15757
|
+
newBuffers = {};
|
|
15758
|
+
for (const [key, value] of Object.entries(state.buffers)) {
|
|
15759
|
+
if (!isBufferLike(value)) newBuffers[key] = value;
|
|
15760
|
+
}
|
|
15761
|
+
} else {
|
|
15762
|
+
newBuffers = {};
|
|
15763
|
+
}
|
|
15764
|
+
return { buffers: newBuffers, _hmrVersion: state._hmrVersion + 1 };
|
|
15765
|
+
});
|
|
15766
|
+
},
|
|
15767
|
+
[store]
|
|
15768
|
+
);
|
|
15769
|
+
const disposeBuffers = React.useCallback(
|
|
15770
|
+
(names, targetScope) => {
|
|
15771
|
+
const nameArray = Array.isArray(names) ? names : [names];
|
|
15772
|
+
const state = store.getState();
|
|
15773
|
+
for (const name of nameArray) {
|
|
15774
|
+
const buffer = targetScope ? state.buffers[targetScope]?.[name] : state.buffers[name];
|
|
15775
|
+
if (buffer && isBufferLike(buffer)) {
|
|
15776
|
+
disposeBuffer(buffer);
|
|
15777
|
+
}
|
|
15778
|
+
}
|
|
15779
|
+
removeBuffers(names, targetScope);
|
|
15780
|
+
},
|
|
15781
|
+
[store, removeBuffers]
|
|
15782
|
+
);
|
|
15783
|
+
const isReader = creatorOrScope === void 0 || typeof creatorOrScope === "string";
|
|
15784
|
+
const storeBuffers = usePrimaryThree((s) => s.buffers);
|
|
15785
|
+
const hmrVersion = usePrimaryThree((s) => s._hmrVersion);
|
|
15786
|
+
const scopeDep = typeof creatorOrScope === "string" ? creatorOrScope : scope;
|
|
15787
|
+
const readerDep = isReader ? storeBuffers : null;
|
|
15788
|
+
const creatorDep = isReader ? null : hmrVersion;
|
|
15789
|
+
const buffers = React.useMemo(() => {
|
|
15790
|
+
if (creatorOrScope === void 0) {
|
|
15791
|
+
return storeBuffers;
|
|
15792
|
+
}
|
|
15793
|
+
if (typeof creatorOrScope === "string") {
|
|
15794
|
+
const scopeData = storeBuffers[creatorOrScope];
|
|
15795
|
+
if (scopeData && !isBufferLike(scopeData)) return scopeData;
|
|
15796
|
+
return {};
|
|
15797
|
+
}
|
|
15798
|
+
const state = store.getState();
|
|
15799
|
+
const set = store.setState;
|
|
15800
|
+
const creator = creatorOrScope;
|
|
15801
|
+
const wrappedState = createLazyCreatorState(state);
|
|
15802
|
+
const created = creator(wrappedState);
|
|
15803
|
+
const result = {};
|
|
15804
|
+
let hasNewBuffers = false;
|
|
15805
|
+
if (scope) {
|
|
15806
|
+
const currentScope = state.buffers[scope] ?? {};
|
|
15807
|
+
for (const [name, buffer] of Object.entries(created)) {
|
|
15808
|
+
if (currentScope[name]) {
|
|
15809
|
+
result[name] = currentScope[name];
|
|
15810
|
+
} else {
|
|
15811
|
+
if ("setName" in buffer && typeof buffer.setName === "function") {
|
|
15812
|
+
buffer.setName(`${scope}.${name}`);
|
|
15813
|
+
}
|
|
15814
|
+
result[name] = buffer;
|
|
15815
|
+
hasNewBuffers = true;
|
|
15816
|
+
}
|
|
15817
|
+
}
|
|
15818
|
+
if (hasNewBuffers) {
|
|
15819
|
+
set((s) => ({
|
|
15820
|
+
buffers: {
|
|
15821
|
+
...s.buffers,
|
|
15822
|
+
[scope]: { ...s.buffers[scope], ...result }
|
|
15823
|
+
}
|
|
15824
|
+
}));
|
|
15825
|
+
}
|
|
15826
|
+
return result;
|
|
15827
|
+
}
|
|
15828
|
+
for (const [name, buffer] of Object.entries(created)) {
|
|
15829
|
+
const existing = state.buffers[name];
|
|
15830
|
+
if (existing && isBufferLike(existing)) {
|
|
15831
|
+
result[name] = existing;
|
|
15832
|
+
} else {
|
|
15833
|
+
if ("setName" in buffer && typeof buffer.setName === "function") {
|
|
15834
|
+
buffer.setName(name);
|
|
15835
|
+
}
|
|
15836
|
+
result[name] = buffer;
|
|
15837
|
+
hasNewBuffers = true;
|
|
15838
|
+
}
|
|
15839
|
+
}
|
|
15840
|
+
if (hasNewBuffers) {
|
|
15841
|
+
set((s) => ({ buffers: { ...s.buffers, ...result } }));
|
|
15842
|
+
}
|
|
15843
|
+
return result;
|
|
15844
|
+
}, [store, scopeDep, readerDep, creatorDep]);
|
|
15845
|
+
return { ...buffers, removeBuffers, clearBuffers, rebuildBuffers, disposeBuffers };
|
|
15846
|
+
}
|
|
15847
|
+
function rebuildAllBuffers(store, scope) {
|
|
15848
|
+
store = store.getState().primaryStore ?? store;
|
|
15849
|
+
store.setState((state) => {
|
|
15850
|
+
let newBuffers = state.buffers;
|
|
15851
|
+
if (scope && scope !== "root") {
|
|
15852
|
+
const { [scope]: _, ...rest } = state.buffers;
|
|
15853
|
+
newBuffers = rest;
|
|
15854
|
+
} else if (scope === "root") {
|
|
15855
|
+
newBuffers = {};
|
|
15856
|
+
for (const [key, value] of Object.entries(state.buffers)) {
|
|
15857
|
+
if (!isBufferLike(value)) newBuffers[key] = value;
|
|
15858
|
+
}
|
|
15859
|
+
} else {
|
|
15860
|
+
newBuffers = {};
|
|
15861
|
+
}
|
|
15862
|
+
return { buffers: newBuffers, _hmrVersion: state._hmrVersion + 1 };
|
|
15863
|
+
});
|
|
15864
|
+
}
|
|
15865
|
+
|
|
15866
|
+
const isStorageLike = (value) => {
|
|
15867
|
+
if (value === null || typeof value !== "object") return false;
|
|
15868
|
+
if ("isTexture" in value) return true;
|
|
15869
|
+
if ("isData3DTexture" in value) return true;
|
|
15870
|
+
if ("uuid" in value || "nodeType" in value) return true;
|
|
15871
|
+
return false;
|
|
15872
|
+
};
|
|
15873
|
+
const disposeStorage = (storage) => {
|
|
15874
|
+
if (storage === null || typeof storage !== "object") return;
|
|
15875
|
+
if ("dispose" in storage && typeof storage.dispose === "function") {
|
|
15876
|
+
storage.dispose();
|
|
15877
|
+
}
|
|
15878
|
+
};
|
|
15879
|
+
function useGPUStorage(creatorOrScope, scope) {
|
|
15880
|
+
const store = usePrimaryStore();
|
|
15881
|
+
const removeStorage = React.useCallback(
|
|
15882
|
+
(names, targetScope) => {
|
|
15883
|
+
const nameArray = Array.isArray(names) ? names : [names];
|
|
15884
|
+
store.setState((state) => {
|
|
15885
|
+
if (targetScope) {
|
|
15886
|
+
const currentScope = { ...state.gpuStorage[targetScope] };
|
|
15887
|
+
for (const name of nameArray) delete currentScope[name];
|
|
15888
|
+
return { gpuStorage: { ...state.gpuStorage, [targetScope]: currentScope } };
|
|
15889
|
+
}
|
|
15890
|
+
const gpuStorage2 = { ...state.gpuStorage };
|
|
15891
|
+
for (const name of nameArray) if (isStorageLike(gpuStorage2[name])) delete gpuStorage2[name];
|
|
15892
|
+
return { gpuStorage: gpuStorage2 };
|
|
15893
|
+
});
|
|
15894
|
+
},
|
|
15895
|
+
[store]
|
|
15896
|
+
);
|
|
15897
|
+
const clearStorage = React.useCallback(
|
|
15898
|
+
(targetScope) => {
|
|
15899
|
+
store.setState((state) => {
|
|
15900
|
+
if (targetScope && targetScope !== "root") {
|
|
15901
|
+
const { [targetScope]: _, ...rest } = state.gpuStorage;
|
|
15902
|
+
return { gpuStorage: rest };
|
|
15903
|
+
}
|
|
15904
|
+
if (targetScope === "root") {
|
|
15905
|
+
const gpuStorage2 = {};
|
|
15906
|
+
for (const [key, value] of Object.entries(state.gpuStorage)) {
|
|
15907
|
+
if (!isStorageLike(value)) gpuStorage2[key] = value;
|
|
15908
|
+
}
|
|
15909
|
+
return { gpuStorage: gpuStorage2 };
|
|
15910
|
+
}
|
|
15911
|
+
return { gpuStorage: {} };
|
|
15912
|
+
});
|
|
15913
|
+
},
|
|
15914
|
+
[store]
|
|
15915
|
+
);
|
|
15916
|
+
const rebuildStorage = React.useCallback(
|
|
15917
|
+
(targetScope) => {
|
|
15918
|
+
store.setState((state) => {
|
|
15919
|
+
let newStorage = state.gpuStorage;
|
|
15920
|
+
if (targetScope && targetScope !== "root") {
|
|
15921
|
+
const { [targetScope]: _, ...rest } = state.gpuStorage;
|
|
15922
|
+
newStorage = rest;
|
|
15923
|
+
} else if (targetScope === "root") {
|
|
15924
|
+
newStorage = {};
|
|
15925
|
+
for (const [key, value] of Object.entries(state.gpuStorage)) {
|
|
15926
|
+
if (!isStorageLike(value)) newStorage[key] = value;
|
|
15927
|
+
}
|
|
15928
|
+
} else {
|
|
15929
|
+
newStorage = {};
|
|
15930
|
+
}
|
|
15931
|
+
return { gpuStorage: newStorage, _hmrVersion: state._hmrVersion + 1 };
|
|
15932
|
+
});
|
|
15933
|
+
},
|
|
15934
|
+
[store]
|
|
15935
|
+
);
|
|
15936
|
+
const disposeStorageFn = React.useCallback(
|
|
15937
|
+
(names, targetScope) => {
|
|
15938
|
+
const nameArray = Array.isArray(names) ? names : [names];
|
|
15939
|
+
const state = store.getState();
|
|
15940
|
+
for (const name of nameArray) {
|
|
15941
|
+
const storage = targetScope ? state.gpuStorage[targetScope]?.[name] : state.gpuStorage[name];
|
|
15942
|
+
if (storage && isStorageLike(storage)) {
|
|
15943
|
+
disposeStorage(storage);
|
|
15944
|
+
}
|
|
15945
|
+
}
|
|
15946
|
+
removeStorage(names, targetScope);
|
|
15947
|
+
},
|
|
15948
|
+
[store, removeStorage]
|
|
15949
|
+
);
|
|
15950
|
+
const isReader = creatorOrScope === void 0 || typeof creatorOrScope === "string";
|
|
15951
|
+
const storeStorage = usePrimaryThree((s) => s.gpuStorage);
|
|
15952
|
+
const hmrVersion = usePrimaryThree((s) => s._hmrVersion);
|
|
15953
|
+
const scopeDep = typeof creatorOrScope === "string" ? creatorOrScope : scope;
|
|
15954
|
+
const readerDep = isReader ? storeStorage : null;
|
|
15955
|
+
const creatorDep = isReader ? null : hmrVersion;
|
|
15956
|
+
const gpuStorage = React.useMemo(() => {
|
|
15957
|
+
if (creatorOrScope === void 0) {
|
|
15958
|
+
return storeStorage;
|
|
15959
|
+
}
|
|
15960
|
+
if (typeof creatorOrScope === "string") {
|
|
15961
|
+
const scopeData = storeStorage[creatorOrScope];
|
|
15962
|
+
if (scopeData && !isStorageLike(scopeData)) return scopeData;
|
|
15963
|
+
return {};
|
|
15964
|
+
}
|
|
15965
|
+
const state = store.getState();
|
|
15966
|
+
const set = store.setState;
|
|
15967
|
+
const creator = creatorOrScope;
|
|
15968
|
+
const wrappedState = createLazyCreatorState(state);
|
|
15969
|
+
const created = creator(wrappedState);
|
|
15970
|
+
const result = {};
|
|
15971
|
+
let hasNewStorage = false;
|
|
15972
|
+
if (scope) {
|
|
15973
|
+
const currentScope = state.gpuStorage[scope] ?? {};
|
|
15974
|
+
for (const [name, storage] of Object.entries(created)) {
|
|
15975
|
+
if (currentScope[name]) {
|
|
15976
|
+
result[name] = currentScope[name];
|
|
15977
|
+
} else {
|
|
15978
|
+
if ("setName" in storage && typeof storage.setName === "function") {
|
|
15979
|
+
storage.setName(`${scope}.${name}`);
|
|
15980
|
+
}
|
|
15981
|
+
if ("name" in storage && typeof storage.name === "string") {
|
|
15982
|
+
storage.name = `${scope}.${name}`;
|
|
15983
|
+
}
|
|
15984
|
+
result[name] = storage;
|
|
15985
|
+
hasNewStorage = true;
|
|
15986
|
+
}
|
|
15987
|
+
}
|
|
15988
|
+
if (hasNewStorage) {
|
|
15989
|
+
set((s) => ({
|
|
15990
|
+
gpuStorage: {
|
|
15991
|
+
...s.gpuStorage,
|
|
15992
|
+
[scope]: { ...s.gpuStorage[scope], ...result }
|
|
15993
|
+
}
|
|
15994
|
+
}));
|
|
15995
|
+
}
|
|
15996
|
+
return result;
|
|
15997
|
+
}
|
|
15998
|
+
for (const [name, storage] of Object.entries(created)) {
|
|
15999
|
+
const existing = state.gpuStorage[name];
|
|
16000
|
+
if (existing && isStorageLike(existing)) {
|
|
16001
|
+
result[name] = existing;
|
|
16002
|
+
} else {
|
|
16003
|
+
if ("setName" in storage && typeof storage.setName === "function") {
|
|
16004
|
+
storage.setName(name);
|
|
16005
|
+
}
|
|
16006
|
+
if ("name" in storage && typeof storage.name === "string") {
|
|
16007
|
+
storage.name = name;
|
|
16008
|
+
}
|
|
16009
|
+
result[name] = storage;
|
|
16010
|
+
hasNewStorage = true;
|
|
16011
|
+
}
|
|
16012
|
+
}
|
|
16013
|
+
if (hasNewStorage) {
|
|
16014
|
+
set((s) => ({ gpuStorage: { ...s.gpuStorage, ...result } }));
|
|
16015
|
+
}
|
|
16016
|
+
return result;
|
|
16017
|
+
}, [store, scopeDep, readerDep, creatorDep]);
|
|
16018
|
+
return {
|
|
16019
|
+
...gpuStorage,
|
|
16020
|
+
removeStorage,
|
|
16021
|
+
clearStorage,
|
|
16022
|
+
rebuildStorage,
|
|
16023
|
+
disposeStorage: disposeStorageFn
|
|
16024
|
+
};
|
|
16025
|
+
}
|
|
16026
|
+
function rebuildAllStorage(store, scope) {
|
|
16027
|
+
store = store.getState().primaryStore ?? store;
|
|
16028
|
+
store.setState((state) => {
|
|
16029
|
+
let newStorage = state.gpuStorage;
|
|
16030
|
+
if (scope && scope !== "root") {
|
|
16031
|
+
const { [scope]: _, ...rest } = state.gpuStorage;
|
|
16032
|
+
newStorage = rest;
|
|
16033
|
+
} else if (scope === "root") {
|
|
16034
|
+
newStorage = {};
|
|
16035
|
+
for (const [key, value] of Object.entries(state.gpuStorage)) {
|
|
16036
|
+
if (!isStorageLike(value)) newStorage[key] = value;
|
|
16037
|
+
}
|
|
16038
|
+
} else {
|
|
16039
|
+
newStorage = {};
|
|
16040
|
+
}
|
|
16041
|
+
return { gpuStorage: newStorage, _hmrVersion: state._hmrVersion + 1 };
|
|
16042
|
+
});
|
|
16043
|
+
}
|
|
16044
|
+
|
|
16045
|
+
function useRenderPipeline(mainCB, setupCB) {
|
|
16381
16046
|
const store = useStore();
|
|
16382
16047
|
const { scene, camera, renderer, isLegacy } = useThree();
|
|
16383
16048
|
const callbacksRanRef = React.useRef(false);
|
|
@@ -16396,7 +16061,7 @@ function usePostProcessing(mainCB, setupCB) {
|
|
|
16396
16061
|
}, [store]);
|
|
16397
16062
|
const reset = React.useCallback(() => {
|
|
16398
16063
|
store.setState({
|
|
16399
|
-
|
|
16064
|
+
renderPipeline: null,
|
|
16400
16065
|
passes: {}
|
|
16401
16066
|
});
|
|
16402
16067
|
callbacksRanRef.current = false;
|
|
@@ -16409,13 +16074,13 @@ function usePostProcessing(mainCB, setupCB) {
|
|
|
16409
16074
|
}, []);
|
|
16410
16075
|
React.useLayoutEffect(() => {
|
|
16411
16076
|
if (isLegacy) {
|
|
16412
|
-
throw new Error("
|
|
16077
|
+
throw new Error("useRenderPipeline is only available with WebGPU renderer. Set renderer prop on Canvas.");
|
|
16413
16078
|
}
|
|
16414
16079
|
if (!renderer || !scene || !camera) return;
|
|
16415
16080
|
const state = store.getState();
|
|
16416
16081
|
const set = store.setState;
|
|
16417
16082
|
try {
|
|
16418
|
-
let pp = state.
|
|
16083
|
+
let pp = state.renderPipeline;
|
|
16419
16084
|
let currentPasses = { ...state.passes };
|
|
16420
16085
|
let justCreatedPP = false;
|
|
16421
16086
|
if (!pp) {
|
|
@@ -16432,7 +16097,7 @@ function usePostProcessing(mainCB, setupCB) {
|
|
|
16432
16097
|
}
|
|
16433
16098
|
currentPasses.scenePass = scenePass;
|
|
16434
16099
|
if (!pp.outputNode || justCreatedPP) pp.outputNode = scenePass;
|
|
16435
|
-
set({
|
|
16100
|
+
set({ renderPipeline: pp, passes: currentPasses });
|
|
16436
16101
|
const shouldRunCallbacks = justCreatedPP || !callbacksRanRef.current || !cacheValid;
|
|
16437
16102
|
if (shouldRunCallbacks) {
|
|
16438
16103
|
if (setupCBRef.current) {
|
|
@@ -16454,24 +16119,26 @@ function usePostProcessing(mainCB, setupCB) {
|
|
|
16454
16119
|
callbacksRanRef.current = true;
|
|
16455
16120
|
}
|
|
16456
16121
|
} catch (error) {
|
|
16457
|
-
console.error("[
|
|
16122
|
+
console.error("[useRenderPipeline] Setup error:", error);
|
|
16458
16123
|
}
|
|
16459
16124
|
}, [store, renderer, scene, camera, isLegacy, rebuildVersion]);
|
|
16460
16125
|
const passes = useThree((s) => s.passes);
|
|
16461
|
-
const
|
|
16126
|
+
const renderPipeline = useThree((s) => s.renderPipeline);
|
|
16462
16127
|
return {
|
|
16463
16128
|
passes,
|
|
16464
|
-
|
|
16129
|
+
renderPipeline,
|
|
16465
16130
|
clearPasses,
|
|
16466
16131
|
reset,
|
|
16467
16132
|
rebuild,
|
|
16468
|
-
// isReady indicates if
|
|
16469
|
-
isReady:
|
|
16133
|
+
// isReady indicates if RenderPipeline is configured and ready for rendering
|
|
16134
|
+
isReady: renderPipeline !== null
|
|
16470
16135
|
};
|
|
16471
16136
|
}
|
|
16472
16137
|
|
|
16473
16138
|
extend(THREE);
|
|
16474
16139
|
|
|
16140
|
+
exports.Scheduler = scheduler.Scheduler;
|
|
16141
|
+
exports.getScheduler = scheduler.getScheduler;
|
|
16475
16142
|
exports.Block = Block;
|
|
16476
16143
|
exports.Canvas = Canvas;
|
|
16477
16144
|
exports.Environment = Environment;
|
|
@@ -16487,7 +16154,6 @@ exports.R3F_BUILD_LEGACY = R3F_BUILD_LEGACY;
|
|
|
16487
16154
|
exports.R3F_BUILD_WEBGPU = R3F_BUILD_WEBGPU;
|
|
16488
16155
|
exports.REACT_INTERNAL_PROPS = REACT_INTERNAL_PROPS;
|
|
16489
16156
|
exports.RESERVED_PROPS = RESERVED_PROPS;
|
|
16490
|
-
exports.Scheduler = Scheduler;
|
|
16491
16157
|
exports.Texture = Texture;
|
|
16492
16158
|
exports._roots = _roots;
|
|
16493
16159
|
exports.act = act;
|
|
@@ -16523,7 +16189,6 @@ exports.getInstanceProps = getInstanceProps;
|
|
|
16523
16189
|
exports.getPrimary = getPrimary;
|
|
16524
16190
|
exports.getPrimaryIds = getPrimaryIds;
|
|
16525
16191
|
exports.getRootState = getRootState;
|
|
16526
|
-
exports.getScheduler = getScheduler;
|
|
16527
16192
|
exports.getUuidPrefix = getUuidPrefix;
|
|
16528
16193
|
exports.hasConstructor = hasConstructor;
|
|
16529
16194
|
exports.hasPrimary = hasPrimary;
|
|
@@ -16543,7 +16208,9 @@ exports.isVectorLike = isVectorLike;
|
|
|
16543
16208
|
exports.once = once;
|
|
16544
16209
|
exports.prepare = prepare;
|
|
16545
16210
|
exports.presetsObj = presetsObj;
|
|
16211
|
+
exports.rebuildAllBuffers = rebuildAllBuffers;
|
|
16546
16212
|
exports.rebuildAllNodes = rebuildAllNodes;
|
|
16213
|
+
exports.rebuildAllStorage = rebuildAllStorage;
|
|
16547
16214
|
exports.rebuildAllUniforms = rebuildAllUniforms;
|
|
16548
16215
|
exports.reconciler = reconciler;
|
|
16549
16216
|
exports.registerPrimary = registerPrimary;
|
|
@@ -16556,8 +16223,10 @@ exports.unregisterPrimary = unregisterPrimary;
|
|
|
16556
16223
|
exports.updateCamera = updateCamera;
|
|
16557
16224
|
exports.updateFrustum = updateFrustum;
|
|
16558
16225
|
exports.useBridge = useBridge;
|
|
16226
|
+
exports.useBuffers = useBuffers;
|
|
16559
16227
|
exports.useEnvironment = useEnvironment;
|
|
16560
16228
|
exports.useFrame = useFrame;
|
|
16229
|
+
exports.useGPUStorage = useGPUStorage;
|
|
16561
16230
|
exports.useGraph = useGraph;
|
|
16562
16231
|
exports.useInstanceHandle = useInstanceHandle;
|
|
16563
16232
|
exports.useIsomorphicLayoutEffect = useIsomorphicLayoutEffect;
|
|
@@ -16565,7 +16234,7 @@ exports.useLoader = useLoader;
|
|
|
16565
16234
|
exports.useLocalNodes = useLocalNodes;
|
|
16566
16235
|
exports.useMutableCallback = useMutableCallback;
|
|
16567
16236
|
exports.useNodes = useNodes;
|
|
16568
|
-
exports.
|
|
16237
|
+
exports.useRenderPipeline = useRenderPipeline;
|
|
16569
16238
|
exports.useRenderTarget = useRenderTarget;
|
|
16570
16239
|
exports.useStore = useStore;
|
|
16571
16240
|
exports.useTexture = useTexture;
|