@xviewer.js/core 1.0.0-alpha.13 → 1.0.0-alpha.15

package/dist/main.js

@@ -137,6 +137,10 @@ function mixin(derivedCtor, baseCtors) {
     });
 }
 
+function getClassInstance(constructor, args = []) {
+    return typeof constructor === "function" ? new constructor(...args) : constructor;
+}
+
 /**
  * The Ease class provides a collection of easing functions for use with tween.js.
  */ var Easing = {
@@ -1186,18 +1190,36 @@ typeof SuppressedError === "function" ? SuppressedError : function (error, suppr
   return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
 };
 
+class ClassProperties {
+    property(propertyKey, options = {}) {
+        this._properties[propertyKey] = options;
+        return this;
+    }
+    applyProperties(target) {
+        Object.assign(target, this._properties);
+        return target;
+    }
+    constructor(clsName){
+        this.clsName = clsName;
+        this._properties = Object.create(null);
+    }
+}
 class PropertyManager {
-    static _getProperties(target) {
-        return PropertyManager._propertiesMap.get(target.constructor);
+    static _hasProperties(constructor) {
+        return PropertyManager._propertyMap.has(constructor);
     }
-    static _hasProperties(target) {
-        return PropertyManager._propertiesMap.has(target.constructor);
+    static _getProperties(constructor, autoAdd = true) {
+        let props = PropertyManager._propertyMap.get(constructor);
+        if (props === undefined && autoAdd) {
+            props = Object.create(null);
+            PropertyManager._propertyMap.set(constructor, props);
+        }
+        return props;
     }
-    static _getMergedProperties(target) {
+    static _getMergedProperties(constructor) {
         let props = null;
-        let constructor = target.constructor;
         while(constructor !== Object.constructor.prototype){
-            let values = PropertyManager._propertiesMap.get(constructor);
+            let values = PropertyManager._getProperties(constructor, false);
             if (values) {
                 if (props === null) {
                     props = Object.create(null);
@@ -1208,17 +1230,29 @@ class PropertyManager {
         }
         return props;
     }
+    static _getClassProperties(clsName, autoAdd = true) {
+        let props = PropertyManager._classMap.get(clsName);
+        if (props === undefined && autoAdd) {
+            props = new ClassProperties(clsName);
+            PropertyManager._classMap.set(clsName, props);
+        }
+        return props;
+    }
+    static _applyClassProperties(clsName, constructor) {
+        let cls = PropertyManager._getClassProperties(clsName, false);
+        if (cls) {
+            return cls.applyProperties(PropertyManager._getProperties(constructor));
+        } else {
+            return PropertyManager._getProperties(constructor, false);
+        }
+    }
 }
-PropertyManager._propertiesMap = new Map();
+PropertyManager._classMap = new Map();
+PropertyManager._propertyMap = new Map();
 function property(target, propertyKey) {
     let options = null;
     function normalized(target, propertyKey) {
-        let targetMap = PropertyManager._propertiesMap.get(target.constructor);
-        if (targetMap === undefined) {
-            targetMap = Object.create(null);
-            PropertyManager._propertiesMap.set(target.constructor, targetMap);
-        }
-        targetMap[propertyKey] = options;
+        PropertyManager._getProperties(target.constructor)[propertyKey] = options;
     }
     if (target === undefined) {
         return property({});
@@ -2292,6 +2326,53 @@ 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;
@@ -2796,7 +2877,12 @@ class ResourceManager {
             this._loaders.set(ext, loader);
         }
     }
-    loadAsset({ url, ext, onProgress, ...props }) {
+    loadAsset(_param) {
+        var { url, ext, onProgress } = _param, props = _object_without_properties_loose(_param, [
+            "url",
+            "ext",
+            "onProgress"
+        ]);
         return new Promise((resolve, reject)=>{
             const info = ResourceManager._parseURL(url);
             const texSettings = ResourceManager._splitTextureSettings(props);
@@ -2819,7 +2905,7 @@ class ResourceManager {
                         onError: reject
                     });
                 } else {
-                    reject("missing loader for " + ext);
+                    reject("ResourceManager.loadAsset: missing loader for " + ext);
                 }
             }
         });
@@ -2897,7 +2983,7 @@ class PluginManager {
         return ins;
     }
     addPlugin(plugin) {
-        const ins = Viewer._getClassInstance(plugin);
+        const ins = getClassInstance(plugin);
         if (this._pluginsMap.has(ins.constructor)) {
             Logger.warn("Plugin already added");
         } else {
@@ -2905,6 +2991,7 @@ class PluginManager {
             ins.install && ins.install();
             this._plugins.push(ins);
             this._pluginsMap.set(ins.constructor, ins);
+            PropertyManager._applyClassProperties(ins.type, ins.constructor);
         }
         return ins;
     }
@@ -2925,9 +3012,6 @@ class PluginManager {
 }
 
 class Viewer extends EventEmitter {
-    static _getClassInstance(constructor, args = []) {
-        return typeof constructor === "function" ? new constructor(...args) : constructor;
-    }
     static _setDirectLightShadow(shadow, props) {
         const shadowCamera = shadow.camera;
         for(let i = 0; i < props.length && i < 6; i++){
@@ -3042,6 +3126,7 @@ class Viewer extends EventEmitter {
         this.addLoader(aGLTFLoader);
         this.addLoader(aHDRLoader);
         this.addLoader(aTextureLoader);
+        this.addLoader(aJSONLoader);
     }
     _frame(time) {
         this._time = time;
@@ -3155,20 +3240,30 @@ class Viewer extends EventEmitter {
     addLoader(Loader) {
         this._resourceManager.addLoader(Loader);
     }
-    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;
+    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
             });
-        }
-        this.addNode(node, props);
-        return node;
+            if (castShadow || receiveShadow) {
+                node.userData.meshData.meshes.forEach((v)=>{
+                    v.castShadow = castShadow;
+                    v.receiveShadow = receiveShadow;
+                });
+            }
+            _this.addNode(node, props);
+            return node;
+        })();
     }
     tween(target) {
         return this._tweenManager.tween(target);
@@ -3217,9 +3312,20 @@ class Viewer extends EventEmitter {
     removeComponent(node, component) {
         return this._componentManager.removeComponent(node, component);
     }
-    addNode(object, { args, debug, scale, position, rotation, shadowArgs, makeDefault, component, parent = this._scene, ...props } = {}) {
+    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"
+        ]);
         let node = null;
-        let ins = Viewer._getClassInstance(object, args);
+        let ins = getClassInstance(object, args);
         if (ins.isObject3D) {
             node = ins;
             parent.add(ins);
@@ -3228,7 +3334,7 @@ class Viewer extends EventEmitter {
             parent.add(node);
             this._componentManager.addComponent(node, ins);
         } else {
-            throw Error("unsuport object");
+            throw Error("Viewer.addNode: unsuport object");
         }
         if (component) {
             const components = Array.isArray(component) ? component : [
@@ -3317,7 +3423,7 @@ class Viewer extends EventEmitter {
             if (target.every((v)=>v.isMaterial)) {
                 Viewer.CompileMaterial(this._renderer, this._scene, this._camera, target);
             } else {
-                throw Error("unsuport material");
+                throw Error("Viewer.compile: unsuport material");
             }
         } else if (typeof target === "object") {
             if (target.isMaterial) {
@@ -3339,12 +3445,30 @@ class Viewer extends EventEmitter {
             Viewer.CompileObject3D(this._renderer, this._scene, this._camera, this._scene);
         }
     }
-    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 } = {}){
+    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"
+        ]);
         super();
         this._dpr = 1;
         this._width = 1;
@@ -3448,6 +3572,7 @@ exports.aGLTFLoader = aGLTFLoader;
 exports.aHDRLoader = aHDRLoader;
 exports.aJSONLoader = aJSONLoader;
 exports.aTextureLoader = aTextureLoader;
+exports.getClassInstance = getClassInstance;
 exports.mixin = mixin;
 exports.property = property;
 //# sourceMappingURL=main.js.map