From ff4f582c7d828f0af65164909d8a9706005fde07 Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Wed, 3 Jan 2018 17:23:35 -0800 Subject: [PATCH] Thanks Howard --- interface/src/ui/overlays/ContextOverlayInterface.cpp | 2 +- .../system/controllers/controllerModules/farActionGrabEntity.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/src/ui/overlays/ContextOverlayInterface.cpp b/interface/src/ui/overlays/ContextOverlayInterface.cpp index 16b771567c..d690880f99 100644 --- a/interface/src/ui/overlays/ContextOverlayInterface.cpp +++ b/interface/src/ui/overlays/ContextOverlayInterface.cpp @@ -151,7 +151,7 @@ bool ContextOverlayInterface::createOrDestroyContextOverlay(const EntityItemID& glm::vec3 normal; boundingBox.findRayIntersection(cameraPosition, direction, distance, face, normal); float offsetAngle = -CONTEXT_OVERLAY_OFFSET_ANGLE; - if (DependencyManager::get()->isLeftHand(event.getID())) { + if (event.getID() == 1) { // "1" is left hand offsetAngle *= -1.0f; } contextOverlayPosition = cameraPosition + diff --git a/scripts/system/controllers/controllerModules/farActionGrabEntity.js b/scripts/system/controllers/controllerModules/farActionGrabEntity.js index ea625571b9..4508153c03 100644 --- a/scripts/system/controllers/controllerModules/farActionGrabEntity.js +++ b/scripts/system/controllers/controllerModules/farActionGrabEntity.js @@ -495,7 +495,7 @@ Script.include("/~/system/libraries/Xform.js"); var props = Entities.getEntityProperties(rayPickInfo.objectID); var pointerEvent = { type: "Move", - id: this.hand + 1, // 0 is reserved for hardware mouse + id: _this.hand + 1, // 0 is reserved for hardware mouse pos2D: projectOntoEntityXYPlane(rayPickInfo.objectID, rayPickInfo.intersection, props), pos3D: rayPickInfo.intersection, normal: rayPickInfo.surfaceNormal,