@colijnit/configuratorcore 262.1.5 → 262.1.7

package/fesm2022/colijnit-configuratorcore.mjs

@@ -1,5 +1,5 @@
 import * as THREE from 'three';
-import { Group, BufferGeometry, Float32BufferAttribute, Line, LineBasicMaterial, Vector3, CylinderGeometry, Mesh, MeshBasicMaterial, Object3D, EquirectangularReflectionMapping, Vector2, Material as Material$1, Texture, Source, Camera, Box3, LinearSRGBColorSpace, SRGBColorSpace, Color, MaterialLoader, MeshPhongMaterial, NearestFilter, DoubleSide, MeshPhysicalMaterial, MeshStandardMaterial, Euler, Quaternion } from 'three';
+import { Group, BufferGeometry, Float32BufferAttribute, Line, LineBasicMaterial, Vector3, CylinderGeometry, Mesh, MeshBasicMaterial, Object3D, EquirectangularReflectionMapping, Vector2, Material as Material$1, Texture, Source, LinearSRGBColorSpace, SRGBColorSpace, Color, MaterialLoader, MeshPhongMaterial, NearestFilter, DoubleSide, MeshPhysicalMaterial, MeshStandardMaterial, Box3, Euler, Quaternion } from 'three';
 import { Subject, BehaviorSubject } from 'rxjs';
 import { GLTFLoader } from 'three/examples/jsm/loaders/GLTFLoader.js';
 import { DRACOLoader } from 'three/examples/jsm/loaders/DRACOLoader.js';
@@ -451,7 +451,7 @@ class ThreedUtils {
                 loader.dracoLoader.setDecoderConfig({ type: 'js' });
                 loader.load(file, async (object) => {
                     this.clips = object.animations || [];
-                    const obj = this.cleanedUpObjectsWeb(object.scene, false);
+                    const obj = this._cleanedUpObjects(object.scene, cleanUp);
                     this._objectCache.set(file, obj);
                     resolve(obj);
                 }, xhr => this._handleUpdateProgressBar(xhr.loaded / xhr.total * 100), error => {
@@ -473,7 +473,7 @@ class ThreedUtils {
         }
     }
     async loadGlbSource(file, setVisibleFalse = true, dracoPath) {
-        const obj = await this.loadGlbModel(file, true, dracoPath);
+        const obj = await this.loadGlbModel(file, false, dracoPath);
         if (obj) {
             obj.children = obj.children.filter(c => !(c instanceof THREE.Camera || (c.constructor.name && c.constructor.name.toLowerCase().indexOf('camera') > -1)));
             obj.children.sort((a, b) => a['name'] < b['name'] ? 1 : -1);
@@ -511,46 +511,6 @@ class ThreedUtils {
             }, null, reject);
         });
     }
-    cleanedUpObjectsWeb(object, cleanUp = true) {
-        let obj = new Object3D();
-        // console.log(this.clips);
-        object.children.forEach((c) => {
-            if (!(c instanceof Camera)) {
-                if (cleanUp && c instanceof Group || (c.children.length === 1 && c.children[0] instanceof Group)) {
-                    this._addGroupChildrenToObject(c, obj);
-                }
-                else if ((cleanUp && !(c instanceof Mesh)) || (!(c instanceof Mesh) && !c.name && c.children.length > 0)) {
-                    c.children.forEach((child) => {
-                        child.translateY(c.position.y);
-                    });
-                    c.translateY(-c.position.y);
-                    if (obj.children.length > 0) {
-                        obj.add(c.clone());
-                    }
-                    else {
-                        obj = c.clone();
-                    }
-                }
-                else {
-                    // if (c.position.y > 0 || c.position.y < 0) {
-                    //   c.children.forEach((child) => {
-                    //     child.translateY(c.position.y);
-                    //   });
-                    //   c.translateY(-c.position.y);
-                    // }
-                    obj.add(c.clone());
-                }
-            }
-        });
-        const boundingBox = new Box3().setFromObject(obj);
-        const bbCenterPivot = new Vector3();
-        boundingBox.getCenter(bbCenterPivot);
-        const delta = new Vector3().add(bbCenterPivot).negate();
-        obj.children.forEach((cc) => {
-            cc.position.add(delta);
-        });
-        return obj;
-    }
     _cleanedUpObjects(object, cleanUp = true) {
         let obj = new THREE.Object3D();
         object.children.forEach((c) => {
@@ -571,12 +531,6 @@ class ThreedUtils {
                     }
                 }
                 else {
-                    if (c.position.y > 0 || c.position.y < 0) {
-                        c.children.forEach((child) => {
-                            child.translateY(c.position.y);
-                        });
-                        c.translateY(-c.position.y);
-                    }
                     obj.add(c.clone());
                 }
             }
@@ -1782,7 +1736,7 @@ class VariationHelper extends VariationCacheHelper {
                     const lastKnownVariations = [];
                     const variationPromise = [];
                     for (let j = 0; j < variations.length; j++) {
-                        variationPromise.push(this.loadCachedVariation(variations[j].materialUrl ? variations[j].materialCode : (variations[j].gameObjectName || parts[i].decoId)).then(async (variationSettings) => {
+                        variationPromise.push(this.loadCachedVariation(variations[j].materialUrl ? this.getFileNameFromUrl(variations[j].materialUrl) : (variations[j].gameObjectName || parts[i].decoId)).then(async (variationSettings) => {
                             const newVariation = this._createVariationFromNode(variations[j]);
                             newVariation.material = await AssetUtils.CreateMaterialFromAsset(variationSettings);
                             this.loadedAsset = variations[j].materialUrl ? variations[j].materialUrl : VariationUtils.GetUrl(assetPath, parts[i].schema, variations[j].gameObjectName || parts[i].decoId);
@@ -1803,6 +1757,12 @@ class VariationHelper extends VariationCacheHelper {
             }
         });
     }
+    getFileNameFromUrl(url) {
+        // Make sure that when we are referencing a material, we always use the URL values and not the code.
+        // materialCode can be different than the materialUrl file part and will cause issues.
+        const fileNameFromUrl = url ? url.substr(url.lastIndexOf('/') + 1, url.length) : null;
+        return fileNameFromUrl ? fileNameFromUrl.substr(0, fileNameFromUrl.lastIndexOf('.')) : null;
+    }
     async loadVariationFromLocalFile(id, file, obj) {
         try {
             const variationSettings = await VariationUtils.GetVariationSettingsFromFile(id, file);