vis-core 0.22.13 → 0.22.15

package/dist/index.module.js

@@ -90,7 +90,7 @@ const publicKeyPEM = "LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUlJQklqQU5CZ2txaGtpRz
     ).toString(CryptoJS.enc.Utf8), qe = JSON.parse($e), st = Date.now();
     return !qe.s || qe.s > st ? (this.token = void 0, "") : qe.e && qe.e < st ? (this.token = void 0, "") : (qe.isValid = Qe, qe);
   }
-}, version = "0.22.13";
+}, version = "0.22.15";
 /**
  * @license
  * Copyright 2010-2024 Three.js Authors
@@ -38024,7 +38024,7 @@ const V = {
   r.width = 256, r.height = 1;
   const T = r.getContext("2d"), de = T.createLinearGradient(0, 0, 256, 1);
   de.addColorStop(0, e), de.addColorStop(c, e), de.addColorStop(c, s), de.addColorStop(1, s), T.fillStyle = de, T.fillRect(0, 0, 256, 1);
-  const Xe = new Texture(r);
+  const Xe = new CanvasTexture(r);
   return Xe.wrapS = RepeatWrapping, Xe.wrapT = RepeatWrapping, Xe.needsUpdate = !0, Xe;
 }, createFlyPath = (c, e, s = 40) => {
   const r = c.angleTo(e);
@@ -38149,29 +38149,34 @@ class Arc extends A$1 {
     onComplete: de,
     onRepeat: Xe
   } = {}) {
-    this.line.material.userData.tween && (this.line.material.userData.tween.stop(), remove(this.line.material.userData.tween), this.line.material.userData.tween = null), this.line.material.uniforms.offset.value.x = 1, this.line.material.uniforms.offsetLoop.value = 0, this.line.animate({
+    this.line.material.userData.tween && (this.line.material.userData.tween.stop(), remove(this.line.material.userData.tween), this.line.material.userData.tween = null, this.line.material.uniforms.offset.value.x = 0), s && (this.line.material.uniforms.offset.value.x = 1, this.line.material.uniforms.offsetLoop.value = 0, this.line.animate({
       duration: s,
       repeat: T,
       delay: r,
       lineLoop: this.options.offsetLoop,
       onRepeat: Xe,
       onComplete: de
-    });
+    }));
   }
   update() {
     var s;
-    (s = this.helperMesh) != null && s.length && this.helperMesh.some((r, T) => {
-      if (r.position.distanceTo(this.helperMeshPosition[T]) > 0.01) {
-        this.helperMeshPosition[T].copy(r.position);
-        const Xe = new CubicBezierCurve3(
-          this.helperMeshPosition[0],
-          this.helperMeshPosition[1],
-          this.helperMeshPosition[2],
-          this.helperMeshPosition[3]
-        ).getPoints(1500);
-        return this.line.setGeometry(Xe, (Ke) => Ke * 1), !0;
-      }
-    });
+    if ((s = this.helperMesh) != null && s.length && this.helperMesh.find(
+      (T, de) => T.position.distanceTo(this.helperMeshPosition[de]) > 0.01
+    )) {
+      this.helperMesh.forEach((Xe, Ke) => {
+        this.helperMeshPosition[Ke].copy(Xe.position);
+      });
+      const de = new CubicBezierCurve3(
+        this.helperMeshPosition[0],
+        this.helperMeshPosition[1],
+        this.helperMeshPosition[2],
+        this.helperMeshPosition[3]
+      ).getPoints(1500);
+      this.line.setGeometry(
+        de,
+        this.line.object3d.geometry.widthCallback
+      );
+    }
   }
   setMList() {
     var r;
@@ -50482,20 +50487,22 @@ class Base extends Event {
     const r = {
       bloom: !1
     };
-    s.objectType !== "BaseObject#Light" && (prefabType.includes(s.objectType.split("#")[1]) && (r.prefab = s.prefab), s.object3d.userData = new Proxy(r, {
-      set: (T, de, Xe) => {
-        if (de === "bloom")
+    if (s.objectType === "BaseObject#Light")
+      return;
+    s.objectType === "BaseObject#Arc" && (r.animationDuration = 2e3), prefabType.includes(s.objectType.split("#")[1]) && (r.prefab = s.prefab), s.object3d.userData = new Proxy(r, {
+      set: (de, Xe, Ke) => {
+        if (Xe === "bloom")
           this.pencil.composerController.toggleBloomSelection(
             s,
-            Xe
+            Ke
           );
-        else if (de === "prefab") {
-          const Ke = this.pencil.getPlugin("draw");
-          s.prefab = Xe, Xe ? Ke.prefabGroup.attach(s) : Ke.group.attach(s);
-        }
-        return Reflect.set(T, de, Xe);
+        else if (Xe === "prefab") {
+          const Je = this.pencil.getPlugin("draw");
+          s.prefab = Ke, Ke ? Je.prefabGroup.attach(s) : Je.group.attach(s);
+        } else Xe === "animationDuration" && s.animateIn({ duration: Ke });
+        return Reflect.set(de, Xe, Ke);
       }
-    }));
+    });
   }
   initPencilPlugin() {
     this.mList = new MaterialList(), this.loader = new Kl(ai({
@@ -129769,14 +129776,11 @@ const objs$4 = Ki(ai({}, objs$5), {
   }, c.initMaterial = function() {
     return ei(this, null, function* () {
       const e = this.loader, s = (() => {
-        const r = new MeshStandardMaterial({
+        const T = new MeshStandardMaterial({
           name: "顶面",
           map: e.getAsset("/image/map/hp.webp"),
           normalMap: e.getAsset("/image/map/shuchu2.webp")
-        }), T = this.options.drillDownTopMatTwo ? new MeshBasicMaterial({
-          name: "二级顶面",
-          color: new Color$1("#0d2425")
-        }) : null, de = new MeshBasicMaterial({
+        }), de = new MeshBasicMaterial({
           name: "侧面",
           map: e.getAsset("/image/map/jianbian.webp")
         }), Xe = new it$1({
@@ -129794,14 +129798,41 @@ const objs$4 = Ki(ai({}, objs$5), {
           depthWrite: !1
         });
         return {
-          topMat: r,
-          topMatTwo: T,
+          topMat: T,
           sideMat: de,
           lineMat: Xe,
           extrudeLineMat: Ke
         };
-      })();
-      this.mList.setMaterialObj("plane", s), this.mList.setShowMaterialList("area", ["plane#topMat", "plane#sideMat"], {
+      })(), r = this.options.drillDownTopMatTwo ? (() => {
+        const T = new MeshBasicMaterial({
+          name: "二级顶面",
+          color: new Color$1("#0d2425")
+        }), de = new MeshBasicMaterial({
+          name: "二级侧面",
+          color: new Color$1("#0d2425")
+        }), Xe = new it$1({
+          name: "二级线",
+          color: new Color$1("#73FEDD"),
+          sizeAttenuation: 0,
+          lineWidth: this.options.lineWidth,
+          //@ts-ignore
+          depthWrite: !1
+        }), Ke = new it$1({
+          name: "二级边线",
+          color: new Color$1("#00FFED"),
+          sizeAttenuation: 0,
+          lineWidth: this.options.extrudeLineWidth,
+          //@ts-ignore
+          depthWrite: !1
+        });
+        return {
+          topMat: T,
+          sideMat: de,
+          lineMat: Xe,
+          extrudeLineMat: Ke
+        };
+      })() : null;
+      this.mList.setMaterialObj("plane", s), r && this.mList.setMaterialObj("secondPlane", r), this.mList.setShowMaterialList("area", ["plane#topMat", "plane#sideMat"], {
         name: "板块"
       }), this.mList.setShowMaterialList("line", "plane#lineMat", {
         name: "板块线"
@@ -129816,13 +129847,10 @@ const objs$4 = Ki(ai({}, objs$5), {
   }, c.initMaterial = function() {
     return ei(this, null, function* () {
       const e = this.loader, s = (() => {
-        const r = new MeshBasicMaterial({
+        const T = new MeshBasicMaterial({
           name: "顶面",
           color: new Color$1("#0d2425")
-        }), T = this.options.drillDownTopMatTwo ? new MeshBasicMaterial({
-          name: "二级顶面",
-          color: new Color$1("#0d2425")
-        }) : null, de = new MeshBasicMaterial({
+        }), de = new MeshBasicMaterial({
           name: "侧面",
           map: e.getAsset("/image/map/jianbian.webp")
         }), Xe = new it$1({
@@ -129839,14 +129867,41 @@ const objs$4 = Ki(ai({}, objs$5), {
           depthWrite: !1
         });
         return {
-          topMatTwo: T,
-          topMat: r,
+          topMat: T,
           sideMat: de,
           lineMat: Xe,
           extrudeLineMat: Ke
         };
-      })();
-      this.mList.setMaterialObj("plane", s), this.mList.setShowMaterialList("area", ["plane#topMat", "plane#sideMat"], {
+      })(), r = this.options.drillDownTopMatTwo ? (() => {
+        const T = new MeshBasicMaterial({
+          name: "二级顶面",
+          color: new Color$1("#0d2425")
+        }), de = new MeshBasicMaterial({
+          name: "二级侧面",
+          color: new Color$1("#0d2425")
+        }), Xe = new it$1({
+          name: "二级线",
+          color: new Color$1("#73FEDD"),
+          sizeAttenuation: 0,
+          lineWidth: this.options.lineWidth,
+          //@ts-ignore
+          depthWrite: !1
+        }), Ke = new it$1({
+          name: "二级边线",
+          color: new Color$1("#00FFED"),
+          sizeAttenuation: 0,
+          lineWidth: this.options.extrudeLineWidth,
+          //@ts-ignore
+          depthWrite: !1
+        });
+        return {
+          topMat: T,
+          sideMat: de,
+          lineMat: Xe,
+          extrudeLineMat: Ke
+        };
+      })() : null;
+      this.mList.setMaterialObj("plane", s), r && this.mList.setMaterialObj("secondPlane", r), this.mList.setShowMaterialList("area", ["plane#topMat", "plane#sideMat"], {
         name: "板块"
       }), this.mList.setShowMaterialList("line", "plane#lineMat", {
         name: "板块线"
@@ -130171,6 +130226,13 @@ const objs$4 = Ki(ai({}, objs$5), {
       }
     });
   }
+  consoleMousePostion() {
+    this.addListener(this.container, "click", (s) => {
+      var de, Xe;
+      const r = this.unproject(s, this.mapObj.z + this.mapObj.depth), T = (Xe = (de = this.projection).invert) == null ? void 0 : Xe.call(de, [r.x, -r.y]);
+      console.log("consoleMousePostion.postion", r), console.log("consoleMousePostion.lnglat", T);
+    });
+  }
   setAreaMixColor(s, r) {
     this.setAreaColorByProperty("adcode", s, r, !0);
   }
@@ -130659,9 +130721,7 @@ const objs$4 = Ki(ai({}, objs$5), {
       depth: de,
       adcode: Xe
     }) {
-      const Je = this.mapHistory.length === 0, Qe = this.mList.getMaterialObj("plane"), _e = ai({}, Qe);
-      !Je && _e.topMatTwo && (_e.topMat = _e.topMatTwo);
-      const $e = yield this.drawController.draw(
+      const Je = this.mapHistory.length !== 0 && this.options.drillDownTopMatTwo, Qe = Je ? "secondPlane" : "plane", _e = this.mList.getMaterialObj(Qe), $e = ai({}, _e), qe = yield this.drawController.draw(
         "PlaneMap",
         {
           geojson: s,
@@ -130673,7 +130733,7 @@ const objs$4 = Ki(ai({}, objs$5), {
             rotate: this.options.worldPacificCentre ? [-160, 0] : void 0,
             projectionType: this.options.projectionType
           },
-          materialOptions: _e,
+          materialOptions: $e,
           bbox: T,
           topSegments: this.options.topSegments,
           lineOffset: this.options.lineOffset,
@@ -130681,19 +130741,19 @@ const objs$4 = Ki(ai({}, objs$5), {
         },
         this.group
       );
-      return $e.extrudelineArr && $e.extrudelineArr.forEach((qe) => {
-        qe.object3d.name = "板块边线", this.mList.setObject3d(qe.object3d, "extrudeLine", {
-          baseObject: qe,
+      return Je || (qe.extrudelineArr && qe.extrudelineArr.forEach((st) => {
+        st.object3d.name = "板块边线", this.mList.setObject3d(st.object3d, "extrudeLine", {
+          baseObject: st,
           replace: !0
-        }), this.initBaseObjectUserData(qe);
+        }), this.initBaseObjectUserData(st);
       }), this.mList.setObject3d(
-        $e.object3d,
+        qe.object3d,
         Xe === 1e5 ? "chinaGroup" : "planeMapGroup",
         {
-          baseObject: $e,
+          baseObject: qe,
           replace: !0
         }
-      ), $e;
+      )), qe;
     });
   }
   handleBack() {
@@ -133162,13 +133222,6 @@ const R1 = class R1 extends Map$1 {
       }), adcodeMap[s].parent === 35e4 && this.options.curvatureResolution && city350000(Je), Je.pencilConfig = this.pencilConfig, Je.pencil = this.pencil, Je.roomEnvMap = this.roomEnvMap, Je.mList = this.mList, Je.loader = this.loader, Je.editor = this.editor, Je.drawController = this.drawController, yield Je.init(), Je.group.hide(), this.cityVisObj[s].city = Je, this.cityVisObj[s].state.resolve(), this.emit("initCityVis", s);
     });
   }
-  consoleMousePostion() {
-    this.addListener(this.container, "click", (s) => {
-      var de, Xe;
-      const r = this.unproject(s, this.mapObj.z + this.mapObj.depth), T = (Xe = (de = this.projection).invert) == null ? void 0 : Xe.call(de, [r.x, -r.y]);
-      console.log("consoleMousePostion.postion", r), console.log("consoleMousePostion.lnglat", T);
-    });
-  }
   initCityOnMap(s) {
     return ei(this, null, function* () {
       if (this.getAdcodeShowLevel(s) !== "city") {

package/dist/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "0.22.13";
+declare const _default: "0.22.15";
 export default _default;

package/dist/vis/all/objects/Arc/utils.d.ts

@@ -1,6 +1,6 @@
 import * as THREE from 'three';
 import Pencil from 'gl-draw';
-export declare const getLineTexture: (length: number, lightColor?: string, lineColor?: string) => THREE.Texture;
+export declare const getLineTexture: (length: number, lightColor?: string, lineColor?: string) => THREE.CanvasTexture;
 export declare const createFlyPath: (v0: THREE.Vector3, v3: THREE.Vector3, h?: number) => THREE.CubicBezierCurve3;
 export declare const createFlyPath2: (v0: THREE.Vector3, v3: THREE.Vector3, h?: number) => THREE.CubicBezierCurve3;
 export declare const pixel2unit: (pencil: Pencil, pixel: number) => number;

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

@@ -3,6 +3,7 @@ import MaterialList from "../all/MaterialList";
 import { Wk, Loader, Draw as DrawController } from 'gl-draw/dist/plugins';
 import type { PickFunctionsItem } from 'gl-draw/dist/plugins/Draw';
 import { Node } from 'gl-draw/dist/objects';
+import Arc from "../all/objects/Arc";
 import { RoomEnvironment } from 'three/examples/jsm/environments/RoomEnvironment';
 import * as THREE from 'three';
 import Event from "./event";
@@ -58,7 +59,7 @@ export default class Base extends Event {
         Group: typeof import("gl-draw/dist/objects").Group;
         Light: typeof import("../all/objects/Light").default;
         Point: typeof import("../all/objects/Point").default;
-        Arc: typeof import("../all/objects/Arc").default;
+        Arc: typeof Arc;
         Model: typeof import("../all/objects/Model").default;
     }>;
     mList: MaterialList;
@@ -75,7 +76,7 @@ export default class Base extends Event {
     setOptions(options: Record<string, any>): void;
     get fromJSON(): (jsonOrUrl: Record<string, any> | string, hooks?: import("../../editor").Hooks) => Promise<Record<string, any>>;
     get baseObjectByUuid(): {
-        (uuid: `arc${string}`, flag?: boolean): import("../all/objects/Arc").default;
+        (uuid: `arc${string}`, flag?: boolean): Arc;
         (uuid: `sprite${string}`, flag?: boolean): import("../all/objects/Sprite").default;
         (uuid: string, flag?: boolean): BaseObject;
     };

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

@@ -130,6 +130,7 @@ export default class extends Base {
     initVis(adcode: number): Promise<void>;
     loaderAddBg(): void;
     initMaterialBg(): Promise<void>;
+    consoleMousePostion(): void;
     setAreaMixColor(adcode: number, color: string): void;
     setAreaColorByProperty(key: string, value: any, color: string, mix?: boolean): void;
     setAreaEmissiveByProperty(key: string, value: any, color: string, intensity?: number): void;

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

@@ -44,7 +44,6 @@ export default class extends Map {
         clip?: boolean;
         grey?: boolean;
     }): Promise<void>;
-    consoleMousePostion(): void;
     initCityOnMap(adcode: number): Promise<void>;
     showCity(adcode: number, lnglat?: [number, number]): Promise<void>;
     showCity(option: showCityOption): Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vis-core",
-  "version": "0.22.13",
+  "version": "0.22.15",
   "scripts": {
     "start": "npm run version && PORT=5173 bundler-dev",
     "build:site": "npm run version && bundler",