phaneron/Kelsidavis-WoWee
1
0
Fork 0
mirror of https://github.com/Kelsidavis/WoWee.git synced 2026-03-22 23:30:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix: prefer variationIndex=0 run animation and silence spurious compositeWithRegions warns

Browse source 
- character_renderer: playAnimation now prefers the primary variation
  (variationIndex==0) when multiple sequences share the same animation ID;
  this fixes hitching on human female run where a variation sequence was
  selected first before the base cycle
- character_renderer: move the compositeWithRegions size-mismatch warning
  inside the else branch so it only fires when sizes genuinely don't match,
  not for every successful 1:1 or scaled blit
This commit is contained in:
Kelsi 2026-03-11 01:35:37 -07:00
parent f462db6bfa
commit ce36171000
1 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/rendering/character_renderer.cpp
View file

@ -1327,12 +1327,12 @@ VkTexture* CharacterRenderer::compositeWithRegions(const std::string& basePath,
blitOverlay(composite, width, height, overlay, dstX, dstY);
}
} else {
// Size mismatch — blit at natural size (may clip or leave gap)
core::Logger::getInstance().warning("compositeWithRegions: region ", regionIdx,
" at (", dstX, ",", dstY, ") overlay=", overlay.width, "x", overlay.height,
" expected=", expectedW, "x", expectedH, " from ", rl.second);
blitOverlay(composite, width, height, overlay, dstX, dstY);
}
core::Logger::getInstance().warning("compositeWithRegions: region ", regionIdx,
" at (", dstX, ",", dstY, ") overlay=", overlay.width, "x", overlay.height,
" expected=", expectedW, "x", expectedH, " from ", rl.second);
}
// Upload to GPU via VkTexture
@ -1580,12 +1580,20 @@ void CharacterRenderer::playAnimation(uint32_t instanceId, uint32_t animationId,
instance.animationTime = 0.0f;
instance.animationLoop = loop;
// Prefer variationIndex==0 (primary animation); fall back to first match
int firstMatch = -1;
for (size_t i = 0; i < model.sequences.size(); i++) {
if (model.sequences[i].id == animationId) {
instance.currentSequenceIndex = static_cast<int>(i);
break;
if (firstMatch < 0) firstMatch = static_cast<int>(i);
if (model.sequences[i].variationIndex == 0) {
instance.currentSequenceIndex = static_cast<int>(i);
break;
}
}
}
if (instance.currentSequenceIndex < 0 && firstMatch >= 0) {
instance.currentSequenceIndex = firstMatch;
}
if (instance.currentSequenceIndex < 0) {
// Fall back to first sequence