@needle-tools/engine 3.32.10-alpha → 3.32.11-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 +8 -0
- package/dist/needle-engine.js +1110 -1074
- package/dist/needle-engine.light.js +1134 -1098
- package/dist/needle-engine.light.min.js +63 -63
- package/dist/needle-engine.light.umd.cjs +118 -118
- package/dist/needle-engine.min.js +64 -64
- package/dist/needle-engine.umd.cjs +73 -73
- package/lib/engine/engine_input.d.ts +8 -5
- package/lib/engine/engine_input.js +15 -7
- package/lib/engine/engine_input.js.map +1 -1
- package/lib/engine/xr/NeedleXRController.d.ts +9 -0
- package/lib/engine/xr/NeedleXRController.js +38 -27
- package/lib/engine/xr/NeedleXRController.js.map +1 -1
- package/lib/engine/xr/NeedleXRSession.d.ts +5 -1
- package/lib/engine/xr/NeedleXRSession.js +5 -1
- package/lib/engine/xr/NeedleXRSession.js.map +1 -1
- package/lib/engine-components/DragControls.js +2 -0
- package/lib/engine-components/DragControls.js.map +1 -1
- package/lib/engine-components/ui/EventSystem.js +2 -0
- package/lib/engine-components/ui/EventSystem.js.map +1 -1
- package/lib/engine-components/ui/PointerEvents.js +3 -0
- package/lib/engine-components/ui/PointerEvents.js.map +1 -1
- package/lib/engine-components/webxr/WebXRButtons.d.ts +22 -4
- package/lib/engine-components/webxr/WebXRButtons.js +25 -4
- package/lib/engine-components/webxr/WebXRButtons.js.map +1 -1
- package/package.json +1 -1
- package/src/engine/engine_input.ts +20 -11
- package/src/engine/xr/NeedleXRController.ts +42 -24
- package/src/engine/xr/NeedleXRSession.ts +5 -1
- package/src/engine-components/DragControls.ts +1 -0
- package/src/engine-components/ui/EventSystem.ts +1 -0
- package/src/engine-components/ui/PointerEvents.ts +3 -0
- package/src/engine-components/webxr/WebXRButtons.ts +25 -4
|
@@ -101,7 +101,10 @@ export class NeedleWebXRHtmlElement extends HTMLElement {
|
|
|
101
101
|
}
|
|
102
102
|
/** @returns the quicklook button if it was created */
|
|
103
103
|
get quicklookButton() { return this.shadowRoot?.querySelector("[data-needle='quicklook-button']"); }
|
|
104
|
-
/** get or create the quicklook button
|
|
104
|
+
/** get or create the quicklook button
|
|
105
|
+
* Behaviour of the button:
|
|
106
|
+
* - if the button is clicked a USDZExporter component will be searched for in the scene and if found, it will be used to export the scene to USDZ / Quicklook
|
|
107
|
+
*/
|
|
105
108
|
createQuicklookButton() {
|
|
106
109
|
const existingButton = this.shadowRoot?.querySelector("[data-needle='quicklook-button']");
|
|
107
110
|
if (existingButton)
|
|
@@ -114,13 +117,22 @@ export class NeedleWebXRHtmlElement extends HTMLElement {
|
|
|
114
117
|
if (usdzExporter) {
|
|
115
118
|
usdzExporter.exportAsync();
|
|
116
119
|
}
|
|
120
|
+
else {
|
|
121
|
+
console.warn("No USDZExporter component found in the scene");
|
|
122
|
+
}
|
|
117
123
|
});
|
|
118
124
|
this.shadowRoot?.appendChild(button);
|
|
119
125
|
return button;
|
|
120
126
|
}
|
|
121
127
|
/** @returns the WebXR AR button if it was created */
|
|
122
128
|
get arButton() { return this.shadowRoot?.querySelector("[data-needle='webxr-ar-button']"); }
|
|
123
|
-
/** get or create the WebXR AR button
|
|
129
|
+
/** get or create the WebXR AR button
|
|
130
|
+
* @param init optional session init options
|
|
131
|
+
* Behaviour of the button:
|
|
132
|
+
* - if the device supports AR, the button will be visible and clickable
|
|
133
|
+
* - if the device does not support AR, the button will be hidden
|
|
134
|
+
* - if the device changes and now supports AR, the button will be visible
|
|
135
|
+
*/
|
|
124
136
|
createARButton(init) {
|
|
125
137
|
const existingButton = this.shadowRoot?.querySelector("[data-needle='webxr-ar-button']");
|
|
126
138
|
if (existingButton)
|
|
@@ -139,7 +151,13 @@ export class NeedleWebXRHtmlElement extends HTMLElement {
|
|
|
139
151
|
}
|
|
140
152
|
/** @returns the WebXR VR button if it was created */
|
|
141
153
|
get vrButton() { return this.shadowRoot?.querySelector("[data-needle='webxr-vr-button']"); }
|
|
142
|
-
/** get or create the WebXR VR button
|
|
154
|
+
/** get or create the WebXR VR button
|
|
155
|
+
* @param init optional session init options
|
|
156
|
+
* Behaviour of the button:
|
|
157
|
+
* - if the device supports VR, the button will be visible and clickable
|
|
158
|
+
* - if the device does not support VR, the button will be hidden
|
|
159
|
+
* - if the device changes and now supports VR, the button will be visible
|
|
160
|
+
*/
|
|
143
161
|
createVRButton(init) {
|
|
144
162
|
const hasButton = this.shadowRoot?.querySelector("[data-needle='webxr-vr-button']");
|
|
145
163
|
if (hasButton)
|
|
@@ -158,7 +176,10 @@ export class NeedleWebXRHtmlElement extends HTMLElement {
|
|
|
158
176
|
}
|
|
159
177
|
/** @returns the Send to Quest button */
|
|
160
178
|
get sendToQuestButton() { return this.shadowRoot?.querySelector("[data-needle='webxr-sendtoquest-button']"); }
|
|
161
|
-
/** get or create the Send To Quest button
|
|
179
|
+
/** get or create the Send To Quest button
|
|
180
|
+
* Behaviour of the button:
|
|
181
|
+
* - if the button is clicked, the current URL will be sent to the Oculus Browser on the Quest
|
|
182
|
+
*/
|
|
162
183
|
createSendToQuestButton() {
|
|
163
184
|
const hasButton = this.shadowRoot?.querySelector("[data-needle='webxr-sendtoquest-button']");
|
|
164
185
|
if (hasButton)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebXRButtons.js","sourceRoot":"","sources":["../../../src/engine-components/webxr/WebXRButtons.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAE9D,MAAM,gBAAgB,GAAG,sBAAsB,CAAC;AAEhD,6JAA6J;AAE7J,MAAM,OAAO,sBAAuB,SAAQ,WAAW;IAEnD,MAAM,CAAC,MAAM;QACT,OAAO,QAAQ,CAAC,aAAa,CAAC,gBAAgB,CAA2B,CAAC;IAC9E,CAAC;IAED;QACI,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;QACpC,MAAM,QAAQ,GAAG,QAAQ,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;QACpD,QAAQ,CAAC,SAAS,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;SAiFpB,CAAC;QACF,IAAI,IAAI,CAAC,UAAU;YACf,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;IACtE,CAAC;IAED,sDAAsD;IACtD,IAAI,eAAe,KAAK,OAAO,IAAI,CAAC,UAAU,EAAE,aAAa,CAAC,kCAAkC,CAA6B,CAAC,CAAC,CAAC;IAChI
|
|
1
|
+
{"version":3,"file":"WebXRButtons.js","sourceRoot":"","sources":["../../../src/engine-components/webxr/WebXRButtons.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": "3.32.
|
|
3
|
+
"version": "3.32.11-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.umd.cjs",
|
|
6
6
|
"type": "module",
|
|
@@ -58,16 +58,6 @@ export declare type NEPointerEventInit = PointerEventInit &
|
|
|
58
58
|
|
|
59
59
|
export class NEPointerEvent extends PointerEvent {
|
|
60
60
|
|
|
61
|
-
/** Unique identifier for this input: a combination of the deviceIndex + button to uniquely identify the exact input (e.g. LeftController:Button0 = 0, RightController:Button1 = 101) */
|
|
62
|
-
override readonly pointerId!: number;
|
|
63
|
-
|
|
64
|
-
// this is set via the init arguments (we override it here for intellisense to show the string options)
|
|
65
|
-
override readonly pointerType!: PointerTypeNames;
|
|
66
|
-
|
|
67
|
-
// this is set via the init arguments (we override it here for intellisense to show the string options)
|
|
68
|
-
/** The input that raised this event like `pointerdown` */
|
|
69
|
-
override readonly type!: InputEventNames;
|
|
70
|
-
|
|
71
61
|
/** the device index: mouse and touch are always 0, otherwise e.g. index of the connected Gamepad or XRController */
|
|
72
62
|
readonly deviceIndex: number;
|
|
73
63
|
|
|
@@ -94,8 +84,27 @@ export class NEPointerEvent extends PointerEvent {
|
|
|
94
84
|
isDoubleClick: boolean = false;
|
|
95
85
|
|
|
96
86
|
|
|
87
|
+
/** Unique identifier for this input: a combination of the deviceIndex + button to uniquely identify the exact input (e.g. LeftController:Button0 = 0, RightController:Button1 = 101) */
|
|
88
|
+
override get pointerId(): number { return this._pointerid; }
|
|
89
|
+
private readonly _pointerid;
|
|
90
|
+
|
|
91
|
+
// this is set via the init arguments (we override it here for intellisense to show the string options)
|
|
92
|
+
override get pointerType(): PointerTypeNames { return this._pointerType; }
|
|
93
|
+
private readonly _pointerType: PointerTypeNames;
|
|
94
|
+
|
|
95
|
+
// this is set via the init arguments (we override it here for intellisense to show the string options)
|
|
96
|
+
/** The input that raised this event like `pointerdown` */
|
|
97
|
+
override get type(): InputEventNames { return this._type; }
|
|
98
|
+
private readonly _type: InputEventNames;
|
|
99
|
+
|
|
97
100
|
constructor(type: InputEvents | InputEventNames, source: Event | null, init: NEPointerEventInit) {
|
|
98
|
-
super(type, init)
|
|
101
|
+
super(type, init);
|
|
102
|
+
// apply the init arguments. Otherwise the arguments will be undefined in the bundled / published version of needle engine
|
|
103
|
+
// so we have to be careful if we override properties - we then also need to set them in the constructor
|
|
104
|
+
this._pointerid = init.pointerId;
|
|
105
|
+
this._pointerType = init.pointerType;
|
|
106
|
+
this._type = type;
|
|
107
|
+
|
|
99
108
|
this.deviceIndex = init.deviceIndex;
|
|
100
109
|
this.origin = init.origin;
|
|
101
110
|
this.source = source;
|
|
@@ -126,6 +126,7 @@ export class NeedleXRController {
|
|
|
126
126
|
|
|
127
127
|
private readonly _gripPosition = new Vector3();
|
|
128
128
|
private readonly _gripQuaternion = new Quaternion();
|
|
129
|
+
private readonly _linearVelocity: Vector3 = new Vector3();
|
|
129
130
|
private readonly _rayPosition = new Vector3();
|
|
130
131
|
private readonly _rayQuaternion = new Quaternion();
|
|
131
132
|
|
|
@@ -133,6 +134,12 @@ export class NeedleXRController {
|
|
|
133
134
|
get gripPosition() { return getTempVector(this._gripPosition).applyMatrix4(flipForwardMatrix) }
|
|
134
135
|
/** Grip rotation in rig space */
|
|
135
136
|
get gripQuaternion() { return getTempQuaternion(this._gripQuaternion).premultiply(flipForwardQuaternion) }
|
|
137
|
+
/** Grip linear velocity in rig space
|
|
138
|
+
* @link https://developer.mozilla.org/en-US/docs/Web/API/XRPose/linearVelocity
|
|
139
|
+
*/
|
|
140
|
+
get gripLinearVelocity() {
|
|
141
|
+
return getTempVector(this._linearVelocity).applyQuaternion(flipForwardQuaternion);
|
|
142
|
+
}
|
|
136
143
|
/** Ray position in rig space */
|
|
137
144
|
get rayPosition() { return getTempVector(this._rayPosition).applyMatrix4(flipForwardMatrix) }
|
|
138
145
|
/** Ray rotation in rig space */
|
|
@@ -140,38 +147,27 @@ export class NeedleXRController {
|
|
|
140
147
|
|
|
141
148
|
/** Controller grip position in worldspace */
|
|
142
149
|
get gripWorldPosition() {
|
|
143
|
-
|
|
144
|
-
const space = this.xr.context.mainCamera?.parent;
|
|
145
|
-
if (!space) return v;
|
|
146
|
-
return v.applyMatrix4(space.matrixWorld);
|
|
150
|
+
return getTempVector(this._gripWorldPosition);
|
|
147
151
|
}
|
|
152
|
+
private readonly _gripWorldPosition: Vector3 = new Vector3();
|
|
153
|
+
|
|
148
154
|
/** Controller grip rotation in wordspace */
|
|
149
155
|
get gripWorldQuaternion() {
|
|
150
|
-
|
|
151
|
-
// flip forward because we want +Z to be forward
|
|
152
|
-
q.multiply(flipForwardQuaternion);
|
|
153
|
-
const space = this.xr.context.mainCamera?.parent;
|
|
154
|
-
if (!space) return q;
|
|
155
|
-
q.premultiply(getWorldQuaternion(space))
|
|
156
|
-
return q;
|
|
156
|
+
return getTempQuaternion(this._gripWorldQuaternion);
|
|
157
157
|
}
|
|
158
|
+
private readonly _gripWorldQuaternion: Quaternion = new Quaternion();
|
|
159
|
+
|
|
158
160
|
/** Controller ray position in worldspace */
|
|
159
161
|
get rayWorldPosition() {
|
|
160
|
-
|
|
161
|
-
const space = this.xr.context.mainCamera?.parent;
|
|
162
|
-
if (!space) return v;
|
|
163
|
-
return v.applyMatrix4(space.matrixWorld);
|
|
162
|
+
return getTempVector(this._rayWorldPosition);
|
|
164
163
|
}
|
|
164
|
+
private readonly _rayWorldPosition: Vector3 = new Vector3();
|
|
165
|
+
|
|
165
166
|
/** Controller ray rotation in wordspace */
|
|
166
167
|
get rayWorldQuaternion() {
|
|
167
|
-
|
|
168
|
-
// flip forward because we want +Z to be forward
|
|
169
|
-
.multiply(flipForwardQuaternion);
|
|
170
|
-
const space = this.xr.context.mainCamera?.parent;
|
|
171
|
-
if (!space) return q;
|
|
172
|
-
q.premultiply(getWorldQuaternion(space))
|
|
173
|
-
return q;
|
|
168
|
+
return getTempQuaternion(this._rayWorldQuaternion);
|
|
174
169
|
}
|
|
170
|
+
private readonly _rayWorldQuaternion: Quaternion = new Quaternion();
|
|
175
171
|
|
|
176
172
|
/** The controller ray in worldspace */
|
|
177
173
|
get ray(): Ray {
|
|
@@ -181,6 +177,7 @@ export class NeedleXRController {
|
|
|
181
177
|
}
|
|
182
178
|
private readonly _ray;
|
|
183
179
|
|
|
180
|
+
|
|
184
181
|
/** The controller object space.
|
|
185
182
|
* You can use it to attach objects to the controller.
|
|
186
183
|
* Children will be automatically detached and put into the scene when the controller disconnects
|
|
@@ -246,8 +243,6 @@ export class NeedleXRController {
|
|
|
246
243
|
return;
|
|
247
244
|
}
|
|
248
245
|
|
|
249
|
-
// TODO: we might actually want to apply the rotation here now already to avoid the matrix multiplications in the vector and quaternion getters since we now ALWAYS deal witht the rotated data (previously the camera was rotated before calling the update methods hence we needed other data etc but this has been changed in 99a8b96fe03676078e194f5504743576a19a9b1a and now the camera is rotated at the very end of the frame - or at least it should be - which also fixed the issue with selectstart controller events requiring other frame data etc)
|
|
250
|
-
|
|
251
246
|
const rayPose = frame.getPose(this.inputSource.targetRaySpace, this.xr.referenceSpace);
|
|
252
247
|
this._isTracking = rayPose != null;
|
|
253
248
|
|
|
@@ -263,6 +258,8 @@ export class NeedleXRController {
|
|
|
263
258
|
const t = gripPose.transform;
|
|
264
259
|
this._gripPosition.set(t.position.x, t.position.y, t.position.z);
|
|
265
260
|
this._gripQuaternion.set(t.orientation.x, t.orientation.y, t.orientation.z, t.orientation.w);
|
|
261
|
+
if (gripPose.linearVelocity)
|
|
262
|
+
this._linearVelocity.set(gripPose.linearVelocity.x, gripPose.linearVelocity.y, gripPose.linearVelocity.z);
|
|
266
263
|
}
|
|
267
264
|
}
|
|
268
265
|
|
|
@@ -312,6 +309,27 @@ export class NeedleXRController {
|
|
|
312
309
|
this._object.position.copy(this._rayPosition);
|
|
313
310
|
this._object.quaternion.copy(this._rayQuaternion).multiply(flipForwardQuaternion);
|
|
314
311
|
}
|
|
312
|
+
|
|
313
|
+
|
|
314
|
+
// UPDATE WORLD TRANSFORM DATA
|
|
315
|
+
const parent = this.xr.context.mainCamera?.parent;
|
|
316
|
+
const parentWorldQuaternion = parent ? getWorldQuaternion(parent) : undefined;
|
|
317
|
+
|
|
318
|
+
// GRIP
|
|
319
|
+
this._gripWorldPosition.copy(this._gripPosition);
|
|
320
|
+
if (parent) this._gripWorldPosition.applyMatrix4(parent.matrixWorld);
|
|
321
|
+
this._gripWorldQuaternion.copy(this._gripQuaternion);
|
|
322
|
+
// flip forward because we want +Z to be forward
|
|
323
|
+
this._gripWorldQuaternion.multiply(flipForwardQuaternion);
|
|
324
|
+
if (parentWorldQuaternion) this._gripWorldQuaternion.premultiply(parentWorldQuaternion)
|
|
325
|
+
|
|
326
|
+
// RAY
|
|
327
|
+
this._rayWorldPosition.copy(this._rayPosition);
|
|
328
|
+
if (parent) this._rayWorldPosition.applyMatrix4(parent.matrixWorld);
|
|
329
|
+
this._rayWorldQuaternion.copy(this._rayQuaternion)
|
|
330
|
+
// flip forward because we want +Z to be forward
|
|
331
|
+
.multiply(flipForwardQuaternion);
|
|
332
|
+
if (parentWorldQuaternion) this._rayWorldQuaternion.premultiply(parentWorldQuaternion)
|
|
315
333
|
}
|
|
316
334
|
|
|
317
335
|
/** Called when the input source disconnects */
|
|
@@ -278,7 +278,11 @@ export class NeedleXRSession implements INeedleXRSession {
|
|
|
278
278
|
}
|
|
279
279
|
}
|
|
280
280
|
|
|
281
|
-
/** start a new webXR session (make sure to stop already running sessions before calling this method)
|
|
281
|
+
/** start a new webXR session (make sure to stop already running sessions before calling this method)
|
|
282
|
+
* @param mode The XRSessionMode to start (e.g. `immersive-vr` or `immersive-ar`), docs: https://developer.mozilla.org/en-US/docs/Web/API/XRSessionMode
|
|
283
|
+
* @param init The XRSessionInit to use (optional), docs: https://developer.mozilla.org/en-US/docs/Web/API/XRSessionInit
|
|
284
|
+
* @param context The Needle Engine context to use
|
|
285
|
+
*/
|
|
282
286
|
static async start(mode: XRSessionMode, init?: XRSessionInit, context?: Context): Promise<NeedleXRSession | null> {
|
|
283
287
|
|
|
284
288
|
if (this._currentSessionRequest) {
|
|
@@ -136,6 +136,7 @@ export class DragControls extends Behaviour implements IPointerEventHandler {
|
|
|
136
136
|
|
|
137
137
|
onPointerDown(args: PointerEventData) {
|
|
138
138
|
if (!this.allowEdit(this.gameObject)) return;
|
|
139
|
+
if (args.used) return;
|
|
139
140
|
DragControls.lastHovered = args.object;
|
|
140
141
|
|
|
141
142
|
if (args.button === 0) {
|
|
@@ -177,6 +177,9 @@ export interface IPointerEventHandler extends IPointerDownHandler,
|
|
|
177
177
|
*/
|
|
178
178
|
export function hasPointerEventComponent(obj: Object3D, event?: InputEventNames | null) {
|
|
179
179
|
const res = GameObject.foreachComponent(obj, comp => {
|
|
180
|
+
// ignore disabled components
|
|
181
|
+
if (!comp.enabled) return undefined;
|
|
182
|
+
|
|
180
183
|
const handler = comp as IPointerEventHandler;
|
|
181
184
|
// if a specific event is passed in, we only check for that event
|
|
182
185
|
if (event) {
|
|
@@ -107,7 +107,10 @@ export class NeedleWebXRHtmlElement extends HTMLElement {
|
|
|
107
107
|
|
|
108
108
|
/** @returns the quicklook button if it was created */
|
|
109
109
|
get quicklookButton() { return this.shadowRoot?.querySelector("[data-needle='quicklook-button']") as HTMLButtonElement | null; }
|
|
110
|
-
/** get or create the quicklook button
|
|
110
|
+
/** get or create the quicklook button
|
|
111
|
+
* Behaviour of the button:
|
|
112
|
+
* - if the button is clicked a USDZExporter component will be searched for in the scene and if found, it will be used to export the scene to USDZ / Quicklook
|
|
113
|
+
*/
|
|
111
114
|
createQuicklookButton(): HTMLButtonElement {
|
|
112
115
|
const existingButton = this.shadowRoot?.querySelector("[data-needle='quicklook-button']") as HTMLButtonElement | null;
|
|
113
116
|
if (existingButton) return existingButton;
|
|
@@ -119,6 +122,9 @@ export class NeedleWebXRHtmlElement extends HTMLElement {
|
|
|
119
122
|
if (usdzExporter) {
|
|
120
123
|
usdzExporter.exportAsync();
|
|
121
124
|
}
|
|
125
|
+
else {
|
|
126
|
+
console.warn("No USDZExporter component found in the scene");
|
|
127
|
+
}
|
|
122
128
|
});
|
|
123
129
|
this.shadowRoot?.appendChild(button);
|
|
124
130
|
return button;
|
|
@@ -126,7 +132,13 @@ export class NeedleWebXRHtmlElement extends HTMLElement {
|
|
|
126
132
|
|
|
127
133
|
/** @returns the WebXR AR button if it was created */
|
|
128
134
|
get arButton() { return this.shadowRoot?.querySelector("[data-needle='webxr-ar-button']") as HTMLButtonElement | null; }
|
|
129
|
-
/** get or create the WebXR AR button
|
|
135
|
+
/** get or create the WebXR AR button
|
|
136
|
+
* @param init optional session init options
|
|
137
|
+
* Behaviour of the button:
|
|
138
|
+
* - if the device supports AR, the button will be visible and clickable
|
|
139
|
+
* - if the device does not support AR, the button will be hidden
|
|
140
|
+
* - if the device changes and now supports AR, the button will be visible
|
|
141
|
+
*/
|
|
130
142
|
createARButton(init?: XRSessionInit): HTMLButtonElement {
|
|
131
143
|
const existingButton = this.shadowRoot?.querySelector("[data-needle='webxr-ar-button']") as HTMLButtonElement | null;
|
|
132
144
|
if (existingButton) return existingButton;
|
|
@@ -147,7 +159,13 @@ export class NeedleWebXRHtmlElement extends HTMLElement {
|
|
|
147
159
|
|
|
148
160
|
/** @returns the WebXR VR button if it was created */
|
|
149
161
|
get vrButton() { return this.shadowRoot?.querySelector("[data-needle='webxr-vr-button']") as HTMLButtonElement | null; }
|
|
150
|
-
/** get or create the WebXR VR button
|
|
162
|
+
/** get or create the WebXR VR button
|
|
163
|
+
* @param init optional session init options
|
|
164
|
+
* Behaviour of the button:
|
|
165
|
+
* - if the device supports VR, the button will be visible and clickable
|
|
166
|
+
* - if the device does not support VR, the button will be hidden
|
|
167
|
+
* - if the device changes and now supports VR, the button will be visible
|
|
168
|
+
*/
|
|
151
169
|
createVRButton(init?: XRSessionInit): HTMLButtonElement {
|
|
152
170
|
const hasButton = this.shadowRoot?.querySelector("[data-needle='webxr-vr-button']");
|
|
153
171
|
if (hasButton) return hasButton as HTMLButtonElement;
|
|
@@ -168,7 +186,10 @@ export class NeedleWebXRHtmlElement extends HTMLElement {
|
|
|
168
186
|
|
|
169
187
|
/** @returns the Send to Quest button */
|
|
170
188
|
get sendToQuestButton() { return this.shadowRoot?.querySelector("[data-needle='webxr-sendtoquest-button']") as HTMLButtonElement | null; }
|
|
171
|
-
/** get or create the Send To Quest button
|
|
189
|
+
/** get or create the Send To Quest button
|
|
190
|
+
* Behaviour of the button:
|
|
191
|
+
* - if the button is clicked, the current URL will be sent to the Oculus Browser on the Quest
|
|
192
|
+
*/
|
|
172
193
|
createSendToQuestButton(): HTMLButtonElement {
|
|
173
194
|
const hasButton = this.shadowRoot?.querySelector("[data-needle='webxr-sendtoquest-button']");
|
|
174
195
|
if (hasButton) return hasButton as HTMLButtonElement;
|