@xviewer.js/core 1.0.0-alpha.43 → 1.0.0-alpha.45

package/dist/main.js

@@ -1052,7 +1052,7 @@ class TweenManager {
 }
 
 class aLoader {
-    static _setMeshData(node) {
+    static _setUserData(node) {
         const keys = aLoader._texKeys;
         const meshes = [];
         const textures = {};
@@ -1065,8 +1065,8 @@ class aLoader {
             if (object.isMesh) {
                 meshes.push(object);
                 const mat = object.material;
-                if (Array.isArray(mat)) mat.forEach((v)=>materials[v.name] = v);
-                else materials[mat.name] = mat;
+                if (Array.isArray(mat)) mat.forEach((v)=>materials[v.uuid] = v);
+                else materials[mat.uuid] = mat;
             }
             queue.push(...object.children);
         }
@@ -1078,11 +1078,11 @@ class aLoader {
                 }
             });
         });
-        node.userData.meshData = {
+        Object.assign(node.userData, {
             meshes,
             materials,
             textures
-        };
+        });
         return node;
     }
     constructor(manager){
@@ -1123,7 +1123,7 @@ class aEXRLoader extends aLoader {
 class aFBXLoader extends aLoader {
     load({ url, onLoad, onProgress, onError }) {
         const loadCallback = (node)=>{
-            onLoad(aLoader._setMeshData(node));
+            onLoad(aLoader._setUserData(node));
         };
         const loader = new FBXLoader_js.FBXLoader(this.manager.loadingManager);
         loader.setPath(this.manager.path);
@@ -1143,7 +1143,7 @@ class aGLTFLoader extends aLoader {
         const loadCallback = (gltf)=>{
             const node = gltf.scene;
             if (gltf.animations) node.animations = gltf.animations;
-            onLoad(aLoader._setMeshData(node));
+            onLoad(aLoader._setUserData(node));
         };
         let gltfLoader = new GLTFLoader_js.GLTFLoader(this.manager.loadingManager);
         gltfLoader.setPath(this.manager.path);
@@ -2692,7 +2692,7 @@ class FreelookVirtualCamera extends VirtualCamera {
         this._button = e.button;
         this._preLoc0.set(e.pageX, e.pageY);
     }
-    _onPointerUp(e) {
+    _onPointerUp(_) {
         if (SystemInfo.isMobile) return;
         this._button = -1;
     }
@@ -2812,7 +2812,7 @@ class FreelookVirtualCamera extends VirtualCamera {
         this._targetPhi = clamp(this._targetPhi, this.phiMin, this.phiMax);
         this._targetSpringLength = clamp(this._targetSpringLength, this.distanceMin, this.distanceMax);
     }
-    gotoPOI({ duration = -1, easing = Easing.Cubic.InOut, springLength = this._targetSpringLength, theta = this._targetTheta, phi = this._targetPhi, lookAt = this._lookAt, fov = this.lens.fov, smoothing = this.smoothing, rotateSmoothing = this.rotateSmoothing }) {
+    gotoPOI({ duration = -1, easing = Easing.Cubic.InOut, springLength = this._targetSpringLength, theta = this._targetTheta, phi = this._targetPhi, lookAt = this._lookAt, fov = this.lens.fov, smoothing = this.smoothing, rotateSmoothing = smoothing }) {
         this._targetFov = fov;
         this._tempSmoothing = smoothing;
         this._tempRotateSmoothing = rotateSmoothing;
@@ -4520,33 +4520,44 @@ class Viewer extends EventEmitter {
     static getChildByName(node, name) {
         return Viewer.getObject(node, (v)=>v.name === name && v);
     }
-    static getObject(node, filter) {
+    static getObject(node, filter, group = false) {
         const queue = [
             node
         ];
+        const objects = [];
         while(queue.length !== 0){
             let object = queue.shift();
             let target = filter(object);
             if (target) {
-                return target;
+                objects.push(object);
+                if (!group) {
+                    break;
+                }
             }
             object.children.forEach((v)=>queue.push(v));
         }
+        if (group) {
+            return objects;
+        }
+        return objects[0];
     }
-    static getObjects(node, filter) {
-        const queue = [
-            node
-        ];
-        const objects = [];
-        while(queue.length !== 0){
-            let object = queue.shift();
-            let target = filter(object);
-            if (target) {
-                objects.push(object);
+    static _getObjectValue(object, name, group = false) {
+        if (name) {
+            if (group) {
+                return Object.values(object || Viewer.__emtpyObject).filter((v)=>v.name === name);
             }
-            object.children.forEach((v)=>queue.push(v));
+            return Object.values(object || Viewer.__emtpyObject).find((v)=>v.name === name);
         }
-        return objects;
+        return Object.values(object);
+    }
+    static getMaterial(node, name, group = false) {
+        return Viewer._getObjectValue(node.userData.materials, name, group);
+    }
+    static getTexture(node, name, group = false) {
+        return Viewer._getObjectValue(node.userData.textures, name, group);
+    }
+    static getMesh(node, name, group = false) {
+        return Viewer._getObjectValue(node.userData.meshes, name, group);
     }
     get root() {
         return this._root;
@@ -4742,12 +4753,12 @@ class Viewer extends EventEmitter {
         this._tweenManager.killTweensOf(target);
     }
     traverseMaterials(callback) {
-        Viewer.getObjects(this._scene, (item)=>{
-            if (item.isMesh) {
+        Viewer.getObject(this._scene, (item)=>{
+            if (item.material) {
                 if (Array.isArray(item.material)) item.material.forEach(callback);
                 else callback(item.material);
             }
-        });
+        }, true);
     }
     traversePlugins(callback) {
         return this._pluginManager.traversePlugins(callback);
@@ -4979,6 +4990,7 @@ Viewer._shadowCameraKeys = [
     "near",
     "far"
 ];
+Viewer.__emtpyObject = {};
 Viewer.fullscreenMesh = new three.Mesh(Viewer.createFullscreenTriangle());
 Viewer.fullscreenCamera = new three.OrthographicCamera(-1, 1, 1, -1, 0, 1);