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

package/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/scaffoldvuer",
-  "version": "0.1.53-beta.1",
+  "version": "0.1.53-beta.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -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.4",
+      "resolved": "https://registry.npmjs.org/zincjs/-/zincjs-1.0.4.tgz",
+      "integrity": "sha512-dJKwUbJSSH3UbBUkG3/5+w+JcPfhp8/tWzZGgPRTkYaFHoO8h2I9oPVqxKMO4h4AL8blbR6ux4zyMtZAMLznUw==",
       "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-beta.1",
+  "version": "0.1.53-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.4"
   },
   "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;
@@ -381,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) {
@@ -404,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)
@@ -989,9 +1003,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 +1026,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 +1063,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,13 +1080,18 @@ 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.displayMinimap = this.displayMinimap;
         this.updateMinimapScissor();
@@ -1086,9 +1108,8 @@ export default {
     },
     /**
      * Callback when drawer is toggled.
-     *
      */
-    drawerToggled: function(flag) {
+    drawerToggled: function(flag) {pppp
       this.drawerOpen = flag;
       this.adjustLayout();
     },

package/src/scripts/organsRenderer.js

@@ -474,14 +474,15 @@ const OrgansSceneData = function() {
       _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);
 			      const name = _this.sceneData.currentName;
 			      let organScene = _this.zincRenderer.getSceneByName(name);
 			      if (organScene) {
-			    	  organScene.clearAll();
+              if (clearFirst)
+			    	    organScene.clearAll();
 			      } else {
 			    	  organScene = _this.zincRenderer.createScene(name);
 			      }
@@ -507,6 +508,36 @@ const OrgansSceneData = function() {
 			  }
 		  }
 	  }
+
+    this.loadGLTFFromURL = function(url, partName, clearFirst) {
+		  if (_this.zincRenderer) {
+			  if (partName && (_this.sceneData.metaURL !== url)) {
+			      setSceneData(undefined, undefined, partName, undefined);
+			      const name = _this.sceneData.currentName;
+			      let organScene = _this.zincRenderer.getSceneByName(name);
+			      if (organScene) {
+              if (clearFirst)
+			    	    organScene.clearAll();
+			      } else {
+			    	  organScene = _this.zincRenderer.createScene(name);
+			      }
+			      for (let 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();
+			      const zincCameraControl = organScene.getZincCameraControls();
+			      zincCameraControl.enableRaycaster(organScene, _pickingCallback(), _hoverCallback());
+			      zincCameraControl.setMouseButtonAction("AUXILIARY", "ZOOM");
+			      zincCameraControl.setMouseButtonAction("SECONDARY", "PAN");
+			  }
+		  }
+	  }
 	  	  
 	  this.alignCameraWithSelectedObject = function(transitionTime) {
 	    const objects = _this.graphicsHighlight.getSelected();
@@ -536,7 +567,7 @@ const OrgansSceneData = function() {
 			  _this.setName(settings.name);
 			  if (settings.metaURL !== undefined && settings.metaURL != "") {
 				  _this.loadOrgansFromURL(settings.metaURL, settings.species,
-					settings.system, settings.part, settings.viewURL);
+					  settings.system, settings.part, settings.viewURL, true);
 			  } else {
 				  _this.loadOrgans(settings.species, settings.system, settings.part);
 			  }