Skip to content

Commit 167a4e3

Browse files
committed
Update Aquarium VR to align aquarium floor with user's physical floor.
1 parent 06f825a commit 167a4e3

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

aquarium/aquarium.js

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1807,7 +1807,7 @@ function initialize() {
18071807
let xrViewport = glLayer.getViewport(view);
18081808
gl.viewport(xrViewport.x, xrViewport.y, xrViewport.width, xrViewport.height);
18091809
gl.scissor(xrViewport.x, xrViewport.y, xrViewport.width, xrViewport.height);
1810-
render(view.projectionMatrix, view.transform.matrix, false, view, 10, 5, 0.75);
1810+
render(view.projectionMatrix, view.transform.matrix, false, view, 10, 0, 0.75);
18111811
}
18121812
session.requestAnimationFrame(onXRFrame);
18131813
}
@@ -2199,20 +2199,21 @@ $(function(){
21992199
vrButtonURL = getCurrentUrl() + "/../aquarium-vr/vr_assets/button.png";
22002200

22012201
function onRequestPresent() {
2202-
return navigator.xr.requestSession('immersive-vr').then((session) => {
2202+
return navigator.xr.requestSession('immersive-vr', {
2203+
requiredFeatures: ['local-floor']
2204+
}).then((session) => {
22032205
removeButton(vrButton);
22042206
vrButton = addButton("Exit VR", "E", vrButtonURL, onExitPresent);
22052207
session.isImmersive = true;
22062208
g_session = session;
22072209

22082210
session.updateRenderState({ baseLayer: new XRWebGLLayer(session, gl) });
22092211

2210-
let refSpaceType = 'local';
2212+
let refSpaceType = 'local-floor';
22112213
session.requestReferenceSpace(refSpaceType).then((refSpace) => {
22122214
g_xrImmersiveRefSpace = refSpace
22132215
g_shadersNeedUpdate = true;
2214-
g.globals.eyeHeight = 150;
2215-
g.globals.eyeRadius = 10;
2216+
g.globals.eyeRadius = 0;
22162217
session.requestAnimationFrame(g_startXRRendering);
22172218
});
22182219
session.addEventListener('end', onSessionEnded);
@@ -2228,7 +2229,7 @@ $(function(){
22282229
if (event.session.isImmersive) {
22292230
onExitPresent();
22302231
}
2231-
}
2232+
}
22322233

22332234
function onDeviceChange() {
22342235
vrButton ?? removeButton(vrButton);

0 commit comments

Comments
 (0)