Added additional sync track tests.

src/SkinnedMesh.h

@@ -25,53 +25,90 @@ constexpr int cSyncTrackMaxIntervals = 8;
 struct SyncTrack {
   float m_duration;
   int m_num_intervals;
+  float m_sync_markers[cSyncTrackMaxIntervals];
+  float m_interval_start[cSyncTrackMaxIntervals];
+  float m_interval_end[cSyncTrackMaxIntervals];
   float m_interval_durations[cSyncTrackMaxIntervals];
 
-  float CalcSyncFromAbsTime (float abs_time) {
-    float sync_time = fmodf (abs_time, m_duration) / m_duration;
+  void CalcIntervals() {
+    int i;
+
+    if (m_num_intervals == 0) {
+      m_num_intervals = 1;
+      m_interval_start[0] = 0.f;
+      m_interval_end[0] = 1.f;
+    } else {
+      for (i = 0; i < m_num_intervals; i++) {
+        int end_index = i < m_num_intervals - 1 ? i + 1 : 0;
+
+        m_interval_start[i] = m_sync_markers[i];
+        m_interval_end[i] = m_sync_markers[end_index];
+
+        if (m_interval_end[i] > m_interval_start[i]) {
+          m_interval_durations[i] = m_interval_end[i] - m_interval_start[i];
+        } else {
+          m_interval_durations[i] =
+              m_interval_end[i] + (1. - m_interval_start[i]);
+        }
+      }
+    }
+  }
+
+  float CalcSyncFromAbsTime(float abs_time) {
+    float sync_time = fmodf(abs_time, m_duration) / m_duration;
 
     int interval_index = 0;
     while (sync_time >= m_interval_durations[interval_index]) {
       sync_time -= m_interval_durations[interval_index];
-      interval_index ++;
+      interval_index++;
     }
 
-    return float(interval_index) + sync_time / m_interval_durations[interval_index];
+    return float(interval_index)
+           + sync_time / m_interval_durations[interval_index];
   }
 
-  float CalcRatioFromSyncTime (float sync_time) {
+  float CalcRatioFromSyncTime(float sync_time) {
     float interval_ratio = fmodf(sync_time, 1.0f);
     int interval = int(sync_time - interval_ratio);
 
-    float result = 0.f;
-    int i = 0;
-    while (i < interval) {
-      result += m_interval_durations[i];
-      i++;
-    }
-
-    result += m_interval_durations[i] * interval_ratio;
-
-    return result;
+    return fmodf(
+        m_interval_start[interval]
+            + m_interval_durations[interval] * interval_ratio,
+        1.0f);
   }
 
-  static SyncTrack Blend(float weight, const SyncTrack& track_A, const SyncTrack& track_B) {
-    SyncTrack result;
+  static SyncTrack
+  Blend(float weight, const SyncTrack& track_A, const SyncTrack& track_B) {
+    assert(track_A.m_num_intervals == track_B.m_num_intervals);
 
-    assert (track_A.m_num_intervals == track_B.m_num_intervals);
+    SyncTrack result;
     result.m_num_intervals = track_A.m_num_intervals;
 
-    result.m_duration = (1.0f - weight) * track_A.m_duration + weight * track_B.m_duration;
+    result.m_duration =
+        (1.0f - weight) * track_A.m_duration + weight * track_B.m_duration;
 
     for (int i = 0; i < result.m_num_intervals; i++) {
-      result.m_interval_durations[i] = (1.0f - weight) * track_A.m_interval_durations[i] + weight * track_B.m_interval_durations[i];
+      result.m_interval_durations[i] =
+          (1.0f - weight) * track_A.m_interval_durations[i]
+          + weight * track_B.m_interval_durations[i];
+
+      result.m_interval_start[i] =
+          (1.0f - weight) * track_A.m_interval_start[i]
+          + weight * track_B.m_interval_start[i];
+
+      result.m_interval_end[i] =
+          (1.0f - weight) * track_A.m_interval_end[i]
+          + weight * track_B.m_interval_end[i];
+
+      result.m_sync_markers[i] =
+          (1.0f - weight) * track_A.m_sync_markers[i]
+          + weight * track_B.m_sync_markers[i];
     }
 
     return result;
   }
 };
 
-
 struct SkinnedMesh {
   virtual ~SkinnedMesh();
   bool LoadSkeleton(const char* filename);
@@ -79,8 +116,12 @@ struct SkinnedMesh {
   //bool LoadMesh (const char* filename);
 
   void SetCurrentAnimation(int index);
-  const ozz::animation::Animation* GetCurrentAnimation() {return m_current_animation; };
-  float GetCurrentAnimationDuration() {return m_current_animation->duration(); };
+  const ozz::animation::Animation* GetCurrentAnimation() {
+    return m_current_animation;
+  };
+  float GetCurrentAnimationDuration() {
+    return m_current_animation->duration();
+  };
 
   void EvalAnimation(float in_time);
   void DrawSkeleton();