vis-core 0.28.23 → 0.28.25

package/dist/index.module.js

@@ -88,7 +88,7 @@ const publicKeyPEM = "LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUlJQklqQU5CZ2txaGtpRz
     ).toString(CryptoJS.enc.Utf8), Fe = JSON.parse(Ne), Ae = Date.now();
     return !Fe.s || Fe.s > Ae ? (this.token = void 0, "") : Fe.e && Fe.e < Ae ? (this.token = void 0, "") : (Fe.isValid = O, Fe);
   }
-}, version = "0.28.23";
+}, version = "0.28.25";
 /**
  * @license
  * Copyright 2010-2025 Three.js Authors
@@ -58125,6 +58125,9 @@ function get(g, t = defaultGetStore()) {
 function setMany(g, t = defaultGetStore()) {
   return t("readwrite", (r) => (g.forEach((m) => r.put(m[1], m[0])), promisifyRequest(r.transaction)));
 }
+function del(g, t = defaultGetStore()) {
+  return t("readwrite", (r) => (r.delete(g), promisifyRequest(r.transaction)));
+}
 var H = Object.defineProperty, y = Object.getOwnPropertySymbols, a = Object.prototype.hasOwnProperty, x = Object.prototype.propertyIsEnumerable, s = (g, t, r) => t in g ? H(g, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : g[t] = r, W = (g, t) => {
   for (var r in t || (t = {}))
     a.call(t, r) && s(g, r, t[r]);
@@ -59754,22 +59757,36 @@ class AddMaterial extends Command {
       this.addObjectUuid = `material_${this.id}`;
       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 I = w.object3d;
-            m = Array.isArray(I.material) ? I.material[+_] : I.material, this.flag = !0;
+      if (typeof this.materialType == "string")
+        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 I = w.object3d;
+              m = Array.isArray(I.material) ? I.material[+_] : I.material, this.flag = !0;
+            } else
+              console.warn(`Base object with key ${C} not found.`), m = new MeshBasicMaterial();
           } 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 We$1({
-        color: new Color$1(16777215),
-        lineWidth: 1,
-        sizeAttenuation: 0
-      }) : m = new THREE[this.materialType]();
+            console.warn(`Material type ${this.materialType} is not valid.`), m = new MeshBasicMaterial();
+        } else if (this.materialType.startsWith("t:")) {
+          const v = this.materialType.match(/t:([^|]+)\|s:([^|]+)/);
+          if (v) {
+            const C = v[1], _ = v[2], w = this.editor.pencil.lead.getObject(C);
+            if (w) {
+              const I = w.object3d;
+              m = Array.isArray(I.material) ? I.material[+_] : I.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 We$1({
+          color: new Color$1(16777215),
+          lineWidth: 1,
+          sizeAttenuation: 0
+        }) : m = new THREE[this.materialType]();
+      else
+        m = parseMaterial(this.materialType);
       m.name = `材质_${this.id}`, r.add(this.addObjectUuid, m), this.flag && this.editor.emit("materialChanged");
     });
   }
@@ -60285,6 +60302,8 @@ class Viewport {
     C0(this, "cameraState", {});
     C0(this, "delLoadObj");
     C0(this, "options");
+    C0(this, "copyObjKey");
+    C0(this, "copyMListMaterialKey");
     this.options = r, this.editor = t;
   }
   setSaveCamera(t) {
@@ -60311,8 +60330,8 @@ class Viewport {
       }
       if (this.vis = this.options.visFactories, this.vis.visName !== t)
         throw new Error(`visName is not match, import {${t}}`);
-      let v = q0(q0({}, r), this.extendsOptions);
-      v = this.editor.hooks.events.beforeSetVisOptions.length ? this.editor.hooks.dispatch("beforeSetVisOptions", v) : v, this.vis.setOptions(v), this.vis.cameraState = q0({}, this.cameraState), this.delLoadObj && (this.vis.delLoadArr = this.delLoadObj), this.vis.playing = this.editor.playing, this.vis._baseObjectByUuid = this.editor.baseObjectByUuid.bind(this.editor), this.vis._objectByUuid = this.editor.objectByUuid.bind(this.editor), this.vis.on("loaderProgress", (_, w) => {
+      let v = q0({}, r);
+      v = this.editor.hooks.events.beforeSetVisOptions.length ? this.editor.hooks.dispatch("beforeSetVisOptions", v) : v, this.vis.setOptions(q0(q0({}, v), this.extendsOptions)), this.vis.cameraState = q0({}, this.cameraState), this.delLoadObj && (this.vis.delLoadArr = this.delLoadObj), this.vis.playing = this.editor.playing, this.vis._baseObjectByUuid = this.editor.baseObjectByUuid.bind(this.editor), this.vis._objectByUuid = this.editor.objectByUuid.bind(this.editor), this.vis.on("loaderProgress", (_, w) => {
         this.editor.emit("progress", {
           type: "下载资源",
           value: _ / w * 100 | 0
@@ -60373,37 +60392,70 @@ class Viewport {
   removeObj(t) {
     return B0(this, null, function* () {
       const { vis: r } = this;
-      if (!r)
+      if (!r || !t)
         return;
-      const m = this.editor.baseObjectByUuid(t);
-      this.editor.execute(new RemoveObject(this.editor, m));
+      const m = this.editor.findSelectItem(
+        this.editor.selectOption,
+        "key",
+        t
+      );
+      if (m && !m.disabledR) {
+        const v = this.editor.baseObjectByUuid(t);
+        this.editor.execute(new RemoveObject(this.editor, v));
+      } else
+        console.warn(m ? "Object is disabled for removal" : "Object not found for removal");
     });
   }
   copyObj(t) {
+    if (this.vis && (this.copyObjKey = void 0, t)) {
+      const r = this.editor.findSelectItem(
+        this.editor.selectOption,
+        "key",
+        t
+      );
+      r && !r.disabledC && (this.copyObjKey = t);
+    }
+  }
+  pasteObj() {
     return B0(this, null, function* () {
-      const { vis: r } = this;
-      if (!r)
+      const { vis: t } = this;
+      if (!t || !this.copyObjKey)
         return;
-      const m = this.editor.baseObjectByUuid(t);
-      this.editor.execute(new CopyObject(this.editor, m));
+      const r = this.editor.baseObjectByUuid(this.copyObjKey);
+      this.editor.execute(new CopyObject(this.editor, r));
     });
   }
-  addMListMaterial(t = "MeshBasicMaterial") {
+  copyMListMaterial(t) {
     return B0(this, null, function* () {
       const { vis: r } = this;
-      r && this.editor.execute(new AddMaterial(this.editor, t));
+      r && (this.copyMListMaterialKey = t, t && del("crossCopyMaterial"));
     });
   }
-  removeMListMaterial(t) {
+  pasteMListMaterial() {
+    return B0(this, null, function* () {
+      const { vis: t } = this;
+      if (t) {
+        if (!this.copyMListMaterialKey) {
+          const r = yield get("crossCopyMaterial");
+          r && this.editor.execute(new AddMaterial(this.editor, r));
+          return;
+        }
+        this.editor.execute(
+          new CopyMaterial(this.editor, this.copyMListMaterialKey)
+        );
+      }
+    });
+  }
+  addMListMaterial(t = "MeshBasicMaterial") {
     return B0(this, null, function* () {
       const { vis: r } = this;
-      r && this.editor.execute(new RemoveMaterial(this.editor, t));
+      r && this.editor.execute(new AddMaterial(this.editor, t));
     });
   }
-  copyMListMaterial(t) {
+  removeMListMaterial(t) {
     return B0(this, null, function* () {
       const { vis: r } = this;
-      r && this.editor.execute(new CopyMaterial(this.editor, t));
+      r && this.editor.execute(new RemoveMaterial(this.editor, t));
     });
   }
   setExtendsOptions(t, r) {
@@ -60430,7 +60482,7 @@ class Viewport {
   setTransformControlsModal(t) {
     var m;
     const { pencil: r } = this.vis;
-    (m = r.transformController) == null || m.controls.setMode(t);
+    (m = r.transformController) == null || m.controls.setMode(t), this.editor.emit("transformControlsModalChanged", t);
   }
   dispose() {
     var t;

package/dist/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "0.28.23";
+declare const _default: "0.28.25";
 export default _default;

package/package.json

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