vis-core 0.28.15 → 0.28.17

package/dist/index.module.js

@@ -88,7 +88,7 @@ const publicKeyPEM = "LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUlJQklqQU5CZ2txaGtpRz
     ).toString(CryptoJS.enc.Utf8), Ne = JSON.parse(Pe), Ae = Date.now();
     return !Ne.s || Ne.s > Ae ? (this.token = void 0, "") : Ne.e && Ne.e < Ae ? (this.token = void 0, "") : (Ne.isValid = O, Ne);
   }
-}, version = "0.28.15";
+}, version = "0.28.17";
 /**
  * @license
  * Copyright 2010-2025 Three.js Authors
@@ -58425,6 +58425,13 @@ class SetMaterialColor extends Command {
       this.materialSlot
     ), this.attributeName = t.attributeName, this.oldValue = t.oldValue, this.newValue = t.newValue;
   }
+  fixJSON() {
+    const t = this.json;
+    if (this.material) {
+      const r = this.editor.pencil.mList.getKey(this.material);
+      r && r !== t.objectUuid && (console.warn(`${this.type}:fix:`, t.objectUuid, r), t.objectUuid = r), r && (t.materialSlot = 0);
+    }
+  }
 }
 class SetMaterial extends Command {
   constructor(t, r, m, v) {
@@ -58459,7 +58466,7 @@ class SetMaterial extends Command {
     const t = this.json;
     if (t && t.oldMaterial && delete t.oldMaterial, this.oldMaterial) {
       const r = this.editor.pencil.mList.getKey(this.oldMaterial);
-      r && r !== t.objectUuid && (console.warn("SetMaterial:fix:", t.objectUuid, r), t.objectUuid = r);
+      r && r !== t.objectUuid && (console.warn("SetMaterial:fix:", t.objectUuid, r), t.objectUuid = r), r && (t.materialSlot = 0);
     }
   }
 }
@@ -58497,7 +58504,7 @@ class SetMaterialMap extends Command {
         const t = new re$1();
         t.track(this.oldMap), t.dispose();
       }
-      this.newMap && (this.newMap.anisotropy = this.editor.viewport.vis.tier0 ? 1 : this.editor.pencil.maxAnisotropy), this.material[this.mapName] = this.newMap, this.playVideo(this.newMap), this.material instanceof Te$1 && (this.material.useMap = !!this.newMap, this.newMap && this.newMap.wrapS !== RepeatWrapping && (this.newMap.wrapS = RepeatWrapping, this.newMap.wrapT = RepeatWrapping, this.newMap.needsUpdate = !0)), (!this.oldMap && this.newMap || this.oldMap && !this.newMap) && (this.material.needsUpdate = !0), this.editor.emit("materialChanged", this.material);
+      this.newMap && (this.newMap.name === "PMREM.cubeUv" && (this.newMap = this.editor.viewport.vis.getRoomEnvMap()), this.newMap.anisotropy = this.editor.viewport.vis.tier0 ? 1 : this.editor.pencil.maxAnisotropy), this.material[this.mapName] = this.newMap, this.playVideo(this.newMap), this.material instanceof Te$1 && (this.material.useMap = !!this.newMap, this.newMap && this.newMap.wrapS !== RepeatWrapping && (this.newMap.wrapS = RepeatWrapping, this.newMap.wrapT = RepeatWrapping, this.newMap.needsUpdate = !0)), (!this.oldMap && this.newMap || this.oldMap && !this.newMap) && (this.material.needsUpdate = !0), this.editor.emit("materialChanged", this.material);
     }
   }
   undo() {
@@ -58517,11 +58524,14 @@ class SetMaterialMap extends Command {
     super.fromJSON(t), this.object = this.editor.materialObjectByUuid(t.objectUuid), this.materialSlot = t.materialSlot, this.material = this.editor.getObjectMaterial(
       this.object,
       this.materialSlot
-    ), this.mapName = t.mapName, this.oldMap = this.object && this.material ? this.material[this.mapName] : void 0, this.newMap = parseTexture(t.newMap);
+    ), this.mapName = t.mapName, this.oldMap = this.object && this.material ? this.material[this.mapName] : void 0, t.newMap.name === "PMREM.cubeUv" ? this.newMap = this.editor.viewport.vis.getRoomEnvMap() : this.newMap = parseTexture(t.newMap);
   }
   fixJSON() {
     const t = this.json;
-    t && t.oldMap && delete t.oldMap;
+    if (t && t.oldMap && delete t.oldMap, this.material) {
+      const r = this.editor.pencil.mList.getKey(this.material);
+      r && r !== t.objectUuid && (console.warn(`${this.type}:fix:`, t.objectUuid, r), t.objectUuid = r), r && (t.materialSlot = 0);
+    }
   }
 }
 function parseTexture(g) {
@@ -58561,6 +58571,10 @@ const parseVideoTextures = (g, t) => {
 };
 function serializeMap(g) {
   if (g == null) return null;
+  if (g.name === "PMREM.cubeUv")
+    return {
+      name: "PMREM.cubeUv"
+    };
   const t = {
     geometries: {},
     materials: {},
@@ -58591,9 +58605,7 @@ class SetMaterialValue extends Command {
     super(t), this.type = "SetMaterialValue", this.name = `Set Material.${m}`, this.updatable = !0, this.object = r, this.materialSlot = C, this.material = this.editor.getObjectMaterial(r, C), this.oldValue = this.material !== void 0 ? this.material[m] : void 0, this.newValue = v, this.attributeName = m;
   }
   execute() {
-    this.material !== void 0 && (this.material[this.attributeName] = this.newValue, needsUpdateAttributeName.includes(this.attributeName) && (this.material.needsUpdate = !0), this.editor.emit("materialChanged", this.material), setTimeout(() => {
-      this.attributeName === "name" && this.editor.emit("mListChange");
-    }));
+    this.material !== void 0 && (this.material[this.attributeName] = this.newValue, needsUpdateAttributeName.includes(this.attributeName) && (this.material.needsUpdate = !0), this.editor.emit("materialChanged", this.material), this.attributeName === "name" && this.editor.emit("mListChange"));
   }
   undo() {
     this.material[this.attributeName] = this.oldValue, needsUpdateAttributeName.includes(this.attributeName) && (this.material.needsUpdate = !0), this.editor.emit("materialChanged", this.material), setTimeout(() => {
@@ -58613,6 +58625,13 @@ class SetMaterialValue extends Command {
       this.materialSlot
     );
   }
+  fixJSON() {
+    const t = this.json;
+    if (this.material) {
+      const r = this.editor.pencil.mList.getKey(this.material);
+      r && r !== t.objectUuid && (console.warn(`${this.type}:fix:`, t.objectUuid, r), t.objectUuid = r), r && (t.materialSlot = 0);
+    }
+  }
 }
 class SetMaterialVector extends Command {
   constructor(t, r, m, v, C) {
@@ -58637,6 +58656,13 @@ class SetMaterialVector extends Command {
       this.materialSlot
     ), this.attributeName = t.attributeName, this.oldValue = t.oldValue, this.newValue = t.newValue;
   }
+  fixJSON() {
+    const t = this.json;
+    if (this.material) {
+      const r = this.editor.pencil.mList.getKey(this.material);
+      r && r !== t.objectUuid && (console.warn(`${this.type}:fix:`, t.objectUuid, r), t.objectUuid = r), r && (t.materialSlot = 0);
+    }
+  }
 }
 class SetMaterialMapVector extends Command {
   constructor(t, r, m, v, C, _ = "repeat") {
@@ -58672,6 +58698,13 @@ class SetMaterialMapVector extends Command {
       this.materialSlot
     ), this.attributeName = t.attributeName, t.attributeName2 && (this.attributeName2 = t.attributeName2), this.oldValue = t.oldValue, this.newValue = t.newValue, this.attributeName === "repeat" && (this.attributeName = "map");
   }
+  fixJSON() {
+    const t = this.json;
+    if (this.material) {
+      const r = this.editor.pencil.mList.getKey(this.material);
+      r && r !== t.objectUuid && (console.warn(`${this.type}:fix:`, t.objectUuid, r), t.objectUuid = r), r && (t.materialSlot = 0);
+    }
+  }
 }
 class SetPosition extends Command {
   constructor(t, r, m, v, C) {
@@ -58760,11 +58793,13 @@ class SetValue extends Command {
   }
   fixObj() {
     const t = this.properties ? this.object[this.properties] : this.object;
-    t.isCamera && ["fov", "left", "right", "top", "bottom", "near", "far"].includes(
+    if (t.isCamera && ["fov", "left", "right", "top", "bottom", "near", "far"].includes(
       this.attributeName
-    ) && t.updateProjectionMatrix(), setTimeout(() => {
-      (this.attributeName === "name" || this.attributeName === "prefab" || this.attributeName === "visible" || this.attributeName === "keepCamera") && this.editor.emit("baseObjectListChange");
-    });
+    ) && t.updateProjectionMatrix(), this.attributeName === "visible") {
+      const r = this.editor.pencil.lead.objMap.get(this.object);
+      r && r[t[this.attributeName] ? "show" : "hide"]();
+    }
+    (this.attributeName === "name" || this.attributeName === "prefab" || this.attributeName === "visible" || this.attributeName === "keepCamera") && this.editor.emit("baseObjectListChange");
   }
   undo() {
     const t = this.properties ? this.object[this.properties] : this.object;
@@ -58927,26 +58962,37 @@ class AddMaterial extends Command {
   constructor(r, m) {
     super(r);
     L0(this, "materialType");
+    L0(this, "flag", !1);
     L0(this, "addObjectUuid");
     this.type = "AddMaterial", this.name = "Add Material", this.materialType = m;
   }
   execute() {
     return H0(this, null, function* () {
       this.addObjectUuid = `material_${this.id}`;
-      const r = this.editor.pencil.mList, m = this.materialType === "MeshLineMaterial" ? new Te$1({
+      const r = this.editor.pencil.mList;
+      let m;
+      if (this.materialType.startsWith("k:")) {
+        const v = this.materialType.match(/k:([^|]+)\|s:([^|]+)/);
+        if (v) {
+          const C = v[1], _ = v[2], w = this.editor.pencil.lead.getObject(C);
+          if (w) {
+            const E = w.object3d;
+            m = Array.isArray(E.material) ? E.material[+_] : E.material, this.flag = !0;
+          } else
+            console.warn(`Base object with key ${C} not found.`), m = new MeshBasicMaterial();
+        } else
+          console.warn(`Material type ${this.materialType} is not valid.`), m = new MeshBasicMaterial();
+      } else this.materialType === "MeshLineMaterial" ? m = new Te$1({
         color: new Color$1(16777215),
         lineWidth: 1,
         sizeAttenuation: 0
-      }) : (
-        // @ts-ignore
-        new THREE[this.materialType]()
-      );
-      m.name = `材质_${this.id}`, r.add(this.addObjectUuid, m);
+      }) : m = new THREE[this.materialType]();
+      m.name = `材质_${this.id}`, r.add(this.addObjectUuid, m), this.flag && this.editor.emit("materialChanged");
     });
   }
   undo() {
     return H0(this, null, function* () {
-      this.editor.pencil.mList.remove(this.addObjectUuid);
+      this.editor.pencil.mList.remove(this.addObjectUuid), this.flag && this.editor.emit("materialChanged");
     });
   }
   toJSON() {
@@ -59330,7 +59376,7 @@ class History {
             const Ne = parseInt(Pe.url.replace("$rp-", ""));
             Pe._url ? (Pe.url = Bi(Q0({}, Pe._url), {
               data: decodeUrlSafeBase64ToArrayBuffer(m[Ne])
-            }), delete Pe._url) : Pe.url = m[Ne], this.editor.playing || console.log("$rp-", Ne, E);
+            }), delete Pe._url) : Pe.url = m[Ne];
           }
         });
       }
@@ -59372,7 +59418,7 @@ class History {
     return H0(this, null, function* () {
       t.fromJSON(t.json);
       try {
-        !["AddObject", "CopyMaterial", "RemoveMaterial"].includes(t.json.type) && t.json.objectUuid && !t.object || (yield t.execute(), t.fixJSON());
+        !["AddObject", "CopyMaterial", "RemoveMaterial"].includes(t.json.type) && t.json.objectUuid && !t.object || (yield t.execute(), this.editor.playing || t.fixJSON());
       } catch (r) {
         console.error(r, t);
       }
@@ -59665,7 +59711,7 @@ function applyFixes(g, t) {
       version: "0.21.24",
       fix: () => {
         var _, w;
-        t.h.u[0] && t.h.u[0].visType === "map" && ((w = (_ = t.v) == null ? void 0 : _.eo) != null && w.parentBgCurvatureResolution) && (delete t.v.eo.parentBgCurvatureResolution, t.v.eo.parentBgTopSegments = 400);
+        t.h.u[0] && t.h.u[0].visType === "map" && ((w = (_ = t.v) == null ? void 0 : _.eo) != null && w.parentBgCurvatureResolution) && delete t.v.eo.parentBgCurvatureResolution;
       }
     },
     {
@@ -141421,7 +141467,7 @@ const objs$1 = Bi(Q0({}, objs$3), {
     greyFull: g.options.greyFull
     // ...this.extendsOptions,
     // initCity: this.options.initCity,
-  }, g.options.parentBg && (g.extendsOptions.parentBgDepth = () => g.options.parentBgDepth, g.extendsOptions.parentBgTopSegments = () => g.options.parentBgTopSegments), g.loaderAdd = function() {
+  }, g.options.parentBg && (g.extendsOptions.parentBgDepth = () => g.options.parentBgDepth), g.loaderAdd = function() {
     this.loader.add(["/image/map2/side.png"]);
   }, g.initMaterial = function() {
     return H0(this, null, function* () {
@@ -141679,7 +141725,7 @@ const objs$1 = Bi(Q0({}, objs$3), {
       continentsBg: !1,
       continentsBgDepth: 0,
       parentBgDepth: 0,
-      parentBgTopSegments: 0,
+      topSegments: 0,
       clickHandleDrillDown: !1,
       drillDownSecondLevelMats: !1,
       drillDownFirstLevelUseBgMats: !1,
@@ -141724,7 +141770,7 @@ const objs$1 = Bi(Q0({}, objs$3), {
     }, r), {
       geojsonMap: m,
       extrudeLineGeojsonMap: v
-    })), this.options.equirectangular && (this.options.projectionType = "equirectangular"), this.options.winkel3 && (this.options.projectionType = "winkel3"), this.options.adcode === 0 ? this.extendsOptions.winkel3 = () => this.options.winkel3 : (this.getAdcodeShowLevel(this.options.adcode) === "province" || this.getAdcodeShowLevel(this.options.adcode) === "country") && (this.extendsOptions.clickHandleDrillDown = () => this.options.clickHandleDrillDown, this.options.clickHandleDrillDown && (this.workerOnce = !1, this.extendsOptions.mapDepth = () => Array.isArray(this.options.mapDepth) ? this.options.mapDepth : new Array(3).fill(this.options.mapDepth), this.extendsOptions.drillDownFirstLevelUseBgMats = () => this.options.drillDownFirstLevelUseBgMats, this.extendsOptions.drillDownSecondLevelMats = () => this.options.drillDownSecondLevelMats, this.extendsOptions.drillDownThirdLevelMats = () => this.options.drillDownThirdLevelMats, this.extendsOptions.drillDownPlateInCenter = () => this.options.drillDownPlateInCenter, this.extendsOptions.clickOusideBack = () => this.options.clickOusideBack, this.extendsOptions.handleBackKeepCamvasState = () => this.options.handleBackKeepCamvasState, this.extendsOptions.showOneLevel = () => this.options.showOneLevel, this.extendsOptions.showDistrict = () => this.options.showDistrict, this.options.parentBg && (this.extendsOptions.drillDownHideParent = () => this.options.drillDownHideParent)), this.extendsOptions.parentBg = () => this.options.parentBg, this.options.parentBg && (this.extendsOptions.parentBgDepth = () => this.options.parentBgDepth, this.extendsOptions.parentBgTopSegments = () => this.options.parentBgTopSegments), this.extendsOptions.continentsBg = () => this.options.continentsBg, this.options.continentsBg && (this.extendsOptions.continentsBgDepth = () => this.options.continentsBgDepth)), this.options.adcode === 0 ? world(this) : this.options.style === "map2Base" || this.options.style === "map2CityOnMap" ? base$1(this) : this.options.adcode === 1e5 ? china(this) : base$2(this);
+    })), this.options.equirectangular && (this.options.projectionType = "equirectangular"), this.options.winkel3 && (this.options.projectionType = "winkel3"), this.options.adcode === 0 ? this.extendsOptions.winkel3 = () => this.options.winkel3 : (this.getAdcodeShowLevel(this.options.adcode) === "province" || this.getAdcodeShowLevel(this.options.adcode) === "country") && (this.extendsOptions.clickHandleDrillDown = () => this.options.clickHandleDrillDown, this.options.clickHandleDrillDown && (this.workerOnce = !1, this.extendsOptions.mapDepth = () => Array.isArray(this.options.mapDepth) ? this.options.mapDepth : new Array(3).fill(this.options.mapDepth), this.extendsOptions.drillDownFirstLevelUseBgMats = () => this.options.drillDownFirstLevelUseBgMats, this.extendsOptions.drillDownSecondLevelMats = () => this.options.drillDownSecondLevelMats, this.extendsOptions.drillDownThirdLevelMats = () => this.options.drillDownThirdLevelMats, this.extendsOptions.drillDownPlateInCenter = () => this.options.drillDownPlateInCenter, this.extendsOptions.clickOusideBack = () => this.options.clickOusideBack, this.extendsOptions.handleBackKeepCamvasState = () => this.options.handleBackKeepCamvasState, this.extendsOptions.showOneLevel = () => this.options.showOneLevel, this.extendsOptions.showDistrict = () => this.options.showDistrict, this.options.parentBg && (this.extendsOptions.drillDownHideParent = () => this.options.drillDownHideParent)), this.extendsOptions.parentBg = () => this.options.parentBg, this.options.parentBg && (this.extendsOptions.parentBgDepth = () => this.options.parentBgDepth), this.extendsOptions.continentsBg = () => this.options.continentsBg, this.options.continentsBg && (this.extendsOptions.continentsBgDepth = () => this.options.continentsBgDepth)), this.options.adcode === 0 ? world(this) : this.options.style === "map2Base" || this.options.style === "map2CityOnMap" ? base$1(this) : this.options.adcode === 1e5 ? china(this) : base$2(this);
   }
   handleSetting(r, m) {
     return H0(this, null, function* () {

package/dist/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "0.28.15";
+declare const _default: "0.28.17";
 export default _default;

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

@@ -15,7 +15,7 @@ export interface MapOptions extends BaseOptions {
     center?: [number, number];
     parentBg?: boolean | number;
     parentBgDepth?: number;
-    parentBgTopSegments?: number;
+    topSegments?: number;
     fixCity?: Record<number, number>;
     continentsBg?: boolean;
     continentsBgDepth?: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vis-core",
-  "version": "0.28.15",
+  "version": "0.28.17",
   "scripts": {
     "start": "npm run version && PORT=5173 bundler-dev",
     "build:site": "npm run version && PUBLIC_EXCLUDE=true  bundler",
@@ -9,7 +9,6 @@
     "preview": "bundler-preview",
     "version": "node ./scripts/generate-version",
     "gzip": "node ./scripts/gzip",
-    "getPublic": "node ./scripts/getPublic",
     "start:3dSite": "npm run version &&  VITE_SITE_3D=true  bundler-dev",
     "build:3dSite": "npm run version && VITE_SITE_3D=true bundler",
     "pub": "npm publish"

package/dist/vis/map/styles/map2/map350000.d.ts

@@ -1,2 +0,0 @@
-import Map from '../../index';
-export declare const map350000: (map: Map) => void;