Skip to content

XRManager: Add layers support. #1514

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Jan 27, 2025
Merged

XRManager: Add layers support. #1514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f02ca43
Remove XRButtonGPU
Methuselah96 Jan 26, 2025
8eb583c
Update three.js
Methuselah96 Jan 26, 2025
d40e373
Add src
Methuselah96 Jan 26, 2025
a581800
Update patch and delete src
Methuselah96 Jan 26, 2025
331ebc5
Update declarations
Methuselah96 Jan 26, 2025
2e3505a
Add src
Methuselah96 Jan 26, 2025
b7d87b4
Update patch and delete src
Methuselah96 Jan 26, 2025
30c8bad
Update declarations
Methuselah96 Jan 26, 2025
61163ac
Add examples
Methuselah96 Jan 26, 2025
c072947
Update
Methuselah96 Jan 27, 2025
f02e7fe
Update patch and delete examples
Methuselah96 Jan 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions examples-testing/changes.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17891,15 +17891,15 @@ index 76e09f1f..edefce0e 100644
gui.addColor(params, 'color').onChange(function (value) {
waterNode.color.value.set(value);
diff --git a/examples-testing/examples/webgpu_xr_cubes.ts b/examples-testing/examples/webgpu_xr_cubes.ts
index 104e33ae..85925f77 100644
index e56a190e..e48ab538 100644
--- a/examples-testing/examples/webgpu_xr_cubes.ts
+++ b/examples-testing/examples/webgpu_xr_cubes.ts
@@ -1,18 +1,22 @@
-import * as THREE from 'three';
+import * as THREE from 'three/webgpu';

import { BoxLineGeometry } from 'three/addons/geometries/BoxLineGeometry.js';
import { XRButton } from 'three/addons/webxr/XRButtonGPU.js';
import { XRButton } from 'three/addons/webxr/XRButton.js';
import { XRControllerModelFactory } from 'three/addons/webxr/XRControllerModelFactory.js';

+type CubeMesh = THREE.Mesh<THREE.BufferGeometry, THREE.MeshLambertMaterial> & {
Expand All @@ -17923,7 +17923,7 @@ index 104e33ae..85925f77 100644

init();

@@ -75,21 +79,21 @@ function init() {
@@ -75,25 +79,25 @@ function init() {

//

Expand All @@ -17941,16 +17941,20 @@ index 104e33ae..85925f77 100644
controller.addEventListener('selectstart', onSelectStart);
controller.addEventListener('selectend', onSelectEnd);
- controller.addEventListener('connected', function (event) {
- this.add(buildController(event.data));
+ controller.addEventListener('connected', function (this: THREE.XRTargetRaySpace, event) {
+ this.add(buildController(event.data)!);
const targetRayMode = event.data.targetRayMode;

if (targetRayMode === 'tracked-pointer' || targetRayMode === 'gaze') {
- this.add(buildController(event.data));
+ this.add(buildController(event.data)!);
}
});
- controller.addEventListener('disconnected', function () {
+ controller.addEventListener('disconnected', function (this: THREE.XRTargetRaySpace) {
this.remove(this.children[0]);
});
scene.add(controller);
@@ -107,7 +111,7 @@ function init() {
@@ -111,7 +115,7 @@ function init() {
document.body.appendChild(XRButton.createButton(renderer));
}

Expand All @@ -17959,7 +17963,7 @@ index 104e33ae..85925f77 100644
let geometry, material;

switch (data.targetRayMode) {
@@ -161,7 +165,7 @@ function animate() {
@@ -165,7 +169,7 @@ function animate() {
if (INTERSECTED != intersects[0].object) {
if (INTERSECTED) INTERSECTED.material.emissive.setHex(INTERSECTED.currentHex);

Expand Down
Loading
Loading