refactor(core): manager, renderer api (WIP)

auioc · Sep 8, 2024 · 0d5292c · 0d5292c
1 parent 9632b9f
commit 0d5292c
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 44 deletions.
diff --git a/packages/core/src/api/manager.ts b/packages/core/src/api/manager.ts
@@ -0,0 +1,29 @@
+import { IComment } from '@api/comment.js';
+
+export interface CCLOptions {
+    global: {
+        scale: number;
+        opacity: number;
+        className: string;
+    };
+    scroll: {
+        scale: number;
+        opacity: number;
+    };
+    // scripting: {
+    //     mode: Array<number>;
+    //     engine: IScriptingEngine;
+    // };
+}
+
+export interface ICommentManager {
+    stage: HTMLElement;
+    width: number;
+    height: number;
+    options: CCLOptions;
+    start(): void;
+    stop(): void;
+    clear(): void;
+    setBounds(w?: number, h?: number): void;
+    finish(c: IComment): void;
+}
diff --git a/packages/core/src/api/renderer.ts b/packages/core/src/api/renderer.ts
@@ -0,0 +1,7 @@
+import { IComment } from '@api/comment.js';
+
+export interface ISpaceAllocator {
+    add(c: IComment): void;
+    remove(c: IComment): void;
+    setBounds(w: number, h: number): void;
+}
diff --git a/packages/core/src/comment/manager.ts b/packages/core/src/comment/manager.ts
@@ -1,46 +1,14 @@
 import { CommentData, CommentType, IComment } from '@api/comment.js';
 import { ICommentFilter } from '@api/filter.js';
+import { ICommentManager } from '@api/manager.js';
 import { ICommentPreprocessor } from '@api/preprocessor.js';
+import { ISpaceAllocator } from '@api/renderer.js';
 import { binarySearch, insertByBinarySearch } from '@utils/array.js';
 import { calcVideoRenderedSize } from '@utils/video.js';
 import { commentComparator } from 'comment/utils.js';
-import {
-    AnchorSpaceAllocator,
-    ISpaceAllocator,
-    SpaceAllocator,
-} from 'renderer/allocator.js';
+import { AnchorSpaceAllocator, SpaceAllocator } from 'renderer/allocator.js';
 import { CommentFactory, ICommentFactory } from 'renderer/factory.js';
 
-interface CCLOptions {
-    global: {
-        scale: number;
-        opacity: number;
-        className: string;
-    };
-    scroll: {
-        scale: number;
-        opacity: number;
-    };
-    // scripting: {
-    //     mode: Array<number>;
-    //     engine: IScriptingEngine;
-    // };
-}
-
-export interface ICommentManager {
-    stage: HTMLElement;
-    width: number;
-    height: number;
-    options: CCLOptions;
-    start(): void;
-    stop(): void;
-    clear(): void;
-    setBounds(w?: number, h?: number): void;
-    finish(c: IComment): void;
-}
-
-// ========================================================================== //
-
 export class CommentManager implements ICommentManager {
     readonly stage: HTMLElement;
     private timer = 0;

diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
@@ -1,6 +1,8 @@
 export * from '@api/comment.js';
 export * from '@api/filter.js';
+export * from '@api/manager.js';
 export * from '@api/preprocessor.js';
+export * from '@api/renderer.js';
 export * from '@api/types.js';
 
 export * from 'comment/manager.js';

diff --git a/packages/core/src/renderer/allocator.ts b/packages/core/src/renderer/allocator.ts
@@ -1,12 +1,7 @@
 import { IComment } from '@api/comment.js';
+import { ISpaceAllocator } from '@api/renderer.js';
 import { insertByBinarySearch } from '@utils/array.js';
 
-export interface ISpaceAllocator {
-    add(c: IComment): void;
-    remove(c: IComment): void;
-    setBounds(w: number, h: number): void;
-}
-
 export class SpaceAllocator implements ISpaceAllocator {
     public width: number;
     public height: number;

diff --git a/packages/core/src/renderer/classic/base.ts b/packages/core/src/renderer/classic/base.ts
@@ -5,9 +5,9 @@ import {
     IMotion,
     MotionRecord,
 } from '@api/comment.js';
+import { ICommentManager } from '@api/manager.js';
 import { Tuple } from '@api/types.js';
 import { Matrix3D } from '@utils/matrix3d.js';
-import { ICommentManager } from 'comment/manager.js';
 
 const linearEasing = (t: number, b: number, c: number, d: number) => {
     return (t * c) / d + b;

diff --git a/packages/core/src/renderer/classic/scroll.ts b/packages/core/src/renderer/classic/scroll.ts
@@ -1,5 +1,5 @@
 import { CommentData, IComment } from '@api/comment.js';
-import { ICommentManager } from 'comment/manager.js';
+import { ICommentManager } from '@api/manager.js';
 import { CoreComment } from 'renderer/classic/base.js';
 
 export class ScrollComment extends CoreComment {

diff --git a/packages/core/src/renderer/factory.ts b/packages/core/src/renderer/factory.ts
@@ -1,6 +1,6 @@
 import { CommentData, CommentType, IComment } from '@api/comment.js';
+import { ICommentManager } from '@api/manager.js';
 import { Matrix3D } from '@utils/matrix3d.js';
-import { ICommentManager } from 'comment/manager.js';
 import { CoreComment } from 'renderer/classic/base.js';
 import { ScrollComment } from 'renderer/classic/scroll.js';
 import { CssScrollComment } from 'renderer/css/scroll.js';