@abi-software/scaffoldvuer 0.1.56 → 0.1.58

package/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/scaffoldvuer",
-  "version": "0.1.55",
+  "version": "0.1.57",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -74,9 +74,9 @@
       },
       "dependencies": {
         "json5": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
-          "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
+          "version": "2.2.3",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+          "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
           "dev": true
         }
       }
@@ -1635,9 +1635,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "18.11.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.9.tgz",
-      "integrity": "sha512-CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg==",
+      "version": "18.11.11",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.11.tgz",
+      "integrity": "sha512-KJ021B1nlQUBLopzZmPBVuGU9un7WJd/W4ya7Ih02B4Uwky5Nja0yGYav2EfYIk0RR2Q9oVhf60S2XR1BCWJ2g==",
       "dev": true
     },
     "@types/normalize-package-data": {
@@ -2952,9 +2952,9 @@
       },
       "dependencies": {
         "json5": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
-          "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
+          "version": "2.2.3",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+          "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
           "dev": true
         },
         "loader-utils": {
@@ -3204,9 +3204,9 @@
       "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ=="
     },
     "bignumber.js": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.0.tgz",
-      "integrity": "sha512-4LwHK4nfDOraBCtst+wOWIHbu1vhvAPJK8g8nROd4iuc3PSEjWif/qwbkh8jwCJz6yDBvtU4KPynETgrfh7y3A=="
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.1.tgz",
+      "integrity": "sha512-pHm4LsMJ6lzgNGVfZHjMoO8sdoRhOzOH4MLmY65Jg70bpxCKu5iOHNJyfF6OyvYw7t8Fpf35RuzUyqnQsj8Vig=="
     },
     "binary-extensions": {
       "version": "2.2.0",
@@ -3819,9 +3819,9 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30001434",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001434.tgz",
-      "integrity": "sha512-aOBHrLmTQw//WFa2rcF1If9fa3ypkC1wzqqiKHgfdrXTWcU8C4gKVZT77eQAPWN1APys3+uQ0Df07rKauXGEYA==",
+      "version": "1.0.30001436",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001436.tgz",
+      "integrity": "sha512-ZmWkKsnC2ifEPoWUvSAIGyOYwT+keAaaWPHiQ9DfMqS1t6tfuyFYoWR78TeZtznkEQ64+vGXH9cZrElwR2Mrxg==",
       "dev": true
     },
     "case-sensitive-paths-webpack-plugin": {
@@ -5132,9 +5132,9 @@
       "dev": true
     },
     "decode-uri-component": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
-      "integrity": "sha512-hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og=="
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
+      "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ=="
     },
     "deep-equal": {
       "version": "1.1.1",
@@ -6519,9 +6519,9 @@
       "dev": true
     },
     "fastq": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
-      "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
+      "version": "1.14.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.14.0.tgz",
+      "integrity": "sha512-eR2D+V9/ExcbF9ls441yIuN6TI2ED1Y2ZcA5BmMtJsOkWOFRJQ0Jt0g1UwqXJJVAb+V+umH5Dfr8oh4EVP7VVg==",
       "dev": true,
       "requires": {
         "reusify": "^1.0.4"
@@ -11976,9 +11976,9 @@
       "dev": true
     },
     "promise-polyfill": {
-      "version": "8.2.3",
-      "resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-8.2.3.tgz",
-      "integrity": "sha512-Og0+jCRQetV84U8wVjMNccfGCnMQ9mGs9Hv78QFe+pSDD3gWTpz0y+1QCuxy5d/vBFuZ3iwP2eycAkvqIMPmWg=="
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-8.3.0.tgz",
+      "integrity": "sha512-H5oELycFml5yto/atYqmjyigJoAo3+OXwolYiH7OfQuYlAqhxNvTfiNMbV9hsC6Yp83yE5r2KTVmtrG6R9i6Pg=="
     },
     "prompts": {
       "version": "2.4.2",
@@ -13037,9 +13037,9 @@
           "dev": true
         },
         "json5": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
-          "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
+          "version": "2.2.3",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+          "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
           "dev": true
         },
         "kleur": {
@@ -13275,9 +13275,9 @@
           }
         },
         "terser": {
-          "version": "5.16.0",
-          "resolved": "https://registry.npmjs.org/terser/-/terser-5.16.0.tgz",
-          "integrity": "sha512-KjTV81QKStSfwbNiwlBXfcgMcOloyuRdb62/iLFPGBcVNF4EXjhdYBhYHmbJpiBrVxZhDvltE11j+LBQUxEEJg==",
+          "version": "5.16.1",
+          "resolved": "https://registry.npmjs.org/terser/-/terser-5.16.1.tgz",
+          "integrity": "sha512-xvQfyfA1ayT0qdK47zskQgRZeWLoOQ8JQ6mIgRGVNwZKdQMU+5FkCBjmv4QjcrTzyZquRw2FVtlJSRUmMKQslw==",
           "dev": true,
           "requires": {
             "@jridgewell/source-map": "^0.3.2",
@@ -15044,9 +15044,9 @@
       },
       "dependencies": {
         "json5": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
-          "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
+          "version": "2.2.3",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+          "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
           "dev": true
         },
         "loader-utils": {
@@ -15380,9 +15380,9 @@
       "integrity": "sha512-OSPPKcGvFSiGkG3jFrwwC76PBV/ZSrGxpBbg28bW8s9GU8r/y2spNGtEXHEb/CVqo0Ctf5Lx2rVaxQZB6OasaA=="
     },
     "three-spritetext": {
-      "version": "1.6.5",
-      "resolved": "https://registry.npmjs.org/three-spritetext/-/three-spritetext-1.6.5.tgz",
-      "integrity": "sha512-ttA1ce3tJz6OFojLGY3VjtqF9johetq50TztYcPFWqdEUrwPmej5XXcHahVyQGd88FHRDzJmW2rW3zSifUsdYA=="
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/three-spritetext/-/three-spritetext-1.8.0.tgz",
+      "integrity": "sha512-ehiATMfR1guCk+knjCxDWp2zikxRbxQaKXJyjXwuZKqjIbKtsCh7BQ00JHaESjzaXXhG5LJV7rXTJ78M/EYWyQ=="
     },
     "throttle-debounce": {
       "version": "1.1.0",
@@ -16141,9 +16141,9 @@
       "integrity": "sha512-ePuy1EDDJd9/piwXLwsCyMQ964HsdhXPzypM9OX0r4JBa20EVN28U7RXeTWwXkoFKim/b3sP7xT2NEM0Di6tUQ=="
     },
     "vue-docgen-api": {
-      "version": "4.54.2",
-      "resolved": "https://registry.npmjs.org/vue-docgen-api/-/vue-docgen-api-4.54.2.tgz",
-      "integrity": "sha512-KWFjSfoD/mJ8wQX1vvj0IvJCyRFGo+Fymy3J5qzOeYLIQfknkZ7ssZX4cqH25ks4TD0OIBrZI4D5ZiyKlMK2YQ==",
+      "version": "4.56.0",
+      "resolved": "https://registry.npmjs.org/vue-docgen-api/-/vue-docgen-api-4.56.0.tgz",
+      "integrity": "sha512-ab/Scb0DCjm4YVLf+AFa/R7XMFl8TVwUsvh26fFT5iaURih1m2hdd5Y8NveA7NQDcycpWavkFZj9eVbQdp2VGQ==",
       "dev": true,
       "requires": {
         "@babel/parser": "^7.13.12",
@@ -16788,9 +16788,9 @@
           }
         },
         "terser": {
-          "version": "5.16.0",
-          "resolved": "https://registry.npmjs.org/terser/-/terser-5.16.0.tgz",
-          "integrity": "sha512-KjTV81QKStSfwbNiwlBXfcgMcOloyuRdb62/iLFPGBcVNF4EXjhdYBhYHmbJpiBrVxZhDvltE11j+LBQUxEEJg==",
+          "version": "5.16.1",
+          "resolved": "https://registry.npmjs.org/terser/-/terser-5.16.1.tgz",
+          "integrity": "sha512-xvQfyfA1ayT0qdK47zskQgRZeWLoOQ8JQ6mIgRGVNwZKdQMU+5FkCBjmv4QjcrTzyZquRw2FVtlJSRUmMKQslw==",
           "dev": true,
           "requires": {
             "@jridgewell/source-map": "^0.3.2",
@@ -17813,9 +17813,9 @@
       }
     },
     "zincjs": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/zincjs/-/zincjs-1.0.9.tgz",
-      "integrity": "sha512-N8Jexto6vmLVu4X8UX1Xes+BbPOxYmrutI4vNXsKspoGNY2Rq2Ffys5GnVV9ZBYWq/Jfm/cvznPlaBBWk3jXdw==",
+      "version": "1.0.15",
+      "resolved": "https://registry.npmjs.org/zincjs/-/zincjs-1.0.15.tgz",
+      "integrity": "sha512-Csnbvrgin7Ebo9kfFr071KzKDFcoDX03MoBz41h1hq6lG8MHJXjTHLP/EhF5kwbNhThH21rgz718D8rBvwTALA==",
       "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.56",
+  "version": "0.1.58",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
@@ -36,7 +36,7 @@
     "vue-custom-element": "^3.3.0",
     "vue-drag-resize": "^1.3.2",
     "vue-router": "^3.5.1",
-    "zincjs": "^1.0.9"
+    "zincjs": "^1.0.15"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "^4.0.0",

package/src/App.vue

@@ -26,6 +26,7 @@
         @scaffold-selected="onSelected"
         @scaffold-navigated="onNavigated"
         @timeChanged="updateCurrentTime"
+        @zinc-object-added="objectAdded"
       />
     </drop-zone>
     <el-popover
@@ -103,6 +104,18 @@
           >
             Capture
           </el-button>
+          <el-button
+            size="mini"
+            @click="featureTesting()"
+          >
+            Test 1
+          </el-button>
+          <el-button
+            size="mini"
+            @click="featureTesting2()"
+          >
+            Test 2
+          </el-button>
         </el-row>
         <el-row :gutter="10">
           <el-button
@@ -253,6 +266,9 @@ import Vue from "vue";
 import { Button, Col, Icon, Input, InputNumber, Popover, Row, Switch } from "element-ui";
 import lang from "element-ui/lib/locale/lang/en";
 import locale from "element-ui/lib/locale";
+import taShader from "zincjs/src/shaders/textureArray.js"
+import volumeRender from "zincjs/src/shaders/volumeRender.js"
+import volumeTexture from "zincjs/src/shaders/volumeTexture.js"
 
 locale.use(lang);
 Vue.use(Button);
@@ -264,6 +280,111 @@ Vue.use(Popover);
 Vue.use(Row);
 Vue.use(Switch);
 
+let texture_prefix = undefined;
+
+const getVolumeRender = (texture) => {
+  const myUniforms = volumeRender.getUniforms();
+  console.log(myUniforms)
+  myUniforms.u_size.value.set(texture.size.width, texture.size.height, texture.size.depth);
+  myUniforms.u_data.value = texture.impl;
+  const options = {
+    fs: volumeRender.fs,
+    vs: volumeRender.vs,
+    uniforms: myUniforms,
+    glslVersion: volumeRender.glslVersion
+  };
+  return options;
+}
+
+const getVolumeTexture = (texture) => {
+  const myUniforms = volumeTexture.getUniforms();
+  console.log(myUniforms)
+  myUniforms.volume_scale.value.set(texture.size.width / texture.size.depth, texture.size.height / texture.size.depth, 1);
+  myUniforms.diffuse.value = texture.impl;
+  myUniforms.depth.value = texture.size.depth;
+  myUniforms.volume_dims.value = [200, 200, 200];
+  const options = {
+    fs: volumeTexture.fs,
+    vs: volumeTexture.vs,
+    uniforms: myUniforms,
+    glslVersion: volumeTexture.glslVersion
+  };
+  return options;
+}
+
+const getTestShader = (texture) => {
+  const myUniforms = taShader.getUniforms();
+  myUniforms.depth.value = texture.size.depth;
+  myUniforms.diffuse.value = texture.impl;
+  const options = {
+    fs: taShader.fs,
+    vs: taShader.vs,
+    uniforms: myUniforms,
+    glslVersion: taShader.glslVersion
+  };
+  console.log(options)
+  return options;
+}
+
+const getTexture = async (scaffoldModule) => {
+  const imgArray = [];
+  const texture = new scaffoldModule.Zinc.TextureArray();
+  for (let i = 1733; i < 1860; i++) {
+    imgArray.push(`${texture_prefix}/foot${i}.jpg`);
+    //imgArray.push(`${process.env.VUE_APP_TEXTURE_FOOT_PREFIX}/foot${i}.jpg`);
+  }
+  await texture.loadFromImages(imgArray);
+  return texture;
+}
+
+const testVolume = async (scaffoldModule, objects) => {
+  if (objects) {
+    const texture = await getTexture(scaffoldModule);
+    //const options = getTestShader(texture);
+    const options = getVolumeTexture(texture);
+    const material = texture.getMaterial(options);
+    console.log(material, texture, objects);
+    objects[0].morph.material = material;
+  }
+}
+
+const testSlides = async (scaffoldModule) => {
+  const texture = await getTexture(scaffoldModule);
+  const textureSlides = new scaffoldModule.Zinc.TextureSlides(texture);
+  textureSlides.createSlides([
+    {
+      direction: "y",
+      value: 0.1
+    },
+    {
+      direction: "y",
+      value: 0.3
+    },
+    {
+      direction: "y",
+      value: 0.5
+    },
+    {
+      direction: "y",
+      value: 0.7
+    },
+    {
+      direction: "y",
+      value: 0.9
+    },
+    {
+      direction: "x",
+      value: 0.5
+    },
+    {
+      direction: "z",
+      value: 0.5
+    },
+  ]);
+  scaffoldModule.scene.addZincObject(textureSlides);
+}
+
+
 export default {
   name: "App",
   components: {
@@ -271,6 +392,9 @@ export default {
     ScaffoldVuer,
     ModelsTable
   },
+  created: function() {
+    texture_prefix = process.env.VUE_APP_TEXTURE_FOOT_PREFIX;
+  },
   data: function() {
     return {
       url: undefined,
@@ -300,6 +424,7 @@ export default {
       pos: [0, 0],
       format: "metadata",
       sceneSettings: [],
+      
     };
   },
   watch: {
@@ -319,6 +444,7 @@ export default {
     }
   },
   mounted: function() {
+    this._objects = [];
     this.selectedCoordinates = this.$refs.scaffold.getDynamicSelectedCoordinates();
     this.rendererInfo = this.$refs.scaffold.getRendererInfo();
   },
@@ -348,6 +474,21 @@ export default {
           hrefElement.remove();
         })
     },
+    objectAdded: function(zincObject) {
+      console.log(zincObject)
+      this._objects.push(zincObject);
+    },
+    featureTesting: async function() {
+      //Test texture
+      testVolume(this.$refs.scaffold.$module, this._objects);
+
+      
+    },
+    featureTesting2: async function() {
+      //Test texture
+      //testVolume(this.$refs.scaffold.$module, this._objects);
+      testSlides(this.$refs.scaffold.$module);
+    },
     saveSettings: function() {
       this.sceneSettings.push(this.$refs.scaffold.getState());
     },
@@ -374,9 +515,10 @@ export default {
     },
     onReady: function() {
       console.log("ready")
+      //window.scaffoldvuer = this.$refs.scaffold;
       this.$refs.dropzone.revokeURLs();
-      //const names = ["left ventricle.mesh2d", "right ventricle.mesh2d"];
-      //this.$refs.scaffold.changeActiveByName(names, "", false);
+      const names = ["left ventricle.mesh2d", "right ventricle.mesh2d"];
+      this.$refs.scaffold.changeActiveByName(names, "", false);
     },
     onSelected: function(data) {
       if (data && (data.length > 0) && data[0].data.group) {
@@ -410,6 +552,9 @@ export default {
       this.currentTime = val;
     },
     parseQuery: function(query) {
+      if (query.url != this.url) {
+        this._objects = [];
+      }
       if (query.url) {
         this.url = query.url;
       } else {

package/src/components/ScaffoldTooltip.vue

@@ -59,7 +59,12 @@ export default {
   },
   computed: {
     position: function () {
-      return { left: this.x + "px", top: this.y - 30 + "px" };
+      let yOffset = 30;
+      if (this.region) {
+        yOffset = 45;
+      }
+
+      return { left: this.x + "px", top: this.y - yOffset + "px" };
     },
   },
   watch: {