Skip to content

Commit d9b8deb

Browse files
Steve-xmhSteve-xmh
committed
core: 修缮部分语法格式，更新 npm 包版本到 0.2.0-alpha.4
react: 更新 npm 包版本到 0.2.0-alpha.4 vue: 更新 npm 包版本到 0.2.0-alpha.4
1 parent e98a4cc commit d9b8deb

File tree

24 files changed

+89
-84
lines changed

24 files changed

+89
-84
lines changed

‎packages/core/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@applemusic-like-lyrics/core",
3-
"version": "0.2.0-alpha.3",
3+
"version": "0.2.0-alpha.4",
44
"description": "AMLL 的纯 JS 核心组件框架，包括歌词显示组件和背景组件等其它可以复用的组件",
55
"repository": {
66
"url": "https://github.com/Steve-xmh/applemusic-like-lyrics.git",

‎packages/core/src/bg-render/base.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Disposable, HasElement } from "../interfaces";
1+
import type { Disposable, HasElement } from "../interfaces.ts";
22

33
export abstract class AbstractBaseRenderer implements Disposable, HasElement {
44
/**
@@ -118,27 +118,27 @@ export abstract class BaseRenderer extends AbstractBaseRenderer {
118118
* 是否启用静态模式，即图片在更换后就会保持静止状态并禁用更新，以节省性能
119119
* @param enable 是否启用静态模式
120120
*/
121-
abstract setStaticMode(enable: boolean): void;
121+
abstract override setStaticMode(enable: boolean): void;
122122
/**
123123
* 修改背景动画帧率，默认是 30 FPS
124124
*
125125
* 如果设置成 0 则会停止动画
126126
* @param fps 目标帧率，默认 30 FPS
127127
*/
128-
abstract setFPS(fps: number): void;
128+
abstract override setFPS(fps: number): void;
129129
/**
130130
* 暂停背景动画，画面即便是更新了图片也不会发生变化
131131
*/
132-
abstract pause(): void;
132+
abstract override pause(): void;
133133
/**
134134
* 恢复播放背景动画
135135
*/
136-
abstract resume(): void;
136+
abstract override resume(): void;
137137
/**
138138
* 设置背景专辑资源，纹理加载并设置完成后会返回
139139
* @param albumSource 专辑的资源链接，可以是图片或视频链接，抑或是任意 img/video 元素，如果提供字符串链接且为视频则需要指定第二个参数
140140
*/
141-
abstract setAlbum(
141+
abstract override setAlbum(
142142
albumSource: string | HTMLImageElement | HTMLVideoElement,
143143
isVideo?: boolean,
144144
): Promise<void>;

‎packages/core/src/bg-render/index.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
* @author SteveXMH
55
*/
66

7-
export { AbstractBaseRenderer, BaseRenderer } from "./base";
8-
import { AbstractBaseRenderer, BaseRenderer } from "./base";
9-
export { PixiRenderer } from "./pixi-renderer";
10-
export { MeshGradientRenderer } from "./mesh-renderer";
7+
export { AbstractBaseRenderer, BaseRenderer } from "./base.ts";
8+
export { MeshGradientRenderer } from "./mesh-renderer/index.ts";
9+
export { PixiRenderer } from "./pixi-renderer.ts";
10+
import type { AbstractBaseRenderer, BaseRenderer } from "./base.ts";
1111

1212
export class BackgroundRender<Renderer extends BaseRenderer>
1313
implements AbstractBaseRenderer
@@ -26,8 +26,8 @@ export class BackgroundRender<Renderer extends BaseRenderer>
2626
static new<Renderer extends BaseRenderer>(type: {
2727
new (canvas: HTMLCanvasElement): Renderer;
2828
}): BackgroundRender<Renderer> {
29-
const canvas = document.createElement("canvas");
30-
return new BackgroundRender(new type(canvas), canvas);
29+
const newCanvas = document.createElement("canvas");
30+
return new BackgroundRender(new type(newCanvas), newCanvas);
3131
}
3232

3333
setRenderScale(scale: number): void {

‎packages/core/src/bg-render/mesh-renderer/index.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@
66
*/
77

88
import { Mat4, Vec2, Vec3, Vec4 } from "gl-matrix";
9-
import type { Disposable } from "../../interfaces";
9+
import type { Disposable } from "../../interfaces.ts";
1010
import {
1111
loadResourceFromElement,
1212
loadResourceFromUrl,
13-
} from "../../utils/resource";
14-
import { BaseRenderer } from "../base";
13+
} from "../../utils/resource.ts";
14+
import { BaseRenderer } from "../base.ts";
1515
import {
1616
blurImage,
1717
brightnessImage,
1818
contrastImage,
1919
saturateImage,
20-
} from "../img";
21-
import { CONTROL_POINT_PRESETS } from "./cp-presets";
20+
} from "../img.ts";
21+
import { CONTROL_POINT_PRESETS } from "./cp-presets.ts";
2222
import meshFragShader from "./mesh.frag.glsl?raw";
2323
import meshVertShader from "./mesh.vert.glsl?raw";
2424

‎packages/core/src/bg-render/pixi-renderer.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
import { Container } from "@pixi/display";
21
import { Application } from "@pixi/app";
2+
import { Texture } from "@pixi/core";
3+
import { Container } from "@pixi/display";
34
import { BlurFilter } from "@pixi/filter-blur";
5+
import { BulgePinchFilter } from "@pixi/filter-bulge-pinch";
46
import { ColorMatrixFilter } from "@pixi/filter-color-matrix";
5-
import { Texture } from "@pixi/core";
67
import { Sprite } from "@pixi/sprite";
7-
import { BulgePinchFilter } from "@pixi/filter-bulge-pinch";
8-
import { BaseRenderer } from "./base";
98
import {
109
loadResourceFromElement,
1110
loadResourceFromUrl,
1211
} from "../utils/resource";
12+
import { BaseRenderer } from "./base";
1313

1414
class TimedContainer extends Container {
1515
public time = 0;
@@ -87,7 +87,7 @@ export class PixiRenderer extends BaseRenderer {
8787
}
8888
}
8989
};
90-
constructor(protected canvas: HTMLCanvasElement) {
90+
constructor(protected override canvas: HTMLCanvasElement) {
9191
super(canvas);
9292
this.app = new Application({
9393
view: canvas,
@@ -120,9 +120,9 @@ export class PixiRenderer extends BaseRenderer {
120120
c1.brightness(0.6, false);
121121
const c2 = new ColorMatrixFilter();
122122
c2.contrast(0.3, true);
123-
this.app.stage.filters?.forEach((filter) => {
123+
for (const filter of this.app.stage.filters ?? []) {
124124
filter.destroy();
125-
});
125+
}
126126
this.app.stage.filters = [];
127127
this.app.stage.filters.push(new BlurFilter(5, 1));
128128
this.app.stage.filters.push(new BlurFilter(10, 1));

‎packages/core/src/index.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
export * from "./bg-render";
2-
export type * from "./interfaces";
3-
export * from "./lyric-player";
4-
export type * as spring from "./utils/spring";
1+
export * from "./bg-render/index.ts";
2+
export type * from "./interfaces.ts";
3+
export * from "./lyric-player/index.ts";
4+
export type * as spring from "./utils/spring.ts";

‎packages/core/src/lyric-player/base.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ import type {
44
HasElement,
55
LyricLine,
66
LyricWord,
7-
} from "../interfaces";
7+
} from "../interfaces.ts";
88
import styles from "../styles/lyric-player.module.css";
9-
import { eqSet } from "../utils/eq-set";
10-
import { isCJK } from "../utils/is-cjk.js";
11-
import { Spring, type SpringParams } from "../utils/spring";
12-
import { BottomLineEl } from "./bottom-line";
13-
import { InterludeDots } from "./dom/interlude-dots";
9+
import { eqSet } from "../utils/eq-set.ts";
10+
import { isCJK } from "../utils/is-cjk.ts";
11+
import { Spring, type SpringParams } from "../utils/spring.ts";
12+
import { BottomLineEl } from "./bottom-line.ts";
13+
import { InterludeDots } from "./dom/interlude-dots.ts";
1414

1515
/**
1616
* 歌词播放器的基类，已经包含了有关歌词操作和排版的功能，子类需要为其实现对应的显示展示操作

‎packages/core/src/lyric-player/bottom-line.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import type { Disposable, HasElement } from "../interfaces";
1+
import type { Disposable, HasElement } from "../interfaces.ts";
22
import styles from "../styles/lyric-player.module.css";
3-
import { measure } from "../utils/schedule.js";
4-
import { Spring } from "../utils/spring";
5-
import type { LyricPlayerBase } from "./base";
3+
import { measure } from "../utils/schedule.ts";
4+
import { Spring } from "../utils/spring.ts";
5+
import type { LyricPlayerBase } from "./base.ts";
66

77
export class BottomLineEl implements HasElement, Disposable {
88
private element: HTMLElement = document.createElement("div");

‎packages/core/src/lyric-player/canvas/index.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import type { LyricLine } from "../../interfaces";
2-
import { LyricPlayerBase } from "../base";
3-
import { CanvasLyricLine } from "./lyric-line";
1+
import type { LyricLine } from "../../interfaces.ts";
2+
import { LyricPlayerBase } from "../base.ts";
3+
import { CanvasLyricLine } from "./lyric-line.ts";
44

55
export class CanvasLyricPlayer extends LyricPlayerBase {
66
private canvasElement = document.createElement("canvas");

‎packages/core/src/lyric-player/canvas/lyric-line.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import type { CanvasLyricPlayer } from ".";
2-
import type { LyricLine } from "../../interfaces";
3-
import { chunkAndSplitLyricWords } from "../../utils/lyric-split-words";
4-
import { LyricLineBase } from "../base";
1+
import type { LyricLine } from "../../interfaces.ts";
2+
import { chunkAndSplitLyricWords } from "../../utils/lyric-split-words.ts";
3+
import { LyricLineBase } from "../base.ts";
4+
import type { CanvasLyricPlayer } from "./index.ts";
55
import {
66
type TextLayoutConfig,
77
type TextLayoutResult,

0 commit comments

Comments
 (0)