mani-game-engine 1.0.0-pre.34 → 1.0.0-pre.36

package/src/systemContext.ts

@@ -1,27 +1,37 @@
-import {System} from './types';
-import {GameEngine, Signal, SignalBinding, SignalCallback} from './index';
-
-export class SystemContext<T extends System = System> {
-    readonly system!: T;
-    private signalBindings: SignalBinding[] = [];
-
-    constructor(readonly entity: Object) {
-    }
-
-    // TODO: is this a bit hacky?
-    addSignalById<S>(signalId: string | symbol, callback: SignalCallback<S>, thisArg?: unknown) {
-        this.signalBindings.push(((this.entity as any).gameEngine as GameEngine).getSignal<S>(signalId).add(callback, thisArg));
-    }
-
-    addSignal<S>(signal: Signal<S>, callback: SignalCallback<S>, thisArg?: unknown) {
-        this.signalBindings.push(signal.add(callback, thisArg));
-    }
-
-    addSignalOnce<S>(signal: Signal<S>, callback: SignalCallback<S>, thisArg?: unknown) {
-        this.signalBindings.push(signal.addOnce(callback, thisArg));
-    }
-
-    dispose() {
-        for (const binding of this.signalBindings) binding.detach();
-    }
-}
+import {System} from './types';
+import {GameEngine, ID, putIfAbsent, Signal, SignalBinding, SignalCallback} from './index';
+
+export const entitySignalHandlers = new Map<Object, [string, ID][]>();
+export const OnEntitySignal = (id: ID) => (target: any, propertyKey: string, descriptor: PropertyDescriptor) => {
+    if (target instanceof Function) {
+        throw new Error('only allowed on non static methods');
+    } else {
+        const mappingList = putIfAbsent(entitySignalHandlers, target.constructor, (): [string, ID][] => []);
+        mappingList.push([propertyKey, id]);
+    }
+};
+
+export class SystemContext<T extends System = System> {
+    readonly system!: T;
+    private signalBindings: SignalBinding[] = [];
+
+    constructor(readonly entity: Object) {
+    }
+
+    // TODO: is this a bit hacky?
+    addSignalById<S>(signalId: string | symbol, callback: SignalCallback<S>, thisArg?: unknown) {
+        this.signalBindings.push(((this.entity as any).gameEngine as GameEngine).getSignal<S>(signalId).add(callback, thisArg));
+    }
+
+    addSignal<S>(signal: Signal<S>, callback: SignalCallback<S>, thisArg?: unknown) {
+        this.signalBindings.push(signal.add(callback, thisArg));
+    }
+
+    addSignalOnce<S>(signal: Signal<S>, callback: SignalCallback<S>, thisArg?: unknown) {
+        this.signalBindings.push(signal.addOnce(callback, thisArg));
+    }
+
+    dispose() {
+        for (const binding of this.signalBindings) binding.detach();
+    }
+}

package/src/types.ts

@@ -1,87 +1,87 @@
-import {GameEngine} from './gameEngine';
-
-export interface System {
-    [propName: string]: any;
-    onPrepare?(): Promise<void>;
-    onStart?(): void;
-    onEnd?(): void;
-    onPreFixedUpdate?(time: number, deltaTime: number): void;
-    onFixedUpdate?(time: number, deltaTime: number): void;
-    onPhysicsUpdate?(time: number, deltaTime: number): void;
-    onUpdate?(time: number, deltaTime: number, alpha: number): void;
-    onLateUpdate?(time: number, deltaTime: number, alpha: number): void;
-    onPrePhysicsUpdate?(time: number, deltaTime: number): void;
-    onPostPhysicsUpdate?(time: number, deltaTime: number): void;
-    onLateFixedUpdate?(time: number, deltaTime: number): void;
-    onRender?(time: number, deltaTime: number, alpha: number): void;
-    // new(): GameSystem;
-}
-
-// export interface GameSystemClass {
-//     new(...args: any[]): GameSystem;
-// }
-
-export interface Service {
-    [propName: string]: any; // disable weak type detection
-    onPrepare?(): Promise<void>;
-    onStart?(): void;
-    onEnd?(): void;
-    onPreFixedUpdate?(time: number, deltaTime: number): void;
-    onPostPhysicsUpdate?(time: number, deltaTime: number): void;
-    onLateFixedUpdate?(time: number, deltaTime: number): void;
-    onFixedUpdate?(time: number, deltaTime: number): void;
-    onPhysicsUpdate?(time: number, deltaTime: number): void;
-    onPrePhysicsUpdate?(time: number, deltaTime: number): void;
-    onUpdate?(time: number, deltaTime: number, alpha: number): void;
-    onLateUpdate?(time: number, deltaTime: number, alpha: number): void;
-    onRender?(time: number, deltaTime: number, alpha: number): void;
-    // new(): GameSystem;
-}
-
-type GameEngineCallback = (gameEngine: GameEngine) => void;
-
-export interface GameEnginePlugin {
-    // systems?: (SystemClass | GameSystemClass)[];
-    // services?: Service[];
-    onPrepare?: GameEngineCallback;
-    onStart?: GameEngineCallback;
-}
-
-export interface CommandClass {
-    name?: string;
-
-    new(...args: any[]): any;
-}
-
-export type OnUpdateParams = {
-    time: number;
-    deltaTime: number;
-    alpha: number;
-};
-
-export type OnFixedUpdateParams = {
-    time: number;
-    deltaTime: number;
-};
-
-export type OnEarlyUpdateParams = { time: number, deltaTime: number };
-
-export type AsyncAction<T = unknown> = (gameEngine: GameEngine) => Promise<T>;
-// export type Action<T = unknown> = (gameEngine: GameEngine) => T;
-export type Action<T = any> = (gameEngine: GameEngine) => T;
-export type Class<T = any> = { new(...args: any[]): T; }
-
-export const EngineSignals = {
-    OnStart: Symbol('OnStart'),
-    OnEnd: Symbol('OnEnd'),
-    OnUpdate: Symbol('OnUpdate'),
-    OnLateUpdate: Symbol('OnLateUpdate'),
-    OnFixedUpdate: Symbol('OnFixedUpdate'),
-    OnPreFixedUpdate: Symbol('OnPreFixedUpdate'),
-    OnPrePhysicsUpdate: Symbol('OnPrePhysicsUpdate'),
-    OnPhysicsUpdate: Symbol('OnPhysicsUpdate'),
-    OnPostPhysicsUpdate: Symbol('OnPostPhysicsUpdate'),
-    onLateFixedUpdate: Symbol('onLateFixedUpdate'),
-    OnRender: Symbol('OnRender'),
-    OnPrepare: Symbol('OnPrepare'),
-};
+import {GameEngine} from './gameEngine';
+
+export interface System {
+    [propName: string]: any;
+    onPrepare?(): Promise<void>;
+    onStart?(): void;
+    onEnd?(): void;
+    onPreFixedUpdate?(time: number, deltaTime: number): void;
+    onFixedUpdate?(time: number, deltaTime: number): void;
+    onPhysicsUpdate?(time: number, deltaTime: number): void;
+    onUpdate?(time: number, deltaTime: number, alpha: number): void;
+    onLateUpdate?(time: number, deltaTime: number, alpha: number): void;
+    onPrePhysicsUpdate?(time: number, deltaTime: number): void;
+    onPostPhysicsUpdate?(time: number, deltaTime: number): void;
+    onLateFixedUpdate?(time: number, deltaTime: number): void;
+    onRender?(time: number, deltaTime: number, alpha: number): void;
+    // new(): GameSystem;
+}
+
+// export interface GameSystemClass {
+//     new(...args: any[]): GameSystem;
+// }
+
+export interface Service {
+    [propName: string]: any; // disable weak type detection
+    onPrepare?(): Promise<void>;
+    onStart?(): void;
+    onEnd?(): void;
+    onPreFixedUpdate?(time: number, deltaTime: number): void;
+    onPostPhysicsUpdate?(time: number, deltaTime: number): void;
+    onLateFixedUpdate?(time: number, deltaTime: number): void;
+    onFixedUpdate?(time: number, deltaTime: number): void;
+    onPhysicsUpdate?(time: number, deltaTime: number): void;
+    onPrePhysicsUpdate?(time: number, deltaTime: number): void;
+    onUpdate?(time: number, deltaTime: number, alpha: number): void;
+    onLateUpdate?(time: number, deltaTime: number, alpha: number): void;
+    onRender?(time: number, deltaTime: number, alpha: number): void;
+    // new(): GameSystem;
+}
+
+type GameEngineCallback = (gameEngine: GameEngine) => void;
+
+export interface GameEnginePlugin {
+    // systems?: (SystemClass | GameSystemClass)[];
+    // services?: Service[];
+    onPrepare?: GameEngineCallback;
+    onStart?: GameEngineCallback;
+}
+
+export interface CommandClass {
+    name?: string;
+
+    new(...args: any[]): any;
+}
+
+export type OnUpdateParams = {
+    time: number;
+    deltaTime: number;
+    alpha: number;
+};
+
+export type OnFixedUpdateParams = {
+    time: number;
+    deltaTime: number;
+};
+
+export type OnEarlyUpdateParams = { time: number, deltaTime: number };
+
+export type AsyncAction<T = unknown> = (gameEngine: GameEngine) => Promise<T>;
+// export type Action<T = unknown> = (gameEngine: GameEngine) => T;
+export type Action<T = any> = (gameEngine: GameEngine) => T;
+export type Class<T = any> = { new(...args: any[]): T; }
+
+export const EngineSignals = {
+    OnStart: Symbol('OnStart'),
+    OnEnd: Symbol('OnEnd'),
+    OnUpdate: Symbol('OnUpdate'),
+    OnLateUpdate: Symbol('OnLateUpdate'),
+    OnFixedUpdate: Symbol('OnFixedUpdate'),
+    OnPreFixedUpdate: Symbol('OnPreFixedUpdate'),
+    OnPrePhysicsUpdate: Symbol('OnPrePhysicsUpdate'),
+    OnPhysicsUpdate: Symbol('OnPhysicsUpdate'),
+    OnPostPhysicsUpdate: Symbol('OnPostPhysicsUpdate'),
+    onLateFixedUpdate: Symbol('onLateFixedUpdate'),
+    OnRender: Symbol('OnRender'),
+    OnPrepare: Symbol('OnPrepare'),
+};

package/src/utils/map2k.ts

@@ -1,52 +1,52 @@
-export class Map2k<K, V> {
-    map = new Map<K, Map<K, V>>();
-
-    set(key1: K, key2: K, value: V) {
-        let first = this.map.get(key1);
-        if(!first) {
-            first = new Map<K, V>();
-            this.map.set(key1, first);
-        }
-        let second = this.map.get(key2);
-        if(!second) {
-            second = new Map<K, V>();
-            this.map.set(key2, second);
-        }
-        first.set(key2, value);
-        second.set(key1, value);
-    }
-
-    // putIfAbsent(key1: K, key2: K, cb: () => V): V {
-    //     let first = this.map.get(key1);
-    //     let value;
-    //     if(!first) {
-    //         first = new Map<K, V>();
-    //         this.map.set(key1, first);
-    //         value = cb();
-    //         first.set(key2, value);
-    //     }
-    // }
-
-    get(key1: K, key2: K): V | undefined {
-        const first = this.map.get(key1);
-        return first && first.get(key2);
-    }
-
-    delete(key1:K, key2:K) {
-        let first = this.map.get(key1);
-        if (first) {
-            first.delete(key2);
-            if (first.size === 0) {
-                this.map.delete(key1)
-            }
-        }
-        let second = this.map.get(key2);
-        if (second) {
-            second.delete(key1);
-            if (second.size === 0) {
-                this.map.delete(key2)
-            }
-        }
-    }
-
-}
+export class Map2k<K, V> {
+    map = new Map<K, Map<K, V>>();
+
+    set(key1: K, key2: K, value: V) {
+        let first = this.map.get(key1);
+        if(!first) {
+            first = new Map<K, V>();
+            this.map.set(key1, first);
+        }
+        let second = this.map.get(key2);
+        if(!second) {
+            second = new Map<K, V>();
+            this.map.set(key2, second);
+        }
+        first.set(key2, value);
+        second.set(key1, value);
+    }
+
+    // putIfAbsent(key1: K, key2: K, cb: () => V): V {
+    //     let first = this.map.get(key1);
+    //     let value;
+    //     if(!first) {
+    //         first = new Map<K, V>();
+    //         this.map.set(key1, first);
+    //         value = cb();
+    //         first.set(key2, value);
+    //     }
+    // }
+
+    get(key1: K, key2: K): V | undefined {
+        const first = this.map.get(key1);
+        return first && first.get(key2);
+    }
+
+    delete(key1:K, key2:K) {
+        let first = this.map.get(key1);
+        if (first) {
+            first.delete(key2);
+            if (first.size === 0) {
+                this.map.delete(key1)
+            }
+        }
+        let second = this.map.get(key2);
+        if (second) {
+            second.delete(key1);
+            if (second.size === 0) {
+                this.map.delete(key2)
+            }
+        }
+    }
+
+}