@archvisioninc/canvas 2.8.5 → 2.8.7

package/README_DEV.md

@@ -152,6 +152,12 @@ a UI action/change from one of FOVEA's panels.
 * **setSerializedData**: Function type -- Canvas calls this any time something in Babylon has changed (usually from the `updateData` payload coming in to Canvas),
 and the host app needs that updated data to re-render it's UI.
 * **setBillboardImages**: Function type -- niche function only used when `updateData` payload comes in requesting screenshots for billboard proxy types.
+* **integration**: Object type -- allows you to set specific overrides to the viewport.  Currently only two options are supported:
+
+```jsx
+// NOTE: Both of these should be boolean values
+{ shadows, meshHightling }
+```
 
 ### Preview Canvas Mode
 The preview mode is a simplified version of the standard canvas that hides the grid and other viewport widgets, limiting certain shortcuts and event listeners etc.

package/dist/helpers/initHelpers.js

@@ -52,7 +52,6 @@ export const initSceneObjects = () => {
   checkForRootNode();
 };
 const initHighlightManagers = () => {
-  if (props.integration?.meshHighlighting === false) return;
   highlightManager = newHighlightManager('selectHighlightManager');
   hoverHighlightManager = newHighlightManager('hoverHighlightManager');
 };

package/dist/helpers/utilityHelpers.js

@@ -275,7 +275,7 @@ export const buildSelectedMaterialArray = () => {
     const mainMaterial = scene.metadata?.materials?.find?.(item => item.materialId === 'material');
     return [mainMaterial];
   }
-  const arr = selectedMeshes.map(mesh => {
+  const arr = selectedMeshes?.map?.(mesh => {
     const material = mesh.material;
     if (material) {
       const existingMaterial = scene.metadata.materials?.find(mat => mat.materialId === material.id);
@@ -464,28 +464,30 @@ export const getExistingUVSettings = args => {
   };
   const userMaterials = getUserMaterials();
   const material = userMaterials.find(mat => mat.id === materialId);
-  Object.keys(material)?.find?.(key => {
-    const validMaterialWithTexture = _.isObject(material[key]) && !_.isArray(material[key]) && key.endsWith('Texture');
-    const texture = material[key];
-    const isEnvironment = key.toLowerCase().includes('environment');
-    const hasAllKeys = texture && ['uAng', 'wAng', 'vAng', 'uOffset', 'vOffset', 'uScale', 'vScale'].every(key => texture[key] !== undefined);
+  if (material) {
+    Object.keys(material)?.find?.(key => {
+      const validMaterialWithTexture = _.isObject(material[key]) && !_.isArray(material[key]) && key.endsWith('Texture');
+      const texture = material[key];
+      const isEnvironment = key.toLowerCase().includes('environment');
+      const hasAllKeys = texture && ['uAng', 'wAng', 'vAng', 'uOffset', 'vOffset', 'uScale', 'vScale'].every(key => texture[key] !== undefined);
 
-    // NOTE: All UV's are adjusted globally, at the same time in canvasUpdateHelpers.js
-    // when **any** UV setting is changed.  So we only need to find the first one to
-    // restore the UV settings.
-    if (!isEnvironment && validMaterialWithTexture && hasAllKeys && !settingsFound) {
-      settingsFound = true;
-      uvSettings = {
-        uvXScale: texture.uScale,
-        uvYScale: texture.vScale,
-        uvXRotation: texture.uAng,
-        uvYRotation: texture.wAng,
-        uvZRotation: texture.vAng,
-        uvXOffset: texture.uOffset,
-        uvYOffset: texture.vOffset
-      };
-    }
-  });
+      // NOTE: All UV's are adjusted globally, at the same time in canvasUpdateHelpers.js
+      // when **any** UV setting is changed.  So we only need to find the first one to
+      // restore the UV settings.
+      if (!isEnvironment && validMaterialWithTexture && hasAllKeys && !settingsFound) {
+        settingsFound = true;
+        uvSettings = {
+          uvXScale: texture.uScale,
+          uvYScale: texture.vScale,
+          uvXRotation: texture.uAng,
+          uvYRotation: texture.wAng,
+          uvZRotation: texture.vAng,
+          uvXOffset: texture.uOffset,
+          uvYOffset: texture.vOffset
+        };
+      }
+    });
+  }
   return uvSettings;
 };
 export const materialData = material => {

package/dist/helpers/viewportHelpers.js

@@ -91,6 +91,7 @@ const removeSelectedMesh = selectedMesh => {
   attachToSelectMeshesNode();
 };
 const addHoverMesh = pickedMesh => {
+  if (props.integration?.meshHighlighting === false) return;
   const isSelected = selectedMeshes.includes(pickedMesh);
   removeHoverMesh();
   if (isSelected) {
@@ -105,6 +106,7 @@ const addHoverMesh = pickedMesh => {
   hoverHighlightManager.addMesh(hoverMesh, hoverColor());
 };
 const removeHoverMesh = () => {
+  if (props.integration?.meshHighlighting === false) return;
   hoverHighlightManager.removeAllMeshes();
   if (tempMesh) {
     highlightManager.addMesh(tempMesh, highlightColor());
@@ -120,13 +122,16 @@ export const resetSelectedMeshes = () => {
     const existingMaterial = scene.metadata?.materials?.find?.(mat => mat.materialId === firstMaterial.id);
     newMetaDataEntry('selectedMaterials', [existingMaterial]);
   }
-  highlightManager.removeAllMeshes();
+  if (props.integration?.meshHighlighting !== false) {
+    highlightManager.removeAllMeshes();
+  }
   selectedMeshes = [];
   selectedMaterials = [];
   newMetaDataEntry('selectedMeshes', []);
   props.setSerializedData?.(serializeScene());
 };
 export const refreshHighlight = () => {
+  if (props.integration?.meshHighlighting === false) return;
   highlightManager.removeAllMeshes();
   selectedMeshes.forEach(mesh => highlightManager.addMesh(mesh, highlightColor()));
 };

package/package.json

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

package/src/helpers/fetchHelpers.js

@@ -14,7 +14,7 @@ export const fetchDownloadURL = async args => {
     if (!_.isEmpty(rpcGuid)) {
       const servicesURL = `https://api.archvision.services/rpc/v1/integration/${rpcGuid}/download/${format}`;
       // eslint-disable-next-line
-      const token = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJodHRwczovL2FyY2h2aXNpb24uY29tIiwic3ViIjoiMzk1MTU3IiwidG9rZW5fdHlwZSI6ImJlYXJlciIsInNjb3BlIjoiYmFzaWMiLCJhdWQiOiI0NUVScXdIRXlJZGpteGRpRTgxTExsOUVhM3ZLNllDd0s1YTZHbEQzIiwiaWF0IjoxNjk5ODc1Nzg5LCJleHAiOjE3MDUwNTk3ODl9.og2ryAY097yemGOuD3LvQBEZcIXJxmKNei7527I4AUg';
+      const token = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJodHRwczovL2FyY2h2aXNpb24uY29tIiwic3ViIjozOTUxNTcsInRva2VuX3R5cGUiOiJiZWFyZXIiLCJzY29wZSI6ImJhc2ljIiwiYXVkIjoiNDVFUnF3SEV5SWRqbXhkaUU4MUxMbDlFYTN2SzZZQ3dLNWE2R2xEMyIsImlhdCI6MTcwOTY1MDM5OSwiZXhwIjoxNzE0ODM0Mzk5fQ.aCtOw3h-BTTiIEcvb0FeA_XhRpEmzQTfyerRUu4JGuU';
       const options = {
         method: 'GET',
         headers: {

package/src/package/helpers/initHelpers.js

@@ -97,8 +97,6 @@ export const initSceneObjects = () => {
 };
 
 const initHighlightManagers = () => {
-  if (props.integration?.meshHighlighting === false) return;
-
   highlightManager = newHighlightManager('selectHighlightManager');
   hoverHighlightManager = newHighlightManager('hoverHighlightManager');
 };

package/src/package/helpers/utilityHelpers.js

@@ -341,7 +341,7 @@ export const buildSelectedMaterialArray = () => {
     return [ mainMaterial ];
   }
 
-  const arr = selectedMeshes.map(mesh => {
+  const arr = selectedMeshes?.map?.(mesh => {
     const material = mesh.material;
     if (material) {
       const existingMaterial = scene.metadata.materials?.find(mat => mat.materialId === material.id);
@@ -525,29 +525,34 @@ export const getExistingUVSettings = args => {
   const userMaterials = getUserMaterials();
   const material = userMaterials.find(mat => mat.id === materialId);
 
-  Object.keys(material)?.find?.(key => {
-    const validMaterialWithTexture = _.isObject(material[key]) && !_.isArray(material[key]) && key.endsWith('Texture');
-    const texture = material[key];
-    const isEnvironment = key.toLowerCase().includes('environment');
-    const hasAllKeys = texture && [ 'uAng', 'wAng', 'vAng', 'uOffset', 'vOffset', 'uScale', 'vScale' ]
-      .every(key => texture[key] !== undefined);
-
-      // NOTE: All UV's are adjusted globally, at the same time in canvasUpdateHelpers.js
-      // when **any** UV setting is changed.  So we only need to find the first one to
-      // restore the UV settings.
-    if (!isEnvironment && validMaterialWithTexture && hasAllKeys && !settingsFound) {
-      settingsFound = true;
-      uvSettings = {
-        uvXScale: texture.uScale,
-        uvYScale: texture.vScale,
-        uvXRotation: texture.uAng,
-        uvYRotation: texture.wAng,
-        uvZRotation: texture.vAng,
-        uvXOffset: texture.uOffset,
-        uvYOffset: texture.vOffset,
-      };
-    }
-  });
+  if (material) {
+    Object.keys(material)?.find?.(key => {
+      const validMaterialWithTexture = _.isObject(material[key])
+        && !_.isArray(material[key])
+        && key.endsWith('Texture');
+
+      const texture = material[key];
+      const isEnvironment = key.toLowerCase().includes('environment');
+      const hasAllKeys = texture && [ 'uAng', 'wAng', 'vAng', 'uOffset', 'vOffset', 'uScale', 'vScale' ]
+        .every(key => texture[key] !== undefined);
+
+        // NOTE: All UV's are adjusted globally, at the same time in canvasUpdateHelpers.js
+        // when **any** UV setting is changed.  So we only need to find the first one to
+        // restore the UV settings.
+      if (!isEnvironment && validMaterialWithTexture && hasAllKeys && !settingsFound) {
+        settingsFound = true;
+        uvSettings = {
+          uvXScale: texture.uScale,
+          uvYScale: texture.vScale,
+          uvXRotation: texture.uAng,
+          uvYRotation: texture.wAng,
+          uvZRotation: texture.vAng,
+          uvXOffset: texture.uOffset,
+          uvYOffset: texture.vOffset,
+        };
+      }
+    });
+  }
 
   return uvSettings;
 };

package/src/package/helpers/viewportHelpers.js

@@ -134,6 +134,8 @@ const removeSelectedMesh = selectedMesh => {
 };
 
 const addHoverMesh = pickedMesh => {
+  if (props.integration?.meshHighlighting === false) return;
+
   const isSelected = selectedMeshes.includes(pickedMesh);
 
   removeHoverMesh();
@@ -153,6 +155,8 @@ const addHoverMesh = pickedMesh => {
 };
 
 const removeHoverMesh = () => {
+  if (props.integration?.meshHighlighting === false) return;
+
   hoverHighlightManager.removeAllMeshes();
 
   if (tempMesh) {
@@ -174,7 +178,10 @@ export const resetSelectedMeshes = () => {
     newMetaDataEntry('selectedMaterials', [ existingMaterial ]);
   }
 
-  highlightManager.removeAllMeshes();
+  if (props.integration?.meshHighlighting !== false) {
+    highlightManager.removeAllMeshes();
+  }
+
   selectedMeshes = [];
   selectedMaterials = [];
   newMetaDataEntry('selectedMeshes', []);
@@ -182,6 +189,8 @@ export const resetSelectedMeshes = () => {
 };
 
 export const refreshHighlight = () => {
+  if (props.integration?.meshHighlighting === false) return;
+
   highlightManager.removeAllMeshes();
   selectedMeshes.forEach(mesh => highlightManager.addMesh(mesh, highlightColor()));
 };

package/src/scenes/App/App.js

@@ -149,6 +149,7 @@ const App = () => {
         materialMode={materialMode}
         previewMode={previewMode}
         demoScene={demoScene}
+        integration={{}}
         file={null}
         guidURL={previewURL}
         updateData={null}