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 applying color swatches

Browse source
This commit is contained in:
David Rowe 2017-08-15 17:47:59 +12:00
parent 3a1fc1f11c
commit 8cf18c1b03
1 changed files with 13 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -303,8 +303,7 @@ ToolMenu = function (side, leftInputs, rightInputs, uiCommandCallback) {
defaultValue: { red: 0, green: 255, blue: 255 } defaultValue: { red: 0, green: 255, blue: 255 }
}, },
command: { command: {
method: "setColorPerSwatch", method: "setColorPerSwatch"
parameter: "colorSwatch1.color"
}, },
onGripClicked: { onGripClicked: {
method: "clearSwatch", method: "clearSwatch",
@ -324,8 +323,7 @@ ToolMenu = function (side, leftInputs, rightInputs, uiCommandCallback) {
defaultValue: { red: 255, green: 0, blue: 255 } defaultValue: { red: 255, green: 0, blue: 255 }
}, },
command: { command: {
method: "setColorPerSwatch", method: "setColorPerSwatch"
parameter: "colorSwatch2.color"
}, },
onGripClicked: { onGripClicked: {
method: "clearSwatch", method: "clearSwatch",
@ -345,8 +343,7 @@ ToolMenu = function (side, leftInputs, rightInputs, uiCommandCallback) {
defaultValue: { red: 255, green: 255, blue: 0 } defaultValue: { red: 255, green: 255, blue: 0 }
}, },
command: { command: {
method: "setColorPerSwatch", method: "setColorPerSwatch"
parameter: "colorSwatch3.color"
}, },
onGripClicked: { onGripClicked: {
method: "clearSwatch", method: "clearSwatch",
@ -366,8 +363,7 @@ ToolMenu = function (side, leftInputs, rightInputs, uiCommandCallback) {
defaultValue: { red: 255, green: 0, blue: 0 } defaultValue: { red: 255, green: 0, blue: 0 }
}, },
command: { command: {
method: "setColorPerSwatch", method: "setColorPerSwatch"
parameter: "colorSwatch4.color"
}, },
onGripClicked: { onGripClicked: {
method: "clearSwatch", method: "clearSwatch",
@ -387,8 +383,7 @@ ToolMenu = function (side, leftInputs, rightInputs, uiCommandCallback) {
defaultValue: { red: 0, green: 255, blue: 0 } defaultValue: { red: 0, green: 255, blue: 0 }
}, },
command: { command: {
method: "setColorPerSwatch", method: "setColorPerSwatch"
parameter: "colorSwatch5.color"
}, },
onGripClicked: { onGripClicked: {
method: "clearSwatch", method: "clearSwatch",
@ -408,8 +403,7 @@ ToolMenu = function (side, leftInputs, rightInputs, uiCommandCallback) {
defaultValue: { red: 0, green: 0, blue: 255 } defaultValue: { red: 0, green: 0, blue: 255 }
}, },
command: { command: {
method: "setColorPerSwatch", method: "setColorPerSwatch"
parameter: "colorSwatch6.color"
}, },
onGripClicked: { onGripClicked: {
method: "clearSwatch", method: "clearSwatch",
@ -429,8 +423,7 @@ ToolMenu = function (side, leftInputs, rightInputs, uiCommandCallback) {
// Default to empty swatch. // Default to empty swatch.
}, },
command: { command: {
method: "setColorPerSwatch", method: "setColorPerSwatch"
parameter: "colorSwatch7.color"
}, },
onGripClicked: { onGripClicked: {
method: "clearSwatch", method: "clearSwatch",
@ -450,8 +443,7 @@ ToolMenu = function (side, leftInputs, rightInputs, uiCommandCallback) {
// Default to empty swatch. // Default to empty swatch.
}, },
command: { command: {
method: "setColorPerSwatch", method: "setColorPerSwatch"
parameter: "colorSwatch8.color"
}, },
onGripClicked: { onGripClicked: {
method: "clearSwatch", method: "clearSwatch",
@ -998,20 +990,17 @@ ToolMenu = function (side, leftInputs, rightInputs, uiCommandCallback) {
} }
function doCommand(command, parameter) { function doCommand(command, parameter) {
var parameters, var index,
index,
hasColor, hasColor,
value; value;
switch (command) { switch (command) {
case "setColorPerSwatch": case "setColorPerSwatch":
parameters = parameter.split("."); index = optionsOverlaysIDs.indexOf(parameter);
index = optionsOverlaysIDs.indexOf(parameters[0]);
hasColor = Overlays.getProperty(optionsOverlays[index], "solid"); hasColor = Overlays.getProperty(optionsOverlays[index], "solid");
if (hasColor) { if (hasColor) {
// Swatch has a color; set current fill color to swatch color. value = Overlays.getProperty(optionsOverlays[index], "color");
value = evaluateParameter(parameter);
Overlays.editOverlay(optionsOverlays[optionsOverlaysIDs.indexOf("currentColor")], { Overlays.editOverlay(optionsOverlays[optionsOverlaysIDs.indexOf("currentColor")], {
color: value color: value
}); });
@ -1026,8 +1015,8 @@ ToolMenu = function (side, leftInputs, rightInputs, uiCommandCallback) {
color: value, color: value,
solid: true solid: true
}); });
if (optionsSettings[parameters[0]]) { if (optionsSettings[parameter]) {
Settings.setValue(optionsSettings[parameters[0]].key, value); Settings.setValue(optionsSettings[parameter].key, value);
} }
} }
break; break;