Merge pull request #4 from mozilla/feature/hand-visibility

Added hand-controls-child-visibility component and network schema.

Merge pull request #4 from mozilla/feature/hand-visibility
c7d6469f · Robert Long · GitHub · faef5a0c · d9c8aa06 · c7d6469f
Unverified Commit c7d6469f authored 7 years ago by Robert Long Committed by GitHub 7 years ago
--- a/public/index.html
+++ b/public/index.html
@@ -2,7 +2,7 @@
 <head>
    <title>Mozilla Mixed Reality Social Client</title>
-    <script src="https://aframe.io/releases/0.7.0/aframe.min.js"></script>
+    <script src="https://aframe.io/releases/0.7.0/aframe.js"></script>
    <script src="./app.bundle.js"></script>
 </head>
@@ -60,7 +60,7 @@
            <a-entity id="nametag" networked="template:#nametag-template;showLocalTemplate:false;"></a-entity>
-            <a-entity id="left-hand" hand-controls="left" axis-dpad="centerZone: 1" teleport-controls="cameraRig: #player-rig; teleportOrigin: #head; button: action_teleport_"
+            <a-entity id="left-hand" hand-controls="left" hand-controls-visibility axis-dpad="centerZone: 1" teleport-controls="cameraRig: #player-rig; teleportOrigin: #head; button: action_teleport_"
                networked="template:#hand-template;showLocalTemplate:false;">
                <a-entity id="watch" gltf-model="assets/hud/watch.gltf" position="0 0.0015 0.147" rotation="3.5 0 0">
                    <a-circle mute-state-indicator scale-audio-feedback="analyserSrc: #head; minScale: 0.035; maxScale: 0.08;" position="0 0.023 0"
@@ -69,7 +69,7 @@
                </a-entity>
            </a-entity>
-            <a-entity id="right-hand" hand-controls="right" axis-dpad teleport-controls="cameraRig: #player-rig; teleportOrigin: #head; hitEntity: #telepor-indicator; button: action_teleport_;"
+            <a-entity id="right-hand" hand-controls="right" hand-controls-child-visibility axis-dpad teleport-controls="cameraRig: #player-rig; teleportOrigin: #head; hitEntity: #telepor-indicator; button: action_teleport_;"
                networked="template:#hand-template;showLocalTemplate:false;"></a-entity>
        </a-entity>

--- a/src/components/hand-controls-visibility.js
+++ b/src/components/hand-controls-visibility.js
+AFRAME.registerComponent("hand-controls-visibility", {
+  init() {
+    this.onControllerConnected = this.onControllerConnected.bind(this);
+    this.onControllerDisconnected = this.onControllerDisconnected.bind(this);
+    this.el.addEventListener("controllerconnected", this.onControllerConnected);
+    this.el.addEventListener(
+      "controllerdisconnected",
+      this.onControllerDisconnected
+    );
+    this.el.setAttribute("visible", false);
+  },
+  onControllerConnected() {
+    this.el.setAttribute("visible", true);
+  },
+  onControllerDisconnected() {
+    this.el.setAttribute("visible", false);
+  }
+});
--- a/src/index.js
+++ b/src/index.js
@@ -12,6 +12,7 @@ import "./components/audio-feedback";
 import "./components/nametag-transform";
 import "./components/avatar-customization";
 import "./components/mute-state-indicator";
+import "./components/hand-controls-visibility";
 import "./systems/personal-space-bubble";
@@ -28,6 +29,11 @@ NAF.schemas.add({
  ]
 });
+NAF.schemas.add({
+  template: "#hand-template",
+  components: ["position", "rotation", "visible"]
+});
 AFRAME.registerInputMappings({
  default: {
    common: {