@xviewer.js/core 1.0.4 → 1.0.5-alhpa.1

package/dist/module.js

@@ -4348,16 +4348,15 @@ function _getMipBlurMaterial(lodMax, width, height) {
 }
 
 class TaskManager {
+    get isComplete() {
+        return this._taskIndex >= this._tasks.length;
+    }
     destroy() {
         this._tasks = [];
         this._taskIndex = 0;
     }
     add(task) {
         this._tasks.push(task);
-        if (this._onStartCalled === false) {
-            this._onStartCalled = true;
-            this.onStart && this.onStart();
-        }
     }
     update() {
         let task = this._tasks[this._taskIndex];
@@ -4368,6 +4367,10 @@ class TaskManager {
                 console.error(e);
                 this.onError && this.onError(task);
             }
+            if (this._onStartCalled === false) {
+                this._onStartCalled = true;
+                this.onStart && this.onStart();
+            }
             ++this._taskIndex;
             this.onProgress && this.onProgress(task, this._taskIndex, this._tasks.length);
             if (this._taskIndex === this._tasks.length) {
@@ -4480,6 +4483,9 @@ class ResourceManager {
         }
         return settings;
     }
+    get isComplete() {
+        return this._loaded >= this._totalCount;
+    }
     destroy() {
         this._loaders.clear();
     }
@@ -4503,19 +4509,30 @@ class ResourceManager {
                     texSettings,
                     ...props,
                     onProgress,
-                    onLoad: resolve,
+                    onLoad: (asset)=>{
+                        this._loaded++;
+                        this._resources.set(url, asset);
+                        resolve(asset);
+                    },
                     onError: (err)=>{
                         console.error(`${url} not exist`, err);
                         reject(err);
                     }
                 });
+                this._totalCount++;
             } else {
                 reject("ResourceManager.loadAsset: missing loader for " + sel);
             }
         });
     }
+    getAsset(url) {
+        return this._resources.get(url);
+    }
     constructor(viewer){
         this._loaders = new Map();
+        this._resources = new Map();
+        this._loaded = 0;
+        this._totalCount = 0;
         this._viewer = viewer;
     }
 }
@@ -4730,11 +4747,13 @@ class Viewer extends EventEmitter {
         }
     }
     loop(dt) {
-        this._taskManager.update();
-        if (!this._loading && !this._tasking && this._running > 0) {
-            this._running--;
+        if (this._resourceManager.isComplete) {
+            this._taskManager.update();
+            if (this._taskManager.isComplete) {
+                this._running = true;
+            }
         }
-        if (this._running <= 0) {
+        if (this._running) {
             dt = Math.min(dt, 0.067);
             this._renderer.info.reset();
             this._componentManager.update(dt);
@@ -4754,8 +4773,7 @@ class Viewer extends EventEmitter {
         return this;
     }
     stop() {
-        this._active = false;
-        this._running = 4;
+        this._active = this._running = false;
         this._time = this._lastTime = 0;
         return this;
     }
@@ -4837,8 +4855,13 @@ class Viewer extends EventEmitter {
     setURLModifier(callback) {
         return this._loadingManager.setURLModifier(callback);
     }
-    loadAsset(props) {
-        return this._resourceManager.loadAsset(Object.assign({}, this._resourceOptions, props));
+    loadAsset({ url, ...props }) {
+        return this._resourceManager.loadAsset(Object.assign({
+            url: this._decodeURL(url)
+        }, this._resourceOptions, props));
+    }
+    getAsset(url) {
+        return this._resourceManager.getAsset(this._decodeURL(url));
     }
     getLoader(ext) {
         return this._resourceManager.getLoader(ext);
@@ -5100,13 +5123,12 @@ class Viewer extends EventEmitter {
         near: 0.1,
         far: 1000,
         position: new Vector3(0, 0, 4)
-    }, targetFrameRate = -1, fixedFrameTime = false, colorSpace = SRGBColorSpace, toneMapping = LinearToneMapping, toneMappingExposure = 1, maxDPR = 1.5, path = "", resourcePath = "", dracoPath = "https://www.gstatic.com/draco/v1/decoders/", transcoderPath = "three/examples/js/libs/basis/", orientation = Orientation.AUTO, loader = {}, tasker = {}, ...webglOpts } = {}){
+    }, targetFrameRate = -1, fixedFrameTime = false, colorSpace = SRGBColorSpace, toneMapping = LinearToneMapping, toneMappingExposure = 1, maxDPR = 1.5, path = "", resourcePath = "", dracoPath = "https://www.gstatic.com/draco/v1/decoders/", transcoderPath = "three/examples/js/libs/basis/", orientation = Orientation.AUTO, decodeURL = (url)=>url, loader = {}, tasker = {}, ...webglOpts } = {}){
         super(), this._instanceId = Viewer.instanceCount++, this._dpr = 1, this._width = 1, this._height = 1, this._viewport = {
             width: 1,
             height: 1,
             factor: 1
-        }, this._active = false, this._loading = false, this._tasking = false, this._running = 4 //延迟4帧执行
-        , this._rootRotated = false, this._time = 0, this._lastTime = 0, this._lastFrameTime = 0, this._targetFrameRate = -1, this._fixedFrameTime = false, this._windowSize = ()=>[
+        }, this._active = false, this._loading = false, this._tasking = false, this._running = false, this._rootRotated = false, this._time = 0, this._lastTime = 0, this._lastFrameTime = 0, this._targetFrameRate = -1, this._fixedFrameTime = false, this._windowSize = ()=>[
                 window.innerWidth,
                 window.innerHeight
             ], this._orientation = Orientation.AUTO;
@@ -5138,14 +5160,8 @@ class Viewer extends EventEmitter {
         this._renderer.sortObjects = sortObjects;
         this._targetFrameRate = targetFrameRate;
         this._windowSize = typeof resize === "function" ? resize : resize === ResizeMode.AUTO ? this._windowSize : null;
-        const complete = (set, cb)=>{
-            set();
-            cb && cb();
-        };
-        this._taskManager = new TaskManager(()=>complete(()=>this._tasking = false, tasker.onComplete), tasker.onProgress, tasker.onError);
-        this._taskManager.onStart = ()=>this._tasking = true;
-        this._loadingManager = new LoadingManager(()=>complete(()=>this._loading = false, loader.onComplete), loader.onProgress, loader.onError);
-        this._loadingManager.onStart = ()=>this._loading = true;
+        this._taskManager = new TaskManager(tasker.onComplete, tasker.onProgress, tasker.onError);
+        this._loadingManager = new LoadingManager(loader.onComplete, loader.onProgress, loader.onError);
         this._resourceManager = new ResourceManager(this);
         this._componentManager = new ComponentManager(this);
         this._resourceOptions = {
@@ -5161,6 +5177,7 @@ class Viewer extends EventEmitter {
         this._input = this.add(new DeviceInput(input || {
             source: this._canvas
         }));
+        this._decodeURL = decodeURL;
         this.add(Renderer);
         this.addLoader(GLTFLoader);
         this.addLoader(HDRLoader);