@archvisioninc/canvas 2.6.6 → 2.6.7

package/dist/helpers/canvasUpdateHelpers.js

@@ -182,7 +182,7 @@ export const updateMaterial = inboundData => {
 
     // Reset supported texture channels, useful when manually importing a new material.
     if (clearTextureChannels) {
-      const workingMaterial = scene.metadata.materials.find(mat => mat.materialId === id);
+      const workingMaterial = scene.metadata.materials.find(mat => mat.materialId === id) || {};
       Object.keys(workingMaterial)?.forEach(key => {
         if (key.endsWith('Texture')) {
           material[key] = null;

package/dist/helpers/utilityHelpers.js

@@ -406,48 +406,18 @@ export const buildMeshPositionsArray = args => {
     return defaultMeshPosition;
   });
 };
-export const getImageFileFromBuffer = args => {
-  const {
-    buffer,
-    asBase64Data
-  } = args || {};
+export const getImageFileFromBuffer = buffer => {
   if (_.isEmpty(buffer)) return '';
-  try {
-    const blob = new Blob([buffer], {
-      type: 'image/png'
-    });
-    const url = URL.createObjectURL(blob);
-    if (asBase64Data) {
-      return new Promise((resolve, reject) => {
-        const reader = new FileReader();
-        reader.onloadend = () => {
-          resolve(reader.result);
-        };
-        reader.onerror = error => {
-          console.error('Error reading buffer: ', error);
-          reject(error);
-        };
-        reader.readAsDataURL(blob);
-      });
-    }
-    return Promise.resolve(url);
-  } catch (error) {
-    console.error('Unable to get image from buffer: ', error);
-    return Promise.reject(error);
-  }
+  const blob = new Blob([buffer], {
+    type: 'image/png'
+  });
+  const url = URL.createObjectURL(blob);
+  return url;
 };
-export const getTextureUrl = async args => {
-  const {
-    texture,
-    asBase64Data
-  } = args || {};
+export const getTextureUrl = texture => {
   const buffer = texture?._buffer;
   if (_.isEmpty(buffer)) return texture?.url || '';
-  const url = await getImageFileFromBuffer({
-    buffer,
-    asBase64Data
-  });
-  return url;
+  return getImageFileFromBuffer(buffer);
 };
 export const materialData = material => {
   const meshesWithMaterial = getUserMeshes().map(mesh => {
@@ -470,45 +440,30 @@ export const materialData = material => {
     albedoColor: material.albedoColor?.toHexString() || props?.theme?.colors?.[props.$selectedTheme]?.black,
     albedoTexture: {
       name: material.albedoTexture?.name,
-      url: getTextureUrl({
-        texture: material.albedoTexture,
-        asBase64Data: true
-      })
+      url: getTextureUrl(material.albedoTexture)
     },
     albedoHasAlpha: material.albedoTexture?.hasAlpha || false,
     environmentIntensity: material.environmentIntensity,
     metallic: material.metallic,
     metallicTexture: {
       name: material.metallicTexture?.name,
-      url: getTextureUrl({
-        texture: material.metallicTexture,
-        asBase64Data: true
-      })
+      url: getTextureUrl(material.metallicTexture)
     },
     roughness: material.roughness,
     microSurfaceTexture: {
       name: material.microSurfaceTexture?.name,
-      url: getTextureUrl({
-        texture: material.microSurfaceTexture,
-        asBase64Data: true
-      })
+      url: getTextureUrl(material.microSurfaceTexture)
     },
     emissiveColor: material.emissiveColor?.toHexString() || props?.theme?.colors?.[props.$selectedTheme]?.black,
     emissiveIntensity: material.emissiveIntensity,
     emissiveTexture: {
       name: material.emissiveTexture?.name,
-      url: getTextureUrl({
-        texture: material.emissiveTexture,
-        asBase64Data: true
-      })
+      url: getTextureUrl(material.emissiveTexture)
     },
     bumpIntensity: material.bumpTexture?.level || 0.5,
     bumpTexture: {
       name: material.bumpTexture?.name,
-      url: getTextureUrl({
-        texture: material.bumpTexture,
-        asBase64Data: true
-      })
+      url: getTextureUrl(material.bumpTexture)
     },
     // Advanced
     clearCoatEnabled: material.clearCoat?.isEnabled || false,
@@ -518,10 +473,7 @@ export const materialData = material => {
     alpha: material.alpha,
     opacityTexture: {
       name: material.opacityTexture?.name,
-      url: getTextureUrl({
-        texture: material.opacityTexture,
-        asBase64Data: true
-      })
+      url: getTextureUrl(material.opacityTexture)
     },
     transparencyMode: material.transparencyMode,
     sssRefractionEnabled: material.subSurface?.isRefractionEnabled || false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@archvisioninc/canvas",
-  "version": "2.6.6",
+  "version": "2.6.7",
   "private": false,
   "main": "dist/Canvas.js",
   "module": "dist/Canvas.js",

package/src/package/helpers/canvasUpdateHelpers.js

@@ -220,7 +220,7 @@ export const updateMaterial = inboundData => {
 
     // Reset supported texture channels, useful when manually importing a new material.
     if (clearTextureChannels) {
-      const workingMaterial = scene.metadata.materials.find(mat => mat.materialId === id);
+      const workingMaterial = scene.metadata.materials.find(mat => mat.materialId === id) || {};
 
       Object.keys(workingMaterial)?.forEach(key => {
         if (key.endsWith('Texture')) {

package/src/package/helpers/utilityHelpers.js

@@ -466,46 +466,20 @@ export const buildMeshPositionsArray = args => {
   });
 };
 
-export const getImageFileFromBuffer = args => {
-  const { buffer, asBase64Data } = args || {};
-
+export const getImageFileFromBuffer = buffer => {
   if (_.isEmpty(buffer)) return '';
 
-  try {
-    const blob = new Blob([ buffer ], { type: 'image/png' });
-    const url = URL.createObjectURL(blob);
-
-    if (asBase64Data) {
-      return new Promise((resolve, reject) => {
-        const reader = new FileReader();
+  const blob = new Blob([ buffer ], { type: 'image/png' });
+  const url = URL.createObjectURL(blob);
 
-        reader.onloadend = () => {
-          resolve(reader.result);
-        };
-
-        reader.onerror = error => {
-          console.error('Error reading buffer: ', error);
-          reject(error);
-        };
-
-        reader.readAsDataURL(blob);
-      });
-    }
-
-    return Promise.resolve(url);
-  } catch (error) {
-    console.error('Unable to get image from buffer: ', error);
-    return Promise.reject(error);
-  }
+  return url;
 };
 
-export const getTextureUrl = async args => {
-  const { texture, asBase64Data } = args || {};
+export const getTextureUrl = texture => {
   const buffer = texture?._buffer;
 
   if (_.isEmpty(buffer)) return texture?.url || '';
-  const url = await getImageFileFromBuffer({ buffer, asBase64Data });
-  return url;
+  return getImageFileFromBuffer(buffer);
 };
 
 export const materialData = material => {
@@ -534,30 +508,30 @@ export const materialData = material => {
     albedoColor: material.albedoColor?.toHexString() || props?.theme?.colors?.[props.$selectedTheme]?.black,
     albedoTexture: {
       name: material.albedoTexture?.name,
-      url: getTextureUrl({ texture: material.albedoTexture, asBase64Data: true }),
+      url: getTextureUrl(material.albedoTexture),
     },
     albedoHasAlpha: material.albedoTexture?.hasAlpha || false,
     environmentIntensity: material.environmentIntensity,
     metallic: material.metallic,
     metallicTexture: {
       name: material.metallicTexture?.name,
-      url: getTextureUrl({ texture: material.metallicTexture, asBase64Data: true }),
+      url: getTextureUrl(material.metallicTexture),
     },
     roughness: material.roughness,
     microSurfaceTexture: {
       name: material.microSurfaceTexture?.name,
-      url: getTextureUrl({ texture: material.microSurfaceTexture, asBase64Data: true }),
+      url: getTextureUrl(material.microSurfaceTexture),
     },
     emissiveColor: material.emissiveColor?.toHexString() || props?.theme?.colors?.[props.$selectedTheme]?.black,
     emissiveIntensity: material.emissiveIntensity,
     emissiveTexture: {
       name: material.emissiveTexture?.name,
-      url: getTextureUrl({ texture: material.emissiveTexture, asBase64Data: true }),
+      url: getTextureUrl(material.emissiveTexture),
     },
     bumpIntensity: material.bumpTexture?.level || 0.5,
     bumpTexture: {
       name: material.bumpTexture?.name,
-      url: getTextureUrl({ texture: material.bumpTexture, asBase64Data: true }),
+      url: getTextureUrl(material.bumpTexture),
     },
 
     // Advanced
@@ -568,7 +542,7 @@ export const materialData = material => {
     alpha: material.alpha,
     opacityTexture: {
       name: material.opacityTexture?.name,
-      url: getTextureUrl({ texture: material.opacityTexture, asBase64Data: true }),
+      url: getTextureUrl(material.opacityTexture),
     },
     transparencyMode: material.transparencyMode,
     sssRefractionEnabled: material.subSurface?.isRefractionEnabled || false,