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

package/dist/main.js

@@ -3146,79 +3146,6 @@ 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() {
@@ -3677,10 +3604,11 @@ const _axisDirections = [
     /*@__PURE__*/ new three.Vector3(PHI, INV_PHI, 0),
     /*@__PURE__*/ new three.Vector3(-PHI, INV_PHI, 0)
 ];
-const _Performance = {
-    HIGH: 0,
+const _Quality = {
+    LOW: 0,
     MEDIUM: 1,
-    LOW: 2
+    HIGH: 2,
+    ULTRA: 3
 };
 function _setViewport(target, x, y, width, height) {
     target.viewport.set(x, y, width, height);
@@ -4677,6 +4605,12 @@ class Viewer extends EventEmitter {
     get input() {
         return this._input;
     }
+    get targetFrameRate() {
+        return this._targetFrameRate;
+    }
+    set targetFrameRate(v) {
+        this._targetFrameRate = Math.max(1, v);
+    }
     destroy() {
         this._renderer.dispose();
         this._taskManager.destroy();
@@ -5078,7 +5012,7 @@ class MergeRefectPass {
     }
     mergeReflect(info) {
         this._pmremGenerator._copyTexture(this._envMapTarget, this._sourceTarget.texture, info.envMapIntensity);
-        this._pmremGenerator._mergeReflect(this._envMapTarget, this._reflectMap, info.performance);
+        this._pmremGenerator._mergeReflect(this._envMapTarget, this._reflectMap, info.quality);
         info.envMapTarget = this._envMapTarget;
         info.lodMax = this._pmremGenerator._lodMeshes.length - 1;
     }
@@ -5112,19 +5046,19 @@ class MergeRefectPass {
         pmremGenerator._clearTexture = function(targetOut, intensity) {
             this._copyTexture(targetOut, this._sourceTarget.texture, intensity);
         };
-        pmremGenerator._mergeReflect = function(sourceTarget, reflectMap, performance) {
+        pmremGenerator._mergeReflect = function(sourceTarget, reflectMap, quality) {
             const renderer = this._renderer;
             const autoClear = renderer.autoClear;
             const cubeMapMaterial = this._cubeMapMaterial;
             const uniforms = this._cubeMapMaterial.uniforms;
             uniforms.envMap.value = reflectMap;
             renderer.autoClear = false;
-            if (performance === _Performance.HIGH) {
+            if (quality === _Quality.HIGH) {
                 for(let i = 0; i < this._lodMeshes.length - 1; i++){
                     uniforms.lod.value = i < 5 ? 0 : i;
                     this._blit(sourceTarget, i, cubeMapMaterial);
                 }
-            } else if (performance === _Performance.MEDIUM) {
+            } else if (quality === _Quality.MEDIUM) {
                 for(let i = 0; i < this._lodMeshes.length; i++){
                     if (i < 4) {
                         uniforms.lod.value = 0;
@@ -5133,7 +5067,7 @@ class MergeRefectPass {
                         this._pmremblur(sourceTarget, i - 1, i);
                     }
                 }
-            } else {
+            } else if (quality === _Quality.ULTRA) {
                 uniforms.lod.value = 0;
                 this._blit(sourceTarget, 0, cubeMapMaterial);
                 for(let i = 1; i < this._lodMeshes.length; i++){
@@ -5319,11 +5253,18 @@ class EnvironmentPlugin extends Plugin {
         }
     }
     onRender(dt) {
-        if (this._elapsed >= this.interval || this._elapsed === 0) {
-            this._elapsed = 0;
+        if (!this.manual) {
+            if (this._elapsed >= this.interval || this._elapsed === 0) {
+                this._elapsed = 0;
+                this._renderFrame();
+            }
+            this._elapsed += dt;
+        }
+    }
+    manualFrame() {
+        if (this.manual) {
             this._renderFrame();
         }
-        this._elapsed += dt;
     }
     _renderFrame() {
         const { renderer } = this.viewer;
@@ -5332,13 +5273,15 @@ class EnvironmentPlugin extends Plugin {
         const oldActiveCubeFace = renderer.getActiveCubeFace();
         const oldActiveMipmapLevel = renderer.getActiveMipmapLevel();
         renderer.autoClear = true;
-        this._cubeCamera.update(renderer, this._scene);
-        this._mergeInfo.performance = this.performance;
+        this._mergeInfo.quality = this.quality;
         this._mergeInfo.exposure = this.reflectExposure;
         this._mergeInfo.envMapIntensity = this.envMapIntensity;
         this._mergeInfo.blurIntensity = this.reflectBlurIntensity;
+        if (this.quality !== _Quality.LOW) {
+            this._cubeCamera.update(renderer, this._scene);
+        }
         this._reflectPass.mergeReflect(this._mergeInfo);
-        if (this.performance === _Performance.HIGH) {
+        if (this.quality === _Quality.HIGH) {
             if (this._mipBlurPass === undefined) {
                 this._mipBlurPass = new MergeMipBlurPass({
                     viewer: this.viewer,
@@ -5353,7 +5296,7 @@ class EnvironmentPlugin extends Plugin {
     constructor({ envMap, scene, near, far, layer = 0, resolution = 256, floatType = three.HalfFloatType, position = new three.Vector3(0, 1, 0) } = {}){
         super();
         this._mergeInfo = {
-            performance: _Performance.HIGH,
+            quality: _Quality.HIGH,
             envMapTarget: null,
             envMapIntensity: 1,
             blurIntensity: 1,
@@ -5363,11 +5306,12 @@ class EnvironmentPlugin extends Plugin {
         this._debug = false;
         this._debugNode = null;
         this._elapsed = 0;
-        this.performance = _Performance.HIGH;
+        this.quality = _Quality.HIGH;
         this.envMapIntensity = 1;
         this.reflectExposure = 1;
         this.reflectBlurIntensity = 5;
         this.interval = 0;
+        this.manual = false;
         this.install = ()=>{
             const viewer = this.viewer;
             this._scene = scene || viewer.scene;
@@ -5390,15 +5334,15 @@ class EnvironmentPlugin extends Plugin {
         };
     }
 }
-EnvironmentPlugin.Performance = _Performance;
+EnvironmentPlugin.Quality = _Quality;
 __decorate([
     property
 ], EnvironmentPlugin.prototype, "debug", null);
 __decorate([
     property({
-        value: _Performance
+        value: _Quality
     })
-], EnvironmentPlugin.prototype, "performance", void 0);
+], EnvironmentPlugin.prototype, "quality", void 0);
 __decorate([
     property({
         min: 0,
@@ -5423,6 +5367,9 @@ __decorate([
 __decorate([
     property
 ], EnvironmentPlugin.prototype, "interval", void 0);
+__decorate([
+    property
+], EnvironmentPlugin.prototype, "manual", void 0);
 
 class BoxProjectionPlugin extends Plugin {
     get debug() {
@@ -5551,6 +5498,79 @@ __decorate([
     property
 ], BoxProjectionPlugin.prototype, "boxMax", null);
 
+class PerformanceMonitorPlugin extends Plugin {
+    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.onUpdate = (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 = [];
+                }
+            }
+        };
+    }
+}
+
 exports.AnimationCurve = AnimationCurve;
 exports.Box = Box;
 exports.BoxProjectionPlugin = BoxProjectionPlugin;
@@ -5567,7 +5587,7 @@ exports.FInterpTo = FInterpTo;
 exports.FreelookVirtualCamera = FreelookVirtualCamera;
 exports.Logger = Logger;
 exports.ObjectInstance = ObjectInstance;
-exports.PerformanceMonitor = PerformanceMonitor;
+exports.PerformanceMonitorPlugin = PerformanceMonitorPlugin;
 exports.Perlin = Perlin;
 exports.Plane = Plane;
 exports.Plugin = Plugin;