vis-core 0.28.3 → 0.28.5

package/dist/index.module.js

@@ -88,7 +88,7 @@ const publicKeyPEM = "LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUlJQklqQU5CZ2txaGtpRz
     ).toString(CryptoJS.enc.Utf8), ke = JSON.parse(Ae), He = Date.now();
     return !ke.s || ke.s > He ? (this.token = void 0, "") : ke.e && ke.e < He ? (this.token = void 0, "") : (ke.isValid = Pe, ke);
   }
-}, version = "0.28.3";
+}, version = "0.28.5";
 /**
  * @license
  * Copyright 2010-2025 Three.js Authors
@@ -55944,9 +55944,6 @@ class mi {
         return r;
     console.warn(`Material key with name "${t}" not found.`);
   }
-  getFixBaseObject(t) {
-    return this.fixBaseObjects.get(t) || null;
-  }
   addMultiple(t, r) {
     for (const [m, v] of Object.entries(r)) {
       const C = `${t}#${m}`;
@@ -56080,13 +56077,13 @@ class mi {
           C ? C.add(t) : this.materialBaseObjectMap.set(v, /* @__PURE__ */ new Set([t]));
         });
       }
-    );
+    ), this.pencil.event.emit("mList.addBaseObjectMap");
   }
   rmBaseObjectMap(t, r, m = !0) {
     const v = r && this.material2array(r);
     this.materialBaseObjectMap.forEach((C, w) => {
       v && !v.includes(w) || C.has(t) && (C.delete(t), C.size === 0 && m && (this.materialBaseObjectMap.delete(w), this.disposeMaterial(w)));
-    });
+    }), this.pencil.event.emit("mList.rmBaseObjectMap");
   }
   getBaseObjectMap(t) {
     return this.materialBaseObjectMap.get(t) || /* @__PURE__ */ new Set();
@@ -58899,6 +58896,33 @@ class CopyObject extends Command {
     r && !r.copyObjectUuid && (r.copyObjectUuid = this.copyObjectUuid);
   }
 }
+class AddMaterial extends Command {
+  constructor(r, m) {
+    super(r);
+    C0(this, "materialType");
+    C0(this, "addObjectUuid");
+    this.type = "AddMaterial", this.name = "Add Material", this.materialType = m;
+  }
+  execute() {
+    return B0(this, null, function* () {
+      this.addObjectUuid = `material_${this.id}`;
+      const r = this.editor.pencil.mList, m = new THREE[this.materialType]();
+      m.name = `材质_${this.id}`, r.add(this.addObjectUuid, m);
+    });
+  }
+  undo() {
+    return B0(this, null, function* () {
+      this.editor.pencil.mList.remove(this.addObjectUuid);
+    });
+  }
+  toJSON() {
+    const r = super.toJSON();
+    return r.materialType = this.materialType, r.addObjectUuid = this.addObjectUuid, r;
+  }
+  fromJSON(r) {
+    super.fromJSON(r), this.materialType = r.materialType, this.addObjectUuid = r.addObjectUuid;
+  }
+}
 class CopyMaterial extends Command {
   constructor(r, m) {
     super(r);
@@ -58925,6 +58949,10 @@ class CopyMaterial extends Command {
   fromJSON(r) {
     super.fromJSON(r), this.objectUuid = r.objectUuid || r.materialKey || r.originKey, this.copyObjectUuid = r.copyObjectUuid || r.copyKey;
   }
+  fixJSON() {
+    const r = this.json;
+    r && !r.objectUuid && (r.objectUuid = r.objectUuid || r.materialKey || r.originKey), r && !r.copyObjectUuid && (r.copyObjectUuid = r.copyObjectUuid || r.copyKey);
+  }
 }
 class RemoveMaterial extends Command {
   constructor(r, m) {
@@ -58952,6 +58980,10 @@ class RemoveMaterial extends Command {
   fromJSON(r) {
     super.fromJSON(r), this.objectUuid = r.objectUuid || r.materialKey;
   }
+  fixJSON() {
+    const r = this.json;
+    r && !r.objectUuid && (r.objectUuid = r.objectUuid || r.materialKey);
+  }
 }
 class SetObjectMaterial extends Command {
   constructor(r, m, v, C) {
@@ -59107,6 +59139,7 @@ class SetGeometry extends Command {
 }
 const Commands = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
+  AddMaterial,
   AddObject,
   AddVis,
   CopyMaterial,
@@ -59325,6 +59358,10 @@ class Viewport {
         this.editor.emit("mListChange");
       }), C.event.on("mList.remove", () => {
         this.editor.emit("mListChange");
+      }), C.event.on("mList.addBaseObjectMap", () => {
+        this.editor.emit("mListChange");
+      }), C.event.on("mList.rmBaseObjectMap", () => {
+        this.editor.emit("mListChange");
       });
     });
   }
@@ -59372,6 +59409,12 @@ class Viewport {
       this.editor.execute(new CopyObject(this.editor, m));
     });
   }
+  addMListMaterial(t = "MeshBasicMaterial") {
+    return B0(this, null, function* () {
+      const { vis: r } = this;
+      r && this.editor.execute(new AddMaterial(this.editor, t));
+    });
+  }
   removeMListMaterial(t) {
     return B0(this, null, function* () {
       const { vis: r } = this;
@@ -59659,7 +59702,7 @@ function applyFixes(g, t) {
       }
     },
     {
-      version: "0.28.3",
+      version: "0.28.4",
       fix: () => !1
     }
   ];
@@ -59834,22 +59877,17 @@ class Editor {
     return Array.isArray(m) && r !== void 0 && (m = m[r]), m;
   }
   getMListFixBaseObjectByObject(t, r) {
+    var v;
     const m = this.getObjectMaterial(t, r);
-    if (m) {
-      const v = this.pencil.mList.getKey(m);
-      return v ? this.pencil.mList.getFixBaseObject(v).object3d : t;
-    } else
-      return null;
+    return m ? ((v = this.findMListSelectItem("material", m)) == null ? void 0 : v.object) || t : null;
   }
   materialObjectByUuid(t) {
-    var m;
-    const r = (m = this.mListOptions.find((v) => v.key === t)) == null ? void 0 : m.object;
-    return r || this.objectByUuid(t);
+    const r = this.findMListSelectItem("key", t);
+    return r ? r.object : this.objectByUuid(t);
   }
   uuidByMaterialObject(t) {
-    var m;
-    const r = (m = this.mListOptions.find((v) => v.object === t)) == null ? void 0 : m.key;
-    return r || this.uuidByObject(t);
+    const r = this.findMListSelectItem("object", t);
+    return r ? r.key : this.uuidByObject(t);
   }
   setObjectMaterial(t, r, m) {
     let v = t.material;
@@ -59939,6 +59977,11 @@ class Editor {
     }).filter((v) => v !== null);
     this.selectOption = r([t.lead.scene]), this.emit("sceneGraphChanged");
   }
+  findMListSelectItem(t, r) {
+    return this.mListOptions.find(
+      (m) => m[t] === r
+    );
+  }
   changeMListOptions() {
     if (!this.pencil)
       return [];
@@ -59947,11 +59990,12 @@ class Editor {
     ).map(([t, r]) => {
       const m = this.pencil.mList.get(t);
       return {
-        key: t.replace(t[0], t[0].toLowerCase()),
+        key: t,
         name: m.name,
         type: m.type,
         object: r.object3d,
         baseObject: r,
+        material: m,
         use: !!this.pencil.mList.getBaseObjectMap(m).size
       };
     }), this.emit("mListGraphChanged");

package/dist/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "0.28.3";
+declare const _default: "0.28.5";
 export default _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vis-core",
-  "version": "0.28.3",
+  "version": "0.28.5",
   "scripts": {
     "start": "npm run version && PORT=5173 bundler-dev",
     "build:site": "npm run version && bundler",
@@ -69,7 +69,7 @@
     "esus-lite": "^0.2.8",
     "events": "^3.3.0",
     "geojson-cn": "^0.2.5",
-    "gl-draw": "0.15.6",
+    "gl-draw": "0.15.7",
     "jsrsasign": "^11.1.0",
     "lodash-es": "^4.17.21"
   },