Skip to content
Snippets Groups Projects
Commit f3679062 authored by Greg Fodor's avatar Greg Fodor
Browse files

Merge branch 'master' of github.com:mozilla/mr-social-client into feature/new-reticulum-layout

parents 9c750b7d e9ac30bc
No related branches found
No related tags found
No related merge requests found
...@@ -83,6 +83,11 @@ import { getAvailableVREntryTypes } from "./utils/vr-caps-detect.js"; ...@@ -83,6 +83,11 @@ import { getAvailableVREntryTypes } from "./utils/vr-caps-detect.js";
import ConcurrentLoadDetector from "./utils/concurrent-load-detector.js"; import ConcurrentLoadDetector from "./utils/concurrent-load-detector.js";
registerTelemetry(); registerTelemetry();
AFRAME.registerInputBehaviour("vive_trackpad_dpad4", vive_trackpad_dpad4);
AFRAME.registerInputBehaviour("oculus_touch_joystick_dpad4", oculus_touch_joystick_dpad4);
AFRAME.registerInputActivator("pressedmove", PressedMove);
AFRAME.registerInputActivator("reverseY", ReverseY);
AFRAME.registerInputMappings(inputConfig, true); AFRAME.registerInputMappings(inputConfig, true);
const store = new Store(); const store = new Store();
...@@ -140,10 +145,6 @@ async function enterScene(mediaStream, enterInVR, janusRoomId) { ...@@ -140,10 +145,6 @@ async function enterScene(mediaStream, enterInVR, janusRoomId) {
scene.enterVR(); scene.enterVR();
} }
AFRAME.registerInputBehaviour("vive_trackpad_dpad4", vive_trackpad_dpad4);
AFRAME.registerInputBehaviour("oculus_touch_joystick_dpad4", oculus_touch_joystick_dpad4);
AFRAME.registerInputActivator("pressedmove", PressedMove);
AFRAME.registerInputActivator("reverseY", ReverseY);
AFRAME.registerInputActions(inGameActions, "default"); AFRAME.registerInputActions(inGameActions, "default");
document.querySelector("#player-camera").setAttribute("look-controls", "pointerLockEnabled: true;"); document.querySelector("#player-camera").setAttribute("look-controls", "pointerLockEnabled: true;");
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment