@xviewer.js/core 1.0.0-alpha.37 → 1.0.0-alpha.39

package/dist/main.js

@@ -1410,7 +1410,11 @@ class CinestationBrain extends Component {
     lastUpdate(dt) {
         let vcam = this.getActiveCamera();
         if (vcam == null) return;
-        this._vcams.forEach((v)=>v.enabled = v === vcam);
+        this._vcams.forEach((v)=>{
+            if (!v.locked) {
+                v.enabled = v === vcam;
+            }
+        });
         if (this._lerpTime < this.brainBlend.time) {
             this._lerpTime += dt;
             let t = clamp$4(this._lerpTime / this.brainBlend.time, 0, 1);
@@ -1439,7 +1443,7 @@ class CinestationBrain extends Component {
         }
     }
     getActiveCamera() {
-        return this._vcamSolo || this._vcams.filter((v)=>v.enabled).sort((a, b)=>b.priority - a.priority)[0];
+        return this._vcamSolo || this._vcams.filter((v)=>v.enabled || v.locked).sort((a, b)=>b.priority - a.priority)[0];
     }
     _lerpToMainCamera(vcam, t) {
         const from = this.node, to = vcam;
@@ -1512,6 +1516,7 @@ class VirtualCamera extends Component {
         super(...args);
         this._finalPosition = new three.Vector3();
         this._finalRotation = new three.Quaternion();
+        this.locked = false;
         this.priority = 10;
         this.lens = new Lens();
         this.correctPosition = new three.Vector3();
@@ -2803,9 +2808,10 @@ class FreelookVirtualCamera extends VirtualCamera {
         this._targetPhi = clamp(this._targetPhi, this.phiMin, this.phiMax);
         this._targetSpringLength = clamp(this._targetSpringLength, this.distanceMin, this.distanceMax);
     }
-    gotoPOI({ springLength = this._targetSpringLength, theta = this._targetTheta, phi = this._targetPhi, lookAt = this._lookAt, fov = this.lens.fov, smoothing = this.smoothing }) {
+    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 }) {
         this._targetFov = fov;
         this._tempSmoothing = smoothing;
+        this._targetLookAt.copy(lookAt);
         this._targetSpringLength = springLength;
         this._targetPhi = phi;
         this._targetTheta = theta;
@@ -2813,7 +2819,27 @@ class FreelookVirtualCamera extends VirtualCamera {
         const theta0 = three.MathUtils.euclideanModulo(this._spherical.theta, PI2);
         const theta1 = theta0 - PI2;
         this._spherical.theta = abs(theta0 - this._targetTheta) < abs(theta1 - this._targetTheta) ? theta0 : theta1;
-        this._targetLookAt.copy(lookAt);
+        if (duration > 0) {
+            this.locked = true;
+            this.enabled = false;
+            this.viewer.killTweensOf(this);
+            this.viewer.timeline(this).to({
+                springLength,
+                theta,
+                phi,
+                lookAt,
+                fov
+            }, duration, {
+                easing,
+                onUpdate: ()=>{
+                    this.node.position.setFromSpherical(this._spherical).add(this._lookAt);
+                    this.node.lookAt(this._lookAt);
+                }
+            }).call(()=>{
+                this.locked = false;
+                this.enabled = true;
+            }).start();
+        }
     }
     update(dt) {
         const smoothing = this._tempSmoothing;
@@ -5233,7 +5259,7 @@ class EnvironmentPlugin extends Plugin {
             const cubeRenderTarget = viewer.createCubeRenderTarget(resolution, false, floatType, 0, true);
             this._cubeCamera = new three.CubeCamera(near || viewer.camera.near, far || viewer.camera.far, cubeRenderTarget);
             this._cubeCamera.position.copy(position);
-            this._cubeCamera.layers.set(layer);
+            this._cubeCamera.layers.mask = layer;
             const reflectMap = cubeRenderTarget.texture;
             this._reflectPass = new MergeRefectPass({
                 viewer,