From 2589c0bcc1f219fe7cd196a6bbe837a51231105e Mon Sep 17 00:00:00 2001
From: Jess Telford <jess+github@jes.st>
Date: Mon, 3 Oct 2016 20:37:56 +1100
Subject: [PATCH] Support a rotated camera

---
 examples/basic/index.html |  2 +-
 examples/main.js          |  2 ++
 package.json              |  1 +
 src/index.js              | 47 ++++++++++++++++++++++-----------------
 4 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/examples/basic/index.html b/examples/basic/index.html
index d769c36..eb395bd 100644
--- a/examples/basic/index.html
+++ b/examples/basic/index.html
@@ -14,7 +14,7 @@
       <a-sky color="#ECECEC"></a-sky>
 
       <a-entity position="0 0 3.8">
-        <a-camera look-controls-enabled="false"></a-camera>
+        <a-camera look-controls-enabled="false" keyboard-controls="fpsMode: true"></a-camera>
       </a-entity>
     </a-scene>
   </body>
diff --git a/examples/main.js b/examples/main.js
index cedfc9c..fbb42bf 100644
--- a/examples/main.js
+++ b/examples/main.js
@@ -1,7 +1,9 @@
 import aframe from 'aframe';
 import extras from 'aframe-extras';
+import keyboardControls from 'aframe-keyboard-controls';
 import clickDragComponent from '../src/index';
 
 extras.physics.registerAll(aframe);
+aframe.registerComponent('keyboard-controls', keyboardControls);
 clickDragComponent(aframe);
 
diff --git a/package.json b/package.json
index ae0e3cd..eb851b0 100644
--- a/package.json
+++ b/package.json
@@ -39,6 +39,7 @@
   "devDependencies": {
     "aframe": "^0.3.0",
     "aframe-extras": "^2.5.3",
+    "aframe-keyboard-controls": "github:jesstelford/aframe-keyboard-controls#fps-mode",
     "babel-cli": "^6.14.0",
     "babel-plugin-transform-object-rest-spread": "^6.8.0",
     "babel-preset-es2015": "^6.9.0",
diff --git a/src/index.js b/src/index.js
index 2c1084f..d02bb38 100644
--- a/src/index.js
+++ b/src/index.js
@@ -9,6 +9,16 @@ const DRAG_END_EVENT = 'dragend';
 
 const TIME_TO_KEEP_LOG = 300;
 
+function forceWorldUpdate(threeElement) {
+
+  let element = threeElement;
+  while (element.parent) {
+    element = element.parent;
+  }
+
+  element.updateMatrixWorld(true);
+}
+
 function cameraPositionToVec3(camera, vec3) {
 
   let element = camera;
@@ -35,19 +45,18 @@ function cameraPositionToVec3(camera, vec3) {
 
 }
 
+function localToWorld(THREE, threeCamera, vector) {
+  forceWorldUpdate(threeCamera);
+  return threeCamera.localToWorld(vector);
+}
+
 const {unproject} = (function unprojectFunction() {
 
   let initialized = false;
 
-  let cameraPosition;
-
-  let cameraWorld;
   let matrix;
 
   function initialize(THREE) {
-    cameraPosition = new THREE.Vector3();
-
-    cameraWorld = new THREE.Matrix4();
     matrix = new THREE.Matrix4();
 
     return true;
@@ -57,19 +66,13 @@ const {unproject} = (function unprojectFunction() {
 
     unproject(THREE, vector, camera) {
 
+      const threeCamera = camera.components.camera.camera;
+
       initialized = initialized || initialize(THREE);
 
-      cameraPositionToVec3(camera, cameraPosition);
+      vector.applyProjection(matrix.getInverse(threeCamera.projectionMatrix));
 
-      cameraWorld.identity();
-      cameraWorld.setPosition(cameraPosition);
-
-      matrix.multiplyMatrices(
-        cameraWorld,
-        matrix.getInverse(camera.components.camera.camera.projectionMatrix)
-      );
-
-      return vector.applyProjection(matrix);
+      return localToWorld(THREE, threeCamera, vector);
 
     },
   };
@@ -125,16 +128,20 @@ const {screenCoordsToDirection} = (function screenCoordsToDirectionFunction() {
       // apply camera transformation from near-plane of mouse x/y into 3d space
       // NOTE: This should be replaced with THREE code directly once the aframe bug
       // is fixed:
-      // const projectedVector = new THREE
-      //  .Vector3(mouseX, mouseY, -1)
-      //  .unproject(threeCamera);
+/*
+      cameraPositionToVec3(aframeCamera, cameraPosAsVec3);
+      const {x, y, z} = new THREE
+       .Vector3(mouseX, mouseY, -1)
+       .unproject(aframeCamera.components.camera.camera)
+       .sub(cameraPosAsVec3)
+       .normalize();
+*/
       const projectedVector = unproject(THREE, mousePosAsVec3, aframeCamera);
 
       cameraPositionToVec3(aframeCamera, cameraPosAsVec3);
 
       // Get the unit length direction vector from the camera's position
       const {x, y, z} = projectedVector.sub(cameraPosAsVec3).normalize();
-
       return {x, y, z};
     },
   };