@xviewer.js/core 1.0.0-alpha.47 → 1.0.0-alpha.49

package/dist/main.js

@@ -3604,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);
@@ -4604,6 +4605,12 @@ class Viewer extends EventEmitter {
     get input() {
         return this._input;
     }
+    get targetFrameRate() {
+        return this._targetFrameRate;
+    }
+    set targetFrameRate(v) {
+        this._targetFrameRate = Math.max(0.001, v);
+    }
     destroy() {
         this._renderer.dispose();
         this._taskManager.destroy();
@@ -4623,14 +4630,15 @@ class Viewer extends EventEmitter {
         this._time = time;
         if (this._targetFrameRate > -1) {
             const interval = 1 / this._targetFrameRate;
-            const delta = time - this._lastTime;
+            const delta = this._time - this._lastFrameTime;
             if (delta >= interval) {
-                this.loop(delta);
-                this._lastTime = time - delta % interval;
+                this.loop(this._time - this._lastTime);
+                this._lastTime = this._time;
+                this._lastFrameTime = this._time - delta % interval;
             }
         } else {
-            this.loop(time - this._lastTime);
-            this._lastTime = time;
+            this.loop(this._time - this._lastTime);
+            this._lastTime = this._time;
         }
     }
     loop(dt) {
@@ -4934,6 +4942,7 @@ class Viewer extends EventEmitter {
         this._rootRotated = false;
         this._time = 0;
         this._lastTime = 0;
+        this._lastFrameTime = 0;
         this._targetFrameRate = -1;
         this._autoResize = true;
         const el = canvas || document.getElementById("canvas");
@@ -5005,7 +5014,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;
     }
@@ -5039,19 +5048,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;
@@ -5060,7 +5069,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++){
@@ -5246,11 +5255,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;
@@ -5259,13 +5275,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,
@@ -5280,7 +5298,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,
@@ -5290,11 +5308,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;
@@ -5317,15 +5336,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,
@@ -5350,6 +5369,9 @@ __decorate([
 __decorate([
     property
 ], EnvironmentPlugin.prototype, "interval", void 0);
+__decorate([
+    property
+], EnvironmentPlugin.prototype, "manual", void 0);
 
 class BoxProjectionPlugin extends Plugin {
     get debug() {