modern-canvas 0.7.3 → 0.7.5

package/dist/index.cjs

@@ -2405,25 +2405,6 @@ class WebGLBatch2DModule extends WebGLModule {
   _drawCallUid = 0;
   _defaultModulate = 4294967295;
   _defaultBackgroundColor = 0;
-  _defaultColorMatrixOffset = [0, 0, 0, 0];
-  _defaultColorMatrix = [
-    1,
-    0,
-    0,
-    0,
-    0,
-    1,
-    0,
-    0,
-    0,
-    0,
-    1,
-    0,
-    0,
-    0,
-    0,
-    1
-  ];
   _batchables = [];
   _vertexCount = 0;
   _indexCount = 0;
@@ -2441,14 +2422,10 @@ class WebGLBatch2DModule extends WebGLModule {
     // 1
     aBackgroundColor: { size: 4, normalized: true, type: "unsigned_byte" },
     // 1
-    aDisableWrapMode: { size: 4, normalized: true, type: "float" },
-    // 4 只是为了凑4的整数倍
-    aColorMatrixOffset: { size: 4, normalized: false, type: "float" },
-    // 4 TODO bug
-    aColorMatrix: { size: 4, normalized: false, type: "float" }
-    // 16 TODO bug
+    aDisableWrapMode: { size: 4, normalized: true, type: "unsigned_byte" }
+    // 1
   };
-  _vertexSize = 1 + 2 + 2 + 1 + 1 + 4 + 4 + 16;
+  _vertexSize = 1 + 2 + 2 + 1 + 1 + 1;
   _getShader(maxTextureUnits) {
     let shader = this._shaders.get(maxTextureUnits);
     if (!shader) {
@@ -2465,8 +2442,6 @@ attribute vec2 aPosition;
 attribute vec2 aUv;
 attribute vec4 aModulate;
 attribute vec4 aBackgroundColor;
-attribute mat4 aColorMatrix;
-attribute vec4 aColorMatrixOffset;
 attribute vec4 aDisableWrapMode;
 
 uniform mat3 projectionMatrix;
@@ -2477,8 +2452,6 @@ varying float vTextureId;
 varying vec2 vUv;
 varying vec4 vModulate;
 varying vec4 vBackgroundColor;
-varying mat4 vColorMatrix;
-varying vec4 vColorMatrixOffset;
 varying vec4 vDisableWrapMode;
 
 void main(void) {
@@ -2493,8 +2466,6 @@ void main(void) {
   vUv = aUv;
   vModulate = aModulate * modulate;
   vBackgroundColor = aBackgroundColor;
-  vColorMatrix = aColorMatrix;
-  vColorMatrixOffset = aColorMatrixOffset;
   vDisableWrapMode = aDisableWrapMode;
 }`,
       frag: `precision highp float;
@@ -2502,8 +2473,6 @@ varying float vTextureId;
 varying vec2 vUv;
 varying vec4 vModulate;
 varying vec4 vBackgroundColor;
-varying mat4 vColorMatrix;
-varying vec4 vColorMatrixOffset;
 varying vec4 vDisableWrapMode;
 
 uniform sampler2D samplers[${maxTextureUnits}];
@@ -2536,8 +2505,6 @@ void main(void) {
   color += (1.0 - color.a) * vBackgroundColor;
   if (color.a > 0.0) {
     color *= vModulate;
-    color = vColorMatrix * color;
-    color += vColorMatrixOffset;
   }
   gl_FragColor = color;
 }`
@@ -2640,12 +2607,9 @@ void main(void) {
             texture: texture2,
             modulate = this._defaultModulate,
             backgroundColor = this._defaultBackgroundColor,
-            colorMatrix = this._defaultColorMatrix,
-            colorMatrixOffset = this._defaultColorMatrixOffset,
             blendMode = WebGLBlendMode.NORMAL,
             disableWrapMode = false
           } = batchables[i];
-          const textureLocation = (texture2 ? textureLocationMap.get(texture2) : -1) ?? -1;
           if (start < i && drawCall.blendMode !== blendMode) {
             drawCall.count = iIndex - drawCall.first;
             drawCalls.push(drawCall);
@@ -2655,24 +2619,17 @@ void main(void) {
             drawCall.first = iIndex;
           }
           const iIndexStart = aIndex / this._vertexSize;
+          const textureLocation = (texture2 ? textureLocationMap.get(texture2) : 255) ?? 255;
+          const disableWrapModeInt = disableWrapMode ? 1 : 0;
           for (let len2 = vertices.length, i2 = 0; i2 < len2; i2 += 2) {
             float32View[aIndex++] = textureLocation;
             float32View[aIndex++] = vertices[i2];
             float32View[aIndex++] = vertices[i2 + 1];
-            float32View[aIndex++] = uvs[i2] ?? 0;
-            float32View[aIndex++] = uvs[i2 + 1] ?? 0;
+            float32View[aIndex++] = uvs[i2];
+            float32View[aIndex++] = uvs[i2 + 1];
             uint32View[aIndex++] = modulate;
             uint32View[aIndex++] = backgroundColor;
-            float32View[aIndex++] = disableWrapMode ? 1 : 0;
-            float32View[aIndex++] = 0;
-            float32View[aIndex++] = 0;
-            float32View[aIndex++] = 0;
-            for (let i3 = 0; i3 < 4; i3++) {
-              float32View[aIndex++] = colorMatrixOffset[i3] ?? 0;
-            }
-            for (let i3 = 0; i3 < 16; i3++) {
-              float32View[aIndex++] = colorMatrix[i3] ?? 0;
-            }
+            uint32View[aIndex++] = disableWrapModeInt;
           }
           for (let len2 = indices.length, i2 = 0; i2 < len2; i2++) {
             indexBuffer[iIndex++] = iIndexStart + indices[i2];
@@ -5604,9 +5561,9 @@ class CanvasContext extends modernPath2d.Path2D {
       }
       this.buildUvs(0, vertices, uvs, current.texture, current.uvTransform);
       batchables.push({
-        vertices,
-        indices,
-        uvs,
+        vertices: new Float32Array(vertices),
+        indices: new Float32Array(indices),
+        uvs: new Float32Array(uvs),
         texture: current.texture,
         type: current.type,
         disableWrapMode: current.disableWrapMode,
@@ -7061,7 +7018,7 @@ class SceneTree extends MainLoop {
   }
 }
 __decorateClass$L([
-  modernIdoc.property({ fallback: false })
+  modernIdoc.property({ protected: true, fallback: false })
 ], SceneTree.prototype, "processPaused");
 __decorateClass$L([
   modernIdoc.property()
@@ -9990,12 +9947,11 @@ exports.BaseElement2D = class BaseElement2D extends exports.Node2D {
   _drawContent() {
   }
   _repaint(batchables) {
-    const colorMatrix = parseCSSFilter(this.style.filter);
     return super._repaint(batchables).map((batchable) => {
       return {
-        ...batchable,
-        colorMatrix: colorMatrix.toMatrix4().toArray(true),
-        colorMatrixOffset: colorMatrix.toVector4().toArray()
+        ...batchable
+        // colorMatrix: colorMatrix.toMatrix4().toArray(true),
+        // colorMatrixOffset: colorMatrix.toVector4().toArray(),
       };
     });
   }

package/dist/index.d.cts

@@ -916,14 +916,12 @@ declare class WebGLStateModule extends WebGLModule {
 }
 
 interface Batchable2D {
-    vertices: number[];
-    indices: number[];
-    uvs?: number[];
+    vertices: Float32Array;
+    indices: Float32Array;
+    uvs?: Float32Array;
     texture?: WebGLTexture;
     backgroundColor?: number;
     modulate?: number;
-    colorMatrix?: ArrayLike<number>;
-    colorMatrixOffset?: ArrayLike<number>;
     blendMode?: WebGLBlendMode;
     disableWrapMode?: boolean;
 }
@@ -938,8 +936,6 @@ declare class WebGLBatch2DModule extends WebGLModule {
     protected _drawCallUid: number;
     protected _defaultModulate: number;
     protected _defaultBackgroundColor: number;
-    protected _defaultColorMatrixOffset: number[];
-    protected _defaultColorMatrix: number[];
     protected _batchables: Batchable2D[];
     protected _vertexCount: number;
     protected _indexCount: number;
@@ -1892,7 +1888,7 @@ declare class Node2D extends CanvasItem {
     getTransform(cb?: (transform: Transform2D) => void): Transform2D;
     updateTransform(): void;
     updateGlobalTransform(): void;
-    protected _transformVertices(vertices: number[], vertTransform?: VertTransform): number[];
+    protected _transformVertices(vertices: Float32Array, vertTransform?: VertTransform): Float32Array;
     protected _relayout(batchables: CanvasBatchable[]): CanvasBatchable[];
     protected _process(delta: number): void;
 }

package/dist/index.d.mts

@@ -916,14 +916,12 @@ declare class WebGLStateModule extends WebGLModule {
 }
 
 interface Batchable2D {
-    vertices: number[];
-    indices: number[];
-    uvs?: number[];
+    vertices: Float32Array;
+    indices: Float32Array;
+    uvs?: Float32Array;
     texture?: WebGLTexture;
     backgroundColor?: number;
     modulate?: number;
-    colorMatrix?: ArrayLike<number>;
-    colorMatrixOffset?: ArrayLike<number>;
     blendMode?: WebGLBlendMode;
     disableWrapMode?: boolean;
 }
@@ -938,8 +936,6 @@ declare class WebGLBatch2DModule extends WebGLModule {
     protected _drawCallUid: number;
     protected _defaultModulate: number;
     protected _defaultBackgroundColor: number;
-    protected _defaultColorMatrixOffset: number[];
-    protected _defaultColorMatrix: number[];
     protected _batchables: Batchable2D[];
     protected _vertexCount: number;
     protected _indexCount: number;
@@ -1892,7 +1888,7 @@ declare class Node2D extends CanvasItem {
     getTransform(cb?: (transform: Transform2D) => void): Transform2D;
     updateTransform(): void;
     updateGlobalTransform(): void;
-    protected _transformVertices(vertices: number[], vertTransform?: VertTransform): number[];
+    protected _transformVertices(vertices: Float32Array, vertTransform?: VertTransform): Float32Array;
     protected _relayout(batchables: CanvasBatchable[]): CanvasBatchable[];
     protected _process(delta: number): void;
 }

package/dist/index.d.ts

@@ -916,14 +916,12 @@ declare class WebGLStateModule extends WebGLModule {
 }
 
 interface Batchable2D {
-    vertices: number[];
-    indices: number[];
-    uvs?: number[];
+    vertices: Float32Array;
+    indices: Float32Array;
+    uvs?: Float32Array;
     texture?: WebGLTexture;
     backgroundColor?: number;
     modulate?: number;
-    colorMatrix?: ArrayLike<number>;
-    colorMatrixOffset?: ArrayLike<number>;
     blendMode?: WebGLBlendMode;
     disableWrapMode?: boolean;
 }
@@ -938,8 +936,6 @@ declare class WebGLBatch2DModule extends WebGLModule {
     protected _drawCallUid: number;
     protected _defaultModulate: number;
     protected _defaultBackgroundColor: number;
-    protected _defaultColorMatrixOffset: number[];
-    protected _defaultColorMatrix: number[];
     protected _batchables: Batchable2D[];
     protected _vertexCount: number;
     protected _indexCount: number;
@@ -1892,7 +1888,7 @@ declare class Node2D extends CanvasItem {
     getTransform(cb?: (transform: Transform2D) => void): Transform2D;
     updateTransform(): void;
     updateGlobalTransform(): void;
-    protected _transformVertices(vertices: number[], vertTransform?: VertTransform): number[];
+    protected _transformVertices(vertices: Float32Array, vertTransform?: VertTransform): Float32Array;
     protected _relayout(batchables: CanvasBatchable[]): CanvasBatchable[];
     protected _process(delta: number): void;
 }