From e1065f7ec7b0ddc545c31504763b114c06988276 Mon Sep 17 00:00:00 2001
From: Kevin Ngo <me@ngokevin.com>
Date: Sat, 17 Nov 2018 04:36:34 -0800
Subject: [PATCH] fix overlay moving camera rig to a different scene

---
 src/components/recenter.js |  3 +++
 src/index.html             | 22 +++++++++++++++-------
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/components/recenter.js b/src/components/recenter.js
index 1adb872..ca078d7 100644
--- a/src/components/recenter.js
+++ b/src/components/recenter.js
@@ -14,6 +14,8 @@ AFRAME.registerComponent('recenter', {
       controlEl.addEventListener('menudown', this.recenter);
       controlEl.addEventListener('thumbstickdown', this.recenter);
     });
+
+    this.el.addEventListener('recenter', this.recenter);
   },
 
   recenter: (function () {
@@ -43,6 +45,7 @@ AFRAME.registerComponent('recenter', {
       matrix.multiply(rotationMatrix).multiply(translationMatrix);
       matrix.decompose(el.object3D.position, el.object3D.quaternion, el.object3D.scale);
       el.object3D.updateMatrixWorld(true);
+      el.emit('recentered', null, false);
     };
   })()
 });
diff --git a/src/index.html b/src/index.html
index e5a0d01..2392e5e 100644
--- a/src/index.html
+++ b/src/index.html
@@ -96,13 +96,8 @@
         material="shader: flat; transparent: true; src: #cursorMeshImg; depthTest: false"
         sub-object="from: #cursorLaser; name: glow"></a-mixin>
 
-      <!--
-        Player.
-        Apply overlay to camera rig, not controllers, because overlay will reparent to
-        an empty scene, disabling ability to move and rotate the camera rig having effect
-        on controller matrix world.
-       -->
-      <a-entity id="cameraRig" class="overlay" bind__recenter="enabled: !isPlaying">
+      <!-- Player. -->
+      <a-entity id="cameraRig" bind__recenter="enabled: !isPlaying">
         <a-entity id="camera" position="0 1.6 0.5" camera look-controls wasd-controls>
           <a-entity
             id="cameraCollider"
@@ -113,7 +108,20 @@
             proxy-event__wallhitend="event: hitend; to: a-scene; as: wallhitend"
             visible="false"></a-entity>
         </a-entity>
+      </a-entity>
 
+      <!--
+        We want the recenter transforms to apply to the controllers.
+        Overlay component reparents entity to different scene.
+        Thus need to add overlay to root-level container.
+        But cannot add overlay component to camera else camera would get reparented to wrong.
+        Thus we have a separate controller rig that matches the same transforms as cameraRig.
+      -->
+      <a-entity
+        id="controllerRig"
+        class="overlay"
+        bind__recenter="enabled: !isPlaying"
+        proxy-event="event: recentered; to: #cameraRig; captureBubbles: true; as: recenter">
         {% macro saber (hand, otherHand, bladeColor, beamColor) %}
           <a-entity id="{{ hand }}Hand"
             class="saber"