diff --git a/web/app/3d/actions/core-actions.js b/web/app/3d/actions/core-actions.js index 5b549345..11b27848 100644 --- a/web/app/3d/actions/core-actions.js +++ b/web/app/3d/actions/core-actions.js @@ -2,7 +2,7 @@ import * as ActionHelpers from './action-helpers' export const EditFace = { cssIcons: ['file-picture-o'], - label: 'edit', + label: 'edit sketch', icon96: 'img/3d/face-edit96.png', info: 'open sketcher for a face/plane', listens: ['selection'], diff --git a/web/app/3d/operations.js b/web/app/3d/operations.js index 4f750c21..461655f3 100644 --- a/web/app/3d/operations.js +++ b/web/app/3d/operations.js @@ -2,7 +2,7 @@ import * as math from '../math/math' export const CUT = { icon: 'img/3d/cut', - label: 'Cut', + label: 'Cut', info: (p) => '(' + r(math.norm2(p.target)) + ')' }; @@ -13,7 +13,7 @@ export const PAD = { }; export const REVOLVE = { - icon: 'img/3d/shell', + icon: 'img/3d/revolve', label: 'Revolve', info: (p) => '(' + p.angle + ')' }; @@ -68,4 +68,4 @@ export const IMPORT_STL = { function r(value) { return value.toPrecision(4).replace(/\.0$/, ''); -} \ No newline at end of file +} diff --git a/web/app/3d/ui/ctrl.js b/web/app/3d/ui/ctrl.js index 2eff50db..ce1cf52a 100644 --- a/web/app/3d/ui/ctrl.js +++ b/web/app/3d/ui/ctrl.js @@ -60,12 +60,14 @@ function UI(app) { UI.prototype.createCraftToolBar = function (vertPos) { var toolBar = new ToolBar(this.app); - toolBar.add(this.app.actionManager.actions['EditFace']); - toolBar.add(this.app.actionManager.actions['CUT']); - toolBar.add(this.app.actionManager.actions['PAD']); toolBar.add(this.app.actionManager.actions['PLANE']); - toolBar.add(this.app.actionManager.actions['BOX']); - toolBar.add(this.app.actionManager.actions['SPHERE']); + toolBar.add(this.app.actionManager.actions['EditFace']); + toolBar.add(this.app.actionManager.actions['PAD']); + toolBar.add(this.app.actionManager.actions['CUT']); + toolBar.add(this.app.actionManager.actions['REVOLVE']); + + + $('#viewer-container').append(toolBar.node); toolBar.node.css({left: '10px',top : vertPos + 'px'}); return toolBar; diff --git a/web/img/3d/revolve23.png b/web/img/3d/revolve23.png new file mode 100644 index 00000000..fc815fc2 Binary files /dev/null and b/web/img/3d/revolve23.png differ diff --git a/web/img/3d/revolve96.png b/web/img/3d/revolve96.png new file mode 100644 index 00000000..619297a0 Binary files /dev/null and b/web/img/3d/revolve96.png differ diff --git a/web/img/3d/shell96.png b/web/img/3d/shell96.png index 91988e84..c1eea845 100644 Binary files a/web/img/3d/shell96.png and b/web/img/3d/shell96.png differ