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

Fix up colors and highlighting of group/ungroup and toggle buttons

Browse source
This commit is contained in:
David Rowe 2017-08-31 09:30:11 +12:00
parent db27b97ec7
commit 59505b4334
1 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -316,8 +316,10 @@ ToolsMenu = function (side, leftInputs, rightInputs, uiCommandCallback) {
ignoreRayIntersection: false,
visible: true
},
onColor: UIT.colors.greenShadow,
onColor: UIT.colors.greenHighlight,
offColor: UIT.colors.baseGrayShadow,
onHighlightColor: UIT.colors.greenShadow,
offHighlightColor: UIT.colors.darkGray,
newLabel: { // TODO: Rename to "label".
// Relative to newToggleButton.
localPosition: {
@ -1003,8 +1005,8 @@ ToolsMenu = function (side, leftInputs, rightInputs, uiCommandCallback) {
},
color: UIT.colors.baseGrayShadow
},
enabledColor: UIT.colors.greenShadow,
highlightColor: UIT.colors.greenHighlight,
enabledColor: UIT.colors.greenHighlight,
highlightColor: UIT.colors.greenShadow,
newLabel: {
url: "../assets/tools/group/group-label.svg",
scale: 0.0351,
@ -1032,8 +1034,8 @@ ToolsMenu = function (side, leftInputs, rightInputs, uiCommandCallback) {
color: UIT.colors.baseGrayShadow
},
enabledColor: UIT.colors.redAccent,
highlightColor: UIT.colors.redHighlight,
enabledColor: UIT.colors.redHighlight,
highlightColor: UIT.colors.redAccent,
newLabel: {
url: "../assets/tools/group/ungroup-label.svg",
scale: 0.0496,
@ -2898,7 +2900,7 @@ ToolsMenu = function (side, leftInputs, rightInputs, uiCommandCallback) {
});
}
// Highlight new item. (The existence of a command or callback infers that the item should be highlighted.)
if (isHighlightingNewButton || isHighlightingNewToggleButton) {
if (isHighlightingNewButton) {
if (intersectionEnabled[highlightedItem]) {
localPosition = intersectionItems[highlightedItem].properties.localPosition;
Overlays.editOverlay(intersectionOverlays[highlightedItem], {
@ -2908,6 +2910,16 @@ ToolsMenu = function (side, leftInputs, rightInputs, uiCommandCallback) {
localPosition: Vec3.sum(localPosition, OPTION_HOVER_DELTA)
});
}
} else if (isHighlightingNewToggleButton) {
if (intersectionEnabled[highlightedItem]) {
localPosition = intersectionItems[highlightedItem].properties.localPosition;
Overlays.editOverlay(intersectionOverlays[highlightedItem], {
color: optionsToggles[intersectionItems[highlightedItem].id]
? UI_ELEMENTS.newToggleButton.onHighlightColor
: UI_ELEMENTS.newToggleButton.offHighlightColor,
localPosition: Vec3.sum(localPosition, OPTION_HOVER_DELTA)
});
}
} else if (isHighlightingSwatch) {
localPosition = intersectionItems[highlightedItem].properties.localPosition;
if (optionsSettings[intersectionItems[highlightedItem].id].value === "") {