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

Transition walking-zombie look good.

Browse Source
This commit is contained in:
Martin Felis
2021-11-19 22:13:06 +01:00
parent db3095fa07
commit 382730960f
6 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/AnimNodes/AnimSamplerNode.cc
+1 -2
View File
@@ -23,10 +23,9 @@ void AnimSamplerNode::SetAnimation(ozz::animation::Animation* animation, const S
void AnimSamplerNode::Evaluate(
ozz::vector<ozz::math::SoaTransform>* local_matrices) {
ozz::animation::SamplingJob sampling_job;
float ratio = m_sync_track.CalcRatioFromSyncTime(m_anim_ratio);
sampling_job.animation = m_animation;
sampling_job.cache = &m_sampling_cache;
sampling_job.ratio = ratio;
sampling_job.ratio = m_anim_ratio;
sampling_job.output = make_span(*local_matrices);
if (!sampling_job.Run()) {
ozz::log::Err() << "Error sampling animation." << std::endl;
src/AnimNodes/AnimSamplerNode.h
+2 -3
View File
@@ -38,10 +38,9 @@ struct AnimSamplerNode : public AnimNode {
m_current_time += dt;
if (!m_override_ratio) {
if (m_is_time_synced) {
m_anim_ratio = fmodf((float)m_current_time, 1.0f);
m_current_time = m_anim_ratio;
m_anim_ratio = m_sync_track.CalcRatioFromSyncTime(m_current_time);
} else {
m_anim_ratio = fmodf((float)m_current_time / m_sync_track.m_duration, 1.0f);
m_anim_ratio = fmodf((float)m_current_time / m_animation->duration(), 1.0f);
}
}
src/AnimNodes/BlendNode.cc
+3 -1
View File
@@ -49,7 +49,9 @@ void BlendNode::Evaluate(ozz::vector<ozz::math::SoaTransform>* local_matrices) {
}
void BlendNode::DrawDebugUi() {
ImGui::SliderFloat("Weight", &m_weight, 0.f, 1.f);
if (ImGui::SliderFloat("Weight", &m_weight, 0.f, 1.f)) {
m_sync_track = SyncTrack::Blend(m_weight, m_input_A->m_sync_track, m_input_B->m_sync_track);
}
ImGui::Checkbox("Sync Inputs", &m_sync_inputs);
ImGui::Text("SyncTrack");
src/AnimNodes/BlendNode.h
+4 -13
View File
@@ -45,20 +45,11 @@ struct BlendNode : public AnimNode {
virtual void UpdateTime(float dt) {
if (m_is_time_synced) {
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_current_time = fmodf(m_current_time + dt, m_sync_track.m_duration);
float current_sync_time = m_sync_track.CalcSyncFromAbsTime(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);
m_input_A->UpdateTime(current_sync_time - m_input_A->m_current_time);
m_input_B->UpdateTime(current_sync_time - m_input_B->m_current_time);
} else {
m_current_time += dt;
m_input_A->UpdateTime(dt);