Skip to content
Snippets Groups Projects
Commit f71f4fd9 authored by joni's avatar joni
Browse files

Merge branch 'feature/image-interactables' of https://github.com/mozilla/hubs...

Merge branch 'feature/image-interactables' of https://github.com/mozilla/hubs into feature/image-interactables
parents fbed5a6a 9b42aed6
No related branches found
No related tags found
No related merge requests found
...@@ -23,6 +23,7 @@ AFRAME.GLTFModelPlus.registerComponent("shape", "shape"); ...@@ -23,6 +23,7 @@ AFRAME.GLTFModelPlus.registerComponent("shape", "shape");
AFRAME.GLTFModelPlus.registerComponent("visible", "visible"); AFRAME.GLTFModelPlus.registerComponent("visible", "visible");
AFRAME.GLTFModelPlus.registerComponent("spawn-point", "spawn-point"); AFRAME.GLTFModelPlus.registerComponent("spawn-point", "spawn-point");
AFRAME.GLTFModelPlus.registerComponent("hoverable", "hoverable"); AFRAME.GLTFModelPlus.registerComponent("hoverable", "hoverable");
AFRAME.GLTFModelPlus.registerComponent("sticky-zone", "sticky-zone");
AFRAME.GLTFModelPlus.registerComponent("nav-mesh", "nav-mesh", (el, componentName, componentData, gltfPath) => { AFRAME.GLTFModelPlus.registerComponent("nav-mesh", "nav-mesh", (el, componentName, componentData, gltfPath) => {
if (componentData.src) { if (componentData.src) {
componentData.src = resolveURL(componentData.src, gltfPath); componentData.src = resolveURL(componentData.src, gltfPath);
......
...@@ -149,8 +149,7 @@ const config = { ...@@ -149,8 +149,7 @@ const config = {
m_press: "action_mute", m_press: "action_mute",
q_press: "snap_rotate_left", q_press: "snap_rotate_left",
e_press: "snap_rotate_right", e_press: "snap_rotate_right",
v_press: "action_share_screen", b_press: "action_share_screen",
b_press: "action_select_hud_item",
// We can't create a keyboard behaviour with AFIM yet, // We can't create a keyboard behaviour with AFIM yet,
// so these will get captured by wasd-to-analog2d // so these will get captured by wasd-to-analog2d
......
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