diff --git a/packages/viewer/example/demo.js b/packages/viewer/example/demo.js index b6969641a..e60a8cf9c 100644 --- a/packages/viewer/example/demo.js +++ b/packages/viewer/example/demo.js @@ -228,11 +228,12 @@ var v = new _modules_Viewer__WEBPACK_IMPORTED_MODULE_0__.default({ }); v.on('load-progress', args => console.log(args)); window.v = v; +var token = 'e844747dc6f6b0b5c7d5fbd82d66de6e9529531d75'; window.LoadData = /*#__PURE__*/function () { var _LoadData = _asyncToGenerator(function* (url) { - url = url || document.getElementById('objectIdInput').value; - yield v.loadObject(url, 'e844747dc6f6b0b5c7d5fbd82d66de6e9529531d75'); + url = url || document.getElementById('objectUrlInput').value; + yield v.loadObject(url, token); }); function LoadData(_x) { @@ -249,7 +250,7 @@ window.LoadDataOld = /*#__PURE__*/function () { var loader = new _modules_ObjectLoader__WEBPACK_IMPORTED_MODULE_1__.default({ serverUrl: 'https://staging.speckle.dev', streamId: '5486aa9fc7', - token: 'e844747dc6f6b0b5c7d5fbd82d66de6e9529531d75', + token, objectId: id }); var converter = new _modules_Converter__WEBPACK_IMPORTED_MODULE_2__.default(loader); @@ -1113,6 +1114,7 @@ var SceneObjectManager = /*#__PURE__*/function () { this.solidObjects.clear(); this.transparentObjects.clear(); + this.viewer.selectionHelper.unselect(); this.objectIds = []; this._postLoadFunction(); diff --git a/packages/viewer/example/example.html b/packages/viewer/example/example.html index 7136a6680..8d99e919e 100644 --- a/packages/viewer/example/example.html +++ b/packages/viewer/example/example.html @@ -28,21 +28,23 @@

Viewer

-

Click an object to select it. Double click it to focus on it. Here are some extra buttons:

+
Controls summary:
+

Click an object to select it. Double click it to focus on it. Press `esc` to clear the selection. Press `shift-s` to toggle a section plane. Press `s` while the section plane is active to toggle its control mode. Double click anywhere outside an object to zoom extents to the entire scene.

- -
- press 's' to rotate/drag section plane
- - - + + +
+
+ + +
+
diff --git a/packages/viewer/src/modules/SceneObjectManager.js b/packages/viewer/src/modules/SceneObjectManager.js index 0b30fac31..03c6f263f 100644 --- a/packages/viewer/src/modules/SceneObjectManager.js +++ b/packages/viewer/src/modules/SceneObjectManager.js @@ -141,6 +141,7 @@ export default class SceneObjectManager { } this.solidObjects.clear() this.transparentObjects.clear() + this.viewer.selectionHelper.unselect() this.objectIds = [] this._postLoadFunction()