phaneron/Kelsidavis-WoWee
1
0
Fork 0
mirror of https://github.com/Kelsidavis/WoWee.git synced 2026-05-03 08:03:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use speed-based walk/run selection for NPC movement

Browse source 
- choose run only when movement speed is above threshold
- prefer walk for duration-less synthesized movement deltas
- keep animation fallback behavior when specific sequence is unavailable
This commit is contained in:
Kelsi 2026-02-18 03:56:12 -08:00
parent a9d3641d4b
commit 900558e02e
1 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/rendering/character_renderer.cpp
View file

@ -1706,15 +1706,21 @@ void CharacterRenderer::moveInstanceTo(uint32_t instanceId, const glm::vec3& des
// Don't move dead instances (corpses shouldn't slide around) // Don't move dead instances (corpses shouldn't slide around)
if (inst.isDead) return; if (inst.isDead) return;
auto pickMoveAnim = [&]() -> uint32_t { auto pickMoveAnim = [&](bool preferRun) -> uint32_t {
// Prefer run when available to avoid "gliding with attack pose" on chase. // Choose movement anim from estimated speed; fall back if missing.
if (hasAnimation(instanceId, 5)) return 5; // Run if (preferRun) {
if (hasAnimation(instanceId, 4)) return 4; // Walk if (hasAnimation(instanceId, 5)) return 5; // Run
if (hasAnimation(instanceId, 4)) return 4; // Walk
} else {
if (hasAnimation(instanceId, 4)) return 4; // Walk
if (hasAnimation(instanceId, 5)) return 5; // Run
}
return 0; return 0;
}; };
float planarDist = glm::length(glm::vec2(destination.x - inst.position.x, float planarDist = glm::length(glm::vec2(destination.x - inst.position.x,
destination.y - inst.position.y)); destination.y - inst.position.y));
bool synthesizedDuration = false;
if (durationSeconds <= 0.0f) { if (durationSeconds <= 0.0f) {
if (planarDist < 0.01f) { if (planarDist < 0.01f) {
// Stop at current location. // Stop at current location.
@ -1728,6 +1734,7 @@ void CharacterRenderer::moveInstanceTo(uint32_t instanceId, const glm::vec3& des
// Some cores send movement-only deltas without spline duration. // Some cores send movement-only deltas without spline duration.
// Synthesize a tiny duration so movement anim/rotation still updates. // Synthesize a tiny duration so movement anim/rotation still updates.
durationSeconds = std::clamp(planarDist / 7.0f, 0.05f, 0.20f); durationSeconds = std::clamp(planarDist / 7.0f, 0.05f, 0.20f);
synthesizedDuration = true;
} }
inst.moveStart = inst.position; inst.moveStart = inst.position;
@ -1744,7 +1751,10 @@ void CharacterRenderer::moveInstanceTo(uint32_t instanceId, const glm::vec3& des
} }
// Play movement animation while moving. // Play movement animation while moving.
uint32_t moveAnim = pickMoveAnim(); // Prefer run only when speed is clearly above normal walk pace.
float moveSpeed = planarDist / std::max(durationSeconds, 0.001f);
bool preferRun = (!synthesizedDuration && moveSpeed >= 4.5f);
uint32_t moveAnim = pickMoveAnim(preferRun);
if (moveAnim != 0 && inst.currentAnimationId != moveAnim) { if (moveAnim != 0 && inst.currentAnimationId != moveAnim) {
playAnimation(instanceId, moveAnim, true); playAnimation(instanceId, moveAnim, true);
} }