Added props to systems v1.1.0

darkaqua · Apr 1, 2021 · bdd3c00 · bdd3c00
1 parent 29638aa
commit bdd3c00
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "darker-engine",
   "description": "ecs lightweight library",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "author": "darkaqua",
   "license": "MIT",
   "main": "./build/index.js",
@@ -12,8 +12,12 @@
     "start": "./node_modules/.bin/ts-node ./src/index.ts",
     "build": "yarn run build:js && yarn run build:dts",
     "build:js": "esbuild src/index.ts --bundle --format=esm --outfile=build/index.js",
-    "build:dts": "tsc src/index.ts --declaration --emitDeclarationOnly --outDir build"
+    "build:dts": "tsc src/index.ts --declaration --emitDeclarationOnly --outDir build",
+    "prepublish": "yarn run build"
   },
+  "files": [
+    "build/"
+  ],
   "keywords": [
     "ecs",
     "entity-component-system",

diff --git a/src/game.ts b/src/game.ts
@@ -1,5 +1,5 @@
 import {entitiesFunction} from "./entities";
-import {GameFunction, SystemType} from "./types";
+import {GameFunction, SystemFunction, SystemType} from "./types";
 
 export const game: GameFunction = <SystemEnum, ComponentEnum>() => {
     let systems: SystemType<SystemEnum, ComponentEnum>[] = [];
@@ -8,11 +8,15 @@ export const game: GameFunction = <SystemEnum, ComponentEnum>() => {
     // Contains which entities has every system
     const systemEntitiesMap = new Map<SystemEnum, string[]>();
 
-    const setSystems = (..._systems: SystemType<SystemEnum, ComponentEnum>[]) => {
-        _systems.forEach(system => {
-            systemEntitiesMap.set(system.id, []);
+    const setSystems = (..._systems: SystemFunction<SystemEnum, ComponentEnum>[]) => {
+        const systemList = _systems.map(system => {
+            const _system = system({
+                game: this
+            });
+            systemEntitiesMap.set(_system.id, []);
+            return _system;
         });
-        systems.push(..._systems);
+        systems.push(...systemList);
     }
 
     const entities = entitiesFunction<ComponentEnum>();

diff --git a/src/types.ts b/src/types.ts
@@ -5,7 +5,7 @@
 export interface GameType<SystemEnum, ComponentEnum> {
     entities: EntitiesType<ComponentEnum>;
     onLoop: (delta: number) => any;
-    setSystems: (...systems: SystemType<SystemEnum, ComponentEnum>[]) => any;
+    setSystems: (...systems: SystemFunction<SystemEnum, ComponentEnum>[]) => any;
     getSystemEntities?: (system: SystemEnum) => string[];
 }
 
@@ -23,7 +23,12 @@ export interface SystemType<SystemEnum, ComponentEnum> {
     getEntities?: () => string[];
 }
 
-export type SystemFunction<SystemEnum, ComponentEnum> = () => SystemType<SystemEnum, ComponentEnum>;
+export type SystemFunctionProps<SystemEnum, ComponentEnum> = {
+    game: GameType<SystemEnum, ComponentEnum>
+}
+
+export type SystemFunction<SystemEnum, ComponentEnum> =
+    (props: SystemFunctionProps<SystemEnum, ComponentEnum>) => SystemType<SystemEnum, ComponentEnum>;
 
 /**
  * Entity