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

Renamed m_current_time to m_time_current to simplify root bone sampling.

Browse Source
This commit is contained in:
Martin Felis
2021-12-03 15:58:20 +01:00
parent 1e1d36c5b1
commit b8d863c8e1
8 changed files with 73 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/AnimNodes/BlendNode.h
+15 -12
View File
@@ -22,9 +22,7 @@ struct BlendNode : public AnimNode {
ozz::math::Transform m_root_transform_A;
ozz::math::Transform m_root_transform_B;
virtual void Reset() {
m_current_time = 0.f;
}
virtual void Reset() { m_time_current = 0.f; }
virtual void UpdateIsSynced(bool is_synced) override {
m_is_time_synced = is_synced;
@@ -39,24 +37,28 @@ struct BlendNode : public AnimNode {
virtual void UpdateSyncTrack() override {
if (m_is_time_synced) {
m_sync_track = SyncTrack::Blend(m_weight, m_input_A->m_sync_track, m_input_B->m_sync_track);
m_sync_track = SyncTrack::Blend(
m_weight,
m_input_A->m_sync_track,
m_input_B->m_sync_track);
} else {
assert (false);
assert(false);
}
}
virtual void UpdateTime(float dt) {
if (m_is_time_synced) {
float sync_time_old = m_sync_track.CalcSyncFromAbsTime(m_current_time);
m_current_time = fmodf(m_current_time + dt, m_sync_track.m_duration);
float sync_time_dt = m_sync_track.CalcSyncFromAbsTime(m_current_time) - sync_time_old;
float sync_time_old = m_sync_track.CalcSyncFromAbsTime(m_time_current);
m_time_current = fmodf(m_time_current + dt, m_sync_track.m_duration);
float sync_time_dt =
m_sync_track.CalcSyncFromAbsTime(m_time_current) - sync_time_old;
m_input_A->m_current_time = sync_time_old;
m_input_B->m_current_time = sync_time_old;
m_input_A->m_time_current = sync_time_old;
m_input_B->m_time_current = sync_time_old;
m_input_A->UpdateTime(sync_time_dt);
m_input_B->UpdateTime(sync_time_dt);
} else {
m_current_time += dt;
m_time_current += dt;
m_input_A->UpdateTime(dt);
m_input_B->UpdateTime(dt);
}
@@ -66,7 +68,8 @@ struct BlendNode : public AnimNode {
ozz::vector<ozz::math::SoaTransform>* local_matrices,
ozz::math::Transform* root_transform) override;
virtual void GetInputNodes(std::vector<AnimNode*>& input_nodes) const override {
virtual void GetInputNodes(
std::vector<AnimNode*>& input_nodes) const override {
input_nodes.push_back(m_input_A);
input_nodes.push_back(m_input_B);
};