mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-10-14 07:17:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix actor viewer animation offsetting.

Browse Source 
Fix attack animation drifts.

This was SVN commit r7612.
This commit is contained in:
Ykkrosh
2010-06-05 22:23:28 +00:00
parent 5982c07002
commit 23c92b7fe3
11 changed files with 54 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/graphics/UnitAnimation.cpp
+5 -2
View File
@@ -100,10 +100,13 @@ void CUnitAnimation::SetAnimationState(const CStr& name, bool once, float speed,
ReloadUnit();
}
void CUnitAnimation::SetAnimationSync(float actionTime, float repeatTime)
void CUnitAnimation::SetAnimationSyncRepeat(float repeatTime)
{
m_SyncRepeatTime = repeatTime;
}
void CUnitAnimation::SetAnimationSyncOffset(float actionTime)
{
// Update all the synced prop models to each coincide with actionTime
for (std::vector<SModelAnimState>::iterator it = m_AnimStates.begin(); it != m_AnimStates.end(); ++it)
{
@@ -119,7 +122,7 @@ void CUnitAnimation::SetAnimationSync(float actionTime, float repeatTime)
if (!hasActionPos)
continue;
float speed = duration / repeatTime;
float speed = duration / m_SyncRepeatTime;
// Need to offset so that start+actionTime*speed = actionPos
float start = actionPos - actionTime*speed;