@rpgjs/client 5.0.0-beta.6 → 5.0.0-beta.8

package/src/components/character.ce

@@ -4,6 +4,8 @@
       <compConfig.component object ...compConfig.props />
     </Container>
   } 
+  <PlayerComponents object position="bottom" graphicBounds />
+  <PlayerComponents object position="left" graphicBounds />
   <Particle emit={emitParticleTrigger} settings={particleSettings} zIndex={1000} name={particleName} />
   <Container>
     @for (graphicObj of graphicsSignals) {
@@ -17,6 +19,9 @@
       />
     }
   </Container>
+  <PlayerComponents object position="center" graphicBounds />
+  <PlayerComponents object position="right" graphicBounds />
+  <PlayerComponents object position="top" graphicBounds />
   @for (compConfig of normalizedComponentsInFront) {
     <Container dependencies={compConfig.dependencies}>
       <compConfig.component object ...compConfig.props />
@@ -37,13 +42,14 @@
 
 <script>
   import { signal, effect, mount, computed, tick, animatedSignal, on } from "canvasengine";
+  import { Assets } from "pixi.js";
 
   import { lastValueFrom, combineLatest, pairwise, filter, map, startWith } from "rxjs";
   import { Particle } from "@canvasengine/presets";
   import { GameEngineToken, ModulesToken } from "@rpgjs/common";
   import { RpgClientEngine } from "../RpgClientEngine";
   import { inject } from "../core/inject";  
-  import { Direction } from "@rpgjs/common";
+  import { Direction, Animation } from "@rpgjs/common";
   import Hit from "./effects/hit.ce";
   import PlayerComponents from "./player-components.ce";
   import { RpgGui } from "../Gui/Gui";
@@ -390,6 +396,280 @@
     return undefined;
   }
 
+  const imageDimensions = signal({});
+  const loadingImageDimensions = new Set();
+
+  const toPositiveNumber = (value) => {
+    const number = typeof value === 'number' ? value : parseFloat(value);
+    return Number.isFinite(number) && number > 0 ? number : undefined;
+  };
+
+  const toFiniteNumber = (value, fallback = 0) => {
+    const number = typeof value === 'number' ? value : parseFloat(value);
+    return Number.isFinite(number) ? number : fallback;
+  };
+
+  const clampRatio = (value) => Math.min(1, Math.max(0, value));
+
+  const normalizePair = (value, fallback = [1, 1]) => {
+    if (Array.isArray(value)) {
+      const x = toFiniteNumber(value[0], fallback[0]);
+      const y = toFiniteNumber(value[1] ?? value[0], x);
+      return [x, y];
+    }
+    if (typeof value === 'number') {
+      return [value, value];
+    }
+    if (value && typeof value === 'object') {
+      const x = toFiniteNumber(value.x, fallback[0]);
+      const y = toFiniteNumber(value.y ?? value.x, x);
+      return [x, y];
+    }
+    return fallback;
+  };
+
+  const normalizeAnchor = (value) => {
+    if (!Array.isArray(value)) return undefined;
+    const [x, y] = normalizePair(value, [0, 0]);
+    return [clampRatio(x), clampRatio(y)];
+  };
+
+  const resolveImageSource = (image) => {
+    if (typeof image === 'string') return image;
+    if (typeof image?.default === 'string') return image.default;
+    return undefined;
+  };
+
+  const parentTextureOptions = (graphicObject) => {
+    const props = [
+      'width',
+      'height',
+      'framesHeight',
+      'framesWidth',
+      'rectWidth',
+      'rectHeight',
+      'offset',
+      'image',
+      'sound',
+      'spriteRealSize',
+      'scale',
+      'anchor',
+      'pivot',
+      'x',
+      'y',
+      'opacity'
+    ];
+
+    return props.reduce((options, prop) => {
+      if (graphicObject?.[prop] !== undefined) {
+        options[prop] = graphicObject[prop];
+      }
+      return options;
+    }, {});
+  };
+
+  const resolveTextureOptions = (graphicObject) => {
+    const textures = graphicObject?.textures ?? {};
+    const texture =
+      textures[realAnimationName()] ??
+      textures[Animation.Stand] ??
+      Object.values(textures)[0] ??
+      {};
+
+    return {
+      ...parentTextureOptions(graphicObject),
+      ...texture
+    };
+  };
+
+  const resolveFirstAnimationFrame = (textureOptions) => {
+    const animations = textureOptions?.animations;
+    if (!animations) return {};
+
+    try {
+      const frames = typeof animations === 'function'
+        ? animations({ direction: direction() })
+        : animations;
+      if (!Array.isArray(frames)) return {};
+      const firstGroup = frames[0];
+      return Array.isArray(firstGroup) ? firstGroup[0] ?? {} : firstGroup ?? {};
+    }
+    catch {
+      return {};
+    }
+  };
+
+  const optionValue = (prop, frame, textureOptions, graphicObject) => {
+    return frame?.[prop] ?? textureOptions?.[prop] ?? graphicObject?.[prop];
+  };
+
+  const resolveFrameSize = (textureOptions, dimensions) => {
+    const framesWidth = toPositiveNumber(textureOptions?.framesWidth) ?? 1;
+    const framesHeight = toPositiveNumber(textureOptions?.framesHeight) ?? 1;
+    const imageSource = resolveImageSource(textureOptions?.image);
+    const loadedSize = imageSource ? dimensions[imageSource] : undefined;
+    const fullWidth = toPositiveNumber(textureOptions?.width) ?? loadedSize?.width;
+    const fullHeight = toPositiveNumber(textureOptions?.height) ?? loadedSize?.height;
+    const width = toPositiveNumber(textureOptions?.rectWidth) ??
+      toPositiveNumber(textureOptions?.spriteWidth) ??
+      (fullWidth ? fullWidth / framesWidth : undefined);
+    const height = toPositiveNumber(textureOptions?.rectHeight) ??
+      toPositiveNumber(textureOptions?.spriteHeight) ??
+      (fullHeight ? fullHeight / framesHeight : undefined);
+
+    return {
+      width,
+      height
+    };
+  };
+
+  const resolveHitboxAnchor = (spriteWidth, spriteHeight, realSize, box) => {
+    if (!spriteWidth || !spriteHeight || !box) {
+      return [0, 0];
+    }
+
+    const heightOfSprite = typeof realSize === 'number' ? realSize : realSize?.height;
+    const resolvedHeight = toPositiveNumber(heightOfSprite) ?? spriteHeight;
+    const gap = Math.max(0, (spriteHeight - resolvedHeight) / 2);
+    const hitboxTopLeftX = clampRatio((spriteWidth - box.w) / 2 / spriteWidth);
+    const hitboxTopLeftY = clampRatio((spriteHeight - box.h - gap) / spriteHeight);
+    const hitboxCenterX = clampRatio(hitboxTopLeftX + box.w / 2 / spriteWidth);
+    const hitboxCenterY = clampRatio(hitboxTopLeftY + box.h / 2 / spriteHeight);
+    const footY = clampRatio((spriteHeight - gap) / spriteHeight);
+
+    switch (box.anchorMode ?? 'top-left') {
+      case 'center':
+        return [hitboxCenterX, hitboxCenterY];
+      case 'foot':
+        return [hitboxCenterX, footY];
+      case 'top-left':
+      default:
+        return [hitboxTopLeftX, hitboxTopLeftY];
+    }
+  };
+
+  const loadImageDimensions = (image) => {
+    const source = resolveImageSource(image);
+    if (!source || imageDimensions()[source] || loadingImageDimensions.has(source)) {
+      return;
+    }
+
+    loadingImageDimensions.add(source);
+    Assets.load(source)
+      .then((texture) => {
+        const width = toPositiveNumber(texture?.width);
+        const height = toPositiveNumber(texture?.height);
+        if (!width || !height) return;
+
+        imageDimensions.update((dimensions) => ({
+          ...dimensions,
+          [source]: { width, height }
+        }));
+      })
+      .catch(() => {})
+      .finally(() => {
+        loadingImageDimensions.delete(source);
+      });
+  };
+
+  effect(() => {
+    const sources = new Set();
+
+    graphicsSignals().forEach((graphicObject) => {
+      const baseImage = resolveImageSource(graphicObject?.image);
+      if (baseImage) sources.add(baseImage);
+
+      Object.values(graphicObject?.textures ?? {}).forEach((textureOptions) => {
+        const image = resolveImageSource(textureOptions?.image ?? graphicObject?.image);
+        if (image) sources.add(image);
+      });
+    });
+
+    sources.forEach((source) => loadImageDimensions(source));
+  });
+
+  const hitboxBounds = computed(() => {
+    const box = hitbox();
+    const width = box?.w ?? 0;
+    const height = box?.h ?? 0;
+
+    return {
+      left: 0,
+      top: 0,
+      right: width,
+      bottom: height,
+      width,
+      height,
+      centerX: width / 2,
+      centerY: height / 2
+    };
+  });
+
+  const graphicBounds = computed(() => {
+    const box = hitbox();
+    const fallback = hitboxBounds();
+    const dimensions = imageDimensions();
+    const graphics = graphicsSignals();
+    let bounds = null;
+
+    graphics.forEach((graphicObject) => {
+      const textureOptions = resolveTextureOptions(graphicObject);
+      const frame = resolveFirstAnimationFrame(textureOptions);
+      const size = resolveFrameSize(textureOptions, dimensions);
+      const spriteWidth = size.width ?? box?.w;
+      const spriteHeight = size.height ?? box?.h;
+
+      if (!spriteWidth || !spriteHeight) {
+        return;
+      }
+
+      const explicitAnchor = normalizeAnchor(optionValue('anchor', frame, textureOptions, graphicObject));
+      const anchor = explicitAnchor ?? resolveHitboxAnchor(
+        spriteWidth,
+        spriteHeight,
+        optionValue('spriteRealSize', frame, textureOptions, graphicObject),
+        box
+      );
+      const scale = normalizePair(optionValue('scale', frame, textureOptions, graphicObject) ?? graphicScale(graphicObject));
+      const x = toFiniteNumber(optionValue('x', frame, textureOptions, graphicObject), 0);
+      const y = toFiniteNumber(optionValue('y', frame, textureOptions, graphicObject), 0);
+      const leftEdge = -anchor[0] * spriteWidth * scale[0];
+      const rightEdge = (1 - anchor[0]) * spriteWidth * scale[0];
+      const topEdge = -anchor[1] * spriteHeight * scale[1];
+      const bottomEdge = (1 - anchor[1]) * spriteHeight * scale[1];
+      const graphic = {
+        left: x + Math.min(leftEdge, rightEdge),
+        top: y + Math.min(topEdge, bottomEdge),
+        right: x + Math.max(leftEdge, rightEdge),
+        bottom: y + Math.max(topEdge, bottomEdge)
+      };
+
+      bounds = bounds
+        ? {
+            left: Math.min(bounds.left, graphic.left),
+            top: Math.min(bounds.top, graphic.top),
+            right: Math.max(bounds.right, graphic.right),
+            bottom: Math.max(bounds.bottom, graphic.bottom)
+          }
+        : graphic;
+    });
+
+    if (!bounds) {
+      return fallback;
+    }
+
+    const width = bounds.right - bounds.left;
+    const height = bounds.bottom - bounds.top;
+
+    return {
+      ...bounds,
+      width,
+      height,
+      centerX: bounds.left + width / 2,
+      centerY: bounds.top + height / 2
+    };
+  });
+
   // Combine animation change detection with movement state from smoothX/smoothY
   const movementAnimations = ['walk', 'stand'];
   const epsilon = 0; // movement threshold to consider the easing still running
@@ -413,6 +693,51 @@
     filter(([prev, curr]) => prev !== curr)
   );
 
+  let beforeRemovePromise = null;
+  let beforeRemoveTransitionValue = null;
+  const resolveRemoveContext = () => {
+    if (!object._removeTransition) return null;
+    const value = object._removeTransition();
+    if (!value || typeof value !== 'string') return null;
+    try {
+      const context = JSON.parse(value);
+      if (!context || typeof context !== 'object' || !context.active) return null;
+      context.__transitionValue = value;
+      return context;
+    }
+    catch {
+      return null;
+    }
+  };
+
+  const withTimeout = (promise, timeoutMs = 0) => {
+    if (!timeoutMs || timeoutMs <= 0) return promise;
+    return Promise.race([
+      promise,
+      new Promise((resolve) => setTimeout(resolve, timeoutMs)),
+    ]);
+  };
+
+  const runBeforeRemove = () => {
+    const context = resolveRemoveContext();
+    if (!context) return Promise.resolve();
+    if (beforeRemovePromise && beforeRemoveTransitionValue === context.__transitionValue) {
+      return beforeRemovePromise;
+    }
+    beforeRemoveTransitionValue = context.__transitionValue;
+    beforeRemovePromise = withTimeout(
+      lastValueFrom(hooks.callHooks("client-sprite-onBeforeRemove", object, context)),
+      context.timeoutMs
+    );
+    return beforeRemovePromise;
+  };
+
+  const removeTransitionSubscription = object._removeTransition?.observable?.subscribe(() => {
+    if (resolveRemoveContext()) {
+      runBeforeRemove();
+    }
+  });
+
   const animationMovementSubscription = combineLatest([animationChange$, moving$]).subscribe(([[prev, curr], isMoving]) => {
     if (curr == 'stand' && !isMoving) {
       realAnimationName.set(curr);
@@ -442,7 +767,34 @@
    * @example
    * await onBeforeDestroy();
    */
+  const waitForTemporaryAnimationEnd = (maxDuration = 1200) => {
+    if (!object.animationIsPlaying || !object.animationIsPlaying()) {
+      return Promise.resolve();
+    }
+
+    return new Promise((resolve) => {
+      let finished = false;
+      let timeout;
+      let subscription;
+      const finish = () => {
+        if (finished) return;
+        finished = true;
+        clearTimeout(timeout);
+        subscription?.unsubscribe();
+        resolve();
+      };
+      timeout = setTimeout(finish, maxDuration);
+      subscription = object.animationIsPlaying.observable.subscribe((isPlaying) => {
+        if (!isPlaying) finish();
+      });
+      if (finished) subscription.unsubscribe();
+    });
+  };
+
   const onBeforeDestroy = async () => {
+    await runBeforeRemove();
+    await waitForTemporaryAnimationEnd();
+    removeTransitionSubscription?.unsubscribe();
     animationMovementSubscription.unsubscribe();
     xSubscription.unsubscribe();
     ySubscription.unsubscribe();

package/src/components/dynamics/bar.ce

@@ -0,0 +1,87 @@
+<Container width={width} height={containerHeight} minWidth={width} minHeight={containerHeight}>
+  <Graphics width={width} height={containerHeight} draw={drawBar} />
+  @if (hasLabel) {
+    <Text text={labelText} x={labelPosition.x} y={labelPosition.y} size={labelSize} color={labelColor} />
+  }
+</Container>
+
+<script>
+import { computed } from "canvasengine";
+import { resolveDynamicValue } from "./parse-value";
+
+const { object, current, max, style, text } = defineProps();
+
+const read = (prop, fallback) => prop ? prop() : fallback;
+
+const toNumber = (value, fallback = 0) => {
+  const resolved = resolveDynamicValue(value, object);
+  const num = typeof resolved === 'number' ? resolved : parseFloat(resolved);
+  return Number.isFinite(num) ? num : fallback;
+};
+
+const toColor = (value, fallback) => {
+  const resolved = resolveDynamicValue(value, object);
+  if (typeof resolved === 'number') return resolved;
+  if (typeof resolved === 'string' && resolved.startsWith('#')) {
+    return parseInt(resolved.slice(1), 16);
+  }
+  return resolved ?? fallback;
+};
+
+const config = computed(() => read(style, {}) ?? {});
+const width = computed(() => toNumber(config().width, 50));
+const height = computed(() => toNumber(config().height, 8));
+const borderRadius = computed(() => toNumber(config().borderRadius, 3));
+const borderWidth = computed(() => toNumber(config().borderWidth, 1));
+const backgroundColor = computed(() => toColor(config().bgColor, 0x16213e));
+const fillColor = computed(() => toColor(config().fillColor, 0x4ade80));
+const borderColor = computed(() => toColor(config().borderColor, 0x4a5568));
+const opacity = computed(() => Math.max(0, Math.min(1, toNumber(config().opacity, 1))));
+
+const currentValue = computed(() => toNumber(read(current, 0), 0));
+const maxValue = computed(() => Math.max(0, toNumber(read(max, 0), 0)));
+const percent = computed(() => {
+  const max = maxValue();
+  if (max <= 0) return 0;
+  return Math.max(0, Math.min(1, currentValue() / max));
+});
+
+const fillWidth = computed(() => Math.max(0, width() * percent()));
+const labelTemplate = computed(() => read(text, null));
+const labelText = computed(() => {
+  const template = labelTemplate();
+  if (template == null || template === '') return '';
+
+  const value = String(template)
+    .replace(/\{\$current\}/g, String(currentValue()))
+    .replace(/\{\$max\}/g, String(maxValue()))
+    .replace(/\{\$percent\}/g, String(Math.round(percent() * 100)));
+
+  return String(resolveDynamicValue(value, object) ?? '');
+});
+const labelSize = computed(() => toNumber(config().fontSize, 10));
+const hasLabel = computed(() => labelText().length > 0);
+const labelOffset = computed(() => hasLabel() ? labelSize() + 2 : 0);
+const containerHeight = computed(() => labelOffset() + height());
+const labelColor = computed(() => toColor(config().textColor, 0xffffff));
+const labelPosition = computed(() => ({
+  x: 0,
+  y: 0
+}));
+
+const drawBar = (g) => {
+  g.roundRect(0, labelOffset(), width(), height(), borderRadius());
+  g.fill({ color: backgroundColor(), alpha: opacity() });
+
+  const currentWidth = fillWidth();
+  if (currentWidth > 0) {
+    g.roundRect(0, labelOffset(), currentWidth, height(), borderRadius());
+    g.fill({ color: fillColor(), alpha: opacity() });
+  }
+  
+  const strokeWidth = borderWidth();
+  if (strokeWidth <= 0) return;
+  g.roundRect(0, labelOffset(), width(), height(), borderRadius());
+  g.stroke({ color: borderColor(), width: strokeWidth, alpha: opacity() });
+};
+</script>

package/src/components/dynamics/image.ce

@@ -0,0 +1,20 @@
+<Sprite sheet={sheet} />
+
+<script>
+import { computed } from "canvasengine";
+import { RpgClientEngine } from "../../RpgClientEngine";
+import { inject } from "../../core/inject";
+import { resolveDynamicValue } from "./parse-value";
+
+const { object, value } = defineProps();
+const client = inject(RpgClientEngine);
+
+const sheet = computed(() => {
+  const id = resolveDynamicValue(value?.(), object);
+  if (!id) return null;
+  return {
+    definition: client.getSpriteSheet(id),
+    playing: 'default'
+  };
+});
+</script>

package/src/components/dynamics/parse-value.spec.ts

@@ -0,0 +1,41 @@
+import { describe, expect, test } from "vitest";
+import { signal } from "canvasengine";
+import { resolveDynamicProps, resolveDynamicValue } from "./parse-value";
+
+describe("dynamic component values", () => {
+  test("resolves player properties and keeps bar placeholders for the bar renderer", () => {
+    const object = {
+      name: signal("Alex"),
+      hpSignal: signal(100),
+      _param: signal({ maxHp: 120 })
+    };
+
+    expect(resolveDynamicValue("HP: {hp}/{param.maxHp} {name} {$current}", object)).toBe("HP: 100/120 Alex {$current}");
+  });
+
+  test("keeps resolved props reactive", () => {
+    const object = {
+      name: signal("Alex"),
+      hpSignal: signal(100),
+      _param: signal({ maxHp: 120 })
+    };
+    const props: any = resolveDynamicProps({
+      value: "HP: {hp} {name}",
+      text: "{$current}/{$max} {name}",
+      style: {
+        width: "{hp}"
+      }
+    }, object);
+
+    expect(props.value()).toBe("HP: 100 Alex");
+    expect(props.text()).toBe("{$current}/{$max} Alex");
+    expect(props.style()).toEqual({ width: "100" });
+
+    object.hpSignal.set(10);
+    object.name.set("Sam");
+
+    expect(props.value()).toBe("HP: 10 Sam");
+    expect(props.text()).toBe("{$current}/{$max} Sam");
+    expect(props.style()).toEqual({ width: "10" });
+  });
+});