@abi-software/scaffoldvuer 0.2.3-alpha-2 → 0.3.0

package/src/app/TextureDemos.js

@@ -1,114 +1,114 @@
-import volumeTexture from "zincjs/src/shaders/volumeTexture.js";
-
-const getVolumeTexture = (texture) => {
-  const myUniforms = volumeTexture.getUniforms();
-  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 getTexture = async (scaffoldModule, texture_prefix) => {
-  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;
-};
-
-export const testVolume = async (scaffoldVuer, texture_prefix) => {
-  const cube = new scaffoldVuer.$module.Zinc.THREE.BoxGeometry(1, 1, 1);
-  const zincObject = new scaffoldVuer.$module.Zinc.Geometry();
-  zincObject.setName("Texture volume");
-  cube.translate(0.5, 0.5, 0.5);
-  let meshOptions = {};
-  meshOptions.opacity = 1.0;
-  meshOptions.localTimeEnabled = false;
-  meshOptions.localMorphColour = false;
-  const texture = await getTexture(scaffoldVuer.$module, texture_prefix);
-  const options = getVolumeTexture(texture);
-  const material = texture.getMaterial(options);
-  zincObject.createMesh(cube, material, meshOptions);
-  scaffoldVuer.addZincObject(zincObject);
-  zincObject.morph.matrix.set(
-    -100,
-    0,
-    0,
-    -60,
-    0,
-    -100,
-    0,
-    -100,
-    0,
-    0,
-    -100,
-    30,
-    0,
-    0,
-    0,
-    1
-  );
-  //console.log(zincObject.morph.matrix)
-  window.texture = zincObject;
-};
-
-export const testSlides = async (scaffoldVuer, texture_prefix) => {
-  const scaffoldModule = scaffoldVuer.$module;
-  const texture = await getTexture(scaffoldModule, texture_prefix);
-  const textureSlides = new scaffoldModule.Zinc.TextureSlides(texture);
-  textureSlides.setName("Texture slides");
-  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,
-    },
-  ]);
-  //textureSlides.morph.matrix.set(-100, 0, 0, 0, 0, -100, 0, 0, 0, 0, -100, 0, -60, -100, 30, 1);
-  //textureSlides.morph.matrix.set( -100, 0, 0, -60, 0, -100, 0, -100, 0, 0, -100, 30, 0, 0, 0, 1 );
-
-  const n = textureSlides.morph.matrix.clone();
-  n.set(-100, 0, 0, -10, 0, -200, 0, 0, 0, 0, -100, 0, 0, 0, 10, 1);
-  textureSlides.morph.applyMatrix4(n);
-  scaffoldVuer.addZincObject(textureSlides);
-  //scaffoldVuer.fitWindow();
-  window.texture = textureSlides;
-};
-
+import volumeTexture from "zincjs/src/shaders/volumeTexture.js";
+
+const getVolumeTexture = (texture) => {
+  const myUniforms = volumeTexture.getUniforms();
+  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 getTexture = async (scaffoldModule, texture_prefix) => {
+  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;
+};
+
+export const testVolume = async (scaffoldVuer, texture_prefix) => {
+  const cube = new scaffoldVuer.$module.Zinc.THREE.BoxGeometry(1, 1, 1);
+  const zincObject = new scaffoldVuer.$module.Zinc.Geometry();
+  zincObject.setName("Texture volume");
+  cube.translate(0.5, 0.5, 0.5);
+  let meshOptions = {};
+  meshOptions.opacity = 1.0;
+  meshOptions.localTimeEnabled = false;
+  meshOptions.localMorphColour = false;
+  const texture = await getTexture(scaffoldVuer.$module, texture_prefix);
+  const options = getVolumeTexture(texture);
+  const material = texture.getMaterial(options);
+  zincObject.createMesh(cube, material, meshOptions);
+  scaffoldVuer.addZincObject(zincObject);
+  zincObject.morph.matrix.set(
+    -100,
+    0,
+    0,
+    -60,
+    0,
+    -100,
+    0,
+    -100,
+    0,
+    0,
+    -100,
+    30,
+    0,
+    0,
+    0,
+    1
+  );
+  //console.log(zincObject.morph.matrix)
+  window.texture = zincObject;
+};
+
+export const testSlides = async (scaffoldVuer, texture_prefix) => {
+  const scaffoldModule = scaffoldVuer.$module;
+  const texture = await getTexture(scaffoldModule, texture_prefix);
+  const textureSlides = new scaffoldModule.Zinc.TextureSlides(texture);
+  textureSlides.setName("Texture slides");
+  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,
+    },
+  ]);
+  //textureSlides.morph.matrix.set(-100, 0, 0, 0, 0, -100, 0, 0, 0, 0, -100, 0, -60, -100, 30, 1);
+  //textureSlides.morph.matrix.set( -100, 0, 0, -60, 0, -100, 0, -100, 0, 0, -100, 30, 0, 0, 0, 1 );
+
+  const n = textureSlides.morph.matrix.clone();
+  n.set(-100, 0, 0, -10, 0, -200, 0, 0, 0, 0, -100, 0, 0, 0, 10, 1);
+  textureSlides.morph.applyMatrix4(n);
+  scaffoldVuer.addZincObject(textureSlides);
+  //scaffoldVuer.fitWindow();
+  window.texture = textureSlides;
+};
+

package/src/assets/_variables.scss

@@ -1,43 +1,43 @@
-// Primary colors
-$purple: #8300BF;
-$darkBlue: #24245B;
-$grey: #303133;
-
-// Secondary colors
-$lightPurple: #BC00FC;
-$blue: #0026FF;
-
-// Status colors
-$success: #5e9f69;
-$warning: #FF8400;
-$danger: #b51d09;
-
-// Text colors
-$neutralGrey: #616161;
-$mediumGrey: #606266;
-$lightGrey: #909399;
-
-// Line colors
-$lineColor1: #DCDFE6;
-$lineColor2: #E4E7ED;
-
-// Background colors
-$background: #F5F7FA;
-$cochlear: #FFFFFF;
-
-//Search box colors
-$darkGrey: #606266;
-
-$app-primary-color: $purple;
-$app-secondary-color: $darkBlue;
-$text-color: $grey;
-$input-text: $grey;
-
-$system-font:  -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif !important;
-$font-family: 'Asap', sans-serif;
-
-// Viewport Sizes
-$viewport-sm: 20rem;
-$viewport-md: 47rem;
-$viewport-lg: 64rem;
-$viewport-xlg: 120rem;
+// Primary colors
+$purple: #8300BF;
+$darkBlue: #24245B;
+$grey: #303133;
+
+// Secondary colors
+$lightPurple: #BC00FC;
+$blue: #0026FF;
+
+// Status colors
+$success: #5e9f69;
+$warning: #FF8400;
+$danger: #b51d09;
+
+// Text colors
+$neutralGrey: #616161;
+$mediumGrey: #606266;
+$lightGrey: #909399;
+
+// Line colors
+$lineColor1: #DCDFE6;
+$lineColor2: #E4E7ED;
+
+// Background colors
+$background: #F5F7FA;
+$cochlear: #FFFFFF;
+
+//Search box colors
+$darkGrey: #606266;
+
+$app-primary-color: $purple;
+$app-secondary-color: $darkBlue;
+$text-color: $grey;
+$input-text: $grey;
+
+$system-font:  -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif !important;
+$font-family: 'Asap', sans-serif;
+
+// Viewport Sizes
+$viewport-sm: 20rem;
+$viewport-md: 47rem;
+$viewport-lg: 64rem;
+$viewport-xlg: 120rem;

package/src/assets/styles.scss

@@ -1,7 +1,7 @@
-@import url('https://fonts.googleapis.com/css?family=Asap:400,400i,500,600,700&display=swap');
-
-@import '_variables';
-
-/* icon font path, required */
-$--color-primary: $app-primary-color !default;
-$--font-path: '~element-ui/lib/theme-chalk/fonts';
+@import url('https://fonts.googleapis.com/css?family=Asap:400,400i,500,600,700&display=swap');
+
+@import '_variables';
+
+/* icon font path, required */
+$--color-primary: $app-primary-color !default;
+$--font-path: '~element-ui/lib/theme-chalk/fonts';