@xviewer.js/core 1.0.0-alpha.52 → 1.0.0-alpha.54

package/dist/main.js

@@ -1483,19 +1483,13 @@ class Lens {
     }
 }
 __decorate([
-    property({
-        dir: "lens"
-    })
+    property
 ], Lens.prototype, "fov", void 0);
 __decorate([
-    property({
-        dir: "lens"
-    })
+    property
 ], Lens.prototype, "near", void 0);
 __decorate([
-    property({
-        dir: "lens"
-    })
+    property
 ], Lens.prototype, "far", void 0);
 class VirtualCamera extends Component {
     get finalPosition() {
@@ -2720,6 +2714,7 @@ class FreelookVirtualCamera extends VirtualCamera {
         } else if (e.deltaY < 0) {
             this._targetSpringLength *= this._calculateDistanceScale(0.85);
         }
+        this._calculateTargetSpringArm();
     }
     _onTouchStart(e) {
         if (!SystemInfo.isMobile) return;
@@ -2746,6 +2741,7 @@ class FreelookVirtualCamera extends VirtualCamera {
             __center.copy(__loc0).add(__loc1).multiplyScalar(0.5);
             this._calculatePanDelta(__panDelta, __preCenter, __center);
             this._calculateTargetLookAt(__panDelta);
+            this._calculateTargetSpringArm();
             this._preLoc0.copy(__loc0);
             this._preLoc1.copy(__loc1);
         } else if (touches.length > 0) {
@@ -2767,7 +2763,7 @@ class FreelookVirtualCamera extends VirtualCamera {
     _calculateRotatelDelta(out, loc0, loc1) {
         this._tempRotateSmoothing = this.rotateSmoothing;
         const domElement = this.viewer.canvas;
-        out.copy(loc1).sub(loc0).multiplyScalar(this.rotateSpeed * 2 * Math.PI / domElement.height);
+        out.copy(loc1).sub(loc0).multiplyScalar(this.rotateSpeed * 2 * Math.PI / domElement.clientHeight);
         out.y = -out.y;
         if (this.forbidX) {
             out.x = 0;
@@ -2780,7 +2776,7 @@ class FreelookVirtualCamera extends VirtualCamera {
     _calculatePanDelta(out, loc0, loc1) {
         this._tempRotateSmoothing = this.rotateSmoothing;
         const domElement = this.viewer.canvas;
-        out.copy(loc1).sub(loc0).multiplyScalar(this.panSpeed / domElement.height);
+        out.copy(loc1).sub(loc0).multiplyScalar(this.panSpeed / domElement.clientHeight);
         if (this.forbidPanX) {
             out.x = 0;
         }
@@ -2870,10 +2866,10 @@ class FreelookVirtualCamera extends VirtualCamera {
         this._touchID = -1;
         this._preLoc0 = new three.Vector2();
         this._preLoc1 = new three.Vector2();
-        this._spherical = new three.Spherical(1, Math.PI / 2);
+        this._spherical = new three.Spherical(2, Math.PI / 2);
         this._lookAt = new three.Vector3();
         this._tempSmoothing = 6;
-        this._tempRotateSmoothing = 6;
+        this._tempRotateSmoothing = 8;
         this._targetTheta = 0;
         this._targetPhi = 0;
         this._targetSpringLength = 1;
@@ -2888,7 +2884,7 @@ class FreelookVirtualCamera extends VirtualCamera {
         this.panSpeed = 1;
         this.rotateSpeed = 1;
         this.smoothing = 5;
-        this.rotateSmoothing = 5;
+        this.rotateSmoothing = 8;
         this.phiMin = ESP;
         this.phiMax = Math.PI - ESP;
         this.thetaMin = -Infinity;
@@ -4561,6 +4557,9 @@ class Viewer extends EventEmitter {
     static getMesh(node, name, group = false) {
         return Viewer._getObjectValue(node.userData.meshes, name, group);
     }
+    get instanceId() {
+        return this._instanceId;
+    }
     get root() {
         return this._root;
     }
@@ -4931,6 +4930,7 @@ class Viewer extends EventEmitter {
         position: new three.Vector3(0, 0, 4)
     }, targetFrameRate = -1, fixedFrameTime = false, colorSpace = three.SRGBColorSpace, toneMapping = three.LinearToneMapping, toneMappingExposure = 1, maxDPR = 1.5, path = "", resourcePath = "", dracoPath = "https://www.gstatic.com/draco/v1/decoders/", orientation = exports.Orientation.AUTO, loader = {}, tasker = {}, ...webglOpts } = {}){
         super();
+        this._instanceId = Viewer._instanceCount++;
         this._dpr = 1;
         this._width = 1;
         this._height = 1;
@@ -5005,6 +5005,7 @@ Viewer._shadowCameraKeys = [
 Viewer.__emtpyObject = {};
 Viewer.fullscreenMesh = new three.Mesh(Viewer.createFullscreenTriangle());
 Viewer.fullscreenCamera = new three.OrthographicCamera(-1, 1, 1, -1, 0, 1);
+Viewer._instanceCount = 0;
 
 class MergeRefectPass {
     get envMapTarget() {