Merge pull request #12422 from misslivirose/fix-overlay-lines

Show outline for zones when rotating
This commit is contained in:
John Conklin II 2018-02-20 09:30:22 -08:00 committed by GitHub
commit 6148c407a5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1018,6 +1018,7 @@ SelectionDisplay = (function() {
return;
}
if (SelectionManager.hasSelection()) {
var position = SelectionManager.worldPosition;
var rotation = spaceMode === SPACE_LOCAL ? SelectionManager.localRotation : SelectionManager.worldRotation;
@ -1317,8 +1318,12 @@ SelectionDisplay = (function() {
isActiveTool(handleScaleRTNCube) || isActiveTool(handleScaleLTFCube) ||
isActiveTool(handleScaleRTFCube) || isActiveTool(handleStretchXSphere) ||
isActiveTool(handleStretchYSphere) || isActiveTool(handleStretchZSphere));
that.setHandleScaleEdgeVisible(!isActiveTool(handleRotatePitchRing) && !isActiveTool(handleRotateYawRing) &&
!isActiveTool(handleRotateRollRing));
var showOutlineForZone = (SelectionManager.selections.length === 1 &&
SelectionManager.savedProperties[SelectionManager.selections[0]].type === "Zone");
that.setHandleScaleEdgeVisible(showOutlineForZone || (!isActiveTool(handleRotatePitchRing) &&
!isActiveTool(handleRotateYawRing) &&
!isActiveTool(handleRotateRollRing)));
//keep cloner always hidden for now since you can hold Alt to clone while
//translating an entity - we may bring cloner back for HMD only later