vis-core 0.12.28 → 0.12.30

package/dist/index.module.js

@@ -40885,14 +40885,6 @@ const BM = {
   Point: RM,
   Arc: CM
 }, EM = {
-  Box: SM,
-  Capsule: YM,
-  Circle: NM,
-  Cylinder: IM,
-  Dodecahedron: MM,
-  Icosahedron: FM,
-  Lathe: TM,
-  Octahedron: vM,
   Plane: wM,
   Ring: HM,
   Sphere: q2,
@@ -40900,7 +40892,15 @@ const BM = {
   Tetrahedron: kM,
   Torus: JM,
   TorusKnot: KM,
-  Tube: UM
+  Tube: UM,
+  Box: SM,
+  Capsule: YM,
+  Circle: NM,
+  Cylinder: IM,
+  Dodecahedron: MM,
+  Icosahedron: FM,
+  Lathe: TM,
+  Octahedron: vM
 }, cn = new Ca(Bt(Bt({}, BM), EM));
 cn.pluginName += "_all";
 class PM {
@@ -40910,6 +40910,7 @@ class PM {
     P(this, "materialList", /* @__PURE__ */ new Map());
     //兼容旧版本
     P(this, "showMaterialList", /* @__PURE__ */ new Map());
+    P(this, "showMaterialListTitle", /* @__PURE__ */ new Map());
     P(this, "objectList", /* @__PURE__ */ new Map());
   }
   install(t) {
@@ -40955,6 +40956,9 @@ class PM {
   setObject3d(t, e, i) {
     this.objectList.has(t) && console.warn(`ObjectList: ${t.uuid} already exists`), this.objectList.set(t, { name: e, meta: i }), this.emitObject3dChange();
   }
+  delObject3d(t) {
+    this.objectList.delete(t), this.emitObject3dChange();
+  }
   changeObject3dName(t, e) {
     this.objectList.forEach((i, s) => {
       var o;
@@ -40976,7 +40980,7 @@ class PM {
       t.material && Mh({
         material: t.material
       });
-    }), this.materialList.clear(), this.objectList.clear(), this.showMaterialList.clear(), this.pencil.event.emit("materialListChange");
+    }), this.materialList.clear(), this.objectList.clear(), this.showMaterialList.clear(), this.showMaterialListTitle.clear(), this.pencil.event.emit("materialListChange");
   }
 }
 class QM extends $s {
@@ -41029,7 +41033,7 @@ function Ql(n) {
   const t = new t0();
   return t.color.setScalar(n), t;
 }
-const GX = "0.12.28", a1 = !1;
+const GX = "0.12.30", a1 = !1;
 class pl {
   constructor(t, e = {}) {
     P(this, "container");
@@ -41285,7 +41289,7 @@ class pl {
   }
   dispose() {
     var t, e, i, s;
-    this.loader.clearLoadObj(), (t = this.pencil) == null || t.dispose(), (e = this.pmremGenerator) == null || e.dispose(), (i = this.re) == null || i.dispose(), this.removeAllListeners(), this.event.removeAllListeners(), (s = this.checkDprTimer) == null || s.stop();
+    this.loader.clearLoadObj(), (t = this.pencil) == null || t.dispose(), (e = this.pmremGenerator) == null || e.dispose(), (i = this.re) == null || i.dispose(), this.removeAllListeners(), this.event.removeAllListeners(), (s = this.checkDprTimer) == null || s.stop(), this.loadObjState && (this.loadObjState.length = 0);
   }
 }
 P(pl, "VisName", "base");
@@ -41737,6 +41741,18 @@ class yX extends X0 {
       }
     }
   }
+  render() {
+    const e = this.pencil.installPlugins.get("materialList");
+    e.setObject3d(this.object3d, "continents-group", {
+      baseObject: this,
+      remove: !1
+    }), this.mapArr.forEach((i) => {
+      e.setObject3d(i.object3d, "continents-" + i.userData.name, {
+        baseObject: i,
+        remove: !1
+      });
+    });
+  }
   dispose() {
     this.mapArr.forEach((e) => {
       e.dispose();
@@ -41747,7 +41763,7 @@ class VX extends X0 {
   create() {
     return Gt(this, null, function* () {
       const t = new Oi(100, 100, 1, 1), e = new h2();
-      e.opacity = 0.5, this.createMesh(t, e), this.object3d.receiveShadow = !0, this.position.z = 1e-3;
+      e.opacity = 0.5, this.createMesh(t, e), this.object3d.receiveShadow = !0, this.position.z = 1e-3, this.object3d.name = "阴影接受";
     });
   }
 }
@@ -41904,7 +41920,7 @@ const jM = {
         this.mList.showMaterialList.set(h + "area", [
           "parentPlane#topMat",
           "parentPlane#sideMat"
-        ]), this.mList.showMaterialList.set(h + "line", "parentPlane#lineMat");
+        ]), this.mList.showMaterialList.set(h + "line", "parentPlane#lineMat"), this.mList.showMaterialListTitle.set(h + "area", "背景板块"), this.mList.showMaterialListTitle.set(h + "line", "背景线");
         const r = yield this.drawController.draw("PlaneMap", {
           geojson: o,
           projection: {
@@ -41924,19 +41940,7 @@ const jM = {
         depth: this.options.continentsBgDepth,
         equirectangular: this.options.equirectangular,
         scale: this.pscale
-      }), this.continentsBg.position.z = 0.1, this.mList.setObject3d(this.continentsBg.object3d, "continents-group", {
-        baseObject: this.continentsBg,
-        remove: !1
-      }), this.continentsBg.mapArr.forEach((a) => {
-        this.mList.setObject3d(
-          a.object3d,
-          "continents-" + a.userData.name,
-          {
-            baseObject: a,
-            remove: !1
-          }
-        );
-      })), yield this.setAdcode({
+      }), this.continentsBg.position.z = 0.1), yield this.setAdcode({
         adcodes: [e],
         duration: 0
       });
@@ -42023,7 +42027,7 @@ const jM = {
         this.mList.setMaterialObj("continents", l), this.mList.showMaterialList.set("continentsArea", [
           "continents#topMat",
           "continents#sideMat"
-        ]), this.mList.showMaterialList.set("continentsLine", "continents#lineMat");
+        ]), this.mList.showMaterialList.set("continentsLine", "continents#lineMat"), this.mList.showMaterialListTitle.set("continentsArea", "大洲"), this.mList.showMaterialListTitle.set("continentsLine", "大洲线");
       }
       const s = (() => {
         const l = e === 1e5 ? new le({
@@ -42052,7 +42056,7 @@ const jM = {
           extrudeLineMat: c
         };
       })();
-      this.mList.setMaterialObj("plane", s), this.mList.showMaterialList.set("area", ["plane#topMat", "plane#sideMat"]), this.mList.showMaterialList.set("line", "plane#lineMat"), this.mList.showMaterialList.set("extrudeline", "plane#extrudeLineMat");
+      this.mList.setMaterialObj("plane", s), this.mList.showMaterialList.set("area", ["plane#topMat", "plane#sideMat"]), this.mList.showMaterialList.set("line", "plane#lineMat"), this.mList.showMaterialList.set("extrudeline", "plane#extrudeLineMat"), this.mList.showMaterialListTitle.set("area", "板块"), this.mList.showMaterialListTitle.set("line", "板块线"), this.mList.showMaterialListTitle.set("extrudeline", "板块边线");
     });
   }
   setAreaColor(e, i) {
@@ -42108,14 +42112,21 @@ const jM = {
         penumbra: 1,
         decay: 0
       }), i = e.object3d;
-      this.mList.changeObject3dName(i, "Shadow$1"), this.mList.changeObject3dName(i.target, "Shadow$1"), this.shadowMapLight = e, e.object3d.position.set(0.281, 32.487, 43.077), e.object3d.castShadow = !0, yield this.drawController.draw("PlaneShadow"), this.map && this.map.areaArr.forEach((s) => {
-        s.object3d.castShadow = !0;
+      this.mList.changeObject3dName(i, "Shadow$1"), this.mList.changeObject3dName(i.target, "Shadow$1"), this.shadowMapLight = e, e.object3d.position.set(0.281, 32.487, 43.077), e.object3d.castShadow = !0;
+      const s = yield this.drawController.draw("PlaneShadow");
+      this.mList.setObject3d(s.object3d, "PlaneShadow", {
+        baseObject: s,
+        remove: !1
+      }), this.map && this.map.areaArr.forEach((l) => {
+        l.object3d.castShadow = !0;
       });
     });
   }
   shadowMapDisabled() {
-    this.pencil.renderer.shadowMap.enabled = !1, this.shadowMapLight && (this.shadowMapLight.erase(), this.mList.removeObject3d(this.shadowMapLight.object3d)), this.drawController.erase("PlaneShadow"), this.map && this.map.areaArr.forEach((e) => {
-      e.object3d.castShadow = !1;
+    this.pencil.renderer.shadowMap.enabled = !1, this.shadowMapLight && (this.shadowMapLight.erase(), this.mList.removeObject3d(this.shadowMapLight.object3d));
+    const e = this.drawController.getObject("PlaneShadow");
+    e && (this.mList.removeObject3d(e.object3d), e.erase()), this.map && this.map.areaArr.forEach((i) => {
+      i.object3d.castShadow = !1;
     });
   }
   getDepth(e) {
@@ -42632,7 +42643,7 @@ const Go = class Go extends pl {
           lineMat: o
         };
       })();
-      i.setMaterialObj("plane", s), i.showMaterialList.set("area", ["plane#topMat", "plane#sideMat"]), i.showMaterialList.set("line", "plane#lineMat");
+      i.setMaterialObj("plane", s), i.showMaterialList.set("area", ["plane#topMat", "plane#sideMat"]), i.showMaterialList.set("line", "plane#lineMat"), this.mList.showMaterialListTitle.set("area", "板块"), this.mList.showMaterialListTitle.set("line", "板块线");
     });
   }
   eraseLabels() {
@@ -43691,11 +43702,11 @@ const nF = {
             const a = this.loader.getAsset(`/image/city/${l}-1.jpg`), o = this.loader.getAsset(`/image/city/${l}.webp`);
             return s[l] = [
               new t0({
-                name: "顶面",
+                name: "建筑顶面-板块内" + l + "高",
                 color: "#00a3bc"
               }),
               new le({
-                name: "侧面",
+                name: "建筑侧面-板块内" + l + "高",
                 map: a,
                 normalMap: o,
                 envMap: this.getRoomEnvMap()
@@ -43720,11 +43731,11 @@ const nF = {
             const a = this.loader.getAsset(`/image/city/${l}-1.jpg`), o = this.loader.getAsset(`/image/city/${l}.webp`);
             return s[l] = [
               new t0({
-                name: "顶面",
+                name: "建筑顶面-板块外" + l + "高",
                 color: "#133144"
               }),
               new le({
-                name: "侧面",
+                name: "建筑侧面-块外" + l + "高",
                 map: a,
                 normalMap: o,
                 envMap: this.getRoomEnvMap()
@@ -43747,10 +43758,14 @@ const nF = {
       }
       if (!this.mList.getMaterialObj("road")) {
         const e = new z0({
+          //@ts-ignore
+          name: "道路-板块内",
           color: "#ffc457",
           sizeAttenuation: 0,
           lineWidth: 40
         }), i = new z0({
+          //@ts-ignore
+          name: "道路-板块外",
           color: "#4a3f15",
           sizeAttenuation: 0,
           lineWidth: 40
@@ -43763,16 +43778,20 @@ const nF = {
       }
       if (this.mList.getMaterialObj("area") || (this.mList.setMaterialObj("area", {
         river: new t0({
+          name: "河流-板块内",
           color: "#115d8a"
         }),
         grassland: new t0({
+          name: "绿地-板块内",
           color: "#043141"
         })
       }), this.mList.setMaterialObj("area-grey", {
         river: new t0({
+          name: "河流-板块外",
           color: "#19354f"
         }),
         grassland: new t0({
+          name: "绿地-板块外",
           color: "#133341"
         })
       })), !this.mList.getMaterial("city-plane")) {
@@ -44737,15 +44756,17 @@ class yF extends Ao {
         if (this.options.adcode !== 1e5) {
           const l = (() => {
             const a = new le({
-              name: "顶面",
+              name: "父级板块顶面",
               color: "#031529",
               emissive: "#010f1f",
               envMap: e
             }), o = new t0({
-              name: "侧面",
+              name: "父级板块侧面",
               color: "#064d73",
               side: K0
             }), c = new z0({
+              //@ts-ignore
+              name: "父级板块线",
               color: new rt("#3f648c"),
               lineWidth: 4,
               sizeAttenuation: 0
@@ -44760,15 +44781,17 @@ class yF extends Ao {
         }
         const s = (() => {
           const l = new le({
-            name: "顶面",
+            name: "世界板块顶面",
             color: "#031529",
             emissive: "#010f1f",
             envMap: e
           }), a = new t0({
-            name: "侧面",
+            name: "世界板块侧面",
             color: "#064d73",
             side: K0
           }), o = new z0({
+            //@ts-ignore
+            name: "世界板块线",
             color: new rt("#3f648c"),
             lineWidth: 4,
             sizeAttenuation: 0
@@ -44784,13 +44807,15 @@ class yF extends Ao {
       if (this.options.continentsBg) {
         const s = (() => {
           const l = new le({
-            name: "顶面",
+            name: "大洲板块顶面",
             emissive: "#235278"
           }), a = new t0({
-            name: "侧面",
+            name: "大洲板块侧面",
             color: "#0c1528"
           }), o = new z0({
             // color: new THREE.Color('#0a88e5'),
+            //@ts-ignore
+            name: "大洲板块线",
             color: new rt("#1488e0"),
             sizeAttenuation: 0,
             lineWidth: this.options.lineWidth
@@ -44805,25 +44830,37 @@ class yF extends Ao {
       }
       const i = (() => {
         const s = new t0({
-          name: "顶面",
+          name: "板块顶面",
           color: new rt("#064773")
         }), l = new t0({
-          name: "侧面",
+          name: "板块侧面",
           color: new rt("#064d73"),
           side: K0
         }), a = new z0({
+          //@ts-ignore
+          name: "板块线",
           color: new rt("#02BAF7"),
           lineWidth: 3,
           sizeAttenuation: 0
         }), o = new z0({
+          //@ts-ignore
+          name: "板块边框线",
           color: new rt("#02BAF7"),
           lineWidth: 3,
           sizeAttenuation: 0
-        }), c = s.clone(), d = l.clone(), h = new z0({
+        }), c = s.clone();
+        c.name = "板块下钻背景顶面";
+        const d = l.clone();
+        d.name = "板块下钻背景侧面";
+        const h = new z0({
+          //@ts-ignore
+          name: "板块下钻背景线",
           color: new rt("#3773b0"),
           lineWidth: 2,
           sizeAttenuation: 0
         }), r = new z0({
+          //@ts-ignore
+          name: "板块下钻背景边框线",
           color: new rt("#3773b0"),
           lineWidth: 4,
           sizeAttenuation: 0
@@ -44896,19 +44933,7 @@ class yF extends Ao {
           scale: this.pscale
         },
         this.group
-      ), this.continentsBg.position.z = 0.1, this.mList.setObject3d(this.continentsBg.object3d, "continents-group", {
-        baseObject: this.continentsBg,
-        remove: !1
-      }), this.continentsBg.mapArr.forEach((a) => {
-        this.mList.setObject3d(
-          a.object3d,
-          "continents-" + a.userData.name,
-          {
-            baseObject: a,
-            remove: !1
-          }
-        );
-      })), yield this.setAdcode({
+      ), this.continentsBg.position.z = 0.1), yield this.setAdcode({
         adcodes: [e],
         duration: 0
       }), this.options.bottomPlane) {
@@ -45198,12 +45223,15 @@ const VF = (n) => {
     return Gt(this, null, function* () {
       const t = n.loader, e = (() => {
         const i = new t0({
+          name: "板块顶面",
           color: "#094253"
         }), s = new t0({
-          name: "侧面",
+          name: "板块侧面",
           map: t.getAsset("/image/map2/side.png"),
           side: K0
         }), l = new z0({
+          // @ts-ignore
+          name: "板块边框",
           color: new rt("#02f7eb"),
           lineWidth: 6,
           sizeAttenuation: 0,
@@ -45808,11 +45836,11 @@ class vF extends ke {
   }
   execute() {
     const t = this.properties ? this.object[this.properties] : this.object;
-    t && (t[this.attributeName] = this.newValue, this.editor.emit("objectChanged", this.object));
+    t && (t[this.attributeName] = this.newValue, this.editor.emit("objectChanged", this.object), this.attributeName === "name" && this.editor.pencil.event.emit("object3dListChange"));
   }
   undo() {
     const t = this.properties ? this.object[this.properties] : this.object;
-    t[this.attributeName] = this.oldValue, this.editor.emit("objectChanged", this.object);
+    t[this.attributeName] = this.oldValue, this.editor.emit("objectChanged", this.object), this.attributeName === "name" && this.editor.pencil.event.emit("object3dListChange");
   }
   update(t) {
     this.newValue = t.newValue;
@@ -46597,8 +46625,12 @@ class gT {
   changeSelectOption() {
     const t = this.viewport.vis, { pencil: e, mList: i } = t, s = i == null ? void 0 : i.showMaterialList.size, l = (s ? [...i.showMaterialList.keys()] : [...i.materialList.keys()]).map((c) => {
       const d = s ? i.getShowMaterial(c) : i.getMaterial(c), h = new yt(this.fixBufferGeometry, d);
-      return h.userData.fixBufferGeometry = !0, {
-        uuid: c.replace(c[0], c[0].toLowerCase()),
+      h.userData.fixBufferGeometry = !0;
+      const r = c.replace(c[0], c[0].toLowerCase());
+      let u;
+      return s && i.showMaterialListTitle.has(c) ? u = i.showMaterialListTitle.get(c) : !s && (d != null && d.name) && (u = d == null ? void 0 : d.name), {
+        uuid: r,
+        name: u,
         object: h
       };
     }), a = [...i.objectList.keys()].map(
@@ -46607,14 +46639,15 @@ class gT {
         let r = !1;
         return h != null && h.baseObject && h.remove !== !1 && (r = !0), We(Bt({
           uuid: d.replace(d[0], d[0].toLowerCase()),
-          object: c
+          object: c,
+          name: c.name
         }, h), {
           remove: r
         });
       }
     ), o = [...l, ...a];
     if (o.unshift({
-      name: "camera",
+      name: "相机",
       object: e.camera,
       uuid: "camera"
     }), !this.jsonVersion) {

package/dist/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "0.12.28";
+declare const _default: "0.12.30";
 export default _default;

package/dist/vis/all/MaterialList.d.ts

@@ -7,6 +7,7 @@ export default class MaterialList {
         material: THREE.Material;
     }>;
     showMaterialList: Map<string, string | string[]>;
+    showMaterialListTitle: Map<string, string>;
     objectList: Map<THREE.Object3D<THREE.Object3DEventMap>, {
         name: string;
         meta?: any;
@@ -19,6 +20,7 @@ export default class MaterialList {
     getShowMaterial(name: string): THREE.Material | THREE.Material[];
     emitObject3dChange(): void;
     setObject3d(object3d: THREE.Object3D, name: string, meta?: any): void;
+    delObject3d(object3d: THREE.Object3D): void;
     changeObject3dName(object3d: THREE.Object3D, name: string): void;
     removeObject3d(object3d: THREE.Object3D): void;
     dispose(): void;

package/dist/vis/all/objects/index.d.ts

@@ -20,14 +20,6 @@ import Torus from './Torus';
 import TorusKnot from './TorusKnot';
 import Tube from './Tube';
 export declare const objs2: {
-    Box: typeof Box;
-    Capsule: typeof Capsule;
-    Circle: typeof Circle;
-    Cylinder: typeof Cylinder;
-    Dodecahedron: typeof Dodecahedron;
-    Icosahedron: typeof Icosahedron;
-    Lathe: typeof Lathe;
-    Octahedron: typeof Octahedron;
     Plane: typeof Plane;
     Ring: typeof Ring;
     Sphere: typeof Sphere;
@@ -36,8 +28,6 @@ export declare const objs2: {
     Torus: typeof Torus;
     TorusKnot: typeof TorusKnot;
     Tube: typeof Tube;
-};
-declare const d: DrawController<{
     Box: typeof Box;
     Capsule: typeof Capsule;
     Circle: typeof Circle;
@@ -46,6 +36,8 @@ declare const d: DrawController<{
     Icosahedron: typeof Icosahedron;
     Lathe: typeof Lathe;
     Octahedron: typeof Octahedron;
+};
+declare const d: DrawController<{
     Plane: typeof Plane;
     Ring: typeof Ring;
     Sphere: typeof Sphere;
@@ -54,6 +46,14 @@ declare const d: DrawController<{
     Torus: typeof Torus;
     TorusKnot: typeof TorusKnot;
     Tube: typeof Tube;
+    Box: typeof Box;
+    Capsule: typeof Capsule;
+    Circle: typeof Circle;
+    Cylinder: typeof Cylinder;
+    Dodecahedron: typeof Dodecahedron;
+    Icosahedron: typeof Icosahedron;
+    Lathe: typeof Lathe;
+    Octahedron: typeof Octahedron;
     Node: typeof Node;
     Image: typeof Image;
     Line: typeof Line;

package/dist/vis/map/objects/ContinentsBg.d.ts

@@ -22,6 +22,7 @@ export default class extends BaseObject {
     } | undefined;
     getPointInContinent(location: [number, number]): boolean;
     getLocationPosition(location: [number, number]): number[] | undefined;
+    render(): void;
     dispose(): void;
 }
 export {};

package/package.json

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