@inglorious/engine 1.0.0 → 2.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inglorious/engine",
-  "version": "1.0.0",
+  "version": "2.0.0",
   "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",
@@ -31,12 +31,17 @@
   },
   "dependencies": {
     "@inglorious/store": "4.0.0",
-    "@inglorious/utils": "3.1.0"
+    "@inglorious/utils": "3.5.0"
+  },
+  "peerDependencies": {
+    "@inglorious/store": "4.0.0",
+    "@inglorious/utils": "3.5.0"
   },
   "devDependencies": {
     "prettier": "^3.5.3",
     "vite": "^7.1.3",
-    "vitest": "^1.6.0"
+    "vitest": "^1.6.0",
+    "@inglorious/eslint-config": "1.0.0"
   },
   "engines": {
     "node": ">= 22"

package/src/behaviors/input/controls.js

@@ -1,37 +1,21 @@
-import { extend } from "@inglorious/utils/data-structures/objects.js"
-
 import { createGamepad, gamepadListener, gamepadsPoller } from "./gamepad.js"
 import { createInput, input } from "./input.js"
 import { createKeyboard, keyboard } from "./keyboard.js"
 
-const DEFAULT_PARAMS = {
-  name: "input0",
-}
-
-export function setupControls(params) {
-  params = extend(DEFAULT_PARAMS, params)
-
+export function controls(...targetIds) {
   return {
-    types: {
-      keyboard: [keyboard(params)],
-      gamepads_poller: [gamepadsPoller(params)],
-      gamepad_listener: [gamepadListener(params)],
-      input: [input(params)],
-    },
-    entities: {
-      gamepads: { type: "gamepads_poller" },
-    },
+    keyboard: [keyboard()],
+    gamepads_poller: [gamepadsPoller(targetIds)],
+    gamepad_listener: [gamepadListener()],
+    input: [input()],
   }
 }
 
-export function controlsEntities(
-  name = DEFAULT_PARAMS.name,
-  targetIds,
-  mapping = {},
-) {
+export function createControls(targetId, mapping = {}) {
   return {
-    [`keyboard_${name}`]: createKeyboard(`keyboard_${name}`, name, mapping),
-    [`gamepad_${name}`]: createGamepad(`gamepad_${name}`, name, mapping),
-    [name]: createInput(name, targetIds, mapping),
+    gamepads: { type: "gamepads_poller" },
+    [`keyboard_${targetId}`]: createKeyboard(targetId, mapping),
+    [`gamepad_${targetId}`]: createGamepad(targetId, mapping),
+    [`input_${targetId}`]: createInput(targetId, mapping),
   }
 }

package/src/behaviors/input/gamepad.js

@@ -1,8 +1,4 @@
-const DEFAULT_PARAMS = {
-  name: "gamepad_input0",
-}
-
-export function gamepadsPoller() {
+export function gamepadsPoller(targetIds = []) {
   return {
     create(entity, entityId) {
       if (entityId !== entity.id) return
@@ -12,9 +8,7 @@ export function gamepadsPoller() {
 
     update(entity, dt, api) {
       navigator.getGamepads().forEach((gamepad) => {
-        if (gamepad == null) {
-          return
-        }
+        if (gamepad == null) return
 
         const cache = (entity.gamepadStateCache[gamepad.index] ??= {
           axes: [],
@@ -22,12 +16,10 @@ export function gamepadsPoller() {
         })
 
         gamepad.axes.forEach((axis, index) => {
-          if (axis === cache.axes[index]) {
-            return
-          }
+          if (axis === cache.axes[index]) return
 
           api.notify("gamepadAxis", {
-            gamepadIndex: gamepad.index,
+            targetId: targetIds[gamepad.index],
             axis: `Axis${index}`,
             value: axis,
           })
@@ -40,12 +32,12 @@ export function gamepadsPoller() {
 
           if (isPressed && !wasPressed) {
             api.notify("gamepadPress", {
-              gamepadIndex: gamepad.index,
+              targetId: targetIds[gamepad.index],
               button: `Btn${index}`,
             })
           } else if (!isPressed && wasPressed) {
             api.notify("gamepadRelease", {
-              gamepadIndex: gamepad.index,
+              targetId: targetIds[gamepad.index],
               button: `Btn${index}`,
             })
           }
@@ -59,58 +51,42 @@ export function gamepadsPoller() {
 
 export function gamepadListener() {
   return {
-    gamepadAxis(entity, { gamepadIndex, axis, value }, api) {
-      if (entity.id !== `gamepad_input${gamepadIndex}`) {
-        return
-      }
+    gamepadAxis(entity, { targetId, axis, value }, api) {
+      if (targetId !== entity.targetId) return
 
       const action = entity.mapping[axis]
-      if (!action) {
-        return
-      }
+      if (!action) return
 
       entity[action] = value
-      api.notify("inputAxis", { controlId: entity.id, action, value })
+      api.notify("inputAxis", { targetId, action, value })
     },
 
-    gamepadPress(entity, { gamepadIndex, button }, api) {
-      if (entity.id !== `gamepad_input${gamepadIndex}`) {
-        return
-      }
+    gamepadPress(entity, { targetId, button }, api) {
+      if (targetId !== entity.targetId) return
 
       const action = entity.mapping[button]
-      if (!action) {
-        return
-      }
+      if (!action) return
 
       if (!entity[action]) {
         entity[action] = true
-        api.notify("inputPress", { controlId: entity.id, action })
+        api.notify("inputPress", { targetId, action })
       }
     },
 
-    gamepadRelease(entity, { gamepadIndex, button }, api) {
-      if (entity.id !== `gamepad_input${gamepadIndex}`) {
-        return
-      }
+    gamepadRelease(entity, { targetId, button }, api) {
+      if (targetId !== entity.targetId) return
 
       const action = entity.mapping[button]
-      if (!action) {
-        return
-      }
+      if (!action) return
 
       if (entity[action]) {
         entity[action] = false
-        api.notify("inputRelease", { controlId: entity.id, action })
+        api.notify("inputRelease", { targetId, action })
       }
     },
   }
 }
 
-export function createGamepad(
-  name = DEFAULT_PARAMS.name,
-  targetInput,
-  mapping = {},
-) {
-  return { id: name, type: "gamepad_listener", targetInput, mapping }
+export function createGamepad(targetId, mapping = {}) {
+  return { type: "gamepad_listener", targetId, mapping }
 }

package/src/behaviors/input/input.js

@@ -1,48 +1,31 @@
-const DEFAULT_PARAMS = {
-  name: "input0",
-}
-
 export function input() {
   return {
-    inputAxis(entity, { controlId, action, value }, api) {
-      if (!controlId.endsWith(entity.id)) {
-        return
-      }
+    inputAxis(entity, { targetId, action, value }, api) {
+      if (targetId !== entity.targetId) return
+
       entity[action] = value
 
-      entity.targetIds.forEach((targetId) => {
-        api.notify(action, { entityId: targetId, value })
-      })
+      api.notify(action, { entityId: entity.targetId, value })
     },
 
-    inputPress(entity, { controlId, action }, api) {
-      if (!controlId.endsWith(entity.id)) {
-        return
-      }
+    inputPress(entity, { targetId, action }, api) {
+      if (targetId !== entity.targetId) return
+
       entity[action] = true
 
-      entity.targetIds.forEach((targetId) => {
-        api.notify(action, targetId)
-      })
+      api.notify(action, entity.targetId)
     },
 
-    inputRelease(entity, { controlId, action }, api) {
-      if (!controlId.endsWith(entity.id)) {
-        return
-      }
+    inputRelease(entity, { targetId, action }, api) {
+      if (targetId !== entity.targetId) return
+
       entity[action] = false
 
-      entity.targetIds.forEach((targetId) => {
-        api.notify(`${action}End`, targetId)
-      })
+      api.notify(`${action}End`, entity.targetId)
     },
   }
 }
 
-export function createInput(
-  name = DEFAULT_PARAMS.name,
-  targetIds = [],
-  mapping = {},
-) {
-  return { id: name, type: "input", targetIds, mapping }
+export function createInput(targetId, mapping = {}) {
+  return { type: "input", targetId, mapping }
 }

package/src/behaviors/input/keyboard.js

@@ -1,7 +1,3 @@
-const DEFAULT_PARAMS = {
-  name: "keyboard0",
-}
-
 export function keyboard() {
   let handleKeyDown, handleKeyUp
   let currentDocument = null
@@ -26,36 +22,28 @@ export function keyboard() {
 
     keyboardKeyDown(entity, keyCode, api) {
       const action = entity.mapping[keyCode]
-      if (!action) {
-        return
-      }
+      if (!action) return
 
       if (!entity[action]) {
         entity[action] = true
-        api.notify("inputPress", { controlId: entity.id, action })
+        api.notify("inputPress", { targetId: entity.targetId, action })
       }
     },
 
     keyboardKeyUp(entity, keyCode, api) {
       const action = entity.mapping[keyCode]
-      if (!action) {
-        return
-      }
+      if (!action) return
 
       if (entity[action]) {
         entity[action] = false
-        api.notify("inputRelease", { controlId: entity.id, action })
+        api.notify("inputRelease", { targetId: entity.targetId, action })
       }
     },
   }
 }
 
-export function createKeyboard(
-  name = DEFAULT_PARAMS.name,
-  targetInput,
-  mapping = {},
-) {
-  return { id: name, type: "keyboard", targetInput, mapping }
+export function createKeyboard(targetId, mapping = {}) {
+  return { type: "keyboard", targetId, mapping }
 }
 
 function createKeyboardHandler(id, api) {

package/src/behaviors/input/mouse.js

@@ -2,10 +2,6 @@ import { findCollision } from "@inglorious/engine/collision/detection.js"
 import { clampToBounds } from "@inglorious/engine/physics/bounds.js"
 import { zero } from "@inglorious/utils/math/vector.js"
 
-const DEFAULT_PARAMS = {
-  name: "mouse",
-}
-
 const NO_Y = 0
 
 export function mouse() {
@@ -49,9 +45,8 @@ export function track(parent, options) {
   }
 }
 
-export function createMouse(name = DEFAULT_PARAMS.name, overrides = {}) {
+export function createMouse(overrides = {}) {
   return {
-    id: name,
     type: "mouse",
     layer: 999, // A high layer value to ensure it's always rendered on top
     position: zero(),

package/src/core/middlewares/multiplayer-middleware.js

@@ -1,3 +1,7 @@
+import {
+  deserialize,
+  serialize,
+} from "@inglorious/utils/data-structures/object.js"
 import { extend } from "@inglorious/utils/data-structures/objects.js"
 
 import { coreEvents } from "../core-events.js"
@@ -33,7 +37,7 @@ export function multiplayerMiddleware(config = {}) {
     if (!event.fromServer) {
       if (ws?.readyState === WebSocket.OPEN) {
         // If the connection is open, send the event immediately.
-        ws.send(JSON.stringify(event))
+        ws.send(serialize(event))
       } else {
         // If the connection is not open, queue the event for later.
         localQueue.push(event)
@@ -62,12 +66,12 @@ export function multiplayerMiddleware(config = {}) {
     ws.onopen = () => {
       // Send any queued events to the server.
       while (localQueue.length) {
-        ws.send(JSON.stringify(localQueue.shift()))
+        ws.send(serialize(localQueue.shift()))
       }
     }
 
     ws.onmessage = (event) => {
-      const serverEvent = JSON.parse(event.data)
+      const serverEvent = deserialize(event.data)
 
       if (serverEvent.type === "initialState") {
         // Merge the server's initial state with the client's local state.

package/src/behaviors/physics/collidable.js

@@ -1,20 +0,0 @@
-import { extend } from "@inglorious/utils/data-structures/objects.js"
-
-const DEFAULT_PARAMS = {
-  onState: "default",
-}
-
-export function collidable(params) {
-  params = extend(DEFAULT_PARAMS, params)
-
-  return (type) =>
-    extend(type, {
-      states: {
-        [params.onState]: {
-          update(entity, dt, api) {
-            type.states?.[params.onState].update?.(entity, dt, api)
-          },
-        },
-      },
-    })
-}