diff --git a/example/pong/src/index.ts b/example/pong/src/index.ts index c07de0b..c8f7318 100644 --- a/example/pong/src/index.ts +++ b/example/pong/src/index.ts @@ -34,7 +34,6 @@ export const main = async (options: IRunOptions) => { const registry = ecsLibrary.registry; graphics.stage.add(layer); - console.log(graphics.stage.width()); sounds.load("test", "https://universal-soundbank.com/sounds/18782.mp3"); diff --git a/example/pong/src/systems.ts b/example/pong/src/systems.ts index c90faff..02c433f 100644 --- a/example/pong/src/systems.ts +++ b/example/pong/src/systems.ts @@ -1,4 +1,5 @@ -import { type ECSContext, type ECSRegistry } from "@nanoforge/ecs"; +import { type Context } from "@nanoforge/common"; +import { type ECSRegistry } from "@nanoforge/ecs"; import { type InputLibrary } from "@nanoforge/input"; import { type SoundLibrary } from "@nanoforge/sound"; @@ -22,29 +23,28 @@ export function move(registry: ECSRegistry) { }); } -export function bounce(registry: ECSRegistry, ctx: ECSContext) { +export function bounce(registry: ECSRegistry, ctx: Context) { const entities = registry.getZipper([Bounce, Position, Velocity]); entities.forEach((entity) => { if (entity.Position.x >= 1800 || entity.Position.x <= 100) { entity.Velocity.x = -entity.Velocity.x; - ctx.libraries.getSound().library.play("test"); + ctx.libs.getSound().play("test"); } if (entity.Position.y >= 1000 || entity.Position.y <= 100) { entity.Velocity.y = -entity.Velocity.y; - - ctx.libraries.getSound().library.play("test"); + ctx.libs.getSound().play("test"); } }); } -export function controlPlayer(registry: ECSRegistry, ctx: ECSContext) { +export function controlPlayer(registry: ECSRegistry, ctx: Context) { const entities = registry.getZipper([Controller, Position, Hitbox, Velocity]); entities.forEach((entity) => { if ( - ctx.libraries.getInput().library.isKeyPressed(entity.Controller.up) && + ctx.libs.getInput().isKeyPressed(entity.Controller.up) && !checkCollisions(registry, entity) ) { entity.Position.y -= entity.Velocity.y; @@ -52,7 +52,7 @@ export function controlPlayer(registry: ECSRegistry, ctx: ECSContext) { entity.Position.y += entity.Velocity.y; } if ( - ctx.libraries.getInput().library.isKeyPressed(entity.Controller.down) && + ctx.libs.getInput().isKeyPressed(entity.Controller.down) && !checkCollisions(registry, entity) ) { entity.Position.y += entity.Velocity.y; diff --git a/packages/asset-manager/src/asset-manager.library.ts b/packages/asset-manager/src/asset-manager.library.ts index 81fa345..57d577f 100644 --- a/packages/asset-manager/src/asset-manager.library.ts +++ b/packages/asset-manager/src/asset-manager.library.ts @@ -7,11 +7,11 @@ export class AssetManagerLibrary extends BaseAssetManagerLibrary { private _wasm: Map; private _wgsl: Map; - get name(): string { + get __name(): string { return "AssetManagerLibrary"; } - public async init(context: InitContext): Promise { + public async __init(context: InitContext): Promise { this._assets = context.files.assets; this._wasm = context.files.wasm; this._wgsl = context.files.wgsl; diff --git a/packages/asset-manager/test/asset-manager.library.spec.ts b/packages/asset-manager/test/asset-manager.library.spec.ts index 5110489..8d00c25 100644 --- a/packages/asset-manager/test/asset-manager.library.spec.ts +++ b/packages/asset-manager/test/asset-manager.library.spec.ts @@ -21,7 +21,7 @@ describe("Asset Manager Library", () => { wgsl: new Map([["/test.wgsl", "blob:http://localhost:3000/test.wgsl"]]), }, }); - library.init(context); + library.__init(context); it("Should get asset", async () => { expect((await library.getAsset("test.png")).path).toEqual( diff --git a/packages/common/src/context/contexts/application.context.ts b/packages/common/src/context/contexts/application.context.ts index 9ec3573..a1955f3 100644 --- a/packages/common/src/context/contexts/application.context.ts +++ b/packages/common/src/context/contexts/application.context.ts @@ -1 +1,11 @@ -export class ApplicationContext {} +export class ApplicationContext { + private _isRunning: boolean = false; + + get isRunning(): boolean { + return this._isRunning; + } + + setIsRunning(value: boolean): void { + this._isRunning = value; + } +} diff --git a/packages/common/src/context/contexts/client.context.ts b/packages/common/src/context/contexts/client.context.ts new file mode 100644 index 0000000..a491a93 --- /dev/null +++ b/packages/common/src/context/contexts/client.context.ts @@ -0,0 +1,20 @@ +import { type ClientLibraryManager } from "../../library"; +import type { ApplicationContext } from "./application.context"; + +export class Context { + private readonly _applicationContext: ApplicationContext; + private readonly _libraryManager: ClientLibraryManager; + + constructor(applicationContext: ApplicationContext, libraryManager: ClientLibraryManager) { + this._applicationContext = applicationContext; + this._libraryManager = libraryManager; + } + + get app(): ApplicationContext { + return this._applicationContext; + } + + get libs(): ClientLibraryManager { + return this._libraryManager; + } +} diff --git a/packages/common/src/context/contexts/executions/execution.context.ts b/packages/common/src/context/contexts/executions/execution.context.ts index cfb920b..7876505 100644 --- a/packages/common/src/context/contexts/executions/execution.context.ts +++ b/packages/common/src/context/contexts/executions/execution.context.ts @@ -1,15 +1,3 @@ -import { type IRunnerLibrary } from "../../../library"; import { BaseContext } from "./base.context"; -export class ExecutionContext extends BaseContext { - protected _isRunning: boolean = true; - protected _currentLibrary: T; - - get isRunning() { - return this._isRunning; - } - - get lib(): T { - return this._currentLibrary; - } -} +export class ExecutionContext extends BaseContext {} diff --git a/packages/common/src/context/contexts/index.ts b/packages/common/src/context/contexts/index.ts index 3fc9395..19e85e0 100644 --- a/packages/common/src/context/contexts/index.ts +++ b/packages/common/src/context/contexts/index.ts @@ -1,3 +1,4 @@ export * from "./executions"; export { ApplicationContext } from "./application.context"; +export { Context } from "./client.context"; export { LibraryContext, LibraryStatusEnum } from "./library.context"; diff --git a/packages/common/src/library/libraries/abstracts/asset-manager.library.abstract.ts b/packages/common/src/library/libraries/abstracts/asset-manager.library.abstract.ts index 6f6d027..27f1636 100644 --- a/packages/common/src/library/libraries/abstracts/asset-manager.library.abstract.ts +++ b/packages/common/src/library/libraries/abstracts/asset-manager.library.abstract.ts @@ -3,5 +3,5 @@ import { type IAssetManagerLibrary } from "../interfaces"; import { Library } from "../library"; export abstract class BaseAssetManagerLibrary extends Library implements IAssetManagerLibrary { - public abstract init(context: InitContext): Promise; + public abstract __init(context: InitContext): Promise; } diff --git a/packages/common/src/library/libraries/abstracts/component-system.library.abstract.ts b/packages/common/src/library/libraries/abstracts/component-system.library.abstract.ts index ce93ed7..9636529 100644 --- a/packages/common/src/library/libraries/abstracts/component-system.library.abstract.ts +++ b/packages/common/src/library/libraries/abstracts/component-system.library.abstract.ts @@ -1,4 +1,4 @@ -import { type ExecutionContext } from "../../../context"; +import { type Context } from "../../../context"; import { type IComponentSystemLibrary } from "../interfaces"; import { Library } from "../library"; @@ -6,5 +6,5 @@ export abstract class BaseComponentSystemLibrary extends Library implements IComponentSystemLibrary { - abstract run(context: ExecutionContext): Promise; + abstract __run(context: Context): Promise; } diff --git a/packages/common/src/library/libraries/abstracts/graphics.library.abstract.ts b/packages/common/src/library/libraries/abstracts/graphics.library.abstract.ts index facb9db..d26c4b6 100644 --- a/packages/common/src/library/libraries/abstracts/graphics.library.abstract.ts +++ b/packages/common/src/library/libraries/abstracts/graphics.library.abstract.ts @@ -1,7 +1,7 @@ -import type { ExecutionContext } from "../../../context"; +import { type Context } from "../../../context"; import { type IGraphicsLibrary } from "../interfaces"; import { Library } from "../library"; export abstract class BaseGraphicsLibrary extends Library implements IGraphicsLibrary { - abstract run(context: ExecutionContext): Promise; + abstract __run(context: Context): Promise; } diff --git a/packages/common/src/library/libraries/abstracts/input.library.abstract.ts b/packages/common/src/library/libraries/abstracts/input.library.abstract.ts index afa8a19..e41f862 100644 --- a/packages/common/src/library/libraries/abstracts/input.library.abstract.ts +++ b/packages/common/src/library/libraries/abstracts/input.library.abstract.ts @@ -1,7 +1,4 @@ -import { type InitContext } from "../../../context"; import { type IInputLibrary } from "../interfaces"; import { Library } from "../library"; -export abstract class BaseInputLibrary extends Library implements IInputLibrary { - public abstract init(context: InitContext): Promise; -} +export abstract class BaseInputLibrary extends Library implements IInputLibrary {} diff --git a/packages/common/src/library/libraries/abstracts/music.library.abstract.ts b/packages/common/src/library/libraries/abstracts/music.library.abstract.ts index e6da30d..12b9d19 100644 --- a/packages/common/src/library/libraries/abstracts/music.library.abstract.ts +++ b/packages/common/src/library/libraries/abstracts/music.library.abstract.ts @@ -3,7 +3,7 @@ import { type IMusicLibrary } from "../interfaces"; import { Library } from "../library"; export abstract class BaseMusicLibrary extends Library implements IMusicLibrary { - public abstract init(context: InitContext): Promise; + public abstract __init(context: InitContext): Promise; public abstract play(sound: string): void; diff --git a/packages/common/src/library/libraries/abstracts/sound.library.abstract.ts b/packages/common/src/library/libraries/abstracts/sound.library.abstract.ts index 7096c3c..c0c2cb2 100644 --- a/packages/common/src/library/libraries/abstracts/sound.library.abstract.ts +++ b/packages/common/src/library/libraries/abstracts/sound.library.abstract.ts @@ -3,7 +3,7 @@ import { type ISoundLibrary } from "../interfaces"; import { Library } from "../library"; export abstract class BaseSoundLibrary extends Library implements ISoundLibrary { - public abstract init(context: InitContext): Promise; + public abstract __init(context: InitContext): Promise; public abstract play(sound: string): void; diff --git a/packages/common/src/library/libraries/interfaces/bases/runner.library.type.ts b/packages/common/src/library/libraries/interfaces/bases/runner.library.type.ts index 28be752..cf319f3 100644 --- a/packages/common/src/library/libraries/interfaces/bases/runner.library.type.ts +++ b/packages/common/src/library/libraries/interfaces/bases/runner.library.type.ts @@ -1,6 +1,6 @@ -import { type ExecutionContext } from "../../../../context"; +import { type Context } from "../../../../context"; import { type ILibrary } from "../../library.type"; export interface IRunnerLibrary extends ILibrary { - run(context: ExecutionContext): Promise; + __run(context: Context): Promise; } diff --git a/packages/common/src/library/libraries/library.ts b/packages/common/src/library/libraries/library.ts index 0d65660..ca1fac7 100644 --- a/packages/common/src/library/libraries/library.ts +++ b/packages/common/src/library/libraries/library.ts @@ -19,15 +19,15 @@ export abstract class Library implements ILibrary { ); } - get relationship(): RelationshipHandler { + get __relationship(): RelationshipHandler { return this._relationship; } - abstract get name(): string; + abstract get __name(): string; // eslint-disable-next-line @typescript-eslint/no-unused-vars - public async init(_context: InitContext): Promise {} + public async __init(_context: InitContext): Promise {} // eslint-disable-next-line @typescript-eslint/no-unused-vars - public async clear(_context: ClearContext): Promise {} + public async __clear(_context: ClearContext): Promise {} } diff --git a/packages/common/src/library/libraries/library.type.ts b/packages/common/src/library/libraries/library.type.ts index 477040c..c7f7cf5 100644 --- a/packages/common/src/library/libraries/library.type.ts +++ b/packages/common/src/library/libraries/library.type.ts @@ -1,14 +1,14 @@ -import { type ApplicationContext, type ClearContext } from "../../context"; +import { type ClearContext, type InitContext } from "../../context"; import { type RelationshipHandler } from "../relationship/relationship-handler"; export interface ILibrary { - get name(): string; + get __name(): string; - get relationship(): RelationshipHandler; + get __relationship(): RelationshipHandler; - init(context: ApplicationContext): Promise; + __init(context: InitContext): Promise; - clear(context: ClearContext): Promise; + __clear(context: ClearContext): Promise; } export interface ILibraryOptions { diff --git a/packages/common/src/library/manager/index.ts b/packages/common/src/library/manager/index.ts index 7bfd452..e44f1e3 100644 --- a/packages/common/src/library/manager/index.ts +++ b/packages/common/src/library/manager/index.ts @@ -1,2 +1,3 @@ export { LibraryHandle } from "./handle/library.handle"; +export { ClientLibraryManager } from "./managers/client-library.manager"; export { DefaultLibrariesEnum, LibraryManager } from "./managers/library.manager"; diff --git a/packages/common/src/library/manager/managers/client-library.manager.ts b/packages/common/src/library/manager/managers/client-library.manager.ts new file mode 100644 index 0000000..4dc63b8 --- /dev/null +++ b/packages/common/src/library/manager/managers/client-library.manager.ts @@ -0,0 +1,51 @@ +import { + type IAssetManagerLibrary, + type IComponentSystemLibrary, + type IGraphicsLibrary, + type IInputLibrary, + type ILibrary, + type IMusicLibrary, + type INetworkLibrary, + type ISoundLibrary, +} from "../../libraries"; +import { type LibraryManager } from "./library.manager"; + +export class ClientLibraryManager { + private readonly _libraryManager: LibraryManager; + + constructor(libraryManager: LibraryManager) { + this._libraryManager = libraryManager; + } + + public get(sym: symbol): T { + return this._libraryManager.get(sym).library; + } + + public getComponentSystem(): T { + return this._libraryManager.getComponentSystem().library; + } + + public getGraphics(): T { + return this._libraryManager.getGraphics().library; + } + + public getNetwork(): T { + return this._libraryManager.getNetwork().library; + } + + public getInput(): T { + return this._libraryManager.getInput().library; + } + + public getAssetManager(): T { + return this._libraryManager.getAssetManager().library; + } + + public getSound(): T { + return this._libraryManager.getSound().library; + } + + public getMusic(): T { + return this._libraryManager.getMusic().library; + } +} diff --git a/packages/core/src/common/context/contexts/executions/execution.editable-context.ts b/packages/core/src/common/context/contexts/executions/execution.editable-context.ts index a425fc2..0887838 100644 --- a/packages/core/src/common/context/contexts/executions/execution.editable-context.ts +++ b/packages/core/src/common/context/contexts/executions/execution.editable-context.ts @@ -1,11 +1,3 @@ -import { ExecutionContext, type IRunnerLibrary } from "@nanoforge/common"; +import { ExecutionContext } from "@nanoforge/common"; -export class EditableExecutionContext extends ExecutionContext { - setIsRunning(isRunning: boolean) { - this._isRunning = isRunning; - } - - setCurrentLibrary(library: T) { - this._currentLibrary = library; - } -} +export class EditableExecutionContext extends ExecutionContext {} diff --git a/packages/core/src/common/library/manager/library.manager.ts b/packages/core/src/common/library/manager/library.manager.ts index 76efa80..af3de8c 100644 --- a/packages/core/src/common/library/manager/library.manager.ts +++ b/packages/core/src/common/library/manager/library.manager.ts @@ -96,7 +96,7 @@ export class EditableLibraryManager extends LibraryManager { private _getRunnerLibraries(): LibraryHandle[] { return this._libraries.filter( - (handle) => handle && typeof handle.library["run"] === "function", + (handle) => handle && typeof handle.library["__run"] === "function", ) as LibraryHandle[]; } } diff --git a/packages/core/src/common/library/relationship-functions.ts b/packages/core/src/common/library/relationship-functions.ts index 1bf1332..2ba79c6 100644 --- a/packages/core/src/common/library/relationship-functions.ts +++ b/packages/core/src/common/library/relationship-functions.ts @@ -21,10 +21,10 @@ class RelationshipStatic { for (const handle of libraries) { const key = handle.symbol; - for (const before of handle.library.relationship.runBefore) { + for (const before of handle.library.__relationship.runBefore) { this._pushToDependencies(key, before, dependencies); } - for (const after of handle.library.relationship.runAfter) { + for (const after of handle.library.__relationship.runAfter) { this._pushToDependencies(after, key, dependencies); } } @@ -100,7 +100,7 @@ class RelationshipStatic { if (cache.includes(handle.symbol)) throw new Error("Circular dependencies !"); cache.push(handle.symbol); - for (const dep of handle.library.relationship.dependencies) { + for (const dep of handle.library.__relationship.dependencies) { if (this._symbolIsInList(dep, response)) continue; const depHandle = libraries.find((lib) => lib?.symbol === dep) as LibraryHandle; diff --git a/packages/core/src/config/index.ts b/packages/core/src/config/index.ts deleted file mode 100644 index 7997572..0000000 --- a/packages/core/src/config/index.ts +++ /dev/null @@ -1,35 +0,0 @@ -import { Expose, Transform, plainToInstance } from "class-transformer"; -import { IsIP, IsInt, IsOptional, IsPort, validate } from "class-validator"; - -class Config { - @Expose() - @IsIP("4") - @IsOptional() - NETWORK_IP: string; - - @Expose() - @IsPort() - NETWORK_PORT: string; - - @Expose() - @Transform(({ value }) => parseInt(value, 10)) - @IsInt() - NETWORK_TEST: number; -} -const test = async () => { - console.log("\n"); - const data = plainToInstance( - Config, - { - NETWORK_IP: "127.0.0.1", - NETWORK_PORT: "8080", - NETWORK_TEST: "10", - }, - { excludeExtraneousValues: true }, - ); - const errors = await validate(data); - console.log(errors); - console.log(data); -}; - -test(); diff --git a/packages/core/src/core/core.ts b/packages/core/src/core/core.ts index 35631fb..b487ed5 100644 --- a/packages/core/src/core/core.ts +++ b/packages/core/src/core/core.ts @@ -1,6 +1,8 @@ import { type ApplicationContext, ClearContext, + ClientLibraryManager, + Context, type IRunOptions, type IRunnerLibrary, InitContext, @@ -33,15 +35,16 @@ export class Core { public async run(): Promise { const context = this.getExecutionContext(); + const clientContext = this.getClientContext(); const libraries = this.config.libraryManager.getExecutionLibraries(); let requestAnimationFrameHandle: number; const runner = async () => { - await this.runExecute(context, libraries); + await this.runExecute(clientContext, libraries); }; const render = () => { - if (!context.isRunning) { + if (!context.application.isRunning) { clearInterval(intervalHandle); this.runClear(this.getClearContext()); return; @@ -50,6 +53,7 @@ export class Core { requestAnimationFrameHandle = requestAnimationFrame(runner); }; + context.application.setIsRunning(true); const intervalHandle = setInterval(render, 1000 / this.options.tickRate); } @@ -64,7 +68,7 @@ export class Core { return new InitContext(this.context, this.config.libraryManager, this._configRegistry, options); } - private getExecutionContext(): EditableExecutionContext { + private getExecutionContext(): EditableExecutionContext { return new EditableExecutionContext(this.context, this.config.libraryManager); } @@ -72,26 +76,26 @@ export class Core { return new ClearContext(this.context, this.config.libraryManager); } + private getClientContext(): Context { + return new Context(this.context, new ClientLibraryManager(this.config.libraryManager)); + } + private async runInit(context: InitContext): Promise { for (const handle of this.config.libraryManager.getInitLibraries()) { - await handle.library.init(context); + await handle.library.__init(context); (handle.context as EditableLibraryContext).setStatus(LibraryStatusEnum.LOADED); } } - private async runExecute( - context: EditableExecutionContext, - libraries: LibraryHandle[], - ) { + private async runExecute(context: Context, libraries: LibraryHandle[]) { for (const handle of libraries) { - context.setCurrentLibrary(handle.library); - await handle.library.run(context); + await handle.library.__run(context); } } private async runClear(context: ClearContext) { for (const handle of this.config.libraryManager.getClearLibraries()) { - await handle.library.clear(context); + await handle.library.__clear(context); (handle.context as EditableLibraryContext).setStatus(LibraryStatusEnum.CLEAR); } } diff --git a/packages/ecs/src/ecs-context.type.ts b/packages/ecs/src/ecs-context.type.ts deleted file mode 100644 index a20c24b..0000000 --- a/packages/ecs/src/ecs-context.type.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { type ExecutionContext } from "@nanoforge/common"; - -import { type ECSLibrary } from "./ecs-library"; - -export type ECSContext = ExecutionContext; diff --git a/packages/ecs/src/ecs-library.ts b/packages/ecs/src/ecs-library.ts index 4d81634..ed4a587 100644 --- a/packages/ecs/src/ecs-library.ts +++ b/packages/ecs/src/ecs-library.ts @@ -2,13 +2,13 @@ import { type AssetManagerLibrary } from "@nanoforge/asset-manager"; import { ASSET_MANAGER_LIBRARY, BaseComponentSystemLibrary, + type Context, GRAPHICS_LIBRARY, type InitContext, } from "@nanoforge/common"; import type { MainModule } from "../lib"; import { Module } from "../lib"; -import { type ECSContext } from "./ecs-context.type"; import { ECSRegistry } from "./ecs-registry"; export class ECSLibrary extends BaseComponentSystemLibrary { @@ -24,11 +24,11 @@ export class ECSLibrary extends BaseComponentSystemLibrary { }); } - get name(): string { + get __name(): string { return "ECSLibrary"; } - async init(context: InitContext): Promise { + async __init(context: InitContext): Promise { const wasmFile = await context.libraries .getAssetManager() .library.getWasm(this.path); @@ -36,7 +36,7 @@ export class ECSLibrary extends BaseComponentSystemLibrary { this._registry = new ECSRegistry(new this.module.Registry()); } - async run(ctx: ECSContext): Promise { + async __run(ctx: Context): Promise { this._registry.runSystems(ctx); } diff --git a/packages/ecs/src/ecs-registry.ts b/packages/ecs/src/ecs-registry.ts index 6141b53..562828d 100644 --- a/packages/ecs/src/ecs-registry.ts +++ b/packages/ecs/src/ecs-registry.ts @@ -1,8 +1,9 @@ +import { type Context } from "@nanoforge/common"; + import type { Entity, Registry, SparseArray } from "../lib"; -import { type ECSContext } from "./ecs-context.type"; export type Component = { name: string; [key: string]: any }; -export type System = (registry: ECSRegistry, ctx: ECSContext) => void; +export type System = (registry: ECSRegistry, ctx: Context) => void; export class ECSRegistry { private _registry: Registry; @@ -39,7 +40,7 @@ export class ECSRegistry { return this._registry.clearEntities(); } - runSystems(ctx: ECSContext): void { + runSystems(ctx: Context): void { return this._registry.runSystems(ctx); } diff --git a/packages/ecs/src/index.ts b/packages/ecs/src/index.ts index da11674..45e3590 100644 --- a/packages/ecs/src/index.ts +++ b/packages/ecs/src/index.ts @@ -1,5 +1,4 @@ import "../lib/libecs.wasm"; export { ECSLibrary } from "./ecs-library"; -export type { ECSContext } from "./ecs-context.type"; export type { ECSRegistry, Component, System } from "./ecs-registry"; diff --git a/packages/ecs/test/ecs-library.spec.ts b/packages/ecs/test/ecs-library.spec.ts index f94ed59..58b6b08 100644 --- a/packages/ecs/test/ecs-library.spec.ts +++ b/packages/ecs/test/ecs-library.spec.ts @@ -41,12 +41,12 @@ describe("ECSLibrary", () => { libraryManager.setAssetManager(assetManager); beforeAll(async () => { - await assetManager.init(initContext); + await assetManager.__init(initContext); }); beforeEach(async () => { ecs = new ECSLibrary(); - await ecs.init(initContext); + await ecs.__init(initContext); registry = ecs.registry; }); @@ -66,6 +66,6 @@ describe("ECSLibrary", () => { }); test("clear", async () => { - await ecs.clear(clearContext); + await ecs.__clear(clearContext); }); }); diff --git a/packages/graphics-2d/src/graphics-2d.library.ts b/packages/graphics-2d/src/graphics-2d.library.ts index 5640a77..44c208d 100644 --- a/packages/graphics-2d/src/graphics-2d.library.ts +++ b/packages/graphics-2d/src/graphics-2d.library.ts @@ -5,7 +5,7 @@ import { Graphics } from "."; export class Graphics2DLibrary extends BaseGraphicsLibrary { private _stage: Graphics.Stage; - get name(): string { + get __name(): string { return "Graphics2DLibrary"; } @@ -13,7 +13,7 @@ export class Graphics2DLibrary extends BaseGraphicsLibrary { return this._stage; } - public async init(context: InitContext): Promise { + public async __init(context: InitContext): Promise { if (!context.canvas) { throw new Error("Can't initialize the canvas context"); } @@ -24,5 +24,5 @@ export class Graphics2DLibrary extends BaseGraphicsLibrary { }); } - public async run(): Promise {} + public async __run(): Promise {} } diff --git a/packages/graphics-2d/test/graphics-2d.library.spec.ts b/packages/graphics-2d/test/graphics-2d.library.spec.ts index 0574215..0846aa8 100644 --- a/packages/graphics-2d/test/graphics-2d.library.spec.ts +++ b/packages/graphics-2d/test/graphics-2d.library.spec.ts @@ -23,6 +23,6 @@ describe("Graphics 2D Library", () => { }); it("Should throw if canvas is undefined", async () => { - await expect(library.init(context)).rejects.toThrow(); + await expect(library.__init(context)).rejects.toThrow(); }); }); diff --git a/packages/input/src/input.library.ts b/packages/input/src/input.library.ts index a06e373..51e9700 100644 --- a/packages/input/src/input.library.ts +++ b/packages/input/src/input.library.ts @@ -6,11 +6,11 @@ import { type InputEnum } from "./input.enum"; export class InputLibrary extends BaseInputLibrary { private _inputHandler: InputHandler; - get name(): string { + get __name(): string { return "InputLibrary"; } - public async init(): Promise { + public async __init(): Promise { this._inputHandler = new InputHandler(); } diff --git a/packages/music/src/music.library.ts b/packages/music/src/music.library.ts index b92fe7f..56ca03e 100644 --- a/packages/music/src/music.library.ts +++ b/packages/music/src/music.library.ts @@ -5,11 +5,11 @@ export class MusicLibrary extends BaseMusicLibrary { private musics: Map; private current: HTMLAudioElement | null = null; - get name(): string { + get __name(): string { return "NfMusic"; } - public async init(): Promise { + public async __init(): Promise { this.musics = new Map(); this.muted = true; } diff --git a/packages/sound/src/sound.library.ts b/packages/sound/src/sound.library.ts index 25ce81a..646ea95 100644 --- a/packages/sound/src/sound.library.ts +++ b/packages/sound/src/sound.library.ts @@ -4,11 +4,11 @@ export class SoundLibrary extends BaseSoundLibrary { private muted: boolean; private sounds: Map; - get name(): string { + get __name(): string { return "NfSound"; } - public async init(): Promise { + public async __init(): Promise { this.sounds = new Map(); this.muted = true; }