modern-canvas 0.1.3 → 0.1.5

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import { extend, colord } from 'colord';
 import namesPlugin from 'colord/plugins/names';
-import { Path2D, strokeTriangulate, BoundingBox } from 'modern-path2d';
+import { Path2D, CurvePath, BoundingBox } from 'modern-path2d';
 import { getDefaultTextStyle, getDefaultTransformStyle } from 'modern-idoc';
 import { textDefaultStyle, Text } from 'modern-text';
 
@@ -3386,8 +3386,8 @@ class CanvasContext extends Path2D {
   lineWidth;
   miterLimit;
   _defaultStyle = Texture.EMPTY;
-  _stroked = [];
-  _filled = [];
+  _stroke = [];
+  _fille = [];
   stroke() {
     let texture = this._defaultStyle;
     if (this.strokeStyle) {
@@ -3398,8 +3398,8 @@ class CanvasContext extends Path2D {
       }
     }
     if (this.curves.length) {
-      this._stroked.push({
-        shapes: this.curves.slice(),
+      this._stroke.push({
+        path: new Path2D(this),
         texture,
         textureTransform: this.textureTransform,
         style: {
@@ -3410,7 +3410,8 @@ class CanvasContext extends Path2D {
           miterLimit: this.miterLimit ?? 10
         }
       });
-      this.curves.length = 0;
+      this.currentCurve = new CurvePath();
+      this.curves = [this.currentCurve];
     }
   }
   fillRect(x, y, width, height) {
@@ -3428,14 +3429,29 @@ class CanvasContext extends Path2D {
         texture = new ColorTexture(this.fillStyle);
       }
     }
-    this._filled.push({
-      shapes: this.curves.slice(),
+    this._fille.push({
+      path: new Path2D(this),
       texture,
       textureTransform: this.textureTransform
     });
-    this.curves.length = 0;
+    this.currentCurve = new 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;
@@ -3443,9 +3459,9 @@ class CanvasContext extends Path2D {
     this.lineJoin = void 0;
     this.lineWidth = void 0;
     this.miterLimit = void 0;
-    this.curves.length = 0;
-    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) {
@@ -3483,15 +3499,11 @@ class CanvasContext extends 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);
-      }
-      strokeTriangulate(points, {
+      graphics.path.strokeTriangulate({
         vertices,
         indices,
         lineStyle: graphics.style,
@@ -3501,19 +3513,17 @@ class CanvasContext extends 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/package.json

@@ -1,7 +1,7 @@
 {
   "name": "modern-canvas",
   "type": "module",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "packageManager": "pnpm@9.15.1",
   "description": "A JavaScript WebGL rendering engine.",
   "author": "wxm",
@@ -71,7 +71,7 @@
     "earcut": "^3.0.1",
     "modern-font": "^0.3.5",
     "modern-idoc": "^0.1.5",
-    "modern-path2d": "^1.2.2",
+    "modern-path2d": "^1.2.3",
     "modern-text": "^1.2.0"
   },
   "devDependencies": {