@xviewer.js/core 1.0.0-alpha.21 → 1.0.0-alpha.22

package/dist/main.js

@@ -1006,19 +1006,6 @@ class TweenManager {
     }
 }
 
-const materialMapKeys = [
-    "alphaMap",
-    "aoMap",
-    "bumpMap",
-    "displacementMap",
-    "emissiveMap",
-    "envMap",
-    "lightMap",
-    "metalnessMap",
-    "normalMap",
-    "roughnessMap",
-    "specularMap"
-];
 class aLoader {
     static _setMeshData(node) {
         const meshData = {
@@ -1034,7 +1021,7 @@ class aLoader {
                 meshData.meshes.push(node);
                 meshData.materials[mat.name] = mat;
                 let tex = null;
-                for (let v of materialMapKeys){
+                for (let v of aLoader._materialMapKeys){
                     tex = mat[v];
                     tex && (meshData.textures[tex.uuid] = tex);
                 }
@@ -1048,6 +1035,19 @@ class aLoader {
         this.manager = manager;
     }
 }
+aLoader._materialMapKeys = [
+    "alphaMap",
+    "aoMap",
+    "bumpMap",
+    "displacementMap",
+    "emissiveMap",
+    "envMap",
+    "lightMap",
+    "metalnessMap",
+    "normalMap",
+    "roughnessMap",
+    "specularMap"
+];
 
 class aEXRLoader extends aLoader {
     load({ url, onLoad, onProgress, onError, texSettings }) {
@@ -2891,53 +2891,6 @@ class Plane extends three.Mesh {
     }
 }
 
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
-    try {
-        var info = gen[key](arg);
-        var value = info.value;
-    } catch (error) {
-        reject(error);
-        return;
-    }
-    if (info.done) resolve(value);
-    else Promise.resolve(value).then(_next, _throw);
-}
-function _async_to_generator(fn) {
-    return function() {
-        var self = this, args = arguments;
-
-        return new Promise(function(resolve, reject) {
-            var gen = fn.apply(self, args);
-
-            function _next(value) {
-                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
-            }
-
-            function _throw(err) {
-                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
-            }
-
-            _next(undefined);
-        });
-    };
-}
-
-function _object_without_properties_loose(source, excluded) {
-    if (source == null) return {};
-
-    var target = {};
-    var sourceKeys = Object.keys(source);
-    var key, i;
-
-    for (i = 0; i < sourceKeys.length; i++) {
-        key = sourceKeys[i];
-        if (excluded.indexOf(key) >= 0) continue;
-        target[key] = source[key];
-    }
-
-    return target;
-}
-
 class Caller {
     get pause() {
         return this._pause;
@@ -3442,12 +3395,7 @@ class ResourceManager {
             this._loaders.set(ext, loader);
         }
     }
-    loadAsset(_param) {
-        var { url, ext, onProgress } = _param, props = _object_without_properties_loose(_param, [
-            "url",
-            "ext",
-            "onProgress"
-        ]);
+    loadAsset({ url, ext, onProgress, ...props }) {
         return new Promise((resolve, reject)=>{
             const info = ResourceManager._parseURL(url);
             const texSettings = ResourceManager._splitTextureSettings(props);
@@ -3805,30 +3753,20 @@ class Viewer extends EventEmitter {
     addLoader(Loader) {
         this._resourceManager.addLoader(Loader);
     }
-    load(_param) {
-        var _this = this;
-        return _async_to_generator(function*() {
-            var { url, ext, onProgress, castShadow = false, receiveShadow = false } = _param, props = _object_without_properties_loose(_param, [
-                "url",
-                "ext",
-                "onProgress",
-                "castShadow",
-                "receiveShadow"
-            ]);
-            const node = yield _this.loadAsset({
-                url,
-                ext,
-                onProgress
+    async load({ url, ext, onProgress, castShadow = false, receiveShadow = false, ...props }) {
+        const node = await this.loadAsset({
+            url,
+            ext,
+            onProgress
+        });
+        if (castShadow || receiveShadow) {
+            node.userData.meshData.meshes.forEach((v)=>{
+                v.castShadow = castShadow;
+                v.receiveShadow = receiveShadow;
             });
-            if (castShadow || receiveShadow) {
-                node.userData.meshData.meshes.forEach((v)=>{
-                    v.castShadow = castShadow;
-                    v.receiveShadow = receiveShadow;
-                });
-            }
-            _this.addNode(node, props);
-            return node;
-        })();
+        }
+        this.addNode(node, props);
+        return node;
     }
     tween(target) {
         return this._tweenManager.tween(target);
@@ -3877,18 +3815,7 @@ class Viewer extends EventEmitter {
     removeComponent(node, component) {
         return this._componentManager.removeComponent(node, component);
     }
-    addNode(object, _param = {}) {
-        var { args, debug, scale, position, rotation, shadowArgs, makeDefault, component, parent = this._scene } = _param, props = _object_without_properties_loose(_param, [
-            "args",
-            "debug",
-            "scale",
-            "position",
-            "rotation",
-            "shadowArgs",
-            "makeDefault",
-            "component",
-            "parent"
-        ]);
+    addNode(object, { args, debug, scale, position, rotation, shadowArgs, makeDefault, component, parent = this._scene, ...props } = {}) {
         let node = null;
         let ins = getClassInstance(object, args);
         if (ins.isObject3D) {
@@ -4013,30 +3940,12 @@ class Viewer extends EventEmitter {
             Viewer.CompileObject3D(this._renderer, this._scene, this._camera, this._scene);
         }
     }
-    constructor(_param = {}){
-        var { root, canvas, autoStart = true, autoResize = true, shadows = false, camera = {
-            fov: 45,
-            near: 1,
-            far: 1000,
-            position: new three.Vector3(0, 0, 4)
-        }, targetFrameRate = -1, colorSpace = three.SRGBColorSpace, toneMapping = three.LinearToneMapping, toneMappingExposure = 1, maxDPR = 1.5, path = "", resourcePath = "", dracoPath = "https://www.gstatic.com/draco/v1/decoders/", loader = {}, tasker = {} } = _param, webglOpts = _object_without_properties_loose(_param, [
-            "root",
-            "canvas",
-            "autoStart",
-            "autoResize",
-            "shadows",
-            "camera",
-            "targetFrameRate",
-            "colorSpace",
-            "toneMapping",
-            "toneMappingExposure",
-            "maxDPR",
-            "path",
-            "resourcePath",
-            "dracoPath",
-            "loader",
-            "tasker"
-        ]);
+    constructor({ root, canvas, autoStart = true, autoResize = true, shadows = false, camera = {
+        fov: 45,
+        near: 1,
+        far: 1000,
+        position: new three.Vector3(0, 0, 4)
+    }, targetFrameRate = -1, colorSpace = three.SRGBColorSpace, toneMapping = three.LinearToneMapping, toneMappingExposure = 1, maxDPR = 1.5, path = "", resourcePath = "", dracoPath = "https://www.gstatic.com/draco/v1/decoders/", loader = {}, tasker = {}, ...webglOpts } = {}){
         super();
         this._dpr = 1;
         this._width = 1;
@@ -4163,6 +4072,7 @@ exports.aFBXLoader = aFBXLoader;
 exports.aGLTFLoader = aGLTFLoader;
 exports.aHDRLoader = aHDRLoader;
 exports.aJSONLoader = aJSONLoader;
+exports.aLoader = aLoader;
 exports.aTextureLoader = aTextureLoader;
 exports.exponentialDamp = exponentialDamp;
 exports.getClassInstance = getClassInstance;