vis-core 0.21.28 → 0.21.30

package/dist/index.module.js

@@ -48310,7 +48310,7 @@ function createAreaLightMaterial(ct) {
   const e = new MeshBasicMaterial();
   return e.color.setScalar(ct), e;
 }
-const version = "0.21.28";
+const version = "0.21.30";
 class Event {
   constructor() {
     J0(this, "event", new EventEmitter());
@@ -49583,7 +49583,7 @@ class Base extends Event {
     J0(this, "visName");
     J0(this, "editor");
     J0(this, "initSettingsObj");
-    J0(this, "mouseButtonsActiveStore");
+    J0(this, "mouseButtonsActiveStore", null);
     if (this.container = c.container, this.options = bi({
       assetsPrefix: "",
       editor: !0
@@ -49739,31 +49739,31 @@ class Base extends Event {
     return (c = this.pencil) == null ? void 0 : c.controls.verticalDragToForward;
   }
   initSettings() {
-    this.mouseButtonsActiveStore = {
+    const c = {
       mouseLeft: this.leftTruck ? Ts.TRUCK : Ts.ROTATE,
       mouseRight: this.leftTruck ? Ts.ROTATE : Ts.TRUCK,
-      mouseWheel: Ts.DOLLY,
-      viewportPadding: [0, 0, 0, 0]
-    }, this.settings = new Proxy(
-      Ei(bi(bi({}, this.initSettingsObj), this.mouseButtonsActiveStore), {
-        mouseNone: !1
+      mouseWheel: Ts.DOLLY
+    };
+    this.settings = new Proxy(
+      Ei(bi(bi({}, this.initSettingsObj), c), {
+        mouseNone: !1,
+        viewportPadding: [0, 0, 0, 0]
       }),
       {
-        set: (c, st, Zt) => {
-          const { pencil: Wt } = this;
-          if (!(st in c) && !(st.replace(/(:::.+)\..*$/, "$1") in c))
-            return Reflect.set({}, st, Zt);
-          st === "mouseWheel" ? typeof Zt == "boolean" && (Zt = Zt ? Wt.controls.mouseButtons.wheel : Ts.NONE) : st === "mouseLeft" ? typeof Zt == "boolean" && (Zt = Zt ? Wt.controls.mouseButtons.left : Ts.NONE) : st === "mouseRight" && typeof Zt == "boolean" && (Zt = Zt ? Wt.controls.mouseButtons.right : Ts.NONE);
-          const Yt = st.includes(":::");
+        set: (st, Zt, Wt) => {
+          if (!(Zt in st) && !(Zt.replace(/(:::.+)\..*$/, "$1") in st))
+            return Reflect.set({}, Zt, Wt);
+          Zt === "mouseWheel" ? typeof Wt == "boolean" && (Wt = Wt ? c.mouseWheel : Ts.NONE) : Zt === "mouseLeft" ? typeof Wt == "boolean" && (Wt = Wt ? c.mouseLeft : Ts.NONE) : Zt === "mouseRight" && typeof Wt == "boolean" && (Wt = Wt ? c.mouseRight : Ts.NONE);
+          const Yt = Zt.includes(":::");
           return Reflect.set(
-            c,
-            Yt ? st.replace(/(:::.+)\..*$/, "$1") : st,
-            this.handleSetting(st, Zt)
+            st,
+            Yt ? Zt.replace(/(:::.+)\..*$/, "$1") : Zt,
+            this.handleSetting(Zt, Wt)
           );
         },
-        get: (c, st) => {
-          const Wt = st.includes(":::") ? st.replace(/(:::.+)\..*$/, "$1") : st, Yt = Reflect.get(c, Wt);
-          return Yt instanceof Promise ? Yt.then((vt) => (Reflect.set(c, Wt, vt), vt)) : Yt;
+        get: (st, Zt) => {
+          const Yt = Zt.includes(":::") ? Zt.replace(/(:::.+)\..*$/, "$1") : Zt, vt = Reflect.get(st, Yt);
+          return vt instanceof Promise ? vt.then((Tt) => (Reflect.set(st, Yt, Tt), Tt)) : vt;
         }
       }
     );
@@ -49772,22 +49772,13 @@ class Base extends Event {
     return ni(this, null, function* () {
       const { pencil: Zt } = this;
       if (c === "mouseWheel" || c === "mouseLeft" || c === "mouseRight") {
-        if (yield this.settings.mouseNone, !this.settings.mouseNone) {
-          const Wt = c.replace("mouse", "").toLowerCase();
-          st ? (this.mouseButtonsActiveStore[c] = st, Zt.controls.mouseButtons[Wt] = st) : this.playing && (this.mouseButtonsActiveStore[c] = st, Zt.controls.mouseButtons[Wt] = Ts.NONE);
-        }
-      } else c === "mouseNone" ? st ? (Zt.controls.mouseButtons.left = Ts.NONE, Zt.controls.mouseButtons.right = Ts.NONE, Zt.controls.mouseButtons.wheel = Ts.NONE) : setTimeout(() => {
-        this.handleSetting(
-          "mouseLeft",
-          this.mouseButtonsActiveStore.mouseLeft
-        ), this.handleSetting(
-          "mouseRight",
-          this.mouseButtonsActiveStore.mouseRight
-        ), this.handleSetting(
-          "mouseWheel",
-          this.mouseButtonsActiveStore.mouseWheel
-        );
-      }) : c === "viewportPadding" && Zt.setViewPadding(...st);
+        const Wt = c.replace("mouse", "").toLowerCase();
+        (st || this.playing) && (Zt.controls.mouseButtons[Wt] = st);
+      } else c === "mouseNone" ? st ? (this.mouseButtonsActiveStore = {
+        mouseLeft: Zt.controls.mouseButtons.left,
+        mouseRight: Zt.controls.mouseButtons.right,
+        mouseWheel: Zt.controls.mouseButtons.wheel
+      }, Zt.controls.mouseButtons.left = Ts.NONE, Zt.controls.mouseButtons.right = Ts.NONE, Zt.controls.mouseButtons.wheel = Ts.NONE) : this.mouseButtonsActiveStore && (Zt.controls.mouseButtons.left = this.mouseButtonsActiveStore.mouseLeft, Zt.controls.mouseButtons.right = this.mouseButtonsActiveStore.mouseRight, Zt.controls.mouseButtons.wheel = this.mouseButtonsActiveStore.mouseWheel) : c === "viewportPadding" && Zt.setViewPadding(...st);
       return st;
     });
   }
@@ -49840,6 +49831,32 @@ class Base extends Event {
       this.pencil.controls.smoothTime = Wt / 1e3, this.pencil.controls.restThreshold = 0, yield this.pencil.controls.truck(c, st, Zt), this.pencil.controls.restThreshold = 25e-4, this.pencil.controls.smoothTime = 250 / 1e3;
     });
   }
+  absoluteAngle(c, st) {
+    const Zt = Math.PI * 2, Wt = c - st;
+    return MathUtils.euclideanModulo(Wt + Math.PI, Zt) - Math.PI;
+  }
+  lookAtTarget(c, st = !1, Zt = 250) {
+    return ni(this, null, function* () {
+      this.pencil.controls.smoothTime = Zt / 1e3;
+      const Wt = this.pencil.controls.azimuthAngle, Yt = this.pencil.controls.polarAngle, vt = this.pencil.controls.distance, Tt = this.pencil.cameraTarget.clone(), Jt = c.azimuthAngle || Wt, $t = c.polarAngle || Yt, de = c.distance || vt, Xe = c.target || Tt, Ke = Wt !== Jt || Yt !== $t, Qe = vt !== de, qe = !Xe.equals(Tt);
+      yield Promise.all(
+        [
+          qe && this.pencil.controls.setTarget(
+            Xe.x,
+            Xe.y,
+            Xe.z,
+            st
+          ),
+          Qe && this.pencil.controls.dollyTo(de, st),
+          Ke && this.pencil.controls.rotate(
+            this.absoluteAngle(Jt, Wt),
+            this.absoluteAngle($t, Yt),
+            st
+          )
+        ].filter(Boolean)
+      ), this.pencil.controls.smoothTime = 250 / 1e3;
+    });
+  }
   resetCamera(c = !1, st = 250) {
     return ni(this, null, function* () {
       this.pencil.controls.smoothTime = st / 1e3, yield this.pencil.controls.reset(c), this.pencil.controls.smoothTime = 250 / 1e3;
@@ -53661,33 +53678,17 @@ class City$1 extends Base {
         }
         const Wt = Zt.object3d.getWorldPosition(new Vector3());
         yield this.lookAtTarget(
-          Wt,
-          6.984429017840711 * this.multiplyScalar,
-          0.9963693538268685
+          {
+            target: Wt,
+            distance: 6.984429017840711 * this.multiplyScalar,
+            polarAngle: 0.9963693538268685,
+            azimuthAngle: 0
+          },
+          !0
         );
       }
     });
   }
-  absoluteAngle(c, st) {
-    const Zt = Math.PI * 2, Wt = c - st;
-    return MathUtils.euclideanModulo(Wt + Math.PI, Zt) - Math.PI;
-  }
-  lookAtTarget(c, st, Zt, Wt = 0) {
-    return ni(this, null, function* () {
-      const Yt = this.pencil.controls.azimuthAngle, vt = this.pencil.controls.polarAngle, Tt = Yt !== Wt || vt !== Zt;
-      yield Promise.all(
-        [
-          this.pencil.controls.setTarget(c.x, c.y, c.z, !0),
-          this.pencil.controls.dollyTo(st, !0),
-          Tt && this.pencil.controls.rotate(
-            this.absoluteAngle(Wt, Yt),
-            this.absoluteAngle(Zt, vt),
-            !0
-          )
-        ].filter(Boolean)
-      );
-    });
-  }
   drawBuilding() {
     return ni(this, arguments, function* (c = {}) {
       var Wt;
@@ -53975,10 +53976,13 @@ const xn = class xn extends Map$1 {
             this.mapObj.z + this.mapObj.depth
           );
           this.emit("beforeDrillDown", "city"), yield this.cityVis.lookAtTarget(
-            Xe,
-            vt,
-            Tt,
-            Jt
+            {
+              target: Xe,
+              distance: vt,
+              polarAngle: Tt,
+              azimuthAngle: Jt
+            },
+            !0
           ), this.emit("afterDrillDown", "city");
         } else
           console.error("showCityOnMap lnglat or target is required");

package/dist/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "0.21.28";
+declare const _default: "0.21.30";
 export default _default;

package/dist/vis/base/index.d.ts

@@ -88,7 +88,7 @@ export default class Base extends Event {
     initSettingsObj?: Record<string, any>;
     set verticalDragToForward(value: boolean);
     get verticalDragToForward(): boolean;
-    mouseButtonsActiveStore: Record<string, any>;
+    mouseButtonsActiveStore: Record<string, any> | null;
     initSettings(): void;
     handleSetting(key: string, value: any): Promise<any>;
     show(): void;
@@ -104,6 +104,13 @@ export default class Base extends Event {
     }): Promise<Node>;
     lookAt(positionX: number, positionY: number, positionZ: number, targetX: number, targetY: number, targetZ: number, enableTransition?: boolean, smoothTime?: number): Promise<void>;
     truck(x: number, y: number, enableTransition?: boolean, smoothTime?: number): Promise<void>;
+    absoluteAngle(targetAngle: number, sourceAngle: number): number;
+    lookAtTarget(ops: {
+        target?: THREE.Vector3;
+        distance?: number;
+        polarAngle?: number;
+        azimuthAngle?: number;
+    }, enableTransition?: boolean, smoothTime?: number): Promise<void>;
     resetCamera(enableTransition?: boolean, smoothTime?: number): Promise<void>;
     unproject(e: MouseEvent, targetZ?: number): THREE.Vector3;
     getRoomEnvMap(): THREE.Texture;

package/dist/vis/city/index.d.ts

@@ -88,8 +88,6 @@ export default class extends Base {
     fitTo(obj: BaseObject, enableTransition?: boolean): Promise<void>;
     initVis(): Promise<void>;
     fitToTarget(adcode: number, lnglat?: [number, number]): Promise<void>;
-    absoluteAngle(targetAngle: number, sourceAngle: number): number;
-    lookAtTarget(pos: THREE.Vector3, distance: number, polarAngle: number, azimuthAngle?: number): Promise<void>;
     drawBuilding(options?: {
         json?: {
             features: any[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vis-core",
-  "version": "0.21.28",
+  "version": "0.21.30",
   "scripts": {
     "start": "npm run version && PORT=5173 bundler-dev",
     "build:site": "npm run version &&PUBLIC_EXCLUDE=public/city bundler",