@archvisioninc/canvas 2.4.9 → 2.5.1

package/dist/helpers/cameraHelpers.js

@@ -1,6 +1,6 @@
 import * as BABYLON from 'babylonjs';
 import { newVector } from './utilityHelpers';
-import { scene, engine, canvas, selectedMeshes, getParamOfSelectedMeshes, getUserMeshes, defaultCameraPosition } from '../helpers';
+import { scene, engine, canvas, selectedMeshes, getParamOfSelectedMeshes, getUserMeshes, defaultCameraPosition, getBoundingMeshData } from '../helpers';
 import { CAMERAS, MESH_PARAMS } from '../constants';
 import { focusCamera, toggleTurntable } from '../actions';
 import { orthoOptions, ratios } from '../enums';
@@ -35,14 +35,20 @@ export const prepareCamera = () => {
 };
 export const prepareMaterialCamera = () => {
   const camera = scene.activeCamera;
-  const primarySurface = scene.getMeshById('node0_primitive1');
+  const base = scene.getMeshById('node2');
+  const sphere = scene.getMeshById('node4');
   camera.position = defaultCameraPosition();
-  if (primarySurface) {
-    const meshCenter = primarySurface.getBoundingInfo().boundingBox.centerWorld;
+  if (base && sphere) {
+    const primarySurfaces = [sphere, base];
+    const meshCenter = getBoundingMeshData(primarySurfaces).center;
     camera.setTarget(meshCenter);
     camera.alpha = 1.57;
-    camera.beta = 1.20;
-    camera.radius = 1.57;
+    camera.beta = 1.35;
+    camera.lowerRadiusLimit = 0.3239;
+    camera.upperRadiusLimit = 5000;
+    camera.minZ = 0.1;
+    camera.maxZ = 10000;
+    camera.radius = 0.785;
   }
 };
 export const toggleCameraMode = (orthoCamera, requestedMode) => {

package/dist/helpers/initHelpers.js

@@ -63,6 +63,8 @@ const tweakSceneForShaderball = () => {
   if (yAxis) yAxis.isVisible = false;
   if (zAxis) zAxis.isVisible = false;
   if (ground) ground.isVisible = false;
+  const mainMaterial = scene.getMaterialById('material');
+  newMetaDataEntry('selectedMaterial', mainMaterial?.id);
   prepareMaterialCamera();
   props.clearNotifications?.();
 };
@@ -100,11 +102,9 @@ const initCamera = () => {
     z: 0
   };
   newCamera('defaultCamera', cameraLocation, CAMERAS.ArcRotateCamera, cameraMeta);
-  if (props.materialMode) {
-    prepareMaterialCamera();
-    return;
+  if (!props.materialMode) {
+    prepareCamera();
   }
-  prepareCamera();
 };
 const initGUI = () => {
   const aspectRatio = props.ratio?.value || ratios.broadcast.value;

package/package.json

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

package/src/helpers/fetchHelpers.js

@@ -1,21 +1,20 @@
 import { MESSAGE_TYPES } from 'package/constants';
 import { progressConfig } from 'package/helpers';
+import _ from 'lodash';
 
 const clearExisting = true;
 
 export const fetchDownloadURL = async args => {
-  const { addNotification, clearNotifications, setPreviewURL } = args;
+  const { addNotification, rpcGuid, clearNotifications, setPreviewURL } = args;
 
   try {
-    const rpcGuid = window.location.pathname.split('/')[1];
     const format = 'GLB';
     const message = 'Getting file from GUID...';
 
-
-    if (rpcGuid) {
+    if (!_.isEmpty(rpcGuid)) {
       const servicesURL = `https://api.archvision.services/rpc/v1/integration/${rpcGuid}/download/${format}`;
       // eslint-disable-next-line
-      const token = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJodHRwczovL2FyY2h2aXNpb24uY29tIiwic3ViIjozOTUxNTcsInRva2VuX3R5cGUiOiJiZWFyZXIiLCJzY29wZSI6ImJhc2ljIiwiYXVkIjoiNDVFUnF3SEV5SWRqbXhkaUU4MUxMbDlFYTN2SzZZQ3dLNWE2R2xEMyIsImlhdCI6MTY5MTAwNTE4MywiZXhwIjoxNjk2MTg5MTgzfQ.7_2iKl8EpYyhi9o99U6RJ2yR-knLXnLj1Vq8yPdYUdk';
+      const token = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJodHRwczovL2FyY2h2aXNpb24uY29tIiwic3ViIjozOTUxNTcsInRva2VuX3R5cGUiOiJiZWFyZXIiLCJzY29wZSI6ImJhc2ljIiwiYXVkIjoiNDVFUnF3SEV5SWRqbXhkaUU4MUxMbDlFYTN2SzZZQ3dLNWE2R2xEMyIsImlhdCI6MTY5NTA0MTc0MCwiZXhwIjoxNzAwMjI1NzQwfQ.xTj9rYTPWr8XBHgM1Hcz2DBF6xln8muyGR1SwJWRGqk';
       const options = {
         method: 'GET',
         headers: {

package/src/package/helpers/cameraHelpers.js

@@ -8,6 +8,7 @@ import {
   getParamOfSelectedMeshes,
   getUserMeshes,
   defaultCameraPosition,
+  getBoundingMeshData,
 } from '../helpers';
 import { CAMERAS, MESH_PARAMS } from '../constants';
 import { focusCamera, toggleTurntable } from '../actions';
@@ -62,15 +63,22 @@ export const prepareCamera = () => {
 
 export const prepareMaterialCamera = () => {
   const camera = scene.activeCamera;
-  const primarySurface = scene.getMeshById('node0_primitive1');
+  const base = scene.getMeshById('node2');
+  const sphere = scene.getMeshById('node4');
   camera.position = defaultCameraPosition();
 
-  if (primarySurface) {
-    const meshCenter = primarySurface.getBoundingInfo().boundingBox.centerWorld;
+  if (base && sphere) {
+    const primarySurfaces = [ sphere, base ];
+    const meshCenter = getBoundingMeshData(primarySurfaces).center;
+
     camera.setTarget(meshCenter);
     camera.alpha = 1.57;
-    camera.beta = 1.20;
-    camera.radius = 1.57;
+    camera.beta = 1.35;
+    camera.lowerRadiusLimit = 0.3239;
+    camera.upperRadiusLimit = 5000;
+    camera.minZ = 0.1;
+    camera.maxZ = 10000;
+    camera.radius = 0.785;
   }
 };
 

package/src/package/helpers/initHelpers.js

@@ -111,6 +111,9 @@ const tweakSceneForShaderball = () => {
   if (zAxis) zAxis.isVisible = false;
   if (ground) ground.isVisible = false;
 
+  const mainMaterial = scene.getMaterialById('material');
+
+  newMetaDataEntry('selectedMaterial', mainMaterial?.id);
   prepareMaterialCamera();
   props.clearNotifications?.();
 };
@@ -136,12 +139,9 @@ const initCamera = () => {
   const cameraLocation = { x: 0, y: 0, z: 0 };
   newCamera('defaultCamera', cameraLocation, CAMERAS.ArcRotateCamera, cameraMeta);
 
-  if (props.materialMode) {
-    prepareMaterialCamera();
-    return;
+  if (!props.materialMode) {
+    prepareCamera();
   }
-
-  prepareCamera();
 };
 
 const initGUI = () => {

package/src/scenes/App/App.js

@@ -8,9 +8,10 @@ import { updateCamera, scene } from 'package/helpers';
 import Canvas from 'package/Canvas';
 import _ from 'lodash';
 
-const materialMode = false;
+const materialMode = true;
 const previewMode = false;
 const demoScene = false;
+const shaderballGuid = '21-4D80-79E5-E2E5-C1EF-FCED-D3C2-D990-0927-00';
 
 const App = () => {
   const [ notifications, setNotifications ] = useState([]);
@@ -37,10 +38,16 @@ const App = () => {
   }, [ notifications, setNotifications ]);
 
   const getPreviewURL = useCallback(() => {
-    const args = { addNotification, clearNotifications, setPreviewURL };
-    if (guid) fetchDownloadURL(args);
+    const args = {
+      addNotification,
+      rpcGuid: materialMode ? shaderballGuid : guid,
+      clearNotifications,
+      setPreviewURL,
+    };
+
+    fetchDownloadURL(args);
     // eslint-disable-next-line
-  }, [ guid ]);
+  }, [ guid, materialMode ]);
 
   const removeNotification = index => {
     const updatedArray = notifications.filter((item, i) => index !== i);