vis-core 0.28.15 → 0.28.16

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.16";
 /**
  * @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);
     }
   }
 }
@@ -58521,7 +58528,10 @@ class SetMaterialMap extends Command {
   }
   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) {
@@ -58591,9 +58601,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 +58621,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 +58652,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 +58694,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 +58789,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 +58958,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 +59372,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 +59414,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);
       }

package/dist/version.d.ts

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

package/package.json

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