@woosh/meep-engine 2.138.20 → 2.139.0

package/src/engine/control/first-person/prototype_first_person_controller.js

@@ -1,9 +1,13 @@
 import { BoxGeometry, MeshStandardMaterial } from "three";
+import { Ray3 } from "../../../core/geom/3d/ray/Ray3.js";
+import { BoxShape3D } from "../../../core/geom/3d/shape/BoxShape3D.js";
+import { CapsuleShape3D } from "../../../core/geom/3d/shape/CapsuleShape3D.js";
 import Vector2 from "../../../core/geom/Vector2.js";
 import Vector3 from "../../../core/geom/Vector3.js";
 import { SerializationMetadata } from "../../ecs/components/SerializationMetadata.js";
 import { Tag } from "../../ecs/components/Tag.js";
 import Entity from "../../ecs/Entity.js";
+import { obtainTerrain } from "../../ecs/terrain/util/obtainTerrain.js";
 import { Transform } from "../../ecs/transform/Transform.js";
 import { EngineHarness } from "../../EngineHarness.js";
 import { CameraSystem } from "../../graphics/ecs/camera/CameraSystem.js";
@@ -12,11 +16,29 @@ import { ShadedGeometryFlags } from "../../graphics/ecs/mesh-v2/ShadedGeometryFl
 import { ShadedGeometrySystem } from "../../graphics/ecs/mesh-v2/ShadedGeometrySystem.js";
 import InputController from "../../input/ecs/components/InputController.js";
 import InputControllerSystem from "../../input/ecs/systems/InputControllerSystem.js";
+import { BodyKind } from "../../physics/ecs/BodyKind.js";
+import { Collider } from "../../physics/ecs/Collider.js";
+import { ColliderObserverSystem } from "../../physics/ecs/ColliderObserverSystem.js";
+import { PhysicsSystem } from "../../physics/ecs/PhysicsSystem.js";
+import { RigidBody } from "../../physics/ecs/RigidBody.js";
+import { PhysicsSurfacePoint } from "../../physics/queries/PhysicsSurfacePoint.js";
+import { LedgeGrab } from "./abilities/LedgeGrab.js";
+import { Mantle } from "./abilities/Mantle.js";
+import { Slide } from "./abilities/Slide.js";
+import { WallJump } from "./abilities/WallJump.js";
+import { WallRun } from "./abilities/WallRun.js";
 import { FirstPersonPlayerController } from "./FirstPersonPlayerController.js";
 import { FirstPersonPlayerControllerSystem } from "./FirstPersonPlayerControllerSystem.js";
+import { BreathRhythmEvaluator } from "./mastery/BreathRhythmEvaluator.js";
+import { DecisionPoint } from "./mastery/DecisionPoint.js";
+import { FootAsymmetryTurnEvaluator } from "./mastery/FootAsymmetryTurnEvaluator.js";
+import { SlideInitiationTimingEvaluator } from "./mastery/SlideInitiationTimingEvaluator.js";
+import { StrideTimingJumpEvaluator } from "./mastery/StrideTimingJumpEvaluator.js";
+import { FirstPersonSensorsSystem } from "./sensors/FirstPersonSensorsSystem.js";
 
 /**
- * Prototype harness for {@link FirstPersonPlayerController}.
+ * Prototype harness for {@link FirstPersonPlayerController} — a parkour
+ * "gym" laid out as discrete test stations around the spawn point.
  *
  * Controls:
  *   - Click to capture mouse (pointer lock); ESC to release
@@ -24,12 +46,38 @@ import { FirstPersonPlayerControllerSystem } from "./FirstPersonPlayerController
  *   - Mouse      — look
  *   - Space      — jump (tap; holding does not auto-repeat)
  *   - Shift      — sprint (hold while moving forward)
- *   - C          — crouch (hold)
+ *   - C          — crouch (hold; sprint+crouch press → slide)
  *
- * Scene: a flat ground at y=0 with a handful of coloured cubes for spatial
- * reference, lit by the harness's default sun.
+ * Stations (compass directions from spawn):
+ *
+ *   N  Mantle row         four obstacles from too-low to too-tall
+ *   NE Slide tunnel       sprint run-up + low ceiling
+ *   E  Wall-run wall      one long wall to run alongside
+ *   SE Gap jump           raised platforms with a gap to clear
+ *   S  Ledge-grab wall    too tall to mantle; jump + catch the lip
+ *   SW (open)
+ *   W  Wall-jump chimney  two parallel walls for back-and-forth jumps
+ *   NW (open)
+ *
+ * Each station is colour-coded at the entrance. Look around: the
+ * coloured pad on the ground tells you what's there.
+ *
+ * @author Alex Goldring
+ * @copyright Company Named Limited (c) 2026
  */
 
+const SPAWN_X = 100;
+const SPAWN_Z = 100;
+
+// Station palette — used for entry pads + matching obstacle colour.
+const COLOR_MANTLE = 0x55ff55;
+const COLOR_WALLRUN = 0xff5555;
+const COLOR_WALLJUMP = 0xaa55ff;
+const COLOR_LEDGE = 0xffaa44;
+const COLOR_SLIDE = 0x44ddee;
+const COLOR_GAP = 0xff66cc;
+const COLOR_NEUTRAL = 0xaaaaaa;
+
 const eh = new EngineHarness();
 
 async function main(engine) {
@@ -43,6 +91,8 @@ async function main(engine) {
         engine,
         sunIntensity: 1.0,
         ambientIntensity: 0.25,
+        shadowmapResolution: 2048,
+        sunShadowDistance: 30,
     });
 
     if (em.getSystem(CameraSystem) === null) {
@@ -55,11 +105,30 @@ async function main(engine) {
         await em.addSystem(new ShadedGeometrySystem(engine));
     }
 
+    // Physics — owns RigidBody+Collider lifecycle, fires contact events,
+    // and serves spatial queries (raycast). Sensors and the ground
+    // resolver both go through it. Added BEFORE the controller so the
+    // sensors and ground resolver find it in their startup auto-acquire.
+    const physicsSystem = new PhysicsSystem();
+    await em.addSystem(physicsSystem);
+    // ColliderObserver wires Collider components into PhysicsSystem
+    // bodies as entities are built. Without it, every collider would
+    // need an explicit attach_collider call.
+    await em.addSystem(new ColliderObserverSystem(physicsSystem));
+
     const fpsSystem = new FirstPersonPlayerControllerSystem();
-    fpsSystem.useBuiltInFlatGround = true;
-    fpsSystem.groundY = 0;
+    // Built-in flat-ground OFF — the gym uses the physics-backed ground
+    // resolver below (which finds the highest static surface under the
+    // player from BVH raycasts). Leaving the flat baseline on would
+    // pin the player to y=0 even when standing on a 2 m platform.
+    fpsSystem.useBuiltInFlatGround = false;
     await em.addSystem(fpsSystem);
 
+    // Sensors system — populates wall/obstacle/ledge probes via
+    // PhysicsSystem.raycast. Auto-acquires the physics system in startup.
+    const sensorsSystem = new FirstPersonSensorsSystem();
+    await em.addSystem(sensorsSystem);
+
     if (!ecd.isComponentTypeRegistered(Tag)) {
         ecd.registerComponentType(Tag);
     }
@@ -76,11 +145,22 @@ async function main(engine) {
         diffuse0: "data/textures/materials/terrain_township_set/512/Grass_3.png",
     });
 
-    addReferenceMarkers(ecd);
+    obtainTerrain(ecd); // no-op call to ensure terrain is built
+
+    buildGym(ecd);
 
     // -- Player ----------------------------------------------------------
     const player = buildPlayerEntity(ecd);
 
+    // Ground resolver: downward raycast through PhysicsSystem, filtered
+    // to exclude the player's own capsule. Wired AFTER the player is
+    // built so the filter has the right entity id. The controller's
+    // vertical integrator falls through when the resolver returns null
+    // (no platform below) — set up with `useBuiltInFlatGround = false`
+    // above so that means actual airborne / void, not a hidden y=0
+    // safety floor.
+    fpsSystem.groundResolver = makePhysicsGroundResolver(physicsSystem, player.entity);
+
     // -- Inputs ----------------------------------------------------------
     buildInputBindings(ecd, player);
 
@@ -89,26 +169,461 @@ async function main(engine) {
     logHelp();
 }
 
+/**
+ * Downward-raycast ground resolver, backed by {@link PhysicsSystem.raycast}.
+ * Each call: from just above the player's feet, cast straight down
+ * through static + dynamic broadphase; filter out the player's own
+ * body; return the hit y, or null if no surface below.
+ *
+ * The controller's vertical integrator picks max(useBuiltInFlatGround,
+ * resolver). In the gym we leave useBuiltInFlatGround off so the
+ * resolver is the sole source of truth — gaps in the floor are real
+ * gaps (the player falls into them).
+ *
+ * @param {PhysicsSystem} physicsSystem
+ * @param {number} playerEntity  excluded from raycasts to skip the player capsule
+ * @returns {(x:number, y:number, z:number) => number|null}
+ */
+function makePhysicsGroundResolver(physicsSystem, playerEntity) {
+    // Probe starts slightly above the player feet so a grounded player
+    // standing right on a platform still raycasts cleanly. Length is
+    // longer than any reasonable gym platform.
+    const PROBE_LIFT = 0.1;
+    const PROBE_DOWN = 50;
+    const filter = (entity) => entity !== playerEntity;
+    // Reuse a single ray and surface-point across calls — the resolver
+    // can fire many times per frame as the controller hunts for foothold.
+    const ray = Ray3.from(0, 0, 0, 0, -1, 0, PROBE_DOWN);
+    const hit = new PhysicsSurfacePoint();
+    return function physicsGroundResolver(x, y, z) {
+        ray.setOrigin(x, y + PROBE_LIFT, z);
+        if (!physicsSystem.raycast(ray, hit, filter)) return null;
+        // Direction is unit (0,-1,0); t is the distance to the surface
+        // along that direction. Surface Y = origin Y minus t.
+        return (y + PROBE_LIFT) - hit.t;
+    };
+}
+
+// =====================================================================
+// Gym construction
+// =====================================================================
+
+function buildGym(ecd) {
+    buildGroundPlane(ecd);
+    buildSpawnPlaza(ecd);
+    buildMantleStation(ecd);
+    buildWallRunStation(ecd);
+    buildWallJumpChimney(ecd);
+    buildLedgeGrabStation(ecd);
+    buildSlideTunnel(ecd);
+    buildGapJumpStation(ecd);
+}
+
+/**
+ * Reference markers around spawn so motion is visually obvious — a ring
+ * of coloured cubes (circle-strafe targets) and a few tall pillars at
+ * radius 22 for parallax-at-distance.
+ */
+function buildSpawnPlaza(ecd) {
+    const unitCubeGeom = new BoxGeometry(1, 1, 1);
+    const palette = [
+        0xff5555, 0x55ff55, 0x5577ff, 0xffaa44,
+        0xaa55ff, 0x44ddee, 0xff66cc, 0x66ffcc,
+    ];
+
+    // Inner ring at radius 6 — close enough to circle-strafe around.
+    const RING_N = 8;
+    for (let i = 0; i < RING_N; i++) {
+        const a = (i / RING_N) * Math.PI * 2;
+        spawnBox(ecd, {
+            center: new Vector3(SPAWN_X + Math.cos(a) * 6, 0.5, SPAWN_Z + Math.sin(a) * 6),
+            size: new Vector3(1, 1, 1),
+            geometry: unitCubeGeom,
+            color: palette[i % palette.length],
+        });
+    }
+
+    // Tall pillars further out — parallax depth perception when running.
+    const pillarGeom = new BoxGeometry(1, 6, 1);
+    const PILLAR_N = 6;
+    for (let i = 0; i < PILLAR_N; i++) {
+        const a = (i / PILLAR_N) * Math.PI * 2 + 0.3;
+        const r = 22;
+        spawnBox(ecd, {
+            center: new Vector3(SPAWN_X + Math.cos(a) * r, 3, SPAWN_Z + Math.sin(a) * r),
+            size: new Vector3(1, 6, 1),
+            geometry: pillarGeom,
+            color: 0x888888,
+            roughness: 0.9,
+        });
+    }
+}
+
+/**
+ * Mantle row — directly north of spawn. Four obstacles in line, heights
+ * stepping past the mantle range:
+ *
+ *   - 0.6m: well within mantle range; lowest "step-up" test
+ *   - 1.0m: mid mantle range
+ *   - 1.3m: near top of mantle range
+ *   - 2.0m: too tall to mantle from the ground (heightDiff > maxHeight)
+ *
+ * The 2.0m block is also the canonical "LedgeGrab if you jump at it"
+ * candidate, but the dedicated LedgeGrab station to the south has a
+ * cleaner approach path.
+ */
+function buildMantleStation(ecd) {
+    const baseZ = SPAWN_Z + 15;
+    spawnPad(ecd, SPAWN_X, baseZ - 3, COLOR_MANTLE);
+
+    const heights = [0.6, 1.0, 1.3, 2.0];
+    for (let i = 0; i < heights.length; i++) {
+        const h = heights[i];
+        spawnBox(ecd, {
+            center: new Vector3(SPAWN_X, h / 2, baseZ + i * 5),
+            size: new Vector3(3, h, 1),
+            color: COLOR_MANTLE,
+            roughness: 0.6,
+        });
+    }
+}
+
+/**
+ * Wall-run wall — a long wall on the east side. Player runs east past
+ * spawn, jumps near the wall, runs along it.
+ *
+ * Two walls actually — left and right — so the player can wall-run on
+ * either side without needing to circle back.
+ */
+function buildWallRunStation(ecd) {
+    const baseX = SPAWN_X + 15;
+    spawnPad(ecd, baseX - 3, SPAWN_Z, COLOR_WALLRUN);
+
+    // South wall (run along its north face).
+    spawnBox(ecd, {
+        center: new Vector3(baseX + 5, 2, SPAWN_Z - 2),
+        size: new Vector3(10, 4, 0.5),
+        color: COLOR_WALLRUN,
+        roughness: 0.6,
+    });
+    // North wall (run along its south face) — separated by 4m so the
+    // wall-runner picks one side, not both.
+    spawnBox(ecd, {
+        center: new Vector3(baseX + 5, 2, SPAWN_Z + 2),
+        size: new Vector3(10, 4, 0.5),
+        color: COLOR_WALLRUN,
+        roughness: 0.6,
+    });
+}
+
+/**
+ * Wall-jump chimney — two parallel walls on the west side, ~3m apart,
+ * 6m tall. Player walks into the gap, jumps, hits one wall, wall-jumps
+ * to the other side. Repeat to climb.
+ *
+ * The walls are wide enough that wall-jumping straight back to the
+ * other side stays inside the chimney.
+ */
+function buildWallJumpChimney(ecd) {
+    const baseX = SPAWN_X - 15;
+    spawnPad(ecd, baseX + 3, SPAWN_Z, COLOR_WALLJUMP);
+
+    // North wall of the chimney (pushes south).
+    spawnBox(ecd, {
+        center: new Vector3(baseX - 2, 3, SPAWN_Z + 2),
+        size: new Vector3(4, 6, 0.5),
+        color: COLOR_WALLJUMP,
+        roughness: 0.6,
+    });
+    // South wall of the chimney (pushes north). 3m gap to the north wall.
+    spawnBox(ecd, {
+        center: new Vector3(baseX - 2, 3, SPAWN_Z - 1.25),
+        size: new Vector3(4, 6, 0.5),
+        color: COLOR_WALLJUMP,
+        roughness: 0.6,
+    });
+}
+
+/**
+ * Ledge-grab station — a single 2m-tall wall just south of spawn.
+ * Too tall to mantle from the ground (heightDiff = 2 > maxHeight 1.4),
+ * but the player can run-jump at it and catch the lip on descent:
+ *
+ *   1. sprint south
+ *   2. jump just before the wall
+ *   3. on the way down, chest probe hits the wall face;
+ *      ledgeAhead probe finds the top → LedgeGrab fires
+ *   4. press jump to chain into Mantle (mantle-up release)
+ *
+ * The wall is 6m wide so the player doesn't have to aim perfectly.
+ */
+function buildLedgeGrabStation(ecd) {
+    const baseZ = SPAWN_Z - 15;
+    spawnPad(ecd, SPAWN_X, baseZ + 3, COLOR_LEDGE);
+
+    spawnBox(ecd, {
+        center: new Vector3(SPAWN_X, 1.0, baseZ - 1),
+        size: new Vector3(6, 2.0, 2),
+        color: COLOR_LEDGE,
+        roughness: 0.6,
+    });
+
+    // A larger top-of-wall platform behind the lip, so once the player
+    // climbs up they have somewhere to stand and look around.
+    spawnBox(ecd, {
+        center: new Vector3(SPAWN_X, 1.0, baseZ - 4.5),
+        size: new Vector3(6, 2.0, 5),
+        color: COLOR_LEDGE,
+        roughness: 0.6,
+    });
+}
+
+/**
+ * Slide tunnel — a sprint run-up followed by a low ceiling that forces
+ * the player to slide under. NE of spawn.
+ *
+ * Layout: a long flat lane (just an entry pad / marker, ground is
+ * already flat), with an overhead box at 1m height. Approaching at
+ * sprint + crouch press → slide → fits under the gap.
+ */
+function buildSlideTunnel(ecd) {
+    const baseX = SPAWN_X + 11;
+    const baseZ = SPAWN_Z + 11;
+    spawnPad(ecd, baseX, baseZ, COLOR_SLIDE);
+
+    // The "ceiling" — a slab suspended 1.0m above the ground. Sliding
+    // brings the eye height down to ~0.4m; standing-eye-height would
+    // collide.
+    spawnBox(ecd, {
+        center: new Vector3(baseX + 4, 1.5, baseZ + 4),
+        size: new Vector3(4, 1.0, 4),
+        color: COLOR_SLIDE,
+        roughness: 0.6,
+    });
+
+    // Side pillars to make the tunnel feel like a tunnel.
+    spawnBox(ecd, {
+        center: new Vector3(baseX + 4, 1.0, baseZ + 2.0),
+        size: new Vector3(4, 2.0, 0.5),
+        color: COLOR_SLIDE,
+        roughness: 0.7,
+    });
+    spawnBox(ecd, {
+        center: new Vector3(baseX + 4, 1.0, baseZ + 6.0),
+        size: new Vector3(4, 2.0, 0.5),
+        color: COLOR_SLIDE,
+        roughness: 0.7,
+    });
+}
+
+/**
+ * Gap jump — two elevated platforms with a 3m gap between them. Player
+ * approaches via a mantle stair, runs across the first platform,
+ * sprints + jumps the gap.
+ *
+ * The platforms sit 1.5m above the spawn ground (mantleable). The gap
+ * doesn't actually break the floor — landing flat would still catch
+ * the player on the y=0 floor below. That's fine for testing the
+ * mid-flight feel of a jump; survival of misses is a feature here.
+ */
+function buildGapJumpStation(ecd) {
+    const baseX = SPAWN_X + 11;
+    const baseZ = SPAWN_Z - 11;
+    spawnPad(ecd, baseX, baseZ, COLOR_GAP);
+
+    // Approach mantle (step up to the first platform).
+    spawnBox(ecd, {
+        center: new Vector3(baseX + 2, 0.5, baseZ - 2),
+        size: new Vector3(2, 1.0, 2),
+        color: COLOR_GAP,
+        roughness: 0.7,
+    });
+
+    // First platform — 4m long along Z.
+    spawnBox(ecd, {
+        center: new Vector3(baseX + 5, 0.75, baseZ - 4),
+        size: new Vector3(4, 1.5, 4),
+        color: COLOR_GAP,
+        roughness: 0.6,
+    });
+
+    // Second platform — same height, 3m gap.
+    spawnBox(ecd, {
+        center: new Vector3(baseX + 5, 0.75, baseZ - 11),
+        size: new Vector3(4, 1.5, 4),
+        color: COLOR_GAP,
+        roughness: 0.6,
+    });
+}
+
+// =====================================================================
+// Spawn helpers
+// =====================================================================
+
+/**
+ * Add a box-shaped obstacle to the world. Position is the box centre.
+ *
+ * Single entity carrying both visual (ShadedGeometry) and physical
+ * (RigidBody + Collider) representations so the player can stand on it,
+ * sensors can raycast against it, and dynamic crates (when added) bump
+ * off it. Bodies are {@link BodyKind.Static} — gym geometry never moves.
+ *
+ * @param {EntityComponentDataset} ecd
+ * @param {object} p
+ * @param {Vector3} p.center
+ * @param {Vector3} p.size       w, h, d (box dimensions)
+ * @param {number} p.color
+ * @param {number} [p.roughness]
+ * @param {THREE.BufferGeometry} [p.geometry]   reuse to avoid new geometry per spawn
+ * @param {string} [p.tag]
+ * @param {boolean} [p.collide]   default true; set false for decorative pads
+ */
+function spawnBox(ecd, { center, size, color, roughness = 0.7, geometry, tag = "GymObstacle", collide = true }) {
+    const geom = geometry !== undefined ? geometry : new BoxGeometry(size.x, size.y, size.z);
+    const material = new MeshStandardMaterial({ color, roughness });
+    const sg = ShadedGeometry.from(geom, material);
+    sg.setFlag(ShadedGeometryFlags.CastShadow);
+    sg.setFlag(ShadedGeometryFlags.ReceiveShadow);
+    sg.setFlag(ShadedGeometryFlags.Visible);
+
+    const transform = new Transform();
+    transform.position.copy(center);
+
+    const eb = new Entity()
+        .add(sg)
+        .add(Tag.fromJSON([tag]))
+        .add(SerializationMetadata.Transient);
+
+    if (collide) {
+        const rigidBody = new RigidBody();
+        rigidBody.kind = BodyKind.Static;
+        const collider = new Collider();
+        // BoxShape3D with explicit half-extents — routes through the
+        // closed-form sphere-box / box-box / capsule-box narrowphase paths
+        // instead of degenerating into GJK+EPA, which is unreliable on
+        // smooth-surface pairs like capsule-vs-box.
+        collider.shape = BoxShape3D.from_size(size.x, size.y, size.z);
+        // Transform is added LAST so the (RigidBody, Transform) tuple
+        // completes only after the body is present — PhysicsSystem.link
+        // is the trigger, not the rigidBody add.
+        eb.add(rigidBody).add(collider).add(transform).build(ecd);
+    } else {
+        eb.add(transform).build(ecd);
+    }
+}
+
+/**
+ * Lay a thin coloured "entry pad" on the ground at (x, z). Visual
+ * landmark only — flush with the floor, no collision (a 5 cm-thick
+ * static body in the player's walking path would bump the camera).
+ */
+function spawnPad(ecd, x, z, color) {
+    spawnBox(ecd, {
+        center: new Vector3(x, 0.025, z),
+        size: new Vector3(4, 0.05, 4),
+        color,
+        roughness: 0.95,
+        tag: "GymEntryPad",
+        collide: false,
+    });
+}
+
+/**
+ * Lay a physics-only ground body underneath the entire gym so the
+ * player has something to stand on. The terrain mesh provides the
+ * grass visual at y=0; this is its physics counterpart (the player
+ * controller's vertical integrator and sensors only look at physics
+ * bodies, not the terrain heightfield).
+ *
+ * Sized to comfortably encompass all stations (the gym spans ~30 m
+ * radius around spawn). The slab top sits at y=0 — same as the
+ * terrain visual — so standing on it puts the player's feet on the
+ * grass.
+ */
+function buildGroundPlane(ecd) {
+    const SIZE = 120;
+    const THICKNESS = 1.0;
+
+    const rigidBody = new RigidBody();
+    rigidBody.kind = BodyKind.Static;
+    const collider = new Collider();
+    collider.shape = BoxShape3D.from_size(SIZE, THICKNESS, SIZE);
+
+    const transform = new Transform();
+    // Top face at y=0 → centre at y = -thickness/2.
+    transform.position.set(SPAWN_X, -THICKNESS / 2, SPAWN_Z);
+
+    new Entity()
+        .add(rigidBody)
+        .add(collider)
+        .add(Tag.fromJSON(["GymGroundPlane"]))
+        .add(SerializationMetadata.Transient)
+        .add(transform)
+        .build(ecd);
+}
+
+// =====================================================================
+// Player + input
+// =====================================================================
+
 /**
  * @param {EntityComponentDataset} ecd
  * @returns {{entity:number, controller:FirstPersonPlayerController}}
  */
 function buildPlayerEntity(ecd) {
     const transform = new Transform();
-    // Spawn standing on the ground (body origin sits at the feet)
-    transform.position.set(100, 0, 100);
+    // Spawn standing on the ground at the centre of the plaza.
+    transform.position.set(SPAWN_X, 0, SPAWN_Z);
 
     const controller = new FirstPersonPlayerController();
-    // Most tuning lives at config defaults; mass-tweak example shown for
-    // documentation. Comment out for the default soldier feel.
-    // controller.config.body.mass = 120;
-    // controller.config.bob.verticalAmpAtWalk = 0.08;
 
+    // Movement abilities (priority order — see DESIGN_EXTENSIONS §2.2):
+    //   Slide(10) < Mantle(30) < LedgeGrab(40) < WallRun(50) < WallJump(60).
+    controller.abilities.add(new Slide());
+    controller.abilities.add(new Mantle());
+    controller.abilities.add(new LedgeGrab());
+    controller.abilities.add(new WallRun());
+    controller.abilities.add(new WallJump());
+
+    // Mastery evaluators — small bonuses/penalties tied to gait phase,
+    // foot asymmetry, and breath rhythm. Each fires on one (or a few)
+    // DecisionPoint(s); contributions compose multiplicatively.
+    controller.mastery.add(new StrideTimingJumpEvaluator());
+    controller.mastery.add(new SlideInitiationTimingEvaluator());
+    controller.mastery.add(new FootAsymmetryTurnEvaluator());
+    controller.mastery.add(new BreathRhythmEvaluator());
+    controller.mastery.add(new BreathRhythmEvaluator({
+        decisionPoints: [DecisionPoint.GroundAccel],
+        peakBonus: 0.015,
+        troughPenalty: 0.005,
+        requireExertionAbove: 0.3,
+    }));
+
+    // Kinematic capsule body: the controller writes Transform directly,
+    // physics derives velocity from the per-step delta. Capsule centred
+    // on the Transform — bottom hemisphere extends below the feet (this
+    // is fine for spatial queries since sensor probes start at chest
+    // height and the ground resolver filters out the player's own body).
+    const bodyCfg = controller.config.body;
+    const radius = bodyCfg.radius;
+    const totalHeight = bodyCfg.height; // standing eye height ≈ body extent
+    const cylinderHeight = Math.max(0, totalHeight - 2 * radius);
+    const rigidBody = new RigidBody();
+    rigidBody.kind = BodyKind.KinematicPosition;
+    rigidBody.mass = bodyCfg.mass;
+    const collider = new Collider();
+    collider.shape = CapsuleShape3D.from(radius, cylinderHeight);
+
+    // Build order matters: Transform is added LAST so the FirstPerson
+    // controller system's link() sees the RigidBody already attached.
+    // (Same pattern as the spec helpers.)
     const eb = new Entity()
-        .add(transform)
         .add(controller)
+        .add(rigidBody)
+        .add(collider)
         .add(Tag.fromJSON(["Player"]))
-        .add(SerializationMetadata.Transient);
+        .add(SerializationMetadata.Transient)
+        .add(transform);
 
     eb.build(ecd);
 
@@ -116,9 +631,7 @@ function buildPlayerEntity(ecd) {
 }
 
 /**
- * Wire keyboard + mouse to the controller's intent surface. Uses the same
- * `InputController` plumbing as the orbital-camera controller, so the
- * standard `InputControllerSystem` does the device subscription bookkeeping.
+ * Wire keyboard + mouse to the controller's intent surface.
  *
  * @param {EntityComponentDataset} ecd
  * @param {{entity:number, controller:FirstPersonPlayerController}} player
@@ -128,14 +641,9 @@ function buildInputBindings(ecd, player) {
     const intent = player.controller.intent;
 
     // Mouse sensitivity — radians of view rotation per pixel of mouse delta.
-    // ~1200px sweep = one full 360° turn. Comparable to Source-engine
-    // "sensitivity 2" at 800 DPI; calmer than typical web demos.
     const SENSITIVITY = (Math.PI * 2) / 1200;
 
     // -- WASD movement --------------------------------------------------
-    // Keep a small "held" mirror so we can recompute intent.move whenever
-    // any of the four keys change. We can't read intent.move directly
-    // because both keys can be pressed simultaneously.
     const held = { w: false, a: false, s: false, d: false };
 
     function recomputeMove() {
@@ -148,15 +656,22 @@ function buildInputBindings(ecd, player) {
     }
 
     function bindMoveKey(key, prop) {
-        ic.bind(`keyboard/keys/${key}/down`, () => { held[prop] = true; recomputeMove(); });
-        ic.bind(`keyboard/keys/${key}/up`, () => { held[prop] = false; recomputeMove(); });
+        ic.bind(`keyboard/keys/${key}/down`, () => {
+            held[prop] = true;
+            recomputeMove();
+        });
+        ic.bind(`keyboard/keys/${key}/up`, () => {
+            held[prop] = false;
+            recomputeMove();
+        });
     }
+
     bindMoveKey("w", "w");
     bindMoveKey("a", "a");
     bindMoveKey("s", "s");
     bindMoveKey("d", "d");
 
-    // -- Jump (hold-state; the system does the edge detection) -----------
+    // -- Jump ------------------------------------------------------------
     ic.bind("keyboard/keys/space/down", () => { intent.jump = true; });
     ic.bind("keyboard/keys/space/up", () => { intent.jump = false; });
 
@@ -169,16 +684,11 @@ function buildInputBindings(ecd, player) {
     ic.bind("keyboard/keys/c/up", () => { intent.crouch = false; });
 
     // -- Mouse look ------------------------------------------------------
-    // Only accumulate look delta while the pointer is captured — otherwise
-    // moving the cursor over the page would steer the camera, which is
-    // jarring before the user has "claimed" the input surface.
     ic.bind("pointer/on/move", (position, event, delta) => {
         if (document.pointerLockElement === null) return;
         intent.look._add(delta.x * SENSITIVITY, delta.y * SENSITIVITY);
     });
 
-    // When the InputController unlinks (e.g. system shutdown), zero
-    // everything so a held key doesn't get stuck.
     ic.on.unlinked.add(() => {
         intent.move.set(0, 0);
         intent.look.set(0, 0);
@@ -200,10 +710,6 @@ function buildInputBindings(ecd, player) {
  */
 function setupPointerLock(engine) {
     const el = engine.graphics.domElement;
-
-    // The harness wires the engine into the page body via viewStack; the
-    // canvas is the actual pointer-lock target. Listen on the viewStack
-    // element so clicks anywhere inside the canvas trigger the request.
     const captureEl = engine.viewStack.el;
 
     captureEl.addEventListener("click", () => {
@@ -212,98 +718,23 @@ function setupPointerLock(engine) {
         }
     });
 
-    // Suppress the right-click context menu so the canvas stays usable.
     captureEl.addEventListener("contextmenu", (e) => e.preventDefault());
 }
 
-/**
- * Spawn a handful of marker entities around the player so motion is
- * visually obvious. All markers go through the standard ECS pipeline
- * (Transform + ShadedGeometry) — same path as gameplay geometry — so
- * shadows and lighting work correctly.
- *
- * @param {EntityComponentDataset} ecd
- */
-function addReferenceMarkers(ecd) {
-    const SPAWN_X = 100, SPAWN_Z = 100;
-
-    // Share one unit-cube geometry across the ring cubes — cheap and lets
-    // the renderer's instancing path kick in if it wants.
-    const unitCubeGeom = new BoxGeometry(1, 1, 1);
-    const palette = [0xff5555, 0x55ff55, 0x5577ff, 0xffaa44, 0xaa55ff, 0x44ddee, 0xff66cc, 0x66ffcc];
-
-    // Ring of coloured cubes at radius 6 — circle-strafe targets.
-    const RING_N = 8;
-    for (let i = 0; i < RING_N; i++) {
-        const a = (i / RING_N) * Math.PI * 2;
-        spawnMarker({
-            ecd,
-            geometry: unitCubeGeom,
-            color: palette[i % palette.length],
-            roughness: 0.8,
-            position: new Vector3(SPAWN_X + Math.cos(a) * 6, 0.5, SPAWN_Z + Math.sin(a) * 6),
-        });
-    }
-
-    // Tall pillars further out — for parallax depth-perception while
-    // testing bob and breath at distance.
-    const pillarGeom = new BoxGeometry(1, 6, 1);
-    const PILLAR_N = 6;
-    for (let i = 0; i < PILLAR_N; i++) {
-        const a = (i / PILLAR_N) * Math.PI * 2 + 0.3;
-        const r = 22;
-        spawnMarker({
-            ecd,
-            geometry: pillarGeom,
-            color: 0x888888,
-            roughness: 0.9,
-            position: new Vector3(SPAWN_X + Math.cos(a) * r, 3, SPAWN_Z + Math.sin(a) * r),
-        });
-    }
-
-    // A low platform next to spawn — easy hop target, plus a chance to see
-    // the landing dip when stepping back down.
-    spawnMarker({
-        ecd,
-        geometry: new BoxGeometry(2, 0.4, 2),
-        color: 0xddddee,
-        roughness: 0.7,
-        position: new Vector3(SPAWN_X + 3, 0.2, SPAWN_Z),
-    });
-}
-
-/**
- * @param {object} p
- * @param {EntityComponentDataset} p.ecd
- * @param {THREE.BufferGeometry} p.geometry
- * @param {number} p.color  Hex color, e.g. 0xff5555
- * @param {number} [p.roughness]
- * @param {Vector3} p.position
- */
-function spawnMarker({ ecd, geometry, color, roughness = 0.8, position }) {
-    const material = new MeshStandardMaterial({ color, roughness });
-    const sg = ShadedGeometry.from(geometry, material);
-    sg.setFlag(ShadedGeometryFlags.CastShadow);
-    sg.setFlag(ShadedGeometryFlags.ReceiveShadow);
-    sg.setFlag(ShadedGeometryFlags.Visible);
-
-    const transform = new Transform();
-    transform.position.copy(position);
-
-    new Entity()
-        .add(transform)
-        .add(sg)
-        .add(Tag.fromJSON(["ReferenceMarker"]))
-        .add(SerializationMetadata.Transient)
-        .build(ecd);
-}
-
 function logHelp() {
     /* eslint-disable no-console */
-    console.log("%cFirstPersonPlayerController prototype",
+    console.log("%cFirstPersonPlayerController — Parkour Gym",
         "color:#88ddff;font-weight:bold;font-size:14px");
     console.log("Click the canvas to capture mouse. ESC to release.");
     console.log("WASD = move | Mouse = look | Space = jump | Shift = sprint | C = crouch");
+    console.log("");
+    console.log("%cStations:", "font-weight:bold");
+    console.log("  N  Mantle row — four obstacles, last one is too tall");
+    console.log("  NE Slide tunnel — sprint + C to slide under the low ceiling");
+    console.log("  E  Wall-run — sprint along, jump near the wall");
+    console.log("  SE Gap jump — mantle up the stair, sprint, jump the gap");
+    console.log("  S  Ledge-grab — too tall to mantle; jump at it, catch the lip");
+    console.log("  W  Wall-jump chimney — alternate walls to climb");
 }
 
 async function init() {