mani-game-engine 1.0.0-pre.3 → 1.0.0-pre.30

package/lib/scope/scopeContext.js

@@ -0,0 +1,255 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ScopeContext = exports.SCOPE_CONTEXT = exports.OnScopeSignal = exports.scopeSignalHandlers = void 0;
+const ecsInjector_1 = require("../ecsInjector");
+const injector_1 = require("../injector");
+exports.scopeSignalHandlers = new Map();
+const OnScopeSignal = (id, options) => (target, propertyKey, descriptor) => {
+    if (target instanceof Function) {
+        throw new Error('only allowed on non static methods');
+    }
+    else {
+        const mappingList = injector_1.putIfAbsent(exports.scopeSignalHandlers, target.constructor, () => []);
+        mappingList.push([propertyKey, id, options]);
+    }
+};
+exports.OnScopeSignal = OnScopeSignal;
+exports.SCOPE_CONTEXT = {
+    log: true,
+};
+class ScopeSignalBinding {
+    constructor(signalBinding, options) {
+        this.signalBinding = signalBinding;
+        this.keepAlive = options === null || options === void 0 ? void 0 : options.keepAlive;
+        this.group = options === null || options === void 0 ? void 0 : options.group;
+    }
+    activate() {
+        this.signalBinding.setActive(true);
+    }
+    deactivate() {
+        this.signalBinding.setActive(false);
+    }
+    detach() {
+        this.signalBinding.detach();
+    }
+}
+class ScopeStack {
+    constructor(rootScope) {
+        this.rootScope = rootScope;
+        this.stack = [];
+        this.queuedScopeChanges = [];
+        this.ongoingChange = false;
+        this.stack.push(rootScope);
+    }
+    get rootContext() {
+        return this.stack[0];
+    }
+    get activeContext() {
+        return this.stack[this.stack.length - 1];
+    }
+}
+class ScopeContext {
+    constructor(injector, scopeClass, mapping, parent) {
+        var _a, _b, _c, _d;
+        this.parent = parent;
+        this.signalBindings = [];
+        this.serviceBindings = [];
+        this.closed = false;
+        this.muteKeepAliveSignals = false;
+        if (!parent) {
+            this.stack = new ScopeStack(this);
+        }
+        else {
+            this.stack = parent.stack;
+            this.stack.stack.push(this);
+        }
+        this.injector = injector.createChild();
+        this.injector.map(scopeClass).toSingleton();
+        this.injector.map(ScopeContext).toValue(this);
+        mapping === null || mapping === void 0 ? void 0 : mapping({
+            injector: this.injector,
+            registerScopeService: serviceClass => {
+                this.injector.map(serviceClass).toSingleton();
+                this.mapServiceSignals(this.injector.get(serviceClass));
+            },
+        });
+        this.scope = this.injector.get(scopeClass);
+        this.mapScopeSignals();
+        this.updateSignalBindings();
+        (_b = (_a = this.scope).onEnter) === null || _b === void 0 ? void 0 : _b.call(_a);
+        (_d = (_c = this.scope).onActivate) === null || _d === void 0 ? void 0 : _d.call(_c);
+    }
+    get isRoot() {
+        return this === this.stack.rootScope;
+    }
+    get target() {
+        return this.stack.target;
+    }
+    get isActive() {
+        return this === this.stack.activeContext;
+    }
+    get activeContext() { return this.stack.activeContext; }
+    enterScope(scopeClass, mapping) {
+        let newContext;
+        const doChange = () => {
+            var _a, _b, _c, _d;
+            (_b = (_a = this.activeContext.scope).onSubExit) === null || _b === void 0 ? void 0 : _b.call(_a);
+            (_d = (_c = this.activeContext.scope).onDeactivate) === null || _d === void 0 ? void 0 : _d.call(_c);
+            newContext = new ScopeContext(this.activeContext.injector, scopeClass, mapping, this.activeContext);
+            this.logStack();
+            const nextChange = this.stack.queuedScopeChanges.shift();
+            if (nextChange) {
+                nextChange();
+            }
+            else {
+                this.stack.ongoingChange = false;
+            }
+        };
+        if (!this.stack.ongoingChange) {
+            this.stack.ongoingChange = true;
+            doChange();
+        }
+        else {
+            this.stack.queuedScopeChanges.push(doChange);
+        }
+        return newContext;
+    }
+    exitScope(target) {
+        const doChange = () => {
+            if (this.closed)
+                throw new Error(`Scope already closed`);
+            this.stack.target = target || this.scope.constructor;
+            while (true) {
+                const ctx = this.stack.stack.pop();
+                if (!ctx) {
+                    throw new Error('no scope in stack');
+                }
+                ctx.exitThis();
+                if (ctx.scope.constructor === this.stack.target) {
+                    break;
+                }
+            }
+            this.stack.target = undefined;
+            const nextChange = this.stack.queuedScopeChanges.shift();
+            if (nextChange) {
+                nextChange();
+            }
+            else {
+                this.stack.ongoingChange = false;
+            }
+        };
+        if (!this.stack.ongoingChange) {
+            this.stack.ongoingChange = true;
+            doChange();
+        }
+        else {
+            this.stack.queuedScopeChanges.push(doChange);
+        }
+    }
+    closeSubScopes() {
+        this.stack.target = this.scope.constructor;
+        while (!this.isActive) {
+            const ctx = this.stack.stack.pop();
+            if (!ctx) {
+                throw new Error('no scope in stack');
+            }
+            ctx.exitThis();
+        }
+        this.stack.target = undefined;
+    }
+    logStack() {
+        if (exports.SCOPE_CONTEXT.log) {
+            console.debug('%c' + this.stack.stack.map(c => c.scope.constructor.name).join(' -> '), 'color:yellow');
+        }
+    }
+    getStackClasses() {
+        return this.stack.stack.map(context => context.scope.constructor);
+    }
+    addScopeSignal(signal, callback, params) {
+        const signalBinding = new ScopeSignalBinding(signal.add(callback, params === null || params === void 0 ? void 0 : params.context), params);
+        this.signalBindings.push(signalBinding);
+    }
+    disableKeepAliveSignals() {
+        this.muteKeepAliveSignals = true;
+        this.updateSignalBindings();
+    }
+    enableKeepAliveSignals() {
+        this.muteKeepAliveSignals = false;
+        this.updateSignalBindings();
+    }
+    updateSignalBindings(muteKeepAlive = false) {
+        var _a;
+        for (const binding of this.signalBindings) {
+            if (this.isActive) {
+                binding.activate();
+            }
+            else if (muteKeepAlive) {
+                binding.deactivate();
+            }
+            else if (binding.keepAlive === true) {
+                binding.activate();
+            }
+            else if (!!(binding.keepAlive)) {
+                if (binding.keepAlive.indexOf(this.activeContext.scope.constructor) != -1) {
+                    binding.activate();
+                }
+                else {
+                    binding.deactivate();
+                }
+            }
+            else {
+                binding.deactivate();
+            }
+        }
+        muteKeepAlive = muteKeepAlive || this.muteKeepAliveSignals;
+        (_a = this.parent) === null || _a === void 0 ? void 0 : _a.updateSignalBindings(muteKeepAlive);
+    }
+    detachSignalBindings() {
+        for (const signalBinding of this.signalBindings) {
+            signalBinding.detach();
+        }
+    }
+    mapScopeSignals() {
+        const handlers = exports.scopeSignalHandlers.get(this.scope.constructor);
+        if (!handlers)
+            return;
+        for (const [field, id, options] of handlers) {
+            const signal = this.injector.getSignal(id);
+            const callback = this.scope[field];
+            this.addScopeSignal(signal, callback, Object.assign(Object.assign({}, options), { context: this.scope }));
+        }
+    }
+    mapServiceSignals(scopeService) {
+        const handlers = ecsInjector_1.signalHandlers.get(scopeService.constructor);
+        if (!handlers)
+            return;
+        for (const [field, id] of handlers) {
+            const signal = this.injector.getSignal(id);
+            const signalBinding = signal.add(scopeService[field], scopeService);
+            this.serviceBindings.push(signalBinding);
+        }
+    }
+    detachServiceBindings() {
+        for (const binding of this.serviceBindings) {
+            binding.detach();
+        }
+        this.serviceBindings = [];
+    }
+    exitThis() {
+        var _a, _b, _c, _d, _e, _f, _g, _h;
+        if (!this.parent) {
+            throw new Error('can\'t exit root scope?!');
+        }
+        this.logStack();
+        this.detachSignalBindings();
+        this.detachServiceBindings();
+        (_b = (_a = this.scope).onDeactivate) === null || _b === void 0 ? void 0 : _b.call(_a);
+        (_d = (_c = this.scope).onExit) === null || _d === void 0 ? void 0 : _d.call(_c);
+        this.parent.updateSignalBindings();
+        (_f = (_e = this.parent.scope).onSubReturn) === null || _f === void 0 ? void 0 : _f.call(_e);
+        (_h = (_g = this.parent.scope).onActivate) === null || _h === void 0 ? void 0 : _h.call(_g);
+        this.closed = true;
+    }
+}
+exports.ScopeContext = ScopeContext;
+//# sourceMappingURL=scopeContext.js.map

package/lib/scope/scopeContext.js.map

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

package/lib/systemContext.d.ts

@@ -0,0 +1,12 @@
+import { System } from './types';
+import { Signal, SignalCallback } from './index';
+export declare class SystemContext<T extends System = System> {
+    readonly entity: Object;
+    readonly system: T;
+    private signalBindings;
+    constructor(entity: Object);
+    addSignalById<S>(signalId: string | symbol, callback: SignalCallback<S>, thisArg?: unknown): void;
+    addSignal<S>(signal: Signal<S>, callback: SignalCallback<S>, thisArg?: unknown): void;
+    addSignalOnce<S>(signal: Signal<S>, callback: SignalCallback<S>, thisArg?: unknown): void;
+    dispose(): void;
+}

package/lib/systemContext.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SystemContext = void 0;
+class SystemContext {
+    constructor(entity) {
+        this.entity = entity;
+        this.signalBindings = [];
+    }
+    addSignalById(signalId, callback, thisArg) {
+        this.signalBindings.push(this.entity.gameEngine.getSignal(signalId).add(callback, thisArg));
+    }
+    addSignal(signal, callback, thisArg) {
+        this.signalBindings.push(signal.add(callback, thisArg));
+    }
+    addSignalOnce(signal, callback, thisArg) {
+        this.signalBindings.push(signal.addOnce(callback, thisArg));
+    }
+    dispose() {
+        for (const binding of this.signalBindings)
+            binding.detach();
+    }
+}
+exports.SystemContext = SystemContext;
+//# sourceMappingURL=systemContext.js.map

package/lib/systemContext.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"systemContext.js","sourceRoot":"","sources":["../src/systemContext.ts"],"names":[],"mappings":";;;AAGA,MAAa,aAAa;IAItB,YAAqB,MAAc;QAAd,WAAM,GAAN,MAAM,CAAQ;QAF3B,mBAAc,GAAoB,EAAE,CAAC;IAG7C,CAAC;IAGD,aAAa,CAAI,QAAyB,EAAE,QAA2B,EAAE,OAAiB;QACtF,IAAI,CAAC,cAAc,CAAC,IAAI,CAAG,IAAI,CAAC,MAAc,CAAC,UAAyB,CAAC,SAAS,CAAI,QAAQ,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC;IAC5H,CAAC;IAED,SAAS,CAAI,MAAiB,EAAE,QAA2B,EAAE,OAAiB;QAC1E,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC;IAC5D,CAAC;IAED,aAAa,CAAI,MAAiB,EAAE,QAA2B,EAAE,OAAiB;QAC9E,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC;IAChE,CAAC;IAED,OAAO;QACH,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,cAAc;YAAE,OAAO,CAAC,MAAM,EAAE,CAAC;IAChE,CAAC;CACJ;AAvBD,sCAuBC"}

package/lib/types.d.ts

@@ -1,32 +1,33 @@
 import { GameEngine } from './gameEngine';
-export interface GameSystem {
+export interface System {
     [propName: string]: any;
     onPrepare?(): Promise<void>;
     onStart?(): void;
     onEnd?(): void;
-    onPreFixedUpdate?(): void;
-    onEarlyUpdate?(time: number, deltaTime: number): void;
+    onPreFixedUpdate?(time: number, deltaTime: number): void;
     onFixedUpdate?(time: number, deltaTime: number): void;
-    onPrePhysicUpdate?(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;
-    onRender?(): void;
+    onLateFixedUpdate?(time: number, deltaTime: number): void;
+    onRender?(time: number, deltaTime: number, alpha: number): void;
 }
-export interface GameService {
+export interface Service {
     [propName: string]: any;
     onPrepare?(): Promise<void>;
     onStart?(): void;
     onEnd?(): void;
-    onPreFixedUpdate?(): 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;
-    onPrePhysicUpdate?(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?(): void;
+    onRender?(time: number, deltaTime: number, alpha: number): void;
 }
 declare type GameEngineCallback = (gameEngine: GameEngine) => void;
 export interface GameEnginePlugin {
@@ -46,9 +47,27 @@ export declare type OnFixedUpdateParams = {
     time: number;
     deltaTime: number;
 };
+export declare type OnEarlyUpdateParams = {
+    time: number;
+    deltaTime: number;
+};
 export declare type AsyncAction<T = unknown> = (gameEngine: GameEngine) => Promise<T>;
 export declare type Action<T = any> = (gameEngine: GameEngine) => T;
 export declare type Class<T = any> = {
     new (...args: any[]): T;
 };
+export declare const EngineSignals: {
+    OnStart: symbol;
+    OnEnd: symbol;
+    OnUpdate: symbol;
+    OnLateUpdate: symbol;
+    OnFixedUpdate: symbol;
+    OnPreFixedUpdate: symbol;
+    OnPrePhysicsUpdate: symbol;
+    OnPhysicsUpdate: symbol;
+    OnPostPhysicsUpdate: symbol;
+    onLateFixedUpdate: symbol;
+    OnRender: symbol;
+    OnPrepare: symbol;
+};
 export {};

package/lib/types.js

@@ -1 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EngineSignals = void 0;
+exports.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'),
+};
 //# sourceMappingURL=types.js.map

package/lib/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":""}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";;;AAyEa,QAAA,aAAa,GAAG;IACzB,OAAO,EAAE,MAAM,CAAC,SAAS,CAAC;IAC1B,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC,UAAU,CAAC;IAC5B,YAAY,EAAE,MAAM,CAAC,cAAc,CAAC;IACpC,aAAa,EAAE,MAAM,CAAC,eAAe,CAAC;IACtC,gBAAgB,EAAE,MAAM,CAAC,kBAAkB,CAAC;IAC5C,kBAAkB,EAAE,MAAM,CAAC,oBAAoB,CAAC;IAChD,eAAe,EAAE,MAAM,CAAC,iBAAiB,CAAC;IAC1C,mBAAmB,EAAE,MAAM,CAAC,qBAAqB,CAAC;IAClD,iBAAiB,EAAE,MAAM,CAAC,mBAAmB,CAAC;IAC9C,QAAQ,EAAE,MAAM,CAAC,UAAU,CAAC;IAC5B,SAAS,EAAE,MAAM,CAAC,WAAW,CAAC;CACjC,CAAC"}

package/lib/utils/map2k.js

@@ -1,4 +1,7 @@
-export class Map2k {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Map2k = void 0;
+class Map2k {
     constructor() {
         this.map = new Map();
     }
@@ -37,4 +40,5 @@ export class Map2k {
         }
     }
 }
+exports.Map2k = Map2k;
 //# sourceMappingURL=map2k.js.map

package/lib/utils/map2k.js.map

@@ -1 +1 @@
-{"version":3,"file":"map2k.js","sourceRoot":"","sources":["../../src/utils/map2k.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,KAAK;IAAlB;QACI,QAAG,GAAG,IAAI,GAAG,EAAgB,CAAC;IAkDlC,CAAC;IAhDG,GAAG,CAAC,IAAO,EAAE,IAAO,EAAE,KAAQ;QAC1B,IAAI,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC/B,IAAG,CAAC,KAAK,EAAE;YACP,KAAK,GAAG,IAAI,GAAG,EAAQ,CAAC;YACxB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;SAC7B;QACD,IAAI,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAChC,IAAG,CAAC,MAAM,EAAE;YACR,MAAM,GAAG,IAAI,GAAG,EAAQ,CAAC;YACzB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;SAC9B;QACD,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACvB,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAC5B,CAAC;IAaD,GAAG,CAAC,IAAO,EAAE,IAAO;QAChB,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACjC,OAAO,KAAK,IAAI,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACpC,CAAC;IAED,MAAM,CAAC,IAAM,EAAE,IAAM;QACjB,IAAI,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC/B,IAAI,KAAK,EAAE;YACP,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACnB,IAAI,KAAK,CAAC,IAAI,KAAK,CAAC,EAAE;gBAClB,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;aACxB;SACJ;QACD,IAAI,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAChC,IAAI,MAAM,EAAE;YACR,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACpB,IAAI,MAAM,CAAC,IAAI,KAAK,CAAC,EAAE;gBACnB,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;aACxB;SACJ;IACL,CAAC;CAEJ"}
+{"version":3,"file":"map2k.js","sourceRoot":"","sources":["../../src/utils/map2k.ts"],"names":[],"mappings":";;;AAAA,MAAa,KAAK;IAAlB;QACI,QAAG,GAAG,IAAI,GAAG,EAAgB,CAAC;IAkDlC,CAAC;IAhDG,GAAG,CAAC,IAAO,EAAE,IAAO,EAAE,KAAQ;QAC1B,IAAI,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC/B,IAAG,CAAC,KAAK,EAAE;YACP,KAAK,GAAG,IAAI,GAAG,EAAQ,CAAC;YACxB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;SAC7B;QACD,IAAI,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAChC,IAAG,CAAC,MAAM,EAAE;YACR,MAAM,GAAG,IAAI,GAAG,EAAQ,CAAC;YACzB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;SAC9B;QACD,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACvB,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAC5B,CAAC;IAaD,GAAG,CAAC,IAAO,EAAE,IAAO;QAChB,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACjC,OAAO,KAAK,IAAI,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACpC,CAAC;IAED,MAAM,CAAC,IAAM,EAAE,IAAM;QACjB,IAAI,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC/B,IAAI,KAAK,EAAE;YACP,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACnB,IAAI,KAAK,CAAC,IAAI,KAAK,CAAC,EAAE;gBAClB,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;aACxB;SACJ;QACD,IAAI,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAChC,IAAI,MAAM,EAAE;YACR,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACpB,IAAI,MAAM,CAAC,IAAI,KAAK,CAAC,EAAE;gBACnB,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;aACxB;SACJ;IACL,CAAC;CAEJ;AAnDD,sBAmDC"}

package/package.json

@@ -1,17 +1,17 @@
 {
   "name": "mani-game-engine",
   "author": "Jan Mankopf",
-  "version": "1.0.0-pre.3",
+  "version": "1.0.0-pre.30",
   "description": "entity component system game engine for typescript",
   "private": false,
   "scripts": {
     "build": "rimraf lib && tsc",
-    "watch": "rimraf lib && tsc -w",
+    "watch": "tsc -w",
     "test": "jest",
     "test watch": "jest --watch",
     "do-pre-publish": "npm publish --dry-run",
-    "do-publish": "npm publish",
-    "testme": "mocha --experimental-modules -r ts-node/register tests/**/*.spec.ts "
+    "version-up": "npm version prerelease",
+    "do-publish": "npm publish"
   },
   "main": "lib/index.js",
   "files": [
@@ -21,25 +21,19 @@
   "typings": "lib/index.d.ts",
   "license": "MIT",
   "devDependencies": {
-    "@fluffy-spoon/substitute": "^1.88.0",
-    "@types/jest": "^24.0.13",
-    "chai": "^4.2.0",
-    "jasmine-core": "^3.4.0",
-    "jest": "^24.8.0",
-    "mani-signal": "^1.0.3",
-    "mocha": "^6.1.4",
-    "nyc": "^14.1.1",
+    "@fluffy-spoon/substitute": "^1.201.0",
+    "@types/jest": "^26.0.22",
+    "jest": "^26.6.3",
     "reflect-metadata": "^0.1.13",
-    "rimraf": "^2.6.3",
-    "ts-jest": "^24.0.2",
-    "ts-node": "^8.2.0",
-    "typescript": "^3.5.1"
+    "rimraf": "^3.0.2",
+    "ts-jest": "^26.5.4",
+    "ts-node": "^9.1.1",
+    "tslib": "^2.2.0",
+    "typescript": "^4.2.4",
+    "mani-signal": "1.x"
   },
   "peerDependencies": {
-    "mani-signal": "^1.0.3",
-    "reflect-metadata": "^0.1.13"
-  },
-  "dependencies": {
-    "mani-injector": "^0.0.2"
+    "reflect-metadata": "0.x",
+    "mani-signal": "1.x"
   }
 }

package/src/clock.ts

@@ -1,10 +1,9 @@
 import {Signal} from 'mani-signal';
+import {OnEarlyUpdateParams, OnFixedUpdateParams, OnUpdateParams} from './types';
 
 const MIN_TIME_SCALE = 0.00001;
 
-type OnEarlyUpdateParams = { time: number, deltaTime: number };
-type OnUpdateParams = { time: number, deltaTime: number, alpha: number; };
-type OnFixedUpdateParams = { time: number, deltaTime: number; };
+// type OnUpdateParams = { time: number, deltaTime: number, alpha: number; };
 
 const defaultOptions = {
     autoStart: true,
@@ -13,32 +12,38 @@ const defaultOptions = {
     timeScale: 1,
 };
 
+export type Timeout = {
+    recall?: number;
+    callback: Function;
+    callTime: number;
+};
 export type GameClockOptions = Partial<typeof defaultOptions>;
 
-export class Clock {
+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 class GameClock implements Clock {
+    private nextTimeoutId = 0;
+    private timeouts = new Map<number, Timeout>();
     private isRunning = false;
     private requestId = 0;
     private currentTime = 0;
     private accumulator = 0;
     private gameTime = 0;
 
-    private fixedDeltaTime: number;
-    private maxFrameTime: number;
-
-    readonly onPrepare = new Signal();
-    readonly onEarlyUpdate = new Signal<OnEarlyUpdateParams>();
-    readonly onUpdate = new Signal<OnUpdateParams>();
-    readonly onFixedUpdate = new Signal<OnFixedUpdateParams>();
-
-    constructor(options?: GameClockOptions) {
-        const opts = {...defaultOptions, ...options} as Required<GameClockOptions>;
-        this.fixedDeltaTime = opts.fixedDeltaTime;
-        this.maxFrameTime = opts.maxFrameTime;
-        this.timeScale = opts.timeScale;
-
-        opts.autoStart && this.start();
-    }
-
+    private readonly _fixedDeltaTime: number;
     private update = (time: number) => {
         const newTime = time * 0.001;
         if (!this.isRunning) {
@@ -58,22 +63,59 @@ export class Clock {
 
         this.onPrepare.dispatch();
         this.onEarlyUpdate.dispatch({time: this.gameTime, deltaTime: frameTime});
-        while (this.accumulator >= this.fixedDeltaTime) {
+
+        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});
+            this.onFixedUpdate.dispatch({time: this.gameTime, deltaTime: this._fixedDeltaTime});
             isMultipleFixedUpdate = true;
-            this.accumulator -= this.fixedDeltaTime;
-            this.gameTime += this.fixedDeltaTime;
+            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});
+        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);
         }
     };
 
+    private readonly maxFrameTime: number;
+
+    readonly onPrepare = new Signal();
+    readonly onEarlyUpdate = new Signal<OnEarlyUpdateParams>();
+    readonly onUpdate = new Signal<OnUpdateParams>();
+    readonly onFixedUpdate = new Signal<OnFixedUpdateParams>();
+
+    constructor(options?: GameClockOptions) {
+        const opts = {...defaultOptions, ...options} as Required<GameClockOptions>;
+        this._fixedDeltaTime = opts.fixedDeltaTime;
+        this.maxFrameTime = opts.maxFrameTime;
+        this.timeScale = opts.timeScale;
+
+        opts.autoStart && this.start();
+    }
+
+    dispose(): void {
+        this.onPrepare.detachAll();
+        this.onEarlyUpdate.detachAll();
+        this.onUpdate.detachAll();
+        this.onFixedUpdate.detachAll();
+    }
+
+    get fixedDeltaTime(): number { return this._fixedDeltaTime; }
+
     private _timeScale = 1;
 
     get timeScale(): number {
@@ -92,11 +134,30 @@ export class Clock {
         return this;
     }
 
-    stop() {
+    stop(): this {
         if (!this.isRunning) {
-            return;
+            return this;
         }
         this.isRunning = false;
         cancelAnimationFrame(this.requestId);
+        return this;
+    }
+
+    setTimeout(callback: Function, delay: number) {
+        const timeOut: Timeout = {callback, callTime: this.gameTime + delay};
+        this.nextTimeoutId++;
+        this.timeouts.set(this.nextTimeoutId, timeOut);
+        return this.nextTimeoutId;
+    }
+
+    setInterval(callback: Function, delay: number) {
+        const timeOut: Timeout = {callback, callTime: this.gameTime + delay, recall: delay};
+        this.nextTimeoutId++;
+        this.timeouts.set(this.nextTimeoutId, timeOut);
+        return this.nextTimeoutId;
+    }
+
+    clearTimeout(timeoutId: number) {
+        return this.timeouts.delete(timeoutId);
     }
 }