@datamoc/mw_games 0.7.6 → 0.7.7

package/dist/two-d/render/AnimatedSprite.d.ts

@@ -1,10 +1,36 @@
 import { TintedSprite } from './TintedSprite.ts';
 import type { Texture2D } from './Types2D.ts';
+/**
+ * One frame, with its own timing and its own place.
+ *
+ * A frame may carry its own duration, which is what Wesnoth writes as `image=a.png:120,b.png:80`: a
+ * list of frames with how long each is held. It may also sit a few pixels away from where the sprite
+ * is - a recoil, a hit shake, a frame drawn high on purpose.
+ */
+export interface AnimationFrame {
+    readonly texture: Texture2D;
+    /** seconds this frame is held; without it, `AnimationOptions.fps` decides */
+    readonly duration?: number;
+    /** pixels this frame is drawn away from the sprite's own position */
+    readonly offsetX?: number;
+    readonly offsetY?: number;
+}
+/** a plain texture is a frame with no timing or offset of its own */
+export type AnimationFrameInput = Texture2D | AnimationFrame;
 export interface AnimationOptions {
-    /** frames per second */
+    /** frames per second: the duration of every frame that does not carry one of its own */
     fps?: number;
     /** whether to start again at the end, or hold on the last frame */
     loop?: boolean;
+    /**
+     * Seconds into its own timeline this animation starts at. Positive holds the first frame that
+     * much longer, negative skips that much of the leading frames. The negative case is not a quirk:
+     * it is how Wesnoth lines an attack animation up with the frame the damage lands on, by starting
+     * mid-swing (`start_time=-450` over frames of 100ms each skips four and a half of them). The
+     * offset applies once, when playback starts; a looping animation then cycles on the frames' own
+     * length, so the delay does not repeat every lap.
+     */
+    startTime?: number;
 }
 /**
  * @example
@@ -19,11 +45,24 @@ export interface AnimationOptions {
  * ```
  */
 export declare class Animation {
-    readonly frames: readonly Texture2D[];
+    readonly frames: readonly AnimationFrame[];
+    /** the duration every frame without one of its own is held for */
     readonly frameDuration: number;
     readonly loop: boolean;
-    constructor(frames: readonly Texture2D[], { fps, loop }?: AnimationOptions);
-    get duration(): number;
+    readonly startTime: number;
+    /** how long one pass over the frames takes, `startTime` excluded */
+    readonly duration: number;
+    /** each frame's resolved duration, in order: `frameAt` walks these rather than the frames */
+    private readonly times;
+    constructor(frames: readonly AnimationFrameInput[], { fps, loop, startTime }?: AnimationOptions);
+    /** the frame playing `seconds` in, with `startTime` and `loop` applied */
+    frameAt(seconds: number): AnimationFrame;
+    /**
+     * Which frame plays `seconds` in. Before it starts the first frame is held, however long that
+     * is, and a non-looping animation that has run out stays on its last frame rather than running
+     * off the end.
+     */
+    frameIndexAt(seconds: number): number;
 }
 /**
  * A sprite that plays named animations, and can still be tinted.
@@ -34,6 +73,14 @@ export declare class Animation {
  * Nothing advances on its own: call `update(dt)` from the scene, or add the sprite to a
  * `SpriteGroup`, so that pausing the game pauses the animations with it.
  *
+ * Frames may carry their own duration, and the animation may start partway into itself, which is
+ * what Wesnoth's `image=a.png:120,b.png:80` and `start_time=-450` mean. A frame may also carry an
+ * offset, so a swing recoils a few pixels without a second texture: `frameOffset` reports it, and
+ * the *caller* adds it where it already positions the sprite. The framework does not apply it
+ * itself, on purpose - this sprite's position belongs to whoever put it there (a `GridMover`, a
+ * walk tween, a camera projection), and a sprite that overwrote `y` every frame would undo that
+ * every frame. `FloatingText` learned the same rule the hard way.
+ *
  * Reduced motion deliberately does not pause this. A frame cycle is usually game state - a
  * walking enemy that freezes when the player has asked for less motion is a bug, not an
  * accommodation, and the article's own "Don't Reduce Too Much" is about exactly this. A game
@@ -54,6 +101,14 @@ export declare class Animation {
  * hero.add('idle', sheet.pick(0, 0, 0, 1), { fps: 2 });
  * hero.add('walk', sheet.range(6, 10), { fps: 10 });
  * hero.add('die', sheet.range(11, 14), { fps: 10, loop: false });
+ * hero.add(
+ *   'thrust',
+ *   [
+ *     { texture: sheet.get(20), duration: 0.4 },
+ *     { texture: sheet.get(21), duration: 0.1, offsetX: 3 }, // the lunge
+ *   ],
+ *   { startTime: -0.2 },
+ * );
  * hero.play('idle');
  *
  * hero.onFinish = (name) => console.log(`${name} finished`);
@@ -64,16 +119,27 @@ export declare class AnimatedSprite extends TintedSprite {
     private animations;
     private current;
     private currentName;
-    private frameIndex;
-    private timer;
+    private elapsed;
     private finished;
+    private readonly offset;
     /** fires once when a non-looping animation reaches its last frame */
     onFinish: ((name: string) => void) | null;
     paused: boolean;
-    add(name: string, frames: readonly Texture2D[], options?: AnimationOptions): this;
+    add(name: string, frames: readonly AnimationFrameInput[], options?: AnimationOptions): this;
     has(name: string): boolean;
     get playing(): string | null;
     get isFinished(): boolean;
+    /**
+     * Where the current frame is drawn relative to the sprite's own position, in pixels. The caller
+     * adds it, as in `sprite.position.set(x + sprite.frameOffset.x, y + sprite.frameOffset.y)`. Both
+     * are zero for a frame with no offset of its own.
+     */
+    get frameOffset(): {
+        readonly x: number;
+        readonly y: number;
+    };
+    /** how long the current animation has been running, `startTime` and all */
+    get elapsedTime(): number;
     /**
      * Starts an animation.
      *
@@ -83,5 +149,6 @@ export declare class AnimatedSprite extends TintedSprite {
     play(name: string, restart?: boolean): this;
     stop(): void;
     update(dt: number): void;
+    private show;
 }
 //# sourceMappingURL=AnimatedSprite.d.ts.map

package/dist/two-d/render/AnimatedSprite.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AnimatedSprite.d.ts","sourceRoot":"","sources":["../../../src/two-d/render/AnimatedSprite.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE9C,MAAM,WAAW,gBAAgB;IAChC,wBAAwB;IACxB,GAAG,CAAC,EAAE,MAAM,CAAC;IAEb,mEAAmE;IACnE,IAAI,CAAC,EAAE,OAAO,CAAC;CACf;AAED;;;;;;;;;;;GAWG;AACH,qBAAa,SAAS;IACrB,QAAQ,CAAC,MAAM,EAAE,SAAS,SAAS,EAAE,CAAC;IACtC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IAEvB,YAAY,MAAM,EAAE,SAAS,SAAS,EAAE,EAAE,EAAE,GAAQ,EAAE,IAAW,EAAE,GAAE,gBAAqB,EAKzF;IAED,IAAI,QAAQ,IAAI,MAAM,CAErB;CACD;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AACH,qBAAa,cAAe,SAAQ,YAAY;IAC/C,OAAO,CAAC,UAAU,CAAgC;IAElD,OAAO,CAAC,OAAO,CAA0B;IACzC,OAAO,CAAC,WAAW,CAAuB;IAC1C,OAAO,CAAC,UAAU,CAAK;IACvB,OAAO,CAAC,KAAK,CAAK;IAClB,OAAO,CAAC,QAAQ,CAAS;IAEzB,qEAAqE;IACrE,QAAQ,EAAE,CAAC,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC,GAAG,IAAI,CAAQ;IAEjD,MAAM,UAAS;IAEf,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,SAAS,EAAE,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAGhF;IAED,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEzB;IAED,IAAI,OAAO,IAAI,MAAM,GAAG,IAAI,CAE3B;IAED,IAAI,UAAU,IAAI,OAAO,CAExB;IAED;;;;;OAKG;IACH,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,UAAQ,GAAG,IAAI,CAcxC;IAED,IAAI,IAAI,IAAI,CAGX;IAED,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAuBvB;CACD"}
+{"version":3,"file":"AnimatedSprite.d.ts","sourceRoot":"","sources":["../../../src/two-d/render/AnimatedSprite.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE9C;;;;;;GAMG;AACH,MAAM,WAAW,cAAc;IAC9B,QAAQ,CAAC,OAAO,EAAE,SAAS,CAAC;IAE5B,6EAA6E;IAC7E,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAE3B,qEAAqE;IACrE,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,qEAAqE;AACrE,MAAM,MAAM,mBAAmB,GAAG,SAAS,GAAG,cAAc,CAAC;AAE7D,MAAM,WAAW,gBAAgB;IAChC,wFAAwF;IACxF,GAAG,CAAC,EAAE,MAAM,CAAC;IAEb,mEAAmE;IACnE,IAAI,CAAC,EAAE,OAAO,CAAC;IAEf;;;;;;;OAOG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;CACnB;AAED;;;;;;;;;;;GAWG;AACH,qBAAa,SAAS;IACrB,QAAQ,CAAC,MAAM,EAAE,SAAS,cAAc,EAAE,CAAC;IAE3C,kEAAkE;IAClE,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAE/B,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAE3B,oEAAoE;IACpE,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAE1B,6FAA6F;IAC7F,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAoB;IAE1C,YACC,MAAM,EAAE,SAAS,mBAAmB,EAAE,EACtC,EAAE,GAAQ,EAAE,IAAW,EAAE,SAAa,EAAE,GAAE,gBAAqB,EAqB/D;IAED,0EAA0E;IAC1E,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,cAAc,CAEvC;IAED;;;;OAIG;IACH,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAapC;CACD;AAMD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkDG;AACH,qBAAa,cAAe,SAAQ,YAAY;IAC/C,OAAO,CAAC,UAAU,CAAgC;IAElD,OAAO,CAAC,OAAO,CAA0B;IACzC,OAAO,CAAC,WAAW,CAAuB;IAC1C,OAAO,CAAC,OAAO,CAAK;IACpB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAkB;IAEzC,qEAAqE;IACrE,QAAQ,EAAE,CAAC,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC,GAAG,IAAI,CAAQ;IAEjD,MAAM,UAAS;IAEf,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,mBAAmB,EAAE,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAG1F;IAED,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEzB;IAED,IAAI,OAAO,IAAI,MAAM,GAAG,IAAI,CAE3B;IAED,IAAI,UAAU,IAAI,OAAO,CAExB;IAED;;;;OAIG;IACH,IAAI,WAAW,IAAI;QAAE,QAAQ,CAAC,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,CAAC,EAAE,MAAM,CAAA;KAAE,CAE5D;IAED,2EAA2E;IAC3E,IAAI,WAAW,IAAI,MAAM,CAExB;IAED;;;;;OAKG;IACH,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,UAAQ,GAAG,IAAI,CAaxC;IAED,IAAI,IAAI,IAAI,CAGX;IAED,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAavB;IAED,OAAO,CAAC,IAAI;CAKZ"}

package/dist/two-d/render/AnimatedSprite.js

@@ -12,17 +12,57 @@ import { TintedSprite } from './TintedSprite.js';
  * ```
  */
 export class Animation {
-    constructor(frames, { fps = 10, loop = true } = {}) {
+    constructor(frames, { fps = 10, loop = true, startTime = 0 } = {}) {
         if (frames.length === 0)
             throw new Error('an animation needs at least one frame');
-        this.frames = frames;
+        if (!(fps > 0))
+            throw new Error(`an animation needs a positive fps, got ${fps}`);
         this.frameDuration = 1 / fps;
+        this.frames = frames.map((frame) => (isFrame(frame) ? frame : { texture: frame }));
+        this.times = this.frames.map((frame) => frame.duration ?? this.frameDuration);
         this.loop = loop;
+        this.startTime = startTime;
+        //the frames that borrow the fps are multiplied rather than added one by one: ten frames at a
+        //tenth of a second are exactly a second, where summing ten copies of 0.1 lands an ulp away
+        //from it. This total is what a loop wraps on and what a one-shot animation is timed against
+        let uniform = 0;
+        let timed = 0;
+        for (const frame of this.frames) {
+            if (frame.duration === undefined)
+                uniform++;
+            else
+                timed += frame.duration;
+        }
+        this.duration = uniform * this.frameDuration + timed;
+    }
+    /** the frame playing `seconds` in, with `startTime` and `loop` applied */
+    frameAt(seconds) {
+        return this.frames[this.frameIndexAt(seconds)];
     }
-    get duration() {
-        return this.frameDuration * this.frames.length;
+    /**
+     * Which frame plays `seconds` in. Before it starts the first frame is held, however long that
+     * is, and a non-looping animation that has run out stays on its last frame rather than running
+     * off the end.
+     */
+    frameIndexAt(seconds) {
+        const elapsed = seconds - this.startTime;
+        if (elapsed <= 0)
+            return 0;
+        const total = this.duration;
+        if (total <= 0)
+            return this.frames.length - 1;
+        let time = this.loop ? elapsed % total : Math.min(elapsed, total);
+        for (let index = 0; index < this.times.length; index++) {
+            if (time < this.times[index])
+                return index;
+            time -= this.times[index];
+        }
+        return this.frames.length - 1;
     }
 }
+function isFrame(frame) {
+    return typeof frame.texture !== 'undefined';
+}
 /**
  * A sprite that plays named animations, and can still be tinted.
  *
@@ -32,6 +72,14 @@ export class Animation {
  * Nothing advances on its own: call `update(dt)` from the scene, or add the sprite to a
  * `SpriteGroup`, so that pausing the game pauses the animations with it.
  *
+ * Frames may carry their own duration, and the animation may start partway into itself, which is
+ * what Wesnoth's `image=a.png:120,b.png:80` and `start_time=-450` mean. A frame may also carry an
+ * offset, so a swing recoils a few pixels without a second texture: `frameOffset` reports it, and
+ * the *caller* adds it where it already positions the sprite. The framework does not apply it
+ * itself, on purpose - this sprite's position belongs to whoever put it there (a `GridMover`, a
+ * walk tween, a camera projection), and a sprite that overwrote `y` every frame would undo that
+ * every frame. `FloatingText` learned the same rule the hard way.
+ *
  * Reduced motion deliberately does not pause this. A frame cycle is usually game state - a
  * walking enemy that freezes when the player has asked for less motion is a bug, not an
  * accommodation, and the article's own "Don't Reduce Too Much" is about exactly this. A game
@@ -52,6 +100,14 @@ export class Animation {
  * hero.add('idle', sheet.pick(0, 0, 0, 1), { fps: 2 });
  * hero.add('walk', sheet.range(6, 10), { fps: 10 });
  * hero.add('die', sheet.range(11, 14), { fps: 10, loop: false });
+ * hero.add(
+ *   'thrust',
+ *   [
+ *     { texture: sheet.get(20), duration: 0.4 },
+ *     { texture: sheet.get(21), duration: 0.1, offsetX: 3 }, // the lunge
+ *   ],
+ *   { startTime: -0.2 },
+ * );
  * hero.play('idle');
  *
  * hero.onFinish = (name) => console.log(`${name} finished`);
@@ -64,9 +120,9 @@ export class AnimatedSprite extends TintedSprite {
         this.animations = new Map();
         this.current = null;
         this.currentName = null;
-        this.frameIndex = 0;
-        this.timer = 0;
+        this.elapsed = 0;
         this.finished = false;
+        this.offset = { x: 0, y: 0 };
         /** fires once when a non-looping animation reaches its last frame */
         this.onFinish = null;
         this.paused = false;
@@ -84,6 +140,18 @@ export class AnimatedSprite extends TintedSprite {
     get isFinished() {
         return this.finished;
     }
+    /**
+     * Where the current frame is drawn relative to the sprite's own position, in pixels. The caller
+     * adds it, as in `sprite.position.set(x + sprite.frameOffset.x, y + sprite.frameOffset.y)`. Both
+     * are zero for a frame with no offset of its own.
+     */
+    get frameOffset() {
+        return this.offset;
+    }
+    /** how long the current animation has been running, `startTime` and all */
+    get elapsedTime() {
+        return this.elapsed;
+    }
     /**
      * Starts an animation.
      *
@@ -98,10 +166,9 @@ export class AnimatedSprite extends TintedSprite {
             throw new Error(`no animation named "${name}" on this sprite`);
         this.current = animation;
         this.currentName = name;
-        this.frameIndex = 0;
-        this.timer = 0;
+        this.elapsed = 0;
         this.finished = false;
-        this.texture = animation.frames[0];
+        this.show(animation.frameAt(0));
         return this;
     }
     stop() {
@@ -112,24 +179,19 @@ export class AnimatedSprite extends TintedSprite {
         const animation = this.current;
         if (!animation || this.paused || this.finished)
             return;
-        this.timer += dt;
-        //a long frame may cross several animation frames, so this catches up rather than
-        //dropping them, which keeps two sprites started together in step
-        while (this.timer >= animation.frameDuration) {
-            this.timer -= animation.frameDuration;
-            if (this.frameIndex < animation.frames.length - 1) {
-                this.frameIndex++;
-            }
-            else if (animation.loop) {
-                this.frameIndex = 0;
-            }
-            else {
-                this.finished = true;
-                this.onFinish?.(this.currentName);
-                break;
-            }
+        //elapsed rather than a leftover timer: one long frame lands on the right frame instead of
+        //catching up through each of them, which keeps two sprites started together in step
+        this.elapsed += dt;
+        this.show(animation.frameAt(this.elapsed));
+        if (!animation.loop && this.elapsed >= animation.startTime + animation.duration) {
+            this.finished = true;
+            this.onFinish?.(this.currentName);
         }
-        this.texture = animation.frames[this.frameIndex];
+    }
+    show(frame) {
+        this.texture = frame.texture;
+        this.offset.x = frame.offsetX ?? 0;
+        this.offset.y = frame.offsetY ?? 0;
     }
 }
 //# sourceMappingURL=AnimatedSprite.js.map

package/dist/two-d/render/AnimatedSprite.js.map

@@ -1 +1 @@
-{"version":3,"file":"AnimatedSprite.js","sourceRoot":"","sources":["../../../src/two-d/render/AnimatedSprite.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"AnimatedSprite.js","sourceRoot":"","sources":["../../../src/two-d/render/AnimatedSprite.ts"],"names":[],"mappings":"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"}

package/dist/two-d/render/Camera.d.ts

@@ -4,10 +4,20 @@ import { Container } from 'pixi.js';
  *
  * The camera does not move: it moves the world under a fixed viewport, which is what a
  * renderer actually wants. `world` is the container to put the map and its inhabitants in;
- * anything that should stay put on screen (the HUD, a dialogue box) goes outside it.
+ * anything that should stay put on screen (the HUD, a dialogue box) goes outside it. The
+ * same answers "does rotation turn the camera or the world": the layer turns, once, about
+ * the view centre - never a per-tile transform, which is what keeps rotated tiles seamless
+ * and the per-frame cost flat regardless of map size.
  *
  * Positions are in world units. At `zoom = 3` a 16px tile is 48 screen pixels.
  *
+ * Rotation has two APIs sharing one angle: `setRotationStep`/`rotate` turn in the whole
+ * steps a grid closes on (item 285 - four quarter turns for a square map, six 60-degree
+ * steps for a hex one), while `rotateTo`/`animateRotationTo` turn to any angle at all (item
+ * 286), animating smoothly between two steps rather than only landing on them. `toScreen`/
+ * `toWorld`/`view`'s culling box already work at any angle, not only a step's whole
+ * multiple, so free rotation needed no change to either.
+ *
  * @example
  * ```ts
  * import { Camera, createCamera } from '@datamoc/mw_games/two-d/render';
@@ -28,6 +38,13 @@ import { Container } from 'pixi.js';
 export interface CameraOptions {
     /** screen pixels per world unit */
     zoom?: number;
+    /**
+     * The grid whose symmetry `rotate`/`setRotationStep` step in: `'square'` (the default)
+     * turns in four quarter turns, `'hex'` in six 60-degree steps, because a hex lattice comes
+     * back onto itself every 60 degrees. Only the step count depends on this; the layer and its
+     * inverse mapping are the same shape either way.
+     */
+    grid?: 'square' | 'hex';
     /**
      * How much of the screen the target may drift across before the camera follows, 0 to 1.
      *
@@ -91,7 +108,43 @@ export declare class Camera {
     private shakeY;
     /** clamps the view to these world bounds when set, so the map's edge is never crossed */
     private bounds;
+    /** how many whole-angle positions a full turn has: 4 for a square grid, 6 for a hex one */
+    readonly stepsPerTurn: number;
+    private step;
+    private _angle;
+    private targetAngle;
+    private angleIntensity;
     constructor(options?: CameraOptions);
+    /** the rotation step this view is turned to, always in `0 .. stepsPerTurn - 1` */
+    get rotationSteps(): number;
+    /** the view's rotation, in radians, positive turning the world counter-clockwise */
+    get rotation(): number;
+    /**
+     * The angle that cancels `rotation`: draw a label, health bar or damage number into `world`
+     * with this and it stays upright however the view is turned. A half turn would otherwise put
+     * every label upside down.
+     */
+    get uprightRotation(): number;
+    /** turns the view to a whole step, wrapping around a full turn */
+    setRotationStep(step: number): void;
+    /** turns the view by whole steps; `rotate(1)` is the next position, `rotate(-1)` the last */
+    rotate(delta?: number): void;
+    /**
+     * Turns the view to an arbitrary angle immediately, no animation - free rotation, not
+     * confined to a grid's whole steps. `rotationSteps` is left as it was: it names where
+     * `setRotationStep`/`rotate` last put the view, not this angle, so the two APIs are best
+     * used one at a time rather than interleaved.
+     */
+    rotateTo(angle: number): void;
+    /**
+     * Eases the view towards an arbitrary angle, taking whichever way around the turn is
+     * shorter - so animating from a hex view's fifth step back to its first sweeps the one
+     * 60-degree gap between them rather than the long way around. `intensity` behaves like
+     * `follow`'s: the remaining angle closes by that fraction each second.
+     */
+    animateRotationTo(angle: number, intensity?: number): void;
+    /** cos/sin of the current rotation, the shared arithmetic `toScreen`/`toWorld`/`view` use */
+    private get spin();
     get zoom(): number;
     set zoom(value: number);
     /**
@@ -101,7 +154,14 @@ export declare class Camera {
      * the screen instead, for a split-screen layout.
      */
     setViewport(width: number, height: number, screenX?: number, screenY?: number): void;
-    /** the visible rectangle, in world units: use it to cull */
+    /**
+     * The visible region, in world units, as an axis-aligned box: use it to cull.
+     *
+     * With the view turned, the visible region is the viewport rectangle rotated in world space,
+     * so this is the box around its four corners instead of the rectangle itself - over-inclusive
+     * rather than clipping tiles that are actually on screen. Unturned, it is the rectangle, at
+     * its exact numbers.
+     */
     get view(): {
         x: number;
         y: number;
@@ -128,12 +188,12 @@ export declare class Camera {
     /** @param magnitude world units @param duration seconds */
     shake(magnitude: number, duration?: number): void;
     update(dt: number): void;
-    /** world point to screen pixels */
+    /** world point to screen pixels, through the current rotation */
     toScreen(x: number, y: number): {
         x: number;
         y: number;
     };
-    /** screen pixels to world point, for turning a click into a tile */
+    /** screen pixels to world point, for turning a click into a tile; the inverse of `toScreen` */
     toWorld(x: number, y: number): {
         x: number;
         y: number;

package/dist/two-d/render/Camera.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Camera.d.ts","sourceRoot":"","sources":["../../../src/two-d/render/Camera.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAKpC;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,MAAM,WAAW,aAAa;IAC7B,mCAAmC;IACnC,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;;;;;;;;;;OAWG;IACH,oBAAoB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,qBAAa,MAAM;IAClB,4CAA4C;IAC5C,QAAQ,CAAC,KAAK,8CAAmB;IAEjC,yCAAyC;IACzC,CAAC,SAAK;IACN,CAAC,SAAK;IAEN,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAAS;IAE/C,OAAO,CAAC,SAAS,CAAK;IACtB,OAAO,CAAC,UAAU,CAAK;IAGvB,OAAO,CAAC,OAAO,CAAK;IACpB,OAAO,CAAC,OAAO,CAAK;IAEpB,OAAO,CAAC,YAAY,CAAyC;IAG7D,OAAO,CAAC,eAAe,CAAK;IAE5B,OAAO,CAAC,cAAc,CAAK;IAC3B,OAAO,CAAC,cAAc,CAAK;IAC3B,OAAO,CAAC,aAAa,CAAK;IAC1B,OAAO,CAAC,MAAM,CAAK;IACnB,OAAO,CAAC,MAAM,CAAK;IAEnB,yFAAyF;IACzF,OAAO,CAAC,MAAM,CAA2E;IAEzF,YAAY,OAAO,GAAE,aAAkB,EAKtC;IAED,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED,IAAI,IAAI,CAAC,KAAK,EAAE,MAAM,EAGrB;IAED;;;;;OAKG;IACH,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,SAAI,EAAE,OAAO,SAAI,GAAG,IAAI,CAKzE;IAED,4DAA4D;IAC5D,IAAI,IAAI,IAAI;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAKlE;IAED,oEAAoE;IACpE,SAAS,CAAC,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,GAAG,IAAI,CAEzF;IAED,wEAAwE;IACxE,MAAM,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,IAAI,CAMjC;IAED,kCAAkC;IAClC,KAAK,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,SAAS,SAAI,GAAG,IAAI,CAG/C;IAED,oEAAoE;IACpE,MAAM,CAAC,MAAM,EAAE;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAE,EAAE,SAAS,SAAI,GAAG,IAAI,CAG5D;IAED,aAAa,IAAI,IAAI,CAGpB;IAED,2DAA2D;IAC3D,KAAK,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,SAAM,GAAG,IAAI,CAM7C;IAED,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAoCvB;IAED,mCAAmC;IACnC,QAAQ,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAE,CAUvD;IAED,oEAAoE;IACpE,OAAO,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAE,CAMtD;IAID,OAAO,CAAC,aAAa;IAerB,OAAO,CAAC,KAAK;CAQb;AAMD;;;;;;;;;;;GAWG;AACH,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAG/D;AAED;;;;;;;;;GASG;AACH,wBAAgB,YAAY,CAAC,OAAO,GAAE,aAAkB,GAAG,MAAM,CAMhE"}
+{"version":3,"file":"Camera.d.ts","sourceRoot":"","sources":["../../../src/two-d/render/Camera.ts"],"names":[],"mappings":"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"}