diff --git a/assets/icons/camera_orthographic.svg b/assets/icons/camera_orthographic.svg index f65c09e..b5a6f9c 100644 --- a/assets/icons/camera_orthographic.svg +++ b/assets/icons/camera_orthographic.svg @@ -1,36 +1,81 @@ + id="defs25" /> + + + + + + + + + + + diff --git a/assets/icons/camera_perspective.svg b/assets/icons/camera_perspective.svg index 5b734b1..5677a05 100644 --- a/assets/icons/camera_perspective.svg +++ b/assets/icons/camera_perspective.svg @@ -1,35 +1,67 @@ + id="defs21" /> + + + + + + + + + diff --git a/source/website/featureset.js b/source/website/featureset.js index 6b17d76..1590268 100644 --- a/source/website/featureset.js +++ b/source/website/featureset.js @@ -1,4 +1,4 @@ export const FeatureSet = { - OrthographicView : false + }; diff --git a/source/website/website.js b/source/website/website.js index 076e209..78ed729 100644 --- a/source/website/website.js +++ b/source/website/website.js @@ -23,7 +23,6 @@ import { CookieGetBoolVal, CookieSetBoolVal } from './cookiehandler.js'; import { ShadingType } from '../engine/threejs/threeutils.js'; import { MeasureTool } from './measuretool.js'; import { CloseAllDialogs } from './dialog.js'; -import { FeatureSet } from './featureset.js'; import * as THREE from 'three'; @@ -557,33 +556,22 @@ export class Website this.viewer.FlipUpVector (); }); AddSeparator (this.toolbar, ['only_on_model']); - if (FeatureSet.OrthographicView) { - AddRadioButton (this.toolbar, ['camera_perspective', 'camera_orthographic'], ['Perspective camera', 'Orthographic camera'], 0, ['only_on_model'], (buttonIndex) => { - if (buttonIndex === 0) { - this.viewer.SetCameraMode (CameraMode.Perspective); - } else if (buttonIndex === 1) { - this.viewer.SetCameraMode (CameraMode.Orthographic); - } - }); - AddSeparator (this.toolbar, ['only_full_width', 'only_on_model']); - AddRadioButton (this.toolbar, ['fix_up_on', 'fix_up_off'], ['Fixed up vector', 'Free orbit'], 0, ['only_full_width', 'only_on_model'], (buttonIndex) => { - if (buttonIndex === 0) { - this.viewer.SetFixUpVector (true); - } else if (buttonIndex === 1) { - this.viewer.SetFixUpVector (false); - } - }); - AddSeparator (this.toolbar, ['only_full_width', 'only_on_model']); - } else { - AddRadioButton (this.toolbar, ['fix_up_on', 'fix_up_off'], ['Fixed up vector', 'Free orbit'], 0, ['only_on_model'], (buttonIndex) => { - if (buttonIndex === 0) { - this.viewer.SetFixUpVector (true); - } else if (buttonIndex === 1) { - this.viewer.SetFixUpVector (false); - } - }); - AddSeparator (this.toolbar, ['only_full_width', 'only_on_model']); - } + AddRadioButton (this.toolbar, ['fix_up_on', 'fix_up_off'], ['Fixed up vector', 'Free orbit'], 0, ['only_full_width', 'only_on_model'], (buttonIndex) => { + if (buttonIndex === 0) { + this.viewer.SetFixUpVector (true); + } else if (buttonIndex === 1) { + this.viewer.SetFixUpVector (false); + } + }); + AddSeparator (this.toolbar, ['only_full_width', 'only_on_model']); + AddRadioButton (this.toolbar, ['camera_perspective', 'camera_orthographic'], ['Perspective camera', 'Orthographic camera'], 0, ['only_on_model'], (buttonIndex) => { + if (buttonIndex === 0) { + this.viewer.SetCameraMode (CameraMode.Perspective); + } else if (buttonIndex === 1) { + this.viewer.SetCameraMode (CameraMode.Orthographic); + } + }); + 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); diff --git a/website/css/O3DVIcons/O3DVIcons.woff b/website/css/O3DVIcons/O3DVIcons.woff index a6e6968..ae65558 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 826c355..2d7877c 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?780171e944ff8a7e49a1336268d1461f") format("woff"); + src: url("O3DVIcons/O3DVIcons.woff?8f67a1f0a9586b502ca919a45546917d") format("woff"); } i[class^="icon-"]:before, i[class*=" icon-"]:before { diff --git a/website/index.html b/website/index.html index 99d6007..d089e7c 100644 --- a/website/index.html +++ b/website/index.html @@ -83,8 +83,6 @@ Drag and drop 3D models here.
obj, 3ds, stl, ply, gltf, 3dm, fbx, and more - -
Example models:
@@ -95,6 +93,8 @@ helmet
+ + diff --git a/website/info/css/O3DVIcons.woff b/website/info/css/O3DVIcons.woff index a6e6968..ae65558 100644 Binary files a/website/info/css/O3DVIcons.woff and b/website/info/css/O3DVIcons.woff differ diff --git a/website/info/css/icons.css b/website/info/css/icons.css index fca415a..db62bd4 100644 --- a/website/info/css/icons.css +++ b/website/info/css/icons.css @@ -1,6 +1,6 @@ @font-face { font-family: "O3DVIcons"; - src: url("./O3DVIcons.woff?780171e944ff8a7e49a1336268d1461f") format("woff"); + src: url("./O3DVIcons.woff?8f67a1f0a9586b502ca919a45546917d") format("woff"); } i[class^="icon-"]:before, i[class*=" icon-"]:before {