modern-canvas 0.1.4 → 0.1.6

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';
 
@@ -246,6 +246,45 @@ class EventEmitter {
   }
 }
 
+class RawWeakMap {
+  _map = /* @__PURE__ */ new WeakMap();
+  _toRaw(value) {
+    if (value && typeof value === "object") {
+      if ("__v_raw" in value) {
+        value = value.__v_raw;
+      }
+    }
+    return value;
+  }
+  /**
+   * Removes the specified element from the WeakMap.
+   * @returns true if the element was successfully removed, or false if it was not present.
+   */
+  delete(key) {
+    return this._map.delete(this._toRaw(key));
+  }
+  /**
+   * @returns a specified element.
+   */
+  get(key) {
+    return this._map.get(this._toRaw(key));
+  }
+  /**
+   * @returns a boolean indicating whether an element with the specified key exists or not.
+   */
+  has(key) {
+    return this._map.has(this._toRaw(key));
+  }
+  /**
+   * Adds a new element with a specified key and value.
+   * @param key Must be an object or symbol.
+   */
+  set(key, value) {
+    this._map.set(this._toRaw(key), this._toRaw(value));
+    return this;
+  }
+}
+
 const customNodes = /* @__PURE__ */ new Map();
 function customNode(options) {
   let tag;
@@ -272,7 +311,7 @@ function customNode(options) {
   };
 }
 
-const declarationMap = /* @__PURE__ */ new WeakMap();
+const declarationMap = new RawWeakMap();
 function getDeclarations(constructor) {
   let declarations = declarationMap.get(constructor);
   if (!declarations) {
@@ -537,7 +576,7 @@ class Geometry extends Resource {
   indexBuffer;
   instanceCount;
   mode;
-  _materialWeakMap = /* @__PURE__ */ new WeakMap();
+  _materialWeakMap = new RawWeakMap();
   constructor(options = {}) {
     super();
     this.vertexAttributes = new Map(Object.entries(options?.vertexAttributes ?? {}));
@@ -3386,8 +3425,8 @@ class CanvasContext extends Path2D {
   lineWidth;
   miterLimit;
   _defaultStyle = Texture.EMPTY;
-  _stroked = [];
-  _filled = [];
+  _stroke = [];
+  _fille = [];
   stroke() {
     let texture = this._defaultStyle;
     if (this.strokeStyle) {
@@ -3398,8 +3437,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,6 +3449,7 @@ class CanvasContext extends Path2D {
           miterLimit: this.miterLimit ?? 10
         }
       });
+      this.currentCurve = new CurvePath();
       this.curves = [this.currentCurve];
     }
   }
@@ -3428,14 +3468,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.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 +3498,9 @@ class CanvasContext extends 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) {
@@ -3483,15 +3538,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 +3552,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) {
@@ -4448,7 +4497,7 @@ let Animation2D = class extends Node {
   easing;
   _keyframes = [];
   _starting = false;
-  _startProps = /* @__PURE__ */ new WeakMap();
+  _startProps = new RawWeakMap();
   constructor(options) {
     super();
     this._onUpdateTime = this._onUpdateTime.bind(this);
@@ -9299,7 +9348,7 @@ class Renderer {
   view;
   pixelRatio = DEVICE_PIXEL_RATIO;
   screen = { x: 0, y: 0, width: 0, height: 0 };
-  related = /* @__PURE__ */ new WeakMap();
+  related = new RawWeakMap();
   getRelated(source, createFn) {
     let related = this.related.get(source);
     if (related)
@@ -10371,7 +10420,7 @@ class WebGLProgramModule extends WebGLModule {
       return {
         attributes: /* @__PURE__ */ new Map(),
         uniforms: /* @__PURE__ */ new Map(),
-        boundUniforms: /* @__PURE__ */ new WeakMap()
+        boundUniforms: new RawWeakMap()
       };
     });
   }
@@ -11529,4 +11578,4 @@ async function render(options) {
   });
 }
 
-export { Animation2D, Assets, Audio, AudioPipeline, AudioProcessor, AudioSpectrum, AudioWaveform, BlurEffect, CanvasContext, CanvasItem, Color, ColorAdjustEffect, ColorFilterEffect, ColorMatrix, ColorOverlayEffect, ColorRemoveEffect, ColorReplaceEffect, ColorTexture, DEG_TO_RAD, DEVICE_PIXEL_RATIO, Effect, EffectMaterial, EmbossEffect, Engine, EventEmitter, FontLoader, Geometry, GifLoader, GlitchEffect, GodrayEffect, Graphics2D, HTMLAudio, HTMLAudioContext, HTMLSound, IN_BROWSER, Image2D, Image2DResource, ImageTexture, IndexBuffer, Input, InternalMode, JsonLoader, KawaseEffect, LeftEraseEffect, Loader, Lottie2D, LottieLoader, MainLoop, MaskEffect, Material, Matrix, Matrix2, Matrix3, Matrix4, MouseInputEvent, Node, Node2D, PI, PI_2, PixelateEffect, PixelsTexture, PointerInputEvent, Projection2D, QuadGeometry, QuadUvGeometry, RAD_TO_DEG, Reference, RenderStack, Renderer, Resource, SUPPORTS_AUDIO_CONTEXT, SUPPORTS_CLICK_EVENTS, SUPPORTS_CREATE_IMAGE_BITMAP, SUPPORTS_IMAGE_BITMAP, SUPPORTS_MOUSE_EVENTS, SUPPORTS_OFFLINE_AUDIO_CONTEXT, SUPPORTS_POINTER_EVENTS, SUPPORTS_RESIZE_OBSERVER, SUPPORTS_TOUCH_EVENTS, SUPPORTS_WEBGL2, SUPPORTS_WEBKIT_AUDIO_CONTEXT, SUPPORTS_WEBKIT_OFFLINE_AUDIO_CONTEXT, SUPPORTS_WEB_AUDIO, SUPPORTS_WHEEL_EVENTS, SceneTree, Style2D, Style2DBackgroundModule, Style2DFilterModule, Style2DModule, Style2DTextModule, Style2DTransformModule, Text2D, TextLoader, Texture, TextureLoader, Ticker, TiltShiftEffect, Timer, Transform2D, TwistEffect, UIInputEvent, UvGeometry, UvMaterial, Vector, Vector2, Vector3, Vector4, VertexAttribute, VertexBuffer, Video2D, VideoLoader, VideoTexture, Viewport, ViewportTexture, WebAudio, WebAudioContext, WebGLBatch2DModule, WebGLBlendMode, WebGLBufferModule, WebGLFramebufferModule, WebGLMaskModule, WebGLModule, WebGLProgramModule, WebGLRenderer, WebGLScissorModule, WebGLState, WebGLStateModule, WebGLStencilModule, WebGLTextureModule, WebGLVertexArrayModule, WebGLViewportModule, WebSound, WheelInputEvent, ZoomBlurEffect, _Object, assets, clamp, createHTMLCanvas, createNode, crossOrigin, cubicBezier, curves, customNode, customNodes, defaultOptions, defineProperty, determineCrossOrigin, ease, easeIn, easeInOut, easeOut, getDeclarations, getDefaultCssPropertyValue, isCanvasElement, isElementNode, isImageElement, isPow2, isVideoElement, isWebgl2, lerp, linear, log2, mapWebGLBlendModes, nextPow2, nextTick, parseCssFunctions, parseCssProperty, property, protectedProperty, render, timingFunctions, uid };
+export { Animation2D, Assets, Audio, AudioPipeline, AudioProcessor, AudioSpectrum, AudioWaveform, BlurEffect, CanvasContext, CanvasItem, Color, ColorAdjustEffect, ColorFilterEffect, ColorMatrix, ColorOverlayEffect, ColorRemoveEffect, ColorReplaceEffect, ColorTexture, DEG_TO_RAD, DEVICE_PIXEL_RATIO, Effect, EffectMaterial, EmbossEffect, Engine, EventEmitter, FontLoader, Geometry, GifLoader, GlitchEffect, GodrayEffect, Graphics2D, HTMLAudio, HTMLAudioContext, HTMLSound, IN_BROWSER, Image2D, Image2DResource, ImageTexture, IndexBuffer, Input, InternalMode, JsonLoader, KawaseEffect, LeftEraseEffect, Loader, Lottie2D, LottieLoader, MainLoop, MaskEffect, Material, Matrix, Matrix2, Matrix3, Matrix4, MouseInputEvent, Node, Node2D, PI, PI_2, PixelateEffect, PixelsTexture, PointerInputEvent, Projection2D, QuadGeometry, QuadUvGeometry, RAD_TO_DEG, RawWeakMap, Reference, RenderStack, Renderer, Resource, SUPPORTS_AUDIO_CONTEXT, SUPPORTS_CLICK_EVENTS, SUPPORTS_CREATE_IMAGE_BITMAP, SUPPORTS_IMAGE_BITMAP, SUPPORTS_MOUSE_EVENTS, SUPPORTS_OFFLINE_AUDIO_CONTEXT, SUPPORTS_POINTER_EVENTS, SUPPORTS_RESIZE_OBSERVER, SUPPORTS_TOUCH_EVENTS, SUPPORTS_WEBGL2, SUPPORTS_WEBKIT_AUDIO_CONTEXT, SUPPORTS_WEBKIT_OFFLINE_AUDIO_CONTEXT, SUPPORTS_WEB_AUDIO, SUPPORTS_WHEEL_EVENTS, SceneTree, Style2D, Style2DBackgroundModule, Style2DFilterModule, Style2DModule, Style2DTextModule, Style2DTransformModule, Text2D, TextLoader, Texture, TextureLoader, Ticker, TiltShiftEffect, Timer, Transform2D, TwistEffect, UIInputEvent, UvGeometry, UvMaterial, Vector, Vector2, Vector3, Vector4, VertexAttribute, VertexBuffer, Video2D, VideoLoader, VideoTexture, Viewport, ViewportTexture, WebAudio, WebAudioContext, WebGLBatch2DModule, WebGLBlendMode, WebGLBufferModule, WebGLFramebufferModule, WebGLMaskModule, WebGLModule, WebGLProgramModule, WebGLRenderer, WebGLScissorModule, WebGLState, WebGLStateModule, WebGLStencilModule, WebGLTextureModule, WebGLVertexArrayModule, WebGLViewportModule, WebSound, WheelInputEvent, ZoomBlurEffect, _Object, assets, clamp, createHTMLCanvas, createNode, crossOrigin, cubicBezier, curves, customNode, customNodes, defaultOptions, defineProperty, determineCrossOrigin, ease, easeIn, easeInOut, easeOut, getDeclarations, getDefaultCssPropertyValue, isCanvasElement, isElementNode, isImageElement, isPow2, isVideoElement, isWebgl2, lerp, linear, log2, mapWebGLBlendModes, nextPow2, nextTick, parseCssFunctions, parseCssProperty, property, protectedProperty, render, timingFunctions, uid };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "modern-canvas",
   "type": "module",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "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": {