Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-14 15:10:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Prevent invalid direct / handle scaling transition while scaling

Browse source
This commit is contained in:
David Rowe 2017-07-20 18:36:02 +12:00
parent 5551bb70d4
commit 880a711d2b
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
scripts/vr-edit/vr-edit.js
View file

@ -1334,6 +1334,10 @@
&& (rootEntityID === undefined || rootEntityID === selection.rootEntityID());
}
function isScaling() {
return editorState === EDITOR_DIRECT_SCALING || editorState === EDITOR_HANDLE_SCALING;
}
function startEditing() {
var selectionPositionAndOrientation;
@ -1917,6 +1921,7 @@
hoverHandle: hoverHandle,
isHandle: isHandle,
isEditing: isEditing,
isScaling: isScaling,
startDirectScaling: startDirectScaling,
updateDirectScaling: updateDirectScaling,
stopDirectScaling: stopDirectScaling,
@ -1966,7 +1971,10 @@
}
function onGripClicked() {
isAppScaleWithHandles = !isAppScaleWithHandles;
// Do not change scale mode if are currently scaling.
if (!editors[LEFT_HAND].isScaling() && !editors[RIGHT_HAND].isScaling()) {
isAppScaleWithHandles = !isAppScaleWithHandles;
}
}