mani-game-engine 1.0.0-pre.73 → 1.0.0-pre.75

package/lib/entity.d.ts

@@ -1,9 +1,10 @@
+import { GameEngine } from './gameEngine';
 import { Signal } from 'mani-signal';
 import { Class } from './types';
 import { ID } from './injector';
 export declare class Entity {
     readonly children: Set<Entity>;
-    private gameEngine?;
+    readonly gameEngine?: GameEngine;
     get isAdded(): boolean;
     private _parent?;
     readonly parentChanged: Signal<unknown>;

package/lib/systemContext.d.ts

@@ -9,7 +9,7 @@ export declare class SystemContext<T extends System = System> {
     private signalBindings;
     constructor(entity: Entity);
     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;
+    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

@@ -17,16 +17,26 @@ class SystemContext {
     constructor(entity) {
         this.entity = entity;
         this.onDispose = new index_1.Signal();
-        this.signalBindings = [];
+        this.signalBindings = new Set();
     }
     addSignalById(signalId, callback, thisArg) {
-        this.signalBindings.push(this.entity.gameEngine.getSignal(signalId).add(callback, thisArg));
+        this.signalBindings.add(this.entity.gameEngine.getSignal(signalId).add(callback, thisArg));
     }
     addSignal(signal, callback, thisArg) {
-        this.signalBindings.push(signal.add(callback, thisArg));
+        const binding = signal.add(callback, thisArg);
+        this.signalBindings.add(binding);
+        return () => {
+            binding.detach();
+            this.signalBindings.delete(binding);
+        };
     }
     addSignalOnce(signal, callback, thisArg) {
-        this.signalBindings.push(signal.addOnce(callback, thisArg));
+        const binding = signal.addOnce(callback, thisArg);
+        this.signalBindings.add(binding);
+        return () => {
+            binding.detach();
+            this.signalBindings.delete(binding);
+        };
     }
     dispose() {
         for (const binding of this.signalBindings)

package/lib/systemContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"systemContext.js","sourceRoot":"","sources":["../src/systemContext.ts"],"names":[],"mappings":";;;AACA,mCAAmG;AAEtF,QAAA,oBAAoB,GAAG,IAAI,GAAG,EAA0B,CAAC;AAC/D,MAAM,cAAc,GAAG,CAAC,EAAM,EAAE,EAAE,CAAC,CAAC,MAAW,EAAE,WAAmB,EAAE,UAA8B,EAAE,EAAE;IAC3G,IAAI,MAAM,YAAY,QAAQ,EAAE,CAAC;QAC7B,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;IAC1D,CAAC;SAAM,CAAC;QACJ,MAAM,WAAW,GAAG,IAAA,mBAAW,EAAC,4BAAoB,EAAE,MAAM,CAAC,WAAW,EAAE,GAAmB,EAAE,CAAC,EAAE,CAAC,CAAC;QACpG,WAAW,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,CAAC;IACxC,CAAC;AACL,CAAC,CAAC;AAPW,QAAA,cAAc,kBAOzB;AAEF,MAAa,aAAa;IAKtB,YAAqB,MAAc;QAAd,WAAM,GAAN,MAAM,CAAQ;QAH1B,cAAS,GAAG,IAAI,cAAM,EAAE,CAAC;QAC1B,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;QAC5D,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;QAC1B,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC;IAC/B,CAAC;CACJ;AA1BD,sCA0BC"}
+{"version":3,"file":"systemContext.js","sourceRoot":"","sources":["../src/systemContext.ts"],"names":[],"mappings":";;;AACA,mCAAmG;AAEtF,QAAA,oBAAoB,GAAG,IAAI,GAAG,EAA0B,CAAC;AAC/D,MAAM,cAAc,GAAG,CAAC,EAAM,EAAE,EAAE,CAAC,CAAC,MAAW,EAAE,WAAmB,EAAE,UAA8B,EAAE,EAAE;IAC7G,IAAI,MAAM,YAAY,QAAQ,EAAE,CAAC;QAC/B,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;IACxD,CAAC;SAAM,CAAC;QACN,MAAM,WAAW,GAAG,IAAA,mBAAW,EAAC,4BAAoB,EAAE,MAAM,CAAC,WAAW,EAAE,GAAmB,EAAE,CAAC,EAAE,CAAC,CAAC;QACpG,WAAW,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,CAAC;IACtC,CAAC;AACH,CAAC,CAAC;AAPW,QAAA,cAAc,kBAOzB;AAEF,MAAa,aAAa;IAKxB,YAAqB,MAAc;QAAd,WAAM,GAAN,MAAM,CAAQ;QAH1B,cAAS,GAAG,IAAI,cAAM,EAAE,CAAC;QAC1B,mBAAc,GAAG,IAAI,GAAG,EAAiB,CAAC;IAGlD,CAAC;IAGD,aAAa,CAAI,QAAyB,EAAE,QAA2B,EAAE,OAAiB;QACxF,IAAI,CAAC,cAAc,CAAC,GAAG,CAAG,IAAI,CAAC,MAAc,CAAC,UAAyB,CAAC,SAAS,CAAI,QAAQ,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC;IACzH,CAAC;IAGD,SAAS,CAAI,MAAiB,EAAE,QAA2B,EAAE,OAAiB;QAC5E,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAC9C,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACjC,OAAO,GAAG,EAAE;YACV,OAAO,CAAC,MAAM,EAAE,CAAC;YACjB,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACtC,CAAC,CAAC;IACJ,CAAC;IAED,aAAa,CAAI,MAAiB,EAAE,QAA2B,EAAE,OAAiB;QAChF,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAClD,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACjC,OAAO,GAAG,EAAE;YACV,OAAO,CAAC,MAAM,EAAE,CAAC;YACjB,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACtC,CAAC,CAAA;IAEH,CAAC;IAED,OAAO;QACL,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,cAAc;YAAE,OAAO,CAAC,MAAM,EAAE,CAAC;QAC5D,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;QAC1B,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC;IAC7B,CAAC;CACF;AAtCD,sCAsCC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mani-game-engine",
   "author": "Jan Mankopf",
-  "version": "1.0.0-pre.73",
+  "version": "1.0.0-pre.75",
   "description": "entity component system game engine for typescript",
   "private": false,
   "scripts": {

package/src/entity.ts

@@ -10,7 +10,7 @@ let idCounter = 0;
 export class Entity {
 
     readonly children = new Set<Entity>();
-    private gameEngine?: GameEngine;
+    readonly gameEngine?: GameEngine;
 
     get isAdded() {
         return !!this.gameEngine;

package/src/systemContext.ts

@@ -3,38 +3,50 @@ import {Entity, GameEngine, ID, putIfAbsent, Signal, SignalBinding, SignalCallba
 
 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]);
-    }
+  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;
-    readonly onDispose = new Signal();
-    private signalBindings: SignalBinding[] = [];
+  readonly system!: T;
+  readonly onDispose = new Signal();
+  private signalBindings = new Set<SignalBinding>();
 
-    constructor(readonly entity: Entity) {
-    }
+  constructor(readonly entity: Entity) {
+  }
 
-    // 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));
-    }
+  // TODO: is this a bit hacky?
+  addSignalById<S>(signalId: string | symbol, callback: SignalCallback<S>, thisArg?: unknown) {
+    this.signalBindings.add(((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));
-    }
+  // returns a function that can be called to remove the signal
+  addSignal<S>(signal: Signal<S>, callback: SignalCallback<S>, thisArg?: unknown) {
+    const binding = signal.add(callback, thisArg);
+    this.signalBindings.add(binding);
+    return () => {
+      binding.detach();
+      this.signalBindings.delete(binding);
+    };
+  }
 
-    addSignalOnce<S>(signal: Signal<S>, callback: SignalCallback<S>, thisArg?: unknown) {
-        this.signalBindings.push(signal.addOnce(callback, thisArg));
+  addSignalOnce<S>(signal: Signal<S>, callback: SignalCallback<S>, thisArg?: unknown) {
+    const binding = signal.addOnce(callback, thisArg);
+    this.signalBindings.add(binding);
+    return () => {
+      binding.detach();
+      this.signalBindings.delete(binding);
     }
 
-    dispose() {
-        for (const binding of this.signalBindings) binding.detach();
-        this.onDispose.dispatch();
-        this.onDispose.detachAll();
-    }
+  }
+
+  dispose() {
+    for (const binding of this.signalBindings) binding.detach();
+    this.onDispose.dispatch();
+    this.onDispose.detachAll();
+  }
 }