Undo unnecessary changes

Hubs-Foundation · Jan 17, 2019 · c2d2adc · c2d2adc
1 parent 73cb9e5
commit c2d2adc
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 46 deletions.
diff --git a/scripts/print-bindings.mjs b/scripts/print-bindings.mjs
@@ -76,6 +76,7 @@ function getPaths(set, dest) {
 const exclude = [
   paths.actions.cameraDelta,
   paths.actions.cursor.stopDrawing,
+  paths.actions.cursor.hideLine,
   paths.actions.leftHand.index,
   paths.actions.leftHand.middleRingPinky,
   paths.actions.leftHand.pose,

diff --git a/src/components/cursor-controller.js b/src/components/cursor-controller.js
@@ -89,17 +89,11 @@ AFRAME.registerComponent("cursor-controller", {
   emitIntersectionEvents: function(prevIntersection, currIntersection) {
     // if we are now intersecting something, and previously we were intersecting nothing or something else
     if (currIntersection && (!prevIntersection || currIntersection.object.el !== prevIntersection.object.el)) {
-      this.data.cursor.emit("raycaster-intersection", {
-        el: currIntersection.object.el,
-        intersection: currIntersection
-      });
+      this.data.cursor.emit("raycaster-intersection", { el: currIntersection.object.el });
     }
     // if we were intersecting something, but now we are intersecting nothing or something else
     if (prevIntersection && (!currIntersection || currIntersection.object.el !== prevIntersection.object.el)) {
-      this.data.cursor.emit("raycaster-intersection-cleared", {
-        el: prevIntersection.object.el,
-        intersection: currIntersection
-      });
+      this.data.cursor.emit("raycaster-intersection-cleared", { el: prevIntersection.object.el });
     }
   },
 
@@ -116,10 +110,9 @@ AFRAME.registerComponent("cursor-controller", {
 
       const userinput = AFRAME.scenes[0].systems.userinput;
       const cursorPose = userinput.get(paths.actions.cursor.pose);
-      const rightHandPose = userinput.get(paths.actions.rightHand.pose);
 
       this.data.cursor.object3D.visible = this.enabled && !!cursorPose;
-      this.line.material.visible = !!(this.enabled && rightHandPose);
+      this.line.material.visible = !!(this.enabled && !userinput.get(paths.actions.cursor.hideLine));
 
       if (!this.enabled || !cursorPose) {
         return;

diff --git a/src/systems/userinput/bindings/keyboard-mouse-user.js b/src/systems/userinput/bindings/keyboard-mouse-user.js
@@ -154,11 +154,6 @@ export const keyboardMouseUserBindings = addSetsToBindings({
       },
       xform: xforms.falling,
       priority: 100
-    },
-    {
-      src: { value: paths.device.mouse.buttonLeft },
-      dest: { value: paths.actions.cursor.drop },
-      xform: xforms.falling
     }
   ],
 
@@ -292,17 +287,6 @@ export const keyboardMouseUserBindings = addSetsToBindings({
       xform: xforms.any
     }
   ],
-  [sets.cursorHoldingUI]: [
-    {
-      src: {
-        value: paths.device.mouse.buttonLeft
-      },
-      dest: {
-        value: paths.actions.cursor.drop
-      },
-      xform: xforms.rising
-    }
-  ],
 
   [sets.cursorHoldingInteractable]: [
     {
@@ -353,12 +337,6 @@ export const keyboardMouseUserBindings = addSetsToBindings({
       dest: { value: paths.actions.cursor.grab },
       xform: xforms.rising,
       priority: 1
-    },
-    {
-      src: { value: paths.device.mouse.buttonLeft },
-      dest: { value: paths.actions.cursor.drop },
-      xform: xforms.falling,
-      priority: 1
     }
   ],
   [sets.cursorHoveringOnVideo]: [
@@ -382,11 +360,6 @@ export const keyboardMouseUserBindings = addSetsToBindings({
       src: { value: paths.device.mouse.buttonLeft },
       dest: { value: paths.actions.cursor.grab },
       xform: xforms.rising
-    },
-    {
-      src: { value: paths.device.mouse.buttonLeft },
-      dest: { value: paths.actions.cursor.drop },
-      xform: xforms.falling
     }
   ]
 });
diff --git a/src/systems/userinput/bindings/oculus-go-user.js b/src/systems/userinput/bindings/oculus-go-user.js
@@ -158,13 +158,6 @@ export default function generate3DOFTriggerBindings(device) {
         src: { value: device.button("trigger").pressed },
         dest: { value: paths.actions.rightHand.middleRingPinky },
         xform: xforms.copy
-      },
-      {
-        src: {
-          value: triggerFalling
-        },
-        dest: { value: paths.actions.cursor.drop },
-        xform: xforms.copy
       }
     ],
 

diff --git a/src/systems/userinput/bindings/touchscreen-user.js b/src/systems/userinput/bindings/touchscreen-user.js
@@ -26,6 +26,11 @@ export const touchscreenUserBindings = addSetsToBindings({
       dest: { value: zero },
       xform: xforms.always(0)
     },
+    {
+      src: {},
+      dest: { value: paths.actions.hideCursorLine },
+      xform: xforms.always(true)
+    },
     {
       src: { x: zero, y: forward },
       dest: { value: paths.actions.characterAcceleration },

diff --git a/src/systems/userinput/devices/daydream-controller.js b/src/systems/userinput/devices/daydream-controller.js
@@ -41,7 +41,10 @@ export class DaydreamControllerDevice {
       }
       this.rayObject.updateMatrixWorld();
       this.rayObjectRotation.setFromRotationMatrix(this.rayObject.matrixWorld);
-      frame[paths.device.daydream.pose] = 1;
+      this.pose.position.setFromMatrixPosition(this.rayObject.matrixWorld);
+      this.pose.direction.set(0, 0, -1).applyQuaternion(this.rayObjectRotation);
+      this.pose.fromOriginAndDirection(this.pose.position, this.pose.direction);
+      frame[paths.device.daydream.pose] = this.pose;
     }
   }
 }
diff --git a/src/systems/userinput/paths.js b/src/systems/userinput/paths.js
@@ -16,8 +16,9 @@ paths.actions.ensureFrozen = "/actions/ensureFrozen";
 paths.actions.thaw = "/actions/thaw";
 paths.actions.muteMic = "/actions/muteMic";
 paths.actions.focusChat = "/actions/focusChat";
-paths.actions.cursor = {};
 paths.actions.rayObjectRotation = "/actions/rayObjectRotation";
+paths.actions.cursor = {};
+paths.actions.cursor.hideLine = "/actions/cursor/hideLine";
 paths.actions.cursor.pose = "/actions/cursorPose";
 paths.actions.cursor.grab = "/actions/cursorGrab";
 paths.actions.cursor.drop = "/actions/cursorDrop";