@abi-software/scaffoldvuer 0.1.53 → 0.1.54-beta.2

package/dist/scaffoldvuer.umd.js

@@ -96,6 +96,13 @@ return /******/ (function(modules) { // webpackBootstrap
 /************************************************************************/
 /******/ ({
 
+/***/ "0481":
+/***/ (function(module, exports, __webpack_require__) {
+
+// extracted by mini-css-extract-plugin
+
+/***/ }),
+
 /***/ "0676":
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -2578,6 +2585,13 @@ module.exports = require("core-js/modules/es.symbol.iterator.js");
 
 /***/ }),
 
+/***/ "3bcb":
+/***/ (function(module, exports, __webpack_require__) {
+
+// extracted by mini-css-extract-plugin
+
+/***/ }),
+
 /***/ "3d2d":
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -6331,7 +6345,7 @@ var OrgansViewer = function OrgansViewer(ModelsLoaderIn) {
     _this.sceneData.currentName = name;
   };
 
-  this.loadOrgansFromURL = function (url, speciesName, systemName, partName, viewURL) {
+  this.loadOrgansFromURL = function (url, speciesName, systemName, partName, viewURL, clearFirst) {
     if (_this.zincRenderer) {
       if (partName && _this.sceneData.metaURL !== url) {
         setSceneData(speciesName, systemName, partName, undefined);
@@ -6340,7 +6354,7 @@ var OrgansViewer = function OrgansViewer(ModelsLoaderIn) {
         var organScene = _this.zincRenderer.getSceneByName(name);
 
         if (organScene) {
-          organScene.clearAll();
+          if (clearFirst) organScene.clearAll();
         } else {
           organScene = _this.zincRenderer.createScene(name);
         }
@@ -6372,6 +6386,41 @@ var OrgansViewer = function OrgansViewer(ModelsLoaderIn) {
     }
   };
 
+  this.loadGLTFFromURL = function (url, partName, clearFirst) {
+    if (_this.zincRenderer) {
+      if (partName && _this.sceneData.metaURL !== url) {
+        setSceneData(undefined, undefined, partName, undefined);
+        var name = _this.sceneData.currentName;
+
+        var organScene = _this.zincRenderer.getSceneByName(name);
+
+        if (organScene) {
+          if (clearFirst) organScene.clearAll();
+        } else {
+          organScene = _this.zincRenderer.createScene(name);
+        }
+
+        for (var i = 0; i < sceneChangedCallbacks.length; i++) {
+          sceneChangedCallbacks[i](_this.sceneData);
+        }
+
+        _this.sceneData.viewURL = undefined;
+        _this.sceneData.metaURL = url;
+        organScene.loadGLTF(url, _addOrganPartCallback(undefined, partName, false), downloadCompletedCallback());
+        _this.scene = organScene;
+
+        _this.zincRenderer.setCurrentScene(organScene);
+
+        _this.graphicsHighlight.reset();
+
+        var zincCameraControl = organScene.getZincCameraControls();
+        zincCameraControl.enableRaycaster(organScene, _pickingCallback(), _hoverCallback());
+        zincCameraControl.setMouseButtonAction("AUXILIARY", "ZOOM");
+        zincCameraControl.setMouseButtonAction("SECONDARY", "PAN");
+      }
+    }
+  };
+
   this.alignCameraWithSelectedObject = function (transitionTime) {
     var objects = _this.graphicsHighlight.getSelected();
 
@@ -6397,7 +6446,7 @@ var OrgansViewer = function OrgansViewer(ModelsLoaderIn) {
       _this.setName(settings.name);
 
       if (settings.metaURL !== undefined && settings.metaURL != "") {
-        _this.loadOrgansFromURL(settings.metaURL, settings.species, settings.system, settings.part, settings.viewURL);
+        _this.loadOrgansFromURL(settings.metaURL, settings.species, settings.system, settings.part, settings.viewURL, true);
       } else {
         _this.loadOrgans(settings.species, settings.system, settings.part);
       }
@@ -6433,13 +6482,6 @@ exports.OrgansViewer = OrgansViewer;
 
 /***/ }),
 
-/***/ "540c":
-/***/ (function(module, exports, __webpack_require__) {
-
-// extracted by mini-css-extract-plugin
-
-/***/ }),
-
 /***/ "5488":
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -6808,17 +6850,6 @@ function _arrayLikeToArray(arr, len) {
 
 module.exports = _arrayLikeToArray, module.exports.__esModule = true, module.exports["default"] = module.exports;
 
-/***/ }),
-
-/***/ "5ae1":
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_9_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_9_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_9_oneOf_1_2_node_modules_sass_loader_dist_cjs_js_ref_9_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_ScaffoldVuer_vue_vue_type_style_index_0_id_3379deaa_scoped_true_lang_scss___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("540c");
-/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_9_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_9_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_9_oneOf_1_2_node_modules_sass_loader_dist_cjs_js_ref_9_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_ScaffoldVuer_vue_vue_type_style_index_0_id_3379deaa_scoped_true_lang_scss___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_ref_9_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_9_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_9_oneOf_1_2_node_modules_sass_loader_dist_cjs_js_ref_9_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_ScaffoldVuer_vue_vue_type_style_index_0_id_3379deaa_scoped_true_lang_scss___WEBPACK_IMPORTED_MODULE_0__);
-/* unused harmony reexport * */
-
-
 /***/ }),
 
 /***/ "5e32":
@@ -10663,9 +10694,9 @@ BaseModule.prototype.importSettings = function (settings) {
   return false;
 };
 
-BaseModule.prototype.publishChanges = function (annotations, eventType) {
+BaseModule.prototype.publishChanges = function (annotations, eventType, zincObjects) {
   for (var i = 0; i < this.eventNotifiers.length; i++) {
-    this.eventNotifiers[i].publish(this, eventType, annotations);
+    this.eventNotifiers[i].publish(this, eventType, annotations, zincObjects);
   }
 };
 
@@ -15315,13 +15346,14 @@ RendererModule.prototype.getAnnotationsFromObjects = function (objects) {
 
 RendererModule.prototype.setHighlightedByObjects = function (objects, coords, propagateChanges) {
   var changed = this.graphicsHighlight.setHighlighted(objects);
+  var zincObjects = this.objectsToZincObjects(objects);
 
   if (propagateChanges) {
     eventType = __webpack_require__("9b21").EVENT_TYPE.MOVE;
     if (changed) eventType = __webpack_require__("9b21").EVENT_TYPE.HIGHLIGHTED;
     var annotations = this.getAnnotationsFromObjects(objects);
     if (annotations.length > 0) annotations[0].coords = coords;
-    this.publishChanges(annotations, eventType);
+    this.publishChanges(annotations, eventType, zincObjects);
   }
 
   return changed;
@@ -15385,7 +15417,7 @@ RendererModule.prototype.setSelectedByObjects = function (objects, coords, propa
 
       var annotations = this.getAnnotationsFromObjects(objects);
       if (annotations.length > 0) annotations[0].coords = coords;
-      this.publishChanges(annotations, _eventType);
+      this.publishChanges(annotations, _eventType, zincObjects);
     }
   }
 
@@ -16501,17 +16533,6 @@ module.exports = require("vue");
 
 module.exports = require("zincjs");
 
-/***/ }),
-
-/***/ "9475":
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_9_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_9_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_9_oneOf_1_2_node_modules_sass_loader_dist_cjs_js_ref_9_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_TreeControls_vue_vue_type_style_index_0_id_7d6a9a0b_scoped_true_lang_scss___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("aac1");
-/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_9_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_9_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_9_oneOf_1_2_node_modules_sass_loader_dist_cjs_js_ref_9_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_TreeControls_vue_vue_type_style_index_0_id_7d6a9a0b_scoped_true_lang_scss___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_ref_9_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_9_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_9_oneOf_1_2_node_modules_sass_loader_dist_cjs_js_ref_9_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_TreeControls_vue_vue_type_style_index_0_id_7d6a9a0b_scoped_true_lang_scss___WEBPACK_IMPORTED_MODULE_0__);
-/* unused harmony reexport * */
-
-
 /***/ }),
 
 /***/ "97d3":
@@ -17141,9 +17162,10 @@ var EVENT_TYPE = {
   MOVE: 3
 };
 
-var SelectionEvent = function SelectionEvent(eventTypeIn, identifiersIn) {
+var SelectionEvent = function SelectionEvent(eventTypeIn, identifiersIn, zincObjects) {
   this.eventType = eventTypeIn;
   this.identifiers = identifiersIn;
+  this.zincObjects = zincObjects;
 };
 
 var returnFullID = function returnFullID(sourceId) {//return full annotations with all different name
@@ -17163,11 +17185,11 @@ var Subscription = function Subscription(subscriberIn, callbackIn, eventType) {
     return eventType;
   };
 
-  this.notify = function (source, eventType, ids) {
+  this.notify = function (source, eventType, ids, zincObjects) {
     if (source !== subscriber && (_this.targetEventType === EVENT_TYPE.ALL || _this.targetEventType === eventType)) {
       //should support different type of id e.g lyph, name, fmas...
       //need a function that finds all relavant ids
-      var event = new SelectionEvent(eventType, ids);
+      var event = new SelectionEvent(eventType, ids, zincObjects);
       callback(event);
     }
   };
@@ -17176,9 +17198,9 @@ var Subscription = function Subscription(subscriberIn, callbackIn, eventType) {
 exports.EventNotifier = function () {
   var subscriptions = [];
 
-  this.publish = function (source, eventType, id) {
+  this.publish = function (source, eventType, id, zincObjects) {
     for (var i = 0; i < subscriptions.length; i++) {
-      subscriptions[i].notify(source, eventType, id);
+      subscriptions[i].notify(source, eventType, id, zincObjects);
     }
   };
 
@@ -17658,13 +17680,6 @@ var isDefined = exports.isDefined = function isDefined(val) {
 
 /***/ }),
 
-/***/ "aac1":
-/***/ (function(module, exports, __webpack_require__) {
-
-// extracted by mini-css-extract-plugin
-
-/***/ }),
-
 /***/ "adec":
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -18324,6 +18339,17 @@ main.install = function (Vue) {
 
 /******/ });
 
+/***/ }),
+
+/***/ "c891":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_9_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_9_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_9_oneOf_1_2_node_modules_sass_loader_dist_cjs_js_ref_9_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_ScaffoldVuer_vue_vue_type_style_index_0_id_0157429c_scoped_true_lang_scss___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("0481");
+/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_9_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_9_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_9_oneOf_1_2_node_modules_sass_loader_dist_cjs_js_ref_9_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_ScaffoldVuer_vue_vue_type_style_index_0_id_0157429c_scoped_true_lang_scss___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_ref_9_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_9_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_9_oneOf_1_2_node_modules_sass_loader_dist_cjs_js_ref_9_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_ScaffoldVuer_vue_vue_type_style_index_0_id_0157429c_scoped_true_lang_scss___WEBPACK_IMPORTED_MODULE_0__);
+/* unused harmony reexport * */
+
+
 /***/ }),
 
 /***/ "c8a6":
@@ -22501,6 +22527,17 @@ module.exports = require("core-js/modules/es.array.splice.js");
 
 // extracted by mini-css-extract-plugin
 
+/***/ }),
+
+/***/ "f692":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_9_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_9_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_9_oneOf_1_2_node_modules_sass_loader_dist_cjs_js_ref_9_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_TreeControls_vue_vue_type_style_index_0_id_3989f99a_scoped_true_lang_scss___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("3bcb");
+/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_9_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_9_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_9_oneOf_1_2_node_modules_sass_loader_dist_cjs_js_ref_9_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_TreeControls_vue_vue_type_style_index_0_id_3989f99a_scoped_true_lang_scss___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_ref_9_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_9_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_9_oneOf_1_2_node_modules_sass_loader_dist_cjs_js_ref_9_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_TreeControls_vue_vue_type_style_index_0_id_3989f99a_scoped_true_lang_scss___WEBPACK_IMPORTED_MODULE_0__);
+/* unused harmony reexport * */
+
+
 /***/ }),
 
 /***/ "f989":
@@ -22544,12 +22581,12 @@ if (typeof window !== 'undefined') {
 // Indicate to webpack that this file can be concatenated
 /* harmony default export */ var setPublicPath = (null);
 
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"587995b2-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/ScaffoldVuer.vue?vue&type=template&id=3379deaa&scoped=true&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"6fbd5217-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/ScaffoldVuer.vue?vue&type=template&id=0157429c&scoped=true&
 var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{directives:[{name:"loading",rawName:"v-loading",value:(_vm.loading),expression:"loading"}],ref:"scaffoldContainer",staticClass:"scaffold-container",attrs:{"element-loading-text":"Loading...","element-loading-spinner":"el-icon-loading","element-loading-background":"rgba(0, 0, 0, 0.3)"}},[_c('map-svg-sprite-color'),_c('scaffold-tooltip',{attrs:{"label":_vm.tData.label,"visible":_vm.tData.visible,"x":_vm.tData.x,"y":_vm.tData.y}}),_c('div',{ref:"display",staticStyle:{"height":"100%","width":"100%"},attrs:{"id":"organsDisplayArea","tabindex":"-1"},on:{"keydown":function($event){if(!$event.type.indexOf('key')&&$event.keyCode!==66){ return null; }return _vm.backgroundChangeCallback.apply(null, arguments)}}}),_c('div',{directives:[{name:"show",rawName:"v-show",value:(_vm.displayUI && !_vm.isTransitioning),expression:"displayUI && !isTransitioning"}]},[(_vm.displayWarning)?_c('el-popover',{ref:"warningPopover",attrs:{"content":_vm.warningMessage,"placement":"right","append-to-body":false,"trigger":"manual","popper-class":"warning-popper right-popper non-selectable"},model:{value:(_vm.hoverVisabilities[6].value),callback:function ($$v) {_vm.$set(_vm.hoverVisabilities[6], "value", $$v)},expression:"hoverVisabilities[6].value"}}):_vm._e(),(_vm.displayWarning)?_c('i',{directives:[{name:"popover",rawName:"v-popover:warningPopover",arg:"warningPopover"}],staticClass:"el-icon-warning warning-icon",on:{"mouseover":function($event){return _vm.showToolitip(6)},"mouseout":function($event){return _vm.hideToolitip(6)}}},[_c('span',{staticClass:"warning-text"},[_vm._v("Beta")])]):_vm._e(),_c('el-popover',{ref:"checkBoxPopover",attrs:{"content":"Change region visibility","placement":"right","append-to-body":false,"trigger":"manual","popper-class":"scaffold-popper right-popper non-selectable"},model:{value:(_vm.hoverVisabilities[5].value),callback:function ($$v) {_vm.$set(_vm.hoverVisabilities[5], "value", $$v)},expression:"hoverVisabilities[5].value"}}),_c('tree-controls',{directives:[{name:"popover",rawName:"v-popover:checkBoxPopover",arg:"checkBoxPopover"}],ref:"treeControl",attrs:{"help-mode":_vm.helpMode,"module":_vm.$module,"show-colour-picker":_vm.showColourPicker},on:{"object-selected":_vm.objectSelected,"object-hovered":_vm.objectHovered,"drawer-toggled":_vm.drawerToggled}}),_c('div',{staticClass:"opacity-box"},[_c('opacity-controls',{ref:"opacityControl"})],1),(_vm.sceneData.timeVarying)?_c('el-popover',{ref:"sliderPopover",attrs:{"content":"Move the slider to animate the region","placement":"top","append-to-body":false,"trigger":"manual","popper-class":"scaffold-popper top-popper non-selectable"},model:{value:(_vm.hoverVisabilities[4].value),callback:function ($$v) {_vm.$set(_vm.hoverVisabilities[4], "value", $$v)},expression:"hoverVisabilities[4].value"}}):_vm._e(),(_vm.sceneData.timeVarying)?_c('div',{directives:[{name:"popover",rawName:"v-popover:sliderPopover",arg:"sliderPopover"}],staticClass:"time-slider-container",class:[ _vm.minimisedSlider ? 'minimised' : '', _vm.sliderPosition]},[_c('el-tabs',{attrs:{"type":"card"}},[_c('el-tab-pane',{attrs:{"label":"Animate scaffold"}},[_c('el-row',{staticClass:"tab-content"},[(_vm.isPlaying)?_c('map-svg-icon',{staticClass:"icon-button video-button",attrs:{"icon":"pause"},nativeOn:{"click":function($event){return _vm.play(false)}}}):_c('map-svg-icon',{staticClass:"video-button icon-button",attrs:{"icon":"play"},nativeOn:{"click":function($event){return _vm.play(true)}}}),_c('el-slider',{staticClass:"slider",attrs:{"min":0,"max":_vm.timeMax,"value":_vm.sceneData.currentTime / 100 * _vm.timeMax,"step":0.1,"tooltip-class":"time-slider-tooltip","format-tooltip":_vm.formatTooltip,"marks":_vm.timeStamps},on:{"input":function($event){return _vm.timeChange($event)}}})],1)],1),_c('el-tab-pane',{attrs:{"label":"Animation data"}},[_c('el-row',{staticClass:"tab-content"},[_c('div',{staticClass:"animation-data"},[_vm._v(" Original duration: "),_c('div',{staticClass:"purple"},[_vm._v(" "+_vm._s(_vm.orginalDuration)+" ")])]),_c('div',{staticClass:"animation-data"},[_vm._v(" Animation duration: "),_c('div',{staticClass:"purple"},[_vm._v(" "+_vm._s(_vm.animateDuration)+" ")])]),_c('div',{staticClass:"animation-data"},[_vm._v(" Playback speed "),_c('el-select',{staticClass:"select-box",attrs:{"popper-append-to-body":true,"value":_vm.currentSpeed,"placeholder":"Select","popper-class":"scaffold_viewer_dropdown"},on:{"change":function($event){return _vm.speedChanged($event)}}},_vm._l((_vm.playSpeed),function(item){return _c('el-option',{key:item.value,attrs:{"label":item.label,"value":item.value}})}),1)],1)])],1)],1)],1):_vm._e(),_c('div',{staticClass:"bottom-right-control"},[_c('el-popover',{attrs:{"content":"Zoom in","placement":"left","append-to-body":false,"trigger":"manual","popper-class":"scaffold-popper left-popper non-selectable"},model:{value:(_vm.hoverVisabilities[0].value),callback:function ($$v) {_vm.$set(_vm.hoverVisabilities[0], "value", $$v)},expression:"hoverVisabilities[0].value"}},[_c('map-svg-icon',{staticClass:"icon-button zoomIn",attrs:{"slot":"reference","icon":"zoomIn"},nativeOn:{"click":function($event){return _vm.zoomIn()},"mouseover":function($event){return _vm.showToolitip(0)},"mouseout":function($event){return _vm.hideToolitip(0)}},slot:"reference"})],1),_c('el-popover',{attrs:{"content":"Zoom out","placement":"top-end","append-to-body":false,"trigger":"manual","popper-class":"scaffold-popper popper-zoomout non-selectable"},model:{value:(_vm.hoverVisabilities[1].value),callback:function ($$v) {_vm.$set(_vm.hoverVisabilities[1], "value", $$v)},expression:"hoverVisabilities[1].value"}},[_c('map-svg-icon',{staticClass:"icon-button zoomOut",attrs:{"slot":"reference","icon":"zoomOut"},nativeOn:{"click":function($event){return _vm.zoomOut()},"mouseover":function($event){return _vm.showToolitip(1)},"mouseout":function($event){return _vm.hideToolitip(1)}},slot:"reference"})],1),_c('el-popover',{attrs:{"placement":"top","append-to-body":false,"trigger":"manual","popper-class":"scaffold-popper non-selectable"},model:{value:(_vm.hoverVisabilities[2].value),callback:function ($$v) {_vm.$set(_vm.hoverVisabilities[2], "value", $$v)},expression:"hoverVisabilities[2].value"}},[_c('div',[_vm._v(" Fit to "),_c('br'),_vm._v(" window ")]),_c('map-svg-icon',{staticClass:"icon-button fitWindow",attrs:{"slot":"reference","icon":"fitWindow"},nativeOn:{"click":function($event){return _vm.fitWindow()},"mouseover":function($event){return _vm.showToolitip(2)},"mouseout":function($event){return _vm.hideToolitip(2)}},slot:"reference"})],1)],1),_c('el-popover',{ref:"backgroundPopover",attrs:{"placement":"top-start","width":"128","append-to-body":false,"trigger":"click","popper-class":"background-popper non-selectable"}},[_c('el-row',{staticClass:"backgroundText"},[_vm._v(" Change background ")]),_c('el-row',{staticClass:"backgroundChooser"},_vm._l((_vm.availableBackground),function(item){return _c('div',{key:item,class:['backgroundChoice', item, item == _vm.currentBackground ? 'active' :''],on:{"click":function($event){return _vm.backgroundChangeCallback(item)}}})}),0)],1),_c('el-popover',{attrs:{"content":"Change background color","placement":"right","append-to-body":false,"trigger":"manual","popper-class":"scaffold-popper right-popper non-selectable"},model:{value:(_vm.hoverVisabilities[3].value),callback:function ($$v) {_vm.$set(_vm.hoverVisabilities[3], "value", $$v)},expression:"hoverVisabilities[3].value"}},[_c('map-svg-icon',{directives:[{name:"popover",rawName:"v-popover:backgroundPopover",arg:"backgroundPopover"}],staticClass:"icon-button background-colour",class:{ open: _vm.drawerOpen, close: !_vm.drawerOpen },attrs:{"slot":"reference","icon":"changeBckgd"},nativeOn:{"mouseover":function($event){return _vm.showToolitip(3)},"mouseout":function($event){return _vm.hideToolitip(3)}},slot:"reference"})],1)],1)],1)}
 var staticRenderFns = []
 
 
-// CONCATENATED MODULE: ./src/components/ScaffoldVuer.vue?vue&type=template&id=3379deaa&scoped=true&
+// CONCATENATED MODULE: ./src/components/ScaffoldVuer.vue?vue&type=template&id=0157429c&scoped=true&
 
 // EXTERNAL MODULE: ./node_modules/element-ui/lib/theme-chalk/tabs.css
 var tabs = __webpack_require__("075a");
@@ -22648,7 +22685,7 @@ var es_object_keys_js_ = __webpack_require__("ea64");
 var external_vue_ = __webpack_require__("8bbf");
 var external_vue_default = /*#__PURE__*/__webpack_require__.n(external_vue_);
 
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"587995b2-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/OpacityControls.vue?vue&type=template&id=4c00a30f&scoped=true&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"6fbd5217-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/OpacityControls.vue?vue&type=template&id=4c00a30f&scoped=true&
 var OpacityControlsvue_type_template_id_4c00a30f_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return (_vm.material!=undefined)?_c('div',{ref:"control",staticClass:"opacity-control"},[_c('el-drawer',{staticClass:"drawer-content",attrs:{"custom-class":"my-drawer","visible":_vm.drawerOpen,"append-to-body":false,"modal-append-to-body":false,"size":"300","with-header":false,"wrapper-closable":false,"modal":false},on:{"update:visible":function($event){_vm.drawerOpen=$event}}},[(_vm.drawerOpen)?_c('div',{staticClass:"tab-button close",on:{"click":_vm.toggleDrawer}},[_c('i',{staticClass:"el-icon-arrow-right"})]):_vm._e(),_c('el-container',{staticClass:"opacity-container"},[_c('el-header',{staticClass:"header",attrs:{"height":"37px"}},[_c('div',[_vm._v("Opacity")])]),_c('el-main',{staticClass:"main"},[_c('div',{staticClass:"block"},[_c('span',{staticClass:"display"},[_vm._v(_vm._s(_vm.displayString))]),_c('el-slider',{staticClass:"my-slider",attrs:{"step":0.01,"min":0,"max":1,"format-tooltip":_vm.formatTooltip,"show-tooltip":false},model:{value:(_vm.material.opacity),callback:function ($$v) {_vm.$set(_vm.material, "opacity", $$v)},expression:"material.opacity"}})],1)])],1)],1),(!_vm.drawerOpen)?_c('div',{staticClass:"tab-button open",on:{"click":_vm.toggleDrawer}},[_c('i',{staticClass:"el-icon-arrow-left"})]):_vm._e()],1):_vm._e()}
 var OpacityControlsvue_type_template_id_4c00a30f_scoped_true_staticRenderFns = []
 
@@ -22949,7 +22986,7 @@ var component = normalizeComponent(
 )
 
 /* harmony default export */ var OpacityControls = (component.exports);
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"587995b2-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/ScaffoldTooltip.vue?vue&type=template&id=b9fa59b4&scoped=true&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"6fbd5217-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/ScaffoldTooltip.vue?vue&type=template&id=b9fa59b4&scoped=true&
 var ScaffoldTooltipvue_type_template_id_b9fa59b4_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"region-tooltip",style:(_vm.position)},[_c('el-popover',{ref:"tooltip",attrs:{"placement":"top","append-to-body":false,"trigger":"manual","popper-class":"tooltip-popper non-selectable"},model:{value:(_vm.display),callback:function ($$v) {_vm.display=$$v},expression:"display"}},[_c('div',[_vm._v(_vm._s(_vm.label))]),_c('i',{directives:[{name:"popover",rawName:"v-popover:tooltip",arg:"tooltip"}]})])],1)}
 var ScaffoldTooltipvue_type_template_id_b9fa59b4_scoped_true_staticRenderFns = []
 
@@ -23065,18 +23102,18 @@ var ScaffoldTooltip_component = normalizeComponent(
 )
 
 /* harmony default export */ var ScaffoldTooltip = (ScaffoldTooltip_component.exports);
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"587995b2-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/TreeControls.vue?vue&type=template&id=7d6a9a0b&scoped=true&
-var TreeControlsvue_type_template_id_7d6a9a0b_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"tree-controls",class:{ open: _vm.drawerOpen, close: !_vm.drawerOpen }},[_c('div',{staticClass:"traditional-container"},[_c('el-row',[_c('el-col',{attrs:{"span":12}},[_c('div',{staticClass:"regions-display-text"},[_vm._v(" Regions ")])])],1),_c('div',{staticClass:"tree-container"},[_c('el-tree',{ref:"regionTree",attrs:{"default-expand-all":"","node-key":"id","show-checkbox":"","check-strictly":false,"data":_vm.treeData,"default-checked-keys":['__r/'],"expand-on-click-node":false},on:{"check":_vm.checkChanged},scopedSlots:_vm._u([{key:"default",fn:function(ref){
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"6fbd5217-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/TreeControls.vue?vue&type=template&id=3989f99a&scoped=true&
+var TreeControlsvue_type_template_id_3989f99a_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"tree-controls",class:{ open: _vm.drawerOpen, close: !_vm.drawerOpen }},[_c('div',{staticClass:"traditional-container"},[_c('el-row',[_c('el-col',{attrs:{"span":12}},[_c('div',{staticClass:"regions-display-text"},[_vm._v(" Regions ")])])],1),_c('div',{staticClass:"tree-container"},[_c('el-tree',{ref:"regionTree",attrs:{"default-expanded-keys":['__r/'],"node-key":"id","show-checkbox":"","check-strictly":false,"data":_vm.treeData,"default-checked-keys":['__r/'],"expand-on-click-node":false},on:{"check":_vm.checkChanged},scopedSlots:_vm._u([{key:"default",fn:function(ref){
 var node = ref.node;
 var data = ref.data;
 return _c('span',{staticClass:"region-tree-node",class:{
             activeItem: _vm.nodeIsActive(data),
             hoverItem: _vm.nodeIsHover(data),
           },on:{"click":function($event){return _vm.changeActiveByNode(data, true)},"mouseover":function($event){return _vm.changeHoverByNode(data, true)}}},[(data.primitives)?_c('el-color-picker',{class:{ 'show-picker': _vm.showColourPicker },attrs:{"value":_vm.getColour(data),"size":"small","popper-class":_vm.myPopperClass},on:{"change":function($event){return _vm.setColour(data, $event)}}}):_vm._e(),_c('span',[_vm._v(_vm._s(node.label))])],1)}}])})],1)],1),_c('div',{staticClass:"drawer-button",class:{ open: _vm.drawerOpen, close: !_vm.drawerOpen },on:{"click":_vm.toggleDrawer}},[_c('i',{staticClass:"el-icon-arrow-left"})])])}
-var TreeControlsvue_type_template_id_7d6a9a0b_scoped_true_staticRenderFns = []
+var TreeControlsvue_type_template_id_3989f99a_scoped_true_staticRenderFns = []
 
 
-// CONCATENATED MODULE: ./src/components/TreeControls.vue?vue&type=template&id=7d6a9a0b&scoped=true&
+// CONCATENATED MODULE: ./src/components/TreeControls.vue?vue&type=template&id=3989f99a&scoped=true&
 
 // CONCATENATED MODULE: ./node_modules/@babel/runtime/helpers/esm/arrayLikeToArray.js
 function _arrayLikeToArray(arr, len) {
@@ -23416,18 +23453,18 @@ var nameSorting = function nameSorting(a, b) {
     var _this = this;
 
     this.module.sceneData.geometries.forEach(function (zincObject) {
-      _this.organsAdded(zincObject);
+      _this.zincObjectAdded(zincObject);
     });
     this.module.sceneData.lines.forEach(function (zincObject) {
-      _this.organsAdded(zincObject);
+      _this.zincObjectAdded(zincObject);
     });
     this.module.sceneData.glyphsets.forEach(function (zincObject) {
-      _this.organsAdded(zincObject);
+      _this.zincObjectAdded(zincObject);
     });
     this.module.sceneData.pointsets.forEach(function (zincObject) {
-      _this.organsAdded(zincObject);
+      _this.zincObjectAdded(zincObject);
     });
-    this.module.addOrganPartAddedCallback(this.organsAdded);
+    this.module.addOrganPartAddedCallback(this.zincObjectAdded);
     this.__nodeNumbers = 1;
   },
   destroyed: function destroyed() {
@@ -23497,7 +23534,7 @@ var nameSorting = function nameSorting(a, b) {
       for (var i = 0; i < this.active.length; i++) {
         var item = this.active[i];
 
-        if (item.group === data.label && (item.regionPath === item.regionPath || item.regionPath === undefined)) {
+        if (item.group === data.label && (item.regionPath === data.regionPath || item.regionPath === undefined)) {
           return true;
         }
       }
@@ -23508,7 +23545,7 @@ var nameSorting = function nameSorting(a, b) {
       for (var i = 0; i < this.hover.length; i++) {
         var item = this.hover[i];
 
-        if (item.group === data.label && (item.regionPath === item.regionPath || item.regionPath === undefined)) {
+        if (item.group === data.label && (item.regionPath === data.regionPath || item.regionPath === undefined)) {
           return true;
         }
       }
@@ -23517,9 +23554,9 @@ var nameSorting = function nameSorting(a, b) {
     },
 
     /**
-     * This is called when a new organ is read into the scene.
+     * This is called when a new zinc object is read into the scene.
      */
-    organsAdded: function organsAdded(zincObject) {
+    zincObjectAdded: function zincObjectAdded(zincObject) {
       var region = zincObject.region;
 
       if (region) {
@@ -23545,30 +23582,25 @@ var nameSorting = function nameSorting(a, b) {
       }
     },
     checkChanged: function checkChanged(node, data) {
-      var rootRegion = this.module.scene.getRootRegion();
-      rootRegion.hideAllChildren();
-      data.checkedNodes.forEach(function (localNode) {
-        if (localNode.region) localNode.region.setVisibility(true);
-
-        if (localNode.primitives) {
-          localNode.primitives.forEach(function (primitive) {
-            primitive.setVisibility(true);
-          });
-        }
-      });
-      data.halfCheckedNodes.forEach(function (localNode) {
-        if (localNode.region) localNode.region.setVisibility(true);
+      var isRegion = node.region;
+      var isPrimitives = node.primitives;
+      var isChecked = data.checkedKeys.includes(node.id);
+      if (isRegion) isChecked ? node.region.showAllPrimitives() : node.region.hideAllPrimitives();
+      if (isPrimitives) node.primitives.forEach(function (primitive) {
+        primitive.setVisibility(isChecked);
       });
     },
-    changeActiveByPrimitives: function changeActiveByPrimitives(primitives, propagate) {
-      if (primitives && primitives.length > 0) {
-        var _this$active;
-
-        this.active = [];
-        var list = createListFromPrimitives(primitives);
+    updateActiveUI: function updateActiveUI(primitives) {
+      var _this$active;
 
-        (_this$active = this.active).push.apply(_this$active, _toConsumableArray(list));
+      this.active = [];
+      var list = createListFromPrimitives(primitives);
 
+      (_this$active = this.active).push.apply(_this$active, _toConsumableArray(list));
+    },
+    changeActiveByPrimitives: function changeActiveByPrimitives(primitives, propagate) {
+      if (primitives && primitives.length > 0) {
+        this.updateActiveUI(primitives);
         this.$emit("object-selected", primitives, propagate);
       } else {
         this.removeActive(propagate);
@@ -23576,15 +23608,17 @@ var nameSorting = function nameSorting(a, b) {
 
       this.removeHover(propagate);
     },
-    changeHoverByPrimitives: function changeHoverByPrimitives(primitives, propagate) {
-      if (primitives && primitives.length > 0) {
-        var _this$hover;
+    updateHoverUI: function updateHoverUI(primitives) {
+      var _this$hover;
 
-        this.hover = [];
-        var list = createListFromPrimitives(primitives);
-
-        (_this$hover = this.hover).push.apply(_this$hover, _toConsumableArray(list));
+      this.hover = [];
+      var list = createListFromPrimitives(primitives);
 
+      (_this$hover = this.hover).push.apply(_this$hover, _toConsumableArray(list));
+    },
+    changeHoverByPrimitives: function changeHoverByPrimitives(primitives, propagate) {
+      if (primitives && primitives.length > 0) {
+        this.updateHoverUI(primitives);
         this.$emit("object-hovered", primitives, propagate);
       } else {
         this.removeHover(propagate);
@@ -23739,8 +23773,8 @@ var nameSorting = function nameSorting(a, b) {
 });
 // CONCATENATED MODULE: ./src/components/TreeControls.vue?vue&type=script&lang=js&
  /* harmony default export */ var components_TreeControlsvue_type_script_lang_js_ = (TreeControlsvue_type_script_lang_js_); 
-// EXTERNAL MODULE: ./src/components/TreeControls.vue?vue&type=style&index=0&id=7d6a9a0b&scoped=true&lang=scss&
-var TreeControlsvue_type_style_index_0_id_7d6a9a0b_scoped_true_lang_scss_ = __webpack_require__("9475");
+// EXTERNAL MODULE: ./src/components/TreeControls.vue?vue&type=style&index=0&id=3989f99a&scoped=true&lang=scss&
+var TreeControlsvue_type_style_index_0_id_3989f99a_scoped_true_lang_scss_ = __webpack_require__("f692");
 
 // EXTERNAL MODULE: ./src/components/TreeControls.vue?vue&type=style&index=1&lang=css&
 var TreeControlsvue_type_style_index_1_lang_css_ = __webpack_require__("8f55");
@@ -23757,11 +23791,11 @@ var TreeControlsvue_type_style_index_1_lang_css_ = __webpack_require__("8f55");
 
 var TreeControls_component = normalizeComponent(
   components_TreeControlsvue_type_script_lang_js_,
-  TreeControlsvue_type_template_id_7d6a9a0b_scoped_true_render,
-  TreeControlsvue_type_template_id_7d6a9a0b_scoped_true_staticRenderFns,
+  TreeControlsvue_type_template_id_3989f99a_scoped_true_render,
+  TreeControlsvue_type_template_id_3989f99a_scoped_true_staticRenderFns,
   false,
   null,
-  "7d6a9a0b",
+  "3989f99a",
   null
   
 )
@@ -24171,6 +24205,14 @@ var EventNotifier = __webpack_require__("9b21").EventNotifier;
       default: false
     },
 
+    /**
+     * Format of the input URL
+     */
+    format: {
+      type: String,
+      default: "metadata"
+    },
+
     /**
      * Settings for minimap position, size and alignment.
      */
@@ -24285,10 +24327,17 @@ var EventNotifier = __webpack_require__("9b21").EventNotifier;
         visible: false,
         x: 200,
         y: 200
-      }
+      },
+      fileFormat: "metadata"
     };
   },
   watch: {
+    format: {
+      handler: function handler(value) {
+        this.fileFormat = value;
+      },
+      immediate: true
+    },
     url: {
       handler: function handler(newValue) {
         if (this.state === undefined || this.state.url === undefined) this.setURL(newValue);
@@ -24318,7 +24367,9 @@ var EventNotifier = __webpack_require__("9b21").EventNotifier;
       this.setHelpMode(val);
     },
     displayMarkers: function displayMarkers(val) {
-      this.$module.scene.displayMarkers = val;
+      this.$module.scene.displayMarkers = val; //Update pickable objects
+
+      this.$module.scene.forcePickableObjectsUpdate = true;
     },
     displayMinimap: function displayMinimap(val) {
       this.$module.scene.displayMinimap = val;
@@ -24497,6 +24548,7 @@ var EventNotifier = __webpack_require__("9b21").EventNotifier;
     viewRegion: function viewRegion(names) {
       var rootRegion = this.$module.scene.getRootRegion();
       var groups = Array.isArray(names) ? names : [names];
+      var dist = this.$module.scene.camera.far - this.$module.scene.camera.near;
       var objects = utilities_findObjectsWithNames(rootRegion, groups, "");
       var box = this.$module.scene.getBoundingBoxOfZincObjects(objects);
 
@@ -24505,6 +24557,7 @@ var EventNotifier = __webpack_require__("9b21").EventNotifier;
           this.$module.setSyncControlZoomToBox(box);
         } else {
           this.$module.scene.viewAllWithBoundingBox(box);
+          this.$module.scene.camera.far = this.$module.scene.camera.near + dist;
         }
 
         return true;
@@ -24565,6 +24618,7 @@ var EventNotifier = __webpack_require__("9b21").EventNotifier;
      */
     eventNotifierCallback: function eventNotifierCallback(event) {
       var names = [];
+      var zincObjects = [];
       var region = undefined;
 
       if (event.eventType == 1 || event.eventType == 2) {
@@ -24574,12 +24628,14 @@ var EventNotifier = __webpack_require__("9b21").EventNotifier;
             names.push(id);
           }
         });
+        zincObjects = event.zincObjects;
       }
 
       if (event.eventType == 1) {
         if (this.$refs.treeControl) {
           if (names.length > 0) {
-            this.$refs.treeControl.changeActiveByNames(names, region, false);
+            //this.$refs.treeControl.changeActiveByNames(names, region, false);
+            this.$refs.treeControl.updateActiveUI(zincObjects);
           } else {
             this.$refs.treeControl.removeActive(true);
           }
@@ -24592,7 +24648,8 @@ var EventNotifier = __webpack_require__("9b21").EventNotifier;
 
         if (this.$refs.treeControl) {
           if (names.length > 0) {
-            this.$refs.treeControl.changeHoverByNames(names, region, false);
+            //this.$refs.treeControl.changeHoverByNames(names, region, false);
+            this.$refs.treeControl.updateHoverUI(zincObjects);
           } else {
             this.$refs.treeControl.removeHover(true);
           }
@@ -24832,6 +24889,7 @@ var EventNotifier = __webpack_require__("9b21").EventNotifier;
      */
     getState: function getState() {
       var state = {
+        format: this.fileFormat,
         url: this._currentURL,
         viewport: undefined,
         visibility: undefined
@@ -24856,6 +24914,7 @@ var EventNotifier = __webpack_require__("9b21").EventNotifier;
       if (state) {
         if (state.url && state.url !== this._currentURL) {
           this.setURLAndState(state.url, {
+            fileFormat: state.fileFormat,
             viewport: state.viewport,
             visibility: state.visibility
           });
@@ -24887,6 +24946,7 @@ var EventNotifier = __webpack_require__("9b21").EventNotifier;
      */
     setURLAndState: function setURLAndState(newValue, state) {
       if (newValue != this._currentURL) {
+        if (state && state.format) this.fileFormat = state.format;
         var viewport = state && state.viewport ? state.viewport : undefined;
         var visibility = state && state.visibility ? state.visibility : undefined;
         this._currentURL = newValue;
@@ -24899,8 +24959,15 @@ var EventNotifier = __webpack_require__("9b21").EventNotifier;
           viewURL: this.viewURL,
           visibility: visibility
         }));
-        this.$module.loadOrgansFromURL(newValue, undefined, undefined, "scene", undefined);
+
+        if (this.fileFormat === "gltf") {
+          this.$module.loadGLTFFromURL(newValue, "scene", true);
+        } else {
+          this.$module.loadOrgansFromURL(newValue, undefined, undefined, "scene", undefined, true);
+        }
+
         this.$module.scene.displayMarkers = this.displayMarkers;
+        this.$module.scene.forcePickableObjectsUpdate = true;
         this.$module.scene.displayMinimap = this.displayMinimap;
         this.updateMinimapScissor();
       }
@@ -24918,7 +24985,6 @@ var EventNotifier = __webpack_require__("9b21").EventNotifier;
 
     /**
      * Callback when drawer is toggled.
-     *
      */
     drawerToggled: function drawerToggled(flag) {
       this.drawerOpen = flag;
@@ -24969,8 +25035,8 @@ var EventNotifier = __webpack_require__("9b21").EventNotifier;
 });
 // CONCATENATED MODULE: ./src/components/ScaffoldVuer.vue?vue&type=script&lang=js&
  /* harmony default export */ var components_ScaffoldVuervue_type_script_lang_js_ = (ScaffoldVuervue_type_script_lang_js_); 
-// EXTERNAL MODULE: ./src/components/ScaffoldVuer.vue?vue&type=style&index=0&id=3379deaa&scoped=true&lang=scss&
-var ScaffoldVuervue_type_style_index_0_id_3379deaa_scoped_true_lang_scss_ = __webpack_require__("5ae1");
+// EXTERNAL MODULE: ./src/components/ScaffoldVuer.vue?vue&type=style&index=0&id=0157429c&scoped=true&lang=scss&
+var ScaffoldVuervue_type_style_index_0_id_0157429c_scoped_true_lang_scss_ = __webpack_require__("c891");
 
 // EXTERNAL MODULE: ./src/components/ScaffoldVuer.vue?vue&type=style&index=1&lang=scss&
 var ScaffoldVuervue_type_style_index_1_lang_scss_ = __webpack_require__("642d");
@@ -24991,7 +25057,7 @@ var ScaffoldVuer_component = normalizeComponent(
   staticRenderFns,
   false,
   null,
-  "3379deaa",
+  "0157429c",
   null
   
 )