@xviewer.js/core 1.0.0-alpha.42 → 1.0.0-alpha.44

package/dist/main.js

@@ -1065,22 +1065,24 @@ 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;
-                keys.forEach((k)=>{
-                    let tex = mat[k];
-                    if (tex) {
-                        textures[tex.uuid] = tex;
-                    }
-                });
+                if (Array.isArray(mat)) mat.forEach((v)=>materials[v.uuid] = v);
+                else materials[mat.uuid] = mat;
             }
-            object.children.forEach((v)=>queue.push(v));
+            queue.push(...object.children);
         }
-        node.userData.meshData = {
+        Object.values(materials).forEach((mat)=>{
+            keys.forEach((k)=>{
+                let tex = mat[k];
+                if (tex) {
+                    textures[tex.uuid] = tex;
+                }
+            });
+        });
+        Object.assign(node.userData, {
             meshes,
             materials,
             textures
-        };
+        });
         return node;
     }
     constructor(manager){
@@ -1088,6 +1090,7 @@ class aLoader {
     }
 }
 aLoader._texKeys = [
+    "map",
     "alphaMap",
     "aoMap",
     "bumpMap",
@@ -1098,7 +1101,8 @@ aLoader._texKeys = [
     "metalnessMap",
     "normalMap",
     "roughnessMap",
-    "specularMap"
+    "specularMap",
+    "alphaMap"
 ];
 
 class aEXRLoader extends aLoader {