vis-core 0.27.10 → 0.27.11

package/dist/index.module.js

@@ -88,7 +88,7 @@ const publicKeyPEM = "LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUlJQklqQU5CZ2txaGtpRz
     ).toString(CryptoJS.enc.Utf8), Fe = JSON.parse(Ne), at = Date.now();
     return !Fe.s || Fe.s > at ? (this.token = void 0, "") : Fe.e && Fe.e < at ? (this.token = void 0, "") : (Fe.isValid = Le, Fe);
   }
-}, version = "0.27.10";
+}, version = "0.27.11";
 /**
  * @license
  * Copyright 2010-2025 Three.js Authors
@@ -36442,7 +36442,7 @@ var At$1 = Object.defineProperty, jt = Object.defineProperties, St$1 = Object.ge
 });
 class O {
   constructor() {
-    this.resources = /* @__PURE__ */ new Set(), this.disposeWithMaterial = !0, this.materialList = {}, this.disposeTrack = !0;
+    this.resources = /* @__PURE__ */ new Set(), this.disposeWithMaterial = !0, this.disposeVideo = !0, this.materialList = {}, this.disposeTrack = !0;
   }
   track(t) {
     if (!t || this.disposeTrack === !1)
@@ -36467,13 +36467,13 @@ class O {
             (v instanceof Texture || Array.isArray(v)) && this.track(v);
           }
       }
-    } else t instanceof VideoTexture && t.source.data && this.resources.add(t.source.data);
+    } else this.disposeVideo && t instanceof VideoTexture && t.source.data && this.resources.add(t.source.data);
     return t;
   }
   dispose() {
     const t = [];
     for (const r of this.resources)
-      r instanceof Object3D ? t.push(r) : r instanceof HTMLVideoElement && (r.pause(), r.src = "", r.remove()), Reflect.has(r, "dispose") && r.dispose();
+      r instanceof Object3D ? t.push(r) : r instanceof HTMLVideoElement && r.pause(), Reflect.has(r, "dispose") && r.dispose();
     t.forEach((r) => {
       r.removeFromParent();
     }), t.length = 0, this.resources.clear();
@@ -58136,11 +58136,7 @@ class SetMaterial extends Command {
     super(t), this.type = "SetMaterial", this.name = "New Material", this.object = r, this.materialSlot = v, this.oldMaterial = this.editor.getObjectMaterial(r, v), this.newMaterial = d, (C = this.oldMaterial) != null && C.name && (this.newMaterial.name = this.oldMaterial.name);
   }
   execute() {
-    var t;
-    this.oldMaterial = this.editor.getObjectMaterial(
-      this.object,
-      this.materialSlot
-    ), (t = this.oldMaterial) != null && t.onBeforeCompile && (this.newMaterial.onBeforeCompile = this.oldMaterial.onBeforeCompile), this.editor.setObjectMaterial(
+    this.editor.setObjectMaterial(
       this.object,
       this.materialSlot,
       this.newMaterial
@@ -58155,11 +58151,18 @@ class SetMaterial extends Command {
   }
   toJSON() {
     const t = super.toJSON(this);
-    return t.objectUuid = this.editor.uuidByObject(this.object), t.materialSlot = this.materialSlot, t.oldMaterial = this.oldMaterial.toJSON(), t.newMaterial = this.newMaterial.toJSON(), t;
+    return t.objectUuid = this.editor.uuidByObject(this.object), t.materialSlot = this.materialSlot, t.newMaterial = this.newMaterial.toJSON(), t;
   }
   fromJSON(t) {
     var r;
-    super.fromJSON(t), this.object = this.editor.objectByUuid(t.objectUuid), this.materialSlot = t.materialSlot, this.oldMaterial = parseMaterial(t.oldMaterial), this.newMaterial = parseMaterial(t.newMaterial), ((r = this.newMaterial.envMap) == null ? void 0 : r.name) === "PMREM.cubeUv" && (this.newMaterial.envMap = this.editor.viewport.vis.getRoomEnvMap());
+    super.fromJSON(t), this.object = this.editor.objectByUuid(t.objectUuid), this.materialSlot = t.materialSlot, this.materialSlot = t.materialSlot, this.oldMaterial = this.editor.getObjectMaterial(
+      this.object,
+      this.materialSlot
+    ), this.newMaterial = parseMaterial(t.newMaterial), ((r = this.newMaterial.envMap) == null ? void 0 : r.name) === "PMREM.cubeUv" && (this.newMaterial.envMap = this.editor.viewport.vis.getRoomEnvMap());
+  }
+  fixJSON() {
+    const t = this.json;
+    t && t.oldMaterial && delete t.oldMaterial;
   }
 }
 function parseMaterial(g) {
@@ -58192,32 +58195,33 @@ class SetMaterialMap extends Command {
   }
   execute() {
     if (this.oldMap) {
-      if (this.editor.playing) {
-        const t = new O();
-        t.track(this.oldMap), t.dispose();
-      } else if (this.oldMap.dispose(), this.oldMap instanceof VideoTexture) {
-        const t = this.oldMap.source.data;
-        t && t.pause();
-      }
+      const t = new O();
+      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.material instanceof Ie$2 && (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.anisotropy = this.editor.viewport.vis.tier0 ? 1 : this.editor.pencil.maxAnisotropy), this.material[this.mapName] = this.newMap, this.playVideo(this.newMap), this.material instanceof Ie$2 && (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() {
-    if (this.oldMap && this.oldMap instanceof VideoTexture) {
-      const t = this.oldMap.source.data;
-      t && t.play();
+    this.material[this.mapName] = this.oldMap, this.playVideo(this.oldMap), this.material instanceof Ie$2 && (this.material.useMap = !!this.newMap), (!this.oldMap && this.newMap || this.oldMap && !this.newMap) && (this.material.needsUpdate = !0), this.editor.emit("materialChanged", this.material);
+  }
+  playVideo(t) {
+    if (t && t instanceof VideoTexture) {
+      const r = t.source.data;
+      r && r.play();
     }
-    this.material[this.mapName] = this.oldMap, this.material instanceof Ie$2 && (this.material.useMap = !!this.newMap), (!this.oldMap && this.newMap || this.oldMap && !this.newMap) && (this.material.needsUpdate = !0), this.editor.emit("materialChanged", this.material);
   }
   toJSON() {
     const t = super.toJSON(this);
-    return t.objectUuid = this.editor.uuidByObject(this.object), t.materialSlot = this.materialSlot, t.mapName = this.mapName, t.newMap = serializeMap(this.newMap), t.oldMap = serializeMap(this.oldMap), t;
+    return t.objectUuid = this.editor.uuidByObject(this.object), t.materialSlot = this.materialSlot, t.mapName = this.mapName, t.newMap = serializeMap(this.newMap), t;
   }
   fromJSON(t) {
     super.fromJSON(t), this.object = this.editor.objectByUuid(t.objectUuid), this.materialSlot = t.materialSlot, this.material = this.editor.getObjectMaterial(
       this.object,
       this.materialSlot
-    ), this.mapName = t.mapName, this.oldMap = parseTexture(t.oldMap), this.newMap = parseTexture(t.newMap);
+    ), this.mapName = t.mapName, this.oldMap = this.object !== void 0 ? this.material[this.mapName] : void 0, this.newMap = parseTexture(t.newMap);
+  }
+  fixJSON() {
+    const t = this.json;
+    t && t.oldMap && delete t.oldMap;
   }
 }
 function parseTexture(g) {
@@ -58226,7 +58230,7 @@ function parseTexture(g) {
     const r = new ObjectLoader();
     if (g.isVideoTexture) {
       const d = document.createElement("video");
-      d.src = g.images[0].url, d.muted = !0, d.autoplay = !0, d.loop = !0, d.preload = "auto", d.play();
+      d.src = g.images[0].url, d.muted = !0, d.loop = !0, d.preload = "auto";
       const v = {
         [g.images[0].uuid]: new VideoTexture(d)
       };
@@ -58771,7 +58775,7 @@ class History {
       } catch (w) {
         console.error(w, t);
       }
-      this.editor.playing || (t.json = t.toJSON()), this.lastCmdTime = Date.now(), this.redos = [], this.editor.emit("historyChanged", t);
+      t.json = t.toJSON(), this.lastCmdTime = Date.now(), this.redos = [], this.editor.emit("historyChanged", t);
     });
   }
   undo() {
@@ -59422,6 +59426,7 @@ class Editor {
     const v = this.viewport.vis;
     let C = t.material;
     if (Array.isArray(t.material) && r !== void 0 ? (C = t.material[r], t.material[r] = d) : t.material = d, C) {
+      C.onBeforeCompile && (d.onBeforeCompile = C.onBeforeCompile);
       const w = new O();
       if (w.track(C), w.dispose(), t.userData.fixBufferGeometry) {
         const E = v.pencil.lead, ye = (Le) => {

package/dist/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "0.27.10";
+declare const _default: "0.27.11";
 export default _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vis-core",
-  "version": "0.27.10",
+  "version": "0.27.11",
   "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.14.38",
+    "gl-draw": "0.14.39",
     "jsrsasign": "^11.1.0",
     "lodash-es": "^4.17.21"
   },