@xviewer.js/core 1.0.5-alhpa.0 → 1.0.5-alhpa.2

package/dist/main.cjs

@@ -6,7 +6,7 @@ var GLTFLoader_js = require('three/examples/jsm/loaders/GLTFLoader.js');
 var DRACOLoader_js = require('three/examples/jsm/loaders/DRACOLoader.js');
 var meshopt_decoder_module_js = require('three/examples/jsm/libs/meshopt_decoder.module.js');
 var THREE = require('three');
-var RGBELoader_js = require('three/examples/jsm/loaders/RGBELoader.js');
+var HDRLoader_js = require('three/examples/jsm/loaders/HDRLoader.js');
 var SVGLoader_js = require('three/examples/jsm/loaders/SVGLoader.js');
 var KTX2Loader_js = require('three/examples/jsm/loaders/KTX2Loader.js');
 var Addons_js = require('three/examples/jsm/Addons.js');
@@ -291,7 +291,7 @@ class HDRLoader extends Loader {
     load({ url, path, resourcePath, manager, texSettings, onLoad, onProgress, onError }) {
         let loader = this._loader;
         if (loader === undefined) {
-            loader = this._loader = new RGBELoader_js.RGBELoader();
+            loader = this._loader = new HDRLoader_js.HDRLoader();
         }
         loader.manager = manager;
         loader.setPath(path);
@@ -2647,9 +2647,15 @@ class DeviceInput extends Component {
     get pointerPixel() {
         return this._pointerPixel;
     }
+    get pointerDown() {
+        return this._pointerDown;
+    }
     get pointerButton() {
         return this._pointerButton;
     }
+    get pointerMoving() {
+        return this._pointerMoving;
+    }
     get prePointer() {
         return this._prePointer;
     }
@@ -2677,6 +2683,9 @@ class DeviceInput extends Component {
     get keys() {
         return this._keys;
     }
+    get pressability() {
+        return this._pressability;
+    }
     onEnable() {
         const dom = this._target;
         this._addEventListener(dom, 'contextmenu', (e)=>e.preventDefault());
@@ -2729,6 +2738,8 @@ class DeviceInput extends Component {
         this._listeners = [];
     }
     lastUpdate(dt) {
+        this._pointerDown = false;
+        this._pointerMoving = false;
         this._prePointer.copy(this._pointer);
         this._prePointerPixel.copy(this._pointerPixel);
         for(let i = this._touchCount; i--;){
@@ -2813,6 +2824,7 @@ class DeviceInput extends Component {
     }
     _onPointerDown(e) {
         e = this._remapPointer(e);
+        this._pointerDown = true;
         this._pointerButton = e.button;
         this._computePointer(e);
         this._prePointer.copy(this._pointer);
@@ -2830,6 +2842,7 @@ class DeviceInput extends Component {
     _onPointerMove(e) {
         e = this._remapPointer(e);
         this._computePointer(e);
+        this._pointerMoving = true;
         this._pressability.pointerMove(this._pointer, this.viewer.camera);
         this.viewer.emit(DeviceInput.POINTER_MOVE, e);
     }
@@ -2897,7 +2910,7 @@ class DeviceInput extends Component {
         this.viewer.emit(DeviceInput.KEYUP, e);
     }
     constructor(option){
-        super(), this._listeners = [], this._touches = [], this._touchCount = 0, this._touchStart = false, this._touchMoving = false, this._pointer = new THREE.Vector2(), this._pointerPixel = new THREE.Vector2(), this._pointerButton = -1, this._prePointer = new THREE.Vector2(), this._prePointerPixel = new THREE.Vector2(), this._preTouches = [], this._mouseWheel = 0, this._keys = {}, this._pressability = new Pressability();
+        super(), this._listeners = [], this._touches = [], this._touchCount = 0, this._touchStart = false, this._touchMoving = false, this._pointer = new THREE.Vector2(), this._pointerPixel = new THREE.Vector2(), this._pointerButton = -1, this._pointerDown = false, this._pointerMoving = false, this._prePointer = new THREE.Vector2(), this._prePointerPixel = new THREE.Vector2(), this._preTouches = [], this._mouseWheel = 0, this._keys = {}, this._pressability = new Pressability();
         this._target = option.source;
         this._normalizeWheel = option.normalizeWheel || normalizeWheel;
     }
@@ -3934,6 +3947,12 @@ class ReflectorMaterial extends THREE.ShaderMaterial {
     set aoMap(v) {
         this.uniforms.aoMap.value = v;
     }
+    get aoMapIntensity() {
+        return this.uniforms.aoMapIntensity.value;
+    }
+    set aoMapIntensity(v) {
+        this.uniforms.aoMapIntensity.value = v;
+    }
     get lightMap() {
         return this.uniforms.lightMap.value;
     }
@@ -4012,6 +4031,9 @@ class ReflectorMaterial extends THREE.ShaderMaterial {
             },
             lightMapIntensity: {
                 value: 1
+            },
+            dfgLUT: {
+                value: null
             }
         };
         Object.defineProperty(this, "opacity", {
@@ -4058,6 +4080,12 @@ __decorate([
 __decorate([
     property
 ], ReflectorMaterial.prototype, "aoMap", null);
+__decorate([
+    property({
+        min: 0,
+        max: 1
+    })
+], ReflectorMaterial.prototype, "aoMapIntensity", null);
 __decorate([
     property
 ], ReflectorMaterial.prototype, "lightMap", null);
@@ -4368,6 +4396,9 @@ function _getMipBlurMaterial(lodMax, width, height) {
 }
 
 class TaskManager {
+    get isComplete() {
+        return this._taskIndex >= this._tasks.length;
+    }
     destroy() {
         this._tasks = [];
         this._taskIndex = 0;
@@ -4500,6 +4531,9 @@ class ResourceManager {
         }
         return settings;
     }
+    get isComplete() {
+        return this._loaded >= this._totalCount;
+    }
     destroy() {
         this._loaders.clear();
     }
@@ -4524,6 +4558,7 @@ class ResourceManager {
                     ...props,
                     onProgress,
                     onLoad: (asset)=>{
+                        this._loaded++;
                         this._resources.set(url, asset);
                         resolve(asset);
                     },
@@ -4532,6 +4567,7 @@ class ResourceManager {
                         reject(err);
                     }
                 });
+                this._totalCount++;
             } else {
                 reject("ResourceManager.loadAsset: missing loader for " + sel);
             }
@@ -4543,6 +4579,8 @@ class ResourceManager {
     constructor(viewer){
         this._loaders = new Map();
         this._resources = new Map();
+        this._loaded = 0;
+        this._totalCount = 0;
         this._viewer = viewer;
     }
 }
@@ -4741,44 +4779,43 @@ class Viewer extends EventEmitter {
             };
         }
     }
-    _frame(time) {
-        this._time = time;
-        if (this._targetFrameRate > -1) {
-            const interval = 1 / this._targetFrameRate;
-            const delta = this._time - this._lastFrameTime;
-            if (delta >= interval) {
-                this.loop(this._fixedFrameTime ? interval : this._time - this._lastTime);
-                this._lastTime = this._time;
-                this._lastFrameTime = this._time - delta % interval;
+    animate() {
+        const loop = (dt)=>{
+            if (!this._active) return;
+            if (this._resourceManager.isComplete) {
+                this._taskManager.isComplete ? this._running = true : this._taskManager.update();
             }
-        } else {
-            this.loop(this._time - this._lastTime);
-            this._lastTime = this._time;
-        }
-    }
-    loop(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);
             }
-        }
-        if (this._running) {
-            dt = Math.min(dt, 0.067);
-            this._renderer.info.reset();
-            this._componentManager.update(dt);
-            this._componentManager.render(dt);
-        }
+        };
+        const frame = (time)=>{
+            this._time = time * 0.001;
+            if (this._targetFrameRate > -1) {
+                const interval = 1 / this._targetFrameRate;
+                const delta = this._time - this._lastFrameTime;
+                if (delta >= interval) {
+                    loop(this._fixedFrameTime ? interval : this._time - this._lastTime);
+                    this._lastTime = this._time;
+                    this._lastFrameTime = this._time - delta % interval;
+                }
+            } else {
+                loop(this._time - this._lastTime);
+                this._lastTime = this._time;
+            }
+        };
+        this._renderer.setAnimationLoop(frame);
     }
     start() {
-        if (this._active == false) {
+        if (this._active === false) {
             this._active = true;
-            const frameCallback = (time)=>{
-                if (this._active) {
-                    this._frame(time * 0.001);
-                }
-            };
-            this._renderer.setAnimationLoop(frameCallback);
+            requestAnimationFrame(()=>{
+                this.rotate();
+                this.resize();
+            });
         }
         return this;
     }
@@ -4918,7 +4955,7 @@ class Viewer extends EventEmitter {
         if (parent === undefined) {
             parent = mount ? this._mount : this._scene;
         }
-        if (parent && !node.parent) {
+        if (parent !== node && !node.parent) {
             parent.add(node);
         }
         if (component) {
@@ -5138,7 +5175,7 @@ class Viewer extends EventEmitter {
             width: 1,
             height: 1,
             factor: 1
-        }, 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 = ()=>[
+        }, this._active = 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;
@@ -5170,14 +5207,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 THREE.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 THREE.LoadingManager(loader.onComplete, loader.onProgress, loader.onError);
         this._resourceManager = new ResourceManager(this);
         this._componentManager = new ComponentManager(this);
         this._resourceOptions = {
@@ -5202,11 +5233,9 @@ class Viewer extends EventEmitter {
         this.addLoader(BINLoader);
         this.addLoader(SVGLoader);
         this.addLoader(KTX2Loader);
-        setTimeout(()=>{
-            this.rotate();
-            this.resize();
-            this.start();
-        });
+        this.rotate();
+        this.resize();
+        this.animate();
     }
 }
 Viewer.instanceCount = 0;