Skip to content

Commit 409dd76

Browse files
lmidanglynndang
and
lynndang
authored
Fixed issue with loading XR with aframe (#48)
Co-authored-by: lynndang <[email protected]>
1 parent e3f2c53 commit 409dd76

File tree

6 files changed

+18
-11
lines changed

6 files changed

+18
-11
lines changed

dist/aframe-master.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27729,10 +27729,13 @@ class AScene extends AEntity {
2772927729
self.resize();
2773027730
}
2773127731
});
27732-
this.play();
27732+
const onPlay = () => {
27733+
this.play();
2773327734

27734-
// Add to scene index.
27735-
scenes.push(this);
27735+
// Add to scene index.
27736+
scenes.push(this);
27737+
};
27738+
window.XR ? onPlay() : window.addEventListener('xrloaded', onPlay);
2773627739
}
2773727740

2773827741
/**
@@ -30766,7 +30769,7 @@ __webpack_require__(/*! ./core/a-mixin */ "./src/core/a-mixin.js");
3076630769
// Extras.
3076730770
__webpack_require__(/*! ./extras/components/ */ "./src/extras/components/index.js");
3076830771
__webpack_require__(/*! ./extras/primitives/ */ "./src/extras/primitives/index.js");
30769-
console.log('A-Frame Version: 1.5.0 (Date 2024-01-23, Commit #fb6863e5)');
30772+
console.log('A-Frame Version: 1.5.0 (Date 2024-08-06, Commit #80e4b39a)');
3077030773
console.log('THREE Version (https://github.com/supermedium/three.js):', pkg.dependencies['super-three']);
3077130774
console.log('WebVR Polyfill Version:', pkg.dependencies['webvr-polyfill']);
3077230775
module.exports = window.AFRAME = {

dist/aframe-master.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/aframe-master.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/aframe-master.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/core/scene/a-scene.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,10 +165,14 @@ class AScene extends AEntity {
165165
self.resize();
166166
}
167167
});
168-
this.play();
168+
const onPlay = () => {
169+
this.play();
169170

170-
// Add to scene index.
171-
scenes.push(this);
171+
// Add to scene index.
172+
scenes.push(this);
173+
};
174+
175+
window.XR ? onPlay() : window.addEventListener('xrloaded', onPlay);
172176
}
173177

174178
/**

src/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ require('./core/a-mixin');
9292
require('./extras/components/');
9393
require('./extras/primitives/');
9494

95-
console.log('A-Frame Version: 1.5.0 (Date 2024-01-25, Commit #824464a0)');
95+
console.log('A-Frame Version: 1.5.0 (Date 2024-08-06, Commit #80e4b39a)');
9696
console.log('THREE Version (https://github.com/supermedium/three.js):',
9797
pkg.dependencies['super-three']);
9898
console.log('WebVR Polyfill Version:', pkg.dependencies['webvr-polyfill']);

0 commit comments

Comments
 (0)