martin/AnimTestbed
1
0
Fork 0
Code Issues 11 Pull Requests Projects 1 Releases Wiki Activity

WIP transition to using sync track based synchronisation.

Browse Source
This commit is contained in:
Martin Felis
2021-11-19 12:40:14 +01:00
parent e2959aaed3
commit db3095fa07
16 changed files with 345 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/AnimNodes/BlendNode.h
+15 -6
View File
@@ -35,9 +35,9 @@ struct BlendNode : public AnimNode {
m_input_A->UpdateIsSynced(m_is_time_synced);
}
virtual void EvalAnimDuration() override {
virtual void UpdateSyncTrack() override {
if (m_is_time_synced) {
m_anim_duration = (1.0f - m_weight) * m_input_A->m_anim_duration + m_weight * m_input_B->m_anim_duration;
m_sync_track = SyncTrack::Blend(m_weight, m_input_A->m_sync_track, m_input_B->m_sync_track);
} else {
assert (false);
}
@@ -45,11 +45,20 @@ struct BlendNode : public AnimNode {
virtual void UpdateTime(float dt) {
if (m_is_time_synced) {
float current_time_absolute = m_current_time * m_anim_duration + dt;
m_current_time = fmodf(current_time_absolute / m_anim_duration, 1.0);
float current_time_absolute = fmodf(m_current_time * m_sync_track.m_duration + dt, 1.0f);
float current_sync_time = m_sync_track.CalcSyncFromAbsTime(current_time_absolute);
m_current_time = m_sync_track.CalcRatioFromSyncTime(current_sync_time);
m_input_A->UpdateTime(m_current_time - m_input_A->m_current_time);
m_input_B->UpdateTime(m_current_time - m_input_B->m_current_time);
float time_absolute_A = fmodf (m_input_A->m_current_time * m_input_A->m_sync_track.m_duration, 1.0f);
float sync_time_A = m_input_A->m_sync_track.CalcSyncFromAbsTime(time_absolute_A);
float m_ratio_A = m_input_A->m_sync_track.CalcSyncFromAbsTime(sync_time_A);
float time_absolute_B = fmodf (m_input_B->m_current_time * m_input_B->m_sync_track.m_duration, 1.0f);
float sync_time_B = m_input_B->m_sync_track.CalcSyncFromAbsTime(time_absolute_B);
float m_ratio_B = m_input_B->m_sync_track.CalcSyncFromAbsTime(sync_time_B);
m_input_A->UpdateTime(current_sync_time);
m_input_B->UpdateTime(current_sync_time);
} else {
m_current_time += dt;
m_input_A->UpdateTime(dt);