@needle-tools/engine 4.8.9 → 4.9.0-alpha
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/CHANGELOG.md +2 -0
- package/dist/gltf-progressive-DWiyqrwB.umd.cjs +8 -0
- package/dist/gltf-progressive-DhE1A6hX.min.js +8 -0
- package/dist/{gltf-progressive-BcHT3Nyo.js → gltf-progressive-egsMzRdv.js} +384 -369
- package/dist/{needle-engine.bundle-BdgNRB4B.js → needle-engine.bundle-BmZiljES.js} +7879 -7642
- package/dist/{needle-engine.bundle-TQyyn3pE.min.js → needle-engine.bundle-D_zlE1Pj.min.js} +142 -142
- package/dist/{needle-engine.bundle-DGca1cic.umd.cjs → needle-engine.bundle-n9XV_9nh.umd.cjs} +138 -138
- package/dist/needle-engine.js +305 -301
- package/dist/needle-engine.min.js +1 -1
- package/dist/needle-engine.umd.cjs +1 -1
- package/dist/{postprocessing-Ywv5oKkX.min.js → postprocessing-B_FzkwDz.min.js} +1 -1
- package/dist/{postprocessing-ORx-0eCx.js → postprocessing-DP1U_BpT.js} +2 -2
- package/dist/{postprocessing-CVb_x9YY.umd.cjs → postprocessing-DTX5VXrj.umd.cjs} +1 -1
- package/dist/rapier-BJaux8TQ.js +5217 -0
- package/dist/rapier-Bd0qRV1r.umd.cjs +1 -0
- package/dist/rapier-CnHGx3sO.min.js +1 -0
- package/dist/{three-Dceyffus.umd.cjs → three-BK56xWDs.umd.cjs} +24 -24
- package/dist/{three-BRSLmpyi.js → three-CsHK73Zc.js} +1 -0
- package/dist/{three-CsmWHVn7.min.js → three-TNFQHSFa.min.js} +25 -25
- package/dist/{three-examples-BX_Sktc9.min.js → three-examples-Bph291U2.min.js} +1 -1
- package/dist/{three-examples-CNexix3E.js → three-examples-BvMpKSun.js} +1 -1
- package/dist/{three-examples-DWxXVnws.umd.cjs → three-examples-C9WfZu-X.umd.cjs} +1 -1
- package/dist/{three-mesh-ui-gqAXlGNB.js → three-mesh-ui-CN6aRT7i.js} +1 -1
- package/dist/{three-mesh-ui-Cdh2iW8b.umd.cjs → three-mesh-ui-DnxkZWNA.umd.cjs} +1 -1
- package/dist/{three-mesh-ui-Bwy12Qvg.min.js → three-mesh-ui-n_qS2BM-.min.js} +1 -1
- package/dist/{vendor-xfQ8tKF3.umd.cjs → vendor-8le8g4MS.umd.cjs} +1 -1
- package/dist/{vendor-Z4SPrTcP.js → vendor-Msb9AgYE.js} +1 -1
- package/dist/{vendor-C43vobGc.min.js → vendor-yDFiCnCw.min.js} +1 -1
- package/lib/engine/codegen/register_types.js +4 -0
- package/lib/engine/codegen/register_types.js.map +1 -1
- package/lib/engine/engine_physics_rapier.js +3 -2
- package/lib/engine/engine_physics_rapier.js.map +1 -1
- package/lib/engine/engine_three_utils.js +4 -2
- package/lib/engine/engine_three_utils.js.map +1 -1
- package/lib/engine/xr/NeedleXRController.js +30 -9
- package/lib/engine/xr/NeedleXRController.js.map +1 -1
- package/lib/engine/xr/NeedleXRSession.js +18 -13
- package/lib/engine/xr/NeedleXRSession.js.map +1 -1
- package/lib/engine-components/api.d.ts +1 -0
- package/lib/engine-components/api.js +1 -0
- package/lib/engine-components/api.js.map +1 -1
- package/lib/engine-components/codegen/components.d.ts +3 -0
- package/lib/engine-components/codegen/components.js +3 -0
- package/lib/engine-components/codegen/components.js.map +1 -1
- package/lib/engine-components/export/usdz/extensions/behavior/Behaviour.d.ts +1 -1
- package/lib/engine-components/splines/Spline.d.ts +58 -0
- package/lib/engine-components/splines/Spline.js +270 -0
- package/lib/engine-components/splines/Spline.js.map +1 -0
- package/lib/engine-components/splines/SplineUtils.d.ts +12 -0
- package/lib/engine-components/splines/SplineUtils.js +33 -0
- package/lib/engine-components/splines/SplineUtils.js.map +1 -0
- package/lib/engine-components/splines/SplineWalker.d.ts +47 -0
- package/lib/engine-components/splines/SplineWalker.js +113 -0
- package/lib/engine-components/splines/SplineWalker.js.map +1 -0
- package/lib/engine-components/splines/index.d.ts +3 -0
- package/lib/engine-components/splines/index.js +4 -0
- package/lib/engine-components/splines/index.js.map +1 -0
- package/lib/engine-components/webxr/controllers/XRControllerModel.js +2 -2
- package/lib/engine-components/webxr/controllers/XRControllerModel.js.map +1 -1
- package/lib/engine-components/webxr/controllers/XRControllerMovement.js +4 -0
- package/lib/engine-components/webxr/controllers/XRControllerMovement.js.map +1 -1
- package/package.json +3 -3
- package/plugins/vite/alias.js +3 -2
- package/src/engine/codegen/register_types.ts +4 -0
- package/src/engine/engine_physics_rapier.ts +3 -2
- package/src/engine/engine_three_utils.ts +5 -2
- package/src/engine/xr/NeedleXRController.ts +39 -15
- package/src/engine/xr/NeedleXRSession.ts +18 -13
- package/src/engine-components/api.ts +1 -0
- package/src/engine-components/codegen/components.ts +3 -0
- package/src/engine-components/splines/Spline.ts +284 -0
- package/src/engine-components/splines/SplineUtils.ts +32 -0
- package/src/engine-components/splines/SplineWalker.ts +106 -0
- package/src/engine-components/splines/index.ts +3 -0
- package/src/engine-components/webxr/controllers/XRControllerModel.ts +3 -2
- package/src/engine-components/webxr/controllers/XRControllerMovement.ts +5 -1
- package/dist/gltf-progressive-CH3Q4H06.umd.cjs +0 -8
- package/dist/gltf-progressive-DR6HqF_h.min.js +0 -8
- package/dist/rapier--oeYP_h7.umd.cjs +0 -1
- package/dist/rapier-B3xpyPtq.js +0 -5142
- package/dist/rapier-CyWhltHY.min.js +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"XRControllerMovement.js","sourceRoot":"","sources":["../../../../src/engine-components/webxr/controllers/XRControllerMovement.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"XRControllerMovement.js","sourceRoot":"","sources":["../../../../src/engine-components/webxr/controllers/XRControllerMovement.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@needle-tools/engine",
|
|
3
|
-
"version": "4.
|
|
3
|
+
"version": "4.9.0-alpha",
|
|
4
4
|
"description": "Needle Engine is a web-based runtime for 3D apps. It runs on your machine for development with great integrations into editors like Unity or Blender - and can be deployed onto any device! It is flexible, extensible and networking and XR are built-in.",
|
|
5
5
|
"main": "dist/needle-engine.min.js",
|
|
6
6
|
"exports": {
|
|
@@ -92,8 +92,8 @@
|
|
|
92
92
|
"quest"
|
|
93
93
|
],
|
|
94
94
|
"dependencies": {
|
|
95
|
-
"@dimforge/rapier3d-compat": "^0.
|
|
96
|
-
"@needle-tools/gltf-progressive": "3.3.
|
|
95
|
+
"@dimforge/rapier3d-compat": "^0.19.0",
|
|
96
|
+
"@needle-tools/gltf-progressive": "3.3.3",
|
|
97
97
|
"@needle-tools/three-animation-pointer": "1.0.2",
|
|
98
98
|
"@webxr-input-profiles/motion-controllers": "^1.0.0",
|
|
99
99
|
"flatbuffers": "2.0.4",
|
package/plugins/vite/alias.js
CHANGED
|
@@ -60,8 +60,9 @@ const packages_to_resolve = {
|
|
|
60
60
|
'postprocessing': "auto-resolve",
|
|
61
61
|
'@dimforge/rapier3d-compat': "auto-resolve",
|
|
62
62
|
|
|
63
|
-
|
|
64
|
-
'@needle-tools/
|
|
63
|
+
// Note: this isnt necessary anymore since we exclude needle-engine from optimization when locally installed in the dev server
|
|
64
|
+
// '@needle-tools/gltf-progressive': "auto-resolve",
|
|
65
|
+
// '@needle-tools/materialx': "auto-resolve",
|
|
65
66
|
}
|
|
66
67
|
|
|
67
68
|
/**
|
|
@@ -95,6 +95,8 @@ import { SmoothFollow } from "../../engine-components/SmoothFollow.js";
|
|
|
95
95
|
import { SpatialTriggerReceiver } from "../../engine-components/SpatialTrigger.js";
|
|
96
96
|
import { SpatialTrigger } from "../../engine-components/SpatialTrigger.js";
|
|
97
97
|
import { SpectatorCamera } from "../../engine-components/SpectatorCamera.js";
|
|
98
|
+
import { SplineContainer } from "../../engine-components/splines/Spline.js";
|
|
99
|
+
import { SplineWalker } from "../../engine-components/splines/SplineWalker.js";
|
|
98
100
|
import { SpriteRenderer } from "../../engine-components/SpriteRenderer.js";
|
|
99
101
|
import { SyncedCamera } from "../../engine-components/SyncedCamera.js";
|
|
100
102
|
import { SyncedRoom } from "../../engine-components/SyncedRoom.js";
|
|
@@ -245,6 +247,8 @@ TypeStore.add("SmoothFollow", SmoothFollow);
|
|
|
245
247
|
TypeStore.add("SpatialTriggerReceiver", SpatialTriggerReceiver);
|
|
246
248
|
TypeStore.add("SpatialTrigger", SpatialTrigger);
|
|
247
249
|
TypeStore.add("SpectatorCamera", SpectatorCamera);
|
|
250
|
+
TypeStore.add("SplineContainer", SplineContainer);
|
|
251
|
+
TypeStore.add("SplineWalker", SplineWalker);
|
|
248
252
|
TypeStore.add("SpriteRenderer", SpriteRenderer);
|
|
249
253
|
TypeStore.add("SyncedCamera", SyncedCamera);
|
|
250
254
|
TypeStore.add("SyncedRoom", SyncedRoom);
|
|
@@ -1109,13 +1109,14 @@ export class RapierPhysics implements IPhysicsEngine {
|
|
|
1109
1109
|
else if (dt !== undefined) {
|
|
1110
1110
|
// if we make to sudden changes to the timestep the physics can get unstable
|
|
1111
1111
|
// https://rapier.rs/docs/user_guides/javascript/integration_parameters/#dt
|
|
1112
|
-
|
|
1112
|
+
const newTimestamp = Mathf.lerp(this.world.timestep, dt, 0.8);
|
|
1113
|
+
this.world.timestep = newTimestamp;
|
|
1113
1114
|
}
|
|
1114
1115
|
try {
|
|
1115
1116
|
this.world.step(this.eventQueue);
|
|
1116
1117
|
}
|
|
1117
1118
|
catch (e) {
|
|
1118
|
-
console.warn("Error running physics step", e);
|
|
1119
|
+
console.warn("Error running physics step", { timestep: this.world.timestep }, e);
|
|
1119
1120
|
}
|
|
1120
1121
|
this._isUpdatingPhysicsWorld = false;
|
|
1121
1122
|
}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { AnimationAction, Box3, Box3Helper, Camera, Color, DepthTexture, Euler, GridHelper, Layers, Material, Mesh, MeshStandardMaterial, Object3D, OrthographicCamera, PerspectiveCamera, PlaneGeometry, Quaternion, Scene, ShadowMaterial, Texture, Uniform, Vector2Like, Vector3, WebGLRenderTarget } from "three";
|
|
2
2
|
import { ShaderMaterial, WebGLRenderer } from "three";
|
|
3
3
|
import { GroundedSkybox } from "three/examples/jsm/objects/GroundedSkybox.js";
|
|
4
|
+
import { rendererReference } from "three/src/nodes/TSL.js";
|
|
4
5
|
|
|
5
6
|
import { useForAutoFit } from "./engine_camera.js";
|
|
6
7
|
import { Mathf } from "./engine_math.js"
|
|
@@ -587,8 +588,10 @@ export class Graphics {
|
|
|
587
588
|
renderer.state.buffers.depth.setMask(depthWrite);
|
|
588
589
|
|
|
589
590
|
renderer.setClearColor(new Color(0, 0, 0), 0);
|
|
590
|
-
|
|
591
|
-
|
|
591
|
+
if (renderer.pixelRatio !== window.devicePixelRatio) {
|
|
592
|
+
if (renderer.xr.isPresenting === false)
|
|
593
|
+
renderer.setPixelRatio(window.devicePixelRatio);
|
|
594
|
+
}
|
|
592
595
|
renderer.setRenderTarget(target);
|
|
593
596
|
renderer.clear();
|
|
594
597
|
renderer.render(this.scene, this.perspectiveCam);
|
|
@@ -398,8 +398,8 @@ export class NeedleXRController implements IPointerHitEventReceiver {
|
|
|
398
398
|
C:${this.connected ? "x" : "-"} T:${this.isTracking ? "x" : "-"} Hand:${this.inputSource.hand ? "x" : "-"} Pen: ${this._isMxInk ? "x" : "-"}`;
|
|
399
399
|
if (this.inputSource.hand) debugStr += `\nPinch: ${this.getGesture("pinch")?.value.toFixed(3)}`;
|
|
400
400
|
debugStr += "\n" + profileStr;
|
|
401
|
-
debugStr += "\n" + (this.inputSource.targetRaySpace ? `Ray: x` : "Ray: -") +
|
|
402
|
-
(this.inputSource.gripSpace ? " Grip: x" : " Grip: -") +
|
|
401
|
+
debugStr += "\n" + (this.inputSource.targetRaySpace ? `Ray: x` : "Ray: -") +
|
|
402
|
+
(this.inputSource.gripSpace ? " Grip: x" : " Grip: -") +
|
|
403
403
|
(this.inputSource.gamepad ? ` Gamepad: ${this.inputSource.gamepad.mapping}` : " Gamepad: -");
|
|
404
404
|
if (this.inputSource.gamepad) {
|
|
405
405
|
const gp = this.inputSource.gamepad;
|
|
@@ -415,7 +415,7 @@ C:${this.connected ? "x" : "-"} T:${this.isTracking ? "x" : "-"} Hand:${this.inp
|
|
|
415
415
|
this._handJointPoses.clear();
|
|
416
416
|
this._hand_wristDotUp = undefined;
|
|
417
417
|
|
|
418
|
-
if (!this.xr.referenceSpace) {
|
|
418
|
+
if (!this.xr.referenceSpace || !this.inputSource.gamepad?.connected) {
|
|
419
419
|
this._isTracking = false;
|
|
420
420
|
return;
|
|
421
421
|
}
|
|
@@ -460,7 +460,7 @@ C:${this.connected ? "x" : "-"} T:${this.isTracking ? "x" : "-"} Hand:${this.inp
|
|
|
460
460
|
|
|
461
461
|
// update controller object parent – needs to be parented to the rig, which
|
|
462
462
|
// implicitly is the same object as the camera parent.
|
|
463
|
-
if (this.xr.context.mainCamera?.parent) {
|
|
463
|
+
if (this.xr.context.mainCamera?.parent) {
|
|
464
464
|
if (this._object.parent !== this.xr.context.mainCamera?.parent)
|
|
465
465
|
this.xr.context.mainCamera.parent.add(this._object);
|
|
466
466
|
if (this._gripSpaceObject !== undefined && this._gripSpaceObject?.parent !== this.xr.context.mainCamera?.parent)
|
|
@@ -594,6 +594,24 @@ C:${this.connected ? "x" : "-"} T:${this.isTracking ? "x" : "-"} Hand:${this.inp
|
|
|
594
594
|
return this.getGesture("pinch");
|
|
595
595
|
}
|
|
596
596
|
return this.toNeedleGamepadButton(0, key);
|
|
597
|
+
|
|
598
|
+
case "xr-standard-trigger":
|
|
599
|
+
if (this.inputSource.gamepad) {
|
|
600
|
+
return this.toNeedleGamepadButton(0, key);
|
|
601
|
+
}
|
|
602
|
+
break;
|
|
603
|
+
|
|
604
|
+
case "xr-standard-squeeze":
|
|
605
|
+
if (this.inputSource.gamepad) {
|
|
606
|
+
return this.toNeedleGamepadButton(1, key);
|
|
607
|
+
}
|
|
608
|
+
break;
|
|
609
|
+
|
|
610
|
+
case "xr-standard-thumbstick":
|
|
611
|
+
if (this.inputSource.gamepad) {
|
|
612
|
+
return this.toNeedleGamepadButton(3, key);
|
|
613
|
+
}
|
|
614
|
+
break;
|
|
597
615
|
}
|
|
598
616
|
|
|
599
617
|
|
|
@@ -694,12 +712,18 @@ C:${this.connected ? "x" : "-"} T:${this.isTracking ? "x" : "-"} Hand:${this.inp
|
|
|
694
712
|
getStick(key: StickName | "primary"): Vec3 {
|
|
695
713
|
if (!this._layout) return { x: 0, y: 0, z: 0 };
|
|
696
714
|
|
|
715
|
+
// Hands dont have thumbsicks
|
|
716
|
+
if (this.isHand) {
|
|
717
|
+
return { x: 0, y: 0, z: 0 };
|
|
718
|
+
}
|
|
719
|
+
|
|
697
720
|
if (key === "primary") {
|
|
698
|
-
|
|
699
|
-
const
|
|
700
|
-
//
|
|
701
|
-
|
|
702
|
-
|
|
721
|
+
if (this._layout.components["xr-standard-thumbstick"]) key = "xr-standard-thumbstick";
|
|
722
|
+
// const x = this.inputSource.gamepad?.axes[0] || 0;
|
|
723
|
+
// const y = this.inputSource.gamepad?.axes[1] || 0;
|
|
724
|
+
// // the primary thumbstick is button 3 (see gamepads module explainer)
|
|
725
|
+
// const z = this.inputSource.gamepad?.buttons[3]?.value || 0;
|
|
726
|
+
// return { x, y, z }
|
|
703
727
|
}
|
|
704
728
|
|
|
705
729
|
const componentModel = this._layout?.components[key];
|
|
@@ -709,12 +733,12 @@ C:${this.connected ? "x" : "-"} T:${this.isTracking ? "x" : "-"} Hand:${this.inp
|
|
|
709
733
|
if (this.inputSource.gamepad) {
|
|
710
734
|
const xIndex = componentModel.gamepadIndices!.xAxis!;
|
|
711
735
|
const yIndex = componentModel.gamepadIndices!.yAxis!;
|
|
712
|
-
let x = this.inputSource.gamepad
|
|
713
|
-
let y = this.inputSource.gamepad
|
|
736
|
+
let x = this.inputSource.gamepad.axes[xIndex] || 0;
|
|
737
|
+
let y = this.inputSource.gamepad.axes[yIndex] || 0;
|
|
714
738
|
x *= -1;
|
|
715
739
|
y *= -1;
|
|
716
740
|
const buttonIndex = componentModel.gamepadIndices!.button!;
|
|
717
|
-
const z = this.inputSource.gamepad?.buttons[buttonIndex]?.value;
|
|
741
|
+
const z = this.inputSource.gamepad?.buttons[buttonIndex]?.value || 0;
|
|
718
742
|
return { x, y, z }
|
|
719
743
|
}
|
|
720
744
|
}
|
|
@@ -731,13 +755,13 @@ C:${this.connected ? "x" : "-"} T:${this.isTracking ? "x" : "-"} Hand:${this.inp
|
|
|
731
755
|
private initialize() {
|
|
732
756
|
// WORKAROUND for hand controllers that don't have a select event
|
|
733
757
|
this._hasSelectEvent = this.profiles.includes("generic-hand-select") || this.profiles.some(p => p.startsWith("generic-trigger"));
|
|
734
|
-
|
|
758
|
+
|
|
735
759
|
// Used to determine special layout for Quest controllers, e.g. last button is menu button
|
|
736
760
|
this._isMetaQuestTouchController = this.profiles.includes("meta-quest-touch-plus") || this.profiles.includes("oculus-touch-v3");
|
|
737
761
|
|
|
738
762
|
// Proper profile starting with v69 and browser 35.1
|
|
739
763
|
this._isMxInk = this.profiles.includes("logitech-mx-ink")
|
|
740
|
-
|
|
764
|
+
|
|
741
765
|
if (!this._layout) {
|
|
742
766
|
// Ignore transient-pointer since we likely don't want to spawn a controller visual just for a temporary pointer.
|
|
743
767
|
// TODO we should check how this is actually handled on Quest Browser when the transient-pointer flag is on.
|
|
@@ -953,7 +977,7 @@ C:${this.connected ? "x" : "-"} T:${this.isTracking ? "x" : "-"} Hand:${this.inp
|
|
|
953
977
|
if (menuButtonState) {
|
|
954
978
|
if (menuButtonState.isDown) {
|
|
955
979
|
const menu = this.context.menu;
|
|
956
|
-
if (menu.spatialMenuIsVisible)
|
|
980
|
+
if (menu.spatialMenuIsVisible)
|
|
957
981
|
menu.setSpatialMenuVisible(false);
|
|
958
982
|
else
|
|
959
983
|
this.context.menu.setSpatialMenuVisible(true);
|
|
@@ -530,7 +530,7 @@ export class NeedleXRSession implements INeedleXRSession {
|
|
|
530
530
|
listener({ mode, init });
|
|
531
531
|
}
|
|
532
532
|
if (debug) showBalloonMessage("Requesting " + mode + " session (" + Date.now() + ")");
|
|
533
|
-
this._currentSessionRequest = navigator
|
|
533
|
+
this._currentSessionRequest = navigator?.xr?.requestSession(mode, init);
|
|
534
534
|
this._currentSessionRequestMode = mode;
|
|
535
535
|
/**@type {XRSystem} */
|
|
536
536
|
const newSession = await (this._currentSessionRequest)?.catch(e => {
|
|
@@ -1053,10 +1053,13 @@ export class NeedleXRSession implements INeedleXRSession {
|
|
|
1053
1053
|
|
|
1054
1054
|
/** Disconnects the controller, invokes events and notifies previou controller (if any) */
|
|
1055
1055
|
private disconnectInputSource(inputSource: XRInputSource) {
|
|
1056
|
-
const handleRemove = (oldController: NeedleXRController,
|
|
1056
|
+
const handleRemove = (oldController: NeedleXRController, array: Array<NeedleXRController>) => {
|
|
1057
1057
|
if (oldController.inputSource === inputSource) {
|
|
1058
1058
|
if (debug) console.log("Disconnecting controller", oldController.index);
|
|
1059
|
-
|
|
1059
|
+
|
|
1060
|
+
const index = array.indexOf(oldController);
|
|
1061
|
+
if(index >= 0) array.splice(index, 1);
|
|
1062
|
+
|
|
1060
1063
|
this.invokeControllerEvent(oldController, this._controllerRemoved, "removed");
|
|
1061
1064
|
const args: NeedleXRControllerEventArgs = {
|
|
1062
1065
|
xr: this,
|
|
@@ -1069,13 +1072,15 @@ export class NeedleXRSession implements INeedleXRSession {
|
|
|
1069
1072
|
oldController.onDisconnected();
|
|
1070
1073
|
}
|
|
1071
1074
|
}
|
|
1072
|
-
|
|
1073
|
-
|
|
1074
|
-
|
|
1075
|
+
const copy = [...this.controllers];
|
|
1076
|
+
for (let i = copy.length - 1; i >= 0; i--) {
|
|
1077
|
+
const oldController = copy[i];
|
|
1078
|
+
handleRemove(oldController, this.controllers);
|
|
1075
1079
|
}
|
|
1076
|
-
|
|
1077
|
-
|
|
1078
|
-
|
|
1080
|
+
const copyNew = [...this._newControllers];
|
|
1081
|
+
for (let i = copyNew.length - 1; i >= 0; i--) {
|
|
1082
|
+
const oldController = copyNew[i];
|
|
1083
|
+
handleRemove(oldController, this._newControllers);
|
|
1079
1084
|
}
|
|
1080
1085
|
}
|
|
1081
1086
|
|
|
@@ -1130,8 +1135,8 @@ export class NeedleXRSession implements INeedleXRSession {
|
|
|
1130
1135
|
for (let i = 0; i < copy.length; i++) {
|
|
1131
1136
|
this.disconnectInputSource(copy[i].inputSource);
|
|
1132
1137
|
}
|
|
1133
|
-
this._newControllers.length = 0;
|
|
1134
1138
|
this.controllers.length = 0;
|
|
1139
|
+
this._newControllers.length = 0;
|
|
1135
1140
|
|
|
1136
1141
|
// we want to call leave XR for *all* scripts that are still registered
|
|
1137
1142
|
// even if they might already be destroyed e.g. by the WebXR component (it destroys the default controller scripts)
|
|
@@ -1318,8 +1323,6 @@ export class NeedleXRSession implements INeedleXRSession {
|
|
|
1318
1323
|
continue;
|
|
1319
1324
|
}
|
|
1320
1325
|
this.invokeCallback_ControllerAdded(script, controller);
|
|
1321
|
-
// if (script.onXRControllerAdded)
|
|
1322
|
-
// script.onXRControllerAdded({ xr: this, controller, change: "added" });
|
|
1323
1326
|
}
|
|
1324
1327
|
}
|
|
1325
1328
|
this.controllers.sort((a, b) => a.index - b.index);
|
|
@@ -1558,9 +1561,10 @@ export class NeedleXRSession implements INeedleXRSession {
|
|
|
1558
1561
|
const rigWorldScale = getWorldScale(this.rig.gameObject);
|
|
1559
1562
|
minNearPlane *= rigWorldScale.x;
|
|
1560
1563
|
}
|
|
1561
|
-
if (this._camera instanceof PerspectiveCamera && this._camera.near
|
|
1564
|
+
if (this._camera instanceof PerspectiveCamera && Math.abs(this._camera.near - minNearPlane) > .0001) {
|
|
1562
1565
|
this.originalCameraNearPlane = this._camera.near;
|
|
1563
1566
|
this._camera.near = minNearPlane;
|
|
1567
|
+
if(debug) console.debug(`Setting camera near plane to ${minNearPlane} (was ${this.originalCameraNearPlane}) to account for XR rendering scale`);
|
|
1564
1568
|
}
|
|
1565
1569
|
}
|
|
1566
1570
|
}
|
|
@@ -1572,6 +1576,7 @@ export class NeedleXRSession implements INeedleXRSession {
|
|
|
1572
1576
|
|
|
1573
1577
|
if (this._camera instanceof PerspectiveCamera && this.originalCameraNearPlane != undefined) {
|
|
1574
1578
|
this._camera.near = this.originalCameraNearPlane;
|
|
1579
|
+
this.originalCameraNearPlane = undefined;
|
|
1575
1580
|
}
|
|
1576
1581
|
}
|
|
1577
1582
|
|
|
@@ -55,6 +55,7 @@ export { DragMode } from "./DragControls.js";
|
|
|
55
55
|
export type { DropListenerNetworkEventArguments, DropListenerOnDropArguments } from "./DropListener.js";
|
|
56
56
|
export { type FitCameraOptions } from "./OrbitControls.js";
|
|
57
57
|
export * from "./particlesystem/api.js"
|
|
58
|
+
export * from "./splines/index.js";
|
|
58
59
|
|
|
59
60
|
// for correct type resolution in JSDoc
|
|
60
61
|
import type { PhysicsMaterial } from "../engine/engine_physics.types.js";
|
|
@@ -150,6 +150,9 @@ export { SmoothFollow } from "../SmoothFollow.js";
|
|
|
150
150
|
export { SpatialTriggerReceiver } from "../SpatialTrigger.js";
|
|
151
151
|
export { SpatialTrigger } from "../SpatialTrigger.js";
|
|
152
152
|
export { SpectatorCamera } from "../SpectatorCamera.js";
|
|
153
|
+
export { SplineData } from "../splines/Spline.js";
|
|
154
|
+
export { SplineContainer } from "../splines/Spline.js";
|
|
155
|
+
export { SplineWalker } from "../splines/SplineWalker.js";
|
|
153
156
|
export { Sprite } from "../SpriteRenderer.js";
|
|
154
157
|
export { SpriteSheet } from "../SpriteRenderer.js";
|
|
155
158
|
export { SpriteData } from "../SpriteRenderer.js";
|