Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-23 19:44:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Tidy clearing color swatches

Browse source
This commit is contained in:
David Rowe 2017-08-15 17:54:21 +12:00
parent 8cf18c1b03
commit 8d01c02c29
1 changed files with 19 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -305,9 +305,8 @@ ToolMenu = function (side, leftInputs, rightInputs, uiCommandCallback) {
command: { command: {
method: "setColorPerSwatch" method: "setColorPerSwatch"
}, },
onGripClicked: { clear: {
method: "clearSwatch", method: "clearSwatch"
parameter: "colorSwatch1"
} }
}, },
{ {
@ -325,9 +324,8 @@ ToolMenu = function (side, leftInputs, rightInputs, uiCommandCallback) {
command: { command: {
method: "setColorPerSwatch" method: "setColorPerSwatch"
}, },
onGripClicked: { clear: {
method: "clearSwatch", method: "clearSwatch"
parameter: "colorSwatch2"
} }
}, },
{ {
@ -345,9 +343,8 @@ ToolMenu = function (side, leftInputs, rightInputs, uiCommandCallback) {
command: { command: {
method: "setColorPerSwatch" method: "setColorPerSwatch"
}, },
onGripClicked: { clear: {
method: "clearSwatch", method: "clearSwatch"
parameter: "colorSwatch3"
} }
}, },
{ {
@ -365,9 +362,8 @@ ToolMenu = function (side, leftInputs, rightInputs, uiCommandCallback) {
command: { command: {
method: "setColorPerSwatch" method: "setColorPerSwatch"
}, },
onGripClicked: { clear: {
method: "clearSwatch", method: "clearSwatch"
parameter: "colorSwatch4"
} }
}, },
{ {
@ -385,9 +381,8 @@ ToolMenu = function (side, leftInputs, rightInputs, uiCommandCallback) {
command: { command: {
method: "setColorPerSwatch" method: "setColorPerSwatch"
}, },
onGripClicked: { clear: {
method: "clearSwatch", method: "clearSwatch"
parameter: "colorSwatch5"
} }
}, },
{ {
@ -405,9 +400,8 @@ ToolMenu = function (side, leftInputs, rightInputs, uiCommandCallback) {
command: { command: {
method: "setColorPerSwatch" method: "setColorPerSwatch"
}, },
onGripClicked: { clear: {
method: "clearSwatch", method: "clearSwatch"
parameter: "colorSwatch6"
} }
}, },
{ {
@ -425,9 +419,8 @@ ToolMenu = function (side, leftInputs, rightInputs, uiCommandCallback) {
command: { command: {
method: "setColorPerSwatch" method: "setColorPerSwatch"
}, },
onGripClicked: { clear: {
method: "clearSwatch", method: "clearSwatch"
parameter: "colorSwatch7"
} }
}, },
{ {
@ -445,9 +438,8 @@ ToolMenu = function (side, leftInputs, rightInputs, uiCommandCallback) {
command: { command: {
method: "setColorPerSwatch" method: "setColorPerSwatch"
}, },
onGripClicked: { clear: {
method: "clearSwatch", method: "clearSwatch"
parameter: "colorSwatch8"
} }
}, },
{ {
@ -1224,12 +1216,10 @@ ToolMenu = function (side, leftInputs, rightInputs, uiCommandCallback) {
// Grip click. // Grip click.
if (controlHand.gripClicked() !== isGripClicked) { if (controlHand.gripClicked() !== isGripClicked) {
isGripClicked = !isGripClicked; isGripClicked = !isGripClicked;
if (isGripClicked && intersectionItems && intersectedItem && intersectionItems[intersectedItem].onGripClicked) { if (isGripClicked && intersectionItems && intersectedItem && intersectionItems[intersectedItem].clear) {
controlHand.setGripClickedHandled(); controlHand.setGripClickedHandled();
if (intersectionItems[intersectedItem].onGripClicked.parameter) { parameter = intersectionItems[intersectedItem].id;
parameter = intersectionItems[intersectedItem].onGripClicked.parameter; doGripClicked(intersectionItems[intersectedItem].clear.method, parameter);
}
doGripClicked(intersectionItems[intersectedItem].onGripClicked.method, parameter);
} }
} }