mani-game-engine 1.0.0-pre.4 → 1.0.0-pre.40

package/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2020 Jan Mankopf
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2022 Jan Mankopf
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -1,69 +1,69 @@
-
-#### Use entity component system
-```typescript
-import {EntityComponent, GetComponent, GetEntity, Inject, Injector} from 'mani-injector';
-
-class Service {}
-
-class FooComponent {}
-class BarComponent {}
-
-class FirstEntity {
-    @EntityComponent
-    foo: FooComponent = new FooComponent();
-}
-
-class SecondEntity {
-    @EntityComponent
-    foo: FooComponent = new FooComponent();
-    @EntityComponent
-    bar: BarComponent = new BarComponent();
-}
-
-// this system is created for every entity that has a FooComponent
-class FooSystem {
-    constructor(
-        // get a reference to the component when the system is created for a specific entity
-        @GetComponent readonly foo: FooComponent,
-        // you can get the entity object
-        @GetEntity readonly entity:Object 
-    ) {}
-}
-
-// this system is created for every entity that has a BarComponent
-class BarSystem {
-    constructor(
-        @GetComponent readonly bar: BarComponent,
-    ) {}
-}
-
-// this system is created for every entity that has a FooComponent and a BarComponent
-class FooBarSystem {
-    constructor(
-        @GetComponent readonly foo: FooComponent,
-        @GetComponent readonly bar: BarComponent,
-        // you can inject everything that is mapped in the injector
-        @Inject readonly service: Service 
-    ) {}
-}
-
-
-const injector = new Injector();
-
-injector.registerSystem(FooSystem);
-injector.registerSystem(BarSystem);
-injector.registerSystem(FooBarSystem);
-injector.map(Service).toSingleton();
-
-const entity1 = new FirstEntity();
-const entity2 = new SecondEntity();
-
-// array with one instance of FooSystem with a reference to the component
-console.log(injector.createSystems(entity1));
-
-// array with 3 systems
-// one instance of FooSystem
-// one instance of BarSystem
-// one instance of FooBarSystem
-console.log(injector.createSystems(entity2));
-```
+
+#### Use entity component system
+```typescript
+import {EntityComponent, GetComponent, GetEntity, Inject, Injector} from 'mani-injector';
+
+class Service {}
+
+class FooComponent {}
+class BarComponent {}
+
+class FirstEntity {
+    @EntityComponent
+    foo: FooComponent = new FooComponent();
+}
+
+class SecondEntity {
+    @EntityComponent
+    foo: FooComponent = new FooComponent();
+    @EntityComponent
+    bar: BarComponent = new BarComponent();
+}
+
+// this system is created for every entity that has a FooComponent
+class FooSystem {
+    constructor(
+        // get a reference to the component when the system is created for a specific entity
+        @GetComponent readonly foo: FooComponent,
+        // you can get the entity object
+        @GetEntity readonly entity:Object 
+    ) {}
+}
+
+// this system is created for every entity that has a BarComponent
+class BarSystem {
+    constructor(
+        @GetComponent readonly bar: BarComponent,
+    ) {}
+}
+
+// this system is created for every entity that has a FooComponent and a BarComponent
+class FooBarSystem {
+    constructor(
+        @GetComponent readonly foo: FooComponent,
+        @GetComponent readonly bar: BarComponent,
+        // you can inject everything that is mapped in the injector
+        @Inject readonly service: Service 
+    ) {}
+}
+
+
+const injector = new Injector();
+
+injector.registerSystem(FooSystem);
+injector.registerSystem(BarSystem);
+injector.registerSystem(FooBarSystem);
+injector.map(Service).toSingleton();
+
+const entity1 = new FirstEntity();
+const entity2 = new SecondEntity();
+
+// array with one instance of FooSystem with a reference to the component
+console.log(injector.createSystems(entity1));
+
+// array with 3 systems
+// one instance of FooSystem
+// one instance of BarSystem
+// one instance of FooBarSystem
+console.log(injector.createSystems(entity2));
+```

package/lib/clock.d.ts

@@ -1,41 +1,55 @@
-import { Signal } from 'mani-signal';
-declare type OnEarlyUpdateParams = {
-    time: number;
-    deltaTime: number;
-};
-declare type OnUpdateParams = {
-    time: number;
-    deltaTime: number;
-    alpha: number;
-};
-declare type OnFixedUpdateParams = {
-    time: number;
-    deltaTime: number;
-};
-declare const defaultOptions: {
-    autoStart: boolean;
-    fixedDeltaTime: number;
-    maxFrameTime: number;
-    timeScale: number;
-};
-export declare type GameClockOptions = Partial<typeof defaultOptions>;
-export declare class Clock {
-    private isRunning;
-    private requestId;
-    private currentTime;
-    private accumulator;
-    private gameTime;
-    private fixedDeltaTime;
-    private maxFrameTime;
-    readonly onPrepare: Signal<any>;
-    readonly onEarlyUpdate: Signal<OnEarlyUpdateParams>;
-    readonly onUpdate: Signal<OnUpdateParams>;
-    readonly onFixedUpdate: Signal<OnFixedUpdateParams>;
-    constructor(options?: GameClockOptions);
-    private update;
-    private _timeScale;
-    timeScale: number;
-    start(): this;
-    stop(): void;
-}
-export {};
+import { Signal } from 'mani-signal';
+import { OnEarlyUpdateParams, OnFixedUpdateParams, OnUpdateParams } from './types';
+declare const defaultOptions: {
+    autoStart: boolean;
+    fixedDeltaTime: number;
+    maxFrameTime: number;
+    timeScale: number;
+};
+export type Timeout = {
+    recall?: number;
+    callback: Function;
+    callTime: number;
+};
+export type GameClockOptions = Partial<typeof defaultOptions>;
+export interface Clock {
+    onPrepare: Signal<unknown>;
+    onEarlyUpdate: Signal<OnEarlyUpdateParams>;
+    onUpdate: Signal<OnUpdateParams>;
+    onFixedUpdate: Signal<OnFixedUpdateParams>;
+    timeScale: number;
+    start(): this;
+    stop(): this;
+    dispose(): void;
+    setTimeout(callback: Function, delay: number): number;
+    setInterval(callback: Function, delay: number): number;
+    clearTimeout(timeoutId: number): boolean;
+}
+export declare class GameClock implements Clock {
+    private nextTimeoutId;
+    private timeouts;
+    private isRunning;
+    private requestId;
+    private currentTime;
+    private accumulator;
+    private gameTime;
+    private readonly _fixedDeltaTime;
+    private update;
+    private readonly maxFrameTime;
+    readonly onPrepare: Signal<unknown>;
+    readonly onEarlyUpdate: Signal<OnEarlyUpdateParams>;
+    readonly onUpdate: Signal<OnUpdateParams>;
+    readonly onFixedUpdate: Signal<OnFixedUpdateParams>;
+    constructor(options?: GameClockOptions);
+    dispose(): void;
+    get fixedDeltaTime(): number;
+    private _timeScale;
+    get timeScale(): number;
+    set timeScale(value: number);
+    start(): this;
+    stop(): this;
+    setTimeout(callback: Function, delay: number): number;
+    setInterval(callback: Function, delay: number): number;
+    clearTimeout(timeoutId: number): boolean;
+}
+export {};

package/lib/clock.js

@@ -1,78 +1,118 @@
-import { Signal } from 'mani-signal';
-const MIN_TIME_SCALE = 0.00001;
-const defaultOptions = {
-    autoStart: true,
-    fixedDeltaTime: 1 / 60,
-    maxFrameTime: 0.25,
-    timeScale: 1,
-};
-export class Clock {
-    constructor(options) {
-        this.isRunning = false;
-        this.requestId = 0;
-        this.currentTime = 0;
-        this.accumulator = 0;
-        this.gameTime = 0;
-        this.onPrepare = new Signal();
-        this.onEarlyUpdate = new Signal();
-        this.onUpdate = new Signal();
-        this.onFixedUpdate = new Signal();
-        this.update = (time) => {
-            const newTime = time * 0.001;
-            if (!this.isRunning) {
-                this.currentTime = newTime;
-                this.isRunning = true;
-            }
-            let frameTime = (newTime - this.currentTime) * this.timeScale;
-            if (frameTime > this.maxFrameTime) {
-                frameTime = this.maxFrameTime;
-            }
-            this.currentTime = newTime;
-            this.accumulator += frameTime;
-            let isMultipleFixedUpdate = false;
-            this.onPrepare.dispatch();
-            this.onEarlyUpdate.dispatch({ time: this.gameTime, deltaTime: frameTime });
-            while (this.accumulator >= this.fixedDeltaTime) {
-                if (isMultipleFixedUpdate) {
-                    this.onPrepare.dispatch();
-                }
-                this.onFixedUpdate.dispatch({ time: this.gameTime, deltaTime: this.fixedDeltaTime });
-                isMultipleFixedUpdate = true;
-                this.accumulator -= this.fixedDeltaTime;
-                this.gameTime += this.fixedDeltaTime;
-            }
-            const alpha = this.accumulator / this.fixedDeltaTime;
-            this.onUpdate.dispatch({ time: this.gameTime + alpha * this.fixedDeltaTime, deltaTime: frameTime, alpha: alpha });
-            if (this.isRunning) {
-                this.requestId = requestAnimationFrame(this.update);
-            }
-        };
-        this._timeScale = 1;
-        const opts = Object.assign({}, defaultOptions, options);
-        this.fixedDeltaTime = opts.fixedDeltaTime;
-        this.maxFrameTime = opts.maxFrameTime;
-        this.timeScale = opts.timeScale;
-        opts.autoStart && this.start();
-    }
-    get timeScale() {
-        return this._timeScale;
-    }
-    set timeScale(value) {
-        this._timeScale = Math.max(value, MIN_TIME_SCALE);
-    }
-    start() {
-        if (this.isRunning) {
-            return this;
-        }
-        this.requestId = requestAnimationFrame(this.update);
-        return this;
-    }
-    stop() {
-        if (!this.isRunning) {
-            return;
-        }
-        this.isRunning = false;
-        cancelAnimationFrame(this.requestId);
-    }
-}
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GameClock = void 0;
+const mani_signal_1 = require("mani-signal");
+const MIN_TIME_SCALE = 0.00001;
+const defaultOptions = {
+    autoStart: true,
+    fixedDeltaTime: 1 / 60,
+    maxFrameTime: 0.25,
+    timeScale: 1,
+};
+class GameClock {
+    constructor(options) {
+        this.nextTimeoutId = 0;
+        this.timeouts = new Map();
+        this.isRunning = false;
+        this.requestId = 0;
+        this.currentTime = 0;
+        this.accumulator = 0;
+        this.gameTime = 0;
+        this.update = (time) => {
+            const newTime = time * 0.001;
+            if (!this.isRunning) {
+                this.currentTime = newTime;
+                this.isRunning = true;
+            }
+            let frameTime = (newTime - this.currentTime) * this.timeScale;
+            if (frameTime > this.maxFrameTime) {
+                frameTime = this.maxFrameTime;
+            }
+            this.currentTime = newTime;
+            this.accumulator += frameTime;
+            let isMultipleFixedUpdate = false;
+            this.onPrepare.dispatch();
+            this.onEarlyUpdate.dispatch({ time: this.gameTime, deltaTime: frameTime });
+            for (const [id, timeOut] of this.timeouts) {
+                if (this.gameTime >= timeOut.callTime) {
+                    timeOut.callback();
+                    if (timeOut.recall) {
+                        timeOut.callTime += timeOut.recall;
+                    }
+                    else {
+                        this.timeouts.delete(id);
+                    }
+                }
+            }
+            while (this.accumulator >= this._fixedDeltaTime) {
+                if (isMultipleFixedUpdate) {
+                    this.onPrepare.dispatch();
+                }
+                this.onFixedUpdate.dispatch({ time: this.gameTime, deltaTime: this._fixedDeltaTime });
+                isMultipleFixedUpdate = true;
+                this.accumulator -= this._fixedDeltaTime;
+                this.gameTime += this._fixedDeltaTime;
+            }
+            const alpha = this.accumulator / this._fixedDeltaTime;
+            this.onUpdate.dispatch({ time: this.gameTime + alpha * this._fixedDeltaTime, deltaTime: frameTime, alpha: alpha });
+            if (this.isRunning) {
+                this.requestId = requestAnimationFrame(this.update);
+            }
+        };
+        this.onPrepare = new mani_signal_1.Signal();
+        this.onEarlyUpdate = new mani_signal_1.Signal();
+        this.onUpdate = new mani_signal_1.Signal();
+        this.onFixedUpdate = new mani_signal_1.Signal();
+        this._timeScale = 1;
+        const opts = Object.assign(Object.assign({}, defaultOptions), options);
+        this._fixedDeltaTime = opts.fixedDeltaTime;
+        this.maxFrameTime = opts.maxFrameTime;
+        this.timeScale = opts.timeScale;
+        opts.autoStart && this.start();
+    }
+    dispose() {
+        this.onPrepare.detachAll();
+        this.onEarlyUpdate.detachAll();
+        this.onUpdate.detachAll();
+        this.onFixedUpdate.detachAll();
+    }
+    get fixedDeltaTime() { return this._fixedDeltaTime; }
+    get timeScale() {
+        return this._timeScale;
+    }
+    set timeScale(value) {
+        this._timeScale = Math.max(value, MIN_TIME_SCALE);
+    }
+    start() {
+        if (this.isRunning) {
+            return this;
+        }
+        this.requestId = requestAnimationFrame(this.update);
+        return this;
+    }
+    stop() {
+        if (!this.isRunning) {
+            return this;
+        }
+        this.isRunning = false;
+        cancelAnimationFrame(this.requestId);
+        return this;
+    }
+    setTimeout(callback, delay) {
+        const timeOut = { callback, callTime: this.gameTime + delay };
+        this.nextTimeoutId++;
+        this.timeouts.set(this.nextTimeoutId, timeOut);
+        return this.nextTimeoutId;
+    }
+    setInterval(callback, delay) {
+        const timeOut = { callback, callTime: this.gameTime + delay, recall: delay };
+        this.nextTimeoutId++;
+        this.timeouts.set(this.nextTimeoutId, timeOut);
+        return this.nextTimeoutId;
+    }
+    clearTimeout(timeoutId) {
+        return this.timeouts.delete(timeoutId);
+    }
+}
+exports.GameClock = GameClock;
 //# sourceMappingURL=clock.js.map

package/lib/clock.js.map

@@ -1 +1 @@
-{"version":3,"file":"clock.js","sourceRoot":"","sources":["../src/clock.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"clock.js","sourceRoot":"","sources":["../src/clock.ts"],"names":[],"mappings":"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"}

package/lib/ecsInjector.d.ts

@@ -1,21 +1,46 @@
-import { Class, ID, Injector, ResolverFunction } from 'mani-injector';
-import { Signal } from 'mani-signal';
-declare type SystemResolvers<T extends Class> = [T, ResolverFunction[]];
-export declare const entityComponents: Map<Class<any>, Map<Class<any>, string>>;
-export declare const GetComponent: (dependantType: Class<any>, _propertyKey: string | symbol, index: number) => any;
-export declare const GetEntity: (dependantType: Class<any>, _propertyKey: string | symbol, index: number) => any;
-export declare const GetSignal: (id: string | symbol) => (dependantType: Class<any>, _propertyKey: string | symbol, index: number) => any;
-export declare const EntityComponent: (target: object, propertyKey: string) => any;
-export declare const signalHandlers: Map<Object, [string, string | symbol][]>;
-export declare const staticSignalHandlers: Map<Object, [string, string | symbol][]>;
-export declare const OnSignal: (id: string | symbol) => (target: any, propertyKey: string, descriptor: PropertyDescriptor) => void;
-export declare class EcsInjector<SystemClass extends Class = Class> extends Injector {
-    protected entitySystemMap: Map<Class, SystemClass[]>;
-    protected entitySystemResolverTuples: Map<Class, SystemResolvers<SystemClass>[]>;
-    private signalMap;
-    constructor(parent?: EcsInjector<SystemClass>);
-    registerSystem<T extends SystemClass>(systemClass: T): void;
-    createSystems(entity: Object): InstanceType<SystemClass>[];
-    getSignal<T>(id: ID): Signal<T>;
-}
-export {};
+import { Signal } from 'mani-signal';
+import { Class, Dependency, ID, Injector, ResolverFunction } from './injector';
+import { SystemContext } from './systemContext';
+import { Entity } from './entity';
+type ComponentClass = Class;
+type EntityClass = Class;
+type ComponentDependency = Dependency & {
+    kind: 'component';
+    index: number;
+    type: Class;
+};
+type DynamicComponentDependency = Dependency & {
+    kind: 'dynamic';
+    index: number;
+    type: Class;
+};
+export declare const GetComponent: (dependantType: Class<any>, _propertyKey: string | symbol, index: number) => any;
+export declare const GetDynamicComponent: (dependantType: Class<any>, _propertyKey: string | symbol, index: number) => any;
+export declare const GetEntity: (dependantType: Class<any>, _propertyKey: string | symbol, index: number) => any;
+export declare const GetContext: (dependantType: Class<any>, _propertyKey: string | symbol, index: number) => any;
+export declare const GetSignal: (id: ID) => (dependantType: Class<any>, _propertyKey: string | symbol, index: number) => any;
+export declare const GetEntitySignal: (id: ID) => (dependantType: Class<any>, _propertyKey: string | symbol, index: number) => any;
+export declare const EntityComponent: (target: object, propertyKey: string) => any;
+export declare const signalHandlers: Map<Object, [string, ID][]>;
+export declare const staticSignalHandlers: Map<Object, [string, ID][]>;
+export declare const OnSignal: (id: ID) => (target: any, propertyKey: string, descriptor: PropertyDescriptor) => void;
+export declare class EcsInjector<SystemClass extends Class = Class> extends Injector {
+    static warnNoMatchingEntities: boolean;
+    static entityComponents: Map<EntityClass, Map<ComponentClass, string>>;
+    protected componentDependencyMap: Map<Class<any>, ComponentDependency[]>;
+    protected dynamicComponentDependencyMap: Map<Class<any>, DynamicComponentDependency[]>;
+    protected entitySystemMap: Map<Class, SystemClass[]>;
+    protected dynamicComponentSystemMap: Map<Class, SystemClass[]>;
+    protected entitySystemResolverTuples: Map<Class, Map<SystemClass, ResolverFunction[]>>;
+    private signalMap;
+    constructor(parent?: EcsInjector<SystemClass>);
+    newSignalScope(): void;
+    registerSystem<T extends SystemClass>(systemClass: T): void;
+    createSystemsForDynamicComponents(dynamicComponentClass: Class, entity: Entity): Set<SystemContext<import("./types").System>>;
+    createSystemsForEntity(entity: Entity): Set<SystemContext>;
+    private createSystems;
+    private getSystemResolverTuples;
+    getSignal<T>(id: ID): Signal<T>;
+    dispose(): void;
+}
+export {};