@xviewer.js/core 1.0.4-alpha.9 → 1.0.5-alhpa.0

package/dist/main.cjs

@@ -3743,7 +3743,9 @@ uniform float     roughness;
 uniform float     metalness;
 uniform sampler2D map;
 uniform sampler2D normalMap;
+uniform vec4      normalScaleBias;     
 uniform sampler2D roughnessMap;
+uniform vec4      roughnessScaleBias;    
 uniform sampler2D aoMap;
 uniform float     aoMapIntensity;
 uniform sampler2D lightMap;
@@ -3781,7 +3783,7 @@ void main() {
     vec2 reflectUv = coord.xy;
 
 #ifdef USE_NORMALMAP
-    vec4 texelNormal = texture2D(normalMap, UV_NORMAL);
+    vec4 texelNormal = texture2D(normalMap, UV_NORMAL * normalScaleBias.xy + normalScaleBias.zw);
     vec3 normal = normalize(vec3(texelNormal.r * 2.0 - 1.0, texelNormal.b,  texelNormal.g * 2.0 - 1.0));
     reflectUv += coord.z * normal.xz * 0.05;
 #endif
@@ -3808,7 +3810,7 @@ void main() {
     float roughnessFactor = roughness;
 
 #ifdef USE_ROUGHNESSMAP
-    roughnessFactor *= texture2D(roughnessMap, UV_ROUGHNESS).g * roughness;
+    roughnessFactor *= texture2D(roughnessMap, UV_ROUGHNESS * roughnessScaleBias.xy + roughnessScaleBias.zw).g * roughness;
 #endif
 
     computeMultiscattering( geometryNormal, geometryViewDir, specularColor, specularF90, roughnessFactor, singleScattering, multiScattering );
@@ -3820,6 +3822,8 @@ void main() {
 
 #ifdef USE_LIGHTMAP
     irradiance += texture2D(lightMap, UV_LIGHTMAP).rgb * lightMapIntensity;
+#else
+    irradiance += vec3(1.);
 #endif
 
     float lod = roughnessFactor * (1.7 - 0.7 * roughnessFactor) * 6.;
@@ -3906,12 +3910,24 @@ class ReflectorMaterial extends THREE.ShaderMaterial {
     set roughnessMap(v) {
         this.uniforms.roughnessMap.value = v;
     }
+    get roughnessScaleBias() {
+        return this.uniforms.roughnessScaleBias.value;
+    }
+    set roughnessScaleBias(v) {
+        this.uniforms.roughnessScaleBias.value.copy(v);
+    }
     get normalMap() {
         return this.uniforms.normalMap.value;
     }
     set normalMap(v) {
         this.uniforms.normalMap.value = v;
     }
+    get normalScaleBias() {
+        return this.uniforms.normalScaleBias.value;
+    }
+    set normalScaleBias(v) {
+        this.uniforms.normalScaleBias.value.copy(v);
+    }
     get aoMap() {
         return this.uniforms.aoMap.value;
     }
@@ -3976,9 +3992,15 @@ class ReflectorMaterial extends THREE.ShaderMaterial {
             roughnessMap: {
                 value: null
             },
+            roughnessScaleBias: {
+                value: new THREE.Vector4(1, 1, 0, 0)
+            },
             normalMap: {
                 value: null
             },
+            normalScaleBias: {
+                value: new THREE.Vector4(1, 1, 0, 0)
+            },
             aoMap: {
                 value: null
             },
@@ -4024,9 +4046,15 @@ __decorate([
 __decorate([
     property
 ], ReflectorMaterial.prototype, "roughnessMap", null);
+__decorate([
+    property
+], ReflectorMaterial.prototype, "roughnessScaleBias", null);
 __decorate([
     property
 ], ReflectorMaterial.prototype, "normalMap", null);
+__decorate([
+    property
+], ReflectorMaterial.prototype, "normalScaleBias", null);
 __decorate([
     property
 ], ReflectorMaterial.prototype, "aoMap", null);
@@ -4343,7 +4371,6 @@ class TaskManager {
     destroy() {
         this._tasks = [];
         this._taskIndex = 0;
-        clearInterval(this._interval);
     }
     add(task) {
         this._tasks.push(task);
@@ -4357,14 +4384,14 @@ class TaskManager {
                 console.error(e);
                 this.onError && this.onError(task);
             }
-            ++this._taskIndex;
-            if (this._onstartCalled === false) {
-                this._onstartCalled = true;
+            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) {
-                this._onstartCalled = false;
+                this._onStartCalled = false;
                 this.onComplete && this.onComplete();
             }
         }
@@ -4375,9 +4402,7 @@ class TaskManager {
         this.onError = onError;
         this._tasks = [];
         this._taskIndex = 0;
-        this._interval = null;
-        this._onstartCalled = false;
-        this._interval = setInterval(()=>this.update());
+        this._onStartCalled = false;
     }
 }
 
@@ -4498,7 +4523,10 @@ class ResourceManager {
                     texSettings,
                     ...props,
                     onProgress,
-                    onLoad: resolve,
+                    onLoad: (asset)=>{
+                        this._resources.set(url, asset);
+                        resolve(asset);
+                    },
                     onError: (err)=>{
                         console.error(`${url} not exist`, err);
                         reject(err);
@@ -4509,8 +4537,12 @@ class ResourceManager {
             }
         });
     }
+    getAsset(url) {
+        return this._resources.get(url);
+    }
     constructor(viewer){
         this._loaders = new Map();
+        this._resources = new Map();
         this._viewer = viewer;
     }
 }
@@ -4530,10 +4562,11 @@ ResourceManager._texSettingKeys = [
 ];
 
 class Task {
-    constructor(excute, name = "task" + this.instanceId){
-        this.excute = excute;
-        this.name = name;
+    constructor(excute, name){
         this.instanceId = Task._instanceCount++;
+        this.name = "task" + this.instanceId;
+        this.excute = excute;
+        this.name = name || this.name;
     }
 }
 Task._instanceCount = 0;
@@ -4724,16 +4757,24 @@ class Viewer extends EventEmitter {
         }
     }
     loop(dt) {
-        dt = Math.min(dt, 0.067);
-        this._renderer.info.reset();
-        this._componentManager.update(dt);
-        this._componentManager.render(dt);
+        if (!this._loading) {
+            this._taskManager.update();
+            if (!this._tasking) {
+                this._running = true;
+            }
+        }
+        if (this._running) {
+            dt = Math.min(dt, 0.067);
+            this._renderer.info.reset();
+            this._componentManager.update(dt);
+            this._componentManager.render(dt);
+        }
     }
     start() {
-        if (this._running == false) {
-            this._running = true;
+        if (this._active == false) {
+            this._active = true;
             const frameCallback = (time)=>{
-                if (this._running) {
+                if (this._active) {
                     this._frame(time * 0.001);
                 }
             };
@@ -4742,7 +4783,7 @@ class Viewer extends EventEmitter {
         return this;
     }
     stop() {
-        this._running = false;
+        this._active = this._running = false;
         this._time = this._lastTime = 0;
         return this;
     }
@@ -4824,8 +4865,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);
@@ -5087,12 +5133,12 @@ class Viewer extends EventEmitter {
         near: 0.1,
         far: 1000,
         position: new THREE.Vector3(0, 0, 4)
-    }, targetFrameRate = -1, fixedFrameTime = false, colorSpace = THREE.SRGBColorSpace, toneMapping = THREE.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 = THREE.SRGBColorSpace, toneMapping = THREE.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._running = false, 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;
@@ -5124,21 +5170,14 @@ class Viewer extends EventEmitter {
         this._renderer.sortObjects = sortObjects;
         this._targetFrameRate = targetFrameRate;
         this._windowSize = typeof resize === "function" ? resize : resize === ResizeMode.AUTO ? this._windowSize : null;
-        const states = {
-            tasking: false,
-            loading: false};
-        const start = ()=>{
-            !states.tasking && !states.loading && this.start();
-        };
         const complete = (set, cb)=>{
             set();
             cb && cb();
-            !this._running && setTimeout(start);
         };
-        this._taskManager = new TaskManager(()=>complete(()=>states.tasking = false, tasker.onComplete), tasker.onProgress, tasker.onError);
-        this._taskManager.onStart = ()=>states.tasking = true;
-        this._loadingManager = new THREE.LoadingManager(()=>complete(()=>states.loading = false, loader.onComplete), loader.onProgress, loader.onError);
-        this._loadingManager.onStart = ()=>states.loading = true;
+        this._taskManager = new TaskManager(()=>complete(()=>this._tasking = false, tasker.onComplete), tasker.onProgress, tasker.onError);
+        this._taskManager.onStart = ()=>this._tasking = true;
+        this._loadingManager = new THREE.LoadingManager(()=>complete(()=>this._loading = false, loader.onComplete), loader.onProgress, loader.onError);
+        this._loadingManager.onStart = ()=>this._loading = true;
         this._resourceManager = new ResourceManager(this);
         this._componentManager = new ComponentManager(this);
         this._resourceOptions = {
@@ -5154,6 +5193,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);
@@ -5165,7 +5205,7 @@ class Viewer extends EventEmitter {
         setTimeout(()=>{
             this.rotate();
             this.resize();
-            start();
+            this.start();
         });
     }
 }