@archvisioninc/canvas 2.6.8 → 2.7.0

package/dist/helpers/cameraHelpers.js

@@ -35,11 +35,10 @@ export const prepareCamera = () => {
 };
 export const prepareMaterialCamera = () => {
   const camera = scene.activeCamera;
-  const base = scene.getMeshById('node2');
-  const sphere = scene.getMeshById('node4');
+  const sphere = scene.getMeshById('node0');
   camera.position = defaultCameraPosition();
-  if (base && sphere) {
-    const primarySurfaces = [sphere, base];
+  if (sphere) {
+    const primarySurfaces = [sphere];
     const meshCenter = getBoundingMeshData(primarySurfaces).center;
     camera.setTarget(meshCenter);
     camera.alpha = 1.57;
@@ -48,7 +47,7 @@ export const prepareMaterialCamera = () => {
     camera.upperRadiusLimit = 5000;
     camera.minZ = 0.1;
     camera.maxZ = 10000;
-    camera.radius = 0.785;
+    camera.radius = 5;
   }
 };
 export const toggleCameraMode = (orthoCamera, requestedMode) => {

package/dist/helpers/utilityHelpers.js

@@ -1,4 +1,3 @@
-/* eslint-disable */
 import { GLTF2 } from 'babylonjs-loaders';
 import { GIZMOS, GUI, TRANSPARENCY_MODES } from '../constants';
 import { orthoOptions } from '../enums';
@@ -413,8 +412,9 @@ export const getImageFileFromBuffer = args => {
     asDataUrl
   } = args || {};
   if (_.isEmpty(buffer)) return '';
+  if (!_.isObject(buffer) && !_.isArray(buffer)) return buffer;
   if (asDataUrl) {
-    const ascii = new Uint8Array(buffer);
+    // Convert buffer to data:image/png;base64 string
     const Uint8ToString = u8a => {
       if (_.isEmpty(u8a)) return '';
       const maxChunkSize = 8192;
@@ -425,23 +425,16 @@ export const getImageFileFromBuffer = args => {
       }
       return chunks.join('');
     };
+    const ascii = new Uint8Array(buffer);
     const dataString = btoa(Uint8ToString(ascii));
-    const blob = new Blob([dataString], {
-      type: 'image/png'
-    });
-    const blobUrl = URL.createObjectURL(blob);
-    console.log({
-      dataString,
-      blob,
-      blobUrl
-    });
-    return blobUrl;
+    const dataUrl = `data:image/png;base64,${dataString}`;
+    return dataUrl;
   }
   const blob = new Blob([buffer], {
     type: 'image/png'
   });
-  const url = URL.createObjectURL(blob);
-  return url;
+  const blobUrl = URL.createObjectURL(blob);
+  return blobUrl;
 };
 export const getTextureUrl = args => {
   const {

package/package.json

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

package/src/package/helpers/cameraHelpers.js

@@ -63,12 +63,11 @@ export const prepareCamera = () => {
 
 export const prepareMaterialCamera = () => {
   const camera = scene.activeCamera;
-  const base = scene.getMeshById('node2');
-  const sphere = scene.getMeshById('node4');
+  const sphere = scene.getMeshById('node0');
   camera.position = defaultCameraPosition();
 
-  if (base && sphere) {
-    const primarySurfaces = [ sphere, base ];
+  if (sphere) {
+    const primarySurfaces = [ sphere ];
     const meshCenter = getBoundingMeshData(primarySurfaces).center;
 
     camera.setTarget(meshCenter);
@@ -78,7 +77,7 @@ export const prepareMaterialCamera = () => {
     camera.upperRadiusLimit = 5000;
     camera.minZ = 0.1;
     camera.maxZ = 10000;
-    camera.radius = 0.785;
+    camera.radius = 5;
   }
 };
 

package/src/package/helpers/utilityHelpers.js

@@ -1,4 +1,3 @@
-/* eslint-disable */
 import { GLTF2 } from 'babylonjs-loaders';
 import { GIZMOS, GUI, TRANSPARENCY_MODES } from '../constants';
 import { orthoOptions } from '../enums';
@@ -471,10 +470,10 @@ export const getImageFileFromBuffer = args => {
   const { buffer, asDataUrl } = args || {};
 
   if (_.isEmpty(buffer)) return '';
+  if (!_.isObject(buffer) && !_.isArray(buffer)) return buffer;
 
   if (asDataUrl) {
-    const ascii = new Uint8Array(buffer);
-
+    // Convert buffer to data:image/png;base64 string
     const Uint8ToString = u8a => {
       if (_.isEmpty(u8a)) return '';
 
@@ -489,18 +488,17 @@ export const getImageFileFromBuffer = args => {
       return chunks.join('');
     };
 
+    const ascii = new Uint8Array(buffer);
     const dataString = btoa(Uint8ToString(ascii));
-    const blob = new Blob([ dataString ], { type: 'image/png' });
-    const blobUrl = URL.createObjectURL(blob);
+    const dataUrl = `data:image/png;base64,${dataString}`;
 
-    console.log({ dataString, blob, blobUrl });
-    return blobUrl;
+    return dataUrl;
   }
 
   const blob = new Blob([ buffer ], { type: 'image/png' });
-  const url = URL.createObjectURL(blob);
+  const blobUrl = URL.createObjectURL(blob);
 
-  return url;
+  return blobUrl;
 };
 
 export const getTextureUrl = args => {

package/src/scenes/App/App.js

@@ -12,7 +12,7 @@ import _ from 'lodash';
 const materialMode = true;
 const previewMode = false;
 const demoScene = false;
-const shaderballGuid = '21-4D80-79E5-E2E5-C1EF-FCED-D3C2-D990-0927-00';
+const shaderballGuid = '21-D640-6334-86DD-4B8D-EDE8-3888-9769-DF26-00';
 
 const serializedResponseData = {
   albedoColor: '#004BA6',