@inglorious/engine 0.6.0 → 0.6.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inglorious/engine",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "A JavaScript game engine written with global state, immutability, and pure functions in mind. Have fun(ctional programming) with it!",
   "author": "IceOnFire <antony.mistretta@gmail.com> (https://ingloriouscoderz.it)",
   "license": "MIT",
@@ -32,8 +32,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@inglorious/utils": "1.1.0",
-    "@inglorious/store": "2.0.0"
+    "@inglorious/store": "2.0.0",
+    "@inglorious/utils": "1.1.0"
   },
   "devDependencies": {
     "prettier": "^3.5.3",

package/src/core/middlewares/entity-pool/entity-pool-middleware.js

@@ -1,28 +1,38 @@
+import { EventMap } from "@inglorious/store/event-map"
+
 export function entityPoolMiddleware(pools) {
-  return (api) => (next) => (event) => {
-    switch (event.type) {
-      case "spawn": {
-        pools.acquire(event.payload)
-        break
-      }
+  return (api) => {
+    const types = api.getTypes()
+    const eventMap = new EventMap()
 
-      case "despawn": {
-        pools.recycle(event.payload)
-        break
-      }
+    return (next) => (event) => {
+      switch (event.type) {
+        case "spawn": {
+          const entity = pools.acquire(event.payload)
+          const type = types[entity.type]
+          eventMap.addEntity(entity.id, type)
+          break
+        }
 
-      default: {
-        const types = api.getTypes()
-        pools._pools.values().forEach((pool) => {
-          pool._activeEntities.forEach((entity) => {
+        case "despawn": {
+          const entity = pools.recycle(event.payload)
+          const type = types[entity.type]
+          eventMap.removeEntity(entity.id, type)
+          break
+        }
+
+        default: {
+          const entityIds = eventMap.getEntitiesForEvent(event.type)
+          for (const id of entityIds) {
+            const entity = pools.activeEntitiesById.get(id)
             const type = types[entity.type]
             const handle = type[event.type]
             handle?.(entity, event.payload, api)
-          })
-        })
+          }
+        }
       }
-    }
 
-    return next(event)
+      return next(event)
+    }
   }
 }

package/src/core/middlewares/entity-pool/entity-pool.js

@@ -19,6 +19,7 @@ export class EntityPool {
     }
     Object.assign(entity, props)
     this._activeEntities.push(entity)
+    return entity
   }
 
   recycle(entity) {
@@ -27,6 +28,7 @@ export class EntityPool {
       const [entity] = this._activeEntities.splice(index, ITEMS_TO_REMOVE)
       this._inactiveEntities.push(entity)
     }
+    return entity
   }
 
   getStats() {

package/src/core/middlewares/entity-pool/entity-pools.js

@@ -2,15 +2,24 @@ import { EntityPool } from "./entity-pool"
 
 export class EntityPools {
   _pools = new Map()
+  _activeEntitiesById = new Map()
 
-  acquire(entity) {
-    this.lazyInit(entity)
-    this._pools.get(entity.type).acquire(entity)
+  get activeEntitiesById() {
+    return this._activeEntitiesById
   }
 
-  recycle(entity) {
-    this.lazyInit(entity)
-    this._pools.get(entity.type).recycle(entity)
+  acquire(props) {
+    this.lazyInit(props)
+    const entity = this._pools.get(props.type).acquire(props)
+    this._activeEntitiesById.set(entity.id, entity)
+    return entity
+  }
+
+  recycle(props) {
+    this.lazyInit(props)
+    const entity = this._pools.get(props.type).recycle(props)
+    this._activeEntitiesById.delete(entity.id)
+    return entity
   }
 
   getStats() {
@@ -28,10 +37,6 @@ export class EntityPools {
   }
 
   getAllActiveEntities() {
-    const activeEntities = []
-    for (const pool of this._pools.values()) {
-      activeEntities.push(...pool._activeEntities)
-    }
-    return activeEntities
+    return Array.from(this._activeEntitiesById.values())
   }
 }