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

Remove setting tool icon color

Browse source
This commit is contained in:
David Rowe 2017-08-24 11:10:41 +12:00
parent 5a1b2babde
commit e8a1614499
2 changed files with 0 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
scripts/vr-edit/modules/toolIcon.js
View file

@ -94,10 +94,6 @@ ToolIcon = function (side) {
}
}
function setColor(color) {
Overlays.editOverlay(iconOverlay, { color: color });
}
function clear() {
// Deletes current icon.
if (iconOverlay) {
@ -121,7 +117,6 @@ ToolIcon = function (side) {
setHand: setHand,
update: update,
display: display,
setColor: setColor,
clear: clear,
destroy: destroy
};

11
scripts/vr-edit/vr-edit.js
View file

@ -227,10 +227,6 @@
toolIcon.display(icon);
}
function setToolColor(color) {
toolIcon.setColor(color);
}
function clearTool() {
toolIcon.clear();
toolsMenu.clearTool();
@ -292,7 +288,6 @@
return {
setHand: setHand,
setToolIcon: setToolIcon,
setToolColor: setToolColor,
clearTool: clearTool,
SCALE_TOOL: toolIcon.SCALE_TOOL,
CLONE_TOOL: toolIcon.CLONE_TOOL,
@ -912,11 +907,9 @@
if (color) {
colorToolColor = color;
ui.doPickColor(colorToolColor);
ui.setToolColor(colorToolColor);
}
toolSelected = TOOL_COLOR;
ui.setToolIcon(ui.COLOR_TOOL);
ui.setToolColor(colorToolColor);
} else if (toolSelected === TOOL_PHYSICS) {
setState(EDITOR_HIGHLIGHTING);
selection.applyPhysics(physicsToolPhysics);
@ -995,11 +988,9 @@
if (color) {
colorToolColor = color;
ui.doPickColor(colorToolColor);
ui.setToolColor(colorToolColor);
}
toolSelected = TOOL_COLOR;
ui.setToolIcon(ui.COLOR_TOOL);
ui.setToolColor(colorToolColor);
} else if (toolSelected === TOOL_PHYSICS) {
selection.applyPhysics(physicsToolPhysics);
} else if (toolSelected === TOOL_DELETE) {
@ -1358,7 +1349,6 @@
grouping.clear();
toolSelected = TOOL_COLOR;
ui.setToolIcon(ui.COLOR_TOOL);
ui.setToolColor(parameter);
colorToolColor = parameter;
ui.updateUIEntities();
break;
@ -1397,7 +1387,6 @@
toolSelected = TOOL_COLOR;
ui.setToolIcon(ui.COLOR_TOOL);
}
ui.setToolColor(parameter);
colorToolColor = parameter;
break;