Skip to content

Added support for VR headsets that do not provide stageParameters #3000

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 4 commits into from
Aug 29, 2017
Merged

Added support for VR headsets that do not provide stageParameters #3000

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bb747ff
Fixed head height on VRDisplays that do not provide the optional stag…
Aug 1, 2017
f1284ea
Merge branch 'master' into msft/head-height
olga-microsoft Aug 25, 2017
20da7d5
Remove unused public properties
olga-microsoft Aug 25, 2017
cd29160
Decouple look-controls and scene camera
olga-microsoft Aug 29, 2017
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Decouple look-controls and scene camera
  • Loading branch information
@olga-microsoft
olga-microsoft committed Aug 29, 2017
commit cd29160ac6280f9ec2a18fe361ebfc717bcb429f
6 changes: 3 additions & 3 deletions src/components/look-controls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@ module.exports.Component = registerComponent('look-controls', {
* Return user height to use for standing poses, where a device doesn't provide an offset.
*/
getUserHeight: function () {
var headEl = this.el.sceneEl.camera.el;
var headCamera = headEl.components.camera;
return (headCamera ? headCamera.data.userHeight : 0) || DEFAULT_CAMERA_HEIGHT;
var el = this.el;
var userHeight = el.hasAttribute('camera') && el.getAttribute('camera').userHeight || DEFAULT_CAMERA_HEIGHT;
return userHeight;
},

play: function () {
Expand Down