fix(draco): modifying check to ensure globalSettings are ready for ev…

…aluation
awslabs · Oct 16, 2024 · 80c3295 · 80c3295
1 parent 63afb47
commit 80c3295
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/.../scene-composer/src/components/three-fiber/ModelRefComponent/__tests__/GLTFLoader.spec.ts b/.../scene-composer/src/components/three-fiber/ModelRefComponent/__tests__/GLTFLoader.spec.ts
@@ -94,8 +94,7 @@ describe('GLTFLoader', () => {
     it('should execute without draco decoder enabled', async () => {
       const getGlobalSettingsMock = getGlobalSettings as jest.Mock;
       const dracoDecoder: DracoDecoderConfig = {
-        enable: true,
-        path: 'draco/path',
+        enable: false,
       };
       const basisuDecoder: BasisuDecoderConfig = {
         enable: false,
@@ -109,8 +108,7 @@ describe('GLTFLoader', () => {
       extensionsCb(mockLoader);
 
       expect(extendLoader).toBeCalledTimes(1);
-      expect(setDecoderPathSpy).toBeCalledWith('draco/path');
-      expect(mockLoader.setDRACOLoader).toBeCalledTimes(1);
+      expect(mockLoader.setDRACOLoader).toBeCalledTimes(0);
     });
   });
 

diff --git a/packages/scene-composer/src/three/loaderUtilsHelpers.spec.ts b/packages/scene-composer/src/three/loaderUtilsHelpers.spec.ts
@@ -18,6 +18,7 @@ describe('dracoSupport', () => {
 
     getGlobalSettingsMock.mockReturnValue({
       dracoDecoder,
+      getSceneObjectFunction: jest.fn(),
     });
 
     const loader = {
@@ -41,6 +42,7 @@ describe('dracoSupport', () => {
 
       getGlobalSettingsMock.mockReturnValue({
         dracoDecoder,
+        getSceneObjectFunction: jest.fn(),
       });
 
       const loader = {
@@ -73,6 +75,7 @@ describe('setupBasisu', () => {
     };
     getGlobalSettingsMock.mockReturnValue({
       basisuDecoder,
+      getSceneObjectFunction: jest.fn(),
     });
 
     const loader = {
@@ -94,6 +97,7 @@ describe('setupBasisu', () => {
       };
       getGlobalSettingsMock.mockReturnValue({
         basisuDecoder,
+        getSceneObjectFunction: jest.fn(),
       });
       const loader = {
         setKTX2Loader: jest.fn(),

diff --git a/packages/scene-composer/src/three/loaderUtilsHelpers.ts b/packages/scene-composer/src/three/loaderUtilsHelpers.ts
@@ -10,8 +10,9 @@ import { TwinMakerTextureLoader } from './TwinMakerTextureLoader';
 import { GLTFLoader, GLTFLoader as TwinMakerGLTFLoader } from './GLTFLoader';
 
 export const setupDracoSupport = (loader: GLTFLoader, dracoLoader: DRACOLoader = new DRACOLoader()): void => {
-  const { dracoDecoder } = getGlobalSettings();
-  if (dracoDecoder.enable) {
+  const { dracoDecoder, getSceneObjectFunction } = getGlobalSettings();
+  // getSceneObjectFunction is needed for the check to ensure that globalSettings are ready to be evaluated against
+  if (dracoDecoder.enable && getSceneObjectFunction) {
     const dracoDecoderPath = dracoDecoder.path ?? `${THREE_PATH}/examples/jsm/libs/draco/gltf/`;
     // TODO: with CSP issues, Chrome/Edge and some other unknown browsers may fail to load WASM, so we enforce to
     // only JS DRACO decoder for now. Please fix once we found a better solution
@@ -26,10 +27,10 @@ export const setupBasisuSupport = (
   renderer: WebGLRenderer,
   ktx2Loader: KTX2Loader = new KTX2Loader(),
 ): void => {
-  const { basisuDecoder } = getGlobalSettings();
-  if (basisuDecoder.enable) {
+  const { basisuDecoder, getSceneObjectFunction } = getGlobalSettings();
+  // getSceneObjectFunction is needed for the check to ensure that globalSettings are ready to be evaluated against
+  if (basisuDecoder.enable && getSceneObjectFunction) {
     const ktx2DecoderPath = basisuDecoder.path ?? `${THREE_PATH}/examples/jsm/libs/basis/`;
-
     ktx2Loader.setTranscoderPath(ktx2DecoderPath).detectSupport(renderer);
 
     (loader as TwinMakerGLTFLoader).setKTX2Loader(ktx2Loader);