@xviewer.js/core 1.0.0-alpha.41 → 1.0.0-alpha.43

package/dist/main.js

@@ -1067,15 +1067,17 @@ class aLoader {
                 const mat = object.material;
                 if (Array.isArray(mat)) mat.forEach((v)=>materials[v.name] = v);
                 else materials[mat.name] = mat;
-                keys.forEach((k)=>{
-                    let tex = mat[k];
-                    if (tex) {
-                        textures[tex.uuid] = tex;
-                    }
-                });
             }
-            object.children.forEach((v)=>queue.push(v));
+            queue.push(...object.children);
         }
+        Object.values(materials).forEach((mat)=>{
+            keys.forEach((k)=>{
+                let tex = mat[k];
+                if (tex) {
+                    textures[tex.uuid] = tex;
+                }
+            });
+        });
         node.userData.meshData = {
             meshes,
             materials,
@@ -1088,6 +1090,7 @@ class aLoader {
     }
 }
 aLoader._texKeys = [
+    "map",
     "alphaMap",
     "aoMap",
     "bumpMap",
@@ -1098,7 +1101,8 @@ aLoader._texKeys = [
     "metalnessMap",
     "normalMap",
     "roughnessMap",
-    "specularMap"
+    "specularMap",
+    "alphaMap"
 ];
 
 class aEXRLoader extends aLoader {
@@ -2753,14 +2757,14 @@ class FreelookVirtualCamera extends VirtualCamera {
         }
     }
     _calculateDistanceScale(scale) {
-        this._tempSmoothing = this.smoothing;
+        this._tempRotateSmoothing = this.rotateSmoothing;
         if (this.forbidZ) {
             scale = 1;
         }
         return scale;
     }
     _calculateRotatelDelta(out, loc0, loc1) {
-        this._tempSmoothing = this.smoothing;
+        this._tempRotateSmoothing = this.rotateSmoothing;
         const domElement = this.viewer.canvas;
         out.copy(loc1).sub(loc0).multiplyScalar(this.rotateSpeed * 2 * Math.PI / domElement.height);
         out.y = -out.y;
@@ -2773,7 +2777,7 @@ class FreelookVirtualCamera extends VirtualCamera {
         return out;
     }
     _calculatePanDelta(out, loc0, loc1) {
-        this._tempSmoothing = this.smoothing;
+        this._tempRotateSmoothing = this.rotateSmoothing;
         const domElement = this.viewer.canvas;
         out.copy(loc1).sub(loc0).multiplyScalar(this.panSpeed / domElement.height);
         if (this.forbidPanX) {
@@ -2808,17 +2812,24 @@ class FreelookVirtualCamera extends VirtualCamera {
         this._targetPhi = clamp(this._targetPhi, this.phiMin, this.phiMax);
         this._targetSpringLength = clamp(this._targetSpringLength, this.distanceMin, this.distanceMax);
     }
-    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 }) {
+    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, rotateSmoothing = this.rotateSmoothing }) {
         this._targetFov = fov;
         this._tempSmoothing = smoothing;
+        this._tempRotateSmoothing = rotateSmoothing;
         this._targetLookAt.copy(lookAt);
+        const t1 = theta % PI2;
+        const t0 = this._spherical.theta = this._spherical.theta % PI2;
+        const thetas = [
+            t1,
+            t1 - PI2,
+            t1 + PI2
+        ];
+        const diffs = thetas.map((v)=>abs(t0 - v));
+        const min = Math.min(...diffs);
+        this._targetTheta = thetas[diffs.findIndex((v)=>v === min)];
         this._targetSpringLength = springLength;
         this._targetPhi = phi;
-        this._targetTheta = theta;
         this._calculateTargetSpringArm();
-        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;
         if (duration > 0) {
             this.locked = true;
             this.enabled = false;
@@ -2843,8 +2854,9 @@ class FreelookVirtualCamera extends VirtualCamera {
     }
     update(dt) {
         const smoothing = this._tempSmoothing;
-        this._spherical.theta = FInterpTo(this._spherical.theta, this._targetTheta, dt, smoothing);
-        this._spherical.phi = FInterpTo(this._spherical.phi, this._targetPhi, dt, smoothing);
+        const rotateSmoothing = this._tempRotateSmoothing;
+        this._spherical.theta = FInterpTo(this._spherical.theta, this._targetTheta, dt, rotateSmoothing);
+        this._spherical.phi = FInterpTo(this._spherical.phi, this._targetPhi, dt, rotateSmoothing);
         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);
@@ -2859,7 +2871,8 @@ class FreelookVirtualCamera extends VirtualCamera {
         this._preLoc1 = new three.Vector2();
         this._spherical = new three.Spherical(1, Math.PI / 2);
         this._lookAt = new three.Vector3();
-        this._tempSmoothing = 0;
+        this._tempSmoothing = 6;
+        this._tempRotateSmoothing = 6;
         this._targetTheta = 0;
         this._targetPhi = 0;
         this._targetSpringLength = 1;
@@ -2874,6 +2887,7 @@ class FreelookVirtualCamera extends VirtualCamera {
         this.panSpeed = 1;
         this.rotateSpeed = 1;
         this.smoothing = 5;
+        this.rotateSmoothing = 5;
         this.phiMin = ESP;
         this.phiMax = Math.PI - ESP;
         this.thetaMin = -Infinity;
@@ -2941,6 +2955,12 @@ __decorate([
         step: 0.01
     })
 ], FreelookVirtualCamera.prototype, "smoothing", void 0);
+__decorate([
+    property({
+        dir: "set",
+        step: 0.01
+    })
+], FreelookVirtualCamera.prototype, "rotateSmoothing", void 0);
 __decorate([
     property({
         dir: "set",
@@ -4214,12 +4234,12 @@ function parepareWebGL(canvas, props) {
     return null;
 }
 
-var Orientation;
+exports.Orientation = void 0;
 (function(Orientation) {
     Orientation[Orientation["AUTO"] = 0] = "AUTO";
     Orientation[Orientation["LANDSCAPE"] = 1] = "LANDSCAPE";
     Orientation[Orientation["PORTRAIT"] = 2] = "PORTRAIT";
-})(Orientation || (Orientation = {}));
+})(exports.Orientation || (exports.Orientation = {}));
 
 class ResourceManager {
     static extension(path) {
@@ -4644,7 +4664,7 @@ class Viewer extends EventEmitter {
         return this;
     }
     resize(width = window.innerWidth, height = window.innerHeight) {
-        this._rootRotated = this._orientation === Orientation.LANDSCAPE ? width < height : this._orientation === Orientation.PORTRAIT ? width > height : false;
+        this._rootRotated = this._orientation === exports.Orientation.LANDSCAPE ? width < height : this._orientation === exports.Orientation.PORTRAIT ? width > height : false;
         if (this._rootRotated) {
             let tmp = width;
             width = height;
@@ -4888,7 +4908,7 @@ class Viewer extends EventEmitter {
         near: 0.1,
         far: 1000,
         position: new three.Vector3(0, 0, 4)
-    }, targetFrameRate = -1, colorSpace = three.SRGBColorSpace, toneMapping = three.LinearToneMapping, toneMappingExposure = 1, maxDPR = 1.5, path = "", resourcePath = "", dracoPath = "https://www.gstatic.com/draco/v1/decoders/", loader = {}, tasker = {}, ...webglOpts } = {}){
+    }, targetFrameRate = -1, 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._dpr = 1;
         this._width = 1;
@@ -4898,7 +4918,7 @@ class Viewer extends EventEmitter {
             height: 1,
             factor: 1
         };
-        this._orientation = Orientation.AUTO;
+        this._orientation = exports.Orientation.AUTO;
         this._running = false;
         this._rootRotated = false;
         this._time = 0;
@@ -4916,6 +4936,7 @@ class Viewer extends EventEmitter {
         this._RENDER_TARGET_FLOAT_TYPE = webgl.RENDER_TARGET_FLOAT_TYPE;
         this._DATA_FLOAT_TYPE = webgl.DATA_FLOAT_TYPE;
         this._dpr = Math.min(maxDPR, window.devicePixelRatio);
+        this._orientation = orientation;
         this._scene = new three.Scene();
         this._camera = applyProps(new three.PerspectiveCamera(), camera);
         this._renderer = new three.WebGLRenderer({