modern-canvas 0.1.4 → 0.1.5

package/dist/index.cjs

@@ -3392,8 +3392,8 @@ class CanvasContext extends modernPath2d.Path2D {
   lineWidth;
   miterLimit;
   _defaultStyle = Texture.EMPTY;
-  _stroked = [];
-  _filled = [];
+  _stroke = [];
+  _fille = [];
   stroke() {
     let texture = this._defaultStyle;
     if (this.strokeStyle) {
@@ -3404,8 +3404,8 @@ class CanvasContext extends modernPath2d.Path2D {
       }
     }
     if (this.curves.length) {
-      this._stroked.push({
-        shapes: this.curves.slice(),
+      this._stroke.push({
+        path: new modernPath2d.Path2D(this),
         texture,
         textureTransform: this.textureTransform,
         style: {
@@ -3416,6 +3416,7 @@ class CanvasContext extends modernPath2d.Path2D {
           miterLimit: this.miterLimit ?? 10
         }
       });
+      this.currentCurve = new modernPath2d.CurvePath();
       this.curves = [this.currentCurve];
     }
   }
@@ -3434,14 +3435,29 @@ class CanvasContext extends modernPath2d.Path2D {
         texture = new ColorTexture(this.fillStyle);
       }
     }
-    this._filled.push({
-      shapes: this.curves.slice(),
+    this._fille.push({
+      path: new modernPath2d.Path2D(this),
       texture,
       textureTransform: this.textureTransform
     });
+    this.currentCurve = new modernPath2d.CurvePath();
     this.curves = [this.currentCurve];
   }
+  copy(source) {
+    super.copy(source);
+    this.strokeStyle = source.strokeStyle;
+    this.fillStyle = source.fillStyle;
+    this.textureTransform = source.textureTransform;
+    this.lineCap = source.lineCap;
+    this.lineJoin = source.lineJoin;
+    this.lineWidth = source.lineWidth;
+    this.miterLimit = source.miterLimit;
+    this._stroke = source._stroke.slice();
+    this._fille = source._fille.slice();
+    return this;
+  }
   reset() {
+    super.reset();
     this.strokeStyle = void 0;
     this.fillStyle = void 0;
     this.textureTransform = void 0;
@@ -3449,9 +3465,9 @@ class CanvasContext extends modernPath2d.Path2D {
     this.lineJoin = void 0;
     this.lineWidth = void 0;
     this.miterLimit = void 0;
-    this.curves = [this.currentCurve];
-    this._stroked.length = 0;
-    this._filled.length = 0;
+    this._stroke.length = 0;
+    this._fille.length = 0;
+    return this;
   }
   buildUvs(start, vertices, uvs, texture, textureTransform) {
     if (texture) {
@@ -3489,15 +3505,11 @@ class CanvasContext extends modernPath2d.Path2D {
       uvs = [];
       texture = void 0;
     };
-    for (let len = this._stroked.length, i = 0; i < len; i++) {
+    for (let len = this._stroke.length, i = 0; i < len; i++) {
       startUv = vertices.length;
-      const graphics = this._stroked[i];
+      const graphics = this._stroke[i];
       texture ??= graphics.texture;
-      const points = [];
-      for (let len2 = graphics.shapes.length, i2 = 0; i2 < len2; i2++) {
-        graphics.shapes[i2].getAdaptivePointArray(points);
-      }
-      modernPath2d.strokeTriangulate(points, {
+      graphics.path.strokeTriangulate({
         vertices,
         indices,
         lineStyle: graphics.style,
@@ -3507,19 +3519,17 @@ class CanvasContext extends modernPath2d.Path2D {
       this.buildUvs(startUv, vertices, uvs, graphics.texture, graphics.textureTransform);
       push("stroke");
     }
-    for (let len = this._filled.length, i = 0; i < len; i++) {
-      const graphics = this._filled[i];
+    for (let len = this._fille.length, i = 0; i < len; i++) {
+      const graphics = this._fille[i];
       texture ??= graphics.texture;
       if (texture !== graphics.texture) {
         push("fill");
       }
       startUv = vertices.length;
-      for (let len2 = graphics.shapes.length, i2 = 0; i2 < len2; i2++) {
-        graphics.shapes[i2].fillTriangulate({
-          vertices,
-          indices
-        });
-      }
+      graphics.path.fillTriangulate({
+        vertices,
+        indices
+      });
       this.buildUvs(startUv, vertices, uvs, graphics.texture, graphics.textureTransform);
     }
     if (vertices.length) {

package/dist/index.d.cts

@@ -1,5 +1,5 @@
 import { Visibility, Overflow, IDOCTextStyleDeclaration, IDOCTransformStyleDeclaration } from 'modern-idoc';
-import { CurvePath, LineStyle, Path2D, LineCap, LineJoin, BoundingBox } from 'modern-path2d';
+import { Path2D, LineStyle, LineCap, LineJoin, BoundingBox } from 'modern-path2d';
 import { AnyColor, Colord } from 'colord';
 import { AnimationItem } from 'lottie-web';
 import { TextOptions, Text, MeasureResult } from 'modern-text';
@@ -1488,13 +1488,13 @@ interface CanvasBatchable extends Batchable2D {
     texture?: Texture;
 }
 interface StrokedGraphics {
-    shapes: CurvePath[];
+    path: Path2D;
     texture?: Texture;
     textureTransform?: Transform2D;
     style: LineStyle;
 }
 interface FilledGraphics {
-    shapes: CurvePath[];
+    path: Path2D;
     texture?: Texture;
     textureTransform?: Transform2D;
 }
@@ -1506,14 +1506,15 @@ declare class CanvasContext extends Path2D {
     lineJoin?: LineJoin;
     lineWidth?: number;
     miterLimit?: number;
-    protected _defaultStyle: Texture<TextureSource>;
-    protected _stroked: StrokedGraphics[];
-    protected _filled: FilledGraphics[];
+    _defaultStyle: Texture<TextureSource>;
+    _stroke: StrokedGraphics[];
+    _fille: FilledGraphics[];
     stroke(): void;
     fillRect(x: number, y: number, width: number, height: number): void;
     strokeRect(x: number, y: number, width: number, height: number): void;
     fill(): void;
-    reset(): void;
+    copy(source: CanvasContext): this;
+    reset(): this;
     buildUvs(start: number, vertices: number[], uvs: number[], texture?: Texture, textureTransform?: Transform2D): void;
     toBatchables(): CanvasBatchable[];
 }

package/dist/index.d.mts

@@ -1,5 +1,5 @@
 import { Visibility, Overflow, IDOCTextStyleDeclaration, IDOCTransformStyleDeclaration } from 'modern-idoc';
-import { CurvePath, LineStyle, Path2D, LineCap, LineJoin, BoundingBox } from 'modern-path2d';
+import { Path2D, LineStyle, LineCap, LineJoin, BoundingBox } from 'modern-path2d';
 import { AnyColor, Colord } from 'colord';
 import { AnimationItem } from 'lottie-web';
 import { TextOptions, Text, MeasureResult } from 'modern-text';
@@ -1488,13 +1488,13 @@ interface CanvasBatchable extends Batchable2D {
     texture?: Texture;
 }
 interface StrokedGraphics {
-    shapes: CurvePath[];
+    path: Path2D;
     texture?: Texture;
     textureTransform?: Transform2D;
     style: LineStyle;
 }
 interface FilledGraphics {
-    shapes: CurvePath[];
+    path: Path2D;
     texture?: Texture;
     textureTransform?: Transform2D;
 }
@@ -1506,14 +1506,15 @@ declare class CanvasContext extends Path2D {
     lineJoin?: LineJoin;
     lineWidth?: number;
     miterLimit?: number;
-    protected _defaultStyle: Texture<TextureSource>;
-    protected _stroked: StrokedGraphics[];
-    protected _filled: FilledGraphics[];
+    _defaultStyle: Texture<TextureSource>;
+    _stroke: StrokedGraphics[];
+    _fille: FilledGraphics[];
     stroke(): void;
     fillRect(x: number, y: number, width: number, height: number): void;
     strokeRect(x: number, y: number, width: number, height: number): void;
     fill(): void;
-    reset(): void;
+    copy(source: CanvasContext): this;
+    reset(): this;
     buildUvs(start: number, vertices: number[], uvs: number[], texture?: Texture, textureTransform?: Transform2D): void;
     toBatchables(): CanvasBatchable[];
 }

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { Visibility, Overflow, IDOCTextStyleDeclaration, IDOCTransformStyleDeclaration } from 'modern-idoc';
-import { CurvePath, LineStyle, Path2D, LineCap, LineJoin, BoundingBox } from 'modern-path2d';
+import { Path2D, LineStyle, LineCap, LineJoin, BoundingBox } from 'modern-path2d';
 import { AnyColor, Colord } from 'colord';
 import { AnimationItem } from 'lottie-web';
 import { TextOptions, Text, MeasureResult } from 'modern-text';
@@ -1488,13 +1488,13 @@ interface CanvasBatchable extends Batchable2D {
     texture?: Texture;
 }
 interface StrokedGraphics {
-    shapes: CurvePath[];
+    path: Path2D;
     texture?: Texture;
     textureTransform?: Transform2D;
     style: LineStyle;
 }
 interface FilledGraphics {
-    shapes: CurvePath[];
+    path: Path2D;
     texture?: Texture;
     textureTransform?: Transform2D;
 }
@@ -1506,14 +1506,15 @@ declare class CanvasContext extends Path2D {
     lineJoin?: LineJoin;
     lineWidth?: number;
     miterLimit?: number;
-    protected _defaultStyle: Texture<TextureSource>;
-    protected _stroked: StrokedGraphics[];
-    protected _filled: FilledGraphics[];
+    _defaultStyle: Texture<TextureSource>;
+    _stroke: StrokedGraphics[];
+    _fille: FilledGraphics[];
     stroke(): void;
     fillRect(x: number, y: number, width: number, height: number): void;
     strokeRect(x: number, y: number, width: number, height: number): void;
     fill(): void;
-    reset(): void;
+    copy(source: CanvasContext): this;
+    reset(): this;
     buildUvs(start: number, vertices: number[], uvs: number[], texture?: Texture, textureTransform?: Transform2D): void;
     toBatchables(): CanvasBatchable[];
 }