@xviewer.js/core 1.0.0-alpha.36 → 1.0.0-alpha.38

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);
     }
@@ -2673,12 +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._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;
@@ -2833,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;
@@ -3010,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,
@@ -4287,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);
@@ -4729,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) {
@@ -4750,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,
@@ -5230,7 +5233,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,