@inglorious/engine 7.0.0 → 8.0.0

package/src/behaviors/physics/jumpable.js

@@ -21,126 +21,123 @@ const NO_PENETRAION = 0
 export function jumpable(params) {
   params = extend(DEFAULT_PARAMS, params)
 
-  return (type) =>
-    extend(type, {
-      create(entity, entityId, api) {
-        type.create?.(entity, entityId, api)
+  return (type) => ({
+    create(entity, entityId, api) {
+      type.create?.(entity, entityId, api)
 
-        if (entityId !== entity.id) return
+      if (entityId !== entity.id) return
 
-        defaults(entity, params)
-        entity.jumpsLeft ??= entity.maxJumps
+      defaults(entity, params)
+      entity.jumpsLeft ??= entity.maxJumps
 
-        entity.velocity ??= zero()
-        entity.vy ??= 0
-      },
+      entity.velocity ??= zero()
+      entity.vy ??= 0
+    },
 
-      jump(entity, entityId, api) {
-        type.jump?.(entity, entityId, api)
+    jump(entity, entityId, api) {
+      type.jump?.(entity, entityId, api)
 
-        if (entityId === entity.id && entity.jumpsLeft) {
-          entity.vy = jump(entity)
-          entity.groundObject = undefined
-          entity.jumpsLeft--
-        }
-      },
-
-      update(entity, dt, api) {
-        type.update?.(entity, dt, api)
-
-        const entities = api.getEntities()
-
-        entity.collisions ??= {}
-        entity.collisions.platform ??= {}
-        entity.collisions.platform.shape ??= "rectangle"
-
-        let width, height
-        if (entity.collisions.platform.shape === "circle") {
-          width = entity.collisions.platform.radius * DOUBLE
-          height = entity.collisions.platform.radius * DOUBLE
-        } else {
-          ;[width, height] = entity.size
+      if (entityId === entity.id && entity.jumpsLeft) {
+        entity.vy = jump(entity)
+        entity.groundObject = undefined
+        entity.jumpsLeft--
+      }
+    },
+
+    update(entity, dt, api) {
+      type.update?.(entity, dt, api)
+
+      const entities = api.getEntities()
+
+      entity.collisions ??= {}
+      entity.collisions.platform ??= {}
+      entity.collisions.platform.shape ??= "rectangle"
+
+      let width, height
+      if (entity.collisions.platform.shape === "circle") {
+        width = entity.collisions.platform.radius * DOUBLE
+        height = entity.collisions.platform.radius * DOUBLE
+      } else {
+        ;[width, height] = entity.size
+      }
+      const [prevX, prevY] = [...entity.position]
+
+      // 1. HORIZONTAL MOVEMENT & RESOLUTION
+      entity.position[X] += entity.velocity[X] * dt
+      const entityLeft = entity.position[X] - width / HALF
+      const entityRight = entity.position[X] + width / HALF
+
+      const collisionX = findCollision(entity, entities, "platform")
+      if (collisionX) {
+        const vx = entity.velocity[X]
+
+        // Check if moving right and crossing the platform's left edge
+        const prevRight = prevX + width / HALF
+        const platformLeft = collisionX.position[X] - collisionX.size[X] / HALF
+        if (vx > NO_VELOCITY && prevRight <= platformLeft) {
+          const penetration = entityRight - platformLeft
+          if (penetration > NO_PENETRAION) entity.position[X] -= penetration
+          entity.velocity[X] = 0
         }
-        const [prevX, prevY] = [...entity.position]
-
-        // 1. HORIZONTAL MOVEMENT & RESOLUTION
-        entity.position[X] += entity.velocity[X] * dt
-        const entityLeft = entity.position[X] - width / HALF
-        const entityRight = entity.position[X] + width / HALF
-
-        const collisionX = findCollision(entity, entities, "platform")
-        if (collisionX) {
-          const vx = entity.velocity[X]
-
-          // Check if moving right and crossing the platform's left edge
-          const prevRight = prevX + width / HALF
-          const platformLeft =
-            collisionX.position[X] - collisionX.size[X] / HALF
-          if (vx > NO_VELOCITY && prevRight <= platformLeft) {
-            const penetration = entityRight - platformLeft
-            if (penetration > NO_PENETRAION) entity.position[X] -= penetration
-            entity.velocity[X] = 0
-          }
 
-          // Check if moving left and crossing the platform's right edge
-          const prevLeft = prevX - width / HALF
-          const platformRight =
-            collisionX.position[X] + collisionX.size[X] / HALF
-          if (vx < NO_VELOCITY && prevLeft >= platformRight) {
-            const penetration = platformRight - entityLeft
-            if (penetration > NO_PENETRAION) entity.position[X] += penetration
-            entity.velocity[X] = 0
-          }
+        // Check if moving left and crossing the platform's right edge
+        const prevLeft = prevX - width / HALF
+        const platformRight = collisionX.position[X] + collisionX.size[X] / HALF
+        if (vx < NO_VELOCITY && prevLeft >= platformRight) {
+          const penetration = platformRight - entityLeft
+          if (penetration > NO_PENETRAION) entity.position[X] += penetration
+          entity.velocity[X] = 0
         }
-
-        // 2. VERTICAL MOVEMENT & RESOLUTION
-        const wasOnGround = entity.groundObject
-        entity.groundObject = undefined
-
-        const { vy, position: nextGravityPosition } = applyGravity(entity, dt)
-        entity.vy = vy
-        entity.position[Y] = nextGravityPosition[Y]
-
-        const collisionY = findCollision(entity, entities, "platform")
-        if (collisionY) {
-          const prevBottom = prevY - height / HALF
-          const platformTop = collisionY.position[Y] + collisionY.size[Y] / HALF
-
-          // Landing on top of a platform (one-way platform logic)
-          if (entity.vy <= NO_VELOCITY && prevBottom >= platformTop) {
-            const entityBottom = entity.position[Y] - height / HALF
-            const penetration = platformTop - entityBottom
-            if (penetration > NO_PENETRAION) entity.position[Y] += penetration
-            entity.vy = 0
-            entity.groundObject = collisionY
-            entity.jumpsLeft = entity.maxJumps
-
-            // Only notify on the frame we actually land, not every frame we're on the ground.
-            if (!wasOnGround) {
-              api.notify("land", {
-                entityId: entity.id,
-                targetId: collisionY.id,
-              })
-            }
+      }
+
+      // 2. VERTICAL MOVEMENT & RESOLUTION
+      const wasOnGround = entity.groundObject
+      entity.groundObject = undefined
+
+      const { vy, position: nextGravityPosition } = applyGravity(entity, dt)
+      entity.vy = vy
+      entity.position[Y] = nextGravityPosition[Y]
+
+      const collisionY = findCollision(entity, entities, "platform")
+      if (collisionY) {
+        const prevBottom = prevY - height / HALF
+        const platformTop = collisionY.position[Y] + collisionY.size[Y] / HALF
+
+        // Landing on top of a platform (one-way platform logic)
+        if (entity.vy <= NO_VELOCITY && prevBottom >= platformTop) {
+          const entityBottom = entity.position[Y] - height / HALF
+          const penetration = platformTop - entityBottom
+          if (penetration > NO_PENETRAION) entity.position[Y] += penetration
+          entity.vy = 0
+          entity.groundObject = collisionY
+          entity.jumpsLeft = entity.maxJumps
+
+          // Only notify on the frame we actually land, not every frame we're on the ground.
+          if (!wasOnGround) {
+            api.notify("land", {
+              entityId: entity.id,
+              targetId: collisionY.id,
+            })
           }
-
-          // Hitting head on bottom of a platform
-          // else if (entity.vy > 0) {
-          //   const prevTop = prevY + height / HALF
-          //   const platformBottom =
-          //     collisionY.position[Y] - collisionY.size[Y] / HALF
-          //   if (prevTop <= platformBottom) {
-          //     const entityTop = entity.position[Y] + height / HALF
-          //     const penetration = entityTop - platformBottom
-          //     if (penetration > 0) entity.position[Y] -= penetration
-          //     entity.vy = 0
-          //   }
-          // }
         }
 
-        entity.orientation = magnitude(entity.velocity)
-          ? angle(entity.velocity)
-          : entity.orientation
-      },
-    })
+        // Hitting head on bottom of a platform
+        // else if (entity.vy > 0) {
+        //   const prevTop = prevY + height / HALF
+        //   const platformBottom =
+        //     collisionY.position[Y] - collisionY.size[Y] / HALF
+        //   if (prevTop <= platformBottom) {
+        //     const entityTop = entity.position[Y] + height / HALF
+        //     const penetration = entityTop - platformBottom
+        //     if (penetration > 0) entity.position[Y] -= penetration
+        //     entity.vy = 0
+        //   }
+        // }
+      }
+
+      entity.orientation = magnitude(entity.velocity)
+        ? angle(entity.velocity)
+        : entity.orientation
+    },
+  })
 }

package/src/core/engine.js

@@ -1,6 +1,7 @@
 import { audio } from "@inglorious/engine/behaviors/audio.js"
 import { game } from "@inglorious/engine/behaviors/game.js"
 import { images } from "@inglorious/engine/behaviors/images.js"
+import { createApi } from "@inglorious/store/api.js"
 import {
   connectDevTools,
   disconnectDevTools,
@@ -69,7 +70,6 @@ export class Engine {
     }
 
     this._store = createStore({ ...this._config, middlewares, mode: "batched" })
-    this._api = this._store.getApi()
     this._loop = new Loop[this._config.loop.type]()
 
     if (this._devMode) {
@@ -78,11 +78,12 @@ export class Engine {
   }
 
   async init() {
+    const api = createApi(this._store)
     return Promise.all(
       Object.values(this._config.entities).map((entity) => {
         const originalType = this._config.types[entity.type]
         const type = augmentType(originalType)
-        return type.init?.(entity, null, this._api)
+        return type.init?.(entity, null, api)
       }),
     )
   }
@@ -91,7 +92,7 @@ export class Engine {
    * Starts the game engine, initializing the loop and notifying the store.
    */
   start() {
-    this._api.notify("start")
+    this._store.notify("start")
     this._loop.start(this, ONE_SECOND / this._config.loop.fps)
   }
 
@@ -99,7 +100,7 @@ export class Engine {
    * Stops the game engine, halting the loop and notifying the store.
    */
   stop() {
-    this._api.notify("stop")
+    this._store.notify("stop")
     this._store.update()
     this._loop.stop()
   }
@@ -109,7 +110,7 @@ export class Engine {
    * @param {number} dt - Delta time since the last update in milliseconds.
    */
   update(dt) {
-    this._api.notify("update", dt)
+    this._store.notify("update", dt)
     const processedEvents = this._store.update()
     const entities = this._store.getState()
 

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

@@ -1,20 +1,24 @@
+import { createApi } from "@inglorious/store/api.js"
 import { EventMap } from "@inglorious/store/event-map.js"
 
 import { EntityPools } from "./entity-pools"
 
 export function entityPoolMiddleware() {
-  return (store, api) => {
+  return (store) => {
     const pools = new EntityPools()
-    const types = api.getTypes()
+    const types = store.getTypes()
     const eventMap = new EventMap()
 
-    api.getAllActivePoolEntities = () => pools.getAllActiveEntities()
+    store.extras ??= {}
+    store.extras.getAllActivePoolEntities = () => pools.getAllActiveEntities()
 
-    const game = api.getEntity("game")
+    const game = store.getState().game
     if (game.devMode) {
-      api.getEntityPoolsStats = () => pools.getStats()
+      store.extras.getEntityPoolsStats = () => pools.getStats()
     }
 
+    const api = createApi(store)
+
     return (next) => (event) => {
       switch (event.type) {
         case "spawn": {