vis-core 0.22.14 → 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.14";
+}, version = "0.22.15";
 /**
  * @license
  * Copyright 2010-2024 Three.js Authors
@@ -38160,21 +38160,23 @@ class Arc extends A$1 {
   }
   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,
-          this.line.object3d.geometry.widthCallback
-        ), !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;
@@ -129774,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({
@@ -129799,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: "板块线"
@@ -129821,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({
@@ -129844,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: "板块线"
@@ -130671,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,
@@ -130685,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,
@@ -130693,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() {

package/dist/version.d.ts

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

package/package.json

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