@zylem/game-lib 0.6.3 → 0.6.4

package/dist/actions.d.ts

@@ -1,12 +1,12 @@
-import { T as TransformState } from './entity-BpbZqg19.js';
-export { A as Action, c as createTransformStore, i as getPosition, H as getRotation, j as getVelocity, m as move, h as moveForwardXY, a as moveX, e as moveXY, f as moveXZ, b as moveY, d as moveZ, r as resetTransformStore, g as resetVelocity, t as rotateEuler, p as rotateInDirection, u as rotateX, v as rotateY, q as rotateYEuler, x as rotateZ, s as setPosition, k as setPositionX, l as setPositionY, n as setPositionZ, G as setRotation, C as setRotationDegrees, E as setRotationDegreesX, D as setRotationDegreesY, F as setRotationDegreesZ, z as setRotationX, y as setRotationY, B as setRotationZ, o as wrapAround3D, w as wrapAroundXY } from './entity-BpbZqg19.js';
-export { c as callFunc, d as delay, m as moveBy, a as moveTo, o as onPress, b as onRelease, p as parallel, e as repeat, f as repeatForever, r as rotateBy, s as sequence, t as throttle } from './composition-DrzFrbqI.js';
+import { T as TransformState } from './entity-vj-HTjzU.js';
+export { A as Action, c as createTransformStore, i as getPosition, H as getRotation, j as getVelocity, m as move, h as moveForwardXY, a as moveX, e as moveXY, f as moveXZ, b as moveY, d as moveZ, r as resetTransformStore, g as resetVelocity, t as rotateEuler, p as rotateInDirection, u as rotateX, v as rotateY, q as rotateYEuler, x as rotateZ, s as setPosition, k as setPositionX, l as setPositionY, n as setPositionZ, G as setRotation, C as setRotationDegrees, E as setRotationDegreesX, D as setRotationDegreesY, F as setRotationDegreesZ, z as setRotationX, y as setRotationY, B as setRotationZ, o as wrapAround3D, w as wrapAroundXY } from './entity-vj-HTjzU.js';
+export { c as callFunc, d as delay, m as moveBy, a as moveTo, o as onPress, b as onRelease, p as parallel, e as repeat, f as repeatForever, r as rotateBy, s as sequence, t as throttle } from './composition-BASvMKrW.js';
 import { RigidBody } from '@dimforge/rapier3d-compat';
-export { g as globalChange, a as globalChanges, v as variableChange, b as variableChanges } from './global-change-Dc8uCKi2.js';
+export { g as globalChange, a as globalChanges, v as variableChange, b as variableChanges } from './global-change-2JvMaz44.js';
 import 'three';
 import 'bitecs';
 import 'mitt';
-import './behavior-descriptor-BWNWmIjv.js';
+import './behavior-descriptor-BXnVR8Ki.js';
 
 /**
  * Entity that can have transformations applied from a store

package/dist/actions.js

@@ -23,6 +23,25 @@ var BaseAction = class {
   }
 };
 
+// src/lib/actions/capabilities/velocity-intents.ts
+function setVelocityIntent(store, sourceId, vector, options = {}) {
+  const prev = store.velocityChannels[sourceId];
+  const mode = options.mode ?? prev?.mode ?? "replace";
+  const priority = options.priority ?? prev?.priority ?? 0;
+  const isAdditiveMerge = mode === "add" && prev?.mode === "add";
+  const x = vector.x == null ? prev?.x : isAdditiveMerge ? (prev?.x ?? 0) + vector.x : vector.x;
+  const y = vector.y == null ? prev?.y : isAdditiveMerge ? (prev?.y ?? 0) + vector.y : vector.y;
+  const z = vector.z == null ? prev?.z : isAdditiveMerge ? (prev?.z ?? 0) + vector.z : vector.z;
+  store.velocityChannels[sourceId] = {
+    x,
+    y,
+    z,
+    mode,
+    priority
+  };
+  store.dirty.velocityChannels = true;
+}
+
 // src/lib/actions/interval-actions.ts
 function moveBy(opts) {
   return new MoveByAction(opts);
@@ -43,10 +62,8 @@ var MoveByAction = class extends BaseAction {
     const vy = this.dy / this.duration;
     const vz = this.dz / this.duration;
     const store = entity.transformStore;
-    store.velocity.x += vx;
-    store.velocity.y += vy;
-    store.velocity.z += vz;
-    store.dirty.velocity = true;
+    if (!store) return;
+    setVelocityIntent(store, "actions", { x: vx, y: vy, z: vz }, { mode: "add" });
   }
 };
 function moveTo(opts) {
@@ -82,10 +99,8 @@ var MoveToAction = class extends BaseAction {
     const vy = this.dy / this.duration;
     const vz = this.dz / this.duration;
     const store = entity.transformStore;
-    store.velocity.x += vx;
-    store.velocity.y += vy;
-    store.velocity.z += vz;
-    store.dirty.velocity = true;
+    if (!store) return;
+    setVelocityIntent(store, "actions", { x: vx, y: vy, z: vz }, { mode: "add" });
   }
   reset() {
     super.reset();
@@ -378,10 +393,15 @@ function createTransformStore(initial) {
     rotation: { x: 0, y: 0, z: 0, w: 1 },
     velocity: { x: 0, y: 0, z: 0 },
     angularVelocity: { x: 0, y: 0, z: 0 },
+    velocityChannels: {},
     dirty: {
       position: false,
       rotation: false,
       velocity: false,
+      velocityX: false,
+      velocityY: false,
+      velocityZ: false,
+      velocityChannels: false,
       angularVelocity: false
     }
   };
@@ -409,25 +429,128 @@ function resetTransformStore(store) {
   store.angularVelocity.x = 0;
   store.angularVelocity.y = 0;
   store.angularVelocity.z = 0;
+  for (const sourceId of Object.keys(store.velocityChannels)) {
+    delete store.velocityChannels[sourceId];
+  }
   store.dirty.position = false;
   store.dirty.rotation = false;
   store.dirty.velocity = false;
+  store.dirty.velocityX = false;
+  store.dirty.velocityY = false;
+  store.dirty.velocityZ = false;
+  store.dirty.velocityChannels = false;
   store.dirty.angularVelocity = false;
 }
 
 // src/lib/actions/capabilities/apply-transform.ts
+function sortIntents(a, b) {
+  if (a.priority !== b.priority) return a.priority - b.priority;
+  return a.sourceId.localeCompare(b.sourceId);
+}
+function composeAxis(current, intents, axis) {
+  let touched = false;
+  let addSum = 0;
+  let hasReplace = false;
+  let replaceValue = current;
+  let replacePriority = Number.NEGATIVE_INFINITY;
+  for (const intent of intents) {
+    const axisValue = intent[axis];
+    if (axisValue == null) continue;
+    touched = true;
+    if (intent.mode === "add") {
+      addSum += axisValue;
+      continue;
+    }
+    if (!hasReplace || intent.priority >= replacePriority) {
+      hasReplace = true;
+      replacePriority = intent.priority;
+      replaceValue = axisValue;
+    }
+  }
+  return {
+    touched,
+    value: (hasReplace ? replaceValue : 0) + addSum
+  };
+}
+function composeVelocity(current, intents) {
+  return {
+    x: composeAxis(current.x, intents, "x"),
+    y: composeAxis(current.y, intents, "y"),
+    z: composeAxis(current.z, intents, "z")
+  };
+}
+function clearVelocityChannels(store) {
+  for (const sourceId in store.velocityChannels) {
+    delete store.velocityChannels[sourceId];
+  }
+  store.dirty.velocityChannels = false;
+}
 function applyTransformChanges(entity, store) {
   if (!entity.body) return;
-  if (store.dirty.velocity) {
-    entity.body.setLinvel(store.velocity, true);
+  const hasPosition = store.dirty.position;
+  const hasRotation = store.dirty.rotation;
+  const hasAngularVelocity = store.dirty.angularVelocity;
+  const hasPerAxis = store.dirty.velocityX || store.dirty.velocityY || store.dirty.velocityZ;
+  const hasLegacyVelocity = store.dirty.velocity;
+  const hasChannels = store.dirty.velocityChannels;
+  if (!hasPosition && !hasRotation && !hasAngularVelocity && !hasPerAxis && !hasLegacyVelocity && !hasChannels) {
+    return;
+  }
+  const intents = [];
+  if (hasChannels) {
+    for (const sourceId in store.velocityChannels) {
+      const intent = store.velocityChannels[sourceId];
+      intents.push({
+        sourceId,
+        mode: intent.mode ?? "replace",
+        priority: intent.priority ?? 0,
+        x: intent.x,
+        y: intent.y,
+        z: intent.z
+      });
+    }
   }
-  if (store.dirty.rotation) {
+  if (hasLegacyVelocity) {
+    intents.push({
+      sourceId: "__legacy_velocity__",
+      mode: "replace",
+      priority: -100,
+      x: store.velocity.x,
+      y: store.velocity.y,
+      z: store.velocity.z
+    });
+  } else if (hasPerAxis) {
+    intents.push({
+      sourceId: "__legacy_per_axis__",
+      mode: "replace",
+      priority: -100,
+      x: store.dirty.velocityX ? store.velocity.x : void 0,
+      y: store.dirty.velocityY ? store.velocity.y : void 0,
+      z: store.dirty.velocityZ ? store.velocity.z : void 0
+    });
+  }
+  if (intents.length > 0) {
+    const current = entity.body.linvel();
+    if (intents.length > 1) {
+      intents.sort(sortIntents);
+    }
+    const composed = composeVelocity(current, intents);
+    entity.body.setLinvel(
+      {
+        x: composed.x.touched ? composed.x.value : current.x,
+        y: composed.y.touched ? composed.y.value : current.y,
+        z: composed.z.touched ? composed.z.value : current.z
+      },
+      true
+    );
+  }
+  if (hasRotation) {
     entity.body.setRotation(store.rotation, true);
   }
-  if (store.dirty.angularVelocity) {
+  if (hasAngularVelocity) {
     entity.body.setAngvel(store.angularVelocity, true);
   }
-  if (store.dirty.position) {
+  if (hasPosition) {
     const current = entity.body.translation();
     entity.body.setTranslation(
       {
@@ -438,43 +561,56 @@ function applyTransformChanges(entity, store) {
       true
     );
   }
+  store.dirty.position = false;
+  store.dirty.rotation = false;
+  store.dirty.velocity = false;
+  store.dirty.velocityX = false;
+  store.dirty.velocityY = false;
+  store.dirty.velocityZ = false;
+  clearVelocityChannels(store);
+  store.dirty.angularVelocity = false;
 }
 
 // src/lib/actions/capabilities/moveable.ts
 import { Vector3 } from "three";
 function moveX(entity, delta) {
   if (!entity.transformStore) return;
-  entity.transformStore.velocity.x = delta;
-  entity.transformStore.dirty.velocity = true;
+  setVelocityIntent(entity.transformStore, "actions", { x: delta }, { mode: "replace" });
 }
 function moveY(entity, delta) {
   if (!entity.transformStore) return;
-  entity.transformStore.velocity.y = delta;
-  entity.transformStore.dirty.velocity = true;
+  setVelocityIntent(entity.transformStore, "actions", { y: delta }, { mode: "replace" });
 }
 function moveZ(entity, delta) {
   if (!entity.transformStore) return;
-  entity.transformStore.velocity.z = delta;
-  entity.transformStore.dirty.velocity = true;
+  setVelocityIntent(entity.transformStore, "actions", { z: delta }, { mode: "replace" });
 }
 function moveXY(entity, deltaX, deltaY) {
   if (!entity.transformStore) return;
-  entity.transformStore.velocity.x = deltaX;
-  entity.transformStore.velocity.y = deltaY;
-  entity.transformStore.dirty.velocity = true;
+  setVelocityIntent(
+    entity.transformStore,
+    "actions",
+    { x: deltaX, y: deltaY },
+    { mode: "replace" }
+  );
 }
 function moveXZ(entity, deltaX, deltaZ) {
   if (!entity.transformStore) return;
-  entity.transformStore.velocity.x = deltaX;
-  entity.transformStore.velocity.z = deltaZ;
-  entity.transformStore.dirty.velocity = true;
+  setVelocityIntent(
+    entity.transformStore,
+    "actions",
+    { x: deltaX, z: deltaZ },
+    { mode: "replace" }
+  );
 }
 function move(entity, vector) {
   if (!entity.transformStore) return;
-  entity.transformStore.velocity.x += vector.x;
-  entity.transformStore.velocity.y += vector.y;
-  entity.transformStore.velocity.z += vector.z;
-  entity.transformStore.dirty.velocity = true;
+  setVelocityIntent(
+    entity.transformStore,
+    "actions",
+    { x: vector.x, y: vector.y, z: vector.z },
+    { mode: "add" }
+  );
 }
 function resetVelocity(entity) {
   if (!entity.body) return;
@@ -537,6 +673,17 @@ function wrapAround3D(entity, boundsX, boundsY, boundsZ) {
 
 // src/lib/actions/capabilities/rotatable.ts
 import { Euler, Vector3 as Vector32, MathUtils, Quaternion } from "three";
+function syncImmediateRotation(entity) {
+  if (!entity.group || !entity.transformStore) return;
+  entity.group.setRotationFromQuaternion(
+    new Quaternion(
+      entity.transformStore.rotation.x,
+      entity.transformStore.rotation.y,
+      entity.transformStore.rotation.z,
+      entity.transformStore.rotation.w
+    )
+  );
+}
 function rotateInDirection(entity, moveVector) {
   if (!entity.body) return;
   const rotate = Math.atan2(-moveVector.x, moveVector.z);
@@ -546,9 +693,16 @@ function rotateYEuler(entity, amount) {
   rotateEuler(entity, new Vector32(0, -amount, 0));
 }
 function rotateEuler(entity, rotation) {
-  if (!entity.group) return;
-  const euler = new Euler(rotation.x, rotation.y, rotation.z);
-  entity.group.setRotationFromEuler(euler);
+  if (!entity.transformStore) return;
+  const quat = new Quaternion().setFromEuler(
+    new Euler(rotation.x, rotation.y, rotation.z)
+  );
+  entity.transformStore.rotation.w = quat.w;
+  entity.transformStore.rotation.x = quat.x;
+  entity.transformStore.rotation.y = quat.y;
+  entity.transformStore.rotation.z = quat.z;
+  entity.transformStore.dirty.rotation = true;
+  syncImmediateRotation(entity);
 }
 function rotateY(entity, delta) {
   if (!entity.transformStore) return;
@@ -565,6 +719,7 @@ function rotateY(entity, delta) {
   entity.transformStore.rotation.y = newY;
   entity.transformStore.rotation.z = newZ;
   entity.transformStore.dirty.rotation = true;
+  syncImmediateRotation(entity);
 }
 function rotateX(entity, delta) {
   if (!entity.transformStore) return;
@@ -581,6 +736,7 @@ function rotateX(entity, delta) {
   entity.transformStore.rotation.y = newY;
   entity.transformStore.rotation.z = newZ;
   entity.transformStore.dirty.rotation = true;
+  syncImmediateRotation(entity);
 }
 function rotateZ(entity, delta) {
   if (!entity.transformStore) return;
@@ -597,6 +753,8 @@ function rotateZ(entity, delta) {
   entity.transformStore.rotation.y = newY;
   entity.transformStore.rotation.z = newZ;
   entity.transformStore.dirty.rotation = true;
+  entity._rotation2DAngle = (entity._rotation2DAngle ?? 0) + delta;
+  syncImmediateRotation(entity);
 }
 function setRotationY(entity, y) {
   if (!entity.transformStore) return;
@@ -608,6 +766,7 @@ function setRotationY(entity, y) {
   entity.transformStore.rotation.y = yComponent;
   entity.transformStore.rotation.z = 0;
   entity.transformStore.dirty.rotation = true;
+  syncImmediateRotation(entity);
 }
 function setRotationDegreesY(entity, y) {
   if (!entity.body) return;
@@ -623,6 +782,7 @@ function setRotationX(entity, x) {
   entity.transformStore.rotation.y = 0;
   entity.transformStore.rotation.z = 0;
   entity.transformStore.dirty.rotation = true;
+  syncImmediateRotation(entity);
 }
 function setRotationDegreesX(entity, x) {
   if (!entity.body) return;
@@ -638,6 +798,8 @@ function setRotationZ(entity, z) {
   entity.transformStore.rotation.y = 0;
   entity.transformStore.rotation.z = zComponent;
   entity.transformStore.dirty.rotation = true;
+  entity._rotation2DAngle = z;
+  syncImmediateRotation(entity);
 }
 function setRotationDegreesZ(entity, z) {
   if (!entity.body) return;
@@ -651,6 +813,8 @@ function setRotation(entity, x, y, z) {
   entity.transformStore.rotation.y = quat.y;
   entity.transformStore.rotation.z = quat.z;
   entity.transformStore.dirty.rotation = true;
+  entity._rotation2DAngle = z;
+  syncImmediateRotation(entity);
 }
 function setRotationDegrees(entity, x, y, z) {
   if (!entity.body) return;