@vunk/plus 1.10.2 → 1.11.0

package/components/WebGLRenderer.mjs

@@ -6,8 +6,8 @@ import '@vunk/shared/enum';
 import '@vunk/shared/promise';
 import './_commonjsHelpers.mjs';
 import './_plugin-vue_export-helper.mjs';
-import '@vunk/core/composables';
 import '@vunk/shared/object';
+import '@vunk/core/composables';
 
 class GlBatchAdaptor {
   constructor() {

package/components/WebGPURenderer.mjs

@@ -6,8 +6,8 @@ import '@vunk/shared/enum';
 import '@vunk/shared/promise';
 import './_commonjsHelpers.mjs';
 import './_plugin-vue_export-helper.mjs';
-import '@vunk/core/composables';
 import '@vunk/shared/object';
+import '@vunk/core/composables';
 
 const tempState = State.for2d();
 class GpuBatchAdaptor {

package/components/broadcasting-markdown/index.mjs

@@ -89,6 +89,13 @@ const props = {
   paragraphMinlength: {
     type: Number,
     default: 20
+  },
+  /**
+   * @description 禁用, 即不产出段落
+   */
+  disabled: {
+    type: Boolean,
+    default: false
   }
 };
 const emits = {
@@ -4054,8 +4061,8 @@ var _sfc_main = defineComponent({
   name: "VkBroadcastingMarkdown",
   components: {
     ParagraphView,
-    VkTypingMarkdown,
-    HowlerSpeechView
+    HowlerSpeechView,
+    VkTypingMarkdown
   },
   props,
   emits,
@@ -4077,10 +4084,10 @@ var _sfc_main = defineComponent({
       if (!props2.textToSpeech) {
         return;
       }
-      if (props2.separators.includes(paragraph.value)) {
+      const value = props2.render(paragraph.value);
+      if (props2.separators.includes(value)) {
         return;
       }
-      const value = props2.render(paragraph.value);
       if (!value) {
         return;
       }
@@ -4104,6 +4111,9 @@ var _sfc_main = defineComponent({
       return props2.source.substring(0, currentIndex.value);
     });
     const fulfilledTextValue = computed(() => {
+      if (props2.disabled) {
+        return props2.source;
+      }
       return theData.value.filter(
         (item) => item.status === ParagraphStatus.fulfilled || item.status === ParagraphStatus.pending
       ).map((item) => item.value).join("");
@@ -4114,6 +4124,9 @@ var _sfc_main = defineComponent({
       });
     });
     watch(isFinished, (val) => {
+      if (props2.disabled) {
+        return;
+      }
       !val && write();
     }, { immediate: true });
     function write() {
@@ -4201,7 +4214,9 @@ var _sfc_main = defineComponent({
     watch(() => props2.status, () => {
       if (props2.status === TickerStatus.stop) {
         theData.value.forEach((item) => {
-          item.broadcast = Broadcast.stop;
+          if (item.broadcast !== TickerStatus.stopped) {
+            item.broadcast = Broadcast.stop;
+          }
         });
       }
       if (!currentPragraph.value) {
@@ -4239,10 +4254,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     null,
     [
       renderSlot(_ctx.$slots, "default", { paragraphs: _ctx.theData }, () => [
-        createVNode(_component_VkTypingMarkdown, {
-          source: _ctx.fulfilledTextValue,
-          pause: _ctx.status === _ctx.TickerStatus.stopped
-        }, null, 8, ["source", "pause"])
+        createVNode(_component_VkTypingMarkdown, { source: _ctx.fulfilledTextValue }, null, 8, ["source"])
       ]),
       (openBlock(true), createElementBlock(
         Fragment,

package/components/broadcasting-markdown/src/ctx.d.ts

@@ -99,6 +99,13 @@ export declare const props: {
         type: NumberConstructor;
         default: number;
     };
+    /**
+     * @description 禁用, 即不产出段落
+     */
+    disabled: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 };
 export declare const emits: {
     setData: (e: SetDataEvent) => SetDataEvent;

package/components/broadcasting-markdown/src/index.vue.d.ts

@@ -72,6 +72,10 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         type: NumberConstructor;
         default: number;
     };
+    disabled: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }>, {
     theData: import("vue").ComputedRef<Paragraph[]>;
     ParagraphStatus: typeof ParagraphStatus;
@@ -158,6 +162,10 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         type: NumberConstructor;
         default: number;
     };
+    disabled: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }>> & Readonly<{
     onComplete?: (() => any) | undefined;
     "onUpdate:status"?: ((_: TickerStatus) => any) | undefined;
@@ -167,6 +175,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     data: Paragraph[];
     source: string;
     render: (text: string) => string;
+    disabled: boolean;
     processing: (paragraph: Paragraph) => void;
     delay: number;
     status: TickerStatus;
@@ -249,6 +258,52 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         enable: boolean;
         retryTimes: number;
     }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
+    HowlerSpeechView: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
+        source: {
+            type: StringConstructor;
+            default: string;
+        };
+        status: {
+            type: import("vue").PropType<TickerStatus>;
+            default: TickerStatus;
+        };
+    }>, {
+        props: import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
+            source: {
+                type: StringConstructor;
+                default: string;
+            };
+            status: {
+                type: import("vue").PropType<TickerStatus>;
+                default: TickerStatus;
+            };
+        }>> & Readonly<{
+            onError?: ((...args: any[]) => any) | undefined;
+            onLoad?: ((...args: any[]) => any) | undefined;
+            "onUpdate:status"?: ((...args: any[]) => any) | undefined;
+        }> & {}>;
+        emit: ((event: "error", ...args: any[]) => void) & ((event: "load", ...args: any[]) => void) & ((event: "update:status", ...args: any[]) => void);
+    }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
+        'update:status': null;
+        load: null;
+        error: null;
+    }, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
+        source: {
+            type: StringConstructor;
+            default: string;
+        };
+        status: {
+            type: import("vue").PropType<TickerStatus>;
+            default: TickerStatus;
+        };
+    }>> & Readonly<{
+        onError?: ((...args: any[]) => any) | undefined;
+        onLoad?: ((...args: any[]) => any) | undefined;
+        "onUpdate:status"?: ((...args: any[]) => any) | undefined;
+    }>, {
+        source: string;
+        status: TickerStatus;
+    }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
     VkTypingMarkdown: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
         source: {
             type: StringConstructor;
@@ -323,51 +378,5 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         markdownItSetup: (md: import("markdown-it-async").MarkdownItAsync) => void;
         finished: boolean;
     }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
-    HowlerSpeechView: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
-        source: {
-            type: StringConstructor;
-            default: string;
-        };
-        status: {
-            type: import("vue").PropType<TickerStatus>;
-            default: TickerStatus;
-        };
-    }>, {
-        props: import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
-            source: {
-                type: StringConstructor;
-                default: string;
-            };
-            status: {
-                type: import("vue").PropType<TickerStatus>;
-                default: TickerStatus;
-            };
-        }>> & Readonly<{
-            onError?: ((...args: any[]) => any) | undefined;
-            onLoad?: ((...args: any[]) => any) | undefined;
-            "onUpdate:status"?: ((...args: any[]) => any) | undefined;
-        }> & {}>;
-        emit: ((event: "error", ...args: any[]) => void) & ((event: "load", ...args: any[]) => void) & ((event: "update:status", ...args: any[]) => void);
-    }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
-        'update:status': null;
-        load: null;
-        error: null;
-    }, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
-        source: {
-            type: StringConstructor;
-            default: string;
-        };
-        status: {
-            type: import("vue").PropType<TickerStatus>;
-            default: TickerStatus;
-        };
-    }>> & Readonly<{
-        onError?: ((...args: any[]) => any) | undefined;
-        onLoad?: ((...args: any[]) => any) | undefined;
-        "onUpdate:status"?: ((...args: any[]) => any) | undefined;
-    }>, {
-        source: string;
-        status: TickerStatus;
-    }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 }, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 export default _default;

package/components/browserAll.mjs

@@ -5,8 +5,8 @@ import '@vunk/shared/enum';
 import '@vunk/shared/promise';
 import './_commonjsHelpers.mjs';
 import './_plugin-vue_export-helper.mjs';
-import '@vunk/core/composables';
 import '@vunk/shared/object';
+import '@vunk/core/composables';
 import './colorToUniform.mjs';
 
 class FederatedEvent {

package/components/index2.mjs

@@ -1,10 +1,10 @@
-import { provide, inject, watchEffect, onBeforeUnmount, defineComponent, useId, ref, onMounted, renderSlot, computed, nextTick, watch, openBlock, createElementBlock, resolveComponent, createBlock, withCtx, createVNode } from 'vue';
+import { provide, inject, watchEffect, onBeforeUnmount, defineComponent, useId, ref, onMounted, renderSlot, watch, computed, openBlock, createElementBlock, resolveComponent, createBlock, withCtx, createVNode } from 'vue';
 import { TickerStatus } from '@vunk/shared/enum';
 import { Deferred, sleep } from '@vunk/shared/promise';
 import { c as commonjsGlobal, g as getDefaultExportFromCjs } from './_commonjsHelpers.mjs';
 import { _ as _export_sfc } from './_plugin-vue_export-helper.mjs';
-import { useModelComputed, useDeferred } from '@vunk/core/composables';
 import { pickObject } from '@vunk/shared/object';
+import { useModelComputed, useDeferred } from '@vunk/core/composables';
 
 var lib = {exports: {}};
 
@@ -25564,7 +25564,7 @@ function useSprite(props) {
   };
 }
 
-var _sfc_main$6 = /* @__PURE__ */ defineComponent({
+var _sfc_main$7 = /* @__PURE__ */ defineComponent({
   __name: "apng",
   props: {
     ...props,
@@ -25757,10 +25757,92 @@ var _sfc_main$6 = /* @__PURE__ */ defineComponent({
   }
 });
 
+function _sfc_render$7(_ctx, _cache, $props, $setup, $data, $options) {
+  return renderSlot(_ctx.$slots, "default");
+}
+var ApngComp = /* @__PURE__ */ _export_sfc(_sfc_main$7, [["render", _sfc_render$7], ["__file", "/home/runner/work/vunk-plus/vunk-plus/packages/components/pixi-frame/src/apng.vue"]]);
+
+var _sfc_main$6 = /* @__PURE__ */ defineComponent({
+  __name: "bitmap-generator",
+  props: {
+    ...pickObject(props, {
+      excludes: ["loop"]
+    }),
+    generator: {
+      type: Object,
+      required: true
+    }
+  },
+  emits: {
+    "update:status": null,
+    "load": (e) => e
+  },
+  setup(__props, { expose: __expose, emit: __emit }) {
+    __expose();
+    const props = __props;
+    const emit = __emit;
+    const { sprite, resizeSprite, application } = useSprite(props);
+    const texture = new Texture({
+      dynamic: true
+    });
+    sprite.texture = texture;
+    function updateTextureFromBitmap(bitmap) {
+      texture.source.destroy();
+      const source = new ImageSource({
+        resource: bitmap
+      });
+      texture.source = source;
+      texture.update();
+      resizeSprite();
+    }
+    emit("load", {
+      application,
+      sprite
+    });
+    watch(() => props.status, (newStatus) => {
+      newStatus === TickerStatus.play && play();
+      newStatus === TickerStatus.pause && pause();
+      newStatus === TickerStatus.stop && stop();
+    }, { immediate: true });
+    function drawFrame() {
+      if (props.status !== TickerStatus.playing) {
+        return;
+      }
+      props.generator.next().then(({ value, done }) => {
+        if (done) {
+          return emit("update:status", TickerStatus.stopped);
+        }
+        updateTextureFromBitmap(value);
+      });
+    }
+    function play() {
+      application.ticker.minFPS = props.frameRate;
+      application.ticker.maxFPS = props.frameRate;
+      emit("update:status", TickerStatus.playing);
+      application.ticker.add(drawFrame);
+    }
+    function pause() {
+      application.ticker.remove(drawFrame);
+      emit("update:status", TickerStatus.paused);
+    }
+    function stop() {
+      application.ticker.remove(drawFrame);
+      emit("update:status", TickerStatus.stopped);
+    }
+    onBeforeUnmount(() => {
+      stop();
+      texture.destroy();
+    });
+    const __returned__ = { props, emit, sprite, resizeSprite, application, texture, updateTextureFromBitmap, drawFrame, play, pause, stop };
+    Object.defineProperty(__returned__, "__isScriptSetup", { enumerable: false, value: true });
+    return __returned__;
+  }
+});
+
 function _sfc_render$6(_ctx, _cache, $props, $setup, $data, $options) {
   return renderSlot(_ctx.$slots, "default");
 }
-var ApngComp = /* @__PURE__ */ _export_sfc(_sfc_main$6, [["render", _sfc_render$6], ["__file", "/home/runner/work/vunk-plus/vunk-plus/packages/components/pixi-frame/src/apng.vue"]]);
+var bitmapGenerator = /* @__PURE__ */ _export_sfc(_sfc_main$6, [["render", _sfc_render$6], ["__file", "/home/runner/work/vunk-plus/vunk-plus/packages/components/pixi-frame/src/bitmap-generator.vue"]]);
 
 var _sfc_main$5 = /* @__PURE__ */ defineComponent({
   __name: "bitmap",
@@ -25786,42 +25868,20 @@ var _sfc_main$5 = /* @__PURE__ */ defineComponent({
     __expose();
     const props = __props;
     const emit = __emit;
-    const compId = useId();
-    const getAlias = (key) => `${compId}-${key}`;
     const { sprite, resizeSprite, application } = useSprite(props);
-    const textureMap = /* @__PURE__ */ new Map();
-    const completedIndex = ref(0);
-    const enabledData = computed(() => {
-      return props.data.slice(completedIndex.value);
-    });
-    watchEffect(() => {
-      for (const key in enabledData.value) {
-        const theKey = +key + completedIndex.value;
-        const alias = `${compId}-${theKey}`;
-        const image = enabledData.value[key];
-        if (!image) {
-          continue;
-        }
-        if (textureMap.has(alias)) {
-          continue;
-        }
-        const source = new ImageSource({
-          resource: image
-        });
-        const texture = new Texture({
-          source
-        });
-        textureMap.set(alias, void 0);
-        nextTick(() => {
-          texture._meta = enabledData.value[key];
-          textureMap.set(alias, texture);
-          if (props.prerender && theKey === 0) {
-            sprite.texture = texture;
-            resizeSprite();
-          }
-        });
-      }
+    const texture = new Texture({
+      dynamic: true
     });
+    sprite.texture = texture;
+    function updateTextureFromBitmap(bitmap) {
+      texture.source?.destroy();
+      const source = new ImageSource({
+        resource: bitmap
+      });
+      texture.source = source;
+      texture.update();
+      resizeSprite();
+    }
     emit("load", {
       application,
       sprite
@@ -25830,40 +25890,42 @@ var _sfc_main$5 = /* @__PURE__ */ defineComponent({
       default: 0,
       key: "frameIndex"
     }, props, emit);
+    const lastScheduledClearIndex = ref(-1);
+    function scheduleClearFrame(frameIndex) {
+      if (frameIndex <= lastScheduledClearIndex.value)
+        return;
+      lastScheduledClearIndex.value = frameIndex;
+      Promise.resolve(sleep(500)).then(() => {
+        emit("setData", {
+          k: frameIndex,
+          v: null
+        });
+      });
+    }
     function drawFrame() {
       if (props.data.length === 0 || props.status !== TickerStatus.playing) {
         return;
       }
-      const currentTexture = textureMap.get(
-        getAlias(index.value)
-      );
-      if (currentTexture) {
-        const originTexture = sprite.texture;
+      const bitmap = props.data[index.value];
+      if (bitmap) {
         const originIndex = index.value - 1;
-        if (originTexture && originIndex >= 0) {
-          Promise.resolve(sleep(500)).then(() => {
-            originTexture.destroy(true);
-            textureMap.set(
-              getAlias(originIndex),
-              void 0
-            );
-            emit("setData", {
-              k: originIndex,
-              v: null
-            });
-            completedIndex.value = originIndex;
-          });
+        if (originIndex >= 0) {
+          scheduleClearFrame(originIndex);
         }
-        sprite.texture = currentTexture;
-        resizeSprite();
+        updateTextureFromBitmap(bitmap);
         index.value = index.value + 1;
       } else {
         console.warn(
-          `Texture for index ${index.value} not found. Ensure the texture is loaded.`
+          `Bitmap for index ${index.value} not found. Ensure the data is loaded.`
         );
         emit("notFound", index.value);
       }
     }
+    watchEffect(() => {
+      if (props.prerender && index.value === 0 && props.data.length > 0 && props.data[0]) {
+        updateTextureFromBitmap(props.data[0]);
+      }
+    });
     watch(() => props.status, (newStatus) => {
       newStatus === TickerStatus.play && play();
       newStatus === TickerStatus.pause && pause();
@@ -25880,25 +25942,21 @@ var _sfc_main$5 = /* @__PURE__ */ defineComponent({
       }
     }
     function pause() {
+      application.ticker.remove(drawFrame);
       emit("update:status", TickerStatus.paused);
     }
     function stop() {
-      emit("update:status", TickerStatus.stopped);
       application.ticker.remove(drawFrame);
+      emit("update:status", TickerStatus.stopped);
       emit("update:data", []);
-      textureMap.clear();
       index.value = 0;
+      lastScheduledClearIndex.value = -1;
     }
     onBeforeUnmount(() => {
-      const entries = Array.from(textureMap.entries());
-      entries.forEach(([_, texture]) => {
-        if (texture) {
-          texture.destroy(true);
-        }
-      });
       stop();
+      texture.destroy();
     });
-    const __returned__ = { props, emit, compId, getAlias, sprite, resizeSprite, application, textureMap, completedIndex, enabledData, index, drawFrame, play, pause, stop };
+    const __returned__ = { props, emit, sprite, resizeSprite, application, texture, updateTextureFromBitmap, index, lastScheduledClearIndex, scheduleClearFrame, drawFrame, play, pause, stop };
     Object.defineProperty(__returned__, "__isScriptSetup", { enumerable: false, value: true });
     return __returned__;
   }
@@ -26376,4 +26434,4 @@ VkPixiFrame.install = (app) => {
   app.component(VkPixiFrame.name || "VkPixiFrame", VkPixiFrame);
 };
 
-export { deprecation as $, AbstractRenderer as A, BufferUsage as B, Container as C, DOMAdapter as D, ExtensionType as E, Bounds as F, GpuProgram as G, FilterEffect as H, Sprite as I, getAttributeInfoFromFormat as J, unsafeEvalSupported as K, uid as L, Matrix as M, Rectangle as N, SystemRunner as O, Point as P, multiplyColors as Q, RendererType as R, STENCIL_MODES as S, Ticker as T, UPDATE_PRIORITY as U, UPDATE_COLOR as V, UPDATE_BLEND as W, UPDATE_VISIBLE as X, Color as Y, getLocalBounds as Z, VERSION as _, EventEmitter as a, v8_0_0 as a0, RendererInitHook as a1, Geometry as a2, checkMaxIfStatementsInShader as a3, compileHighShaderGlProgram as a4, colorBitGl as a5, generateTextureBatchBitGl as a6, roundPixelsBitGl as a7, getBatchSamplersUniformGroup as a8, ViewContainer as a9, GraphicsContext as aa, nextPow2 as ab, CanvasTextMetrics as ac, fontStringFromTextStyle as ad, getCanvasFillStyle as ae, TextStyle as af, BatchableGraphics as ag, getAdjustedBlendModeBlend as ah, ViewableBuffer as ai, TextureStyle as aj, BitmapFontManager as ak, getBitmapTextLayout as al, Cache as am, updateQuadBounds as an, GraphicsContextSystem as ao, VkPixiFrame as ap, ApngComp as aq, Bitmap as ar, core as as, ProviderComp as at, VideoComp as au, ViewComp as av, types as aw, Buffer as b, BindGroup as c, createIdFromString as d, extensions as e, fastCopy as f, getTextureBatchBindGroup as g, CLEAR as h, CanvasSource as i, TextureSource as j, UniformGroup as k, CanvasPool as l, compileHighShaderGpuProgram as m, colorBit as n, generateTextureBatchBit as o, roundPixelsBit as p, Shader as q, removeItems as r, Texture as s, GlProgram as t, TextureMatrix as u, DefaultBatcher as v, warn as w, BigPool as x, getGlobalBounds as y, TexturePool as z };
+export { deprecation as $, AbstractRenderer as A, BufferUsage as B, Container as C, DOMAdapter as D, ExtensionType as E, Bounds as F, GpuProgram as G, FilterEffect as H, Sprite as I, getAttributeInfoFromFormat as J, unsafeEvalSupported as K, uid as L, Matrix as M, Rectangle as N, SystemRunner as O, Point as P, multiplyColors as Q, RendererType as R, STENCIL_MODES as S, Ticker as T, UPDATE_PRIORITY as U, UPDATE_COLOR as V, UPDATE_BLEND as W, UPDATE_VISIBLE as X, Color as Y, getLocalBounds as Z, VERSION as _, EventEmitter as a, v8_0_0 as a0, RendererInitHook as a1, Geometry as a2, checkMaxIfStatementsInShader as a3, compileHighShaderGlProgram as a4, colorBitGl as a5, generateTextureBatchBitGl as a6, roundPixelsBitGl as a7, getBatchSamplersUniformGroup as a8, ViewContainer as a9, GraphicsContext as aa, nextPow2 as ab, CanvasTextMetrics as ac, fontStringFromTextStyle as ad, getCanvasFillStyle as ae, TextStyle as af, BatchableGraphics as ag, getAdjustedBlendModeBlend as ah, ViewableBuffer as ai, TextureStyle as aj, BitmapFontManager as ak, getBitmapTextLayout as al, Cache as am, updateQuadBounds as an, GraphicsContextSystem as ao, VkPixiFrame as ap, ApngComp as aq, Bitmap as ar, bitmapGenerator as as, core as at, ProviderComp as au, VideoComp as av, ViewComp as aw, types as ax, usePixiApp as ay, useSprite as az, Buffer as b, BindGroup as c, createIdFromString as d, extensions as e, fastCopy as f, getTextureBatchBindGroup as g, CLEAR as h, CanvasSource as i, TextureSource as j, UniformGroup as k, CanvasPool as l, compileHighShaderGpuProgram as m, colorBit as n, generateTextureBatchBit as o, roundPixelsBit as p, Shader as q, removeItems as r, Texture as s, GlProgram as t, TextureMatrix as u, DefaultBatcher as v, warn as w, BigPool as x, getGlobalBounds as y, TexturePool as z };

package/components/metahuman-broadcasting/index.d.ts

@@ -1,5 +1,4 @@
 import VkMetahumanBroadcasting from './src/index.vue';
 export * as __VkMetahumanBroadcasting from './src/types';
-export { workerConfig } from '@vunk/plus/shared/audioToFrames';
 export { VkMetahumanBroadcasting, };
 export default VkMetahumanBroadcasting;