Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 07:19:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Implement group selection box button states

Browse source
This commit is contained in:
David Rowe 2017-09-21 19:07:13 +12:00
parent a56a155cc3
commit 2f9a314aa9
1 changed files with 52 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
scripts/vr-edit/modules/toolsMenu.js
View file

@ -1090,6 +1090,7 @@ ToolsMenu = function (side, leftInputs, rightInputs, uiCommandCallback) {
color: UIT.colors.baseGray color: UIT.colors.baseGray
}, },
labelEnabledColor: UIT.colors.white, labelEnabledColor: UIT.colors.white,
enabled: false,
command: { command: {
method: "cancelGroupSelectionBox" method: "cancelGroupSelectionBox"
} }
@ -2423,7 +2424,7 @@ ToolsMenu = function (side, leftInputs, rightInputs, uiCommandCallback) {
swatchHighlightOverlay = Overlays.addOverlay(UI_ELEMENTS.swatchHighlight.overlay, properties); swatchHighlightOverlay = Overlays.addOverlay(UI_ELEMENTS.swatchHighlight.overlay, properties);
} }
optionsEnabled.push(true); optionsEnabled.push(optionsItems[i].enabled === undefined || optionsItems[i].enabled);
} }
// Special handling for Group options. // Special handling for Group options.
@ -2703,6 +2704,54 @@ ToolsMenu = function (side, leftInputs, rightInputs, uiCommandCallback) {
setColorPicker(parameter); setColorPicker(parameter);
break; break;
case "toggleGroupSelectionBox":
optionsToggles.groupSelectionBoxButton = !optionsToggles.groupSelectionBoxButton;
index = optionsOverlaysIDs.indexOf("groupSelectionBoxButton");
Overlays.editOverlay(optionsOverlays[index], {
color: optionsToggles.groupSelectionBoxButton
? UI_ELEMENTS[optionsItems[index].type].onHoverColor
: UI_ELEMENTS[optionsItems[index].type].offHoverColor
});
index = optionsOverlaysIDs.indexOf("groupsSelectionBoxCancelButton");
Overlays.editOverlay(optionsOverlays[index], {
color: optionsToggles.groupSelectionBoxButton
? optionsItems[index].enabledColor
: optionsItems[index].properties.color
});
Overlays.editOverlay(optionsOverlaysLabels[index], {
color: optionsToggles.groupSelectionBoxButton
? optionsItems[index].labelEnabledColor
: optionsItems[index].label.color
});
optionsEnabled[index] = optionsToggles.groupSelectionBoxButton;
uiCommandCallback("toggleGroupSelectionBoxTool", optionsToggles.groupSelectionBoxButton);
break;
case "cancelGroupSelectionBox":
optionsToggles.groupSelectionBoxButton = false;
index = optionsOverlaysIDs.indexOf("groupSelectionBoxButton");
Overlays.editOverlay(optionsOverlays[index], {
color : optionsToggles.groupSelectionBoxButton
? UI_ELEMENTS[optionsItems[index].type].onHoverColor
: UI_ELEMENTS[optionsItems[index].type].offHoverColor
});
index = optionsOverlaysIDs.indexOf("groupsSelectionBoxCancelButton");
Overlays.editOverlay(optionsOverlays[index], {
color: optionsItems[index].properties.color
});
Overlays.editOverlay(optionsOverlaysLabels[index], {
color: optionsItems[index].label.color
});
optionsEnabled[index] = false;
uiCommandCallback("cancelGroupSelectionBoxTool");
break;
case "setGravityOn": case "setGravityOn":
case "setGrabOn": case "setGrabOn":
case "setCollideOn": case "setCollideOn":
@ -3209,7 +3258,8 @@ ToolsMenu = function (side, leftInputs, rightInputs, uiCommandCallback) {
if (pressedItem) { if (pressedItem) {
// Unpress previous button. // Unpress previous button.
Overlays.editOverlay(pressedSource[pressedItem.index], { Overlays.editOverlay(pressedSource[pressedItem.index], {
localPosition: isHoveringButtonElement && hoveredItem === pressedItem.index localPosition:
isHoveringButtonElement && hoveredItem === pressedItem.index && optionsEnabled[pressedItem.index]
? Vec3.sum(pressedItem.localPosition, OPTION_HOVER_DELTA) ? Vec3.sum(pressedItem.localPosition, OPTION_HOVER_DELTA)
: pressedItem.localPosition : pressedItem.localPosition
}); });