diff --git a/assets/images/3dviewer_net_start_page.png b/assets/images/3dviewer_net_start_page.png index 4fbcea3..e501dec 100644 Binary files a/assets/images/3dviewer_net_start_page.png and b/assets/images/3dviewer_net_start_page.png differ diff --git a/source/website/featureset.js b/source/website/featureset.js index 5422814..e746337 100644 --- a/source/website/featureset.js +++ b/source/website/featureset.js @@ -1,5 +1,4 @@ export const FeatureSet = { - MeasureTool : false, EnvironmentMap : false }; diff --git a/source/website/measuretool.js b/source/website/measuretool.js index 02a5390..ac4e2a5 100644 --- a/source/website/measuretool.js +++ b/source/website/measuretool.js @@ -15,7 +15,7 @@ function GetFaceWorldNormal (intersection) function CreateMaterial () { return new THREE.LineBasicMaterial ({ - color : 0x000000, + color : 0x263238, depthTest : false }); } diff --git a/source/website/website.js b/source/website/website.js index 4fbc3b9..35adb4a 100644 --- a/source/website/website.js +++ b/source/website/website.js @@ -19,7 +19,6 @@ import { HasDefaultMaterial, ReplaceDefaultMaterialColor } from '../engine/model import { Direction } from '../engine/geometry/geometry.js'; import { CookieGetBoolVal, CookieSetBoolVal } from './cookiehandler.js'; import { ShadingType } from '../engine/threejs/threeutils.js'; -import { FeatureSet } from './featureset.js'; import { MeasureTool } from './measuretool.js'; export const WebsiteUIState = @@ -567,15 +566,13 @@ export class Website this.viewer.SetFixUpVector (false); } }); - if (FeatureSet.MeasureTool) { - AddSeparator (this.toolbar, ['only_full_width', 'only_on_model']); - let measureToolButton = AddPushButton (this.toolbar, 'measure', 'Measure', ['only_full_width', 'only_on_model'], (isSelected) => { - HandleEvent ('measure_tool_activated', isSelected ? 'on' : 'off'); - this.navigator.SetSelection (null); - this.measureTool.SetActive (isSelected); - }); - this.measureTool.SetButton (measureToolButton); - } + AddSeparator (this.toolbar, ['only_full_width', 'only_on_model']); + let measureToolButton = AddPushButton (this.toolbar, 'measure', 'Measure', ['only_full_width', 'only_on_model'], (isSelected) => { + HandleEvent ('measure_tool_activated', isSelected ? 'on' : 'off'); + this.navigator.SetSelection (null); + this.measureTool.SetActive (isSelected); + }); + this.measureTool.SetButton (measureToolButton); AddSeparator (this.toolbar, ['only_full_width', 'only_on_model']); AddButton (this.toolbar, 'export', 'Export model', ['only_full_width', 'only_on_model'], () => { let exportDialog = new ExportDialog ({ diff --git a/website/css/O3DVIcons/O3DVIcons.woff b/website/css/O3DVIcons/O3DVIcons.woff index 3840775..4758d1a 100644 Binary files a/website/css/O3DVIcons/O3DVIcons.woff and b/website/css/O3DVIcons/O3DVIcons.woff differ diff --git a/website/css/icons.css b/website/css/icons.css index 51a7a0b..6794363 100644 --- a/website/css/icons.css +++ b/website/css/icons.css @@ -1,6 +1,6 @@ @font-face { font-family: "O3DVIcons"; - src: url("O3DVIcons/O3DVIcons.woff?43ee2533396d2125f154730cabd87b6e") format("woff"); + src: url("O3DVIcons/O3DVIcons.woff?8e8ff80e3f2f51d21873c070a35e0f3c") format("woff"); } i[class^="icon-"]:before, i[class*=" icon-"]:before { diff --git a/website/info/O3DVIcons.woff b/website/info/O3DVIcons.woff index 3840775..4758d1a 100644 Binary files a/website/info/O3DVIcons.woff and b/website/info/O3DVIcons.woff differ diff --git a/website/info/icons.css b/website/info/icons.css index d4491ec..a76f10d 100644 --- a/website/info/icons.css +++ b/website/info/icons.css @@ -1,6 +1,6 @@ @font-face { font-family: "O3DVIcons"; - src: url("./O3DVIcons.woff?43ee2533396d2125f154730cabd87b6e") format("woff"); + src: url("./O3DVIcons.woff?8e8ff80e3f2f51d21873c070a35e0f3c") format("woff"); } i[class^="icon-"]:before, i[class*=" icon-"]:before {