From 93fc8e2e187752a54518b4607e710bc0c1689fa4 Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Wed, 27 Mar 2019 18:18:32 -0700
Subject: [PATCH] fix continual translation when moving
---
scripts/system/libraries/entitySelectionTool.js | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/scripts/system/libraries/entitySelectionTool.js b/scripts/system/libraries/entitySelectionTool.js
index 064dafec06..26fb4c874a 100644
--- a/scripts/system/libraries/entitySelectionTool.js
+++ b/scripts/system/libraries/entitySelectionTool.js
@@ -1334,14 +1334,7 @@ SelectionDisplay = (function() {
ctrlPressed = false;
that.updateActiveRotateRing();
}
- if (activeTool && lastMouseEvent !== null) {
- lastMouseEvent.isShifted = event.isShifted;
- lastMouseEvent.isMeta = event.isMeta;
- lastMouseEvent.isControl = event.isControl;
- lastMouseEvent.isAlt = event.isAlt;
- activeTool.onMove(lastMouseEvent);
- SelectionManager._update(false, this);
- }
+ that.updateLastMouseEventXZTranslation(event);
};
// Triggers notification on specific key driven events
@@ -1350,7 +1343,12 @@ SelectionDisplay = (function() {
ctrlPressed = true;
that.updateActiveRotateRing();
}
- if (activeTool && lastMouseEvent !== null) {
+ that.updateLastMouseEventXZTranslation(event);
+ };
+
+ that.updateLastMouseEventXZTranslation = function(event) {
+ var xzTranslateToolActive = isActiveTool(selectionBox) || isActiveTool(iconSelectionBox);
+ if (xzTranslateToolActive && lastMouseEvent !== null) {
lastMouseEvent.isShifted = event.isShifted;
lastMouseEvent.isMeta = event.isMeta;
lastMouseEvent.isControl = event.isControl;