mirror of
https://github.com/Kelsidavis/WoWee.git
synced 2026-04-07 13:43:51 +00:00
b4989dc11f
Replace the 2,200-line monolithic AnimationController (goto-driven, single class, untestable) with a composed FSM architecture per refactor.md. New subsystem (src/rendering/animation/ — 16 headers, 10 sources): - CharacterAnimator: FSM composer implementing ICharacterAnimator - LocomotionFSM: idle/walk/run/sprint/jump/swim/strafe - CombatFSM: melee/ranged/spell cast/stun/hit reaction/charge - ActivityFSM: emote/loot/sit-down/sitting/sit-up - MountFSM: idle/run/flight/taxi/fidget/rear-up (per-instance RNG) - AnimCapabilitySet + AnimCapabilityProbe: probe once at model load, eliminate per-frame hasAnimation() linear search - AnimationManager: registry of CharacterAnimator by GUID - EmoteRegistry: DBC-backed emote command → animId singleton - FootstepDriver, SfxStateDriver: extracted from AnimationController animation_ids.hpp/.cpp moved to animation/ subdirectory (452 named constants); all include paths updated. AnimationController retained as thin adapter (~400 LOC): collects FrameInput, delegates to CharacterAnimator, applies AnimOutput. Priority order: Mount > Stun > HitReaction > Spell > Charge > Melee/Ranged > CombatIdle > Emote > Loot > Sit > Locomotion. STAY_IN_STATE policy when all FSMs return valid=false. Bugs fixed: - Remove static mt19937 in mount fidget (shared state across all mounted units) — replaced with per-instance seeded RNG - Remove goto from mounted animation branch (skipped init) - Remove per-frame hasAnimation() calls (now one probe at load) - Fix VK_INDEX_TYPE_UINT16 → UINT32 in shadow pass Tests (4 new suites, all ASAN+UBSan clean): - test_locomotion_fsm: 167 assertions - test_combat_fsm: 125 cases - test_activity_fsm: 112 cases - test_anim_capability: 56 cases docs/ANIMATION_SYSTEM.md added (architecture reference).
54 lines
1.9 KiB
C++
54 lines
1.9 KiB
C++
#pragma once
|
|
|
|
#include <cstdint>
|
|
#include <glm/glm.hpp>
|
|
|
|
namespace wowee {
|
|
|
|
namespace audio { enum class FootstepSurface : uint8_t; }
|
|
|
|
namespace rendering {
|
|
|
|
class Renderer;
|
|
|
|
// ============================================================================
|
|
// FootstepDriver — extracted from AnimationController
|
|
//
|
|
// Owns animation-driven footstep event detection, surface resolution,
|
|
// and player/mount footstep tracking state.
|
|
// ============================================================================
|
|
class FootstepDriver {
|
|
public:
|
|
FootstepDriver() = default;
|
|
|
|
/// Process footstep events for this frame (called from Renderer::update).
|
|
void update(float deltaTime, Renderer* renderer,
|
|
bool mounted, uint32_t mountInstanceId, bool taxiFlight,
|
|
bool isFootstepState);
|
|
|
|
/// Detect if a footstep event should trigger based on animation phase crossing.
|
|
bool shouldTriggerFootstepEvent(uint32_t animationId, float animationTimeMs,
|
|
float animationDurationMs);
|
|
|
|
/// Resolve the surface type under the character for footstep sound selection.
|
|
audio::FootstepSurface resolveFootstepSurface(Renderer* renderer) const;
|
|
|
|
private:
|
|
// Player footstep event tracking (animation-driven)
|
|
uint32_t footstepLastAnimationId_ = 0;
|
|
float footstepLastNormTime_ = 0.0f;
|
|
bool footstepNormInitialized_ = false;
|
|
|
|
// Footstep surface cache (avoid expensive queries every step)
|
|
mutable audio::FootstepSurface cachedFootstepSurface_{};
|
|
mutable glm::vec3 cachedFootstepPosition_{0.0f, 0.0f, 0.0f};
|
|
mutable float cachedFootstepUpdateTimer_{999.0f};
|
|
|
|
// Mount footstep tracking (separate from player's)
|
|
uint32_t mountFootstepLastAnimId_ = 0;
|
|
float mountFootstepLastNormTime_ = 0.0f;
|
|
bool mountFootstepNormInitialized_ = false;
|
|
};
|
|
|
|
} // namespace rendering
|
|
} // namespace wowee
|