@archvisioninc/canvas 3.3.6 → 3.3.7

package/dist/helpers/canvasUpdateHelpers.js

@@ -596,6 +596,9 @@ export const updateMesh = inboundData => {
     globalTransform,
     variantName,
     resetVariant,
+    animationId,
+    resetAnimation,
+    loopAnimation = true,
     sourceUnit,
     displayUnit
   } = payload;
@@ -725,6 +728,30 @@ export const updateMesh = inboundData => {
     khrExtension.Reset(rootMesh);
     newMetaDataEntry('selectedMaterialVariant', null);
   }
+  const animationGroups = scene.animationGroups || [];
+  const hasAnimationId = animationId !== undefined && animationId !== null && `${animationId}` !== '';
+  const stopAllAnimationGroups = () => {
+    animationGroups.forEach(group => {
+      group.stop();
+      group.reset();
+    });
+  };
+
+  // Reset current animation
+  if (resetAnimation) {
+    stopAllAnimationGroups();
+    newMetaDataEntry('selectedAnimation', null);
+  }
+
+  // Change active animation
+  if (hasAnimationId) {
+    const animationGroup = animationGroups.find((group, index) => `${index}` === `${animationId}`);
+    stopAllAnimationGroups();
+    if (animationGroup) {
+      animationGroup.start(Boolean(loopAnimation));
+      newMetaDataEntry('selectedAnimation', `${animationId}`);
+    }
+  }
 
   // Bounding Box Toggle
   if (boundingBoxEnabled !== undefined) {

package/dist/helpers/initHelpers.js

@@ -3,7 +3,7 @@ import * as MATERIALS from 'babylonjs-materials';
 import * as BABYLONGUI from 'babylonjs-gui';
 import { LISTENERS, LIGHTS, CAMERAS, VIEWPORT } from '../constants';
 import { shortcuts, ratios, downscaling, exclusionMeshes, exclusionMaterials } from '../enums';
-import { newScene, newEngine, newCamera, newLight, newVector, newHighlightManager, handleMouseListeners, handleShortcutListeners, prepareCamera, newGround, newGridMaterial, newColor, setDefaultGridProperties, prepareAxes, getBoundingDistance, newGizmoManager, getUserMeshes, getUserMaterials, newPBRMaterial, createSafeFrame, createDragSelectBox, addInitialGizmoBehaviors, loadFromBlob, loadFromGuidURL, prepareMaterialCamera, loadFromDragDrop, addHighlightExclusion, warningChecks, toRadians, toDegrees, getStatisticsMetadata, newMetaDataEntry, serializeScene, buildMeshPositionsArray, buildMaterialsArray, updatePublish, buildSelectedMaterialArray, buildMaterialVariantsArray, removeAutoRotation, getUserNodes, buildLightsArray } from '../helpers';
+import { newScene, newEngine, newCamera, newLight, newVector, newHighlightManager, handleMouseListeners, handleShortcutListeners, prepareCamera, newGround, newGridMaterial, newColor, setDefaultGridProperties, prepareAxes, getBoundingDistance, newGizmoManager, getUserMeshes, getUserMaterials, newPBRMaterial, createSafeFrame, createDragSelectBox, addInitialGizmoBehaviors, loadFromBlob, loadFromGuidURL, prepareMaterialCamera, loadFromDragDrop, addHighlightExclusion, warningChecks, toRadians, toDegrees, getStatisticsMetadata, newMetaDataEntry, serializeScene, buildMeshPositionsArray, buildMaterialsArray, buildAnimationsArray, updatePublish, buildSelectedMaterialArray, buildMaterialVariantsArray, removeAutoRotation, getUserNodes, buildLightsArray } from '../helpers';
 import { modelToOrigin, focusCamera } from '../actions';
 import { reactProps as props } from '../Canvas';
 import _ from 'lodash';
@@ -344,6 +344,8 @@ const initMetadataKeyDefaults = () => {
   newMetaDataEntry('fileName', null);
   newMetaDataEntry('uvScaleLock', false);
   newMetaDataEntry('lights', []);
+  newMetaDataEntry('animations', []);
+  newMetaDataEntry('selectedAnimation', null);
 };
 const checkForRootNode = () => {
   let rootNode = scene.getNodeById('__root__');
@@ -464,6 +466,10 @@ export const initSceneFromFile = (sceneFromFile, fileName) => {
     newMetaDataEntry('selectedMaterials', buildSelectedMaterialArray());
     newMetaDataEntry('fileName', fileName);
     newMetaDataEntry('materialVariants', buildMaterialVariantsArray());
+    const animations = buildAnimationsArray();
+    const activeAnimationIndex = scene.animationGroups?.findIndex(group => group.isPlaying) ?? -1;
+    newMetaDataEntry('animations', animations);
+    newMetaDataEntry('selectedAnimation', activeAnimationIndex >= 0 ? `${activeAnimationIndex}` : null);
     newMetaDataEntry('uvScaleLock', scene.metadata.uvScaleLock || false);
     newMetaDataEntry('lights', buildLightsArray());
     updatePublish(fileName ? {

package/dist/helpers/utilityHelpers.js

@@ -271,6 +271,19 @@ export const buildMaterialVariantsArray = () => {
   const variants = khrExtension.GetAvailableVariants(rootMesh);
   return variants;
 };
+export const buildAnimationsArray = () => {
+  const animationGroups = scene?.animationGroups || [];
+  return animationGroups.map((group, index) => {
+    const fallbackLabel = `Animation ${index + 1}`;
+    const label = group.name || group.id || fallbackLabel;
+    return {
+      id: `${index}`,
+      index,
+      label,
+      name: group.name || ''
+    };
+  });
+};
 export const buildSelectedMaterialArray = () => {
   if (props.materialMode) {
     const mainMaterial = scene.metadata?.materials?.find?.(item => item.materialId === 'material');

package/package.json

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

package/src/package/helpers/canvasUpdateHelpers.js

@@ -666,6 +666,9 @@ export const updateMesh = inboundData => {
     globalTransform,
     variantName,
     resetVariant,
+    animationId,
+    resetAnimation,
+    loopAnimation = true,
     sourceUnit,
     displayUnit,
   } = payload;
@@ -773,6 +776,34 @@ export const updateMesh = inboundData => {
     newMetaDataEntry('selectedMaterialVariant', null);
   }
 
+  const animationGroups = scene.animationGroups || [];
+  const hasAnimationId = animationId !== undefined && animationId !== null && `${animationId}` !== '';
+
+  const stopAllAnimationGroups = () => {
+    animationGroups.forEach(group => {
+      group.stop();
+      group.reset();
+    });
+  };
+
+  // Reset current animation
+  if (resetAnimation) {
+    stopAllAnimationGroups();
+    newMetaDataEntry('selectedAnimation', null);
+  }
+
+  // Change active animation
+  if (hasAnimationId) {
+    const animationGroup = animationGroups.find((group, index) => `${index}` === `${animationId}`);
+
+    stopAllAnimationGroups();
+
+    if (animationGroup) {
+      animationGroup.start(Boolean(loopAnimation));
+      newMetaDataEntry('selectedAnimation', `${animationId}`);
+    }
+  }
+
   // Bounding Box Toggle
   if (boundingBoxEnabled !== undefined) {
     toggleBoundingBoxWidget();

package/src/package/helpers/initHelpers.js

@@ -39,6 +39,7 @@ import {
   serializeScene,
   buildMeshPositionsArray,
   buildMaterialsArray,
+  buildAnimationsArray,
   updatePublish,
   buildSelectedMaterialArray,
   buildMaterialVariantsArray,
@@ -388,6 +389,8 @@ const initMetadataKeyDefaults = () => {
   newMetaDataEntry('fileName', null);
   newMetaDataEntry('uvScaleLock', false);
   newMetaDataEntry('lights', []);
+  newMetaDataEntry('animations', []);
+  newMetaDataEntry('selectedAnimation', null);
 };
 
 const checkForRootNode = () => {
@@ -506,6 +509,13 @@ export const initSceneFromFile = (sceneFromFile, fileName) => {
     newMetaDataEntry('selectedMaterials', buildSelectedMaterialArray());
     newMetaDataEntry('fileName', fileName);
     newMetaDataEntry('materialVariants', buildMaterialVariantsArray());
+    const animations = buildAnimationsArray();
+    const activeAnimationIndex = scene.animationGroups?.findIndex(group => group.isPlaying) ?? -1;
+    newMetaDataEntry('animations', animations);
+    newMetaDataEntry(
+      'selectedAnimation',
+      activeAnimationIndex >= 0 ? `${activeAnimationIndex}` : null,
+    );
     newMetaDataEntry('uvScaleLock', scene.metadata.uvScaleLock || false);
     newMetaDataEntry('lights', buildLightsArray());
 

package/src/package/helpers/utilityHelpers.js

@@ -336,6 +336,23 @@ export const buildMaterialVariantsArray = () => {
   return variants;
 };
 
+
+export const buildAnimationsArray = () => {
+  const animationGroups = scene?.animationGroups || [];
+
+  return animationGroups.map((group, index) => {
+    const fallbackLabel = `Animation ${index + 1}`;
+    const label = group.name || group.id || fallbackLabel;
+
+    return {
+      id: `${index}`,
+      index,
+      label,
+      name: group.name || '',
+    };
+  });
+};
+
 export const buildSelectedMaterialArray = () => {
   if (props.materialMode) {
     const mainMaterial = scene.metadata?.materials?.find?.(item => item.materialId === 'material');