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

package/dist/main.js

@@ -1459,7 +1459,7 @@ class CinestationBrain extends Component {
         this._vcam = null;
         this._vcamSolo = null;
         this._vcams = [];
-        this._lerpTime = 0;
+        this._lerpTime = 4;
         this.brainBlend = new CinestationBlendDefinition();
     }
 }
@@ -1497,12 +1497,11 @@ class VirtualCamera extends Component {
         return this._finalRotation.copy(this.node.quaternion).multiply(this.correctRotation);
     }
     onLoad() {
-        this.node.isCamera = true;
         const camera = this.viewer.camera;
+        this.node.isCamera = true;
         this.lens.fov = camera.fov;
         this.lens.near = camera.near;
         this.lens.far = camera.far;
-        this.node.position.set(0, 0, 4);
         this.brain = this.viewer.getComponent(camera, CinestationBrain, true);
         this.brain.addCamera(this);
     }
@@ -2626,7 +2625,8 @@ class FreelookVirtualCamera extends VirtualCamera {
         return this._lookAt;
     }
     set lookAt(v) {
-        this._lookAt = this._targetLookAt = v;
+        this._lookAt.copy(v);
+        this._targetLookAt.copy(v);
     }
     get springLength() {
         return this._spherical.radius;
@@ -2672,13 +2672,11 @@ class FreelookVirtualCamera extends VirtualCamera {
     reset() {
         this._button = -1;
         this._touchID = -1;
-        this._setSpherical(this.node.position, this.lookAt);
-    }
-    _setSpherical(position, lookAt) {
-        const { __posDelta } = FreelookVirtualCamera;
-        __posDelta.copy(position).sub(lookAt);
-        this._spherical.setFromVector3(__posDelta);
-        this._targetSpherical.copy(this._spherical);
+        this._targetTheta = this.theta;
+        this._targetPhi = this.phi;
+        this._targetSpringLength = this.springLength;
+        this._targetLookAt.copy(this._lookAt);
+        this._targetFov = this.lens.fov;
     }
     _onPointerDown(e) {
         if (SystemInfo.isMobile) return;
@@ -2707,12 +2705,10 @@ class FreelookVirtualCamera extends VirtualCamera {
         this._preLoc0.copy(__loc0);
     }
     _onMouseWheel(e) {
-        if (this.lookAt) {
-            if (e.deltaY > 0) {
-                this._targetSpringLength *= this._calculateDistanceScale(1 / 0.85);
-            } else if (e.deltaY < 0) {
-                this._targetSpringLength *= this._calculateDistanceScale(0.85);
-            }
+        if (e.deltaY > 0) {
+            this._targetSpringLength *= this._calculateDistanceScale(1 / 0.85);
+        } else if (e.deltaY < 0) {
+            this._targetSpringLength *= this._calculateDistanceScale(0.85);
         }
     }
     _onTouchStart(e) {
@@ -2807,7 +2803,7 @@ 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({ 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._targetSpringLength = springLength;
@@ -2826,7 +2822,7 @@ class FreelookVirtualCamera extends VirtualCamera {
         this._spherical.radius = FInterpTo(this._spherical.radius, this._targetSpringLength, dt, smoothing);
         this.lens.fov = FInterpTo(this.lens.fov, this._targetFov, dt, smoothing);
         VInterpTo(this._lookAt, this._targetLookAt, dt, smoothing);
-        this.node.position.setFromSpherical(this._spherical).add(this.lookAt);
+        this.node.position.setFromSpherical(this._spherical).add(this._lookAt);
         this.node.lookAt(this._lookAt);
     }
     constructor(...args){
@@ -2835,7 +2831,7 @@ class FreelookVirtualCamera extends VirtualCamera {
         this._touchID = -1;
         this._preLoc0 = new three.Vector2();
         this._preLoc1 = new three.Vector2();
-        this._spherical = new three.Spherical();
+        this._spherical = new three.Spherical(1, Math.PI / 2);
         this._lookAt = new three.Vector3();
         this._tempSmoothing = 0;
         this._targetTheta = 0;
@@ -2843,7 +2839,6 @@ class FreelookVirtualCamera extends VirtualCamera {
         this._targetSpringLength = 1;
         this._targetFov = this.fov;
         this._targetLookAt = new three.Vector3();
-        this._targetSpherical = new three.Spherical();
         this.forbidX = false;
         this.forbidY = false;
         this.forbidZ = false;
@@ -3013,7 +3008,7 @@ class Reflector extends Component {
         const q = new three.Vector4();
         const textureMatrix = new three.Matrix4();
         const virtualCamera = new three.PerspectiveCamera();
-        virtualCamera.layers.set(layer);
+        virtualCamera.layers.mask = layer;
         const renderTarget = new three.WebGLRenderTarget(textureWidth, textureHeight, {
             samples: multisample,
             type: three.HalfFloatType,
@@ -4290,7 +4285,9 @@ class ResourceManager {
                         texSettings,
                         onProgress,
                         onLoad,
-                        onError: reject
+                        onError: (e)=>{
+                            console.error(`${url} not exist`, e);
+                        }
                     });
                 } else {
                     reject("ResourceManager.loadAsset: missing loader for " + ext);
@@ -4732,7 +4729,7 @@ class Viewer extends EventEmitter {
     removeComponent(node, component) {
         return this._componentManager.removeComponent(node, component);
     }
-    addNode(object, { args, debug, scale, position, rotation, shadowArgs, makeDefault, component, parent = this._scene, ...props } = {}) {
+    addNode(object, { args, debug, scale, position, rotation, layer, shadowArgs, makeDefault, component, parent = this._scene, ...props } = {}) {
         let node = null;
         let ins = getClassInstance(object, args);
         if (ins.isObject3D) {
@@ -4753,6 +4750,9 @@ class Viewer extends EventEmitter {
                 this._componentManager.addComponent(node, ins);
             }
         }
+        if (layer) {
+            node.layers.mask = layer;
+        }
         if (scale || position || rotation) {
             applyProps(node, {
                 scale,