modern-canvas 0.4.51 → 0.4.52

package/dist/index.mjs

@@ -7144,13 +7144,15 @@ ColorReplaceEffect = __decorateClass$J([
 ], ColorReplaceEffect);
 
 class CanvasContext extends Path2D {
-  textureTransform;
   fillStyle;
   strokeStyle;
   lineCap;
   lineJoin;
   lineWidth;
   miterLimit;
+  // custom
+  uvTransform;
+  vertTransform;
   _defaultStyle = Texture2D.EMPTY;
   _draws = [];
   _toTexture(source) {
@@ -7172,7 +7174,8 @@ class CanvasContext extends Path2D {
         type: "stroke",
         path,
         texture,
-        textureTransform: this.textureTransform,
+        uvTransform: this.uvTransform,
+        vertTransform: this.vertTransform,
         style: {
           alignment: 0.5,
           cap: this.lineCap ?? "butt",
@@ -7201,7 +7204,8 @@ class CanvasContext extends Path2D {
       type: "fill",
       path,
       texture,
-      textureTransform: this.textureTransform
+      uvTransform: this.uvTransform,
+      vertTransform: this.vertTransform
     });
     super.reset();
   }
@@ -7209,7 +7213,8 @@ class CanvasContext extends Path2D {
     super.copy(source);
     this.strokeStyle = source.strokeStyle;
     this.fillStyle = source.fillStyle;
-    this.textureTransform = source.textureTransform;
+    this.uvTransform = source.uvTransform;
+    this.vertTransform = source.vertTransform;
     this.lineCap = source.lineCap;
     this.lineJoin = source.lineJoin;
     this.lineWidth = source.lineWidth;
@@ -7221,7 +7226,8 @@ class CanvasContext extends Path2D {
     super.reset();
     this.strokeStyle = void 0;
     this.fillStyle = void 0;
-    this.textureTransform = void 0;
+    this.uvTransform = void 0;
+    this.vertTransform = void 0;
     this.lineCap = void 0;
     this.lineJoin = void 0;
     this.lineWidth = void 0;
@@ -7229,8 +7235,9 @@ class CanvasContext extends Path2D {
     this._draws.length = 0;
     return this;
   }
-  buildUvs(start, vertices, uvs, texture, textureTransform) {
+  buildUvs(start, vertices, uvs, texture, uvTransform) {
     if (texture) {
+      const _uvTransform = uvTransform ? typeof uvTransform === "function" ? uvTransform : (x, y) => uvTransform.applyToPoint(x, y) : uvTransform;
       const w = texture.width;
       const h = texture.height;
       for (let len = vertices.length, i = start; i < len; i += 2) {
@@ -7238,8 +7245,8 @@ class CanvasContext extends Path2D {
         const y = vertices[i + 1];
         let uvX;
         let uvY;
-        if (textureTransform) {
-          [uvX, uvY] = textureTransform?.applyToPoint(x, y);
+        if (_uvTransform) {
+          [uvX, uvY] = _uvTransform(x, y);
         } else {
           [uvX, uvY] = [x / w, y / h];
         }
@@ -7253,59 +7260,35 @@ class CanvasContext extends Path2D {
   }
   toBatchables() {
     const batchables = [];
-    let vertices = [];
-    let indices = [];
-    let uvs = [];
-    let texture;
-    const push = (draw) => {
-      batchables.push({
-        vertices,
-        indices,
-        uvs,
-        texture,
-        type: draw.type,
-        disableWrapMode: draw.disableWrapMode
-      });
-      vertices = [];
-      indices = [];
-      uvs = [];
-      texture = void 0;
-    };
     for (let len = this._draws.length, i = 0; i < len; i++) {
-      const draw = this._draws[i];
-      const prev = this._draws[i - 1];
-      if (vertices.length && prev && prev?.type !== draw.type) {
-        push(prev);
-      }
-      const oldTexture = texture;
-      if (!oldTexture) {
-        texture = draw.texture;
-      }
-      if (vertices.length && oldTexture !== draw.texture && !oldTexture?.is(draw.texture)) {
-        push(draw);
-        texture = draw.texture;
-      }
-      const start = vertices.length;
-      if (draw.type === "fill") {
-        draw.path.fillTriangulate({
+      const current = this._draws[i];
+      const vertices = [];
+      const indices = [];
+      const uvs = [];
+      if (current.type === "fill") {
+        current.path.fillTriangulate({
           vertices,
           indices
         });
-        this.buildUvs(start, vertices, uvs, draw.texture, draw.textureTransform);
       } else {
-        draw.path.strokeTriangulate({
+        current.path.strokeTriangulate({
           vertices,
           indices,
-          lineStyle: draw.style,
+          lineStyle: current.style,
           flipAlignment: false,
           closed: true
         });
-        this.buildUvs(start, vertices, uvs, draw.texture, draw.textureTransform);
       }
-    }
-    const last = this._draws[this._draws.length - 1];
-    if (last && vertices.length) {
-      push(last);
+      this.buildUvs(0, vertices, uvs, current.texture, current.uvTransform);
+      batchables.push({
+        vertices,
+        indices,
+        uvs,
+        texture: current.texture,
+        type: current.type,
+        disableWrapMode: current.disableWrapMode,
+        vertTransform: current.vertTransform
+      });
     }
     return batchables;
   }
@@ -7384,11 +7367,6 @@ let CanvasItem = class extends TimelineNode {
   requestRelayout() {
     this._relayouting = true;
     this.requestUpdate();
-    this.forEachChild((node) => {
-      if (node instanceof CanvasItem) {
-        node.requestRelayout();
-      }
-    });
   }
   requestRepaint() {
     this._repainting = true;
@@ -9018,7 +8996,7 @@ class BaseElement2DFill extends CoreObject {
   _getDrawOptions() {
     let disableWrapMode = false;
     const { width, height } = this.parent.size;
-    const textureTransform = new Transform2D().scale(1 / width, 1 / height);
+    const uvTransform = new Transform2D().scale(1 / width, 1 / height);
     if (this.cropRect) {
       const {
         left = 0,
@@ -9026,7 +9004,7 @@ class BaseElement2DFill extends CoreObject {
         right = 0,
         bottom = 0
       } = this.cropRect;
-      textureTransform.scale(
+      uvTransform.scale(
         Math.abs(1 - (left + right)),
         Math.abs(1 - (top + bottom))
       ).translate(left, top);
@@ -9041,24 +9019,26 @@ class BaseElement2DFill extends CoreObject {
         // flip, TODO
         // alignment, TODO
       } = this.tile;
-      textureTransform.translate(-translateX / width, -translateY / height).scale(1 / scaleX, 1 / scaleY);
+      uvTransform.translate(-translateX / width, -translateY / height).scale(1 / scaleX, 1 / scaleY);
       disableWrapMode = true;
     } else if (this.stretchRect) {
       const { left = 0, top = 0, right = 0, bottom = 0 } = this.stretchRect;
-      textureTransform.scale(
+      uvTransform.scale(
         Math.abs(1 - (-left + -right)),
         Math.abs(1 - (-top + -bottom))
       ).translate(-left, -top);
       disableWrapMode = true;
     }
-    return { disableWrapMode, textureTransform };
+    return { disableWrapMode, uvTransform };
   }
   draw() {
     const ctx = this.parent.context;
-    const { textureTransform, disableWrapMode } = this._getDrawOptions();
-    ctx.textureTransform = textureTransform;
+    const { uvTransform, disableWrapMode } = this._getDrawOptions();
+    ctx.uvTransform = uvTransform;
     ctx.fillStyle = this._texture ?? this.color;
-    ctx.fill({ disableWrapMode });
+    ctx.fill({
+      disableWrapMode
+    });
   }
 }
 __decorateClass$u([
@@ -9163,9 +9143,9 @@ class BaseElement2DOutline extends BaseElement2DFill {
   }
   draw() {
     const ctx = this.parent.context;
-    const { textureTransform, disableWrapMode } = this._getDrawOptions();
+    const { uvTransform, disableWrapMode } = this._getDrawOptions();
     ctx.lineWidth = this.width || 1;
-    ctx.textureTransform = textureTransform;
+    ctx.uvTransform = uvTransform;
     ctx.strokeStyle = this._texture ?? this.color;
     ctx.stroke({ disableWrapMode });
   }
@@ -9413,7 +9393,6 @@ class BaseElement2DText extends CoreObject {
     );
   }
   draw() {
-    const ctx = this.parent.context;
     this.baseText.render({
       pixelRatio: this.texture.pixelRatio,
       view: this.texture.source
@@ -9421,8 +9400,17 @@ class BaseElement2DText extends CoreObject {
     this.texture.requestUpload();
     const textWidth = this.measureResult?.boundingBox.width ?? this.parent.size.width;
     const textHeight = this.measureResult?.boundingBox.height ?? this.parent.size.height;
+    const ctx = this.parent.context;
     ctx.fillStyle = this.texture;
-    ctx.textureTransform = new Transform2D().scale(1 / textWidth, 1 / textHeight);
+    ctx.uvTransform = new Transform2D().scale(1 / textWidth, 1 / textHeight);
+    ctx.vertTransform = () => {
+      const parent = this.parent;
+      const origin = parent.getTransformOrigin();
+      return new Transform2D().translate(-origin.x, -origin.y).scale(
+        parent.globalScale.x > 0 ? 1 : -1,
+        parent.globalScale.y > 0 ? 1 : -1
+      ).translate(origin.x, origin.y);
+    };
     ctx.fill();
   }
 }
@@ -9463,8 +9451,19 @@ let Node2D = class extends CanvasItem {
     super();
     this.setProperties(properties).append(nodes);
   }
+  getTransformOrigin() {
+    return new Vector2(0, 0);
+  }
+  getTransform(cb) {
+    const origin = this.getTransformOrigin();
+    const transform = new Transform2D();
+    transform.translate(-origin.x, -origin.y).scale(this.scale.x, this.scale.y).skew(this.skew.x, this.skew.y).rotate(this.rotation);
+    cb?.(transform);
+    transform.translate(this.position.x, this.position.y).translate(origin.x, origin.y);
+    return transform;
+  }
   _updateTransform() {
-    this.transform.identity().scale(this.scale.x, this.scale.y).skew(this.skew.x, this.skew.y).rotate(this.rotation).translate(this.position.x, this.position.y);
+    this.transform.copy(this.getTransform());
   }
   _updateGlobalTransform() {
     const parent = this.getParent();
@@ -9491,8 +9490,17 @@ let Node2D = class extends CanvasItem {
     this.globalSkew.y = Math.atan2(b, d) - this.globalRotation;
     this.requestRelayout();
   }
-  _transformVertices(vertices) {
-    const [a, c, tx, b, d, ty] = this.globalTransform.toArray();
+  _transformVertices(vertices, vertTransform) {
+    let a, c, tx, b, d, ty;
+    if (vertTransform) {
+      const globalTransform = this.globalTransform.clone();
+      globalTransform.multiply(
+        typeof vertTransform === "function" ? vertTransform?.() : vertTransform
+      );
+      [a, c, tx, b, d, ty] = globalTransform.toArray();
+    } else {
+      [a, c, tx, b, d, ty] = this.globalTransform.toArray();
+    }
     const newVertices = vertices.slice();
     for (let len = vertices.length, i = 0; i < len; i += 2) {
       const x = vertices[i];
@@ -9508,7 +9516,7 @@ let Node2D = class extends CanvasItem {
     return super._relayout(batchables).map((batchable) => {
       return {
         ...batchable,
-        vertices: this._transformVertices(batchable.vertices)
+        vertices: this._transformVertices(batchable.vertices, batchable.vertTransform)
       };
     });
   }
@@ -9715,14 +9723,17 @@ let BaseElement2D = class extends Node2D {
       }
     }
   }
-  _updateTransform() {
+  getTransformOrigin() {
     const { width, height } = this.size;
     const [originX, originY] = parseCSSTransformOrigin(this.style.transformOrigin);
-    const offsetX = originX * width;
-    const offsetY = originY * height;
-    this.transform.identity().translate(-offsetX, -offsetY).scale(this.scale.x, this.scale.y).skew(this.skew.x, this.skew.y).rotate(this.rotation);
-    parseCSSTransform(this.style.transform ?? "", width, height, this.transform);
-    this.transform.translate(this.position.x, this.position.y).translate(offsetX, offsetY);
+    return new Vector2(originX * width, originY * height);
+  }
+  getTransform(cb) {
+    const { width, height } = this.size;
+    return super.getTransform((transform) => {
+      parseCSSTransform(this.style.transform ?? "", width, height, transform);
+      cb?.(transform);
+    });
   }
   _updateGlobalTransform() {
     super._updateGlobalTransform();
@@ -10514,7 +10525,7 @@ let Image2D = class extends Element2D {
       const sy = 1 / h;
       const tx = left * width * sx;
       const ty = top * height * sy;
-      this.context.textureTransform = new Transform2D().scale(sx, sy).translate(tx, ty);
+      this.context.uvTransform = new Transform2D().scale(sx, sy).translate(tx, ty);
       this.shape.draw();
       this.context.fill();
     }
@@ -10554,7 +10565,7 @@ class TextureRect2D extends Element2D {
     if (this.texture?.valid) {
       const { width, height } = this.size;
       this.context.fillStyle = this.texture;
-      this.context.textureTransform = new Transform2D().scale(
+      this.context.uvTransform = new Transform2D().scale(
         1 / width,
         1 / height
       );
@@ -12464,7 +12475,7 @@ let AudioWaveform = class extends Element2D {
     const src = this._src;
     if (src?.valid) {
       this.context.fillStyle = src;
-      this.context.textureTransform = new Transform2D().scale(
+      this.context.uvTransform = new Transform2D().scale(
         1 / this.style.width,
         1 / this.style.height
       );
@@ -12738,7 +12749,7 @@ let Ruler = class extends Control {
     const texture = this.texture;
     if (texture?.valid) {
       this.context.fillStyle = texture;
-      this.context.textureTransform = new Transform2D().scale(
+      this.context.uvTransform = new Transform2D().scale(
         1 / this.size.width,
         1 / this.size.height
       );

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "modern-canvas",
   "type": "module",
-  "version": "0.4.51",
+  "version": "0.4.52",
   "packageManager": "pnpm@9.15.1",
   "description": "A JavaScript WebGL rendering engine.",
   "author": "wxm",