@xviewer.js/core 1.0.0-alpha.44 → 1.0.0-alpha.46

package/dist/main.js

@@ -1052,7 +1052,7 @@ class TweenManager {
 }
 
 class aLoader {
-    static _setMeshData(node) {
+    static _setUserData(node) {
         const keys = aLoader._texKeys;
         const meshes = [];
         const textures = {};
@@ -1123,7 +1123,7 @@ class aEXRLoader extends aLoader {
 class aFBXLoader extends aLoader {
     load({ url, onLoad, onProgress, onError }) {
         const loadCallback = (node)=>{
-            onLoad(aLoader._setMeshData(node));
+            onLoad(aLoader._setUserData(node));
         };
         const loader = new FBXLoader_js.FBXLoader(this.manager.loadingManager);
         loader.setPath(this.manager.path);
@@ -1143,7 +1143,7 @@ class aGLTFLoader extends aLoader {
         const loadCallback = (gltf)=>{
             const node = gltf.scene;
             if (gltf.animations) node.animations = gltf.animations;
-            onLoad(aLoader._setMeshData(node));
+            onLoad(aLoader._setUserData(node));
         };
         let gltfLoader = new GLTFLoader_js.GLTFLoader(this.manager.loadingManager);
         gltfLoader.setPath(this.manager.path);
@@ -2692,7 +2692,7 @@ class FreelookVirtualCamera extends VirtualCamera {
         this._button = e.button;
         this._preLoc0.set(e.pageX, e.pageY);
     }
-    _onPointerUp(e) {
+    _onPointerUp(_) {
         if (SystemInfo.isMobile) return;
         this._button = -1;
     }
@@ -2812,7 +2812,7 @@ class FreelookVirtualCamera extends VirtualCamera {
         this._targetPhi = clamp(this._targetPhi, this.phiMin, this.phiMax);
         this._targetSpringLength = clamp(this._targetSpringLength, this.distanceMin, this.distanceMax);
     }
-    gotoPOI({ duration = -1, easing = Easing.Cubic.InOut, springLength = this._targetSpringLength, theta = this._targetTheta, phi = this._targetPhi, lookAt = this._lookAt, fov = this.lens.fov, smoothing = this.smoothing, rotateSmoothing = this.rotateSmoothing }) {
+    gotoPOI({ duration = -1, easing = Easing.Cubic.InOut, springLength = this._targetSpringLength, theta = this._targetTheta, phi = this._targetPhi, lookAt = this._lookAt, fov = this.lens.fov, smoothing = this.smoothing, rotateSmoothing = smoothing }) {
         this._targetFov = fov;
         this._tempSmoothing = smoothing;
         this._tempRotateSmoothing = rotateSmoothing;
@@ -3146,6 +3146,79 @@ class Reflector extends Component {
     }
 }
 
+class PerformanceMonitor extends Component {
+    subscribe(subscriber) {
+        this.subscriptions.set(Symbol(), subscriber);
+    }
+    constructor({ iterations = 10, ms = 250, threshold = 0.75, step = 0.1, factor: _factor = 0.5, flipflops = Infinity, bounds = (refreshrate)=>refreshrate > 100 ? [
+            60,
+            100
+        ] : [
+            40,
+            60
+        ], onIncline, onDecline, onChange, onFallback }){
+        super();
+        this.fps = 0;
+        this.index = 0;
+        this.factor = 0.5;
+        this.flipped = 0;
+        this.refreshrate = 0;
+        this.fallback = false;
+        this.frames = [];
+        this.averages = [];
+        this.subscriptions = new Map();
+        let lastFactor = 0;
+        const decimalPlacesRatio = Math.pow(10, 0);
+        this.update = (dt)=>{
+            // If the fallback has been reached do not continue running samples
+            if (this.fallback) return;
+            const { frames, averages } = this;
+            if (averages.length < iterations) {
+                frames.push(performance.now());
+                const msPassed = frames[frames.length - 1] - frames[0];
+                if (msPassed >= ms) {
+                    this.fps = Math.round(frames.length / msPassed * 1000 * decimalPlacesRatio) / decimalPlacesRatio;
+                    this.refreshrate = Math.max(this.refreshrate, this.fps);
+                    averages[this.index++ % iterations] = this.fps;
+                    if (averages.length === iterations) {
+                        const [lower, upper] = bounds(this.refreshrate);
+                        const upperBounds = averages.filter((value)=>value >= upper);
+                        const lowerBounds = averages.filter((value)=>value < lower);
+                        // Trigger incline when more than -threshold- avgs exceed the upper bound
+                        if (upperBounds.length > iterations * threshold) {
+                            this.factor = Math.min(1, this.factor + step);
+                            this.flipped++;
+                            if (onIncline) onIncline(this);
+                            this.subscriptions.forEach((value)=>value.onIncline && value.onIncline(this));
+                        }
+                        // Trigger decline when more than -threshold- avgs are below the lower bound
+                        if (lowerBounds.length > iterations * threshold) {
+                            this.factor = Math.max(0, this.factor - step);
+                            this.flipped++;
+                            if (onDecline) onDecline(this);
+                            this.subscriptions.forEach((value)=>value.onDecline && value.onDecline(this));
+                        }
+                        if (lastFactor !== this.factor) {
+                            lastFactor = this.factor;
+                            if (onChange) onChange(this);
+                            this.subscriptions.forEach((value)=>value.onChange && value.onChange(this));
+                        }
+                        if (this.flipped > flipflops && !this.fallback) {
+                            this.fallback = true;
+                            if (onFallback) onFallback(this);
+                            this.subscriptions.forEach((value)=>value.onFallback && value.onFallback(this));
+                        }
+                        this.averages = [];
+                    // Resetting the refreshrate creates more problems than it solves atm
+                    // this.refreshrate = 0
+                    }
+                    this.frames = [];
+                }
+            }
+        };
+    }
+}
+
 const vert_fullscreen = /*glsl*/ `
 varying vec2 vUv;
 void main() {
@@ -4520,33 +4593,44 @@ class Viewer extends EventEmitter {
     static getChildByName(node, name) {
         return Viewer.getObject(node, (v)=>v.name === name && v);
     }
-    static getObject(node, filter) {
+    static getObject(node, filter, group = false) {
         const queue = [
             node
         ];
+        const objects = [];
         while(queue.length !== 0){
             let object = queue.shift();
             let target = filter(object);
             if (target) {
-                return target;
+                objects.push(object);
+                if (!group) {
+                    break;
+                }
             }
             object.children.forEach((v)=>queue.push(v));
         }
+        if (group) {
+            return objects;
+        }
+        return objects[0];
     }
-    static getObjects(node, filter) {
-        const queue = [
-            node
-        ];
-        const objects = [];
-        while(queue.length !== 0){
-            let object = queue.shift();
-            let target = filter(object);
-            if (target) {
-                objects.push(object);
+    static _getObjectValue(object, name, group = false) {
+        if (name) {
+            if (group) {
+                return Object.values(object || Viewer.__emtpyObject).filter((v)=>v.name === name);
             }
-            object.children.forEach((v)=>queue.push(v));
+            return Object.values(object || Viewer.__emtpyObject).find((v)=>v.name === name);
         }
-        return objects;
+        return Object.values(object);
+    }
+    static getMaterial(node, name, group = false) {
+        return Viewer._getObjectValue(node.userData.materials, name, group);
+    }
+    static getTexture(node, name, group = false) {
+        return Viewer._getObjectValue(node.userData.textures, name, group);
+    }
+    static getMesh(node, name, group = false) {
+        return Viewer._getObjectValue(node.userData.meshes, name, group);
     }
     get root() {
         return this._root;
@@ -4742,12 +4826,12 @@ class Viewer extends EventEmitter {
         this._tweenManager.killTweensOf(target);
     }
     traverseMaterials(callback) {
-        Viewer.getObjects(this._scene, (item)=>{
-            if (item.isMesh) {
+        Viewer.getObject(this._scene, (item)=>{
+            if (item.material) {
                 if (Array.isArray(item.material)) item.material.forEach(callback);
                 else callback(item.material);
             }
-        });
+        }, true);
     }
     traversePlugins(callback) {
         return this._pluginManager.traversePlugins(callback);
@@ -4827,7 +4911,7 @@ class Viewer extends EventEmitter {
         node.visible = active;
         return node;
     }
-    createRenderTarget(width, height, nearest = false, floatType = false, msaa = 0, mipmap = false) {
+    createRenderTarget(width, height, nearest = false, floatType = false, msaa = 0, mipmap = false, depth = false) {
         return new three.WebGLRenderTarget(width, height, {
             wrapS: three.ClampToEdgeWrapping,
             wrapT: three.ClampToEdgeWrapping,
@@ -4836,13 +4920,13 @@ class Viewer extends EventEmitter {
             type: typeof floatType === "boolean" ? floatType ? this.DATA_FLOAT_TYPE : three.UnsignedByteType : floatType,
             anisotropy: 0,
             colorSpace: three.LinearSRGBColorSpace,
-            depthBuffer: false,
+            depthBuffer: depth,
             stencilBuffer: false,
             samples: SystemInfo.isSupportMSAA ? msaa : 0,
             generateMipmaps: mipmap
         });
     }
-    createCubeRenderTarget(size, nearest = false, floatType = false, msaa = 0, mipmap = false) {
+    createCubeRenderTarget(size, nearest = false, floatType = false, msaa = 0, mipmap = false, depth = false) {
         return new three.WebGLCubeRenderTarget(size, {
             wrapS: three.ClampToEdgeWrapping,
             wrapT: three.ClampToEdgeWrapping,
@@ -4851,7 +4935,7 @@ class Viewer extends EventEmitter {
             type: typeof floatType === "boolean" ? floatType ? this.DATA_FLOAT_TYPE : three.UnsignedByteType : floatType,
             anisotropy: 0,
             colorSpace: three.LinearSRGBColorSpace,
-            depthBuffer: false,
+            depthBuffer: depth,
             stencilBuffer: false,
             samples: SystemInfo.isSupportMSAA ? msaa : 0,
             generateMipmaps: mipmap
@@ -4979,6 +5063,7 @@ Viewer._shadowCameraKeys = [
     "near",
     "far"
 ];
+Viewer.__emtpyObject = {};
 Viewer.fullscreenMesh = new three.Mesh(Viewer.createFullscreenTriangle());
 Viewer.fullscreenCamera = new three.OrthographicCamera(-1, 1, 1, -1, 0, 1);
 
@@ -5233,7 +5318,14 @@ class EnvironmentPlugin extends Plugin {
             }
         }
     }
-    onRender() {
+    onRender(dt) {
+        if (this._elapsed >= this.interval || this._elapsed === 0) {
+            this._elapsed = 0;
+            this._renderFrame();
+        }
+        this._elapsed += dt;
+    }
+    _renderFrame() {
         const { renderer } = this.viewer;
         const autoClear = renderer.autoClear;
         const oldTarget = renderer.getRenderTarget();
@@ -5270,14 +5362,16 @@ class EnvironmentPlugin extends Plugin {
         };
         this._debug = false;
         this._debugNode = null;
+        this._elapsed = 0;
         this.performance = _Performance.HIGH;
         this.envMapIntensity = 1;
         this.reflectExposure = 1;
         this.reflectBlurIntensity = 5;
+        this.interval = 0;
         this.install = ()=>{
             const viewer = this.viewer;
             this._scene = scene || viewer.scene;
-            const cubeRenderTarget = viewer.createCubeRenderTarget(resolution, false, floatType, 0, true);
+            const cubeRenderTarget = viewer.createCubeRenderTarget(resolution, false, floatType, 0, true, true);
             this._cubeCamera = new three.CubeCamera(near || viewer.camera.near, far || viewer.camera.far, cubeRenderTarget);
             this._cubeCamera.position.copy(position);
             this._cubeCamera.layers.mask = layer;
@@ -5326,6 +5420,9 @@ __decorate([
         step: 0.1
     })
 ], EnvironmentPlugin.prototype, "reflectBlurIntensity", void 0);
+__decorate([
+    property
+], EnvironmentPlugin.prototype, "interval", void 0);
 
 class BoxProjectionPlugin extends Plugin {
     get debug() {
@@ -5470,6 +5567,7 @@ exports.FInterpTo = FInterpTo;
 exports.FreelookVirtualCamera = FreelookVirtualCamera;
 exports.Logger = Logger;
 exports.ObjectInstance = ObjectInstance;
+exports.PerformanceMonitor = PerformanceMonitor;
 exports.Perlin = Perlin;
 exports.Plane = Plane;
 exports.Plugin = Plugin;