@taole/giftstage 0.1.35 → 0.1.36

package/dist/gift-stage.es.js

@@ -1,51 +1,52 @@
-const gQ = `#version 300 es
-precision highp float;
-
-layout(location = 0) in vec3 a_position;
-layout(location = 1) in vec4 a_color;
-layout(location = 2) in vec2 a_uv;
-
-uniform mat4 u_projection;
-uniform mat4 u_transform;
-
-out vec2 v_uv;
-out vec4 v_color;
-
-void main() {
-    gl_Position = u_projection * u_transform * vec4(a_position, 1.0);
-    v_uv = a_uv;
-    v_color = a_color;
-}
+const gQ = `#version 300 es\r
+precision highp float;\r
+\r
+layout(location = 0) in vec3 a_position;\r
+layout(location = 1) in vec4 a_color;\r
+layout(location = 2) in vec2 a_uv;\r
+\r
+uniform mat4 u_projection;\r
+uniform mat4 u_transform;\r
+uniform float u_opacity;\r
+\r
+out vec2 v_uv;\r
+out vec4 v_color;\r
+\r
+void main() {\r
+    gl_Position = u_projection * u_transform * vec4(a_position, 1.0);\r
+    v_uv = a_uv;\r
+    v_color = vec4(a_color.rgb, a_color.a * u_opacity);\r
+}\r
 `, BQ = `#version 300 es\r
 precision highp float;\r
 \r
-layout(location = 0) in vec2 a_corner;
-layout(location = 1) in vec4 a_transform;
-layout(location = 2) in vec3 a_translateAlpha;
-layout(location = 3) in vec4 a_uvRect;
-layout(location = 4) in uvec2 a_packedClipRect;
-
-uniform mat4 u_projection;
-
-out vec2 v_uv;
-out vec4 v_color;
-flat out vec4 v_clipRect;
-
-void main() {
-    vec2 world = vec2(
-        a_transform.x * a_corner.x + a_transform.z * a_corner.y + a_translateAlpha.x,
-        a_transform.y * a_corner.x + a_transform.w * a_corner.y + a_translateAlpha.y
-    );
-    gl_Position = u_projection * vec4(world, 0.0, 1.0);
-    v_uv = mix(a_uvRect.xy, a_uvRect.zw, a_corner);
-    v_color = vec4(1.0, 1.0, 1.0, a_translateAlpha.z);
-    v_clipRect = vec4(
-        float(a_packedClipRect.x & 0xffffu),
-        float(a_packedClipRect.x >> 16u),
-        float(a_packedClipRect.y & 0xffffu),
-        float(a_packedClipRect.y >> 16u)
-    );
-}
+layout(location = 0) in vec2 a_corner;\r
+layout(location = 1) in vec4 a_transform;\r
+layout(location = 2) in vec3 a_translateAlpha;\r
+layout(location = 3) in vec4 a_uvRect;\r
+layout(location = 4) in uvec2 a_packedClipRect;\r
+\r
+uniform mat4 u_projection;\r
+\r
+out vec2 v_uv;\r
+out vec4 v_color;\r
+flat out vec4 v_clipRect;\r
+\r
+void main() {\r
+    vec2 world = vec2(\r
+        a_transform.x * a_corner.x + a_transform.z * a_corner.y + a_translateAlpha.x,\r
+        a_transform.y * a_corner.x + a_transform.w * a_corner.y + a_translateAlpha.y\r
+    );\r
+    gl_Position = u_projection * vec4(world, 0.0, 1.0);\r
+    v_uv = mix(a_uvRect.xy, a_uvRect.zw, a_corner);\r
+    v_color = vec4(1.0, 1.0, 1.0, a_translateAlpha.z);\r
+    v_clipRect = vec4(\r
+        float(a_packedClipRect.x & 0xffffu),\r
+        float(a_packedClipRect.x >> 16u),\r
+        float(a_packedClipRect.y & 0xffffu),\r
+        float(a_packedClipRect.y >> 16u)\r
+    );\r
+}\r
 `, CQ = `#version 300 es
 precision mediump float;
 
@@ -60,29 +61,29 @@ void main() {
     vec4 c = texture(u_atlas, v_uv);
     fragColor = vec4(c.rgb * v_color.rgb * v_color.a, c.a * v_color.a);
 }
-`, QQ = `#version 300 es
-precision highp float;
-
-uniform sampler2D u_atlas;
-
-in vec2 v_uv;
-in vec4 v_color;
-flat in vec4 v_clipRect;
-
-out vec4 fragColor;
-
-void main() {
-    if (
-        gl_FragCoord.x < v_clipRect.x ||
-        gl_FragCoord.y < v_clipRect.y ||
-        gl_FragCoord.x >= v_clipRect.z ||
-        gl_FragCoord.y >= v_clipRect.w
-    ) {
-        discard;
-    }
-    vec4 c = texture(u_atlas, v_uv);
-    fragColor = vec4(c.rgb * v_color.rgb * v_color.a, c.a * v_color.a);
-}
+`, QQ = `#version 300 es\r
+precision highp float;\r
+\r
+uniform sampler2D u_atlas;\r
+\r
+in vec2 v_uv;\r
+in vec4 v_color;\r
+flat in vec4 v_clipRect;\r
+\r
+out vec4 fragColor;\r
+\r
+void main() {\r
+    if (\r
+        gl_FragCoord.x < v_clipRect.x ||\r
+        gl_FragCoord.y < v_clipRect.y ||\r
+        gl_FragCoord.x >= v_clipRect.z ||\r
+        gl_FragCoord.y >= v_clipRect.w\r
+    ) {\r
+        discard;\r
+    }\r
+    vec4 c = texture(u_atlas, v_uv);\r
+    fragColor = vec4(c.rgb * v_color.rgb * v_color.a, c.a * v_color.a);\r
+}\r
 `, EQ = `#version 300 es\r
 precision highp float;\r
 \r
@@ -313,22 +314,22 @@ layout(location = 0) in vec2 a_pos;
 void main() {
     gl_Position = u_projection * u_transform * vec4(a_pos, 0.0, 1.0);
 }
-`, nQ = `#version 300 es
-precision mediump float;
-
-uniform mat4 u_projection;
-
-layout(location = 0) in vec2 a_pos;
-layout(location = 1) in vec4 i_matrix;
-layout(location = 2) in vec2 i_translation;
-
-void main() {
-    vec2 world = vec2(
-        i_matrix.x * a_pos.x + i_matrix.z * a_pos.y + i_translation.x,
-        i_matrix.y * a_pos.x + i_matrix.w * a_pos.y + i_translation.y
-    );
-    gl_Position = u_projection * vec4(world, 0.0, 1.0);
-}
+`, nQ = `#version 300 es\r
+precision mediump float;\r
+\r
+uniform mat4 u_projection;\r
+\r
+layout(location = 0) in vec2 a_pos;\r
+layout(location = 1) in vec4 i_matrix;\r
+layout(location = 2) in vec2 i_translation;\r
+\r
+void main() {\r
+    vec2 world = vec2(\r
+        i_matrix.x * a_pos.x + i_matrix.z * a_pos.y + i_translation.x,\r
+        i_matrix.y * a_pos.x + i_matrix.w * a_pos.y + i_translation.y\r
+    );\r
+    gl_Position = u_projection * vec4(world, 0.0, 1.0);\r
+}\r
 `, aB = `#version 300 es\r
 precision mediump float;\r
 \r
@@ -342,6 +343,7 @@ struct Uniforms {\r
     projection: mat4x4f,\r
     transform: mat4x4f,\r
     atlasRemap: vec4f,\r
+    opacity: vec4f,\r
 }\r
 \r
 @group(0) @binding(0) var<uniform> uniforms: Uniforms;\r
@@ -365,7 +367,7 @@ fn vs(v: VIn) -> VOut {\r
     var o: VOut;\r
     o.pos = uniforms.projection * uniforms.transform * vec4f(v.pos, 1.0);\r
     o.uv = v.uv;\r
-    o.color = v.color;\r
+    o.color = vec4f(v.color.rgb, v.color.a * uniforms.opacity.x);\r
     return o;\r
 }\r
 \r
@@ -682,43 +684,43 @@ fn vs(v: VIn) -> VOut {\r
 fn fs(f: VOut) -> @location(0) vec4f {\r
     return vec4f(0.0, 0.0, 0.0, 0.0);\r
 }\r
-`, MQ = `struct Globals {
-    projection: mat4x4f,
-}
-
-@group(0) @binding(0) var<uniform> globals: Globals;
-@group(0) @binding(1) var<storage, read> instanceData: array<f32>;
-
-struct VIn {
-    @location(0) pos: vec2f,
-}
-
-struct VOut {
-    @builtin(position) pos: vec4f,
-}
-
-@vertex
-fn vs(v: VIn, @builtin(instance_index) inst: u32) -> VOut {
-    let base = inst * 6u;
-    let a = instanceData[base];
-    let b = instanceData[base + 1u];
-    let c = instanceData[base + 2u];
-    let d = instanceData[base + 3u];
-    let translation = vec2f(instanceData[base + 4u], instanceData[base + 5u]);
-    let world = vec2f(
-        a * v.pos.x + c * v.pos.y + translation.x,
-        b * v.pos.x + d * v.pos.y + translation.y
-    );
-
-    var o: VOut;
-    o.pos = globals.projection * vec4f(world, 0.0, 1.0);
-    return o;
-}
-
-@fragment
-fn fs() -> @location(0) vec4f {
-    return vec4f(0.0);
-}
+`, MQ = `struct Globals {\r
+    projection: mat4x4f,\r
+}\r
+\r
+@group(0) @binding(0) var<uniform> globals: Globals;\r
+@group(0) @binding(1) var<storage, read> instanceData: array<f32>;\r
+\r
+struct VIn {\r
+    @location(0) pos: vec2f,\r
+}\r
+\r
+struct VOut {\r
+    @builtin(position) pos: vec4f,\r
+}\r
+\r
+@vertex\r
+fn vs(v: VIn, @builtin(instance_index) inst: u32) -> VOut {\r
+    let base = inst * 6u;\r
+    let a = instanceData[base];\r
+    let b = instanceData[base + 1u];\r
+    let c = instanceData[base + 2u];\r
+    let d = instanceData[base + 3u];\r
+    let translation = vec2f(instanceData[base + 4u], instanceData[base + 5u]);\r
+    let world = vec2f(\r
+        a * v.pos.x + c * v.pos.y + translation.x,\r
+        b * v.pos.x + d * v.pos.y + translation.y\r
+    );\r
+\r
+    var o: VOut;\r
+    o.pos = globals.projection * vec4f(world, 0.0, 1.0);\r
+    return o;\r
+}\r
+\r
+@fragment\r
+fn fs() -> @location(0) vec4f {\r
+    return vec4f(0.0);\r
+}\r
 `, SQ = `struct Globals {\r
     projection: mat4x4f,\r
 }\r
@@ -740,27 +742,27 @@ struct VOut {\r
 }\r
 \r
 @vertex\r
-fn vs(v: VIn, @builtin(instance_index) inst: u32) -> VOut {
-    let base = inst * 13u;
-    let transform0 = vec2f(instanceData[base], instanceData[base + 1u]);
-    let transform1 = vec2f(instanceData[base + 2u], instanceData[base + 3u]);
-    let translate = vec2f(instanceData[base + 4u], instanceData[base + 5u]);
-    let alpha = instanceData[base + 6u];
-    let uvMin = vec2f(instanceData[base + 7u], instanceData[base + 8u]);
-    let uvMax = vec2f(instanceData[base + 9u], instanceData[base + 10u]);
-    let packedClip0 = bitcast<u32>(instanceData[base + 11u]);
-    let packedClip1 = bitcast<u32>(instanceData[base + 12u]);
-    let clipRect = vec4f(
-        f32(packedClip0 & 0xffffu),
-        f32(packedClip0 >> 16u),
-        f32(packedClip1 & 0xffffu),
-        f32(packedClip1 >> 16u)
-    );
-
-    let world = vec2f(
-        transform0.x * v.corner.x + transform1.x * v.corner.y + translate.x,
-        transform0.y * v.corner.x + transform1.y * v.corner.y + translate.y
-    );
+fn vs(v: VIn, @builtin(instance_index) inst: u32) -> VOut {\r
+    let base = inst * 13u;\r
+    let transform0 = vec2f(instanceData[base], instanceData[base + 1u]);\r
+    let transform1 = vec2f(instanceData[base + 2u], instanceData[base + 3u]);\r
+    let translate = vec2f(instanceData[base + 4u], instanceData[base + 5u]);\r
+    let alpha = instanceData[base + 6u];\r
+    let uvMin = vec2f(instanceData[base + 7u], instanceData[base + 8u]);\r
+    let uvMax = vec2f(instanceData[base + 9u], instanceData[base + 10u]);\r
+    let packedClip0 = bitcast<u32>(instanceData[base + 11u]);\r
+    let packedClip1 = bitcast<u32>(instanceData[base + 12u]);\r
+    let clipRect = vec4f(\r
+        f32(packedClip0 & 0xffffu),\r
+        f32(packedClip0 >> 16u),\r
+        f32(packedClip1 & 0xffffu),\r
+        f32(packedClip1 >> 16u)\r
+    );\r
+\r
+    let world = vec2f(\r
+        transform0.x * v.corner.x + transform1.x * v.corner.y + translate.x,\r
+        transform0.y * v.corner.x + transform1.y * v.corner.y + translate.y\r
+    );\r
 \r
     var o: VOut;\r
     o.pos = globals.projection * vec4f(world, 0.0, 1.0);\r
@@ -2159,7 +2161,10 @@ const JQ = new Float32Array([1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1]), V
   }
   initPrograms() {
     const A = this.gl, I = lA(A, b.svgaBatchPremul.vert, b.svgaBatchPremul.frag);
-    this.programs.set("svga-batch-premul", this.makeProgramEntry(I, { transform: !0 })), this.bindProgramSamplers(I, { u_atlas: 0 });
+    this.programs.set(
+      "svga-batch-premul",
+      this.makeProgramEntry(I, { transform: !0, opacity: !0 })
+    ), this.bindProgramSamplers(I, { u_atlas: 0 });
     const g = lA(
       A,
       b.svgaInstancedPremul.vert,
@@ -2265,8 +2270,8 @@ const JQ = new Float32Array([1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1]), V
       Q instanceof Float32Array && B.uniform4fv(A.atlasRemapLoc, Q);
     }
     if (A.opacityLoc) {
-      const Q = g.uniforms.u_opacity;
-      typeof Q == "number" && A.lastOpacity !== Q && (B.uniform1f(A.opacityLoc, Q), A.lastOpacity = Q);
+      const Q = g.uniforms.u_opacity, E = typeof Q == "number" ? Q : 1;
+      A.lastOpacity !== E && (B.uniform1f(A.opacityLoc, E), A.lastOpacity = E);
     }
     if (A.rgbPremultipliedLoc) {
       const Q = g.uniforms.u_rgbPremultiplied;
@@ -2766,7 +2771,10 @@ class wB {
       a_color: 1,
       a_uv: 2
     });
-    this.programs.set("svga-batch-premul", this.makeProgramEntry(I, { transform: !0 })), this.bindProgramSamplers(I, { u_atlas: 0 });
+    this.programs.set(
+      "svga-batch-premul",
+      this.makeProgramEntry(I, { transform: !0, opacity: !0 })
+    ), this.bindProgramSamplers(I, { u_atlas: 0 });
     const g = tI(A, b.vap.vert, b.vap.frag, {
       a_position: 0,
       a_rgbUV: 1,
@@ -2855,8 +2863,8 @@ class wB {
       E instanceof Float32Array && B.uniform4fv(A.atlasRemapLoc, E);
     }
     if (A.opacityLoc) {
-      const E = g.uniforms.u_opacity;
-      typeof E == "number" && A.lastOpacity !== E && (B.uniform1f(A.opacityLoc, E), A.lastOpacity = E);
+      const E = g.uniforms.u_opacity, o = typeof E == "number" ? E : 1;
+      A.lastOpacity !== o && (B.uniform1f(A.opacityLoc, o), A.lastOpacity = o);
     }
     if (A.rgbPremultipliedLoc) {
       const E = g.uniforms.u_rgbPremultiplied;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@taole/giftstage",
-  "version": "0.1.35",
+  "version": "0.1.36",
   "description": "High-performance WebGPU/WebGL gift animation player unifying SVGA, VAP, AlphaVideo, and images",
   "type": "module",
   "main": "dist/gift-stage.cjs.js",