@xviewer.js/core 1.0.0-alpha.4 → 1.0.0-alpha.6

package/dist/main.js

@@ -1065,22 +1065,6 @@ class aLoader {
     }
 }
 
-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 ResourceManager {
     static extension(path) {
         let str = path.split(".");
@@ -1150,12 +1134,7 @@ class ResourceManager {
     destroy() {
         this._caches.clear();
     }
-    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);
@@ -6764,7 +6743,7 @@ class aGLTFLoader extends aLoader {
             if (gltf.animations) node.animations = gltf.animations;
             onLoad(aLoader._setMeshData(node));
         };
-        let gltfLoader = new GLTFLoader(this.loadingManager);
+        let gltfLoader = new GLTFLoader(this.manager.loadingManager);
         gltfLoader.setPath(this.manager.path);
         gltfLoader.setResourcePath(this.manager.resourcePath);
         let dracoLoader = new DRACOLoader(this.manager.loadingManager);
@@ -13203,11 +13182,10 @@ const Vector3_ZERO = new three.Vector3();
 
 const { clamp, degToRad } = three.MathUtils;
 const { abs, tan } = Math;
-var VCamFreeLookMode;
-(function(VCamFreeLookMode) {
-    VCamFreeLookMode[VCamFreeLookMode["FREE"] = 0] = "FREE";
-    VCamFreeLookMode[VCamFreeLookMode["TRANSLATE"] = 1] = "TRANSLATE";
-})(VCamFreeLookMode || (VCamFreeLookMode = {}));
+const VCamFreeLookMode = {
+    FREE: 0,
+    TRANSLATE: 1
+};
 class FreelookVirtualCamera extends VirtualCamera {
     onEnable() {
         this.viewer.on(DeviceInput.POINTER_DOWN, this._onPointerDown, this);
@@ -13346,7 +13324,7 @@ class FreelookVirtualCamera extends VirtualCamera {
         const { __posDelta, __posOffset, __worldPos, __quat, __spherical, __xAxis, __yAxis } = FreelookVirtualCamera;
         __worldPos.copy(this.lookAt.position).add(this.trackedObjectOffset);
         switch(this.mode){
-            case 0:
+            case VCamFreeLookMode.FREE:
                 if (abs(this._rotateDelta.x) + abs(this._rotateDelta.y) + abs(this._distanceDelta) > 0.001) {
                     const { __posDelta, __posOffset, __worldPos } = FreelookVirtualCamera;
                     __quat.setFromUnitVectors(this.node.up, three.Object3D.DEFAULT_UP);
@@ -13367,7 +13345,7 @@ class FreelookVirtualCamera extends VirtualCamera {
                     this.node.position.copy(__posDelta.add(__worldPos));
                 }
                 break;
-            case 1:
+            case VCamFreeLookMode.TRANSLATE:
                 if (abs(this._distanceDelta) > 0.001) {
                     __posDelta.copy(this.node.position).sub(this.lookAt.position);
                     let dampFactor = quarticDamp(1, 0, this.rotateSmoothing, dt);
@@ -13411,7 +13389,7 @@ class FreelookVirtualCamera extends VirtualCamera {
         this._preLoc1 = new three.Vector2();
         this._rotateDelta = new three.Vector2();
         this._panDelta = new three.Vector2();
-        this.mode = 0;
+        this.mode = VCamFreeLookMode.FREE;
         this.forbidX = false;
         this.forbidY = false;
         this.forbidZ = false;
@@ -13467,10 +13445,7 @@ FreelookVirtualCamera.__quat = new three.Quaternion();
 FreelookVirtualCamera.__spherical = new three.Spherical();
 __decorate([
     property({
-        value: {
-            FREE: 0,
-            TRANSLATE: 1
-        }
+        value: VCamFreeLookMode
     })
 ], FreelookVirtualCamera.prototype, "mode", void 0);
 __decorate([
@@ -13522,37 +13497,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);
-        });
-    };
-}
-
 class Caller {
     get pause() {
         return this._pause;
@@ -14284,30 +14228,20 @@ class Viewer extends EventEmitter {
     loadAsset(props) {
         return this._resourceManager.loadAsset(props);
     }
-    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);
@@ -14356,18 +14290,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 = Viewer._getClassInstance(object, args);
         if (ins.isObject3D) {
@@ -14415,12 +14338,6 @@ class Viewer extends EventEmitter {
         this._componentManager.activeComponents(node);
         node.visible = active;
     }
-    createComponent(comp, _param = {}) {
-        var { args } = _param, props = _object_without_properties_loose(_param, [
-            "args"
-        ]);
-        return applyProps(Viewer._getClassInstance(comp, args), props);
-    }
     createRenderTarget(width, height, nearest = false, floatType = false, msaa = 0, mipmap = false) {
         return new three.WebGLRenderTarget(width, height, {
             wrapS: three.ClampToEdgeWrapping,
@@ -14494,30 +14411,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;