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

Tidy group buttons' enabling

Browse source
This commit is contained in:
David Rowe 2017-08-05 17:52:54 +12:00
parent bff3ad342d
commit 4e87c13020
1 changed files with 25 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
scripts/vr-edit/modules/toolMenu.js
View file

@ -244,9 +244,6 @@ ToolMenu = function (side, leftInputs, rightInputs, doCallback) {
] ]
}, },
GROUP_BUTTON_INDEX = 1,
UNGROUP_BUTTON_INDEX = 2,
MENU_ITEMS = [ MENU_ITEMS = [
{ {
id: "toolsMenuPanel", id: "toolsMenuPanel",
@ -347,8 +344,11 @@ ToolMenu = function (side, leftInputs, rightInputs, doCallback) {
pressedItem, pressedItem,
pressedSource, pressedSource,
isButtonPressed, isButtonPressed,
isGroupButtonEnabled, isGroupButtonEnabled,
isUngroupButtonEnabled, isUngroupButtonEnabled,
groupButtonIndex,
ungroupButtonIndex,
isDisplaying = false, isDisplaying = false,
@ -427,8 +427,8 @@ ToolMenu = function (side, leftInputs, rightInputs, doCallback) {
// Special handling for Group options. // Special handling for Group options.
if (toolOptions === "groupOptions") { if (toolOptions === "groupOptions") {
optionsEnabled[GROUP_BUTTON_INDEX] = false; optionsEnabled[groupButtonIndex] = false;
optionsEnabled[UNGROUP_BUTTON_INDEX] = false; optionsEnabled[ungroupButtonIndex] = false;
} }
} }
@ -570,23 +570,23 @@ ToolMenu = function (side, leftInputs, rightInputs, doCallback) {
enableGroupButton = groupsCount > 1; enableGroupButton = groupsCount > 1;
if (enableGroupButton !== isGroupButtonEnabled) { if (enableGroupButton !== isGroupButtonEnabled) {
isGroupButtonEnabled = enableGroupButton; isGroupButtonEnabled = enableGroupButton;
Overlays.editOverlay(optionsOverlays[GROUP_BUTTON_INDEX], { Overlays.editOverlay(optionsOverlays[groupButtonIndex], {
color: isGroupButtonEnabled color: isGroupButtonEnabled
? OPTONS_PANELS.groupOptions[GROUP_BUTTON_INDEX].enabledColor ? OPTONS_PANELS.groupOptions[groupButtonIndex].enabledColor
: OPTONS_PANELS.groupOptions[GROUP_BUTTON_INDEX].properties.color : OPTONS_PANELS.groupOptions[groupButtonIndex].properties.color
}); });
optionsEnabled[GROUP_BUTTON_INDEX] = enableGroupButton; optionsEnabled[groupButtonIndex] = enableGroupButton;
} }
enableUngroupButton = groupsCount === 1 && entitiesCount > 1; enableUngroupButton = groupsCount === 1 && entitiesCount > 1;
if (enableUngroupButton !== isUngroupButtonEnabled) { if (enableUngroupButton !== isUngroupButtonEnabled) {
isUngroupButtonEnabled = enableUngroupButton; isUngroupButtonEnabled = enableUngroupButton;
Overlays.editOverlay(optionsOverlays[UNGROUP_BUTTON_INDEX], { Overlays.editOverlay(optionsOverlays[ungroupButtonIndex], {
color: isUngroupButtonEnabled color: isUngroupButtonEnabled
? OPTONS_PANELS.groupOptions[UNGROUP_BUTTON_INDEX].enabledColor ? OPTONS_PANELS.groupOptions[ungroupButtonIndex].enabledColor
: OPTONS_PANELS.groupOptions[UNGROUP_BUTTON_INDEX].properties.color : OPTONS_PANELS.groupOptions[ungroupButtonIndex].properties.color
}); });
optionsEnabled[UNGROUP_BUTTON_INDEX] = enableUngroupButton; optionsEnabled[ungroupButtonIndex] = enableUngroupButton;
} }
} }
} }
@ -596,6 +596,7 @@ ToolMenu = function (side, leftInputs, rightInputs, doCallback) {
var handJointIndex, var handJointIndex,
properties, properties,
parentID, parentID,
id,
i, i,
length; length;
@ -657,6 +658,17 @@ ToolMenu = function (side, leftInputs, rightInputs, doCallback) {
isGroupButtonEnabled = false; isGroupButtonEnabled = false;
isUngroupButtonEnabled = false; isUngroupButtonEnabled = false;
// Special handling for Group options.
for (i = 0, length = OPTONS_PANELS.groupOptions.length; i < length; i += 1) {
id = OPTONS_PANELS.groupOptions[i].id;
if (id === "groupButton") {
groupButtonIndex = i;
}
if (id === "ungroupButton") {
ungroupButtonIndex = i;
}
}
isDisplaying = true; isDisplaying = true;
} }