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

package/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/scaffoldvuer",
-  "version": "0.1.53",
+  "version": "0.1.54-beta.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -12784,9 +12784,9 @@
           }
         },
         "terser": {
-          "version": "5.14.1",
-          "resolved": "https://registry.npmjs.org/terser/-/terser-5.14.1.tgz",
-          "integrity": "sha512-+ahUAE+iheqBTDxXhTisdA8hgvbEG1hHOQ9xmNjeUJSoi6DU/gMrKNcfZjHkyY6Alnuyc+ikYJaxxfHkT3+WuQ==",
+          "version": "5.15.0",
+          "resolved": "https://registry.npmjs.org/terser/-/terser-5.15.0.tgz",
+          "integrity": "sha512-L1BJiXVmheAQQy+as0oF3Pwtlo4s3Wi1X2zNZ2NxOB4wx9bdS9Vk67XQENLFdLYGCK/Z2di53mTj/hBafR+dTA==",
           "dev": true,
           "requires": {
             "@jridgewell/source-map": "^0.3.2",
@@ -12796,9 +12796,9 @@
           },
           "dependencies": {
             "acorn": {
-              "version": "8.7.1",
-              "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz",
-              "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==",
+              "version": "8.8.0",
+              "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz",
+              "integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==",
               "dev": true
             }
           }
@@ -14728,9 +14728,9 @@
       }
     },
     "terser": {
-      "version": "4.8.0",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz",
-      "integrity": "sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==",
+      "version": "4.8.1",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.1.tgz",
+      "integrity": "sha512-4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw==",
       "dev": true,
       "requires": {
         "commander": "^2.20.0",
@@ -17192,9 +17192,9 @@
       }
     },
     "zincjs": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/zincjs/-/zincjs-1.0.3.tgz",
-      "integrity": "sha512-S4ajnPitOO8VD6i9MpLXW4s9p1SBj1hQSxTnIbT6GwHUSDhGXCjkNPSqXhX4Ki/q6/48mbz2hLdDBBJY7qkkxA==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/zincjs/-/zincjs-1.0.6.tgz",
+      "integrity": "sha512-2fbss7FugYU0hnvmJJhq3y1rybFYgUH6jsjaqs3vNuLEdCcvPPqzgDEYrgUFoV1Rc8FhwIMwk2mJPhNLQvztcQ==",
       "requires": {
         "css-element-queries": "^1.2.2",
         "lodash": "^4.17.19",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/scaffoldvuer",
-  "version": "0.1.53",
+  "version": "0.1.54-beta.2",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
@@ -33,7 +33,7 @@
     "vue": "^2.6.10",
     "vue-drag-resize": "^1.3.2",
     "vue-router": "^3.5.1",
-    "zincjs": "^1.0.3"
+    "zincjs": "^1.0.6"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "^4.0.0",

package/src/App.vue

@@ -21,6 +21,7 @@
         :render="render"
         :region="region"
         :view-u-r-l="viewURL"
+        :format="format"
         @on-ready="onReady"
         @scaffold-selected="onSelected"
         @scaffold-navigated="onNavigated"
@@ -288,6 +289,8 @@ export default {
       rendererInfo: undefined,
       zoom: 1,
       pos: [0, 0],
+      format: "metadata",
+      sceneSettings: [],
     };
   },
   watch: {
@@ -307,7 +310,6 @@ export default {
     }
   },
   mounted: function() {
-    this._sceneSettings = [];
     this.selectedCoordinates = this.$refs.scaffold.getDynamicSelectedCoordinates();
     this.rendererInfo = this.$refs.scaffold.getRendererInfo();
   },
@@ -339,11 +341,11 @@ export default {
     },
     saveSettings: function() {
       const state = this.$refs.scaffold.getState();
-      this._sceneSettings.push(this.$refs.scaffold.getState());
+      this.sceneSettings.push(this.$refs.scaffold.getState());
     },
     restoreSettings: function() {
-      if (this._sceneSettings.length > 0)
-        this.$refs.scaffold.setState(this._sceneSettings.pop());
+      if (this.sceneSettings.length > 0)
+        this.$refs.scaffold.setState(this.sceneSettings.pop());
     },
     viewModelClicked: function(location) {
       this.input = location;
@@ -366,10 +368,9 @@ export default {
       console.log("ready")
       this.$refs.dropzone.revokeURLs();
       //const names = ["left ventricle.mesh2d", "right ventricle.mesh2d"];
-      //this.$refs.scaffold.changeActiveByName(names, "", true);
+      //this.$refs.scaffold.changeActiveByName(names, "", false);
     },
     onSelected: function(data) {
-      console.log(data)
       if (data && (data.length > 0) && data[0].data.group) {
         delete this.$route.query["viewURL"];
         this.$router.replace({
@@ -382,8 +383,10 @@ export default {
       this.pos[0] = data.target[0];
       this.pos[1] = data.target[1];
     },
-    onFilesDrop: function(metaURL) {
-      this.input = metaURL;
+    onFilesDrop: function(payload) {
+      if (payload.format == "gltf") this.format = "gltf";
+      else this.format = "metadata";
+      this.input = payload.url;
     },
     parseInput: function() {
       if (this.$route.query.url !== this.input) {
@@ -405,6 +408,11 @@ export default {
         this.url =
           "https://mapcore-bucket1.s3-us-west-2.amazonaws.com/others/29_Jan_2020/heartICN_metadata.json";
       }
+      if (this.url.includes(".gltf") || this.url.includes(".glb")) {
+        this.format = "gltf";
+      } else if (this.url.includes(".json")) {
+        this.format = "metadata";
+      }
       this.input = this.url;
       if (query.region) {
         this.region = query.region;

package/src/components/DropZone.vue

@@ -33,7 +33,7 @@ export default {
     });
   },
   methods: {
-    createObjectURLs: function (text, list) {
+    createMetadataObjectURLs: function (text, list) {
       let content = text;
       for (const [key, file] of Object.entries(list)) {
         if (content.includes(key)) {
@@ -45,7 +45,14 @@ export default {
       let blob = new Blob([content], { type: "application/json" });
       const metaURL = URL.createObjectURL(blob);
       this.objectURLs.push(metaURL);
-      this.$emit("files-drop", metaURL);
+      this.$emit("files-drop", { url: metaURL, format : "metadata" } );
+    },
+    createGLTFURL: function (content, binary) {
+      let type =  binary ? 'model/gltf+binary' : 'model/gltf+json';
+      let blob = new Blob([content], { type });
+      const gltfURL = URL.createObjectURL(blob);
+      this.objectURLs.push(gltfURL);
+      this.$emit("files-drop", { url: gltfURL, format : "gltf" });
     },
     revokeURLs: function () {
       this.objectURLs.forEach(objectURL => URL.revokeObjectURL(objectURL));
@@ -55,6 +62,8 @@ export default {
       const dataMaps = {};
       let list = {};
       let metadata = undefined;
+      let gltf = undefined;
+      let binary = false;
       const flatarray = Array.from(fileMap);
       let rootPath = "";
       for (let i = 0; i < flatarray.length; i++) {
@@ -63,6 +72,16 @@ export default {
           metadata = { rootPath, file: flatarray[i][1] };
           break;
         }
+        if (flatarray[i][1].name.includes(".glb")) {
+          gltf = { rootPath, file: flatarray[i][1] };
+          binary = true;
+          break;
+        }
+        if (flatarray[i][1].name.includes(".gltf")) {
+          gltf = { rootPath, file: flatarray[i][1] };
+          binary = false;
+          break;
+        }
       }
       if (metadata) {
         flatarray.forEach(([filePath, file]) => {
@@ -74,9 +93,12 @@ export default {
         const metaFileURL = URL.createObjectURL(metadata.file);
         fetch(metaFileURL)
           .then((response) => response.text())
-          .then((text) => this.createObjectURLs(text, list));
+          .then((text) => this.createMetadataObjectURLs(text, list));
         URL.revokeObjectURL(metaFileURL);
       }
+      if (gltf) {
+        this.createGLTFURL(gltf.file, binary);
+      }
     },
   },
 };

package/src/components/ScaffoldVuer.vue

@@ -363,6 +363,13 @@ export default {
       type: Boolean,
       default: false
     },
+    /**
+     * Format of the input URL
+     */
+    format: {
+      type: String,
+      default: "metadata"
+    },
     /**
      * Settings for minimap position, size and alignment.
      */
@@ -473,10 +480,17 @@ export default {
         visible: false,
         x: 200,
         y: 200
-      }
+      },
+      fileFormat: "metadata",
     };
   },
   watch: {
+    format: {
+      handler: function(value) {
+        this.fileFormat = value;
+      },
+      immediate: true
+    },
     url: {
       handler: function(newValue) {
         if (this.state === undefined || this.state.url === undefined)
@@ -508,6 +522,8 @@ export default {
     },
     displayMarkers: function(val) {
       this.$module.scene.displayMarkers = val;
+      //Update pickable objects
+      this.$module.scene.forcePickableObjectsUpdate = true;
     },
     displayMinimap: function(val) {
       this.$module.scene.displayMinimap = val;
@@ -685,6 +701,7 @@ export default {
     viewRegion: function(names) {
       const rootRegion = this.$module.scene.getRootRegion();
       const groups = Array.isArray(names) ? names : [names];
+      const dist = this.$module.scene.camera.far - this.$module.scene.camera.near;
       const objects = findObjectsWithNames(rootRegion, groups, "");
       let box = this.$module.scene.getBoundingBoxOfZincObjects(objects);
       if (box) {
@@ -692,6 +709,7 @@ export default {
           this.$module.setSyncControlZoomToBox(box);
         } else {
           this.$module.scene.viewAllWithBoundingBox(box);
+          this.$module.scene.camera.far = this.$module.scene.camera.near + dist;
         }
         return true;
       }
@@ -747,6 +765,7 @@ export default {
      */
     eventNotifierCallback: function(event) {
       const names = [];
+      let zincObjects = [];
       const region = undefined;
       if (event.eventType == 1 || event.eventType == 2) {
         event.identifiers.forEach(identifier => {
@@ -757,13 +776,15 @@ export default {
             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);
+            this.$refs.treeControl.removeActive(true)
           }
         }
         // Triggers when an object has been selected
@@ -773,7 +794,8 @@ export default {
        // const offsets = this.$refs.scaffoldContainer.getBoundingClientRect();
         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);
           }
@@ -989,9 +1011,10 @@ export default {
      */
     getState: function() {
       let state = {
+        format: this.fileFormat,
         url: this._currentURL,
         viewport: undefined,
-        visibility: undefined
+        visibility: undefined,
       };
       if (this.$refs.treeControl)
         state.visibility = this.$refs.treeControl.getState();
@@ -1011,6 +1034,7 @@ export default {
       if (state) {
         if (state.url && state.url !== this._currentURL) {
           this.setURLAndState(state.url, {
+            fileFormat: state.fileFormat,
             viewport: state.viewport,
             visibility: state.visibility
           });
@@ -1047,6 +1071,7 @@ export default {
      */
     setURLAndState: function(newValue, state) {
       if (newValue != this._currentURL) {
+        if (state && state.format) this.fileFormat = state.format;
         let viewport = state && state.viewport ? state.viewport : undefined;
         let visibility =
           state && state.visibility ? state.visibility : undefined;
@@ -1063,14 +1088,20 @@ export default {
             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();
       }
@@ -1086,7 +1117,6 @@ export default {
     },
     /**
      * Callback when drawer is toggled.
-     *
      */
     drawerToggled: function(flag) {
       this.drawerOpen = flag;