@archvisioninc/canvas 3.1.6 → 3.1.8

package/dist/helpers/canvasUpdateHelpers.js

@@ -200,7 +200,7 @@ const loadImage = async file => {
     reader.readAsDataURL(file);
   });
 };
-const textureToImage = texture => {
+const metallicTextureToImage = texture => {
   return new Promise(resolve => {
     if (!texture.readPixels()) {
       resolve(null);
@@ -391,7 +391,7 @@ export const updateMaterial = inboundData => {
         currentTexture = material.metallicTexture;
       }
       const metallicBlob = dataUrlToBlob(texture.url);
-      Promise.all([loadImage(metallicBlob), textureToImage(currentTexture)]).then(data => {
+      Promise.all([loadImage(metallicBlob), metallicTextureToImage(currentTexture)]).then(data => {
         const [metallicImage, currentImage] = data;
         const combinedTexture = updateTextureChannel(currentImage, metallicImage, 'B');
         currentTexture.updateURL(combinedTexture);
@@ -434,7 +434,7 @@ export const updateMaterial = inboundData => {
         currentTexture = material.metallicTexture;
       }
       const roughnessBlob = dataUrlToBlob(texture.url);
-      Promise.all([loadImage(roughnessBlob), textureToImage(currentTexture)]).then(data => {
+      Promise.all([loadImage(roughnessBlob), metallicTextureToImage(currentTexture)]).then(data => {
         const [roughnessImage, metallicImage] = data;
         const combinedTexture = updateTextureChannel(metallicImage, roughnessImage, 'G');
         currentTexture.updateURL(combinedTexture);

package/dist/helpers/initHelpers.js

@@ -42,7 +42,7 @@ const resizeEngine = () => engine?.resize();
 export const initSceneObjects = () => {
   initCamera();
   initLights();
-  initHighlightManagers();
+  if (!props.previewMode) initHighlightManagers();
   if (!props.previewMode) initGridGround();
   initMirrorGround();
   initGizmos();

package/dist/helpers/utilityHelpers.js

@@ -25,6 +25,7 @@ export const serializeScene = () => {
   return serializedData;
 };
 export const addHighlightExclusion = mesh => {
+  if (props.previewMode) return;
   highlightManager.addExcludedMesh(mesh);
   hoverHighlightManager.addExcludedMesh(mesh);
 };

package/dist/helpers/viewportHelpers.js

@@ -92,6 +92,7 @@ const removeSelectedMesh = selectedMesh => {
 };
 const addHoverMesh = pickedMesh => {
   if (props.integration?.meshHighlighting === false) return;
+  if (props.previewMode) return;
   const isSelected = selectedMeshes.includes(pickedMesh);
   removeHoverMesh();
   if (isSelected) {
@@ -107,6 +108,7 @@ const addHoverMesh = pickedMesh => {
 };
 const removeHoverMesh = () => {
   if (props.integration?.meshHighlighting === false) return;
+  if (props.previewMode) return;
   hoverHighlightManager.removeAllMeshes();
   if (tempMesh) {
     highlightManager.addMesh(tempMesh, highlightColor());
@@ -268,6 +270,7 @@ const handleMousePointerPick = e => {
   selectedMeshes.includes(selectedMesh) ? removeSelectedMesh(selectedMesh) : addNewMesh(selectedMesh);
 };
 const handleMousePointerMove = () => {
+  if (props.previewMode) return;
   const ray = scene.createPickingRay(scene.pointerX, scene.pointerY, BABYLON.Matrix.Identity(), scene.activeCamera);
   const {
     hit,

package/package.json

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

package/src/package/helpers/canvasUpdateHelpers.js

@@ -251,7 +251,7 @@ const loadImage = async file => {
     });
 };
 
-const textureToImage = texture => {
+const metallicTextureToImage = texture => {
     return new Promise(resolve => {
         if (!texture.readPixels()) {
             resolve(null);
@@ -447,7 +447,7 @@ export const updateMaterial = inboundData => {
 
           Promise.all([
               loadImage(metallicBlob),
-              textureToImage(currentTexture),
+              metallicTextureToImage(currentTexture),
           ])
           .then(data => {
               const [ metallicImage, currentImage ] = data;
@@ -490,7 +490,7 @@ export const updateMaterial = inboundData => {
 
           const roughnessBlob = dataUrlToBlob(texture.url);
 
-          Promise.all([ loadImage(roughnessBlob), textureToImage(currentTexture) ])
+          Promise.all([ loadImage(roughnessBlob), metallicTextureToImage(currentTexture) ])
           .then(data => {
               const [ roughnessImage, metallicImage ] = data;
               const combinedTexture = updateTextureChannel(metallicImage, roughnessImage, 'G');

package/src/package/helpers/gizmoHelpers.js

@@ -140,6 +140,7 @@ export const createBoundingMesh = () => {
   boundingMesh.position = nodeLocation || newVector(1, 1, 1);
   boundingMesh.isPickable = false;
 
+
   addHighlightExclusion(boundingMesh);
 
   return boundingMesh;

package/src/package/helpers/initHelpers.js

@@ -86,7 +86,7 @@ const resizeEngine = () => engine?.resize();
 export const initSceneObjects = () => {
   initCamera();
   initLights();
-  initHighlightManagers();
+  if (!props.previewMode) initHighlightManagers();
   if (!props.previewMode) initGridGround();
   initMirrorGround();
   initGizmos();

package/src/package/helpers/utilityHelpers.js

@@ -55,6 +55,7 @@ export const serializeScene = () => {
 };
 
 export const addHighlightExclusion = mesh => {
+  if (props.previewMode) return;
   highlightManager.addExcludedMesh(mesh);
   hoverHighlightManager.addExcludedMesh(mesh);
 };

package/src/package/helpers/viewportHelpers.js

@@ -135,6 +135,7 @@ const removeSelectedMesh = selectedMesh => {
 
 const addHoverMesh = pickedMesh => {
   if (props.integration?.meshHighlighting === false) return;
+  if (props.previewMode) return;
 
   const isSelected = selectedMeshes.includes(pickedMesh);
 
@@ -156,6 +157,7 @@ const addHoverMesh = pickedMesh => {
 
 const removeHoverMesh = () => {
   if (props.integration?.meshHighlighting === false) return;
+  if (props.previewMode) return;
 
   hoverHighlightManager.removeAllMeshes();
 
@@ -344,6 +346,7 @@ const handleMousePointerPick = e => {
 };
 
 const handleMousePointerMove = () => {
+  if (props.previewMode) return;
   const ray = scene.createPickingRay(scene.pointerX, scene.pointerY, BABYLON.Matrix.Identity(), scene.activeCamera);
   const { hit, pickedMesh } = scene.pickWithRay(ray);
 

package/src/scenes/App/App.js

@@ -10,7 +10,7 @@ import Canvas from 'package/Canvas';
 import _ from 'lodash';
 
 const materialMode = false;
-const previewMode = false;
+const previewMode = true;
 const demoScene = false;
 const shaderballGuid = '21-791A-0D8D-F8A0-63F7-5086-471F-69A7-7AB0-00';